From e277f9f6d1abb2cddd63e259219c639e6b2ed239 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Mon, 29 Dec 2014 11:43:10 -0800 Subject: [PATCH] fix some missing recipient parcel bugs // FREEBIE --- src/org/thoughtcrime/securesms/AutoInitiateActivity.java | 3 ++- src/org/thoughtcrime/securesms/VerifyIdentityActivity.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/AutoInitiateActivity.java b/src/org/thoughtcrime/securesms/AutoInitiateActivity.java index 8b64f29a67..d0d7bbcb14 100644 --- a/src/org/thoughtcrime/securesms/AutoInitiateActivity.java +++ b/src/org/thoughtcrime/securesms/AutoInitiateActivity.java @@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore; import org.thoughtcrime.securesms.protocol.Tag; import org.thoughtcrime.securesms.recipients.Recipient; +import org.thoughtcrime.securesms.recipients.RecipientFactory; import org.thoughtcrime.securesms.util.MemoryCleaner; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.libaxolotl.state.SessionStore; @@ -65,7 +66,7 @@ public class AutoInitiateActivity extends Activity { private void initializeResources() { this.threadId = this.getIntent().getLongExtra("threadId", -1); - this.recipient = this.getIntent().getParcelableExtra("recipient"); + this.recipient = RecipientFactory.getRecipientForId(this, this.getIntent().getLongExtra("recipient", -1), true); this.masterSecret = this.getIntent().getParcelableExtra("masterSecret"); ((Button)findViewById(R.id.initiate_button)).setOnClickListener(new OkListener()); diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java index 5f3143aaeb..cec8803011 100644 --- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore; import org.thoughtcrime.securesms.recipients.Recipient; +import org.thoughtcrime.securesms.recipients.RecipientFactory; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.MemoryCleaner; @@ -113,7 +114,7 @@ public class VerifyIdentityActivity extends KeyScanningActivity { private void initializeResources() { this.localIdentityFingerprint = (TextView)findViewById(R.id.you_read); this.remoteIdentityFingerprint = (TextView)findViewById(R.id.friend_reads); - this.recipient = this.getIntent().getParcelableExtra("recipient"); + this.recipient = RecipientFactory.getRecipientForId(this, this.getIntent().getLongExtra("recipient", -1), true); this.masterSecret = this.getIntent().getParcelableExtra("master_secret"); }