Temporarily bring back end session.

pull/1/head
Moxie Marlinspike 11 years ago
parent ce710b378f
commit 82df23dd41

@ -270,9 +270,8 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
} else {
inflater.inflate(R.menu.conversation_secure_no_identity, menu);
}
if (!pushRegistered) {
inflater.inflate(R.menu.conversation_secure_sms, menu.findItem(R.id.menu_security).getSubMenu());
}
inflater.inflate(R.menu.conversation_secure_sms, menu.findItem(R.id.menu_security).getSubMenu());
} else if (isSingleConversation() && !pushRegistered) {
inflater.inflate(R.menu.conversation_insecure, menu);
}

Loading…
Cancel
Save