From b7dec6e4fab7a7466d51a40f95da007d64fcf99f Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 18 Apr 2019 01:56:14 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20account=20removal=20if=20it=E2=80=99s=20t?= =?UTF-8?q?he=20last=20account?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mario Danic --- .../talk/controllers/SettingsController.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index 22b3ce9c6..5a985d2e9 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -406,17 +406,10 @@ public class SettingsController extends BaseController { onViewBound(getView()); onAttach(getView()); } else if (!otherUserExists) { - if (getParentController() == null || getParentController().getRouter() == null) { - if (getActivity() != null) { - // Something went very wrong, finish the app - getActivity().finish(); - } - } else { - getParentController().getRouter().setRoot(RouterTransaction.with( - new ServerSelectionController()) - .pushChangeHandler(new VerticalChangeHandler()) - .popChangeHandler(new VerticalChangeHandler())); - } + getRouter().setRoot(RouterTransaction.with( + new ServerSelectionController()) + .pushChangeHandler(new VerticalChangeHandler()) + .popChangeHandler(new VerticalChangeHandler())); } }