Temporarily bring back end session.
This commit is contained in:
parent
ce710b378f
commit
82df23dd41
1 changed files with 2 additions and 3 deletions
|
@ -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…
Add table
Reference in a new issue