sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change title of lock icon when changing encryption

This commit is contained in:
Daniel Gultsch 2020-08-31 16:56:23 +02:00
parent 97fe9fa01f
commit 2de8f3d35b
2 changed files with 6 additions and 4 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

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

4
src/main/res/values/strings.xml
View File

@ -8,7 +8,6 @@
<string name="action_contact_details">Contact details</string> <string name="action_contact_details">Contact details</string>
<string name="action_muc_details">Group chat details</string> <string name="action_muc_details">Group chat details</string>
<string name="channel_details">Channel details</string> <string name="channel_details">Channel details</string>
<string name="action_secure">Secure conversation</string>
<string name="action_add_account">Add account</string> <string name="action_add_account">Add account</string>
<string name="action_edit_contact">Edit name</string> <string name="action_edit_contact">Edit name</string>
<string name="action_add_phone_book">Add to address book</string> <string name="action_add_phone_book">Add to address book</string>
@ -931,6 +930,9 @@
<string name="search_this_conversation">This conversation</string> <string name="search_this_conversation">This conversation</string>
<string name="your_avatar">Your avatar</string> <string name="your_avatar">Your avatar</string>
<string name="avatar_for_x">Avatar for %s</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>
<plurals name="view_users"> <plurals name="view_users">
<item quantity="one">View %1$d Participant</item> <item quantity="one">View %1$d Participant</item>
<item quantity="other">View %1$d Participants</item> <item quantity="other">View %1$d Participants</item>