Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 34 insertions, 29 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 351f1dfc..cb08afe9 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -14,10 +14,13 @@ import android.widget.Toast;
 
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
-import eu.siacs.conversations.Config;
+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.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -28,7 +31,7 @@ import eu.siacs.conversations.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 +196,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);