From 531bb21c3bafd2d4914075d23f28a712c2066602 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 16 Jun 2014 23:15:10 +0000
Subject: [PATCH] Fixed B64 encoding of Bitmaps

---
 TODO                                                     | 1 -
 app/src/main/java/i2p/bote/android/util/BoteHelper.java  | 9 +++++----
 .../java/i2p/bote/android/util/EditPictureFragment.java  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index f2d703f..c3b06f9 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 Fixes:
-- Fix B64 encoding of Bitmaps
 - Figure out how to highlight email backgrounds when selected in list
 - Refine view email page
 -- Delete/read/unread/move actions that don't break everything
diff --git a/app/src/main/java/i2p/bote/android/util/BoteHelper.java b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
index e7aa202..2d0730b 100644
--- a/app/src/main/java/i2p/bote/android/util/BoteHelper.java
+++ b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
@@ -15,7 +15,9 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
-import android.util.Base64;
+
+import com.lambdaworks.codec.Base64;
+
 import i2p.bote.android.R;
 import i2p.bote.email.Email;
 import i2p.bote.email.EmailDestination;
@@ -119,7 +121,7 @@ public class BoteHelper extends GeneralHelper {
     public static Bitmap decodePicture(String picB64) {
         if (picB64 == null)
             return null;
-        byte[] decodedPic = Base64.decode(picB64, Base64.DEFAULT);
+        byte[] decodedPic = Base64.decode(picB64.toCharArray());
         return BitmapFactory.decodeByteArray(decodedPic, 0, decodedPic.length);
     }
 
@@ -127,9 +129,8 @@ public class BoteHelper extends GeneralHelper {
         if (picture == null)
             return null;
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        // TODO something is corrupting here
         picture.compress(CompressFormat.PNG, 0, baos);
-        return Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
+        return new String(Base64.encode(baos.toByteArray()));
     }
 
     public static boolean isSentEmail(Email email) throws PasswordException, IOException, GeneralSecurityException, MessagingException {
diff --git a/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java b/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
index 5d31be2..37de9eb 100644
--- a/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
+++ b/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
@@ -41,8 +41,8 @@ public class EditPictureFragment extends Fragment {
 
     protected void setPictureB64(String pic) {
         mPicture = BoteHelper.decodePicture(pic);
-        System.out.println("mPicture == null? " + (mPicture == null));
-        mPictureView.setImageBitmap(mPicture);
+        if (mPicture != null)
+            mPictureView.setImageBitmap(mPicture);
     }
 
     protected String getPictureB64() {