Update emoji

Fixes #6637 Fixes #7206
8 years ago · 58f1e68961
parent be6a51b123
commit 58f1e68961
10 changed files with 12 additions and 8 deletions
--- a/assets/emoji/Activity.png
+++ b/assets/emoji/Activity.png
--- a/assets/emoji/Flags.png
+++ b/assets/emoji/Flags.png
--- a/assets/emoji/Foods.png
+++ b/assets/emoji/Foods.png
--- a/assets/emoji/Nature.png
+++ b/assets/emoji/Nature.png
--- a/assets/emoji/Objects.png
+++ b/assets/emoji/Objects.png
--- a/assets/emoji/People.png
+++ b/assets/emoji/People.png
--- a/assets/emoji/Places.png
+++ b/assets/emoji/Places.png
--- a/assets/emoji/Symbols.png
+++ b/assets/emoji/Symbols.png
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
@ -6,6 +6,8 @@ import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.util.Log;

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