From eacfca37f272203491df1cda627ca7b625331088 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 1 Jul 2015 08:24:47 -0700
Subject: [PATCH] Disable RecipientPreferenceActivity transition from QR popup.

// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationActivity.java      | 2 +-
 src/org/thoughtcrime/securesms/ConversationPopupActivity.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 9959f2cb84..649677a537 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -149,7 +149,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   AnimatingToggle       buttonToggle;
   private   SendButton            sendButton;
   private   ImageButton           attachButton;
-  private   ConversationTitleView titleView;
+  protected ConversationTitleView titleView;
   private   TextView              charactersLeft;
   private   ConversationFragment  fragment;
   private   Button                unblockButton;
diff --git a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java
index 75c17aa262..0c96550c23 100644
--- a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java
@@ -47,6 +47,8 @@ public class ConversationPopupActivity extends ConversationActivity {
     else                getWindow().setLayout((int) (width * .7), (int) (height * .75));
 
     super.onCreate(bundle, masterSecret);
+
+    titleView.setOnClickListener(null);
   }
 
   @Override