Fix #11 intermittent app crash on first launch

Author: DigitallyRefined

app/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdk 24
         targetSdk 34
         versionCode 1
-        versionName "0.0.10"
+        versionName "0.0.11"
     }
 
     signingConfigs {
@@ -72,6 +72,12 @@ android {
         viewBinding true
     }
 
+    packaging {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def versionName = variant.versionName
@@ -96,10 +102,10 @@ dependencies {
     implementation "androidx.security:security-crypto:1.1.0-alpha06"
 
     // CameraX dependencies
-    implementation 'androidx.camera:camera-core:1.3.0'
-    implementation 'androidx.camera:camera-camera2:1.3.0'
-    implementation 'androidx.camera:camera-lifecycle:1.3.0'
-    implementation 'androidx.camera:camera-view:1.3.0'
+    implementation 'androidx.camera:camera-core:1.4.0'
+    implementation 'androidx.camera:camera-camera2:1.4.0'
+    implementation 'androidx.camera:camera-lifecycle:1.4.0'
+    implementation 'androidx.camera:camera-view:1.4.0'
 
     // Coroutines for asynchronous operations
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'

app/src/main/kotlin/com/github/digitallyrefined/androidipcamera/helpers/SecureStorage.kt

@@ -5,8 +5,10 @@ import android.os.Build
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
+import android.util.Log
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
+import java.io.File
 import java.security.KeyStore
 import javax.crypto.Cipher
 import javax.crypto.KeyGenerator
@@ -16,6 +18,13 @@ import javax.crypto.spec.GCMParameterSpec
 class SecureStorage(context: Context) {
 
     private val encryptedPrefs = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        createEncryptedPreferences(context)
+    } else {
+        // Fallback for older Android versions
+        context.getSharedPreferences("secure_prefs", Context.MODE_PRIVATE)
+    }
+
+    private fun createEncryptedPreferences(context: Context) = try {
         // Use AndroidX Security library for modern encryption
         val masterKey = MasterKey.Builder(context)
             .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
@@ -28,9 +37,39 @@ class SecureStorage(context: Context) {
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
             EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
         )
-    } else {
-        // Fallback for older Android versions
-        context.getSharedPreferences("secure_prefs", Context.MODE_PRIVATE)
+    } catch (e: Exception) {
+        // Handle corrupted encrypted preferences from previous installations
+        Log.w(TAG, "Failed to open encrypted preferences, attempting to clear corrupted data", e)
+
+        // Delete the corrupted encrypted preferences file
+        val prefsFile = File(context.filesDir.parent, "shared_prefs/secure_prefs.xml")
+        if (prefsFile.exists()) {
+            prefsFile.delete()
+            Log.i(TAG, "Deleted corrupted encrypted preferences file")
+        }
+
+        // Delete the master key if it exists
+        try {
+            val keyStore = KeyStore.getInstance("AndroidKeyStore")
+            keyStore.load(null)
+            keyStore.deleteEntry(MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+            Log.i(TAG, "Deleted master key")
+        } catch (keyDeleteException: Exception) {
+            Log.w(TAG, "Could not delete master key", keyDeleteException)
+        }
+
+        // Retry creating encrypted preferences with fresh data
+        val masterKey = MasterKey.Builder(context)
+            .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+            .build()
+
+        EncryptedSharedPreferences.create(
+            context,
+            "secure_prefs",
+            masterKey,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        )
     }
 
     // Store sensitive data securely
@@ -59,6 +98,8 @@ class SecureStorage(context: Context) {
     }
 
     companion object {
+        private const val TAG = "SecureStorage"
+
         // Keys for sensitive data
         const val KEY_USERNAME = "secure_username"
         const val KEY_PASSWORD = "secure_password"

build.gradle.kts

@@ -4,8 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.13.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
+        classpath("com.android.tools.build:gradle:9.0.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10")
     }
 }
 

gradle.properties

@@ -8,4 +8,14 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME