Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-06 13:31:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Guard against null intent extras in MainActivity conversation handling.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-06-26 15:21:10 +00:00
committed by jeffrey-signal
parent b652e2d5f9
commit 1560be0300
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+9 -1
View File
@@ -1061,8 +1061,16 @@ class MainActivity :
return
}
val extras = intent.extras
if (extras == null) {
Log.w(TAG, "Received a conversation intent with no extras. Ignoring it.")
intent.action = null
setIntent(intent)
return
}
mainNavigationViewModel.goTo(MainNavigationListLocation.CHATS)
mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(intent.extras!!)))
mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(extras)))
intent.action = null
setIntent(intent)
}