From 95ef492454d69ba0b22344fcf23d50f6de7f715a Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 8 Jul 2018 23:20:03 +0200 Subject: [PATCH] Fix #208 Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/controllers/ChatController.java | 6 ++++-- .../controllers/bottomsheet/OperationsMenuController.java | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 34837cce4..9ed2b2ee6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -197,7 +197,9 @@ public class ChatController extends BaseController implements MessagesListAdapte credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken()); } - this.startCallFromNotification = args.getBoolean(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL); + if (args.containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { + this.startCallFromNotification = args.getBoolean(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL); + } this.voiceOnly = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false); } @@ -382,7 +384,7 @@ public class ChatController extends BaseController implements MessagesListAdapte messageInputView.getButton().setContentDescription(getResources() .getString(R.string.nc_description_send_message_button)); - if (adapterWasNull && startCallFromNotification == null) { + if (adapterWasNull && TextUtils.isEmpty(conversationName) && startCallFromNotification == null) { getRoomInfo(); } else { handleFromNotification(); 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 2a0bcecba..56a88a6da 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 @@ -522,7 +522,11 @@ public class OperationsMenuController extends BaseController { }); } } else { - showResultImage(true, false); + if (!currentUser.hasSpreedCapabilityWithName("chat-v2")) { + showResultImage(true, false); + } else { + initiateConversation(true, null); + } } }