Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent multiple instances of main-activity from being added to our task stack.

Browse Source
This commit is contained in:
Alex Hart
2026-01-05 14:40:50 -04:00
committed by jeffrey-signal
parent f7d87f3436
commit 24c994d5b2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
View File

@@ -258,6 +258,12 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
if (!isTaskRoot && intent.hasCategory(Intent.CATEGORY_LAUNCHER) && Intent.ACTION_MAIN == intent.action) {
Log.w(TAG, "Duplicate launcher intent received, finishing duplicate instance.")
finish()
return
}
AppStartup.getInstance().onCriticalRenderEventStart()
enableEdgeToEdge(
@@ -996,6 +1002,8 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
if (ConversationIntents.isConversationIntent(intent)) {
mainNavigationViewModel.goTo(MainNavigationListLocation.CHATS)
mainNavigationViewModel.goTo(MainNavigationDetailLocation.Chats.Conversation(ConversationIntents.readArgsFromBundle(intent.extras!!)))
intent.action = null
setIntent(intent)
}
}