Rename AppPreferencesDataSource

Wavesonics · Wavesonics · commit 0a8e038672bd · 2025-09-02T23:27:39.000-07:00
Stateless data sources can be factory instead of single
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/App.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/App.kt
@@ -12,7 +12,7 @@ import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
 import com.darkrockstudios.app.securecamera.navigation.AppNavHost
 import com.darkrockstudios.app.securecamera.navigation.NavController
 import com.darkrockstudios.app.securecamera.navigation.enforceAuth
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.ui.theme.SecureCameraTheme
 import org.koin.compose.KoinContext
 import org.koin.compose.koinInject
@@ -26,7 +26,7 @@ fun App(
 	KoinContext {
 		SecureCameraTheme {
 			val snackbarHostState = remember { SnackbarHostState() }
-			val preferencesManager = koinInject<AppPreferencesDataSource>()
+			val preferencesManager = koinInject<AppSettingsDataSource>()
 			val authorizationRepository = koinInject<AuthorizationRepository>()
 
 			val hasCompletedIntro by preferencesManager.hasCompletedIntro.collectAsState(initial = null)
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/AppModule.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/AppModule.kt
@@ -9,8 +9,8 @@ import com.darkrockstudios.app.securecamera.gallery.GalleryViewModel
 import com.darkrockstudios.app.securecamera.import.ImportPhotosViewModel
 import com.darkrockstudios.app.securecamera.introduction.IntroductionViewModel
 import com.darkrockstudios.app.securecamera.obfuscation.ObfuscatePhotoViewModel
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSourceImpl
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
+import com.darkrockstudios.app.securecamera.preferences.PreferencesAppSettingsDataSource
 import com.darkrockstudios.app.securecamera.security.DeviceInfoDataSource
 import com.darkrockstudios.app.securecamera.security.SecurityLevel
 import com.darkrockstudios.app.securecamera.security.SecurityLevelDetector
@@ -33,9 +33,11 @@ import kotlin.time.Clock
 
 val appModule = module {
 
-	single { Clock.System } bind Clock::class
-	singleOf(::SecureImageRepository)
-	single<AppPreferencesDataSource> { AppPreferencesDataSourceImpl(context = get()) }
+	factory { Clock.System } bind Clock::class
+	factory<AppSettingsDataSource> { PreferencesAppSettingsDataSource(context = get()) }
+    factoryOf(::DeviceInfoDataSource)
+
+    singleOf(::SecureImageRepository)
 	single {
 		AuthorizationRepository(
 			preferences = get(),
@@ -71,8 +73,6 @@ val appModule = module {
 
 	single { WorkManager.getInstance(get()) }
 
-	factoryOf(::DeviceInfoDataSource)
-
 	factoryOf(::ThumbnailCache)
 	factoryOf(::SecurityResetUseCase)
 	factoryOf(::PinStrengthCheckUseCase)
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/MainActivity.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/MainActivity.kt
@@ -18,7 +18,7 @@ import androidx.navigation3.runtime.rememberNavBackStack
 import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
 import com.darkrockstudios.app.securecamera.navigation.*
 import com.darkrockstudios.app.securecamera.navigation.Camera
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.isActive
@@ -31,7 +31,7 @@ import kotlin.time.Duration.Companion.seconds
 class MainActivity : ComponentActivity() {
 	private var capturePhoto = mutableStateOf<Boolean?>(null)
 	private val locationRepository: LocationRepository by inject()
-	private val preferences: AppPreferencesDataSource by inject()
+	private val preferences: AppSettingsDataSource by inject()
 	private val authorizationRepository: AuthorizationRepository by inject()
 	lateinit var navController: NavController
 
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizationRepository.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizationRepository.kt
@@ -1,7 +1,7 @@
 package com.darkrockstudios.app.securecamera.auth
 
 import android.content.Context
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
 import com.darkrockstudios.app.securecamera.security.schemes.EncryptionScheme
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -17,10 +17,10 @@ import kotlin.time.Instant
  * Manages user authorization state, including PIN verification and session expiration.
  */
 class AuthorizationRepository(
-	private val preferences: AppPreferencesDataSource,
-	private val encryptionScheme: EncryptionScheme,
-	private val context: Context,
-	private val clock: Clock,
+    private val preferences: AppSettingsDataSource,
+    private val encryptionScheme: EncryptionScheme,
+    private val context: Context,
+    private val clock: Clock,
 ) {
 	companion object {
 		const val MAX_FAILED_ATTEMPTS = 10
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/gallery/GalleryViewModel.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/gallery/GalleryViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.darkrockstudios.app.securecamera.BaseViewModel
 import com.darkrockstudios.app.securecamera.camera.PhotoDef
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.share.sharePhotosWithProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.update
@@ -14,7 +14,7 @@ import kotlinx.coroutines.withContext
 
 class GalleryViewModel(
 	private val imageManager: SecureImageRepository,
-	private val preferencesManager: AppPreferencesDataSource
+	private val preferencesManager: AppSettingsDataSource
 ) : BaseViewModel<GalleryUiState>() {
 
 	override fun createState() = GalleryUiState()
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/preferences/AppSettingsDataSource.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/preferences/AppSettingsDataSource.kt
@@ -3,7 +3,7 @@ package com.darkrockstudios.app.securecamera.preferences
 import com.darkrockstudios.app.securecamera.security.SchemeConfig
 import kotlinx.coroutines.flow.Flow
 
-interface AppPreferencesDataSource {
+interface AppSettingsDataSource {
 	/**
 	 * Check if the user has completed the introduction
 	 */
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/preferences/PreferencesAppSettingsDataSource.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/preferences/PreferencesAppSettingsDataSource.kt
@@ -21,12 +21,12 @@ import kotlin.time.Duration.Companion.minutes
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "app_preferences")
 
 /**
- * Manages app preferences using DataStore
+ * Manages app settings using DataStore
  */
-class AppPreferencesDataSourceImpl(
+class PreferencesAppSettingsDataSource(
 	private val context: Context,
 	private val dataStore: DataStore<Preferences> = context.dataStore,
-) : AppPreferencesDataSource {
+) : AppSettingsDataSource {
 	companion object {
 		private val HAS_COMPLETED_INTRO = booleanPreferencesKey("has_completed_intro")
 		private val APP_PIN = stringPreferencesKey("app_pin")
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/security/pin/PinRepositoryHardware.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/security/pin/PinRepositoryHardware.kt
@@ -1,6 +1,6 @@
 package com.darkrockstudios.app.securecamera.security.pin
 
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
 import com.darkrockstudios.app.securecamera.security.DeviceInfoDataSource
 import com.darkrockstudios.app.securecamera.security.SchemeConfig
@@ -10,10 +10,10 @@ import com.darkrockstudios.app.securecamera.utils.base64Encode
 import kotlinx.serialization.json.Json
 
 class PinRepositoryHardware(
-	private val dataSource: AppPreferencesDataSource,
-	private val encryptionScheme: EncryptionScheme,
-	private val deviceInfo: DeviceInfoDataSource,
-	private val pinCrypto: PinCrypto,
+    private val dataSource: AppSettingsDataSource,
+    private val encryptionScheme: EncryptionScheme,
+    private val deviceInfo: DeviceInfoDataSource,
+    private val pinCrypto: PinCrypto,
 ) : PinRepository {
 
 	override suspend fun setAppPin(
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/security/pin/PinRepositorySoftware.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/security/pin/PinRepositorySoftware.kt
@@ -1,6 +1,6 @@
 package com.darkrockstudios.app.securecamera.security.pin
 
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
 import com.darkrockstudios.app.securecamera.security.DeviceInfoDataSource
 import com.darkrockstudios.app.securecamera.security.SchemeConfig
@@ -9,9 +9,9 @@ import kotlinx.serialization.json.Json
 import kotlin.io.encoding.ExperimentalEncodingApi
 
 class PinRepositorySoftware(
-	private val dataSource: AppPreferencesDataSource,
-	private val deviceInfo: DeviceInfoDataSource,
-	private val pinCrypto: PinCrypto,
+    private val dataSource: AppSettingsDataSource,
+    private val deviceInfo: DeviceInfoDataSource,
+    private val pinCrypto: PinCrypto,
 ) : PinRepository {
 
 	override suspend fun setAppPin(pin: String, schemeConfig: SchemeConfig) {
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/security/schemes/HardwareBackedEncryptionScheme.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/security/schemes/HardwareBackedEncryptionScheme.kt
@@ -8,7 +8,7 @@ import android.security.keystore.KeyProperties.KEY_ALGORITHM_AES
 import android.security.keystore.KeyProperties.PURPOSE_DECRYPT
 import android.security.keystore.KeyProperties.PURPOSE_ENCRYPT
 import android.security.keystore.StrongBoxUnavailableException
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
 import com.darkrockstudios.app.securecamera.security.DeviceInfoDataSource
 import com.darkrockstudios.app.securecamera.security.HardwareSchemeConfig
@@ -30,9 +30,9 @@ import kotlin.time.Duration.Companion.minutes
 
 
 class HardwareBackedEncryptionScheme(
-	private val appContext: Context,
-	deviceInfo: DeviceInfoDataSource,
-	private val appPreferencesDataSource: AppPreferencesDataSource,
+    private val appContext: Context,
+    deviceInfo: DeviceInfoDataSource,
+    private val appSettingsDataSource: AppSettingsDataSource,
 ) : SoftwareEncryptionScheme(deviceInfo) {
 	private val provider = CryptographyProvider.Default
 	private val ks: KeyStore = KeyStore.getInstance("AndroidKeyStore").apply { load(null) }
@@ -42,7 +42,7 @@ class HardwareBackedEncryptionScheme(
 		plainPin: String,
 		hashedPin: HashedPin,
 	): ByteArray {
-		val config = appPreferencesDataSource.getSchemeConfig() as HardwareSchemeConfig
+		val config = appSettingsDataSource.getSchemeConfig() as HardwareSchemeConfig
 		return if (config.ephemeralKey) {
 			deriveEphemeralKey(plainPin, hashedPin)
 		} else {
@@ -98,7 +98,7 @@ class HardwareBackedEncryptionScheme(
 	 * then stores it to disk.
 	 */
 	override suspend fun createKey(plainPin: String, hashedPin: HashedPin) {
-		val config = appPreferencesDataSource.getSchemeConfig() as HardwareSchemeConfig
+		val config = appSettingsDataSource.getSchemeConfig() as HardwareSchemeConfig
 
 		keyMutex.withLock {
 			// Create hardware backed KEK if it doesn't exist
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/SettingsContent.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/SettingsContent.kt
@@ -25,9 +25,9 @@ import com.darkrockstudios.app.securecamera.navigation.About
 import com.darkrockstudios.app.securecamera.navigation.Introduction
 import com.darkrockstudios.app.securecamera.navigation.NavController
 import com.darkrockstudios.app.securecamera.navigation.navigateClearingBackStack
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSourceImpl.Companion.SESSION_TIMEOUT_10_MIN
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSourceImpl.Companion.SESSION_TIMEOUT_1_MIN
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSourceImpl.Companion.SESSION_TIMEOUT_5_MIN
+import com.darkrockstudios.app.securecamera.preferences.PreferencesAppSettingsDataSource.Companion.SESSION_TIMEOUT_10_MIN
+import com.darkrockstudios.app.securecamera.preferences.PreferencesAppSettingsDataSource.Companion.SESSION_TIMEOUT_1_MIN
+import com.darkrockstudios.app.securecamera.preferences.PreferencesAppSettingsDataSource.Companion.SESSION_TIMEOUT_5_MIN
 import com.darkrockstudios.app.securecamera.security.SecurityLevel
 import com.darkrockstudios.app.securecamera.ui.HandleUiEvents
 import kotlinx.coroutines.launch
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/SettingsViewModel.kt
@@ -6,8 +6,8 @@ import com.darkrockstudios.app.securecamera.BaseViewModel
 import com.darkrockstudios.app.securecamera.LocationPermissionStatus
 import com.darkrockstudios.app.securecamera.LocationRepository
 import com.darkrockstudios.app.securecamera.R
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSourceImpl.Companion.SESSION_TIMEOUT_DEFAULT
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
+import com.darkrockstudios.app.securecamera.preferences.PreferencesAppSettingsDataSource.Companion.SESSION_TIMEOUT_DEFAULT
 import com.darkrockstudios.app.securecamera.security.SecurityLevel
 import com.darkrockstudios.app.securecamera.security.SecurityLevelDetector
 import com.darkrockstudios.app.securecamera.security.pin.PinRepository
@@ -19,15 +19,15 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class SettingsViewModel(
-	private val appContext: Context,
-	private val preferences: AppPreferencesDataSource,
-	private val pinRepository: PinRepository,
-	private val locationRepository: LocationRepository,
-	private val securityResetUseCase: SecurityResetUseCase,
-	private val pinStrengthCheck: PinStrengthCheckUseCase,
-	private val pinSizeUseCase: PinSizeUseCase,
-	private val removePoisonPillIUseCase: RemovePoisonPillIUseCase,
-	private val securityLevelDetector: SecurityLevelDetector
+    private val appContext: Context,
+    private val preferences: AppSettingsDataSource,
+    private val pinRepository: PinRepository,
+    private val locationRepository: LocationRepository,
+    private val securityResetUseCase: SecurityResetUseCase,
+    private val pinStrengthCheck: PinStrengthCheckUseCase,
+    private val pinSizeUseCase: PinSizeUseCase,
+    private val removePoisonPillIUseCase: RemovePoisonPillIUseCase,
+    private val securityLevelDetector: SecurityLevelDetector
 ) : BaseViewModel<SettingsUiState>() {
 
 	override fun createState() = SettingsUiState(
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/share/DecryptingImageProvider.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/share/DecryptingImageProvider.kt
@@ -15,7 +15,7 @@ import android.os.storage.StorageManager
 import android.provider.OpenableColumns
 import com.darkrockstudios.app.securecamera.camera.PhotoDef
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import org.koin.core.component.KoinComponent
@@ -33,7 +33,7 @@ import kotlin.uuid.Uuid
 class DecryptingImageProvider : ContentProvider(), KoinComponent {
 
 	private val imageManager: SecureImageRepository by inject()
-	private val preferencesManager: AppPreferencesDataSource by inject()
+	private val preferencesManager: AppSettingsDataSource by inject()
 
 	@OptIn(ExperimentalUuidApi::class)
 	private val uuid = Uuid.random()
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/usecases/CreatePinUseCase.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/usecases/CreatePinUseCase.kt
@@ -1,17 +1,17 @@
 package com.darkrockstudios.app.securecamera.usecases
 
 import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.security.SchemeConfig
 import com.darkrockstudios.app.securecamera.security.pin.PinRepository
 import com.darkrockstudios.app.securecamera.security.schemes.EncryptionScheme
 
 class CreatePinUseCase(
-	private val authorizationRepository: AuthorizationRepository,
-	private val encryptionScheme: EncryptionScheme,
-	private val pinRepository: PinRepository,
-	private val preferencesDataSource: AppPreferencesDataSource,
-	private val authorizePinUseCase: AuthorizePinUseCase
+    private val authorizationRepository: AuthorizationRepository,
+    private val encryptionScheme: EncryptionScheme,
+    private val pinRepository: PinRepository,
+    private val preferencesDataSource: AppSettingsDataSource,
+    private val authorizePinUseCase: AuthorizePinUseCase
 ) {
 	suspend fun createPin(pin: String, schemeConfig: SchemeConfig): Boolean {
 		pinRepository.setAppPin(pin, schemeConfig)
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/usecases/MigratePinHash.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/usecases/MigratePinHash.kt
@@ -1,7 +1,7 @@
 package com.darkrockstudios.app.securecamera.usecases
 
 import at.favre.lib.crypto.bcrypt.BCrypt
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
 import com.darkrockstudios.app.securecamera.security.DeviceInfoDataSource
 import com.darkrockstudios.app.securecamera.security.SecurityLevel
@@ -22,11 +22,11 @@ import kotlinx.serialization.json.Json
 import timber.log.Timber
 
 class MigratePinHash(
-	private val detector: SecurityLevelDetector,
-	private val dataSource: AppPreferencesDataSource,
-	private val encryptionScheme: EncryptionScheme,
-	private val removePoisonPillIUseCase: RemovePoisonPillIUseCase,
-	private val deviceInfo: DeviceInfoDataSource,
+    private val detector: SecurityLevelDetector,
+    private val dataSource: AppSettingsDataSource,
+    private val encryptionScheme: EncryptionScheme,
+    private val removePoisonPillIUseCase: RemovePoisonPillIUseCase,
+    private val deviceInfo: DeviceInfoDataSource,
 ) {
 	private val argon2Kt = Argon2Kt()
 
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/viewphoto/ViewPhotoViewModel.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/viewphoto/ViewPhotoViewModel.kt
@@ -8,7 +8,7 @@ import com.darkrockstudios.app.securecamera.BaseViewModel
 import com.darkrockstudios.app.securecamera.R
 import com.darkrockstudios.app.securecamera.camera.PhotoDef
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
 import com.darkrockstudios.app.securecamera.security.pin.PinRepository
 import com.darkrockstudios.app.securecamera.share.sharePhotoWithProvider
 import com.darkrockstudios.app.securecamera.usecases.AddDecoyPhotoUseCase
@@ -18,12 +18,12 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class ViewPhotoViewModel(
-	private val appContext: Context,
-	private val imageManager: SecureImageRepository,
-	private val preferencesManager: AppPreferencesDataSource,
-	private val pinRepository: PinRepository,
-	private val addDecoyPhotoUseCase: AddDecoyPhotoUseCase,
-	private val initialPhotoName: String,
+    private val appContext: Context,
+    private val imageManager: SecureImageRepository,
+    private val preferencesManager: AppSettingsDataSource,
+    private val pinRepository: PinRepository,
+    private val addDecoyPhotoUseCase: AddDecoyPhotoUseCase,
+    private val initialPhotoName: String,
 ) : BaseViewModel<ViewPhotoUiState>() {
 
 	private var currentIndex: Int
diff --git a/app/src/test/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizationManagerTest.kt b/app/src/test/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizationManagerTest.kt
@@ -5,8 +5,8 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.emptyPreferences
 import com.darkrockstudios.app.securecamera.TestClock
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSourceImpl
+import com.darkrockstudios.app.securecamera.preferences.AppSettingsDataSource
+import com.darkrockstudios.app.securecamera.preferences.PreferencesAppSettingsDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
 import com.darkrockstudios.app.securecamera.security.SoftwareSchemeConfig
 import com.darkrockstudios.app.securecamera.security.pin.PinRepository
@@ -33,7 +33,7 @@ import kotlin.time.Instant
 class AuthorizationManagerTest {
 
 	private lateinit var context: Context
-	private lateinit var preferencesManager: AppPreferencesDataSource
+	private lateinit var preferencesManager: AppSettingsDataSource
 	private lateinit var authManager: AuthorizationRepository
 	private lateinit var authorizePinUseCase: AuthorizePinUseCase
 	private lateinit var pinRepository: PinRepository
@@ -47,7 +47,7 @@ class AuthorizationManagerTest {
 	fun setup() {
 		context = mockk(relaxed = true)
 		dataStore = FakeDataStore(emptyPreferences())
-		preferencesManager = spyk(AppPreferencesDataSourceImpl(context, dataStore))
+		preferencesManager = spyk(PreferencesAppSettingsDataSource(context, dataStore))
 		encryptionManager = mockk(relaxed = true)
 		clock = TestClock(Instant.fromEpochSeconds(1))
 
diff --git a/app/src/test/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizePinUseCaseTest.kt b/app/src/test/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizePinUseCaseTest.kt
diff --git a/app/src/test/kotlin/com/darkrockstudios/app/securecamera/preferences/AppPreferencesDataSourceTest.kt b/app/src/test/kotlin/com/darkrockstudios/app/securecamera/preferences/AppPreferencesDataSourceTest.kt
diff --git a/app/src/test/kotlin/com/darkrockstudios/app/securecamera/security/pin/PinRepositorySoftwareTest.kt b/app/src/test/kotlin/com/darkrockstudios/app/securecamera/security/pin/PinRepositorySoftwareTest.kt
