From 538f1feb2e5b2aa5884881d0c9a92d0af621e368 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Fri, 4 Apr 2025 16:09:20 -0400 Subject: [PATCH] [PM-19872] Migrate UnencryptedPreferences to data module (#4994) --- .../data/auth/datasource/disk/di/AuthDiskModule.kt | 2 +- .../data/platform/datasource/di/PreferenceModule.kt | 1 + .../platform/datasource/disk/di/PlatformDiskModule.kt | 2 +- .../datasource/disk/di/GeneratorDiskModule.kt | 2 +- .../data/auth/datasource/disk/di/AuthDiskModule.kt | 2 +- .../data/platform/datasource/di/PreferenceModule.kt | 1 + .../platform/datasource/di/UnencryptedPreferences.kt | 11 ----------- .../platform/datasource/disk/di/PlatformDiskModule.kt | 2 +- .../datasource/disk}/di/UnencryptedPreferences.kt | 2 +- 9 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/UnencryptedPreferences.kt rename {app/src/main/java/com/x8bit/bitwarden/data/platform/datasource => data/src/main/kotlin/com/bitwarden/data/datasource/disk}/di/UnencryptedPreferences.kt (82%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt index 89f79efd56..7a8025ec75 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt @@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.auth.datasource.disk.di import android.content.SharedPreferences import com.bitwarden.data.datasource.di.EncryptedPreferences +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSourceImpl -import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigrator import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/PreferenceModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/PreferenceModule.kt index 84c4ecb99f..ad22608f01 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/PreferenceModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/PreferenceModule.kt @@ -6,6 +6,7 @@ import android.content.SharedPreferences import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey import com.bitwarden.data.datasource.di.EncryptedPreferences +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt index 78e7b6df48..3136d29950 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt @@ -7,7 +7,7 @@ import androidx.room.Room import com.bitwarden.data.datasource.di.EncryptedPreferences import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl -import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSourceImpl import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/di/GeneratorDiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/di/GeneratorDiskModule.kt index 9533a5b473..77f6eaeab7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/di/GeneratorDiskModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/di/GeneratorDiskModule.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.disk.di import android.app.Application import android.content.SharedPreferences import androidx.room.Room -import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import com.x8bit.bitwarden.data.platform.manager.DatabaseSchemeManager import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSourceImpl diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/di/AuthDiskModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/di/AuthDiskModule.kt index 2b484e4fdc..41ab46bf25 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/di/AuthDiskModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/di/AuthDiskModule.kt @@ -3,8 +3,8 @@ package com.bitwarden.authenticator.data.auth.datasource.disk.di import android.content.SharedPreferences import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSourceImpl -import com.bitwarden.authenticator.data.platform.datasource.di.UnencryptedPreferences import com.bitwarden.data.datasource.di.EncryptedPreferences +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/PreferenceModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/PreferenceModule.kt index f8580a377d..bb63c97205 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/PreferenceModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/PreferenceModule.kt @@ -6,6 +6,7 @@ import android.content.SharedPreferences import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey import com.bitwarden.data.datasource.di.EncryptedPreferences +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/UnencryptedPreferences.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/UnencryptedPreferences.kt deleted file mode 100644 index 9de8579b5e..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/UnencryptedPreferences.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.bitwarden.authenticator.data.platform.datasource.di - -import android.content.SharedPreferences -import javax.inject.Qualifier - -/** - * Used to denote an instance of [SharedPreferences] that does not encrypt its data. - */ -@Qualifier -@Retention(AnnotationRetention.RUNTIME) -annotation class UnencryptedPreferences diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt index f1975f1af8..0b89e43d5f 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt @@ -1,7 +1,6 @@ package com.bitwarden.authenticator.data.platform.datasource.disk.di import android.content.SharedPreferences -import com.bitwarden.authenticator.data.platform.datasource.di.UnencryptedPreferences import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagDiskSource import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagDiskSourceImpl import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagOverrideDiskSource @@ -10,6 +9,7 @@ import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSou import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSourceImpl import com.bitwarden.data.datasource.disk.ConfigDiskSource import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl +import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/UnencryptedPreferences.kt b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/UnencryptedPreferences.kt similarity index 82% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/UnencryptedPreferences.kt rename to data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/UnencryptedPreferences.kt index 277b18ef44..118a553086 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/UnencryptedPreferences.kt +++ b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/UnencryptedPreferences.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.datasource.di +package com.bitwarden.data.datasource.disk.di import android.content.SharedPreferences import javax.inject.Qualifier