mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

change title of lock icon when changing encryption

Browse source 
(cherry picked from commit 2de8f3d35b80fe476d9e579dcfd323e72789a802)
This commit is contained in:
Daniel Gultsch 2020-08-31 16:56:23 +02:00 • committed by Christian Schneppe
parent 7ecef1e07a
commit 4fc66ed040
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
View file

@ -136,16 +136,16 @@ public class ConversationMenuConfigurator {
none.setVisible(Config.supportUnencrypted() || conversation.getMode() == Conversation.MODE_MULTI);
axolotl.setVisible(Config.supportOmemo());
switch (conversation.getNextEncryption()) {
case Message.ENCRYPTION_NONE:
none.setChecked(true);
break;
case Message.ENCRYPTION_PGP:
menuSecure.setTitle(R.string.encrypted_with_openpgp);
pgp.setChecked(true);
break;
case Message.ENCRYPTION_AXOLOTL:
menuSecure.setTitle(R.string.encrypted_with_omemo);
axolotl.setChecked(true);
break;
default:
menuSecure.setTitle(R.string.not_encrypted);
none.setChecked(true);
break;
}

3
src/main/res/values/strings.xml
View file

@ -1049,4 +1049,7 @@
<string name="search_this_conversation">This conversation</string>
<string name="your_avatar">Your avatar</string>
<string name="avatar_for_x">Avatar for %s</string>
<string name="encrypted_with_omemo">Encrypted with OMEMO</string>
<string name="encrypted_with_openpgp">Encrypted with OpenPGP</string>
<string name="not_encrypted">Not encrypted</string>
</resources>