aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/XmppConnection.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-16 12:18:04 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-16 12:18:04 +0200
commitb9477edb53ff2462e6ad5f4ac260a3d8cb38c412 (patch)
tree5d42823968ea7fa92a0a70f1548607552877b459 /src/eu/siacs/conversations/xmpp/XmppConnection.java
parente6b5713c125c65dc152ce1439c3c0fd0091f3820 (diff)
cleanup; removed unnecessary imports and log outputs
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/XmppConnection.java')
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 4ac61ca7..f2c0962a 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -17,7 +17,6 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -241,7 +240,7 @@ public class XmppConnection implements Runnable {
processStream(tagReader.readTag());
break;
} else if (nextTag.isStart("failure")) {
- Element failure = tagReader.readElement(nextTag);
+ tagReader.readElement(nextTag);
changeStatus(Account.STATUS_UNAUTHORIZED);
} else if (nextTag.isStart("challenge")) {
String challange = tagReader.readElement(nextTag).getContent();
@@ -442,17 +441,14 @@ public class XmppConnection implements Runnable {
private void switchOverToTls(Tag currentTag) throws XmlPullParserException,
IOException {
- Tag nextTag = tagReader.readTag(); // should be proceed end tag
+ tagReader.readTag();
try {
SSLContext sc = SSLContext.getInstance("TLS");
TrustManagerFactory tmf = TrustManagerFactory
.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- // Initialise the TMF as you normally would, for example:
- // tmf.in
try {
tmf.init((KeyStore) null);
} catch (KeyStoreException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}