From ef3547708309223217dec59b792128e2e9a2a0d5 Mon Sep 17 00:00:00 2001
From: Brian Yencho <brian@livefront.com>
Date: Mon, 20 Nov 2023 11:49:36 -0600
Subject: [PATCH] Simplify BaseDiskSource usage (#261)

---
 .../data/auth/datasource/disk/AuthDiskSourceImpl.kt   | 10 +---------
 .../data/platform/datasource/disk/BaseDiskSource.kt   | 11 ++---------
 .../datasource/disk/EnvironmentDiskSourceImpl.kt      | 10 +---------
 .../datasource/disk/GeneratorDiskSourceImpl.kt        |  7 +------
 4 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
index 0645741f46..c2b6eadf14 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
@@ -39,6 +39,7 @@ class AuthDiskSourceImpl(
                 key = STATE_KEY,
                 value = value?.let { json.encodeToString(value) },
             )
+            mutableUserStateFlow.tryEmit(value)
         }
 
     override val userStateFlow: Flow<UserStateJson?>
@@ -50,15 +51,6 @@ class AuthDiskSourceImpl(
         extraBufferCapacity = Int.MAX_VALUE,
     )
 
-    override fun onSharedPreferenceChanged(
-        sharedPreferences: SharedPreferences?,
-        key: String?,
-    ) {
-        when (key) {
-            STATE_KEY -> mutableUserStateFlow.tryEmit(userState)
-        }
-    }
-
     override fun getUserKey(userId: String): String? =
         getString(key = "${MASTER_KEY_ENCRYPTION_USER_KEY}_$userId")
 
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseDiskSource.kt
index d001daa555..4283a9ed14 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseDiskSource.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/BaseDiskSource.kt
@@ -1,22 +1,15 @@
 package com.x8bit.bitwarden.data.platform.datasource.disk
 
 import android.content.SharedPreferences
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import androidx.core.content.edit
 
 /**
  * Base class for simplifying interactions with [SharedPreferences].
  */
+@Suppress("UnnecessaryAbstractClass")
 abstract class BaseDiskSource(
     private val sharedPreferences: SharedPreferences,
-) : OnSharedPreferenceChangeListener {
-
-    init {
-        @Suppress("LeakingThis")
-        sharedPreferences
-            .registerOnSharedPreferenceChangeListener(this)
-    }
-
+) {
     protected fun getString(
         key: String,
         default: String? = null,
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt
index 3d1221b92b..f0d463dbfd 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt
@@ -26,6 +26,7 @@ class EnvironmentDiskSourceImpl(
                 key = PRE_AUTH_URLS_KEY,
                 value = value?.let { json.encodeToString(value) },
             )
+            mutableEnvironmentUrlDataFlow.tryEmit(value)
         }
 
     override val preAuthEnvironmentUrlDataFlow: Flow<EnvironmentUrlDataJson?>
@@ -36,13 +37,4 @@ class EnvironmentDiskSourceImpl(
         replay = 1,
         extraBufferCapacity = Int.MAX_VALUE,
     )
-
-    override fun onSharedPreferenceChanged(
-        sharedPreferences: SharedPreferences?,
-        key: String?,
-    ) {
-        when (key) {
-            PRE_AUTH_URLS_KEY -> mutableEnvironmentUrlDataFlow.tryEmit(preAuthEnvironmentUrlData)
-        }
-    }
 }
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt
index 09a71a1c9a..0078f86db8 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt
@@ -1,8 +1,8 @@
 package com.x8bit.bitwarden.data.tools.generator.datasource.disk
 
 import android.content.SharedPreferences
-import com.x8bit.bitwarden.data.tools.generator.repository.model.PasswordGenerationOptions
 import com.x8bit.bitwarden.data.platform.datasource.disk.BaseDiskSource
+import com.x8bit.bitwarden.data.tools.generator.repository.model.PasswordGenerationOptions
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
@@ -33,11 +33,6 @@ class GeneratorDiskSourceImpl(
         )
     }
 
-    override fun onSharedPreferenceChanged(
-        sharedPreferences: SharedPreferences?,
-        key: String?,
-    ) = Unit
-
     private fun getPasswordGenerationOptionsKey(userId: String): String =
         "${BASE_KEY}_${PASSWORD_GENERATION_OPTIONS_KEY}_$userId"
 }