ReceiveKeyActivity -> ReceiveKeyDialog

// FREEBIE

AndroidManifest.xml

@@ -174,10 +174,6 @@
               android:label="@string/AndroidManifest__verify_identity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ReceiveKeyActivity"
-              android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".ApplicationPreferencesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 

res/layout/receive_key_dialog.xml

@@ -0,0 +1,12 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent">
+
+    <TextView style="@style/Registration.Description"
+              android:id="@+id/description_text"
+              android:layout_width="fill_parent"
+              android:layout_marginBottom="16dip"
+              android:layout_marginTop="16dip"/>
+</FrameLayout>
+
+

res/values/strings.xml

@@ -570,8 +570,8 @@
     <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
     <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once.</string>
 
-    <!-- receive_key_activity -->
-    <string name="receive_key_activity__complete">Complete</string>
+    <!-- receive_key_dialog -->
+    <string name="receive_key_dialog__complete">Complete</string>
 
     <!-- registration_activity -->
     <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -370,17 +370,7 @@ private void setContactPhotoForRecipient(final Recipient recipient) {
   /// 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 {