FileBackend splitted into several util classes for separate concerns: AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.

1 files changed, 34 insertions, 367 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
index da5cbf09..7ee67a15 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
@@ -1,7 +1,5 @@
 package de.thedevstack.conversationsplus.persistance;
 
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -9,58 +7,39 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
-import java.security.DigestOutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;
 
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.RectF;
-import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Environment;
-import android.provider.MediaStore;
-import android.util.Base64;
-import android.util.Base64OutputStream;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
-import android.widget.ImageView;
 
 import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.services.XmppConnectionService;
-import de.thedevstack.conversationsplus.utils.CryptoHelper;
-import de.thedevstack.conversationsplus.utils.ExifHelper;
-import de.thedevstack.conversationsplus.utils.FileHelper;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.exceptions.FileCopyException;
+import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.StreamUtil;
 
-public class FileBackend {
+public final class FileBackend {
 
 	private static int IMAGE_SIZE = 1920;
 
-	private final SimpleDateFormat imageDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
+	private static final SimpleDateFormat imageDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
 
-	private XmppConnectionService mXmppConnectionService;
-
-	public FileBackend(XmppConnectionService service) {
-		this.mXmppConnectionService = service;
-	}
-
-	public DownloadableFile getFile(Message message) {
+	public static DownloadableFile getFile(Message message) {
 		return getFile(message, true);
 	}
 
-	public DownloadableFile getFile(Message message, boolean decrypted) {
+	public static DownloadableFile getFile(Message message, boolean decrypted) {
 		String path = message.getRelativeFilePath();
 		String extension;
 		if (path != null && !path.isEmpty()) {
@@ -102,50 +81,19 @@ public class FileBackend {
 			+ "/Conversations/";
 	}
 
-	public Bitmap resize(Bitmap originalBitmap, int size) {
-		int w = originalBitmap.getWidth();
-		int h = originalBitmap.getHeight();
-		if (Math.max(w, h) > size) {
-			int scalledW;
-			int scalledH;
-			if (w <= h) {
-				scalledW = (int) (w / ((double) h / size));
-				scalledH = size;
-			} else {
-				scalledW = size;
-				scalledH = (int) (h / ((double) w / size));
-			}
-			return Bitmap.createScaledBitmap(originalBitmap, scalledW, scalledH, true);
-		} else {
-			return originalBitmap;
-		}
-	}
-
-	public Bitmap rotate(Bitmap bitmap, int degree) {
-		int w = bitmap.getWidth();
-		int h = bitmap.getHeight();
-		Matrix mtx = new Matrix();
-		mtx.postRotate(degree);
-		return Bitmap.createBitmap(bitmap, 0, 0, w, h, mtx, true);
-	}
-
-	public String getOriginalPath(Uri uri) {
-		return FileHelper.getRealPathFromUri(uri);
-	}
-
-	public DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
+	public static DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
 		Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage");
-		String mime = mXmppConnectionService.getContentResolver().getType(uri);
+		String mime = ConversationsPlusApplication.getInstance().getContentResolver().getType(uri);
 		String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime);
 		message.setRelativeFilePath(message.getUuid() + "." + extension);
-		DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message);
+		DownloadableFile file = getFile(message);
 		file.getParentFile().mkdirs();
 		OutputStream os = null;
 		InputStream is = null;
 		try {
 			file.createNewFile();
 			os = new FileOutputStream(file);
-			is = mXmppConnectionService.getContentResolver().openInputStream(uri);
+			is = StreamUtil.openInputStreamFromContentResolver(uri);
 			byte[] buffer = new byte[1024];
 			int length;
 			while ((length = is.read(buffer)) > 0) {
@@ -158,19 +106,19 @@ public class FileBackend {
 			e.printStackTrace();
 			throw new FileCopyException(R.string.error_io_exception);
 		} finally {
-			close(os);
-			close(is);
+			StreamUtil.close(os);
+			StreamUtil.close(is);
 		}
-		Log.d(Config.LOGTAG, "output file name " + mXmppConnectionService.getFileBackend().getFile(message));
+		Log.d(Config.LOGTAG, "output file name " + file);
 		return file;
 	}
 
-	public DownloadableFile copyImageToPrivateStorage(Message message, Uri image)
+	public static DownloadableFile copyImageToPrivateStorage(Message message, Uri image)
 			throws FileCopyException {
-		return this.copyImageToPrivateStorage(message, image, 0);
+		return copyImageToPrivateStorage(message, image, 0);
 	}
 
-	private DownloadableFile copyImageToPrivateStorage(Message message,
+	private static DownloadableFile copyImageToPrivateStorage(Message message,
 			Uri image, int sampleSize) throws FileCopyException {
 		DownloadableFile file = getFile(message);
 		file.getParentFile().mkdirs();
@@ -178,7 +126,7 @@ public class FileBackend {
 		OutputStream os = null;
 		try {
 			file.createNewFile();
-			is = mXmppConnectionService.getContentResolver().openInputStream(image);
+			is = StreamUtil.openInputStreamFromContentResolver(image);
 			os = new FileOutputStream(file);
 
 			Bitmap originalBitmap;
@@ -191,10 +139,10 @@ public class FileBackend {
 			if (originalBitmap == null) {
 				throw new FileCopyException(R.string.error_not_an_image_file);
 			}
-			Bitmap scaledBitmap = resize(originalBitmap, IMAGE_SIZE);
-			int rotation = getRotation(image);
+			Bitmap scaledBitmap = ImageUtil.resize(originalBitmap, IMAGE_SIZE);
+			int rotation = ImageUtil.getRotation(image);
 			if (rotation > 0) {
-				scaledBitmap = rotate(scaledBitmap, rotation);
+				scaledBitmap = ImageUtil.rotate(scaledBitmap, rotation);
 			}
 
 			boolean success = scaledBitmap.compress(Bitmap.CompressFormat.WEBP, 75, os);
@@ -224,286 +172,34 @@ public class FileBackend {
 		} catch (NullPointerException e) {
 			throw new FileCopyException(R.string.error_io_exception);
 		} finally {
-			close(os);
-			close(is);
-		}
-	}
-
-	private int getRotation(Uri image) {
-		InputStream is = null;
-		try {
-			is = mXmppConnectionService.getContentResolver().openInputStream(image);
-			return ExifHelper.getOrientation(is);
-		} catch (FileNotFoundException e) {
-			return 0;
-		} finally {
-			close(is);
-		}
-	}
-
-	public Bitmap getThumbnail(Message message, int size, boolean cacheOnly)
-			throws FileNotFoundException {
-		Bitmap thumbnail = mXmppConnectionService.getBitmapCache().get(
-				message.getUuid());
-		if ((thumbnail == null) && (!cacheOnly)) {
-			File file = getFile(message);
-			BitmapFactory.Options options = new BitmapFactory.Options();
-			options.inSampleSize = calcSampleSize(file, size);
-			Bitmap fullsize = BitmapFactory.decodeFile(file.getAbsolutePath(),options);
-			if (fullsize == null) {
-				throw new FileNotFoundException();
-			}
-			thumbnail = resize(fullsize, size);
-            try {
-                thumbnail = rotate(thumbnail, file.getAbsolutePath());
-            } catch (IOException e) {
-                throw new FileNotFoundException();
-            }
-            this.mXmppConnectionService.getBitmapCache().put(message.getUuid(),
-					thumbnail);
+			StreamUtil.close(os);
+			StreamUtil.close(is);
 		}
-		return thumbnail;
 	}
 
-    private Bitmap rotate(Bitmap original, String srcPath) throws IOException {
-        try {
-            ExifInterface exif = new ExifInterface(srcPath);
-            int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
-            int rotation = 0;
-            switch (orientation) {
-                case ExifInterface.ORIENTATION_ROTATE_90:
-                    rotation = 90;
-                    break;
-                case ExifInterface.ORIENTATION_ROTATE_180:
-                    rotation = 180;
-                    break;
-                case ExifInterface.ORIENTATION_ROTATE_270:
-                    rotation = 270;
-                    break;
-            }
-            if (rotation > 0) {
-                return rotate(original, rotation);
-            }
-        } catch (IOException e) {
-            Log.w("filebackend", "Error while rotating image, returning original");
-        }
-        return original;
-    }
-
-    public Uri getTakePhotoUri() {
+    public static Uri getTakePhotoUri() {
 		StringBuilder pathBuilder = new StringBuilder();
 		pathBuilder.append(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM));
 		pathBuilder.append('/');
 		pathBuilder.append("Camera");
 		pathBuilder.append('/');
-		pathBuilder.append("IMG_" + this.imageDateFormat.format(new Date()) + ".jpg");
+		pathBuilder.append("IMG_" + imageDateFormat.format(new Date()) + ".jpg");
 		Uri uri = Uri.parse("file://" + pathBuilder.toString());
 		File file = new File(uri.toString());
 		file.getParentFile().mkdirs();
 		return uri;
 	}
 
-	public Avatar getPepAvatar(Uri image, int size, Bitmap.CompressFormat format) {
-		try {
-			Avatar avatar = new Avatar();
-			Bitmap bm = cropCenterSquare(image, size);
-			if (bm == null) {
-				return null;
-			}
-			ByteArrayOutputStream mByteArrayOutputStream = new ByteArrayOutputStream();
-			Base64OutputStream mBase64OutputSttream = new Base64OutputStream(
-					mByteArrayOutputStream, Base64.DEFAULT);
-			MessageDigest digest = MessageDigest.getInstance("SHA-1");
-			DigestOutputStream mDigestOutputStream = new DigestOutputStream(
-					mBase64OutputSttream, digest);
-			if (!bm.compress(format, 75, mDigestOutputStream)) {
-				return null;
-			}
-			mDigestOutputStream.flush();
-			mDigestOutputStream.close();
-			avatar.sha1sum = CryptoHelper.bytesToHex(digest.digest());
-			avatar.image = new String(mByteArrayOutputStream.toByteArray());
-			return avatar;
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	public boolean isAvatarCached(Avatar avatar) {
-		File file = new File(getAvatarPath(avatar.getFilename()));
-		return file.exists();
-	}
-
-	public boolean save(Avatar avatar) {
-		File file;
-		if (isAvatarCached(avatar)) {
-			file = new File(getAvatarPath(avatar.getFilename()));
-		} else {
-			String filename = getAvatarPath(avatar.getFilename());
-			file = new File(filename + ".tmp");
-			file.getParentFile().mkdirs();
-			OutputStream os = null;
-			try {
-				file.createNewFile();
-				os = new FileOutputStream(file);
-				MessageDigest digest = MessageDigest.getInstance("SHA-1");
-				digest.reset();
-				DigestOutputStream mDigestOutputStream = new DigestOutputStream(os, digest);
-				mDigestOutputStream.write(avatar.getImageAsBytes());
-				mDigestOutputStream.flush();
-				mDigestOutputStream.close();
-				String sha1sum = CryptoHelper.bytesToHex(digest.digest());
-				if (sha1sum.equals(avatar.sha1sum)) {
-					file.renameTo(new File(filename));
-				} else {
-					Log.d(Config.LOGTAG, "sha1sum mismatch for " + avatar.owner);
-					file.delete();
-					return false;
-				}
-			} catch (FileNotFoundException e) {
-				return false;
-			} catch (IOException e) {
-				return false;
-			} catch (NoSuchAlgorithmException e) {
-				return false;
-			} finally {
-				close(os);
-			}
-		}
-		avatar.size = file.length();
-		return true;
-	}
-
-	public String getAvatarPath(String avatar) {
-		return mXmppConnectionService.getFilesDir().getAbsolutePath()+ "/avatars/" + avatar;
-	}
-
-	public Uri getAvatarUri(String avatar) {
-		return Uri.parse("file:" + getAvatarPath(avatar));
-	}
-
-	public Bitmap cropCenterSquare(Uri image, int size) {
-		if (image == null) {
-			return null;
-		}
-		InputStream is = null;
-		try {
-			BitmapFactory.Options options = new BitmapFactory.Options();
-			options.inSampleSize = calcSampleSize(image, size);
-			is = mXmppConnectionService.getContentResolver().openInputStream(image);
-			Bitmap input = BitmapFactory.decodeStream(is, null, options);
-			if (input == null) {
-				return null;
-			} else {
-				int rotation = getRotation(image);
-				if (rotation > 0) {
-					input = rotate(input, rotation);
-				}
-				return cropCenterSquare(input, size);
-			}
-		} catch (FileNotFoundException e) {
-			return null;
-		} finally {
-			close(is);
-		}
-	}
-
-	public Bitmap cropCenter(Uri image, int newHeight, int newWidth) {
-		if (image == null) {
-			return null;
-		}
-		InputStream is = null;
-		try {
-			BitmapFactory.Options options = new BitmapFactory.Options();
-			options.inSampleSize = calcSampleSize(image,Math.max(newHeight, newWidth));
-			is = mXmppConnectionService.getContentResolver().openInputStream(image);
-			Bitmap source = BitmapFactory.decodeStream(is, null, options);
-			if (source == null) {
-				return null;
-			}
-			int sourceWidth = source.getWidth();
-			int sourceHeight = source.getHeight();
-			float xScale = (float) newWidth / sourceWidth;
-			float yScale = (float) newHeight / sourceHeight;
-			float scale = Math.max(xScale, yScale);
-			float scaledWidth = scale * sourceWidth;
-			float scaledHeight = scale * sourceHeight;
-			float left = (newWidth - scaledWidth) / 2;
-			float top = (newHeight - scaledHeight) / 2;
-
-			RectF targetRect = new RectF(left, top, left + scaledWidth, top + scaledHeight);
-			Bitmap dest = Bitmap.createBitmap(newWidth, newHeight, Bitmap.Config.ARGB_8888);
-			Canvas canvas = new Canvas(dest);
-			canvas.drawBitmap(source, null, targetRect, null);
-			return dest;
-		} catch (FileNotFoundException e) {
-			return null;
-		} finally {
-			close(is);
-		}
-	}
-
-	public Bitmap cropCenterSquare(Bitmap input, int size) {
-		int w = input.getWidth();
-		int h = input.getHeight();
-
-		float scale = Math.max((float) size / h, (float) size / w);
-
-		float outWidth = scale * w;
-		float outHeight = scale * h;
-		float left = (size - outWidth) / 2;
-		float top = (size - outHeight) / 2;
-		RectF target = new RectF(left, top, left + outWidth, top + outHeight);
-
-		Bitmap output = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
-		Canvas canvas = new Canvas(output);
-		canvas.drawBitmap(input, null, target, null);
-		return output;
-	}
-
-	private int calcSampleSize(Uri image, int size) throws FileNotFoundException {
-		BitmapFactory.Options options = new BitmapFactory.Options();
-		options.inJustDecodeBounds = true;
-		BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(image), null, options);
-		return calcSampleSize(options, size);
-	}
-
-	private int calcSampleSize(File image, int size) {
-		BitmapFactory.Options options = new BitmapFactory.Options();
-		options.inJustDecodeBounds = true;
-		BitmapFactory.decodeFile(image.getAbsolutePath(), options);
-		return calcSampleSize(options, size);
-	}
-
-	private int calcSampleSize(BitmapFactory.Options options, int size) {
-		int height = options.outHeight;
-		int width = options.outWidth;
-		int inSampleSize = 1;
-
-		if (height > size || width > size) {
-			int halfHeight = height / 2;
-			int halfWidth = width / 2;
-
-			while ((halfHeight / inSampleSize) > size
-					&& (halfWidth / inSampleSize) > size) {
-				inSampleSize *= 2;
-			}
-		}
-		return inSampleSize;
-	}
-
-	public Uri getJingleFileUri(Message message) {
+	public static Uri getJingleFileUri(Message message) {
 		File file = getFile(message);
 		return Uri.parse("file://" + file.getAbsolutePath());
 	}
 
-	public void updateFileParams(Message message) {
+	public static void updateFileParams(Message message) {
 		updateFileParams(message,null);
 	}
 
-	public void updateFileParams(Message message, URL url) {
+	public static void updateFileParams(Message message, URL url) {
 		DownloadableFile file = getFile(message);
 		if (message.getType() == Message.TYPE_IMAGE || file.getMimeType().startsWith("image/")) {
 			BitmapFactory.Options options = new BitmapFactory.Options();
@@ -526,40 +222,11 @@ public class FileBackend {
 
 	}
 
-	public class FileCopyException extends Exception {
-		private static final long serialVersionUID = -1010013599132881427L;
-		private int resId;
-
-		public FileCopyException(int resId) {
-			this.resId = resId;
-		}
-
-		public int getResId() {
-			return resId;
-		}
-	}
-
-	public Bitmap getAvatar(String avatar, int size) {
-		if (avatar == null) {
-			return null;
-		}
-		Bitmap bm = cropCenter(getAvatarUri(avatar), size, size);
-		if (bm == null) {
-			return null;
-		}
-		return bm;
-	}
-
-	public boolean isFileAvailable(Message message) {
+	public static boolean isFileAvailable(Message message) {
 		return getFile(message).exists();
 	}
 
-	public static void close(Closeable stream) {
-		if (stream != null) {
-			try {
-				stream.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-}
+    private FileBackend() {
+        // Static helper class
+    }
+}
\ No newline at end of file