Update emoji

Fixes #6637
Fixes #7206
This commit is contained in:
Moxie Marlinspike 2017-11-19 18:11:25 -08:00
parent be6a51b123
commit 58f1e68961
10 changed files with 12 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 523 KiB

After

Width:  |  Height:  |  Size: 337 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 818 KiB

After

Width:  |  Height:  |  Size: 812 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 KiB

After

Width:  |  Height:  |  Size: 610 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 959 KiB

After

Width:  |  Height:  |  Size: 694 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 938 KiB

After

Width:  |  Height:  |  Size: 873 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 691 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 741 KiB

After

Width:  |  Height:  |  Size: 482 KiB

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,8 @@ import android.os.AsyncTask;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log; import android.util.Log;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import org.thoughtcrime.securesms.components.emoji.EmojiPageModel; import org.thoughtcrime.securesms.components.emoji.EmojiPageModel;
import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.util.ListenableFutureTask; import org.thoughtcrime.securesms.util.ListenableFutureTask;
@ -72,6 +74,8 @@ public class EmojiPageBitmap {
Bitmap originalBitmap = GlideApp.with(context.getApplicationContext()) Bitmap originalBitmap = GlideApp.with(context.getApplicationContext())
.asBitmap() .asBitmap()
.load("file:///android_asset/" + model.getSprite()) .load("file:///android_asset/" + model.getSprite())
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.NONE)
.submit() .submit()
.get(); .get();