Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes a crash when reorienting and downsizing an image for upload. Closes #247

This commit is contained in:
Vavassor 2017-05-02 20:06:48 -04:00
parent ab76121692
commit f7915d614d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/keylesspalace/tusky/DownsizeImageTask.java
View File

@ -86,7 +86,9 @@ class DownsizeImageTask extends AsyncTask<Uri, Void, Boolean> {
try { try {
Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(),
bitmap.getHeight(), matrix, true); bitmap.getHeight(), matrix, true);
bitmap.recycle(); if (!bitmap.sameAs(result)) {
bitmap.recycle();
}
return result; return result;
} catch (OutOfMemoryError e) { } catch (OutOfMemoryError e) {
return null; return null;
@ -180,17 +182,21 @@ class DownsizeImageTask extends AsyncTask<Uri, Void, Boolean> {
if (scaledBitmap == null) { if (scaledBitmap == null) {
return false; return false;
} }
reorientBitmap(scaledBitmap, orientation); Bitmap reorientedBitmap = reorientBitmap(scaledBitmap, orientation);
if (reorientedBitmap == null) {
scaledBitmap.recycle();
return false;
}
Bitmap.CompressFormat format; Bitmap.CompressFormat format;
/* It's not likely the user will give transparent images over the upload limit, but /* It's not likely the user will give transparent images over the upload limit, but
* if they do, make sure the transparency is retained. */ * if they do, make sure the transparency is retained. */
if (!scaledBitmap.hasAlpha()) { if (!reorientedBitmap.hasAlpha()) {
format = Bitmap.CompressFormat.JPEG; format = Bitmap.CompressFormat.JPEG;
} else { } else {
format = Bitmap.CompressFormat.PNG; format = Bitmap.CompressFormat.PNG;
} }
scaledBitmap.compress(format, 75, stream); reorientedBitmap.compress(format, 75, stream);
scaledBitmap.recycle(); reorientedBitmap.recycle();
scaledImageSize /= 2; scaledImageSize /= 2;
iterations++; iterations++;
} while (stream.size() > sizeLimit); } while (stream.size() > sizeLimit);