Fixed crash when the device is turned while the warning dialog about server certifica...

[pub/Android/ownCloud.git] / src / com / owncloud / android / Uploader.java

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 6f650d7..b911866 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -30,7 +30,7 @@ import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileUploader;\r
-import com.owncloud.android.utils.OwnCloudClientUtils;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
@@ -95,8 +95,9 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
         mParents = new Stack<String>();\r
         mParents.add("");\r
-        if (getIntent().hasExtra(Intent.EXTRA_STREAM)) {\r
-            prepareStreamsToUpload();\r
+        /*if (getIntent().hasExtra(Intent.EXTRA_STREAM)) {\r
+            prepareStreamsToUpload();*/\r
+        if (prepareStreamsToUpload()) {\r
             mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE);\r
             Account[] accounts = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
             if (accounts.length == 0) {\r
@@ -370,16 +371,14 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         }*/\r
     }\r
 \r
-    private void prepareStreamsToUpload() {\r
+    private boolean prepareStreamsToUpload() {\r
         if (getIntent().getAction().equals(Intent.ACTION_SEND)) {\r
             mStreamsToUpload = new ArrayList<Parcelable>();\r
             mStreamsToUpload.add(getIntent().getParcelableExtra(Intent.EXTRA_STREAM));\r
         } else if (getIntent().getAction().equals(Intent.ACTION_SEND_MULTIPLE)) {\r
             mStreamsToUpload = getIntent().getParcelableArrayListExtra(Intent.EXTRA_STREAM);\r
-        } else {\r
-            // unknow action inserted\r
-            throw new IllegalArgumentException("Unknown action given: " + getIntent().getAction());\r
         }\r
+        return (mStreamsToUpload != null && mStreamsToUpload.get(0) != null);\r
     }\r
 \r
     public void uploadFiles() {\r