MVI Lifecycle - Patch 2

Author: ShiftHackZ

data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt

@@ -32,13 +32,6 @@ class PreferenceManagerImpl(
             .apply()
             .also { onPreferencesChanged() }
 
-    override val useSdAiCloud: Boolean
-        get() = source == ServerSource.SDAI
-//        set(value) = preferences.edit()
-//            .putBoolean(KEY_SD_AI_CLOUD_MODE, value)
-//            .apply()
-//            .also { onPreferencesChanged() }
-
     override var monitorConnectivity: Boolean
         get() = if (source != ServerSource.CUSTOM) false
         else preferences.getBoolean(KEY_MONITOR_CONNECTIVITY, true)
@@ -47,6 +40,7 @@ class PreferenceManagerImpl(
             .apply()
             .also { onPreferencesChanged() }
 
+
     override var autoSaveAiResults: Boolean
         get() = preferences.getBoolean(KEY_AI_AUTO_SAVE, true)
         set(value) = preferences.edit()
@@ -60,25 +54,31 @@ class PreferenceManagerImpl(
             .putBoolean(KEY_FORM_ALWAYS_SHOW_ADVANCED_OPTIONS, value)
             .apply()
             .also { onPreferencesChanged() }
+
     override var source: ServerSource
         get() = (preferences.getString(KEY_SERVER_SOURCE, ServerSource.CUSTOM.key) ?: ServerSource.CUSTOM.key)
             .let(ServerSource.Companion::parse)
         set(value) = preferences.edit()
             .putString(KEY_SERVER_SOURCE, value.key)
             .apply()
             .also { onPreferencesChanged() }
+
     override var hordeApiKey: String
         get() = preferences.getString(KEY_HORDE_API_KEY, "") ?: ""
         set(value) = preferences.edit()
             .putString(KEY_HORDE_API_KEY, value)
             .apply()
             .also { onPreferencesChanged() }
+
     override var forceSetupAfterUpdate: Boolean
         get() = preferences.getBoolean(KEY_FORCE_SETUP_AFTER_UPDATE, true)
         set(value) = preferences.edit()
             .putBoolean(KEY_FORCE_SETUP_AFTER_UPDATE, value)
             .apply()
 
+    override val useSdAiCloud: Boolean
+        get() = source == ServerSource.SDAI
+
     override fun observe(): Flowable<Settings> = preferencesChangedSubject
         .toFlowable(BackpressureStrategy.LATEST)
         .map {

domain/src/main/java/com/shifthackz/aisdv1/domain/preference/PreferenceManager.kt

@@ -7,13 +7,14 @@ import io.reactivex.rxjava3.core.Flowable
 interface PreferenceManager {
     var serverUrl: String
     var demoMode: Boolean
-    val useSdAiCloud: Boolean
     var monitorConnectivity: Boolean
     var autoSaveAiResults: Boolean
     var formAdvancedOptionsAlwaysShow: Boolean
     var source: ServerSource
     var hordeApiKey: String
     var forceSetupAfterUpdate: Boolean
 
+    val useSdAiCloud: Boolean
+
     fun observe(): Flowable<Settings>
 }

feature/auth/src/main/java/com/shifthackz/aisdv1/feature/auth/AuthorizationStoreImpl.kt

@@ -1,7 +1,6 @@
 package com.shifthackz.aisdv1.feature.auth
 
 import android.content.SharedPreferences
-import com.shifthackz.aisdv1.core.common.log.debugLog
 import com.shifthackz.aisdv1.core.common.log.errorLog
 import com.shifthackz.aisdv1.domain.authorization.AuthorizationCredentials
 import com.shifthackz.aisdv1.domain.authorization.AuthorizationStore
@@ -12,13 +11,10 @@ internal class AuthorizationStoreImpl(
 
     override fun getAuthorizationCredentials(): AuthorizationCredentials {
         val typeKey = getCredentialsTypeKey()
-        val credentials = getCredentials(typeKey)
-        debugLog("READ -> $credentials")
-        return credentials
+        return getCredentials(typeKey)
     }
 
     override fun storeAuthorizationCredentials(credentials: AuthorizationCredentials) {
-        debugLog("WRITE -> $credentials")
         saveCredentialsTypeKey(credentials.key)
         saveCredentials(credentials)
     }