From b17cf7fcf5cee6eb00c8a15b0fe539ddaf1573e0 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 29 Jun 2016 10:50:46 +0200
Subject: code cleanup

---
 src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui')

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 3cb9aea83..bcab4dd6c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1761,16 +1761,14 @@ public class ConversationActivity extends XmppActivity
         }
         final Conversation conversation_preview = conversation;
         final Uri uri_preview = uri;
-        String imagePath = FileUtils.getPath(this, uri);
-
-        Bitmap bitmap = BitmapFactory.decodeFile(imagePath);
+        Bitmap bitmap = BitmapFactory.decodeFile(FileUtils.getPath(this, uri));
 		if (bitmap != null) {
 			int scaleSize = 400;
 			int originalWidth = bitmap.getWidth();
 			int originalHeight = bitmap.getHeight();
 			int newWidth = -1;
 			int newHeight = -1;
-			float multFactor = -1.0F;
+			float multFactor;
 			if (originalHeight > originalWidth) {
 				newHeight = scaleSize;
 				multFactor = (float) originalWidth / (float) originalHeight;
-- 
cgit v1.2.3