1 files changed, 24 insertions, 38 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 0752ae32..1916947b 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -4,6 +4,7 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
@@ -19,11 +20,17 @@ import android.widget.Toast;
 import com.soundcloud.android.crop.Crop;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+
+import de.thedevstack.conversationsplus.ConversationsPlusColors;
+import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.persistance.FileBackend;
+import eu.siacs.conversations.services.AvatarService;
+import eu.siacs.conversations.utils.ExifHelper;
 import eu.siacs.conversations.utils.FileUtils;
 import eu.siacs.conversations.utils.PhoneHelper;
 import eu.siacs.conversations.xmpp.pep.Avatar;
@@ -81,9 +88,8 @@ public class PublishProfilePictureActivity extends XmppActivity {
 				@Override
 				public void run() {
 					hintOrWarning.setText(errorCode);
-					hintOrWarning.setTextColor(getWarningTextColor());
-					publishButton.setText(R.string.publish);
-					enablePublishButton();
+					hintOrWarning.setTextColor(ConversationsPlusColors.warning());
+                    TextViewUtil.enable(publishButton, ConversationsPlusColors.primaryText(), R.string.publish);
 				}
 			});
 
@@ -109,9 +115,8 @@ public class PublishProfilePictureActivity extends XmppActivity {
 			@Override
 			public void onClick(View v) {
 				if (avatarUri != null) {
-					publishButton.setText(R.string.publishing);
-					disablePublishButton();
-					xmppConnectionService.publishAvatar(account, avatarUri,
+                    TextViewUtil.disable(publishButton, ConversationsPlusColors.secondaryText(), R.string.publishing);
+					AvatarService.getInstance().publishAvatar(account, avatarUri,
 							avatarPublication);
 				}
 			}
@@ -188,14 +193,10 @@ public class PublishProfilePictureActivity extends XmppActivity {
 	protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		if (resultCode == RESULT_OK) {
-			Uri source = data.getData();
 			switch (requestCode) {
 				case REQUEST_CHOOSE_FILE_AND_CROP:
-					if (FileBackend.weOwnFile(this, source)) {
-						Toast.makeText(this,R.string.security_error_invalid_file_access,Toast.LENGTH_SHORT).show();
-						return;
-					}
-					String original = FileUtils.getPath(this, source);
+					Uri source = data.getData();
+					String original = FileUtils.getPath(source);
 					if (original != null) {
 						source = Uri.parse("file://"+original);
 					}
@@ -204,11 +205,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 					Crop.of(source, destination).asSquare().withMaxSize(size, size).start(this);
 					break;
 				case REQUEST_CHOOSE_FILE:
-					if (FileBackend.weOwnFile(this, source)) {
-						Toast.makeText(this,R.string.security_error_invalid_file_access,Toast.LENGTH_SHORT).show();
-						return;
-					}
-					this.avatarUri = source;
+					this.avatarUri = data.getData();
 					if (xmppConnectionServiceBound) {
 						loadImageIntoPreview(this.avatarUri);
 					}
@@ -240,7 +237,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 			if (this.avatarUri == null) {
 				if (this.account.getAvatar() != null
 						|| this.defaultUri == null) {
-					this.avatar.setImageBitmap(avatarService().get(account, getPixel(192)));
+					this.avatar.setImageBitmap(AvatarService.getInstance().get(account, getPixel(192)));
 					if (this.defaultUri != null) {
 						this.avatar
 								.setOnLongClickListener(this.backToDefaultListener);
@@ -249,7 +246,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 					}
 					if (!support) {
 						this.hintOrWarning
-								.setTextColor(getWarningTextColor());
+								.setTextColor(ConversationsPlusColors.warning());
 						this.hintOrWarning
 								.setText(R.string.error_publish_avatar_no_server_support);
 					}
@@ -285,27 +282,26 @@ public class PublishProfilePictureActivity extends XmppActivity {
 	protected void loadImageIntoPreview(Uri uri) {
 		Bitmap bm = null;
 		try {
-			bm = xmppConnectionService.getFileBackend().cropCenterSquare(uri, getPixel(192));
+			bm = ImageUtil.cropCenterSquare(uri, getPixel(192));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 
 		if (bm == null) {
-			disablePublishButton();
-			this.hintOrWarning.setTextColor(getWarningTextColor());
+            TextViewUtil.disable(this.publishButton, ConversationsPlusColors.secondaryText());
+			this.hintOrWarning.setTextColor(ConversationsPlusColors.warning());
 			this.hintOrWarning
 					.setText(R.string.error_publish_avatar_converting);
 			return;
 		}
 		this.avatar.setImageBitmap(bm);
 		if (support) {
-			enablePublishButton();
-			this.publishButton.setText(R.string.publish);
+            TextViewUtil.enable(this.publishButton, ConversationsPlusColors.primaryText(), R.string.publish);
 			this.hintOrWarning.setText(R.string.publish_avatar_explanation);
-			this.hintOrWarning.setTextColor(getPrimaryTextColor());
+			this.hintOrWarning.setTextColor(ConversationsPlusColors.primaryText());
 		} else {
-			disablePublishButton();
-			this.hintOrWarning.setTextColor(getWarningTextColor());
+			TextViewUtil.disable(this.publishButton, ConversationsPlusColors.secondaryText());
+			this.hintOrWarning.setTextColor(ConversationsPlusColors.warning());
 			this.hintOrWarning
 					.setText(R.string.error_publish_avatar_no_server_support);
 		}
@@ -318,16 +314,6 @@ public class PublishProfilePictureActivity extends XmppActivity {
 		}
 	}
 
-	protected void enablePublishButton() {
-		this.publishButton.setEnabled(true);
-		this.publishButton.setTextColor(getPrimaryTextColor());
-	}
-
-	protected void disablePublishButton() {
-		this.publishButton.setEnabled(false);
-		this.publishButton.setTextColor(getSecondaryTextColor());
-	}
-
 	public void refreshUiReal() {
 		//nothing to do. This Activity doesn't implement any listeners
 	}