TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 17:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not crash if RECIPIENT_EXTRA is null.

Browse Source
This commit is contained in:
Alex Hart
2020-11-24 13:22:41 -04:00
parent 65e88d2d1c
commit 1f5364f01d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -434,9 +434,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
@Override @Override
protected void onCreate(Bundle state, boolean ready) { protected void onCreate(Bundle state, boolean ready) {
RecipientId recipientId = getRecipientId(getIntent()); if (getIntent().getStringExtra(RECIPIENT_EXTRA) == null) {
if (recipientId == null) {
Log.w(TAG, "[onCreate] Missing recipientId!"); Log.w(TAG, "[onCreate] Missing recipientId!");
// TODO [greyson] Navigation // TODO [greyson] Navigation
startActivity(new Intent(this, MainActivity.class)); startActivity(new Intent(this, MainActivity.class));
@@ -444,6 +442,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
return; return;
} }
RecipientId recipientId = getRecipientId(getIntent());
reportShortcutLaunch(recipientId); reportShortcutLaunch(recipientId);
setContentView(R.layout.conversation_activity); setContentView(R.layout.conversation_activity);