TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-21 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable RecipientPreferenceActivity transition from QR popup.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-07-01 08:24:47 -07:00
parent 7cdc26a8ba
commit eacfca37f2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -149,7 +149,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private AnimatingToggle buttonToggle; private AnimatingToggle buttonToggle;
private SendButton sendButton; private SendButton sendButton;
private ImageButton attachButton; private ImageButton attachButton;
private ConversationTitleView titleView; protected ConversationTitleView titleView;
private TextView charactersLeft; private TextView charactersLeft;
private ConversationFragment fragment; private ConversationFragment fragment;
private Button unblockButton; private Button unblockButton;

2
src/org/thoughtcrime/securesms/ConversationPopupActivity.java
View File

@ -47,6 +47,8 @@ public class ConversationPopupActivity extends ConversationActivity {
else getWindow().setLayout((int) (width * .7), (int) (height * .75)); else getWindow().setLayout((int) (width * .7), (int) (height * .75));
super.onCreate(bundle, masterSecret); super.onCreate(bundle, masterSecret);
titleView.setOnClickListener(null);
} }
@Override @Override