aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-19 11:08:17 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-20 21:03:29 +0200
commit4cc006bf3a6d1d33f940a0a7b6038701cc4aaad7 (patch)
treec7c8d55d1c0a97df053fdffa644f7529a46871ab /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parent85cd21c33ef62ecffaa43dc9e19803e7679888fd (diff)
display toast on pgp error
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index c09b96899..b34c22b71 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -713,7 +713,7 @@ public class ConversationActivity extends XmppActivity
@Override
public void error(int error, Contact contact) {
- displayErrorDialog(error);
+ replaceToast(getString(error));
}
});
} else if (mode == Conversation.MODE_MULTI && conversation.getMucOptions().pgpKeysInUse()) {
@@ -1673,8 +1673,7 @@ public class ConversationActivity extends XmppActivity
@Override
public void error(int errorCode, Message message) {
- hidePrepareFileToast(prepareFileToast);
- displayErrorDialog(errorCode);
+ replaceToast(getString(errorCode));
}
@Override
@@ -1706,8 +1705,7 @@ public class ConversationActivity extends XmppActivity
@Override
public void error(int error, Message message) {
- hidePrepareFileToast(prepareFileToast);
- displayErrorDialog(error);
+ replaceToast(getString(error));
}
});
}