ReceiveKeyActivity -> ReceiveKeyDialog

Closes #3158
// FREEBIE
This commit is contained in:
Jake McGinty
2015-05-12 16:21:10 -07:00
committed by Moxie Marlinspike
parent fab2296927
commit fa39c23d44
8 changed files with 229 additions and 270 deletions

View File

@@ -370,17 +370,7 @@ public class ConversationItem extends LinearLayout {
/// Event handlers
private void handleKeyExchangeClicked() {
Intent intent = new Intent(context, ReceiveKeyActivity.class);
intent.putExtra("recipient", messageRecord.getIndividualRecipient().getRecipientId());
intent.putExtra("recipient_device_id", messageRecord.getRecipientDeviceId());
intent.putExtra("body", messageRecord.getBody().getBody());
intent.putExtra("thread_id", messageRecord.getThreadId());
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("sent", messageRecord.isOutgoing());
context.startActivity(intent);
ReceiveKeyDialog.build(context, masterSecret, messageRecord).show();
}
private class ThumbnailClickListener implements ThumbnailView.ThumbnailClickListener {