From 003a5af33c744ceff8144e3942d498d45c7cc11b Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 28 Nov 2017 03:47:53 +0100
Subject: [PATCH] Reorganization

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/controllers/CallsListController.java | 15 +++++++-------
 .../talk/controllers/ContactsController.java  | 20 +++++++------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
index a76004b50..454e0aa53 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
@@ -131,6 +131,14 @@ public class CallsListController extends BaseController implements SearchView.On
 
         userEntity = userUtils.getCurrentUser();
 
+        if (userEntity == null) {
+            if (getParentController() != null && getParentController().getRouter() != null) {
+                getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController())
+                        .pushChangeHandler(new HorizontalChangeHandler())
+                        .popChangeHandler(new HorizontalChangeHandler())));
+            }
+        }
+
         if (adapter == null) {
             adapter = new FlexibleAdapter<>(callItems, getActivity(), false);
             if (userEntity != null) {
@@ -141,13 +149,6 @@ public class CallsListController extends BaseController implements SearchView.On
         adapter.addListener(new OnItemClickListener());
         prepareViews();
 
-        if (userEntity == null) {
-            if (getParentController() != null && getParentController().getRouter() != null) {
-                getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController())
-                        .pushChangeHandler(new HorizontalChangeHandler())
-                        .popChangeHandler(new HorizontalChangeHandler())));
-            }
-        }
     }
 
     @Override
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index c9bae2785..2c8c65221 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -120,14 +120,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ
         NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
 
         userEntity = userUtils.getCurrentUser();
-        if (adapter == null) {
-            adapter = new FlexibleAdapter<>(contactItems, getActivity(), false);
-            if (userEntity != null) {
-                fetchData();
-            }
-        }
-
-        prepareViews();
 
         if (userEntity == null) {
             if (getParentController().getRouter() != null) {
@@ -137,12 +129,14 @@ public class ContactsController extends BaseController implements SearchView.OnQ
             }
         }
 
-    }
-
-    @Override
-    protected void onAttach(@NonNull View view) {
-        super.onAttach(view);
+        if (adapter == null) {
+            adapter = new FlexibleAdapter<>(contactItems, getActivity(), false);
+            if (userEntity != null) {
+                fetchData();
+            }
+        }
 
+        prepareViews();
     }
 
     private void initSearchView() {