kopia lustrzana https://github.com/ryukoposting/Signal-Android
rodzic
056dbd1a4e
commit
8794661433
|
@ -1,13 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:title="@string/conversation_secure_verified__menu_security"
|
||||
android:id="@+id/menu_security"
|
||||
android:icon="?menu_lock_icon"
|
||||
android:showAsAction="ifRoom">
|
||||
<menu>
|
||||
<item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
|
||||
android:id="@+id/menu_abort_session"/>
|
||||
|
||||
</menu>
|
||||
</item>
|
||||
<item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
|
||||
android:id="@+id/menu_abort_session"/>
|
||||
</menu>
|
|
@ -269,7 +269,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
|
|||
inflater.inflate(R.menu.conversation_secure_no_identity, menu);
|
||||
}
|
||||
if (!pushRegistered) {
|
||||
inflater.inflate(R.menu.conversation_secure_sms, menu);
|
||||
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);
|
||||
|
|
Ładowanie…
Reference in New Issue