Merge branch 'main' into renovate/kotlinx.serialization

Author: Wavesonics

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/publish-release.yml

@@ -23,7 +23,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Grant Permission to Execute
         run: chmod +x gradlew
@@ -53,7 +53,7 @@ jobs:
 
       - name: Create GitHub Release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           name: Release ${{ env.VERSION_NAME }}
           draft: false
@@ -83,7 +83,7 @@ jobs:
           bundler-cache: true
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Grant Permission to Execute
         run: chmod +x gradlew

app/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 	alias(libs.plugins.kotlin.android)
 	alias(libs.plugins.kotlin.compose)
 	alias(libs.plugins.kotlin.serialization)
+	id("kotlin-parcelize")
 }
 
 android {
@@ -104,6 +105,7 @@ dependencies {
 	implementation(libs.androidx.runtime.livedata)
 	implementation(libs.face.detection)
 	implementation(libs.bcrypt)
+	implementation(libs.androidx.work.runtime.ktx)
 
 	testImplementation(libs.junit)
 	testImplementation(libs.koin.test.junit4)

app/src/main/AndroidManifest.xml

@@ -10,6 +10,8 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" android:minSdkVersion="34"/>
 
     <application
             android:name=".SnapSafeApplication"
@@ -63,6 +65,10 @@
                 android:authorities="${applicationId}.decryptingprovider"
                 android:exported="false"
                 android:grantUriPermissions="true"/>
+
+        <service
+                android:name="androidx.work.impl.foreground.SystemForegroundService"
+                android:foregroundServiceType="dataSync"/>
     </application>
 
 </manifest>

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

@@ -1,23 +1,14 @@
 package com.darkrockstudios.app.securecamera
 
-import android.net.Uri
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.LifecycleResumeEffect
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
-import com.darkrockstudios.app.securecamera.navigation.AppDestinations
 import com.darkrockstudios.app.securecamera.navigation.AppNavHost
 import com.darkrockstudios.app.securecamera.navigation.enforceAuth
 import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
@@ -28,33 +19,16 @@ import org.koin.compose.koinInject
 @Composable
 fun App(
 	capturePhoto: MutableState<Boolean?>,
-	photosToImport: List<Uri>
+	startDestination: String,
+	navController: NavHostController
 ) {
 	KoinContext {
 		SecureCameraTheme {
 			val snackbarHostState = remember { SnackbarHostState() }
-			val navController = rememberNavController()
 			val preferencesManager = koinInject<AppPreferencesDataSource>()
 			val authorizationRepository = koinInject<AuthorizationRepository>()
 
 			val hasCompletedIntro by preferencesManager.hasCompletedIntro.collectAsState(initial = null)
-			val startDestination = rememberSaveable(hasCompletedIntro) {
-				if (hasCompletedIntro == true) {
-					val targetDestination = if (photosToImport.isNotEmpty()) {
-						AppDestinations.IMPORT_PHOTOS_ROUTE
-					} else {
-						AppDestinations.CAMERA_ROUTE
-					}
-
-					if (authorizationRepository.checkSessionValidity()) {
-						targetDestination
-					} else {
-						AppDestinations.createPinVerificationRoute(targetDestination)
-					}
-				} else {
-					AppDestinations.INTRODUCTION_ROUTE
-				}
-			}
 
 			VerifySessionOnResume(navController, hasCompletedIntro, authorizationRepository)
 
@@ -63,17 +37,13 @@ fun App(
 					snackbarHost = { SnackbarHost(snackbarHostState) },
 					modifier = Modifier.imePadding()
 				) { paddingValues ->
-					// Create a mutable state to hold the photos to import
-					val photosToImportState = remember { mutableStateOf(photosToImport) }
-
 					AppNavHost(
 						navController = navController,
 						capturePhoto = capturePhoto,
 						modifier = Modifier,
 						snackbarHostState = snackbarHostState,
 						startDestination = startDestination,
 						paddingValues = paddingValues,
-						photosToImport = photosToImportState
 					)
 				}
 			}
@@ -82,7 +52,7 @@ fun App(
 }
 
 @Composable
-fun VerifySessionOnResume(
+private fun VerifySessionOnResume(
 	navController: NavHostController,
 	hasCompletedIntro: Boolean?,
 	authorizationRepository: AuthorizationRepository

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

@@ -1,5 +1,6 @@
 package com.darkrockstudios.app.securecamera
 
+import androidx.work.WorkManager
 import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
 import com.darkrockstudios.app.securecamera.auth.PinVerificationViewModel
 import com.darkrockstudios.app.securecamera.camera.SecureImageRepository
@@ -10,11 +11,11 @@ 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.security.DeviceInfo
-import com.darkrockstudios.app.securecamera.security.EncryptionScheme
-import com.darkrockstudios.app.securecamera.security.HardwareBackedEncryptionScheme
 import com.darkrockstudios.app.securecamera.security.SecurityLevel
 import com.darkrockstudios.app.securecamera.security.SecurityLevelDetector
-import com.darkrockstudios.app.securecamera.security.SoftwareEncryptionScheme
+import com.darkrockstudios.app.securecamera.security.schemes.EncryptionScheme
+import com.darkrockstudios.app.securecamera.security.schemes.HardwareBackedEncryptionScheme
+import com.darkrockstudios.app.securecamera.security.schemes.SoftwareEncryptionScheme
 import com.darkrockstudios.app.securecamera.settings.SettingsViewModel
 import com.darkrockstudios.app.securecamera.usecases.CreatePinUseCase
 import com.darkrockstudios.app.securecamera.usecases.PinStrengthCheckUseCase
@@ -37,13 +38,15 @@ val appModule = module {
 		when (detector.detectSecurityLevel()) {
 			SecurityLevel.SOFTWARE ->
 				SoftwareEncryptionScheme(get())
-
-			SecurityLevel.TEE, SecurityLevel.STRONGBOX ->
+			SecurityLevel.TEE, SecurityLevel.STRONGBOX -> {
 				HardwareBackedEncryptionScheme(get(), get(), get())
+			}
 		}
 	} bind EncryptionScheme::class
 	singleOf(::SecurityLevelDetector)
 
+	single { WorkManager.getInstance(get()) }
+
 	factoryOf(::DeviceInfo)
 
 	factoryOf(::ThumbnailCache)

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

@@ -9,11 +9,21 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.mutableStateOf
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
+import com.darkrockstudios.app.securecamera.navigation.AppDestinations
+import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.android.inject
 
 class MainActivity : ComponentActivity() {
 	private var capturePhoto = mutableStateOf<Boolean?>(null)
 	private val locationRepository: LocationRepository by inject()
+	private val preferences: AppPreferencesDataSource by inject()
+	private val authorizationRepository: AuthorizationRepository by inject()
+	lateinit var navController: NavHostController
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -27,10 +37,31 @@ class MainActivity : ComponentActivity() {
 
 		enableEdgeToEdge()
 
-		val photosToImport = receiveFiles()
+		val startDestination = determineStartRoute()
 		setContent {
-			App(capturePhoto, photosToImport)
+			navController = rememberNavController()
+			App(capturePhoto, startDestination, navController)
+		}
+	}
+
+	private fun determineStartRoute(): String {
+		val photosToImport = receiveFiles()
+		val hasCompletedIntro = runBlocking { preferences.hasCompletedIntro.firstOrNull() ?: false }
+		val startDestination = if (hasCompletedIntro) {
+			val targetDestination = if (photosToImport.isNotEmpty()) {
+				AppDestinations.createImportPhotosRoute(photosToImport)
+			} else {
+				AppDestinations.CAMERA_ROUTE
+			}
+			if (authorizationRepository.checkSessionValidity()) {
+				targetDestination
+			} else {
+				AppDestinations.createPinVerificationRoute(targetDestination)
+			}
+		} else {
+			AppDestinations.INTRODUCTION_ROUTE
 		}
+		return startDestination
 	}
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {

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

@@ -1,9 +1,9 @@
 package com.darkrockstudios.app.securecamera
 
 import android.app.Application
-import com.darkrockstudios.app.securecamera.auth.AuthorizationRepository
 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
@@ -15,8 +15,8 @@ import timber.log.Timber
 
 class SnapSafeApplication : Application(), KoinComponent {
 	private val imageManager by inject<SecureImageRepository>()
-	private val authRepository by inject<AuthorizationRepository>()
 	private val preferences by inject<AppPreferencesDataSource>()
+	private val securityReset by inject<SecurityResetUseCase>()
 
 	override fun onCreate() {
 		super.onCreate()
@@ -53,8 +53,7 @@ class SnapSafeApplication : Application(), KoinComponent {
 			val isProdReady = (preferences.isProdReady.first() == true)
 			val wasInBeta = intoComplete && !isProdReady
 			if (wasInBeta) {
-				imageManager.securityFailureReset()
-				authRepository.securityFailureReset()
+				securityReset.reset()
 				preferences.markProdReady()
 			} else if (!isProdReady) {
 				preferences.markProdReady()

app/src/main/kotlin/com/darkrockstudios/app/securecamera/auth/AuthorizationRepository.kt

@@ -2,7 +2,7 @@ package com.darkrockstudios.app.securecamera.auth
 
 import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
 import com.darkrockstudios.app.securecamera.preferences.HashedPin
-import com.darkrockstudios.app.securecamera.security.EncryptionScheme
+import com.darkrockstudios.app.securecamera.security.schemes.EncryptionScheme
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -105,8 +105,8 @@ class AuthorizationRepository(
 	/**
 	 * Initial key creation
 	 */
-	suspend fun createKey(): Boolean {
-		encryptionScheme.createKey()
+	suspend fun createKey(pin: String, hashedPin: HashedPin): Boolean {
+		encryptionScheme.createKey(pin, hashedPin)
 		return true
 	}
 

app/src/main/kotlin/com/darkrockstudios/app/securecamera/camera/SecureImageRepository.kt

@@ -11,7 +11,7 @@ import com.ashampoo.kim.model.GpsCoordinates
 import com.ashampoo.kim.model.MetadataUpdate
 import com.ashampoo.kim.model.TiffOrientation
 import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
-import com.darkrockstudios.app.securecamera.security.EncryptionScheme
+import com.darkrockstudios.app.securecamera.security.schemes.EncryptionScheme
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.text.SimpleDateFormat
@@ -29,9 +29,7 @@ class SecureImageRepository(
 	fun getGalleryDirectory(): File = File(appContext.filesDir, PHOTOS_DIR)
 
 	fun getDecoyDirectory(): File {
-		val dir = File(appContext.filesDir, DECOYS_DIR)
-		dir.mkdirs()
-		return dir
+		return File(appContext.filesDir, DECOYS_DIR)
 	}
 
 	fun evictKey() {
@@ -421,7 +419,11 @@ class SecureImageRepository(
 	}
 
 	fun isDecoyPhoto(photoDef: PhotoDef): Boolean = getDecoyFile(photoDef).exists()
-	internal fun getDecoyFile(photoDef: PhotoDef) = File(getDecoyDirectory(), photoDef.photoName)
+
+	internal fun getDecoyFile(photoDef: PhotoDef): File {
+		return File(getDecoyDirectory(), photoDef.photoName)
+	}
+
 	private fun getDecoyFiles(): List<File> {
 		val dir = getDecoyDirectory()
 		if (!dir.exists()) {
@@ -436,6 +438,7 @@ class SecureImageRepository(
 	suspend fun addDecoyPhoto(photoDef: PhotoDef): Boolean {
 		return if (numDecoys() < MAX_DECOY_PHOTOS) {
 			val jpgBytes = decryptJpg(photoDef)
+			getDecoyDirectory().mkdirs()
 			val decoyFile = getDecoyFile(photoDef)
 
 			val ppp = preferencesManager.getHashedPoisonPillPin() ?: return false