Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lifecycle crashes with keyboard fragment and media sending.

Browse Source
This commit is contained in:
Cody Henthorne
2023-07-27 15:36:38 -04:00
parent 0a4147aa0e
commit f740b69ffe
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -514,7 +514,6 @@ class ConversationFragment :
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
registerForResults()
disposables.bindTo(viewLifecycleOwner) disposables.bindTo(viewLifecycleOwner)
FullscreenHelper(requireActivity()).showSystemUI() FullscreenHelper(requireActivity()).showSystemUI()
@@ -523,6 +522,8 @@ class ConversationFragment :
inlineQueryViewModel = createActivityViewModel { InlineQueryViewModelV2(recipientRepository = conversationRecipientRepository) } inlineQueryViewModel = createActivityViewModel { InlineQueryViewModelV2(recipientRepository = conversationRecipientRepository) }
attachmentManager = AttachmentManager(requireContext(), requireView(), AttachmentManagerListener())
initializeConversationThreadUi() initializeConversationThreadUi()
val conversationToolbarOnScrollHelper = ConversationToolbarOnScrollHelper( val conversationToolbarOnScrollHelper = ConversationToolbarOnScrollHelper(
@@ -552,6 +553,8 @@ class ConversationFragment :
ToolbarDependentMarginListener(binding.toolbar) ToolbarDependentMarginListener(binding.toolbar)
initializeMediaKeyboard() initializeMediaKeyboard()
registerForResults()
} }
override fun onViewStateRestored(savedInstanceState: Bundle?) { override fun onViewStateRestored(savedInstanceState: Bundle?) {
@@ -799,8 +802,6 @@ class ConversationFragment :
menuProvider.afterFirstRenderMode = true menuProvider.afterFirstRenderMode = true
attachmentManager = AttachmentManager(requireContext(), requireView(), AttachmentManagerListener())
viewLifecycleOwner.lifecycle.addObserver(LastScrolledPositionUpdater(adapter, layoutManager, viewModel)) viewLifecycleOwner.lifecycle.addObserver(LastScrolledPositionUpdater(adapter, layoutManager, viewModel))
disposables += viewModel.recipient disposables += viewModel.recipient

6
app/src/main/java/org/thoughtcrime/securesms/util/fragments/ListenerExtensions.kt
View File

@@ -17,7 +17,7 @@ inline fun <reified T> Fragment.findListener(): T? {
parent = parent.parentFragment parent = parent.parentFragment
} }
return requireActivity() as? T return activity as? T
} }
/** /**
@@ -40,9 +40,9 @@ inline fun <reified T> Fragment.requireListener(): T {
parent = parent.parentFragment parent = parent.parentFragment
} }
return requireActivity() as T return activity as T
} catch (e: ClassCastException) { } catch (e: ClassCastException) {
hierarchy.add(requireActivity()::class.java.name) hierarchy.add(activity?.let { it::class.java.name } ?: "<null activity>")
throw ListenerNotFoundException(hierarchy, e) throw ListenerNotFoundException(hierarchy, e)
} }
} }