Recovery of instant uploads in temporary disabled

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 330b793..9d2bbcf 100644 (file)
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -801,7 +801,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
             // we add only for instant-uploads the InstantUploadActivity and the
             // db entry
             Intent detailUploadIntent = null;
             // we add only for instant-uploads the InstantUploadActivity and the
             // db entry
             Intent detailUploadIntent = null;

-            if (upload.isInstant()) {
+            if (upload.isInstant() && InstantUploadActivity.IS_ENABLED) {

                 detailUploadIntent = new Intent(this, InstantUploadActivity.class);
                 detailUploadIntent.putExtra(FileUploader.KEY_ACCOUNT, upload.getAccount());
             } else {
                 detailUploadIntent = new Intent(this, InstantUploadActivity.class);
                 detailUploadIntent.putExtra(FileUploader.KEY_ACCOUNT, upload.getAccount());
             } else {

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 17504a8..62937b1 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -753,9 +753,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             break;\r
         }\r
         case DIALOG_CHOOSE_UPLOAD_SOURCE: {\r
             break;\r
         }\r
         case DIALOG_CHOOSE_UPLOAD_SOURCE: {\r

-            final String[] items = {    getString(R.string.actionbar_upload_files),\r
-                                        getString(R.string.actionbar_upload_from_apps), \r
-                                        getString(R.string.actionbar_failed_instant_upload) };\r
+            \r
+            String[] items = null;\r
+            \r
+            String[] allTheItems = { getString(R.string.actionbar_upload_files),\r
+                                     getString(R.string.actionbar_upload_from_apps),\r
+                                     getString(R.string.actionbar_failed_instant_upload) };\r
+            \r
+            String[] commonItems = { getString(R.string.actionbar_upload_files),\r
+                                     getString(R.string.actionbar_upload_from_apps) };\r
+            \r
+            if (InstantUploadActivity.IS_ENABLED)\r
+                items = allTheItems;\r
+            else \r
+                items = commonItems;\r
+            \r

             builder = new AlertDialog.Builder(this);\r
             builder.setTitle(R.string.actionbar_upload);\r
             builder.setItems(items, new DialogInterface.OnClickListener() {\r
             builder = new AlertDialog.Builder(this);\r
             builder.setTitle(R.string.actionbar_upload);\r
             builder.setItems(items, new DialogInterface.OnClickListener() {\r


@@ -775,7 +787,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);\r
                         startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r
                                 ACTION_SELECT_CONTENT_FROM_APPS);\r
                         action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);\r
                         startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r
                                 ACTION_SELECT_CONTENT_FROM_APPS);\r

-                    } else if (item == 2) {\r
+                    } else if (item == 2 && InstantUploadActivity.IS_ENABLED) {\r

                         Account account = AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this);\r
                         Intent action = new Intent(FileDisplayActivity.this, InstantUploadActivity.class);\r
                         action.putExtra(FileUploader.KEY_ACCOUNT, account);\r
                         Account account = AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this);\r
                         Intent action = new Intent(FileDisplayActivity.this, InstantUploadActivity.class);\r
                         action.putExtra(FileUploader.KEY_ACCOUNT, account);\r

diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
index 7b964a6..910802f 100644 (file)
--- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
@@ -75,6 +75,7 @@ public class InstantUploadActivity extends Activity {
     private static final String LOG_TAG = InstantUploadActivity.class.getSimpleName();
     private LinearLayout listView;
     private static final String retry_chexbox_tag = "retry_chexbox_tag";
     private static final String LOG_TAG = InstantUploadActivity.class.getSimpleName();
     private LinearLayout listView;
     private static final String retry_chexbox_tag = "retry_chexbox_tag";

+    public static final boolean IS_ENABLED = false;

     private static int MAX_LOAD_IMAGES = 5;
     private int lastLoadImageIdx = 0;
 
     private static int MAX_LOAD_IMAGES = 5;
     private int lastLoadImageIdx = 0;