xander/main
1
0
Fork 0
mirror of https://github.com/googlefonts/noto-emoji.git synced 2025-07-08 21:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(Hopefully) fixed AssetEmojiCompatConfig

Browse source
This commit is contained in:
c1710 2018-04-22 16:55:05 +02:00
parent 0c03a4ae77
commit d1def0b30e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
emojicompat/AssetEmojiCompatConfig.java
View file

@ -58,7 +58,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
private AssetMetadataLoader(@NonNull Context context, private AssetMetadataLoader(@NonNull Context context,
// NEW // NEW
String assetName) { String assetName) {
this.mContext = context; this.mContext = context.getApplicationContext();
// NEW // NEW
this.assetName = assetName; this.assetName = assetName;
} }
@ -69,7 +69,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
@RequiresApi(19) @RequiresApi(19)
public void load(@NonNull EmojiCompat.MetadataRepoLoaderCallback loaderCallback) { public void load(@NonNull EmojiCompat.MetadataRepoLoaderCallback loaderCallback) {
Preconditions.checkNotNull(loaderCallback, "loaderCallback cannot be null"); Preconditions.checkNotNull(loaderCallback, "loaderCallback cannot be null");
final InitRunnable runnable = new InitRunnable(mContext, loaderCallback, assetName); final InitRunnable runnable = new InitRunnable(mContext, loaderCallback);
final Thread thread = new Thread(runnable); final Thread thread = new Thread(runnable);
thread.setDaemon(false); thread.setDaemon(false);
thread.start(); thread.start();
@ -88,6 +88,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
final EmojiCompat.MetadataRepoLoaderCallback loaderCallback, final EmojiCompat.MetadataRepoLoaderCallback loaderCallback,
// NEW parameter // NEW parameter
final String FONT_NAME) { final String FONT_NAME) {
// This has been changed a bit in order to get some consistency
this.context = context; this.context = context;
this.loaderCallback = loaderCallback; this.loaderCallback = loaderCallback;
this.FONT_NAME = FONT_NAME; this.FONT_NAME = FONT_NAME;
@ -97,11 +98,11 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
@Override @Override
public void run() { public void run() {
try { try {
final AssetManager assetManager = context.getAssets(); final AssetManager assetManager = mContext.getAssets();
final MetadataRepo resourceIndex = MetadataRepo.create(assetManager, FONT_NAME); final MetadataRepo resourceIndex = MetadataRepo.create(assetManager, FONT_NAME);
loaderCallback.onLoaded(resourceIndex); mLoaderCallback.onLoaded(resourceIndex);
} catch (Throwable t) { } catch (Throwable t) {
loaderCallback.onFailed(t); mLoaderCallback.onFailed(t);
} }
} }
} }