blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent ConversationActivity recipientId crash.

master
Greyson Parrelli 2019-10-01 08:17:25 -04:00
parent bf667c0cfc
commit 77ad1ea729
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -187,6 +187,7 @@ import org.thoughtcrime.securesms.recipients.LiveRecipient;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientExporter;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.search.model.MessageResult;
import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.sms.MessageSender;
@ -337,6 +338,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
protected void onCreate(Bundle state, boolean ready) {
Log.i(TAG, "onCreate()");
RecipientId recipientId = getIntent().getParcelableExtra(RECIPIENT_EXTRA);
if (recipientId == null) {
Log.w(TAG, "[onCreate] Missing recipientId!");
startActivity(new Intent(this, ConversationListActivity.class));
finish();
return;
}
setContentView(R.layout.conversation_activity);
TypedArray typedArray = obtainStyledAttributes(new int[] {R.attr.conversation_background});
@ -398,6 +409,15 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
silentlySetComposeText("");
}
RecipientId recipientId = intent.getParcelableExtra(RECIPIENT_EXTRA);
if (recipientId == null) {
Log.w(TAG, "[onNewIntent] Missing recipientId!");
startActivity(new Intent(this, ConversationListActivity.class));
finish();
return;
}
setIntent(intent);
initializeResources();
initializeSecurity(false, isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() {