mirror of
https://github.com/bitwarden/android.git
synced 2026-10-22 02:53:19 -05:00
[PM-19871] Migrate EncryptedPreferences to data module (#4993)
This commit is contained in:
1 parent
d1e4078c5a
commit
3f35ace6e9
8 files changed
+10
-15
No files matched your search
+1
-1
@@ -1,9 +1,9 @@
|
||||
package com.x8bit.bitwarden.data.auth.datasource.disk.di
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import com.bitwarden.data.datasource.di.EncryptedPreferences
|
||||
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.EncryptedPreferences
|
||||
import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences
|
||||
import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacySecureStorageMigrator
|
||||
import dagger.Module
|
||||
|
||||
@@ -5,6 +5,7 @@ import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import androidx.security.crypto.EncryptedSharedPreferences
|
||||
import androidx.security.crypto.MasterKey
|
||||
import com.bitwarden.data.datasource.di.EncryptedPreferences
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.hilt.InstallIn
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import android.app.Application
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import androidx.room.Room
|
||||
import com.x8bit.bitwarden.data.platform.datasource.di.EncryptedPreferences
|
||||
import com.bitwarden.data.datasource.di.EncryptedPreferences
|
||||
import com.x8bit.bitwarden.data.platform.datasource.di.UnencryptedPreferences
|
||||
import com.x8bit.bitwarden.data.platform.datasource.disk.ConfigDiskSource
|
||||
import com.x8bit.bitwarden.data.platform.datasource.disk.ConfigDiskSourceImpl
|
||||
|
||||
+1
-1
@@ -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.EncryptedPreferences
|
||||
import com.bitwarden.authenticator.data.platform.datasource.di.UnencryptedPreferences
|
||||
import com.bitwarden.data.datasource.di.EncryptedPreferences
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.hilt.InstallIn
|
||||
|
||||
-11
@@ -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 encrypts its data.
|
||||
*/
|
||||
@Qualifier
|
||||
@Retention(AnnotationRetention.RUNTIME)
|
||||
annotation class EncryptedPreferences
|
||||
+1
@@ -5,6 +5,7 @@ import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import androidx.security.crypto.EncryptedSharedPreferences
|
||||
import androidx.security.crypto.MasterKey
|
||||
import com.bitwarden.data.datasource.di.EncryptedPreferences
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.hilt.InstallIn
|
||||
|
||||
@@ -2,7 +2,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
|
||||
plugins {
|
||||
alias(libs.plugins.android.library)
|
||||
alias(libs.plugins.hilt)
|
||||
alias(libs.plugins.kotlin.android)
|
||||
alias(libs.plugins.ksp)
|
||||
}
|
||||
|
||||
android {
|
||||
@@ -40,4 +42,6 @@ kotlin {
|
||||
dependencies {
|
||||
implementation(libs.androidx.core.ktx)
|
||||
implementation(libs.androidx.security.crypto)
|
||||
implementation(libs.google.hilt.android)
|
||||
ksp(libs.google.hilt.compiler)
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.x8bit.bitwarden.data.platform.datasource.di
|
||||
package com.bitwarden.data.datasource.di
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import javax.inject.Qualifier
|
||||
Reference in new issue
Block a user