From 3a58a65bc7608ccc9ad25520261478d0790dfc57 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 7 May 2018 19:39:04 +0200 Subject: [PATCH] Fix a crash Signed-off-by: Mario Danic --- .../AccountVerificationController.java | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index e370b9ade..2e7610250 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -449,35 +449,27 @@ public class AccountVerificationController extends BaseController { } else { ApplicationWideMessageHolder.getInstance().setMessageType( ApplicationWideMessageHolder.MessageType.FAILED_TO_IMPORT_ACCOUNT); - new Handler().postDelayed(() -> { - if (getRouter().hasRootController()) { - if (getActivity() != null) { - getActivity().runOnUiThread(() -> { + if (getActivity() != null) { + getActivity().runOnUiThread(() -> new Handler().postDelayed(() -> { + if (getRouter().hasRootController()) { + if (getActivity() != null) { getRouter().popToRoot(); - }); - - } - } else { - if (userUtils.anyUserExists()) { - if (getActivity() != null) { - getActivity().runOnUiThread(() -> { - - getRouter().setRoot(RouterTransaction.with(new MagicBottomNavigationController()) - .pushChangeHandler(new HorizontalChangeHandler()) - .popChangeHandler(new HorizontalChangeHandler())); - }); } + + } else { - if (getActivity() != null) { - getActivity().runOnUiThread(() -> { - getRouter().setRoot(RouterTransaction.with(new ServerSelectionController()) - .pushChangeHandler(new HorizontalChangeHandler()) - .popChangeHandler(new HorizontalChangeHandler())); - }); + if (userUtils.anyUserExists()) { + getRouter().setRoot(RouterTransaction.with(new MagicBottomNavigationController()) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); + } else { + getRouter().setRoot(RouterTransaction.with(new ServerSelectionController()) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); } } - } - }, 7500); + }, 7500)); + } } }