Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Initialise EmojiManager for UI tests.

Browse Source
This commit is contained in:
akwizgran
2018-07-17 17:24:01 +01:00
parent 428501cf5f
commit 83bfeb9075
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
View File

@@ -92,7 +92,6 @@ public class BriarApplicationImpl extends Application
Localizer.getInstance().setLocale(base)); Localizer.getInstance().setLocale(base));
setTheme(base, prefs); setTheme(base, prefs);
ACRA.init(this); ACRA.init(this);
EmojiManager.install(new GoogleEmojiProvider());
} }
@Override @Override
@@ -114,6 +113,7 @@ public class BriarApplicationImpl extends Application
LOG.info("Created"); LOG.info("Created");
applicationComponent = createApplicationComponent(); applicationComponent = createApplicationComponent();
EmojiManager.install(new GoogleEmojiProvider());
} }
protected AndroidComponent createApplicationComponent() { protected AndroidComponent createApplicationComponent() {

4
briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java
View File

@@ -4,6 +4,9 @@ import android.app.Application;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.google.GoogleEmojiProvider;
import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.BrambleCoreModule;
import org.briarproject.briar.BriarCoreModule; import org.briarproject.briar.BriarCoreModule;
@@ -41,6 +44,7 @@ public class TestBriarApplication extends Application
BrambleCoreModule.initEagerSingletons(applicationComponent); BrambleCoreModule.initEagerSingletons(applicationComponent);
BriarCoreModule.initEagerSingletons(applicationComponent); BriarCoreModule.initEagerSingletons(applicationComponent);
AndroidEagerSingletons.initEagerSingletons(applicationComponent); AndroidEagerSingletons.initEagerSingletons(applicationComponent);
EmojiManager.install(new GoogleEmojiProvider());
} }
@Override @Override