narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

unified crypto messages and made lock icon work for conferences

Browse source
This commit is contained in:
iNPUTmice 2014-06-01 19:08:42 +02:00
parent 8ea73feec4
commit 32a21e1ab9
3 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/values/strings.xml
View file

@ -60,7 +60,7 @@
<string name="save">Save</string> <string name="save">Save</string>
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="no">No</string> <string name="no">No</string>
<string name="ok">Ok</string> <string name="ok">OK</string>
<string name="done">Done</string> <string name="done">Done</string>
<string name="hide">Hide</string> <string name="hide">Hide</string>
<string name="create_invite">Create \u0026 Invite</string> <string name="create_invite">Create \u0026 Invite</string>
@ -89,7 +89,6 @@
<string name="delete_messages">Delete messages</string> <string name="delete_messages">Delete messages</string>
<string name="also_end_conversation">End this conversations afterwards</string> <string name="also_end_conversation">End this conversations afterwards</string>
<string name="choose_presence">Choose presence to contact</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_plain_text_message">Send plain text message</string>
<string name="send_otr_message">Send OTR encrypted message</string> <string name="send_otr_message">Send OTR encrypted message</string>
<string name="send_pgp_message">Send OpenPGP encrypted message</string> <string name="send_pgp_message">Send OpenPGP encrypted message</string>

10
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -321,16 +321,16 @@ public class ConversationActivity extends XmppActivity {
((MenuItem) menu.findItem(R.id.action_add)).setVisible(!spl ((MenuItem) menu.findItem(R.id.action_add)).setVisible(!spl
.isSlideable()); .isSlideable());
if (this.getSelectedConversation() != null) { 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) { if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
menuContactDetails.setVisible(false); menuContactDetails.setVisible(false);
menuAttach.setVisible(false); menuAttach.setVisible(false);
} else { } else {
menuMucDetails.setVisible(false); menuMucDetails.setVisible(false);
menuInviteContacts.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); popup.inflate(R.menu.encryption_choices);
MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr); MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr);
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
otr.setVisible(false); otr.setEnabled(false);
} }
switch (conversation.getNextEncryption()) { switch (conversation.getNextEncryption()) {
case Message.ENCRYPTION_NONE: case Message.ENCRYPTION_NONE:

4
src/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -124,9 +124,6 @@ public class ConversationFragment extends Fragment {
} }
public void updateChatMsgHint() { public void updateChatMsgHint() {
if (conversation.getMode() == Conversation.MODE_MULTI) {
chatMsg.setHint(getString(R.string.send_message_to_conference));
} else {
switch (conversation.getNextEncryption()) { switch (conversation.getNextEncryption()) {
case Message.ENCRYPTION_NONE: case Message.ENCRYPTION_NONE:
chatMsg.setHint(getString(R.string.send_plain_text_message)); chatMsg.setHint(getString(R.string.send_plain_text_message));
@ -141,7 +138,6 @@ public class ConversationFragment extends Fragment {
break; break;
} }
} }
}
@Override @Override
public View onCreateView(final LayoutInflater inflater, public View onCreateView(final LayoutInflater inflater,