unified crypto messages and made lock icon work for conferences

3 files changed, 18 insertions, 23 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d0f68fdd..e80de86f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -60,7 +60,7 @@
     <string name="save">Save</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="ok">Ok</string>
+    <string name="ok">OK</string>
     <string name="done">Done</string>
     <string name="hide">Hide</string>
     <string name="create_invite">Create \u0026 Invite</string>
@@ -89,7 +89,6 @@
     <string name="delete_messages">Delete messages</string>
     <string name="also_end_conversation">End this conversations afterwards</string>
     <string name="choose_presence">Choose presence to contact</string>
-    <string name="send_message_to_conference">Send message to conference</string>
     <string name="send_plain_text_message">Send plain text message</string>
     <string name="send_otr_message">Send OTR encrypted message</string>
     <string name="send_pgp_message">Send OpenPGP encrypted message</string>
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index fbb08e71..05120a41 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -321,16 +321,16 @@ public class ConversationActivity extends XmppActivity {
 			((MenuItem) menu.findItem(R.id.action_add)).setVisible(!spl
 					.isSlideable());
 			if (this.getSelectedConversation() != null) {
+				if (this.getSelectedConversation().getLatestMessage()
+						.getEncryption() != Message.ENCRYPTION_NONE) {
+					menuSecure.setIcon(R.drawable.ic_action_secure);
+				}
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
 					menuContactDetails.setVisible(false);
 					menuAttach.setVisible(false);
 				} else {
 					menuMucDetails.setVisible(false);
 					menuInviteContacts.setVisible(false);
-					if (this.getSelectedConversation().getLatestMessage()
-							.getEncryption() != Message.ENCRYPTION_NONE) {
-						menuSecure.setIcon(R.drawable.ic_action_secure);
-					}
 				}
 			}
 		}
@@ -539,7 +539,7 @@ public class ConversationActivity extends XmppActivity {
 				popup.inflate(R.menu.encryption_choices);
 				MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr);
 				if (conversation.getMode() == Conversation.MODE_MULTI) {
-					otr.setVisible(false);
+					otr.setEnabled(false);
 				}
 				switch (conversation.getNextEncryption()) {
 				case Message.ENCRYPTION_NONE:
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index f23a6bfe..7d82dcd4 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -124,22 +124,18 @@ public class ConversationFragment extends Fragment {
 	}
 
 	public void updateChatMsgHint() {
-		if (conversation.getMode() == Conversation.MODE_MULTI) {
-			chatMsg.setHint(getString(R.string.send_message_to_conference));
-		} else {
-			switch (conversation.getNextEncryption()) {
-			case Message.ENCRYPTION_NONE:
-				chatMsg.setHint(getString(R.string.send_plain_text_message));
-				break;
-			case Message.ENCRYPTION_OTR:
-				chatMsg.setHint(getString(R.string.send_otr_message));
-				break;
-			case Message.ENCRYPTION_PGP:
-				chatMsg.setHint(getString(R.string.send_pgp_message));
-				break;
-			default:
-				break;
-			}
+		switch (conversation.getNextEncryption()) {
+		case Message.ENCRYPTION_NONE:
+			chatMsg.setHint(getString(R.string.send_plain_text_message));
+			break;
+		case Message.ENCRYPTION_OTR:
+			chatMsg.setHint(getString(R.string.send_otr_message));
+			break;
+		case Message.ENCRYPTION_PGP:
+			chatMsg.setHint(getString(R.string.send_pgp_message));
+			break;
+		default:
+			break;
 		}
 	}