gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-12 10:07:27 +02:00
parent c5d3fd10c0
commit 01348f07ea
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -570,46 +570,44 @@ public class ContactsController extends BaseController implements SearchView.OnQ
adapter.onLoadMoreComplete(null); adapter.onLoadMoreComplete(null);
} }
getActivity().runOnUiThread(() -> { searchItem.setVisible(newUserItemList.size() > 0);
searchItem.setVisible(newUserItemList.size() > 0); swipeRefreshLayout.setRefreshing(false);
swipeRefreshLayout.setRefreshing(false);
if (isNewConversationView) { if (isNewConversationView) {
checkAndHandleBottomButtons(); checkAndHandleBottomButtons();
} }
});
} }
;
} }
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
getActivity().runOnUiThread(() -> { if (searchItem != null) {
if (searchItem != null) { searchItem.setVisible(false);
searchItem.setVisible(false); }
}
if (e instanceof HttpException) { if (e instanceof HttpException) {
HttpException exception = (HttpException) e; HttpException exception = (HttpException) e;
switch (exception.code()) { switch (exception.code()) {
case 401: case 401:
if (getParentController() != null && if (getParentController() != null &&
getParentController().getRouter() != null) { getParentController().getRouter() != null) {
getParentController().getRouter().pushController((RouterTransaction.with getParentController().getRouter().pushController((RouterTransaction.with
(new WebViewLoginController(currentUser.getBaseUrl(), (new WebViewLoginController(currentUser.getBaseUrl(),
true)) true))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()))); .popChangeHandler(new VerticalChangeHandler())));
} }
break; break;
default: default:
break; break;
}
} }
swipeRefreshLayout.setRefreshing(false); swipeRefreshLayout.setRefreshing(false);
}); }
;
dispose(contactsQueryDisposable); dispose(contactsQueryDisposable);
@ -617,7 +615,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Override @Override
public void onComplete() { public void onComplete() {
getActivity().runOnUiThread(() -> swipeRefreshLayout.setRefreshing(false)); swipeRefreshLayout.setRefreshing(false);
dispose(contactsQueryDisposable); dispose(contactsQueryDisposable);
alreadyFetching = false; alreadyFetching = false;