[PM-19845] Migrate BaseDiskSource to data module (#4978)

app/build.gradle.kts

@@ -214,6 +214,7 @@ dependencies {
     implementation(files("libs/authenticatorbridge-1.0.0-release.aar"))
 
     implementation(project(":core"))
+    implementation(project(":data"))
     implementation(project(":network"))
 
     implementation(libs.androidx.activity.compose)

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseDiskSource.kt

@@ -1,120 +0,0 @@
-package com.x8bit.bitwarden.data.platform.datasource.disk
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-
-/**
- * Base class for simplifying interactions with [SharedPreferences].
- */
-@Suppress("UnnecessaryAbstractClass")
-abstract class BaseDiskSource(
-    private val sharedPreferences: SharedPreferences,
-) {
-    /**
-     * Gets the [Boolean] for the given [key] from [SharedPreferences], or returns `null` if that
-     * key is not present.
-     */
-    protected fun getBoolean(key: String): Boolean? =
-        if (sharedPreferences.contains(key.withBase())) {
-            sharedPreferences.getBoolean(key.withBase(), false)
-        } else {
-            // Make sure we can return a null value as a default if necessary
-            null
-        }
-
-    /**
-     * Puts the [value] in [SharedPreferences] for the given [key] (or removes the key when the
-     * value is `null`).
-     */
-    protected fun putBoolean(
-        key: String,
-        value: Boolean?,
-    ): Unit =
-        sharedPreferences.edit {
-            if (value != null) {
-                putBoolean(key.withBase(), value)
-            } else {
-                remove(key.withBase())
-            }
-        }
-
-    /**
-     * Gets the [Int] for the given [key] from [SharedPreferences], or returns `null` if that key
-     * is not present.
-     */
-    protected fun getInt(key: String): Int? =
-        if (sharedPreferences.contains(key.withBase())) {
-            sharedPreferences.getInt(key.withBase(), 0)
-        } else {
-            // Make sure we can return a null value as a default if necessary
-            null
-        }
-
-    /**
-     * Puts the [value] in [SharedPreferences] for the given [key] (or removes the key when the
-     * value is `null`).
-     */
-    protected fun putInt(
-        key: String,
-        value: Int?,
-    ): Unit =
-        sharedPreferences.edit {
-            if (value != null) {
-                putInt(key.withBase(), value)
-            } else {
-                remove(key.withBase())
-            }
-        }
-
-    /**
-     * Gets the [Long] for the given [key] from [SharedPreferences], or returns `null` if that key
-     * is not present.
-     */
-    protected fun getLong(key: String): Long? =
-        if (sharedPreferences.contains(key.withBase())) {
-            sharedPreferences.getLong(key.withBase(), 0)
-        } else {
-            // Make sure we can return a null value as a default if necessary
-            null
-        }
-
-    /**
-     * Puts the [value] in [SharedPreferences] for the given [key] (or removes the key when the
-     * value is `null`).
-     */
-    protected fun putLong(
-        key: String,
-        value: Long?,
-    ): Unit =
-        sharedPreferences.edit {
-            if (value != null) {
-                putLong(key.withBase(), value)
-            } else {
-                remove(key.withBase())
-            }
-        }
-
-    protected fun getString(
-        key: String,
-    ): String? = sharedPreferences.getString(key.withBase(), null)
-
-    protected fun putString(
-        key: String,
-        value: String?,
-    ): Unit = sharedPreferences.edit { putString(key.withBase(), value) }
-
-    protected fun removeWithPrefix(prefix: String) {
-        sharedPreferences
-            .all
-            .keys
-            .filter { it.startsWith(prefix.withBase()) }
-            .forEach { sharedPreferences.edit { remove(it) } }
-    }
-
-    protected fun String.appendIdentifier(identifier: String): String = "${this}_$identifier"
-}
-
-/**
- * Helper method for prepending the key with the appropriate base storage key.
- */
-private fun String.withBase(): String = "bwPreferencesStorage:$this"

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseEncryptedDiskSource.kt

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.datasource.disk
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.security.crypto.EncryptedSharedPreferences
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 
 /**
  * Base class for simplifying interactions with [SharedPreferences] and

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/ConfigDiskSourceImpl.kt

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.datasource.disk
 import android.content.SharedPreferences
 import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
 import com.bitwarden.core.data.util.decodeFromStringOrNull
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 import com.x8bit.bitwarden.data.platform.datasource.disk.model.ServerConfig
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.onSubscription

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.datasource.disk
 import android.content.SharedPreferences
 import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
 import com.bitwarden.core.data.util.decodeFromStringOrNull
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 import com.x8bit.bitwarden.data.auth.datasource.disk.model.EnvironmentUrlDataJson
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.onSubscription

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/FeatureFlagOverrideDiskSourceImpl.kt

@@ -1,6 +1,7 @@
 package com.x8bit.bitwarden.data.platform.datasource.disk
 
 import android.content.SharedPreferences
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 import com.x8bit.bitwarden.data.platform.manager.model.FlagKey
 
 /**

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/PushDiskSourceImpl.kt

@@ -1,6 +1,7 @@
 package com.x8bit.bitwarden.data.platform.datasource.disk
 
 import android.content.SharedPreferences
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 import com.x8bit.bitwarden.data.platform.util.getBinaryLongFromZoneDateTime
 import com.x8bit.bitwarden.data.platform.util.getZoneDateTimeFromBinaryLong
 import java.time.ZonedDateTime

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.datasource.disk
 import android.content.SharedPreferences
 import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
 import com.bitwarden.core.data.util.decodeFromStringOrNull
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 import com.x8bit.bitwarden.data.platform.manager.model.AppResumeScreenData
 import com.x8bit.bitwarden.data.platform.repository.model.UriMatchType
 import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction

app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt

@@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.disk
 
 import android.content.SharedPreferences
 import com.bitwarden.core.data.util.decodeFromStringOrNull
-import com.x8bit.bitwarden.data.platform.datasource.disk.BaseDiskSource
+import com.bitwarden.data.datasource.disk.BaseDiskSource
 import com.x8bit.bitwarden.data.tools.generator.repository.model.PasscodeGenerationOptions
 import com.x8bit.bitwarden.data.tools.generator.repository.model.UsernameGenerationOptions
 import kotlinx.serialization.json.Json