kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

app: lazily initialize hiltEntryPoint to make sure that activity is available before we use appContext

Browse source 
Signed-off-by: Aditya Wasan <adityawasan55@gmail.com>
This commit is contained in:
Aditya Wasan 2021-05-22 18:23:14 +05:30 committed by Harsh Shandilya
parent 1ae961e51c
commit 1583c4c600
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
View file

@ -42,13 +42,12 @@ import dev.msfjarvis.aps.util.settings.PreferenceKeys
class RepositorySettings(private val activity: FragmentActivity) : SettingsProvider { class RepositorySettings(private val activity: FragmentActivity) : SettingsProvider {
private val hiltEntryPoint = private val hiltEntryPoint by lazy(LazyThreadSafetyMode.NONE) {
EntryPointAccessors.fromApplication( EntryPointAccessors.fromApplication(
activity.applicationContext, activity.applicationContext,
RepositorySettingsEntryPoint::class.java, RepositorySettingsEntryPoint::class.java,
) )
private val encryptedPreferences = hiltEntryPoint.encryptedPreferences() }
private val gitSettings = hiltEntryPoint.gitSettings()
private fun <T : FragmentActivity> launchActivity(clazz: Class<T>) { private fun <T : FragmentActivity> launchActivity(clazz: Class<T>) {
activity.startActivity(Intent(activity, clazz)) activity.startActivity(Intent(activity, clazz))
@ -66,6 +65,9 @@ class RepositorySettings(private val activity: FragmentActivity) : SettingsProvi
} }
override fun provideSettings(builder: PreferenceScreen.Builder) { override fun provideSettings(builder: PreferenceScreen.Builder) {
val encryptedPreferences = hiltEntryPoint.encryptedPreferences()
val gitSettings = hiltEntryPoint.gitSettings()
builder.apply { builder.apply {
checkBox(PreferenceKeys.REBASE_ON_PULL) { checkBox(PreferenceKeys.REBASE_ON_PULL) {
titleRes = R.string.pref_rebase_on_pull_title titleRes = R.string.pref_rebase_on_pull_title

7
app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
View file

@ -34,14 +34,14 @@ class GitCommandExecutor(
private val operation: GitOperation, private val operation: GitOperation,
) { ) {
private val hiltEntryPoint = private val hiltEntryPoint by lazy(LazyThreadSafetyMode.NONE) {
EntryPointAccessors.fromApplication( EntryPointAccessors.fromApplication(
activity.applicationContext, activity.applicationContext,
GitCommandExecutorEntryPoint::class.java GitCommandExecutorEntryPoint::class.java
) )
private val gitSettings = hiltEntryPoint.gitSettings() }
suspend fun execute(): Result<Unit, Throwable> { suspend fun execute(): Result<Unit, Throwable> {
val gitSettings = hiltEntryPoint.gitSettings()
val snackbar = val snackbar =
activity.snackbar( activity.snackbar(
message = activity.resources.getString(R.string.git_operation_running), message = activity.resources.getString(R.string.git_operation_running),
@ -126,6 +126,7 @@ class GitCommandExecutor(
@EntryPoint @EntryPoint
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
interface GitCommandExecutorEntryPoint { interface GitCommandExecutorEntryPoint {
fun gitSettings(): GitSettings fun gitSettings(): GitSettings
} }
} }