mirror of
https://github.com/oxen-io/session-android.git
synced 2025-04-24 15:21:32 +00:00
Temporarily bring back end session.
This commit is contained in:
parent
ce710b378f
commit
82df23dd41
@ -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);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user