From 2de8f3d35b80fe476d9e579dcfd323e72789a802 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 31 Aug 2020 16:56:23 +0200
Subject: [PATCH] change title of lock icon when changing encryption

---
 .../conversations/ui/util/ConversationMenuConfigurator.java | 6 +++---
 src/main/res/values/strings.xml                             | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
index 98986e03a..24bbdd7c7 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
@@ -112,16 +112,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;
 		}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c04115ff6..71eb76f58 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_contact_details">Contact details</string>
     <string name="action_muc_details">Group chat 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_edit_contact">Edit name</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="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>
     <plurals name="view_users">
         <item quantity="one">View %1$d Participant</item>
         <item quantity="other">View %1$d Participants</item>