1 files changed, 24 insertions, 14 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 4ed015f4..9ad19522 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -19,6 +19,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
+import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
+import de.thedevstack.conversationsplus.ui.listeners.ShareWithResizePictureUserDecisionListener;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -27,6 +31,7 @@ import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.adapter.ConversationAdapter;
+import eu.siacs.conversations.utils.FileUtils;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
@@ -183,7 +188,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 		if (intent == null) {
 			return;
 		}
-		this.mReturnToPrevious = getPreferences().getBoolean("return_to_previous", false);
+		this.mReturnToPrevious = ConversationsPlusPreferences.returnToPrevious();
 		final String type = intent.getType();
 		final String action = intent.getAction();
 		Log.d(Config.LOGTAG, "action: "+action+ ", type:"+type);
@@ -278,30 +283,34 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 			final long max = account.getXmppConnection()
 					.getFeatures()
 					.getMaxHttpUploadSize();
-			OnPresenceSelected callback = new OnPresenceSelected() {
+			OnPresenceSelected callback;
+			if (this.share.image) {
+				// TODO: attachementCounter should be set and decremented correctly
+				callback = new OnPresenceSelected() {
 					@Override
 					public void onPresenceSelected() {
-					attachmentCounter.set(share.uris.size());
-					if (share.image) {
-						share.multiple = share.uris.size() > 1;
-						replaceToast(getString(share.multiple ? R.string.preparing_images : R.string.preparing_image));
-						for (Iterator<Uri> i = share.uris.iterator(); i.hasNext(); i.remove()) {
-							ShareWithActivity.this.xmppConnectionService
-									.attachImageToConversation(conversation, i.next(),
-											attachFileCallback);
+						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 {
+				attachmentCounter.set(share.uris.size());
+				callback = new OnPresenceSelected() {
+					@Override
+					public void onPresenceSelected() {
 						replaceToast(getString(R.string.preparing_file));
 						ShareWithActivity.this.xmppConnectionService
 								.attachFileToConversation(conversation, share.uris.get(0),
 										attachFileCallback);
-					}
+						switchToConversation(conversation, null, true);
+						finish();
 					}
 				};
+			}
 			if (account.httpUploadAvailable()
-					&& ((share.image && !neverCompressPictures())
-					|| conversation.getMode() == Conversation.MODE_MULTI
-					|| FileBackend.allFilesUnderSize(this, share.uris, max))
+					&& (conversation.getMode() == Conversation.MODE_MULTI
+					|| FileUtils.allFilesUnderSize(this, share.uris, max))
 					&& conversation.getNextEncryption() != Message.ENCRYPTION_OTR) {
 				callback.onPresenceSelected();
 			} else {
@@ -328,6 +337,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 				}
 			} else {
 				switchToConversation(conversation, this.share.text, true);
+				finish();
 			}
 		}