From ad9cd8b231c891ea30c9e01c23233b1811c90002 Mon Sep 17 00:00:00 2001 From: Harris Date: Wed, 17 Nov 2021 14:22:33 +1100 Subject: [PATCH] fix: don't display call option in conversation and don't show notification if option not enabled --- .../securesms/conversation/v2/menus/ConversationMenuHelper.kt | 3 +-- .../org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt index c08c7eea68..e54e4b1f10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt @@ -100,8 +100,7 @@ object ConversationMenuHelper { inflater.inflate(R.menu.menu_conversation_notification_settings, menu) } - // TODO: Call Tests - if (!isOpenGroup) { + if (!thread.isGroupRecipient && TextSecurePreferences.isCallNotificationsEnabled(context)) { inflater.inflate(R.menu.menu_conversation_call, menu) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt index 19196383a1..86ff154bf9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt @@ -26,6 +26,7 @@ class CallMessageProcessor(private val context: Context, lifecycle: Lifecycle) { if (!TextSecurePreferences.isCallNotificationsEnabled(context)) { Log.d("Loki","Dropping call message if call notifications disabled") // TODO: maybe insert a message here saying you missed a call due to permissions + continue } when (nextMessage.type) { OFFER -> incomingCall(nextMessage)