From e936bf747906003a688c7ae086e0d998ea4860a3 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 4 Mar 2019 12:12:25 +0100 Subject: [PATCH] Fix #486 Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/activities/MainActivity.java | 1 - .../talk/controllers/AccountVerificationController.java | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java index 4797a0ed9..2c64f1e12 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java @@ -167,5 +167,4 @@ public final class MainActivity extends BaseActivity implements ActionBarProvide super.onBackPressed(); } } - } 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 76b440d3d..300a56892 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -193,8 +193,10 @@ public class AccountVerificationController extends BaseController { } if (isAccountImport) { - getRouter().pushController(RouterTransaction.with(new WebViewLoginController(baseUrl, - false, username, ""))); + getRouter().replaceTopController(RouterTransaction.with(new WebViewLoginController(baseUrl, + false, username, "")) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler())); } else { checkEverything(); }