diff options
| -rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java | 28 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 41 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
3 files changed, 71 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java index 3ebc6e06f..4e293c9a1 100644 --- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java @@ -647,14 +647,38 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded { }); } + public enum AxolotlCapability { + FULL, + MISSING_PRESENCE, + MISSING_KEYS, + WRONG_CONFIGURATION, + NO_MEMBERS + } + public boolean isConversationAxolotlCapable(Conversation conversation) { + return isConversationAxolotlCapableDetailed(conversation).first == AxolotlCapability.FULL; + } + + public Pair<AxolotlCapability,Jid> isConversationAxolotlCapableDetailed(Conversation conversation) { final List<Jid> jids = getCryptoTargets(conversation); for(Jid jid : jids) { if (!hasAny(jid) && (!deviceIds.containsKey(jid) || deviceIds.get(jid).isEmpty())) { - return false; + if (conversation.getAccount().getRoster().getContact(jid).trusted()) { + return new Pair<>(AxolotlCapability.MISSING_KEYS,jid); + } else { + return new Pair<>(AxolotlCapability.MISSING_PRESENCE,jid); + } + } + } + if (jids.size() > 0) { + return new Pair<>(AxolotlCapability.FULL, null); + } else { + if (conversation.getMucOptions().membersOnly() && conversation.getMucOptions().nonanonymous()) { + return new Pair<>(AxolotlCapability.NO_MEMBERS, null); + } else { + return new Pair<>(AxolotlCapability.WRONG_CONFIGURATION, null); } } - return jids.size() > 0; } public List<Jid> getCryptoTargets(Conversation conversation) { diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index 5104cb9a8..fde924e1a 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -23,6 +23,7 @@ import android.media.ExifInterface; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.provider.MediaStore; import android.provider.Settings; import android.support.v4.widget.SlidingPaneLayout; @@ -83,6 +84,8 @@ import de.pixart.messenger.xmpp.jid.InvalidJidException; import de.pixart.messenger.xmpp.jid.Jid; import de.timroes.android.listview.EnhancedListView; +import static eu.siacs.conversations.crypto.axolotl.AxolotlService.AxolotlCapability.MISSING_PRESENCE; + public class ConversationActivity extends XmppActivity implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, View.OnClickListener { @@ -588,9 +591,47 @@ public class ConversationActivity extends XmppActivity } } } + if (Config.supportOmemo()) { + new Handler().post(new Runnable() { + @Override + public void run() { + View view = findViewById(R.id.action_security); + if (view != null) { + view.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + return quickOmemoDebugger(getSelectedConversation()); + } + }); + } + } + }); + } return super.onCreateOptionsMenu(menu); } + private boolean quickOmemoDebugger(Conversation c) { + if (c != null) { + AxolotlService axolotlService = c.getAccount().getAxolotlService(); + Pair<AxolotlService.AxolotlCapability,Jid> capabilityJidPair = axolotlService.isConversationAxolotlCapableDetailed(c); + switch (capabilityJidPair.first) { + case MISSING_PRESENCE: + Toast.makeText(ConversationActivity.this,getString(R.string.missing_presence_subscription_with_x,capabilityJidPair.second.toBareJid().toString()),Toast.LENGTH_SHORT).show(); + return true; + case MISSING_KEYS: + Toast.makeText(ConversationActivity.this,getString(R.string.missing_keys_from_x,capabilityJidPair.second.toBareJid().toString()),Toast.LENGTH_SHORT).show(); + return true; + case WRONG_CONFIGURATION: + Toast.makeText(ConversationActivity.this,R.string.wrong_conference_configuration, Toast.LENGTH_SHORT).show(); + return true; + case NO_MEMBERS: + Toast.makeText(ConversationActivity.this,R.string.this_conference_has_no_members, Toast.LENGTH_SHORT).show(); + return true; + } + } + return false; + } + protected void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) { final Conversation conversation = getSelectedConversation(); final Account account = conversation.getAccount(); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bee62ccc6..452b58535 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -699,4 +699,8 @@ <string name="remote_server_not_found">Remote server not found</string> <string name="error_file_corrupt">This file seems to be corrupt.</string> <string name="unable_to_update_account">Unable to update account</string> + <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string> + <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string> + <string name="wrong_conference_configuration">This is not a private, non-anonymous conference.</string> + <string name="this_conference_has_no_members">There are no members in this conference.</string> </resources> |