From f090b506fee2674f586993f225dec77fc80620bf Mon Sep 17 00:00:00 2001 From: LooKeR Date: Tue, 28 Dec 2021 13:37:48 +0530 Subject: [PATCH] Fix: Remove Configuration Caching to fix building & some renaming --- gradle.properties | 3 +-- src/main/kotlin/com/looker/droidify/content/Preferences.kt | 6 +++--- src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index b85d5790..8323ddb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -android.useAndroidX=true -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +android.useAndroidX=true \ No newline at end of file diff --git a/src/main/kotlin/com/looker/droidify/content/Preferences.kt b/src/main/kotlin/com/looker/droidify/content/Preferences.kt index fd377550..e8a25a28 100644 --- a/src/main/kotlin/com/looker/droidify/content/Preferences.kt +++ b/src/main/kotlin/com/looker/droidify/content/Preferences.kt @@ -18,8 +18,8 @@ import java.net.Proxy object Preferences { private lateinit var preferences: SharedPreferences - private val _subject = MutableSharedFlow>() - val subject = _subject.asSharedFlow() + private val mutableSubject = MutableSharedFlow>() + val subject = mutableSubject.asSharedFlow() private val keys = sequenceOf( Key.Language, @@ -45,7 +45,7 @@ object Preferences { preferences.registerOnSharedPreferenceChangeListener { _, keyString -> CoroutineScope(Dispatchers.Default).launch { keys[keyString]?.let { - _subject.emit(it) + mutableSubject.emit(it) } } } diff --git a/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt b/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt index 0d718a63..8c8d7954 100644 --- a/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt +++ b/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt @@ -153,9 +153,9 @@ object IndexV1Parser { it.string("openCollective") -> donates += Product.Donate.OpenCollective( valueAsString ) - it.dictionary("localized") -> forEachKey { it -> - if (it.token == JsonToken.START_OBJECT) { - val locale = it.key + it.dictionary("localized") -> forEachKey { keyToken -> + if (keyToken.token == JsonToken.START_OBJECT) { + val locale = keyToken.key var name = "" var summary = "" var description = ""