From 50e072ced0a3a735780a2f404ba80638c0bc754b Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 1 Jun 2018 15:35:35 +0200 Subject: [PATCH] Some fixups Signed-off-by: Mario Danic --- .../com/nextcloud/talk/controllers/CallsListController.java | 1 - .../java/com/nextcloud/talk/controllers/ContactsController.java | 2 ++ .../talk/controllers/bottomsheet/OperationsMenuController.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) 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 03568d025..ca5fb2b3c 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java @@ -173,7 +173,6 @@ public class CallsListController extends BaseController implements SearchView.On } currentUser = userUtils.getCurrentUser(); - } @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 bcbf25f30..16ab15cdb 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -201,6 +201,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ getActionBar().setDisplayHomeAsUpEnabled(true); } } + + currentUser = userUtils.getCurrentUser(); } @Override diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java index 0c4ecb7ce..f480ad1d8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java @@ -24,6 +24,7 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.os.Handler; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; @@ -589,6 +590,7 @@ public class OperationsMenuController extends BaseController { imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0); } + new Handler().postDelayed(() -> getParentController().getRouter().popCurrentController(), 100); startActivity(callIntent); }