From a95d2d9134508ec694cb48db361f1fd4387d1827 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sat, 12 Mar 2016 21:14:55 +0100
Subject: Fixes FS#155: Check FileHelper vs. FileUtils

---
 .../ui/listeners/ResizePictureUserDecisionListener.java          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java')

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 5ab8feb2..8897d8da 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -15,7 +15,7 @@ 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.FileUtils;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.R;
@@ -47,8 +47,7 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
         this.callback = new UiCallback<Message>() {
 
             @Override
-            public void userInputRequried(PendingIntent pi,
-                                          Message object) {
+            public void userInputRequried(PendingIntent pi, Message object) {
                 hidePrepareFileToast();
             }
 
@@ -97,7 +96,6 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
     public void onYes() {
         this.showPrepareFileToast();
         final Message message;
-        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
         if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
             message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
         } else {
@@ -134,7 +132,6 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
     public void onNo() {
         this.showPrepareFileToast();
         final Message message;
-        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
         if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
             message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
         } else {
@@ -154,7 +151,7 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
                     BitmapFactory.decodeStream(is, null, options);
                     int imageHeight = options.outHeight;
                     int imageWidth = options.outWidth;
-                    String filePath = FileHelper.getRealPathFromUri(uri);
+                    String filePath = FileUtils.getPath(uri);
                     MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
                     if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
                         xmppConnectionService.getPgpEngine().encrypt(message, callback);
-- 
cgit v1.2.3