gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on add account

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-31 00:07:53 +01:00
parent 97423444ce
commit af9ae6f4dd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

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