diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-11-25 20:47:02 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-11-25 20:47:02 +0100 |
| commit | a557d38e4d0bd55442012f7f8a5be62532f7bfe9 (patch) | |
| tree | da3b244cb71952cd469ff0276295b25fd0c6f729 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | 8228e82f51fee33d28a81e4b0c36f7c51122035c (diff) | |
pgp fixes and revert configuration changes
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 7092aca1..c28ac039 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -1369,7 +1369,7 @@ public class XmppConnection implements Runnable { } public boolean httpUpload() { - return findDiscoItemsByFeature(Xmlns.HTTP_UPLOAD).size() > 0; + return !Config.DISABLE_HTTP_UPLOAD && findDiscoItemsByFeature(Xmlns.HTTP_UPLOAD).size() > 0; } } |