diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-15 17:31:24 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-15 17:31:24 +0200 |
| commit | 32c3dd4f4ada85b48551bcf7e17eafb63857237f (patch) | |
| tree | 13fb13cfb9507ee72c9777da8c50ca480c459d09 /src/eu/siacs/conversations/xmpp | |
| parent | f7c747ef4b496df77388872c750bf95100991c76 (diff) | |
moved add/edit account from dialog into seperate activity
Diffstat (limited to 'src/eu/siacs/conversations/xmpp')
| -rw-r--r-- | src/eu/siacs/conversations/xmpp/XmppConnection.java | 5 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/xmpp/pep/Avatar.java | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java index c83f39a8..8e93a91d 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 b99a2fe3..6d5c1431 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) { |