瀏覽代碼

Fix crash on add account

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 年之前
父節點
當前提交
af9ae6f4dd
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java

+ 6 - 2
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java

@@ -215,12 +215,12 @@ public class SettingsController extends BaseController {
 
         versionInfo.setSummary("v" + BuildConfig.VERSION_NAME);
 
+
         addAccountButton.setOnClickListener(view15 -> {
             addAccountButton.setEnabled(false);
             getParentController().getRouter().pushController(RouterTransaction.with(new
                     ServerSelectionController()).pushChangeHandler(new VerticalChangeHandler())
                     .popChangeHandler(new VerticalChangeHandler()));
-            addAccountButton.setEnabled(true);
         });
 
         switchAccountButton.setOnClickListener(view16 -> {
@@ -228,7 +228,6 @@ public class SettingsController extends BaseController {
             getParentController().getRouter().pushController(RouterTransaction.with(new
                     SwitchAccountController()).pushChangeHandler(new VerticalChangeHandler())
                     .popChangeHandler(new VerticalChangeHandler()));
-            switchAccountButton.setEnabled(true);
 
         });
 
@@ -350,10 +349,15 @@ public class SettingsController extends BaseController {
 
         }
 
+
         if (userUtils.getUsers().size() <= 1) {
             switchAccountButton.setVisibility(View.GONE);
+        } else {
+            switchAccountButton.setEnabled(true);
         }
 
+        addAccountButton.setEnabled(true);
+
         if (ErrorMessageHolder.getInstance().getMessageType() != null) {
             switch (ErrorMessageHolder.getInstance().getMessageType()) {
                 case ACCOUNT_UPDATED_NOT_ADDED: