Merge branch 'master' into introduce_cplus_database_version

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	src/main/res/values/strings.xml

2 files changed, 41 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 206ee668..9f6071bb 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
@@ -1,12 +1,14 @@
 package de.thedevstack.conversationsplus.utils;
 
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Base64;
 import android.util.Base64OutputStream;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -59,6 +61,44 @@ public final class AvatarUtil {
         } catch (IOException e) {
             return null;
         }
+
+    }
+
+    public static Avatar getStoredPepAvatar(String hash) {
+        if (hash == null) {
+            return null;
+        }
+        Avatar avatar = new Avatar();
+        File file = new File(getAvatarPath(hash));
+        FileInputStream is = null;
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+            is = new FileInputStream(file);
+            ByteArrayOutputStream mByteArrayOutputStream = new ByteArrayOutputStream();
+            Base64OutputStream mBase64OutputStream = new Base64OutputStream(mByteArrayOutputStream, Base64.DEFAULT);
+            MessageDigest digest = MessageDigest.getInstance("SHA-1");
+            DigestOutputStream os = new DigestOutputStream(mBase64OutputStream, digest);
+            byte[] buffer = new byte[4096];
+            int length;
+            while ((length = is.read(buffer)) > 0) {
+                os.write(buffer, 0, length);
+            }
+            os.flush();
+            os.close();
+            avatar.sha1sum = CryptoHelper.bytesToHex(digest.digest());
+            avatar.image = new String(mByteArrayOutputStream.toByteArray());
+            avatar.height = options.outHeight;
+            avatar.width = options.outWidth;
+            return avatar;
+        } catch (IOException e) {
+            return null;
+        } catch (NoSuchAlgorithmException e) {
+            return null;
+        } finally {
+            StreamUtil.close(is);
+        }
     }
 
     /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java b/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java
index f937e35f..35adf6ec 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java
@@ -7,5 +7,5 @@ public final class Xmlns {
 	public static final String ROSTER = "jabber:iq:roster";
 	public static final String REGISTER = "jabber:iq:register";
 	public static final String BYTE_STREAMS = "http://jabber.org/protocol/bytestreams";
-	public static final String HTTP_UPLOAD = Config.LEGACY_NAMESPACE_HTTP_UPLOAD ? "eu:siacs:conversations:http:upload" : "urn:xmpp:http:upload";
+	public static final String HTTP_UPLOAD = "urn:xmpp:http:upload";
 }