I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed B64 encoding of Bitmaps

Browse Source
This commit is contained in:
str4d
2014-06-16 23:15:10 +00:00
parent ea683846c1
commit 531bb21c3b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/i2p/bote/android/util/BoteHelper.java
View File

@@ -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 {

4
app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
View File

@@ -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() {