Remove beta to prod data migration

Author: Wavesonics

app/src/main/kotlin/com/darkrockstudios/app/securecamera/SnapSafeApplication.kt

@@ -2,10 +2,6 @@ package com.darkrockstudios.app.securecamera
 
 import android.app.Application
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
-import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
-import com.darkrockstudios.app.securecamera.usecases.SecurityResetUseCase
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.component.KoinComponent
@@ -17,8 +13,6 @@ import timber.log.Timber
 
 open class SnapSafeApplication : Application(), KoinComponent {
 	private val imageManager by inject<SecureImageRepository>()
-	private val preferences by inject<AppPreferencesDataSource>()
-	private val securityReset by inject<SecurityResetUseCase>()
 
 	override fun onCreate() {
 		super.onCreate()
@@ -34,8 +28,6 @@ open class SnapSafeApplication : Application(), KoinComponent {
 			androidContext(this@SnapSafeApplication)
 			modules(appModule, flavorModule())
 		}
-
-		handleMigrationFromBeta()
 	}
 
 	open fun flavorModule(): Module = module { }
@@ -49,19 +41,4 @@ open class SnapSafeApplication : Application(), KoinComponent {
 		super.onLowMemory()
 		imageManager.thumbnailCache.clear()
 	}
-
-	// DELETE ME after a few versions
-	private fun handleMigrationFromBeta() {
-		runBlocking {
-			val intoComplete = (preferences.hasCompletedIntro.first() == true)
-			val isProdReady = (preferences.isProdReady.first() == true)
-			val wasInBeta = intoComplete && !isProdReady
-			if (wasInBeta) {
-				securityReset.reset()
-				preferences.markProdReady()
-			} else if (!isProdReady) {
-				preferences.markProdReady()
-			}
-		}
-	}
 }

app/src/main/kotlin/com/darkrockstudios/app/securecamera/preferences/AppPreferencesDataSource.kt

@@ -7,8 +7,7 @@ interface AppPreferencesDataSource {
 	/**
 	 * Check if the user has completed the introduction
 	 */
-	val hasCompletedIntro: Flow<Boolean?> // DELETE ME after beta migration is over
-	val isProdReady: Flow<Boolean?>
+	val hasCompletedIntro: Flow<Boolean?>
 
 	/**
 	 * Get the sanitized file name preference
@@ -30,9 +29,6 @@ interface AppPreferencesDataSource {
 	suspend fun getCipherKey(): String
 	suspend fun getCipheredPin(): String?
 
-	// DELETE ME after beta migration is over
-	suspend fun markProdReady()
-
 	/**
 	 * Set the introduction completion status
 	 */

app/src/main/kotlin/com/darkrockstudios/app/securecamera/preferences/AppPreferencesDataSourceImpl.kt

@@ -40,7 +40,6 @@ class AppPreferencesDataSourceImpl(
 		private val SESSION_TIMEOUT = stringPreferencesKey("session_timeout")
 		private val SYMMETRIC_CIPHER_KEY = stringPreferencesKey("symmetric_cipher_key")
 		private val SCHEME_CONFIG_KEY = stringPreferencesKey("scheme_config")
-		private val IS_PROD_READY = booleanPreferencesKey("is_prod_ready")
 
 		val SESSION_TIMEOUT_1_MIN = 1.minutes.inWholeMilliseconds
 		val SESSION_TIMEOUT_5_MIN = 5.minutes.inWholeMilliseconds
@@ -74,19 +73,6 @@ class AppPreferencesDataSourceImpl(
 			preferences[HAS_COMPLETED_INTRO] ?: false
 		}
 
-	// DELETE ME after beta migration is over
-	override val isProdReady: Flow<Boolean?> = dataStore.data
-		.map { preferences ->
-			preferences[IS_PROD_READY] ?: false
-		}
-
-	// DELETE ME after beta migration is over
-	override suspend fun markProdReady() {
-		dataStore.edit { preferences ->
-			preferences[IS_PROD_READY] = true
-		}
-	}
-
 	/**
 	 * Get the sanitized file name preference
 	 */
@@ -191,7 +177,6 @@ class AppPreferencesDataSourceImpl(
 		dataStore.edit { preferences ->
 			preferences.clear()
 		}
-		markProdReady()
 	}
 
 	/**

app/src/test/kotlin/com/darkrockstudios/app/securecamera/preferences/AppPreferencesDataSourceTest.kt

@@ -41,14 +41,6 @@ class AppPreferencesDataSourceTest {
 		assertEquals(false, sut.hasCompletedIntro.first())
 	}
 
-	@Test
-	fun `isProdReady defaults false, markProdReady true`() = runTest {
-		val sut = newSut()
-		assertEquals(false, sut.isProdReady.first())
-		sut.markProdReady()
-		assertEquals(true, sut.isProdReady.first())
-	}
-
 	@Test
 	fun `sanitize flags default to true and are settable`() = runTest {
 		val sut = newSut()
@@ -140,7 +132,6 @@ class AppPreferencesDataSourceTest {
 
 		// Verify defaults/cleared
 		assertEquals(false, sut.hasCompletedIntro.first())
-		assertEquals(true, sut.isProdReady.first())
 		assertEquals(true, sut.sanitizeFileName.first())
 		assertEquals(true, sut.sanitizeMetadata.first())
 		assertEquals(0, sut.getFailedPinAttempts())