瀏覽代碼

Merge pull request #2251 from nextcloud/NPEifNothingReceived

if nothing received to upload, app crashed
Andy Scherzinger 7 年之前
父節點
當前提交
a2804e74d4
共有 1 個文件被更改,包括 14 次插入15 次删除
  1. 14 15
      src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

+ 14 - 15
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -192,22 +192,21 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
     @Override
     protected void setAccount(Account account, boolean savedAccount) {
-        if (somethingToUpload()) {
-            mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE);
-            Account[] accounts = mAccountManager.getAccountsByType(MainApp.getAccountType());
-            if (accounts.length == 0) {
-                Log_OC.i(TAG, "No ownCloud account is available");
-                DialogNoAccount dialog = new DialogNoAccount();
-                dialog.show(getSupportFragmentManager(), null);
-            } else {
-                if (!savedAccount) {
-                    setAccount(accounts[0]);
-                }
-            }
-        } else {
+        mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE);
+
+        Account[] accounts = mAccountManager.getAccountsByType(MainApp.getAccountType());
+        if (accounts.length == 0) {
+            Log_OC.i(TAG, "No ownCloud account is available");
+            DialogNoAccount dialog = new DialogNoAccount();
+            dialog.show(getSupportFragmentManager(), null);
+        } else if (!savedAccount) {
+            setAccount(accounts[0]);
+        }
+
+        if (!somethingToUpload()) {
             showErrorDialog(
-                R.string.uploader_error_message_no_file_to_upload,
-                R.string.uploader_error_title_no_file_to_upload
+                    R.string.uploader_error_message_no_file_to_upload,
+                    R.string.uploader_error_title_no_file_to_upload
             );
         }