oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge pull request #1297 from McLoo/master 

Stop recycled bitmap crashes
This commit is contained in:
Moxie Marlinspike 2014-04-05 13:38:45 -07:00
parent 4ea481f9dc 5e8e13ed5a
commit 4caff2e511
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/util/BitmapUtil.java
View File

@ -13,7 +13,6 @@ import android.util.Log;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@ -89,7 +88,7 @@ public class BitmapUtil {
Log.w("BitmapUtil", "Scaling to max width and height: " + aspectWidth + "," + aspectHeight);
Bitmap scaledThumbnail = Bitmap.createScaledBitmap(roughThumbnail, (int)aspectWidth, (int)aspectHeight, true);
roughThumbnail.recycle();
if (roughThumbnail != scaledThumbnail) roughThumbnail.recycle();
return scaledThumbnail;
} else {
return roughThumbnail;