Skip to content

Commit 538f1fe

Browse files
authored
[PM-19872] Migrate UnencryptedPreferences to data module (#4994)
1 parent 70e42a2 commit 538f1fe

File tree

9 files changed

+8
-17
lines changed

9 files changed

+8
-17
lines changed

app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/di/AuthDiskModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.x8bit.bitwarden.data.auth.datasource.disk.di
22

33
import android.content.SharedPreferences
44
import com.bitwarden.data.datasource.di.EncryptedPreferences
5+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
56
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
67
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSourceImpl
7-
import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences
88
import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigrator
99
import dagger.Module
1010
import dagger.Provides

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/PreferenceModule.kt

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.content.SharedPreferences
66
import androidx.security.crypto.EncryptedSharedPreferences
77
import androidx.security.crypto.MasterKey
88
import com.bitwarden.data.datasource.di.EncryptedPreferences
9+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
910
import dagger.Module
1011
import dagger.Provides
1112
import dagger.hilt.InstallIn

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.room.Room
77
import com.bitwarden.data.datasource.di.EncryptedPreferences
88
import com.bitwarden.data.datasource.disk.ConfigDiskSource
99
import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl
10-
import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences
10+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
1111
import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource
1212
import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSourceImpl
1313
import com.x8bit.bitwarden.data.platform.datasource.disk.EventDiskSource

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.tools.generator.datasource.disk.di
33
import android.app.Application
44
import android.content.SharedPreferences
55
import androidx.room.Room
6-
import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences
6+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
77
import com.x8bit.bitwarden.data.platform.manager.DatabaseSchemeManager
88
import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSource
99
import com.x8bit.bitwarden.data.tools.generator.datasource.disk.GeneratorDiskSourceImpl

authenticator/src/main/kotlin/com/bitwarden/authenticator/data/auth/datasource/disk/di/AuthDiskModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.bitwarden.authenticator.data.auth.datasource.disk.di
33
import android.content.SharedPreferences
44
import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSource
55
import com.bitwarden.authenticator.data.auth.datasource.disk.AuthDiskSourceImpl
6-
import com.bitwarden.authenticator.data.platform.datasource.di.UnencryptedPreferences
76
import com.bitwarden.data.datasource.di.EncryptedPreferences
7+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
88
import dagger.Module
99
import dagger.Provides
1010
import dagger.hilt.InstallIn

authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/PreferenceModule.kt

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.content.SharedPreferences
66
import androidx.security.crypto.EncryptedSharedPreferences
77
import androidx.security.crypto.MasterKey
88
import com.bitwarden.data.datasource.di.EncryptedPreferences
9+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
910
import dagger.Module
1011
import dagger.Provides
1112
import dagger.hilt.InstallIn

authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/di/UnencryptedPreferences.kt

-11
This file was deleted.

authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.bitwarden.authenticator.data.platform.datasource.disk.di
22

33
import android.content.SharedPreferences
4-
import com.bitwarden.authenticator.data.platform.datasource.di.UnencryptedPreferences
54
import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagDiskSource
65
import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagDiskSourceImpl
76
import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagOverrideDiskSource
@@ -10,6 +9,7 @@ import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSou
109
import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSourceImpl
1110
import com.bitwarden.data.datasource.disk.ConfigDiskSource
1211
import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl
12+
import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
1313
import dagger.Module
1414
import dagger.Provides
1515
import dagger.hilt.InstallIn

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/di/UnencryptedPreferences.kt data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/UnencryptedPreferences.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.x8bit.bitwarden.data.platform.datasource.di
1+
package com.bitwarden.data.datasource.disk.di
22

33
import android.content.SharedPreferences
44
import javax.inject.Qualifier

0 commit comments

Comments
 (0)