narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed #27

Browse source
This commit is contained in:
Daniel Gultsch 2014-04-03 14:25:54 +02:00
parent 24d6e8615c
commit 9d2d853e1b
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/eu/siacs/conversations/ui/ManageAccountActivity.java
View file

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

3
src/eu/siacs/conversations/xmpp/XmppConnection.java
View file

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

6
src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
View file

@ -10,4 +10,10 @@ public class EnablePacket extends AbstractStanza {
this.setAttribute("resume", "true");
}
public EnablePacket(String xmlns) {
super("enable");
this.setAttribute("xmlns",xmlns);
this.setAttribute("resume", "true");
}
}