aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-03 14:25:54 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-03 14:25:54 +0200
commit9d2d853e1b3b1f167be16ffe53530cbe83790ad1 (patch)
tree30bf686e174538b523343c7e90699d487da9aaf8 /src
parent24d6e8615c4a21b8a3ea5f09e1006029d5aaa09e (diff)
fixed #27
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java6
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java3
-rw-r--r--src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java6
3 files changed, 13 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 122c8eee..e505bb41 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -468,7 +468,11 @@ public class ManageAccountActivity extends XmppActivity {
try {
xmppConnectionService.generatePgpAnnouncement(selectedAccountForActionMode);
} catch (UserInputRequiredException e) {
- Log.d("gultsch","already came back. ignoring");
+ try {
+ startIntentSenderForResult(e.getPendingIntent().getIntentSender(), REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
+ } catch (SendIntentException e1) {
+ Log.d(LOGTAG,"sending intent failed");
+ }
}
}
}
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 01a024dc..e50ccd05 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -583,7 +583,8 @@ public class XmppConnection implements Runnable {
.getContent().split("/")[1];
account.setResource(resource);
if (streamFeatures.hasChild("sm")) {
- EnablePacket enable = new EnablePacket();
+ String xmlns = streamFeatures.findChild("sm").getAttribute("xmlns");
+ EnablePacket enable = new EnablePacket(xmlns);
tagWriter.writeStanzaAsync(enable);
}
sendInitialPresence();
diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
index ae6a513a..f6a0adb2 100644
--- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
+++ b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
@@ -9,5 +9,11 @@ public class EnablePacket extends AbstractStanza {
this.setAttribute("xmlns","urn:xmpp:sm:3");
this.setAttribute("resume", "true");
}
+
+ public EnablePacket(String xmlns) {
+ super("enable");
+ this.setAttribute("xmlns",xmlns);
+ this.setAttribute("resume", "true");
+ }
}