diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-12-10 21:42:25 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-12-10 21:42:25 +0100 |
commit | c528e0ac5e6db450304a7eaf1aeb5ced47757d8e (patch) | |
tree | 1bc06bcb35a33680d49596472c98d34f69d08176 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
parent | 869a475235833392042097d78424f57fe9e82e09 (diff) |
possible fix for retry loop on pgp key annoucement
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 21d1953bc..1cbf8c1eb 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1174,7 +1174,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa (Config.supportOpenPgp() && account.isPgpDecryptionServiceConnected()) || Config.supportOtr()))) { if (ENCRYPTION_EXCEPTIONS.contains(conversation.getJid().toString()) || conversation.getJid().toString().equals(account.getJid().getDomainpart())) { - Log.d(Config.LOGTAG, "Don't show unenctrypted warning because " + conversation.getJid().toString() + " is on exception list"); hideSnackbar(); } else { showSnackbar(R.string.conversation_unencrypted_hint, R.string.ok, mHideUnencryptionHint, null); @@ -1534,7 +1533,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa return; } if (conversation.getAccount().getPgpSignature() == null) { - activity.announcePgp(conversation.getAccount(), conversation, activity.onOpenPGPKeyPublished); + activity.announcePgp(conversation.getAccount(), conversation, null, activity.onOpenPGPKeyPublished); return; } if (!mSendingPgpMessage.compareAndSet(false, true)) { |