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

Update emoji

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
View File

File diff suppressed because one or more lines are too long

4
src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
View File

@@ -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();