aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-12 21:22:44 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-12 21:22:44 +0100
commit340272ba841be12dcdf1317e183a45d8b46dce44 (patch)
tree4c4cf2121ccfdb1da3ab2825f6ee2de9132531be /src/main/java/de/thedevstack/conversationsplus/ui
parent86afdc7aaff4ed6fa37e6d5fd9e5ffab20375f21 (diff)
parenta95d2d9134508ec694cb48db361f1fd4387d1827 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java9
1 files changed, 3 insertions, 6 deletions
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 bc74f39b..992776e5 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.utils.StreamUtil;
@@ -48,8 +48,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();
}
@@ -98,7 +97,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 {
@@ -135,7 +133,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 {
@@ -155,7 +152,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);