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

6 files changed, 54 insertions, 189 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index 15fe9f44..4d422801 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -14,6 +14,7 @@ import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpApi.IOpenPgpCallback;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -103,7 +104,7 @@ public class PgpEngine {
 								OpenPgpApi.RESULT_CODE_ERROR)) {
 						case OpenPgpApi.RESULT_CODE_SUCCESS:
 							URL url = message.getFileParams().url;
-							FileBackend.updateFileParams(message, url);
+							MessageUtil.updateFileParams(message, url);
 							message.setEncryption(Message.ENCRYPTION_DECRYPTED);
 							PgpEngine.this.mXmppConnectionService
 									.updateMessage(message);
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 5f0d3436..516d3141 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -17,6 +17,7 @@ import javax.net.ssl.SSLHandshakeException;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -237,7 +238,7 @@ public class HttpDownloadConnection implements Transferable {
 
 		private void updateImageBounds() {
 			message.setType(Message.TYPE_FILE);
-			FileBackend.updateFileParams(message, mUrl);
+			MessageUtil.updateFileParams(message, mUrl);
 			mXmppConnectionService.updateMessage(message);
 		}
 
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index dc2c35d7..7d364eec 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -12,6 +12,7 @@ import java.net.URL;
 import javax.net.ssl.HttpsURLConnection;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 import eu.siacs.conversations.Config;
@@ -165,7 +166,7 @@ public class HttpUploadConnection implements Transferable {
 					if (key != null) {
 						mGetUrl = new URL(mGetUrl.toString() + "#" + CryptoHelper.bytesToHex(key));
 					}
-					FileBackend.updateFileParams(message, mGetUrl);
+					MessageUtil.updateFileParams(message, mGetUrl);
 					message.setTransferable(null);
 					message.setCounterpart(message.getConversation().getJid().toBareJid());
 					if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
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();
 	}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 0a32755d..1ac792c7 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -54,10 +54,13 @@ 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.exceptions.UiException;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.FileHelper;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.tzur.conversations.Settings;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -86,7 +89,6 @@ import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.utils.OnPhoneContactsLoadedListener;
 import eu.siacs.conversations.utils.PRNGFixes;
 import eu.siacs.conversations.utils.PhoneHelper;
-import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
 import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnBindListener;
@@ -110,6 +112,7 @@ import eu.siacs.conversations.xmpp.pep.Avatar;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
 import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
+
 import me.leolin.shortcutbadger.ShortcutBadger;
 
 public class XmppConnectionService extends Service implements OnPhoneContactsLoadedListener {
@@ -130,9 +133,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	};
 
-    private final SerialSingleThreadExecutor mFileAddingExecutor = new SerialSingleThreadExecutor();
-	private final SerialSingleThreadExecutor mDatabaseExecutor = new SerialSingleThreadExecutor();
-
 	private final IBinder mBinder = new XmppConnectionBinder();
 	private final List<Conversation> conversations = new CopyOnWriteArrayList<>();
 	private final FileObserver fileObserver = new FileObserver(
@@ -375,110 +375,33 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		message.setCounterpart(conversation.getNextCounterpart());
 		message.setType(Message.TYPE_FILE);
 		String path = FileHelper.getRealPathFromUri(uri);
-		if (path!=null) {
+		if (path != null) {
 			message.setRelativeFilePath(path);
-			FileBackend.updateFileParams(message);
+			MessageUtil.updateFileParams(message);
 			if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
 				getPgpEngine().encrypt(message, callback);
 			} else {
 				callback.success(message);
 			}
 		} else {
-			mFileAddingExecutor.execute(new Runnable() {
-				@Override
-				public void run() {
-					try {
-						FileBackend.copyFileToPrivateStorage(message, uri);
-						FileBackend.updateFileParams(message);
-						if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
-							getPgpEngine().encrypt(message, callback);
-						} else {
-							callback.success(message);
-						}
-					} catch (FileCopyException e) {
-						callback.error(e.getResId(), message);
-					}
-				}
-			});
-		}
-	}
-
-    public void attachImageToConversationWithoutResizing(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
-        final Message message;
-        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
-        if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-            message = new Message(conversation, "",
-                    Message.ENCRYPTION_DECRYPTED);
-        } else {
-            message = new Message(conversation, "",
-                    conversation.getNextEncryption(forceEncryption));
-        }
-        message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_IMAGE);
-        mFileAddingExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                InputStream is = null;
-                try {
-                    is = ConversationsPlusApplication.getInstance().getContentResolver().openInputStream(uri);
-                    long imageSize = is.available();
-                    BitmapFactory.Options options = new BitmapFactory.Options();
-                    options.inJustDecodeBounds = true;
-                    BitmapFactory.decodeStream(is, null, options);
-                    int imageHeight = options.outHeight;
-                    int imageWidth = options.outWidth;
-                    message.setRelativeFilePath(FileHelper.getRealPathFromUri(uri));
-                    message.setBody(Long.toString(imageSize) + '|' + imageWidth + '|' + imageHeight);
-                    callback.success(message);
-                } catch (FileNotFoundException e) {
-                    Logging.e("pictureresize", "File not found to send not resized. " + e.getMessage());
-                    callback.error(R.string.error_file_not_found, message);
-                } catch (IOException e) {
-                    Logging.e("pictureresize", "Error while sending not resized picture. " + e.getMessage());
-                    callback.error(R.string.error_io_exception, message);
-                } finally {
-                    if (null != is) {
-                        try {
-                            is.close();
-                        } catch (IOException e) {
-                            Logging.w("pictureresize", "Error while closing stream for sending not resized picture. " + e.getMessage());
+            ConversationsPlusApplication.executeFileAdding(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        FileBackend.copyFileToPrivateStorage(message, uri);
+                        MessageUtil.updateFileParams(message);
+                        if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+                            getPgpEngine().encrypt(message, callback);
+                        } else {
+                            callback.success(message);
                         }
+                    } catch (FileCopyException e) {
+                        callback.error(e.getResId(), message);
                     }
                 }
-            }
-        });
-    }
-
-    public void attachImageToConversation(final Conversation conversation,
-                                          final Uri uri, final UiCallback<Message> callback) {
-        final Message message;
-        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
-        if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-            message = new Message(conversation, "",
-                    Message.ENCRYPTION_DECRYPTED);
-        } else {
-            message = new Message(conversation, "",
-                    conversation.getNextEncryption(forceEncryption));
-        }
-        message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_IMAGE);
-        mFileAddingExecutor.execute(new Runnable() {
-
-            @Override
-            public void run() {
-                try {
-                    FileBackend.copyImageToPrivateStorage(message, uri);
-                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-                        getPgpEngine().encrypt(message, callback);
-                    } else {
-                        callback.success(message);
-                    }
-                } catch (final FileCopyException e) {
-                    callback.error(e.getResId(), message);
-                }
-            }
-        });
-    }
+            });
+		}
+	}
 
     public Conversation find(Bookmark bookmark) {
 		return find(bookmark.getAccount(), bookmark.getJid());
@@ -1019,7 +942,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					updateConversationUi();
 				}
 			};
-			mDatabaseExecutor.execute(runnable);
+            ConversationsPlusApplication.executeDatabaseOperation(runnable);
 		}
 	}
 
@@ -1123,7 +1046,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
                 }
             }
 		};
-		mDatabaseExecutor.execute(runnable);
+        ConversationsPlusApplication.executeDatabaseOperation(runnable);
 	}
 
 	public List<Account> getAccounts() {
@@ -2390,8 +2313,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				databaseBackend.writeRoster(account.getRoster());
 			}
 		};
-		mDatabaseExecutor.execute(runnable);
-
+        ConversationsPlusApplication.executeDatabaseOperation(runnable);
 	}
 
 	public List<String> getKnownHosts() {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 731d49e4..f41c6791 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -14,6 +14,7 @@ import android.os.SystemClock;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
@@ -93,7 +94,7 @@ public class JingleConnection implements Transferable {
 					JingleConnection.this.mXmppConnectionService
 							.getNotificationService().push(message);
 				}
-				FileBackend.updateFileParams(message);
+				MessageUtil.updateFileParams(message);
 				mXmppConnectionService.databaseBackend.createMessage(message);
 				mXmppConnectionService.markMessage(message,
 						Message.STATUS_RECEIVED);