From 32c3dd4f4ada85b48551bcf7e17eafb63857237f Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 15 Aug 2014 17:31:24 +0200
Subject: moved add/edit account from dialog into seperate activity

---
 src/eu/siacs/conversations/xmpp/XmppConnection.java | 5 -----
 src/eu/siacs/conversations/xmpp/pep/Avatar.java     | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/eu/siacs/conversations/xmpp')

diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index c83f39a8d..8e93a91d1 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -221,11 +221,6 @@ public class XmppConnection implements Runnable {
 				processStreamError(nextTag);
 			} else if (nextTag.isStart("features")) {
 				processStreamFeatures(nextTag);
-				if ((streamFeatures.getChildren().size() == 1)
-						&& (streamFeatures.hasChild("starttls"))
-						&& (!account.isOptionSet(Account.OPTION_USETLS))) {
-					changeStatus(Account.STATUS_SERVER_REQUIRES_TLS);
-				}
 			} else if (nextTag.isStart("proceed")) {
 				switchOverToTls(nextTag);
 			} else if (nextTag.isStart("compressed")) {
diff --git a/src/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/eu/siacs/conversations/xmpp/pep/Avatar.java
index b99a2fe36..6d5c14314 100644
--- a/src/eu/siacs/conversations/xmpp/pep/Avatar.java
+++ b/src/eu/siacs/conversations/xmpp/pep/Avatar.java
@@ -25,6 +25,7 @@ public class Avatar {
 			return sha1sum;
 		}
 	}
+	
 	public static Avatar parseMetadata(Element items) {
 		Element item = items.findChild("item");
 		if (item==null) {
-- 
cgit v1.2.3