sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaned up log output a little bit

This commit is contained in:
Daniel Gultsch 2014-04-05 11:59:18 +02:00
parent c445b8f4ae
commit 83a23ad3b1
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1070,7 +1070,6 @@ public class XmppConnectionService extends Service {
x.addChild("history").setAttribute("seconds", diff + ""); x.addChild("history").setAttribute("seconds", diff + "");
} }
packet.addChild(x); packet.addChild(x);
Log.d(LOGTAG,conversation.getAccount().getJid()+": joining muc "+packet.toString());
conversation.getAccount().getXmppConnection() conversation.getAccount().getXmppConnection()
.sendPresencePacket(packet); .sendPresencePacket(packet);
} }

7
src/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -395,9 +395,6 @@ public class XmppConnection implements Runnable {
private void switchOverToZLib(Tag currentTag) throws XmlPullParserException, private void switchOverToZLib(Tag currentTag) throws XmlPullParserException,
IOException, NoSuchAlgorithmException { IOException, NoSuchAlgorithmException {
Log.d(LOGTAG,account.getJid()+": Starting zlib compressed stream");
tagReader.readTag(); // read tag close tagReader.readTag(); // read tag close
tagWriter.setOutputStream(new ZLibOutputStream(tagWriter.getOutputStream())); tagWriter.setOutputStream(new ZLibOutputStream(tagWriter.getOutputStream()));
@ -535,13 +532,12 @@ public class XmppConnection implements Runnable {
sendSaslAuthDigestMd5(); sendSaslAuthDigestMd5();
} }
} else if (this.streamFeatures.hasChild("sm") && streamId != null) { } else if (this.streamFeatures.hasChild("sm") && streamId != null) {
Log.d(LOGTAG,"found old stream id. trying to remuse");
ResumePacket resume = new ResumePacket(this.streamId,stanzasReceived); ResumePacket resume = new ResumePacket(this.streamId,stanzasReceived);
this.tagWriter.writeStanzaAsync(resume); this.tagWriter.writeStanzaAsync(resume);
} else if (this.streamFeatures.hasChild("bind") && shouldBind) { } else if (this.streamFeatures.hasChild("bind") && shouldBind) {
sendBindRequest(); sendBindRequest();
if (this.streamFeatures.hasChild("session")) { if (this.streamFeatures.hasChild("session")) {
Log.d(LOGTAG,"sending session"); Log.d(LOGTAG,account.getJid()+": sending deprecated session");
IqPacket startSession = new IqPacket(IqPacket.TYPE_SET); IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("") startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("")
this.sendIqPacket(startSession, null); this.sendIqPacket(startSession, null);
@ -559,7 +555,6 @@ public class XmppConnection implements Runnable {
if (!"method".equals(child.getName())) continue; if (!"method".equals(child.getName())) continue;
if ("zlib".equalsIgnoreCase(child.getContent())) { if ("zlib".equalsIgnoreCase(child.getContent())) {
Log.d(LOGTAG, account.getJid() + ": compression available");
return true; return true;
} }
} }