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

avoid npe when checking for stream restart

This commit is contained in:
Daniel Gultsch 2015-10-29 14:38:35 +01:00
parent c7ff196f58
commit ef7857ac8d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -360,7 +360,8 @@ public class XmppConnection implements Runnable {
String.valueOf(saslMechanism.getPriority())); String.valueOf(saslMechanism.getPriority()));
tagReader.reset(); tagReader.reset();
sendStartStream(); sendStartStream();
if (tagReader.readTag().isStart("stream")) { final Tag tag = tagReader.readTag();
if (tag != null && tag.isStart("stream")) {
processStream(); processStream();
} else { } else {
throw new IOException("server didn't restart stream after successful auth"); throw new IOException("server didn't restart stream after successful auth");
@ -647,7 +648,8 @@ public class XmppConnection implements Runnable {
sendStartStream(); sendStartStream();
Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": TLS connection established"); Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": TLS connection established");
features.encryptionEnabled = true; features.encryptionEnabled = true;
if (tagReader.readTag().isStart("stream")) { final Tag tag = tagReader.readTag();
if (tag != null && tag.isStart("stream")) {
processStream(); processStream();
} else { } else {
throw new IOException("server didn't restart stream after STARTTLS"); throw new IOException("server didn't restart stream after STARTTLS");