From 5140c41c589e2a7e26cde1073d39e18d9111d704 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 9 Mar 2026 10:27:52 -0300 Subject: [PATCH] Move VM setup code from onCreate to onPreCreate in MediaSelectionActivity.kt. --- .../mediasend/v2/MediaSelectionActivity.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt index 8f20d25f13..ee60c3c168 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt @@ -95,13 +95,7 @@ class MediaSelectionActivity : super.attachBaseContext(newBase) } - override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) { - setContentView(R.layout.media_selection_activity) - - FullscreenHelper.showSystemUI(window) - WindowUtil.setNavigationBarColor(this, 0x01000000) - WindowUtil.setStatusBarColor(window, Color.TRANSPARENT) - + override fun onPreCreate() { val sendType: MessageSendType = requireNotNull(intent.getParcelableExtraCompat(MESSAGE_SEND_TYPE, MessageSendType::class.java)) val initialMedia: List = intent.getParcelableArrayListExtraCompat(MEDIA, Media::class.java) ?: listOf() val message: CharSequence? = if (shareToTextStory) null else draftText @@ -110,6 +104,14 @@ class MediaSelectionActivity : val factory = MediaSelectionViewModel.Factory(destination, sendType, initialMedia, message, isReply, isStory, isAddToGroupStoryFlow, MediaSelectionRepository(this)) viewModel = ViewModelProvider(this, factory)[MediaSelectionViewModel::class.java] + } + + override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) { + setContentView(R.layout.media_selection_activity) + + FullscreenHelper.showSystemUI(window) + WindowUtil.setNavigationBarColor(this, 0x01000000) + WindowUtil.setStatusBarColor(window, Color.TRANSPARENT) val textStoryToggle: ConstraintLayout = findViewById(R.id.switch_widget) val cameraDisplay = CameraDisplay.getDisplay(this)