From 3733826e2e434890cbd22d1582f4115e761e8660 Mon Sep 17 00:00:00 2001 From: Harris Date: Thu, 17 Mar 2022 13:01:33 +1100 Subject: [PATCH 1/3] fix: re-check input bar control after recipient modified --- .../securesms/conversation/v2/ConversationActivityV2.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 50dd13499f..e7c5b7e9e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -579,6 +579,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe if (viewModel.recipient.isContactRecipient) { binding?.blockedBanner?.isVisible = viewModel.recipient.isBlocked } + setUpMessageRequestsBar() invalidateOptionsMenu() updateSubtitle() showOrHideInputIfNeeded() From c6cf7a24d7250b11d62c55342229f2b9926d31f0 Mon Sep 17 00:00:00 2001 From: Harris Date: Thu, 17 Mar 2022 13:18:59 +1100 Subject: [PATCH 2/3] fix: raise elevation on the attachment buttons --- app/src/main/res/layout/activity_conversation_v2.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml index 79d115554c..84cbeeaeae 100644 --- a/app/src/main/res/layout/activity_conversation_v2.xml +++ b/app/src/main/res/layout/activity_conversation_v2.xml @@ -52,6 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/small_spacing" + android:elevation="8dp" android:layout_alignParentStart="true" android:layout_alignParentBottom="true" android:layout_marginBottom="60dp" From ad5911e24785ed29e1c42a9fc8d849460bf326b0 Mon Sep 17 00:00:00 2001 From: Harris Date: Thu, 17 Mar 2022 13:31:25 +1100 Subject: [PATCH 3/3] fix: don't enable expiring messages in not approvedMe conversations --- .../securesms/conversation/v2/menus/ConversationMenuHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb581f25f5..5966e765e3 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 @@ -58,7 +58,7 @@ object ConversationMenuHelper { // Base menu (options that should always be present) inflater.inflate(R.menu.menu_conversation, menu) // Expiring messages - if (!isOpenGroup) { + if (!isOpenGroup && thread.hasApprovedMe()) { if (thread.expireMessages > 0) { inflater.inflate(R.menu.menu_conversation_expiration_on, menu) val item = menu.findItem(R.id.menu_expiring_messages)