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

2 files changed, 93 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index b1b2298b..af875251 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -55,6 +55,7 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
      */
     protected void displayFileInfo(View view, Message message) {
         if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getTransferable() != null) {
+            Logging.d("messagedetailsfile", "File is stored in path: " + message.getRelativeFilePath());
             view.findViewById(R.id.dlgMsgDetFileTable).setVisibility(View.VISIBLE);
             if (null != message.getFileParams()) {
                 Message.FileParams params = message.getFileParams();
@@ -140,7 +141,7 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
         // Get own resource name -> What about msg written on other client?
         String me = conversation.getAccount().getJid().getResourcepart();
         // Get resource name of chat partner, if available
-        String other = (message.getCounterpart().isBareJid()) ? "" : message.getCounterpart().getResourcepart();
+        String other = (null == message.getCounterpart() || message.getCounterpart().isBareJid()) ? "" : message.getCounterpart().getResourcepart();
         Logging.d("MesageDialog", "Me: " + me + ", other: " + other);
         TextView sender = (TextView) view.findViewById(R.id.dlgMsgDetSender);
         TextView receipient = (TextView) view.findViewById(R.id.dlgMsgDetReceipient);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
index 135d6faa..ac58e698 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -1,15 +1,29 @@
 package de.thedevstack.conversationsplus.ui.listeners;
 
 import android.app.PendingIntent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.widget.Toast;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.enums.UserDecision;
+import de.thedevstack.conversationsplus.exceptions.UiException;
+import de.thedevstack.conversationsplus.utils.FileHelper;
+import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.UiCallback;
 import eu.siacs.conversations.ui.XmppActivity;
@@ -81,13 +95,88 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
     @Override
     public void onYes() {
         this.showPrepareFileToast();
-        xmppConnectionService.attachImageToConversation(this.conversation, this.uri, this.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);
+        ConversationsPlusApplication.executeFileAdding(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    Bitmap resizedAndRotatedImage = ImageUtil.resizeAndRotateImage(uri);
+                    DownloadableFile file = FileBackend.compressImageAndCopyToPrivateStorage(message, resizedAndRotatedImage);
+                    String filePath = file.getAbsolutePath();
+                    long imageSize = file.getSize();
+                    int imageWidth = resizedAndRotatedImage.getWidth();
+                    int imageHeight = resizedAndRotatedImage.getHeight();
+                    MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
+                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+                        xmppConnectionService.getPgpEngine().encrypt(message, callback);
+                    } else {
+                        callback.success(message);
+                    }
+                } catch (final UiException e) {
+                    Logging.e("pictureresizesending", "Error while sending resized picture. " + e.getMessage());
+                    callback.error(e.getResId(), message);
+                }
+            }
+        });
     }
 
     @Override
     public void onNo() {
         this.showPrepareFileToast();
-        xmppConnectionService.attachImageToConversationWithoutResizing(this.conversation, this.uri, this.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);
+        ConversationsPlusApplication.executeFileAdding(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;
+                    String filePath = FileHelper.getRealPathFromUri(uri);
+                    MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
+                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+                        xmppConnectionService.getPgpEngine().encrypt(message, callback);
+                    } else {
+                        callback.success(message);
+                    }
+                } catch (FileNotFoundException e) {
+                    Logging.e("picturesending", "File not found to send not resized. " + e.getMessage());
+                    callback.error(R.string.error_file_not_found, message);
+                } catch (IOException e) {
+                    Logging.e("picturesending", "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("picturesending", "Error while closing stream for sending not resized picture. " + e.getMessage());
+                        }
+                    }
+                }
+            }
+        });
     }
 
     @Override