simplify DI & test setup, convert TuskyApplication to Kotlin (#1675)
* simplify DI & test setup, convert TuskyApplication to Kotlin * try to fix tests on bitrise * remove conscrypt-openjdk-uber test dependency againmain
Konrad Pozniak
5 years ago
committed by
GitHub
parent
7309b683cc
commit
0279987821
@ -1,158 +0,0 @@ |
||||
/* Copyright 2017 Andrew Dawson |
||||
* |
||||
* This file is a part of Tusky. |
||||
* |
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the |
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even |
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
||||
* Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License along with Tusky; if not, |
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
package com.keylesspalace.tusky; |
||||
|
||||
import android.app.Application; |
||||
import android.content.Context; |
||||
import android.content.SharedPreferences; |
||||
import android.content.res.Configuration; |
||||
|
||||
import androidx.emoji.text.EmojiCompat; |
||||
import androidx.preference.PreferenceManager; |
||||
import androidx.room.Room; |
||||
|
||||
import com.evernote.android.job.JobManager; |
||||
import com.keylesspalace.tusky.db.AccountManager; |
||||
import com.keylesspalace.tusky.db.AppDatabase; |
||||
import com.keylesspalace.tusky.di.AppInjector; |
||||
import com.keylesspalace.tusky.util.EmojiCompatFont; |
||||
import com.keylesspalace.tusky.util.LocaleManager; |
||||
import com.keylesspalace.tusky.util.NotificationPullJobCreator; |
||||
import com.keylesspalace.tusky.util.ThemeUtils; |
||||
import com.uber.autodispose.AutoDisposePlugins; |
||||
|
||||
import org.conscrypt.Conscrypt; |
||||
|
||||
import java.security.Security; |
||||
|
||||
import javax.inject.Inject; |
||||
|
||||
import dagger.android.AndroidInjector; |
||||
import dagger.android.DispatchingAndroidInjector; |
||||
import dagger.android.HasAndroidInjector; |
||||
|
||||
public class TuskyApplication extends Application implements HasAndroidInjector { |
||||
@Inject |
||||
DispatchingAndroidInjector<Object> androidInjector; |
||||
|
||||
@Inject |
||||
NotificationPullJobCreator notificationPullJobCreator; |
||||
|
||||
private AppDatabase appDatabase; |
||||
private AccountManager accountManager; |
||||
|
||||
private ServiceLocator serviceLocator; |
||||
|
||||
public static LocaleManager localeManager; |
||||
|
||||
@Override |
||||
public void onCreate() { |
||||
super.onCreate(); |
||||
|
||||
initSecurityProvider(); |
||||
|
||||
appDatabase = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "tuskyDB") |
||||
.allowMainThreadQueries() |
||||
.addMigrations(AppDatabase.MIGRATION_2_3, AppDatabase.MIGRATION_3_4, AppDatabase.MIGRATION_4_5, |
||||
AppDatabase.MIGRATION_5_6, AppDatabase.MIGRATION_6_7, AppDatabase.MIGRATION_7_8, |
||||
AppDatabase.MIGRATION_8_9, AppDatabase.MIGRATION_9_10, AppDatabase.MIGRATION_10_11, |
||||
AppDatabase.MIGRATION_11_12, AppDatabase.MIGRATION_12_13, AppDatabase.MIGRATION_10_13, |
||||
AppDatabase.MIGRATION_13_14, AppDatabase.MIGRATION_14_15, AppDatabase.MIGRATION_15_16, |
||||
AppDatabase.MIGRATION_16_17, AppDatabase.MIGRATION_17_18, AppDatabase.MIGRATION_18_19, |
||||
AppDatabase.MIGRATION_19_20, AppDatabase.MIGRATION_20_21) |
||||
.build(); |
||||
accountManager = new AccountManager(appDatabase); |
||||
serviceLocator = new ServiceLocator() { |
||||
@Override |
||||
public <T> T get(Class<T> clazz) { |
||||
if (clazz.equals(AccountManager.class)) { |
||||
//noinspection unchecked
|
||||
return (T) accountManager; |
||||
} else if (clazz.equals(AppDatabase.class)) { |
||||
//noinspection unchecked
|
||||
return (T) appDatabase; |
||||
} else { |
||||
throw new IllegalArgumentException("Unknown service " + clazz); |
||||
} |
||||
} |
||||
}; |
||||
|
||||
AutoDisposePlugins.setHideProxies(false); |
||||
|
||||
initAppInjector(); |
||||
initEmojiCompat(); |
||||
initNightMode(); |
||||
|
||||
JobManager.create(this).addJobCreator(notificationPullJobCreator); |
||||
|
||||
} |
||||
|
||||
protected void initSecurityProvider() { |
||||
Security.insertProviderAt(Conscrypt.newProvider(), 1); |
||||
} |
||||
|
||||
@Override |
||||
protected void attachBaseContext(Context base) { |
||||
localeManager = new LocaleManager(base); |
||||
super.attachBaseContext(localeManager.setLocale(base)); |
||||
} |
||||
|
||||
@Override |
||||
public void onConfigurationChanged(Configuration newConfig) { |
||||
super.onConfigurationChanged(newConfig); |
||||
localeManager.setLocale(this); |
||||
} |
||||
|
||||
/** |
||||
* This method will load the EmojiCompat font which has been selected. |
||||
* If this font does not work or if the user hasn't selected one (yet), it will use a |
||||
* fallback solution instead which won't make any visible difference to using no EmojiCompat at all. |
||||
*/ |
||||
private void initEmojiCompat() { |
||||
int emojiSelection = PreferenceManager |
||||
.getDefaultSharedPreferences(getApplicationContext()) |
||||
.getInt(EmojiPreference.FONT_PREFERENCE, 0); |
||||
EmojiCompatFont font = EmojiCompatFont.byId(emojiSelection); |
||||
// FileEmojiCompat will handle any non-existing font and provide a fallback solution.
|
||||
EmojiCompat.Config config = font.getConfig(getApplicationContext()) |
||||
// The user probably wants to get a consistent experience
|
||||
.setReplaceAll(true); |
||||
EmojiCompat.init(config); |
||||
} |
||||
|
||||
protected void initAppInjector() { |
||||
AppInjector.INSTANCE.init(this); |
||||
} |
||||
|
||||
protected void initNightMode() { |
||||
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
||||
String theme = preferences.getString("appTheme", ThemeUtils.APP_THEME_DEFAULT); |
||||
ThemeUtils.setAppNightMode(theme); |
||||
} |
||||
|
||||
public ServiceLocator getServiceLocator() { |
||||
return serviceLocator; |
||||
} |
||||
|
||||
@Override |
||||
public AndroidInjector<Object> androidInjector() { |
||||
return androidInjector; |
||||
} |
||||
|
||||
public interface ServiceLocator { |
||||
<T> T get(Class<T> clazz); |
||||
} |
||||
} |
||||
@ -0,0 +1,85 @@ |
||||
/* Copyright 2020 Tusky Contributors |
||||
* |
||||
* This file is a part of Tusky. |
||||
* |
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the |
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even |
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
||||
* Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License along with Tusky; if not, |
||||
* see <http://www.gnu.org/licenses>. */ |
||||
|
||||
package com.keylesspalace.tusky |
||||
|
||||
import android.app.Application |
||||
import android.content.Context |
||||
import android.content.res.Configuration |
||||
import androidx.emoji.text.EmojiCompat |
||||
import androidx.preference.PreferenceManager |
||||
import com.evernote.android.job.JobManager |
||||
import com.keylesspalace.tusky.di.AppInjector |
||||
import com.keylesspalace.tusky.util.EmojiCompatFont |
||||
import com.keylesspalace.tusky.util.LocaleManager |
||||
import com.keylesspalace.tusky.util.NotificationPullJobCreator |
||||
import com.keylesspalace.tusky.util.ThemeUtils |
||||
import com.uber.autodispose.AutoDisposePlugins |
||||
import dagger.android.DispatchingAndroidInjector |
||||
import dagger.android.HasAndroidInjector |
||||
import org.conscrypt.Conscrypt |
||||
import java.security.Security |
||||
import javax.inject.Inject |
||||
|
||||
class TuskyApplication : Application(), HasAndroidInjector { |
||||
|
||||
@Inject |
||||
lateinit var androidInjector: DispatchingAndroidInjector<Any> |
||||
@Inject |
||||
lateinit var notificationPullJobCreator: NotificationPullJobCreator |
||||
|
||||
override fun onCreate() { |
||||
|
||||
super.onCreate() |
||||
|
||||
Security.insertProviderAt(Conscrypt.newProvider(), 1) |
||||
|
||||
AutoDisposePlugins.setHideProxies(false) // a small performance optimization |
||||
|
||||
AppInjector.init(this) |
||||
|
||||
val preferences = PreferenceManager.getDefaultSharedPreferences(this) |
||||
|
||||
// init the custom emoji fonts |
||||
val emojiSelection = preferences.getInt(EmojiPreference.FONT_PREFERENCE, 0) |
||||
val emojiConfig = EmojiCompatFont.byId(emojiSelection) |
||||
.getConfig(this) |
||||
.setReplaceAll(true) |
||||
EmojiCompat.init(emojiConfig) |
||||
|
||||
// init night mode |
||||
val theme = preferences.getString("appTheme", ThemeUtils.APP_THEME_DEFAULT) |
||||
ThemeUtils.setAppNightMode(theme) |
||||
|
||||
JobManager.create(this).addJobCreator(notificationPullJobCreator) |
||||
} |
||||
|
||||
override fun attachBaseContext(base: Context) { |
||||
localeManager = LocaleManager(base) |
||||
super.attachBaseContext(localeManager.setLocale(base)) |
||||
} |
||||
|
||||
override fun onConfigurationChanged(newConfig: Configuration) { |
||||
super.onConfigurationChanged(newConfig) |
||||
localeManager.setLocale(this) |
||||
} |
||||
|
||||
override fun androidInjector() = androidInjector |
||||
|
||||
companion object { |
||||
@JvmStatic |
||||
lateinit var localeManager: LocaleManager |
||||
} |
||||
} |
||||
@ -1,26 +0,0 @@ |
||||
package com.keylesspalace.tusky |
||||
|
||||
/** |
||||
* Created by charlag on 3/7/18. |
||||
*/ |
||||
|
||||
class FakeTuskyApplication : TuskyApplication() { |
||||
|
||||
private lateinit var locator: ServiceLocator |
||||
|
||||
override fun initSecurityProvider() { |
||||
// No-op |
||||
} |
||||
|
||||
override fun initAppInjector() { |
||||
// No-op |
||||
} |
||||
|
||||
override fun initNightMode() { |
||||
// No-op |
||||
} |
||||
|
||||
override fun getServiceLocator(): ServiceLocator { |
||||
return locator |
||||
} |
||||
} |
||||
@ -0,0 +1,51 @@ |
||||
/* Copyright 2020 Tusky Contributors |
||||
* |
||||
* This file is a part of Tusky. |
||||
* |
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the |
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even |
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
||||
* Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License along with Tusky; if not, |
||||
* see <http://www.gnu.org/licenses>. */ |
||||
|
||||
package com.keylesspalace.tusky |
||||
|
||||
import android.app.Application |
||||
import android.content.Context |
||||
import android.content.res.Configuration |
||||
import android.util.Log |
||||
import androidx.emoji.text.EmojiCompat |
||||
import com.keylesspalace.tusky.util.LocaleManager |
||||
import dagger.android.DispatchingAndroidInjector |
||||
import dagger.android.HasAndroidInjector |
||||
import de.c1710.filemojicompat.FileEmojiCompatConfig |
||||
import javax.inject.Inject |
||||
|
||||
// override TuskyApplication for Robolectric tests, only initialize the necessary stuff |
||||
class TuskyApplication : Application() { |
||||
|
||||
override fun onCreate() { |
||||
super.onCreate() |
||||
EmojiCompat.init(FileEmojiCompatConfig(this, "")) |
||||
} |
||||
|
||||
override fun attachBaseContext(base: Context) { |
||||
localeManager = LocaleManager(base) |
||||
super.attachBaseContext(localeManager.setLocale(base)) |
||||
} |
||||
|
||||
override fun onConfigurationChanged(newConfig: Configuration) { |
||||
super.onConfigurationChanged(newConfig) |
||||
localeManager.setLocale(this) |
||||
} |
||||
|
||||
companion object { |
||||
@JvmStatic |
||||
lateinit var localeManager: LocaleManager |
||||
} |
||||
} |
||||
@ -1,2 +0,0 @@ |
||||
package com.keylesspalace.tusky.di |
||||
|
||||
Loading…
Reference in new issue