aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-12-10 21:42:25 +0100
committerChristian Schneppe <christian@pix-art.de>2017-12-10 21:42:25 +0100
commitc528e0ac5e6db450304a7eaf1aeb5ced47757d8e (patch)
tree1bc06bcb35a33680d49596472c98d34f69d08176 /src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java
parent869a475235833392042097d78424f57fe9e82e09 (diff)
possible fix for retry loop on pgp key annoucement
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java b/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java
index c57f1e3ea..18d28914e 100644
--- a/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java
@@ -94,7 +94,7 @@ public class SetPresenceActivity extends XmppActivity implements View.OnClickLis
if (resultCode == RESULT_OK) {
if (xmppConnectionServiceBound && mAccount != null) {
if (requestCode == REQUEST_ANNOUNCE_PGP) {
- announcePgp(mAccount, null, onPresenceChanged);
+ announcePgp(mAccount, null, data, onPresenceChanged);
}
this.mPostponedActivityResult = null;
} else {
@@ -116,7 +116,7 @@ public class SetPresenceActivity extends XmppActivity implements View.OnClickLis
finish();
} else {
xmppConnectionService.changeStatus(mAccount, status, statusMessage, false);
- announcePgp(mAccount, null, onPresenceChanged);
+ announcePgp(mAccount, null, null, onPresenceChanged);
}
}
}