aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-02-09 16:01:30 +0100
committeriNPUTmice <daniel@gultsch.de>2015-02-09 16:01:30 +0100
commit026be61b7290829899a685c119f8924550386494 (patch)
tree005fea8f9c4965a3df7931832549666609ad127c /src/main
parent16dc13e4dfd2995da3213f7197de63ac97d74d56 (diff)
don't show 'enter pgp key' in non encrypted chats
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 35f5fdac..f4093ef2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -568,6 +568,7 @@ public class ConversationFragment extends Fragment {
this.conversation.trim();
}
this.activity = (ConversationActivity) getActivity();
+ this.askForPassphraseIntent = null;
this.conversation = conversation;
this.mDecryptJobRunning = false;
this.mEncryptedMessages.clear();