empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix "end session" inflation

Browse source 
// FREEBIE
This commit is contained in:
Jake McGinty 2014-02-21 19:05:18 -08:00
parent 056dbd1a4e
commit 8794661433
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/menu/conversation_secure_sms.xml
View file

@ -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>
</menu>

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -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);