Browse Source

Merge pull request #132 from nextcloud/accountDeletionFix

Fix NPE on last account deletion
Andy Scherzinger 8 years ago
parent
commit
3ea6c22ae6
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/com/owncloud/android/ui/activity/ManageAccountsActivity.java

+ 6 - 2
src/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -142,8 +142,12 @@ public class ManageAccountsActivity extends FileActivity
      * @return <code>true</code> if aacount list has changed, <code>false</code> if not
      */
     private boolean hasCurrentAccountChanged() {
-        String currentAccount = AccountUtils.getCurrentOwnCloudAccount(this).name;
-        return !mOriginalCurrentAccount.equals(currentAccount);
+        Account account = AccountUtils.getCurrentOwnCloudAccount(this);
+        if (account == null){
+            return true;
+        } else {
+            return !mOriginalCurrentAccount.equals(account.name);
+        }
     }
 
     /**