Refactor ImageManager to ImageHelper.

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

@@ -13,6 +13,7 @@ import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.briar.android.conversation.ImageHelper.DecodeResult;
 import org.briarproject.briar.api.messaging.Attachment;
 import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
@@ -48,7 +49,7 @@ class AttachmentController {
 	private static final int READ_LIMIT = 1024 * 8192;
 
 	private final MessagingManager messagingManager;
-	private final ImageManager imageManager;
+	private final ImageHelper imageHelper;
 	private final int defaultSize;
 	private final int minWidth, maxWidth;
 	private final int minHeight, maxHeight;
@@ -57,9 +58,9 @@ class AttachmentController {
 			new ConcurrentHashMap<>();
 
 	AttachmentController(MessagingManager messagingManager,
-			AttachmentDimensions dimensions, ImageManager imageManager) {
+			AttachmentDimensions dimensions, ImageHelper imageHelper) {
 		this.messagingManager = messagingManager;
-		this.imageManager = imageManager;
+		this.imageHelper = imageHelper;
 		defaultSize = dimensions.defaultSize;
 		minWidth = dimensions.minWidth;
 		maxWidth = dimensions.maxWidth;
@@ -69,10 +70,16 @@ class AttachmentController {
 
 	AttachmentController(MessagingManager messagingManager,
 			AttachmentDimensions dimensions) {
-		this(messagingManager, dimensions, new ImageManager() {
+		this(messagingManager, dimensions, new ImageHelper() {
 			@Override
-			public void decodeStream(InputStream is, Options options) {
+			public DecodeResult decodeStream(InputStream is) {
+				Options options = new Options();
+				options.inJustDecodeBounds = true;
 				BitmapFactory.decodeStream(is, null, options);
+				String mimeType = options.outMimeType;
+				if (mimeType == null) mimeType = "";
+				return new DecodeResult(options.outWidth, options.outHeight,
+						mimeType);
 			}
 
 			@Nullable
@@ -133,7 +140,7 @@ class AttachmentController {
 		MessageId messageId = h.getMessageId();
 		if (!needsSize) {
 			String mimeType = h.getContentType();
-			String extension = imageManager.getExtensionFromMimeType(mimeType);
+			String extension = imageHelper.getExtensionFromMimeType(mimeType);
 			boolean hasError = false;
 			if (extension == null) {
 				extension = "";
@@ -176,7 +183,7 @@ class AttachmentController {
 					getThumbnailSize(size.width, size.height, size.mimeType);
 		}
 		// get file extension
-		String extension = imageManager.getExtensionFromMimeType(size.mimeType);
+		String extension = imageHelper.getExtensionFromMimeType(size.mimeType);
 		boolean hasError = extension == null || size.error;
 		if (extension == null) extension = "";
 		return new AttachmentItem(messageId, size.width, size.height,
@@ -208,13 +215,9 @@ class AttachmentController {
 	 * Gets the size of any image {@link InputStream}.
 	 */
 	private Size getSizeFromBitmap(InputStream is) {
-		Options options = new Options();
-		options.inJustDecodeBounds = true;
-		imageManager.decodeStream(is, options);
-		if (options.outWidth < 1 || options.outHeight < 1)
-			return new Size();
-		return new Size(options.outWidth, options.outHeight,
-				options.outMimeType);
+		DecodeResult result = imageHelper.decodeStream(is);
+		if (result.width < 1 || result.height < 1) return new Size();
+		return new Size(result.width, result.height, result.mimeType);
 	}
 
 	private Size getThumbnailSize(int width, int height, String mimeType) {

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

@@ -0,0 +1,29 @@
+package org.briarproject.briar.android.conversation;
+
+import android.support.annotation.Nullable;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.io.InputStream;
+
+@NotNullByDefault
+interface ImageHelper {
+
+	DecodeResult decodeStream(InputStream is);
+
+	@Nullable
+	String getExtensionFromMimeType(String mimeType);
+
+	class DecodeResult {
+
+		final int width;
+		final int height;
+		final String mimeType;
+
+		DecodeResult(int width, int height, String mimeType) {
+			this.width = width;
+			this.height = height;
+			this.mimeType = mimeType;
+		}
+	}
+}

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

@@ -1,18 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.graphics.BitmapFactory;
-import android.support.annotation.Nullable;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-interface ImageManager {
-
-	void decodeStream(InputStream is, BitmapFactory.Options options);
-
-	@Nullable
-	String getExtensionFromMimeType(String mimeType);
-
-}