Implements FS#26: Introduction of dialog to choose whether to resize a picture or not

18 files changed, 551 insertions, 173 deletions

diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md
index 05ea7787..086f3b18 100644
--- a/Conversations-Plus-ChangeLog.md
+++ b/Conversations-Plus-ChangeLog.md
@@ -6,6 +6,8 @@
 * Implements FS#78: Allow installation on SD card
 * Fixes FS#70: Fixed Identity Strings
 * Fixes FS#47: Setting "WLAN only" no longer works for received links
+* Implements FS#26: Introduce dialog to choose whether to send resized picture or original picture
+* Implements FS#24: Introduce setting for picture resizing
 
 ####Version 0.0.5
 * Fixes FS#73: Open list of resources while clicking on JID in contact details
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index 47daddb0..b7b7fe47 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -253,7 +253,8 @@ public class ConversationsPlusPreferences extends Settings {
     }
 
     protected static <T extends Enum<T>> T getEnumFromStringPref(String key, T defaultValue) {
-        return (T) T.valueOf(defaultValue.getClass(), defaultValue.name());
+        String enumValueAsString = getString(key, defaultValue.name());
+        return (T) Enum.valueOf(defaultValue.getClass(), enumValueAsString);
     }
 
     private static boolean getBoolean(String key, boolean defValue) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
index 3a245d62..da5cbf09 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
@@ -23,6 +23,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.RectF;
+import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
@@ -30,6 +31,7 @@ import android.util.Base64;
 import android.util.Base64OutputStream;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
+import android.widget.ImageView;
 
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
@@ -39,6 +41,7 @@ import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
 import de.thedevstack.conversationsplus.utils.ExifHelper;
+import de.thedevstack.conversationsplus.utils.FileHelper;
 import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
 
 public class FileBackend {
@@ -95,7 +98,7 @@ public class FileBackend {
 
 	public static String getConversationsImageDirectory() {
 		return Environment.getExternalStoragePublicDirectory(
-			Environment.DIRECTORY_PICTURES).getAbsolutePath()
+                Environment.DIRECTORY_PICTURES).getAbsolutePath()
 			+ "/Conversations/";
 	}
 
@@ -127,24 +130,7 @@ public class FileBackend {
 	}
 
 	public String getOriginalPath(Uri uri) {
-		String path = null;
-		if (uri.getScheme().equals("file")) {
-			return uri.getPath();
-		} else if (uri.toString().startsWith("content://media/")) {
-			String[] projection = {MediaStore.MediaColumns.DATA};
-			Cursor metaCursor = mXmppConnectionService.getContentResolver().query(uri,
-					projection, null, null, null);
-			if (metaCursor != null) {
-				try {
-					if (metaCursor.moveToFirst()) {
-						path = metaCursor.getString(0);
-					}
-				} finally {
-					metaCursor.close();
-				}
-			}
-		}
-		return path;
+		return FileHelper.getRealPathFromUri(uri);
 	}
 
 	public DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
@@ -268,13 +254,43 @@ public class FileBackend {
 				throw new FileNotFoundException();
 			}
 			thumbnail = resize(fullsize, size);
-			this.mXmppConnectionService.getBitmapCache().put(message.getUuid(),
+            try {
+                thumbnail = rotate(thumbnail, file.getAbsolutePath());
+            } catch (IOException e) {
+                throw new FileNotFoundException();
+            }
+            this.mXmppConnectionService.getBitmapCache().put(message.getUuid(),
 					thumbnail);
 		}
 		return thumbnail;
 	}
 
-	public Uri getTakePhotoUri() {
+    private Bitmap rotate(Bitmap original, String srcPath) throws IOException {
+        try {
+            ExifInterface exif = new ExifInterface(srcPath);
+            int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
+            int rotation = 0;
+            switch (orientation) {
+                case ExifInterface.ORIENTATION_ROTATE_90:
+                    rotation = 90;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_180:
+                    rotation = 180;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_270:
+                    rotation = 270;
+                    break;
+            }
+            if (rotation > 0) {
+                return rotate(original, rotation);
+            }
+        } catch (IOException e) {
+            Log.w("filebackend", "Error while rotating image, returning original");
+        }
+        return original;
+    }
+
+    public Uri getTakePhotoUri() {
 		StringBuilder pathBuilder = new StringBuilder();
 		pathBuilder.append(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM));
 		pathBuilder.append('/');
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 25d6a389..62ed2781 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -1,13 +1,16 @@
 package de.thedevstack.conversationsplus.services;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
+import android.database.Cursor;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -20,6 +23,7 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.provider.ContactsContract;
+import android.provider.MediaStore;
 import android.util.Log;
 import android.util.LruCache;
 
@@ -32,6 +36,10 @@ import net.java.otr4j.session.SessionStatus;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpServiceConnection;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -49,6 +57,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import de.duenndns.ssl.MemorizingTrustManager;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.enums.UserDecision;
+import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
+import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
+import de.thedevstack.conversationsplus.utils.FileHelper;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
@@ -122,7 +134,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	};
 
-	private final SerialSingleThreadExecutor mFileAddingExecutor = new SerialSingleThreadExecutor();
+    private final SerialSingleThreadExecutor mFileAddingExecutor = new SerialSingleThreadExecutor();
 	private final SerialSingleThreadExecutor mDatabaseExecutor = new SerialSingleThreadExecutor();
 
 	private final IBinder mBinder = new XmppConnectionBinder();
@@ -401,38 +413,84 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	public void attachImageToConversation(final Conversation conversation,
-			final Uri uri, final UiCallback<Message> callback) {
-		final Message 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() {
+        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) {
+                    Log.e("pictureresize", "File not found to send not resized. " + e.getMessage());
+                    callback.error(R.string.error_file_not_found, message);
+                } catch (IOException e) {
+                    Log.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) {
+                            Log.w("pictureresize", "Error while closing stream for sending not resized picture. " + e.getMessage());
+                        }
+                    }
+                }
+            }
+        });
+    }
 
-			@Override
-			public void run() {
-				try {
-					getFileBackend().copyImageToPrivateStorage(message, uri);
-					if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
-						getPgpEngine().encrypt(message, callback);
-					} else {
-						callback.success(message);
-					}
-				} catch (final FileBackend.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 {
+                    getFileBackend().copyImageToPrivateStorage(message, uri);
+                    if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
+                        getPgpEngine().encrypt(message, callback);
+                    } else {
+                        callback.success(message);
+                    }
+                } catch (final FileBackend.FileCopyException e) {
+                    callback.error(e.getResId(), message);
+                }
+            }
+        });
+    }
 
-	public Conversation find(Bookmark bookmark) {
+    public Conversation find(Bookmark bookmark) {
 		return find(bookmark.getAccount(), bookmark.getJid());
 	}
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
index 64d4b521..3ae2a07a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
@@ -30,6 +30,8 @@ import android.widget.Toast;
 import net.java.otr4j.session.SessionStatus;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
+import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
 import de.timroes.android.listview.EnhancedListView;
 
 import java.util.ArrayList;
@@ -1129,29 +1131,9 @@ public class ConversationActivity extends XmppActivity
 		if (conversation == null) {
 			return;
 		}
-		//TODO Resize setting
-		prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_image), Toast.LENGTH_LONG);
-		prepareFileToast.show();
-		xmppConnectionService.attachImageToConversation(conversation, uri,
-				new UiCallback<Message>() {
-
-					@Override
-					public void userInputRequried(PendingIntent pi,
-							Message object) {
-						hidePrepareFileToast();
-					}
-
-					@Override
-					public void success(Message message) {
-						xmppConnectionService.sendMessage(message);
-					}
-
-					@Override
-					public void error(int error, Message message) {
-						hidePrepareFileToast();
-						displayErrorDialog(error);
-					}
-				});
+        ResizePictureUserDecisionListener userDecisionListener = new ResizePictureUserDecisionListener(this, conversation, uri, xmppConnectionService);
+        UserDecisionDialog userDecisionDialog = new UserDecisionDialog(this, R.string.userdecision_question_resize_picture, userDecisionListener);
+        userDecisionDialog.decide(ConversationsPlusPreferences.resizePicture());
 	}
 
 	private void hidePrepareFileToast() {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java
index 55a19b42..e73b7cbe 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java
@@ -14,21 +14,23 @@ import android.widget.Toast;
 
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
-import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter;
+import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
+import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
+import de.thedevstack.conversationsplus.ui.listeners.ShareWithResizePictureUserDecisionListener;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 
 public class ShareWithActivity extends XmppActivity {
 
-	private class Share {
+	public class Share {
 		public List<Uri> uris = new ArrayList<>();
 		public boolean image;
 		public String account;
@@ -193,34 +195,36 @@ public class ShareWithActivity extends XmppActivity {
 
 	private void share(final Conversation conversation) {
 		if (share.uris.size() != 0) {
-			OnPresenceSelected callback = new OnPresenceSelected() {
-				@Override
-				public void onPresenceSelected() {
-					if (share.image) {
-						Toast.makeText(getApplicationContext(),
-								getText(R.string.preparing_image),
-								Toast.LENGTH_LONG).show();
-						for (Iterator<Uri> i = share.uris.iterator(); i.hasNext(); i.remove()) {
-							ShareWithActivity.this.xmppConnectionService
-									.attachImageToConversation(conversation, i.next(),
-											attachFileCallback);
-						}
-					} else {
-						Toast.makeText(getApplicationContext(),
-								getText(R.string.preparing_file),
-								Toast.LENGTH_LONG).show();
-						ShareWithActivity.this.xmppConnectionService
-								.attachFileToConversation(conversation, share.uris.get(0),
-										attachFileCallback);
-					}
-					switchToConversation(conversation, null, true);
-					finish();
-				}
-			};
+			OnPresenceSelected callback;
+            if (this.share.image) {
+                callback = new OnPresenceSelected() {
+                    @Override
+                    public void onPresenceSelected() {
+                        ResizePictureUserDecisionListener userDecisionListener = new ShareWithResizePictureUserDecisionListener(ShareWithActivity.this, conversation, xmppConnectionService, share.uris);
+                        UserDecisionDialog userDecisionDialog = new UserDecisionDialog(ShareWithActivity.this, R.string.userdecision_question_resize_picture, userDecisionListener);
+                        userDecisionDialog.decide(ConversationsPlusPreferences.resizePicture());
+                    }
+                };
+            } else {
+                callback = new OnPresenceSelected() {
+                    @Override
+                    public void onPresenceSelected() {
+                        Toast.makeText(getApplicationContext(),
+                                getText(R.string.preparing_file),
+                                Toast.LENGTH_LONG).show();
+                        ShareWithActivity.this.xmppConnectionService
+                                .attachFileToConversation(conversation, share.uris.get(0),
+                                        attachFileCallback);
+                        switchToConversation(conversation, null, true);
+                        finish();
+                    }
+                };
+            }
+
 			if (conversation.getAccount().httpUploadAvailable()) {
-				callback.onPresenceSelected();
+                callback.onPresenceSelected();
 			} else {
-				selectPresence(conversation, callback);
+                selectPresence(conversation, callback);
 			}
 		} else {
 			switchToConversation(conversation, this.share.text, true);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
index f0e5992f..ecf1ce77 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
@@ -43,6 +43,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.google.zxing.BarcodeFormat;
@@ -55,6 +56,7 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import net.java.otr4j.session.SessionID;
 
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -423,49 +425,49 @@ public abstract class XmppActivity extends Activity {
 
 	protected void announcePgp(Account account, final Conversation conversation) {
 		xmppConnectionService.getPgpEngine().generateSignature(account,
-				"online", new UiCallback<Account>() {
-
-					@Override
-					public void userInputRequried(PendingIntent pi,
-												  Account account) {
-						try {
-							startIntentSenderForResult(pi.getIntentSender(),
-									REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
-						} catch (final SendIntentException ignored) {
-						}
-					}
-
-					@Override
-					public void success(Account account) {
-						xmppConnectionService.databaseBackend.updateAccount(account);
-						xmppConnectionService.sendPresence(account);
-						if (conversation != null) {
-							conversation.setNextEncryption(Message.ENCRYPTION_PGP);
-							xmppConnectionService.databaseBackend.updateConversation(conversation);
-						}
-					}
-
-					@Override
-					public void error(int error, Account account) {
-						displayErrorDialog(error);
-					}
-				});
-	}
-
-	protected void displayErrorDialog(final int errorCode) {
+                "online", new UiCallback<Account>() {
+
+                    @Override
+                    public void userInputRequried(PendingIntent pi,
+                                                  Account account) {
+                        try {
+                            startIntentSenderForResult(pi.getIntentSender(),
+                                    REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
+                        } catch (final SendIntentException ignored) {
+                        }
+                    }
+
+                    @Override
+                    public void success(Account account) {
+                        xmppConnectionService.databaseBackend.updateAccount(account);
+                        xmppConnectionService.sendPresence(account);
+                        if (conversation != null) {
+                            conversation.setNextEncryption(Message.ENCRYPTION_PGP);
+                            xmppConnectionService.databaseBackend.updateConversation(conversation);
+                        }
+                    }
+
+                    @Override
+                    public void error(int error, Account account) {
+                        displayErrorDialog(error);
+                    }
+                });
+	}
+
+	public void displayErrorDialog(final int errorCode) {
 		runOnUiThread(new Runnable() {
 
-			@Override
-			public void run() {
-				AlertDialog.Builder builder = new AlertDialog.Builder(
-						XmppActivity.this);
-				builder.setIconAttribute(android.R.attr.alertDialogIcon);
-				builder.setTitle(getString(R.string.error));
-				builder.setMessage(errorCode);
-				builder.setNeutralButton(R.string.accept, null);
-				builder.create().show();
-			}
-		});
+            @Override
+            public void run() {
+                AlertDialog.Builder builder = new AlertDialog.Builder(
+                        XmppActivity.this);
+                builder.setIconAttribute(android.R.attr.alertDialogIcon);
+                builder.setTitle(getString(R.string.error));
+                builder.setMessage(errorCode);
+                builder.setNeutralButton(R.string.accept, null);
+                builder.create().show();
+            }
+        });
 
 	}
 
@@ -504,9 +506,9 @@ public abstract class XmppActivity extends Activity {
 					public void onClick(DialogInterface dialog, int which) {
 						if (xmppConnectionServiceBound) {
 							xmppConnectionService.sendPresencePacket(contact
-									.getAccount(), xmppConnectionService
-									.getPresenceGenerator()
-									.requestPresenceUpdatesFrom(contact));
+                                    .getAccount(), xmppConnectionService
+                                    .getPresenceGenerator()
+                                    .requestPresenceUpdatesFrom(contact));
 						}
 					}
 				});
@@ -867,10 +869,12 @@ public abstract class XmppActivity extends Activity {
 
 	class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
 		private final WeakReference<ImageView> imageViewReference;
-		private Message message = null;
+        private final boolean setSize;
+        private Message message = null;
 
-		public BitmapWorkerTask(ImageView imageView) {
+		public BitmapWorkerTask(ImageView imageView, boolean setSize) {
 			imageViewReference = new WeakReference<>(imageView);
+            this.setSize = setSize;
 		}
 
 		@Override
@@ -891,12 +895,16 @@ public abstract class XmppActivity extends Activity {
 				if (imageView != null) {
 					imageView.setImageBitmap(bitmap);
 					imageView.setBackgroundColor(0x00000000);
+                    if (setSize) {
+                         imageView.setLayoutParams(new LinearLayout.LayoutParams(
+                                 bitmap.getWidth(), bitmap.getHeight()));
+                    }
 				}
 			}
 		}
 	}
 
-	public void loadBitmap(Message message, ImageView imageView) {
+	public void loadBitmap(Message message, ImageView imageView, boolean setSize) {
 		Bitmap bm;
 		try {
 			bm = xmppConnectionService.getFileBackend().getThumbnail(message,
@@ -904,13 +912,19 @@ public abstract class XmppActivity extends Activity {
 		} catch (FileNotFoundException e) {
 			bm = null;
 		}
+
 		if (bm != null) {
 			imageView.setImageBitmap(bm);
 			imageView.setBackgroundColor(0x00000000);
+            if (setSize) {
+                imageView.setLayoutParams(new LinearLayout.LayoutParams(
+                        bm.getWidth(), bm.getHeight()));
+            }
 		} else {
 			if (cancelPotentialWork(message, imageView)) {
 				imageView.setBackgroundColor(0xff333333);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
+
+				final BitmapWorkerTask task = new BitmapWorkerTask(imageView, setSize);
 				final AsyncDrawable asyncDrawable = new AsyncDrawable(
 						getResources(), null, task);
 				imageView.setImageDrawable(asyncDrawable);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index 1fc6e066..56e1baa4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -106,7 +106,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 				|| message.getTransferable().getStatus() != Transferable.STATUS_DELETED)) {
 			mLastMessage.setVisibility(View.GONE);
 			imagePreview.setVisibility(View.VISIBLE);
-			activity.loadBitmap(message, imagePreview);
+			activity.loadBitmap(message, imagePreview, false);
 		} else {
 			Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message);
 			mLastMessage.setVisibility(View.VISIBLE);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index 550e3c4e..bbe0d362 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -206,7 +206,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.image.setVisibility(View.GONE);
 		viewHolder.messageBody.setVisibility(View.VISIBLE);
 		viewHolder.messageBody.setText(getContext().getString(
-				R.string.decryption_failed));
+                R.string.decryption_failed));
 		viewHolder.messageBody.setTextColor(activity.getWarningTextColor());
 		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
 		viewHolder.messageBody.setTextIsSelectable(false);
@@ -297,11 +297,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.download_button.setText(text);
 		viewHolder.download_button.setOnClickListener(new OnClickListener() {
 
-			@Override
-			public void onClick(View v) {
-				startDownloadable(message);
-			}
-		});
+            @Override
+            public void onClick(View v) {
+                startDownloadable(message);
+            }
+        });
 		viewHolder.download_button.setOnLongClickListener(openContextMenu);
 	}
 
@@ -343,7 +343,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.messageBody.setVisibility(View.GONE);
 		viewHolder.image.setVisibility(View.VISIBLE);
 		FileParams params = message.getFileParams();
-		double target = metrics.density * 288;
+        //TODO: Check what value add the following lines have (compared with setting height/width in XmppActivity.loadBitmap from thumbnail after thumbnail is created)
+		/*double target = metrics.density * 288;
 		int scalledW;
 		int scalledH;
 		if (params.width <= params.height) {
@@ -354,18 +355,19 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			scalledH = (int) (params.height / ((double) params.width / target));
 		}
 		viewHolder.image.setLayoutParams(new LinearLayout.LayoutParams(
-				scalledW, scalledH));
-		activity.loadBitmap(message, viewHolder.image);
-		viewHolder.image.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				Intent intent = new Intent(Intent.ACTION_VIEW);
-				intent.setDataAndType(activity.xmppConnectionService
-						.getFileBackend().getJingleFileUri(message), "image/*");
-				getContext().startActivity(intent);
-			}
-		});
+                scalledW, scalledH));*/
+        //TODO Why should this be calculated by hand???
+		activity.loadBitmap(message, viewHolder.image, true);
+        viewHolder.image.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setDataAndType(activity.xmppConnectionService
+                        .getFileBackend().getJingleFileUri(message), "image/*");
+                getContext().startActivity(intent);
+            }
+        });
 		viewHolder.image.setOnLongClickListener(openContextMenu);
 	}
 
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 25d522f0..16939a1b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -43,6 +43,8 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
         displayMessageTypeInfo(view, message);
         displayMessageStatusInfo(view, message);
         displayFileInfo(view, message);
+
+        this.setView(view);
     }
 
     /**
@@ -61,7 +63,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
             TextView mimetype = (TextView) view.findViewById(R.id.dlgMsgDetFileMimeType);
             mimetype.setText(message.getMimeType());
         }
-        this.setView(view);
     }
 
     /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java
new file mode 100644
index 00000000..ad920934
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java
@@ -0,0 +1,70 @@
+package de.thedevstack.conversationsplus.ui.dialogs;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import de.thedevstack.conversationsplus.R;
+import de.thedevstack.conversationsplus.enums.UserDecision;
+import de.thedevstack.conversationsplus.ui.listeners.UserDecisionListener;
+
+/**
+ * Created by tzur on 31.10.2015.
+ */
+public class UserDecisionDialog extends AbstractAlertDialog {
+    protected final UserDecisionListener listener;
+    protected final CheckBox rememberCheckBox;
+
+    public UserDecisionDialog(Activity context, int questionResourceId, UserDecisionListener userDecisionListener) {
+        super(context, "User Decision");
+        this.listener = userDecisionListener;
+
+        int viewId = R.layout.dialog_userdecision;
+        View view = context.getLayoutInflater().inflate(viewId, null);
+
+        ((TextView)view.findViewById(R.id.dlgUserDecQuestion)).setText(questionResourceId);
+        this.rememberCheckBox = (CheckBox) view.findViewById(R.id.dlgUserDecRemember);
+
+        this.setPositiveButton(R.string.cplus_yes, new PositiveOnClickListener());
+        this.setNegativeButton(R.string.cplus_no, new NegativeOnClickListener());
+        this.setView(view);
+    }
+
+    public void decide(UserDecision baseDecision) {
+        switch (baseDecision) {
+            case ALWAYS:
+                this.listener.onYes();
+                break;
+            case NEVER:
+                this.listener.onNo();
+                break;
+            case ASK:
+                this.show();
+                break;
+        }
+    }
+
+    class PositiveOnClickListener implements DialogInterface.OnClickListener {
+
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            listener.onYes();
+            if (rememberCheckBox.isChecked()) {
+                listener.onRemember(UserDecision.ALWAYS);
+            }
+        }
+    }
+
+    class NegativeOnClickListener implements DialogInterface.OnClickListener {
+
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            listener.onNo();
+            if (rememberCheckBox.isChecked()) {
+                listener.onRemember(UserDecision.NEVER);
+            }
+        }
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
new file mode 100644
index 00000000..ae2b3b79
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -0,0 +1,97 @@
+package de.thedevstack.conversationsplus.ui.listeners;
+
+import android.app.PendingIntent;
+import android.net.Uri;
+import android.widget.Toast;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.R;
+import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.enums.UserDecision;
+import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.ui.UiCallback;
+import de.thedevstack.conversationsplus.ui.XmppActivity;
+
+/**
+ * Created by tzur on 31.10.2015.
+ */
+public class ResizePictureUserDecisionListener implements UserDecisionListener {
+    protected Uri uri;
+    protected final Conversation conversation;
+    protected final UiCallback<Message> callback;
+    protected final XmppConnectionService xmppConnectionService;
+    protected final Toast prepareFileToast;
+    protected final XmppActivity activity;
+
+    public ResizePictureUserDecisionListener(XmppActivity activity, Conversation conversation, XmppConnectionService xmppConnectionService) {
+        this.xmppConnectionService = xmppConnectionService;
+        this.conversation = conversation;
+        this.activity = activity;
+        this.prepareFileToast = Toast.makeText(ConversationsPlusApplication.getAppContext(), ConversationsPlusApplication.getInstance().getText(R.string.preparing_image), Toast.LENGTH_LONG);
+        this.callback = new UiCallback<Message>() {
+
+            @Override
+            public void userInputRequried(PendingIntent pi,
+                                          Message object) {
+                hidePrepareFileToast();
+            }
+
+            @Override
+            public void success(Message message) {
+                ResizePictureUserDecisionListener.this.xmppConnectionService.sendMessage(message);
+            }
+
+            @Override
+            public void error(int error, Message message) {
+                hidePrepareFileToast();
+                ResizePictureUserDecisionListener.this.activity.displayErrorDialog(error);
+            }
+
+            protected void hidePrepareFileToast() {
+                ResizePictureUserDecisionListener.this.activity.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ResizePictureUserDecisionListener.this.prepareFileToast.cancel();
+                    }
+                });
+            }
+        };
+    }
+
+    public ResizePictureUserDecisionListener(XmppActivity activity, Conversation conversation, Uri uri, XmppConnectionService xmppConnectionService) {
+        this(activity, conversation, xmppConnectionService);
+        this.uri = uri;
+    }
+
+    public void setUri(Uri uri) {
+        this.uri = uri;
+    }
+
+    protected void showPrepareFileToast() {
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                prepareFileToast.show();
+            }
+        });
+    }
+
+    @Override
+    public void onYes() {
+        this.showPrepareFileToast();
+        xmppConnectionService.attachImageToConversation(this.conversation, this.uri, this.callback);
+    }
+
+    @Override
+    public void onNo() {
+        this.showPrepareFileToast();
+        xmppConnectionService.attachImageToConversationWithoutResizing(this.conversation, this.uri, this.callback);
+    }
+
+    @Override
+    public void onRemember(UserDecision decision) {
+        ConversationsPlusPreferences.applyResizePicture(decision);
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ShareWithResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ShareWithResizePictureUserDecisionListener.java
new file mode 100644
index 00000000..e2678ef7
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ShareWithResizePictureUserDecisionListener.java
@@ -0,0 +1,48 @@
+package de.thedevstack.conversationsplus.ui.listeners;
+
+import android.net.Uri;
+
+import java.util.List;
+
+import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.ui.XmppActivity;
+
+/**
+ * Created by tzur on 03.11.2015.
+ */
+public class ShareWithResizePictureUserDecisionListener extends ResizePictureUserDecisionListener {
+    protected final List<Uri> uris;
+
+    public ShareWithResizePictureUserDecisionListener(XmppActivity activity, Conversation conversation, XmppConnectionService xmppConnectionService, List<Uri> uris) {
+        super(activity, conversation, xmppConnectionService);
+        this.uris = uris;
+    }
+
+    @Override
+    public void onYes() {
+        if (null != this.uris && !this.uris.isEmpty()) {
+            for (Uri uri : this.uris) {
+                this.setUri(uri);
+                super.onYes();
+            }
+        }
+        this.finishSharing();
+    }
+
+    @Override
+    public void onNo() {
+        if (null != this.uris && !this.uris.isEmpty()) {
+            for (Uri uri : this.uris) {
+                this.setUri(uri);
+                super.onNo();
+            }
+        }
+        this.finishSharing();
+    }
+
+    protected void finishSharing() {
+        this.activity.switchToConversation(conversation, null, true);
+        this.activity.finish();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java
new file mode 100644
index 00000000..fbee6290
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java
@@ -0,0 +1,12 @@
+package de.thedevstack.conversationsplus.ui.listeners;
+
+import de.thedevstack.conversationsplus.enums.UserDecision;
+
+/**
+ * Created by tzur on 31.10.2015.
+ */
+public interface UserDecisionListener {
+    void onYes();
+    void onNo();
+    void onRemember(UserDecision decision);
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/FileHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/FileHelper.java
new file mode 100644
index 00000000..3384b54e
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/FileHelper.java
@@ -0,0 +1,43 @@
+package de.thedevstack.conversationsplus.utils;
+
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.MediaStore;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+
+/**
+ * Created by tzur on 30.10.2015.
+ */
+public final class FileHelper {
+
+    /**
+     * Get the real path from an Uri.
+     * @param uri the uri to convert to the real path
+     * @return the real path or <code>null</code>
+     */
+    public static String getRealPathFromUri(Uri uri) {
+        String path = null;
+        if (uri.getScheme().equals("file")) {
+            return uri.getPath();
+        } else if (uri.toString().startsWith("content://media/")) {
+            String[] projection = {MediaStore.MediaColumns.DATA};
+            Cursor metaCursor = ConversationsPlusApplication.getInstance().getContentResolver().query(uri,
+                    projection, null, null, null);
+            if (metaCursor != null) {
+                try {
+                    if (metaCursor.moveToFirst()) {
+                        path = metaCursor.getString(0);
+                    }
+                } finally {
+                    metaCursor.close();
+                }
+            }
+        }
+        return path;
+    }
+
+    private FileHelper() {
+        // Utility class - do not instantiate
+    }
+}
diff --git a/src/main/res/layout/dialog_userdecision.xml b/src/main/res/layout/dialog_userdecision.xml
new file mode 100644
index 00000000..edeff812
--- /dev/null
+++ b/src/main/res/layout/dialog_userdecision.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="Medium Text"
+        android:id="@+id/dlgUserDecQuestion" />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cplus_remember_userdecision"
+        android:id="@+id/dlgUserDecRemember"
+        android:checked="false" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 247ca4c1..01d15d10 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -496,4 +496,8 @@
   <string name="pref_resize_picture_never">nie</string>
   <string name="pref_resize_picture_summary">Sollen Bilder vor dem Senden verkleinert werden oder nicht?</string>
   <string name="pref_resize_picture">Bilder verkleinern</string>
+  <string name="cplus_yes">Ja</string>
+  <string name="cplus_no">Nein</string>
+  <string name="cplus_remember_userdecision">Diese Entscheidung merken</string>
+  <string name="userdecision_question_resize_picture">Soll das Bild verkleinert werden?</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5f594800..99f2699e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -525,4 +525,8 @@
     <string name="pref_resize_picture_never">never</string>
     <string name="pref_resize_picture_summary">Whether pictures shall be resized or not</string>
     <string name="pref_resize_picture">Resize pictures</string>
+    <string name="cplus_yes">Yes</string>
+    <string name="cplus_no">No</string>
+    <string name="cplus_remember_userdecision">Remember this decision</string>
+    <string name="userdecision_question_resize_picture">Shall the picture be resized?</string>
 </resources>