fixed #27

Daniel Gultsch created 12 years ago

Change summary

src/eu/siacs/conversations/ui/ManageAccountActivity.java             | 6 
src/eu/siacs/conversations/xmpp/XmppConnection.java                  | 3 
src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java | 6 
3 files changed, 13 insertions(+), 2 deletions(-)

Detailed changes

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");
+					}
 				}
 			 }
 		 }

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();

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");
+	}
 
 }