TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-21 12:51:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scale down bitmap during scribble rendering on lowmem devices

Browse Source 
Fixes #5969

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-12-17 18:59:47 -08:00
parent 4ff8de0ca8
commit 899f3af5e4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/scribbles/widget/ScribbleView.java
View File

@ -32,12 +32,14 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.target.Target;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
import org.thoughtcrime.securesms.scribbles.widget.entity.MotionEntity; import org.thoughtcrime.securesms.scribbles.widget.entity.MotionEntity;
import org.thoughtcrime.securesms.scribbles.widget.entity.TextEntity; import org.thoughtcrime.securesms.scribbles.widget.entity.TextEntity;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
import org.thoughtcrime.securesms.util.concurrent.SettableFuture; import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
@ -82,12 +84,14 @@ public class ScribbleView extends FrameLayout {
Glide.with(getContext()) Glide.with(getContext())
.load(new DecryptableUri(masterSecret, uri)) .load(new DecryptableUri(masterSecret, uri))
.diskCacheStrategy(DiskCacheStrategy.NONE) .diskCacheStrategy(DiskCacheStrategy.NONE)
.fitCenter()
.into(imageView); .into(imageView);
} }
public @NonNull ListenableFuture<Bitmap> getRenderedImage() { public @NonNull ListenableFuture<Bitmap> getRenderedImage() {
final SettableFuture<Bitmap> future = new SettableFuture<>(); final SettableFuture<Bitmap> future = new SettableFuture<>();
final Context context = getContext(); final Context context = getContext();
final boolean isLowMemory = Util.isLowMemory(context);
if (imageUri == null || masterSecret == null) { if (imageUri == null || masterSecret == null) {
future.set(null); future.set(null);
@ -98,12 +102,20 @@ public class ScribbleView extends FrameLayout {
@Override @Override
protected @Nullable Bitmap doInBackground(Void... params) { protected @Nullable Bitmap doInBackground(Void... params) {
try { try {
int width = Target.SIZE_ORIGINAL;
int height = Target.SIZE_ORIGINAL;
if (isLowMemory) {
width = 768;
height = 768;
}
return Glide.with(context) return Glide.with(context)
.load(new DecryptableUri(masterSecret, imageUri)) .load(new DecryptableUri(masterSecret, imageUri))
.asBitmap() .asBitmap()
.diskCacheStrategy(DiskCacheStrategy.NONE) .diskCacheStrategy(DiskCacheStrategy.NONE)
.skipMemoryCache(true) .skipMemoryCache(true)
.into(-1, -1) .into(width, height)
.get(); .get();
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {
Log.w(TAG, e); Log.w(TAG, e);