1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
index 6793d882..b41511de 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
@@ -4,7 +4,6 @@ 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;
@@ -20,15 +19,14 @@ 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.services.avatar.AvatarCache;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
-import de.thedevstack.conversationsplus.services.AvatarService;
-import de.thedevstack.conversationsplus.utils.ExifHelper;
+import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 import de.thedevstack.conversationsplus.utils.FileUtils;
 import de.thedevstack.conversationsplus.utils.PhoneHelper;
 import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
@@ -236,7 +234,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 			if (this.avatarUri == null) {
 				if (this.account.getAvatar() != null
 						|| this.defaultUri == null) {
-					this.avatar.setImageBitmap(AvatarService.getInstance().get(account, getPixel(192)));
+					this.avatar.setImageBitmap(AvatarCache.get(account, getPixel(192)));
 					if (this.defaultUri != null) {
 						this.avatar
 								.setOnLongClickListener(this.backToDefaultListener);