From f368e5b13337a8b8d42a8e5f219dce9a9fc9161e Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 17 Jan 2023 13:25:22 -0400 Subject: [PATCH] Suppress deselection error when opening gallery from chat. --- .../v2/gallery/MediaSelectionGalleryFragment.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt index caf86a82cb..202dd104f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt @@ -37,7 +37,14 @@ class MediaSelectionGalleryFragment : Fragment(R.layout.fragment_container), Med ) override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - val isFirst = arguments?.getBoolean("suppressEmptyError") ?: arguments?.getBoolean("first") ?: false + val args = arguments + val isFirst = when { + args == null -> false + args.containsKey("suppressEmptyError") -> args.getBoolean("suppressEmptyError") + args.containsKey("first") -> args.getBoolean("first") + else -> false + } + sharedViewModel.setSuppressEmptyError(isFirst) mediaGalleryFragment = ensureMediaGalleryFragment()