From 701742f5500ade311741c8af59fcd73181a6e6f6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 2 Apr 2016 18:07:38 +0200 Subject: don't ask for resource when server uses http upload v0.1 --- src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/eu/siacs/conversations/persistance') diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 6e118ec22..21ba45093 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -114,7 +114,7 @@ public class FileBackend { } } - public static long getFileSize(Context context, Uri uri) { + private static long getFileSize(Context context, Uri uri) { Cursor cursor = context.getContentResolver().query(uri, null, null, null, null); if (cursor != null && cursor.moveToFirst()) { return cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE)); @@ -124,6 +124,9 @@ public class FileBackend { } public static boolean allFilesUnderSize(Context context, List uris, long max) { + if (max <= 0) { + return true; //exception to be compatible with HTTP Upload < v0.2 + } for(Uri uri : uris) { if (FileBackend.getFileSize(context, uri) > max) { return false; -- cgit v1.2.3