aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-09 21:25:01 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-09 21:25:01 +0200
commit28b7a6c92a48ba80c3c0d8830b28da11c46b0e2c (patch)
treeead87e7ea24b00b8b889de64eb2f74f2297de1e7 /src/eu/siacs/conversations/ui/ConversationActivity.java
parentd0a338f81406faf902e1f37fb176890cc123026c (diff)
don't display 'enter password' message if OpenKeychain is not installed. made status messages in chat not selectable
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 0c9c154fb..36339bf4e 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -434,6 +434,8 @@ public class ConversationActivity extends XmppActivity {
});
}
}
+ } else {
+ showInstallPgpDialog();
}
} else if (getSelectedConversation().getNextEncryption() == Message.ENCRYPTION_NONE) {
selectPresenceToAttachFile(attachmentChoice);
@@ -568,6 +570,8 @@ public class ConversationActivity extends XmppActivity {
announcePgp(conversation.getAccount(),
conversation);
}
+ } else {
+ showInstallPgpDialog();
}
break;
default: