aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Account.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-04-05 23:24:49 +0200
committerlookshe <github@lookshe.org>2016-04-05 23:24:49 +0200
commitd6a076e11281d4c3fb6b9504fe99d799b04ebbbb (patch)
tree7cbbe209ed0a883bcf29389d91979974444447c1 /src/main/java/eu/siacs/conversations/entities/Account.java
parentbfb3cb844578d06fad9aade3a7576ee44d785f70 (diff)
parent5eedce91f9d92e5139f13fddb57314570f42b9ad (diff)
Merge tag '1.11.3' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Account.java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Account.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 7aee78b5..4c4a1916 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -55,8 +55,12 @@ public class Account extends AbstractEntity {
public static final int OPTION_USECOMPRESSION = 3;
public final HashSet<Pair<String, String>> inProgressDiscoFetches = new HashSet<>();
+ public boolean httpUploadAvailable(long filesize) {
+ return xmppConnection != null && xmppConnection.getFeatures().httpUpload(filesize);
+ }
+
public boolean httpUploadAvailable() {
- return xmppConnection != null && xmppConnection.getFeatures().httpUpload();
+ return httpUploadAvailable(0);
}
public void setDisplayName(String displayName) {