From 4520ff78ff6cf63ff98e6ceb12fd3cf2b4494791 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 20 Jul 2023 16:44:54 -0300 Subject: [PATCH] Fix issue with icon pop in attachment keyboard. --- .../securesms/conversation/AttachmentKeyboard.java | 1 + .../conversation/v2/keyboard/AttachmentKeyboardFragment.kt | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java index bda28f2791..11aac58539 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java @@ -61,6 +61,7 @@ public class AttachmentKeyboard extends FrameLayout implements InputAwareLayout. this.permissionButton = findViewById(R.id.attachment_keyboard_permission_button); RecyclerView buttonList = findViewById(R.id.attachment_keyboard_button_list); + buttonList.setItemAnimator(null); mediaAdapter = new AttachmentKeyboardMediaAdapter(GlideApp.with(this), media -> { if (callback != null) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt index be32451800..094c459a12 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt @@ -67,6 +67,12 @@ class AttachmentKeyboardFragment : LoggingFragment(R.layout.attachment_keyboard_ .addTo(lifecycleDisposable) conversationViewModel = ViewModelProvider(requireParentFragment()).get(ConversationViewModel::class.java) + + val snapshot = conversationViewModel.recipientSnapshot + if (snapshot != null) { + updatePaymentsAvailable(snapshot) + } + conversationViewModel .recipient .observeOn(AndroidSchedulers.mainThread())