Correctly handle key conflict resolution for incoming push.

This commit is contained in:
Moxie Marlinspike
2014-02-22 14:22:12 -08:00
parent 315cf2d8e4
commit 125a60290f
3 changed files with 46 additions and 15 deletions

View File

@@ -354,6 +354,7 @@ public class ConversationItem extends LinearLayout {
intent.putExtra("message_id", messageRecord.getId());
intent.putExtra("is_bundle", messageRecord.isBundleKeyExchange());
intent.putExtra("is_identity_update", messageRecord.isIdentityUpdate());
intent.putExtra("is_push", messageRecord.isPush());
intent.putExtra("master_secret", masterSecret);
intent.putExtra("sent", messageRecord.isOutgoing());
context.startActivity(intent);