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

fix glide bitmap locking issue 

Closes #4086
// FREEBIE
This commit is contained in:
Jake McGinty 2015-09-17 18:02:08 -07:00 committed by Moxie Marlinspike
parent eedbc667c6
commit 6ae38d0718
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,11 @@ import android.util.Pair;
import com.bumptech.glide.Glide;
import com.bumptech.glide.Priority;
import com.bumptech.glide.load.DecodeFormat;
import com.bumptech.glide.load.engine.Resource;
import com.bumptech.glide.load.resource.bitmap.BitmapResource;
import com.bumptech.glide.load.resource.bitmap.Downsampler;
import com.bumptech.glide.load.resource.bitmap.FitCenter;
import org.thoughtcrime.securesms.mms.MediaConstraints;
@ -69,8 +74,8 @@ public class BitmapUtil {
throws ExecutionException
{
final Pair<Integer, Integer> dimensions = getDimensions(getInputStreamForModel(context, model));
final Pair<Integer, Integer> clamped = clampDimensions(dimensions.first, dimensions.second,
maxWidth, maxHeight);
final Pair<Integer, Integer> clamped = clampDimensions(dimensions.first, dimensions.second,
maxWidth, maxHeight);
return createScaledBitmapInto(context, model, clamped.first, clamped.second);
}
@ -89,17 +94,18 @@ public class BitmapUtil {
private static <T> Bitmap createScaledBitmapInto(Context context, T model, int width, int height)
throws ExecutionException
{
try {
return Glide.with(context)
.load(model)
.asBitmap()
.fitCenter()
.skipMemoryCache(true)
.into(width, height)
.get();
} catch (InterruptedException ie) {
throw new AssertionError(ie);
final Bitmap rough = Downsampler.AT_LEAST.decode(getInputStreamForModel(context, model),
Glide.get(context).getBitmapPool(),
width, height,
DecodeFormat.PREFER_RGB_565);
final Resource<Bitmap> resource = BitmapResource.obtain(rough, Glide.get(context).getBitmapPool());
final Resource<Bitmap> result = new FitCenter(context).transform(resource, width, height);
if (result == null) {
throw new ExecutionException(new BitmapDecodingException("unable to transform Bitmap"));
}
return result.get();
}
public static <T> Bitmap createScaledBitmap(Context context, T model, float scale)