Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 22 insertions, 83 deletions

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 8e09131f..32de18e9 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -20,8 +20,8 @@ import android.webkit.MimeTypeMap;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
-import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 import eu.siacs.conversations.Config;
@@ -32,8 +32,6 @@ import eu.siacs.conversations.entities.Message;
 
 public final class FileBackend {
 
-	private static int IMAGE_SIZE = 1920;
-
 	private static final SimpleDateFormat imageDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
 
 	public static DownloadableFile getFile(Message message) {
@@ -64,29 +62,35 @@ public final class FileBackend {
 				return new DownloadableFile(path);
 			} else {
 				if (Arrays.asList(Transferable.VALID_IMAGE_EXTENSIONS).contains(extension)) {
-					return new DownloadableFile(getConversationsFileDirectory() + path);
-				} else {
 					return new DownloadableFile(getConversationsImageDirectory() + path);
+				} else {
+					return new DownloadableFile(getConversationsFileDirectory() + path);
 				}
 			}
 		}
 	}
 
 	public static String getConversationsFileDirectory() {
-		return  Environment.getExternalStorageDirectory().getAbsolutePath()+"/Conversations/";
+		return  Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + ConversationsPlusPreferences.fileTransferFolder() + File.separator;
 	}
 
 	public static String getConversationsImageDirectory() {
-		return Environment.getExternalStoragePublicDirectory(
-                Environment.DIRECTORY_PICTURES).getAbsolutePath()
-			+ "/Conversations/";
+		return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + File.separator + ConversationsPlusPreferences.imgTransferFolder() + File.separator;
 	}
 
+    private static String getPrivateFileDirectoryPath() {
+        return ConversationsPlusApplication.getPrivateFilesDir().getAbsolutePath();
+    }
+
+    private static String getPrivateImageDirectoryPath() {
+        return FileBackend.getPrivateFileDirectoryPath() + File.separator + "Images" + File.separator;
+    }
+
 	public static DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
 		Logging.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage");
 		String mime = ConversationsPlusApplication.getInstance().getContentResolver().getType(uri);
 		String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime);
-		message.setRelativeFilePath(message.getUuid() + "." + extension);
+		message.setRelativeFilePath(FileBackend.getPrivateFileDirectoryPath() + message.getUuid() + "." + extension);
 		DownloadableFile file = getFile(message);
 		file.getParentFile().mkdirs();
 		OutputStream os = null;
@@ -114,68 +118,30 @@ public final class FileBackend {
 		return file;
 	}
 
-	public static DownloadableFile copyImageToPrivateStorage(Message message, Uri image)
-			throws FileCopyException {
-		return copyImageToPrivateStorage(message, image, 0);
-	}
-
-	private static DownloadableFile copyImageToPrivateStorage(Message message,
-			Uri image, int sampleSize) throws FileCopyException {
+	public static DownloadableFile compressImageAndCopyToPrivateStorage(Message message, Bitmap scaledBitmap) throws FileCopyException {
+        message.setRelativeFilePath(FileBackend.getPrivateImageDirectoryPath() + message.getUuid() + ".webp");
 		DownloadableFile file = getFile(message);
 		file.getParentFile().mkdirs();
-		InputStream is = null;
 		OutputStream os = null;
 		try {
 			file.createNewFile();
-			is = StreamUtil.openInputStreamFromContentResolver(image);
-			os = new FileOutputStream(file);
-
-			Bitmap originalBitmap;
-			BitmapFactory.Options options = new BitmapFactory.Options();
-			int inSampleSize = (int) Math.pow(2, sampleSize);
-			Logging.d(Config.LOGTAG, "reading bitmap with sample size " + inSampleSize);
-			options.inSampleSize = inSampleSize;
-			originalBitmap = BitmapFactory.decodeStream(is, null, options);
-			is.close();
-			if (originalBitmap == null) {
-				throw new FileCopyException(R.string.error_not_an_image_file);
-			}
-			Bitmap scaledBitmap = ImageUtil.resize(originalBitmap, IMAGE_SIZE);
-			int rotation = ImageUtil.getRotation(image);
-			if (rotation > 0) {
-				scaledBitmap = ImageUtil.rotate(scaledBitmap, rotation);
-			}
+            os = new FileOutputStream(file);
 
 			boolean success = scaledBitmap.compress(Bitmap.CompressFormat.WEBP, 75, os);
 			if (!success) {
 				throw new FileCopyException(R.string.error_compressing_image);
 			}
 			os.flush();
-			long size = file.getSize();
-			int width = scaledBitmap.getWidth();
-			int height = scaledBitmap.getHeight();
-			message.setBody(Long.toString(size) + '|' + width + '|' + height);
-			return file;
-		} catch (FileNotFoundException e) {
-			throw new FileCopyException(R.string.error_file_not_found);
-		} catch (IOException e) {
-			e.printStackTrace();
-			throw new FileCopyException(R.string.error_io_exception);
+        } catch (IOException e) {
+            throw new FileCopyException(R.string.error_io_exception, e);
 		} catch (SecurityException e) {
-			throw new FileCopyException(R.string.error_security_exception_during_image_copy);
-		} catch (OutOfMemoryError e) {
-			++sampleSize;
-			if (sampleSize <= 3) {
-				return copyImageToPrivateStorage(message, image, sampleSize);
-			} else {
-				throw new FileCopyException(R.string.error_out_of_memory);
-			}
-		} catch (NullPointerException e) {
+            throw new FileCopyException(R.string.error_security_exception_during_image_copy);
+        } catch (NullPointerException e) {
 			throw new FileCopyException(R.string.error_io_exception);
 		} finally {
 			StreamUtil.close(os);
-			StreamUtil.close(is);
 		}
+        return file;
 	}
 
     public static Uri getTakePhotoUri() {
@@ -196,33 +162,6 @@ public final class FileBackend {
 		return Uri.parse("file://" + file.getAbsolutePath());
 	}
 
-	public static void updateFileParams(Message message) {
-		updateFileParams(message,null);
-	}
-
-	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();
-			options.inJustDecodeBounds = true;
-			BitmapFactory.decodeFile(file.getAbsolutePath(), options);
-			int imageHeight = options.outHeight;
-			int imageWidth = options.outWidth;
-			if (url == null) {
-				message.setBody(Long.toString(file.getSize()) + '|' + imageWidth + '|' + imageHeight);
-			} else {
-				message.setBody(url.toString()+"|"+Long.toString(file.getSize()) + '|' + imageWidth + '|' + imageHeight);
-			}
-		} else {
-			if (url != null) {
-				message.setBody(url.toString()+"|"+Long.toString(file.getSize()));
-			} else {
-				message.setBody(Long.toString(file.getSize()));
-			}
-		}
-
-	}
-
 	public static boolean isFileAvailable(Message message) {
 		return getFile(message).exists();
 	}