Temporarily bring back end session.

fork-5.53.8
Moxie Marlinspike 2014-02-25 17:38:55 -08:00
rodzic ce710b378f
commit 82df23dd41
1 zmienionych plików z 2 dodań i 3 usunięć

Wyświetl plik

@ -270,9 +270,8 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
} else { } else {
inflater.inflate(R.menu.conversation_secure_no_identity, menu); 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) { } else if (isSingleConversation() && !pushRegistered) {
inflater.inflate(R.menu.conversation_insecure, menu); inflater.inflate(R.menu.conversation_insecure, menu);
} }