From 01348f07ea6098514ddebdb3ee03c2505045770c Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 12 Jun 2018 10:07:27 +0200
Subject: [PATCH] Clean up

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/controllers/ContactsController.java  | 56 +++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

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 8e5263238..4d346cb54 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -570,46 +570,44 @@ public class ContactsController extends BaseController implements SearchView.OnQ
                                 adapter.onLoadMoreComplete(null);
                             }
 
-                            getActivity().runOnUiThread(() -> {
-                                searchItem.setVisible(newUserItemList.size() > 0);
-                                swipeRefreshLayout.setRefreshing(false);
+                            searchItem.setVisible(newUserItemList.size() > 0);
+                            swipeRefreshLayout.setRefreshing(false);
 
 
-                                if (isNewConversationView) {
-                                    checkAndHandleBottomButtons();
-                                }
-                            });
+                            if (isNewConversationView) {
+                                checkAndHandleBottomButtons();
+                            }
                         }
+                        ;
                     }
 
                     @Override
                     public void onError(Throwable e) {
-                        getActivity().runOnUiThread(() -> {
-                            if (searchItem != null) {
-                                searchItem.setVisible(false);
-                            }
+                        if (searchItem != null) {
+                            searchItem.setVisible(false);
+                        }
 
-                            if (e instanceof HttpException) {
-                                HttpException exception = (HttpException) e;
-                                switch (exception.code()) {
-                                    case 401:
-                                        if (getParentController() != null &&
-                                                getParentController().getRouter() != null) {
-                                            getParentController().getRouter().pushController((RouterTransaction.with
-                                                    (new WebViewLoginController(currentUser.getBaseUrl(),
-                                                            true))
-                                                    .pushChangeHandler(new VerticalChangeHandler())
-                                                    .popChangeHandler(new VerticalChangeHandler())));
-                                        }
-                                        break;
-                                    default:
-                                        break;
-                                }
+                        if (e instanceof HttpException) {
+                            HttpException exception = (HttpException) e;
+                            switch (exception.code()) {
+                                case 401:
+                                    if (getParentController() != null &&
+                                            getParentController().getRouter() != null) {
+                                        getParentController().getRouter().pushController((RouterTransaction.with
+                                                (new WebViewLoginController(currentUser.getBaseUrl(),
+                                                        true))
+                                                .pushChangeHandler(new VerticalChangeHandler())
+                                                .popChangeHandler(new VerticalChangeHandler())));
+                                    }
+                                    break;
+                                default:
+                                    break;
                             }
 
                             swipeRefreshLayout.setRefreshing(false);
 
-                        });
+                        }
+                        ;
 
                         dispose(contactsQueryDisposable);
 
@@ -617,7 +615,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
                     @Override
                     public void onComplete() {
-                        getActivity().runOnUiThread(() -> swipeRefreshLayout.setRefreshing(false));
+                        swipeRefreshLayout.setRefreshing(false);
                         dispose(contactsQueryDisposable);
                         alreadyFetching = false;