Merge branch 'trz/rebase' into trz/rename

1 files changed, 34 insertions, 8 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
index 9036bf8d..58352d4f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
@@ -1317,12 +1317,12 @@ public class XmppConnection implements Runnable {
 		this.streamId = null;
 	}
 
-	public List<Jid> findDiscoItemsByFeature(final String feature) {
+	private List<Entry<Jid, ServiceDiscoveryResult>> findDiscoItemsByFeature(final String feature) {
 		synchronized (this.disco) {
-			final List<Jid> items = new ArrayList<>();
+			final List<Entry<Jid, ServiceDiscoveryResult>> items = new ArrayList<>();
 			for (final Entry<Jid, ServiceDiscoveryResult> cursor : this.disco.entrySet()) {
 				if (cursor.getValue().getFeatures().contains(feature)) {
-					items.add(cursor.getKey());
+					items.add(cursor);
 				}
 			}
 			return items;
@@ -1330,9 +1330,9 @@ public class XmppConnection implements Runnable {
 	}
 
 	public Jid findDiscoItemByFeature(final String feature) {
-		final List<Jid> items = findDiscoItemsByFeature(feature);
+		final List<Entry<Jid, ServiceDiscoveryResult>> items = findDiscoItemsByFeature(feature);
 		if (items.size() >= 1) {
-			return items.get(0);
+			return items.get(0).getKey();
 		}
 		return null;
 	}
@@ -1481,7 +1481,6 @@ public class XmppConnection implements Runnable {
 
 		public boolean pep() {
 			synchronized (XmppConnection.this.disco) {
-				final Pair<String, String> needle = new Pair<>("pubsub", "pep");
 				ServiceDiscoveryResult info = disco.get(account.getServer());
 				if (info != null && info.hasIdentity("pubsub", "pep")) {
 					return true;
@@ -1510,8 +1509,35 @@ public class XmppConnection implements Runnable {
 			this.blockListRequested = value;
 		}
 
-		public boolean httpUpload() {
-			return !Config.DISABLE_HTTP_UPLOAD && findDiscoItemsByFeature(Xmlns.HTTP_UPLOAD).size() > 0;
+		public boolean httpUpload(long filesize) {
+			if (Config.DISABLE_HTTP_UPLOAD) {
+				return false;
+			} else {
+				List<Entry<Jid, ServiceDiscoveryResult>> items = findDiscoItemsByFeature(Xmlns.HTTP_UPLOAD);
+				if (items.size() > 0) {
+					try {
+						long maxsize = Long.parseLong(items.get(0).getValue().getExtendedDiscoInformation(Xmlns.HTTP_UPLOAD, "max-file-size"));
+						return filesize <= maxsize;
+					} catch (Exception e) {
+						return true;
+					}
+				} else {
+					return false;
+				}
+			}
+		}
+
+		public long getMaxHttpUploadSize() {
+			List<Entry<Jid, ServiceDiscoveryResult>> items = findDiscoItemsByFeature(Xmlns.HTTP_UPLOAD);
+				if (items.size() > 0) {
+					try {
+						return Long.parseLong(items.get(0).getValue().getExtendedDiscoInformation(Xmlns.HTTP_UPLOAD, "max-file-size"));
+					} catch (Exception e) {
+						return -1;
+					}
+				} else {
+					return -1;
+				}
 		}
 	}