Add WebP library for API 16.

bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java

@@ -119,7 +119,12 @@ public class AndroidUtils {
 	 * Returns an array of supported content types for image attachments.
 	 */
 	public static String[] getSupportedImageContentTypes() {
-		return new String[] {"image/jpeg", "image/png", "image/gif"};
+		return new String[] {
+				"image/jpeg",
+				"image/png",
+				"image/gif",
+				"image/webp"
+		};
 	}
 
 	@Nullable

briar-android/build.gradle

@@ -121,6 +121,7 @@ dependencies {
 		exclude group: 'com.android.support'
 		exclude module: 'disklrucache' // when there's no disk cache, we can't accidentally use it
 	}
+	implementation "com.github.zjupure:webpdecoder:2.0.$glideVersion"
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 	annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java

@@ -102,12 +102,10 @@ class AttachmentCreationTask {
 		}
 		InputStream is = contentResolver.openInputStream(uri);
 		if (is == null) throw new IOException();
-		is = imageCompressor
+		is = imageCompressor.compressImage(is, contentType);
-				.compressImage(is, contentType);
 		long timestamp = System.currentTimeMillis();
-		AttachmentHeader h = messagingManager
+		AttachmentHeader h = messagingManager.addLocalAttachment(groupId,
-				.addLocalAttachment(groupId, timestamp,
+				timestamp, ImageCompressor.MIME_TYPE, is);
-						ImageCompressor.MIME_TYPE, is);
 		tryToClose(is, LOG, WARNING);
 		logDuration(LOG, "Storing attachment", start);
 		return h;

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageCompressor.java

@@ -11,7 +11,7 @@ public interface ImageCompressor {
 	/**
 	 * The MIME type of compressed images
 	 */
-	String MIME_TYPE = "image/jpeg";
+	String MIME_TYPE = "image/webp";
 
 	/**
 	 * Load an image from {@code is}, compress it and return an InputStream

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageCompressorImpl.java

@@ -12,7 +12,7 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import static android.graphics.Bitmap.CompressFormat.JPEG;
+import static android.graphics.Bitmap.CompressFormat.WEBP;
 import static android.graphics.BitmapFactory.decodeStream;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
@@ -50,7 +50,7 @@ class ImageCompressorImpl implements ImageCompressor {
 	public InputStream compressImage(Bitmap bitmap) throws IOException {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		for (int quality = 100; quality >= 0; quality -= 10) {
-			if (!bitmap.compress(JPEG, quality, out))
+			if (!bitmap.compress(WEBP, quality, out))
 				throw new IOException();
 			if (out.size() <= MAX_IMAGE_SIZE) {
 				if (LOG.isLoggable(INFO)) {

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelperImpl.java

@@ -3,6 +3,8 @@ package org.briarproject.briar.android.attachment.media;
 import android.graphics.BitmapFactory;
 import android.webkit.MimeTypeMap;
 
+import com.bumptech.glide.integration.webp.WebpBitmapFactory;
+
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.io.InputStream;
@@ -25,6 +27,10 @@ class ImageHelperImpl implements ImageHelper {
 		BitmapFactory.Options options = new BitmapFactory.Options();
 		options.inJustDecodeBounds = true;
 		BitmapFactory.decodeStream(is, null, options);
+		if (options.outWidth < 1 || options.outHeight < 1) {
+			// BitmapFactory doesn't fully support WebP on API < 17
+			WebpBitmapFactory.decodeStream(is, null, options);
+		}
 		String mimeType = options.outMimeType;
 		if (mimeType == null) mimeType = "";
 		return new DecodeResult(options.outWidth, options.outHeight,
@@ -34,6 +40,7 @@ class ImageHelperImpl implements ImageHelper {
 	@Nullable
 	@Override
 	public String getExtensionFromMimeType(String mimeType) {
+		if ("image/webp".equals(mimeType)) return "webp";
 		MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
 		return mimeTypeMap.getExtensionFromMimeType(mimeType);
 	}

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorImpl.java

@@ -21,6 +21,7 @@ import static androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @NotNullByDefault
 class ImageSizeCalculatorImpl implements ImageSizeCalculator {
@@ -61,6 +62,10 @@ class ImageSizeCalculatorImpl implements ImageSizeCalculator {
 				logException(LOG, WARNING, e);
 			}
 		}
+		if (!size.hasError() && isNullOrEmpty(size.getMimeType())) {
+			LOG.info("Could not determine content type, using supplied type");
+			size = new Size(size.getWidth(), size.getHeight(), contentType);
+		}
 		return size;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java

@@ -4,6 +4,8 @@ import android.graphics.Bitmap;
 import android.view.View;
 import android.widget.ImageView;
 
+import com.bumptech.glide.integration.webp.decoder.WebpDrawable;
+import com.bumptech.glide.integration.webp.decoder.WebpDrawableTransformation;
 import com.bumptech.glide.load.Transformation;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -80,7 +82,9 @@ class ImageViewHolder extends ViewHolder {
 				.load(a.getHeader())
 				.diskCacheStrategy(NONE)
 				.error(ERROR_RES)
-				.transform(transformation)
+				.optionalTransform(transformation)
+				.optionalTransform(WebpDrawable.class,
+						new WebpDrawableTransformation(transformation))
 				.transition(withCrossFade())
 				.into(imageView)
 				.waitForLayout();

briar-api/src/main/java/org/briarproject/briar/api/test/TestAvatarCreator.java

@@ -6,6 +6,9 @@ import java.io.InputStream;
 import javax.annotation.Nullable;
 
 public interface TestAvatarCreator {
+
+	String MIME_TYPE = "image/webp";
+
 	@Nullable
 	InputStream getAvatarInputStream() throws IOException;
 }

briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java

@@ -316,7 +316,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 		Message m;
 		try {
 			m = avatarMessageEncoder.encodeUpdateMessage(groupId, 0,
-					"image/jpeg", is).getFirst();
+					TestAvatarCreator.MIME_TYPE, is).getFirst();
 		} catch (IOException e) {
 			throw new DbException(e);
 		}