aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-10 20:37:34 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-10 20:37:34 +0100
commit3b1723dcf19dc6e3390df63a71df903d9cb7dd94 (patch)
treea912db2e2204645fc3138cce62bb75a8d1a9b7d3 /src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
parentaa6a2e1c182858e7bcc077f5220546e08df12ec1 (diff)
parenta7454223008c78dcf5e0ff727bca64241f99daa1 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
index 6b080202..401c77fc 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
@@ -4,7 +4,6 @@ import android.graphics.Bitmap;
import android.net.Uri;
import android.util.Base64;
import android.util.Base64OutputStream;
-import de.thedevstack.conversationsplus.utils.Logging;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -16,6 +15,7 @@ import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
import eu.siacs.conversations.Config;