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

Hotfix for FileEmojiCompatConfig

Browse source
This commit is contained in:
Constantin A 2018-05-01 19:29:54 +02:00
parent da60d4fcdc
commit 3667d9b43e
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emojicompat/FileMojiCompat/filemojicompat/build.gradle
View file

@ -18,7 +18,7 @@ ext {
libraryDescription = 'An EmojiCompat implementation using files from a local file or a file inside your assets directory' libraryDescription = 'An EmojiCompat implementation using files from a local file or a file inside your assets directory'
siteUrl = 'https://github.com/c1710/blobmoji' siteUrl = 'https://github.com/c1710/blobmoji'
gitUrl = 'https://github.com/c1710/blobmoji.git' gitUrl = 'https://github.com/c1710/blobmoji.git'
libraryVersion = '1.0.3' libraryVersion = '1.0.5'
developerId = 'c1710' developerId = 'c1710'
developerName = 'Constantin A.' developerName = 'Constantin A.'
developerEmail = 'c1710.apps@outlook.com' developerEmail = 'c1710.apps@outlook.com'
@ -33,8 +33,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 27 targetSdkVersion 27
versionCode 4 versionCode 5
versionName "1.0.3" versionName "1.0.5"
} }

7
emojicompat/FileMojiCompat/filemojicompat/src/main/java/de/c1710/filemojicompat/FileEmojiCompatConfig.java
View file

@ -22,6 +22,7 @@ import android.content.res.AssetManager;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.Build; import android.os.Build;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi; import android.support.annotation.RequiresApi;
import android.support.text.emoji.EmojiCompat; import android.support.text.emoji.EmojiCompat;
import android.support.text.emoji.MetadataRepo; import android.support.text.emoji.MetadataRepo;
@ -68,9 +69,9 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
*/ */
public FileEmojiCompatConfig(@NonNull Context context, public FileEmojiCompatConfig(@NonNull Context context,
// NEW // NEW
@NonNull File fontFile) { @Nullable File fontFile) {
super(new FileMetadataLoader(context, fontFile)); super(new FileMetadataLoader(context, fontFile));
if(fontFile.exists() && fontFile.canRead()) { if(fontFile != null && fontFile.exists() && fontFile.canRead()) {
try { try {
// Is it a font? // Is it a font?
Typeface typeface = Typeface.createFromFile(fontFile); Typeface typeface = Typeface.createFromFile(fontFile);
@ -136,7 +137,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
private FileMetadataLoader(@NonNull Context context, private FileMetadataLoader(@NonNull Context context,
// NEW // NEW
File fontFile) { @Nullable File fontFile) {
this.mContext = context.getApplicationContext(); this.mContext = context.getApplicationContext();
// NEW // NEW
this.fontFile = fontFile; this.fontFile = fontFile;