From f76498047437fd53aa383dcc1fecb438f319da6d Mon Sep 17 00:00:00 2001 From: Matthias Baumann Date: Mon, 25 Feb 2013 08:21:33 +0100 Subject: [PATCH] - extend existing FileUpload, so we can handel failed instand upload later - new Activity to handle failed instant uploads - new Activity InstantUploadActivity can be started at two ways, -touch to the 'Faild Upload Notifivation' -submenue underneath the upload menue - merges from head - add lazy loading for the images list with failed uploads --- AndroidManifest.xml | 24 +- res/layout/failed_upload_files.xml | 104 + res/layout/file_activity_details.xml | 3 +- res/values-de-rDE/strings.xml | 10 + res/values-de/strings.xml | 10 + res/values/strings.xml | 141 +- src/com/owncloud/android/db/DbHandler.java | 206 +- .../files/InstantUploadBroadcastReceiver.java | 95 +- .../android/files/services/FileUploader.java | 525 ++-- .../files/services/InstantUploadService.java | 16 +- .../android/ui/activity/FileDisplayActivity.java | 2597 ++++++++++---------- .../android/ui/activity/InstantUploadActivity.java | 436 ++++ 12 files changed, 2413 insertions(+), 1754 deletions(-) create mode 100644 res/layout/failed_upload_files.xml create mode 100644 src/com/owncloud/android/ui/activity/InstantUploadActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 83374c38..14be678e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -58,6 +58,8 @@ + + @@ -132,25 +134,25 @@ - + - + - + - + - - + + - - - + + + @@ -158,7 +160,7 @@ - + - + diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml new file mode 100644 index 00000000..b307ff81 --- /dev/null +++ b/res/layout/failed_upload_files.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + +