1 files changed, 9 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 88645c4a..57fcf4e3 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,10 +20,14 @@ import android.widget.Toast;
 import com.soundcloud.android.crop.Crop;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 
+import de.thedevstack.conversationsplus.utils.ImageUtil;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
+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;
@@ -110,7 +115,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 				if (avatarUri != null) {
 					publishButton.setText(R.string.publishing);
 					disablePublishButton();
-					xmppConnectionService.publishAvatar(account, avatarUri,
+					AvatarService.getInstance().publishAvatar(account, avatarUri,
 							avatarPublication);
 				}
 			}
@@ -190,7 +195,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 			switch (requestCode) {
 				case REQUEST_CHOOSE_FILE_AND_CROP:
 					Uri source = data.getData();
-					String original = FileUtils.getPath(this, source);
+					String original = FileUtils.getPath(source);
 					if (original != null) {
 						source = Uri.parse("file://"+original);
 					}
@@ -231,7 +236,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);
@@ -276,7 +281,7 @@ 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();
 		}