diff options
| author | Christian S <christian@pix-art.de> | 2016-05-05 19:30:53 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-05 19:30:53 +0200 |
| commit | 27ccf4e08f2547f372196bf381915ed1e6204ad8 (patch) | |
| tree | 05749ea85a8421b77daf3c04d316c958895e3601 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 626d0d3260d792843bebf2a8b8a62c1a026dd314 (diff) | |
| parent | 6e0ec9b924173bd2afe3b87646e3b1f4e907b7c1 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 091f11a95..aad4467dc 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1199,7 +1199,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa return; } if (conversation.getAccount().getPgpSignature() == null) { - activity.announcePgp(conversation.getAccount(), conversation); + activity.announcePgp(conversation.getAccount(), conversation, activity.onOpenPGPKeyPublished); return; } if (conversation.getMode() == Conversation.MODE_SINGLE) { |