refactor: move config, CA install, and Google IP logic into ViewModel…

android/app/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
+    id("com.google.devtools.ksp")
+    id("com.google.dagger.hilt.android")
 }
 
 android {
@@ -129,6 +131,10 @@ dependencies {
     // from MhrvApp.onCreate without touching every composable.
     implementation("androidx.appcompat:appcompat:1.7.0")
 
+    implementation("com.google.dagger:hilt-android:2.57.1")
+    implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
+    ksp("com.google.dagger:hilt-android-compiler:2.57.1")
+
     // Compose UI.
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")

android/app/proguard-rules.pro

@@ -2,4 +2,4 @@
 # These methods are declared `external` in Kotlin — the JNI linker looks
 # them up by exact name at load time.
 -keep class com.therealaleph.mhrv.Native { *; }
--keep class com.therealaleph.mhrv.MhrvVpnService { *; }
+-keep class com.therealaleph.mhrv.data.MhrvVpnService { *; }

android/app/src/main/AndroidManifest.xml

@@ -46,7 +46,7 @@
         tools:targetApi="34">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Mhrv">
@@ -88,7 +88,7 @@
           and route through us.
         -->
         <service
-            android:name=".MhrvVpnService"
+            android:name=".data.MhrvVpnService"
             android:exported="false"
             android:permission="android.permission.BIND_VPN_SERVICE"
             android:foregroundServiceType="specialUse">

android/app/src/main/java/com/therealaleph/mhrv/MhrvApp.kt

@@ -4,6 +4,9 @@ import android.app.Application
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
+import com.therealaleph.mhrv.data.ConfigStore
+import com.therealaleph.mhrv.data.UiLang
+import dagger.hilt.android.HiltAndroidApp
 
 /**
  * Application-level setup. The only job here right now is to catch
@@ -19,6 +22,7 @@ import androidx.core.os.LocaleListCompat
  * including the tun2proxy worker and the log-drain coroutine —
  * important because those don't have an activity in scope.
  */
+@HiltAndroidApp
 class MhrvApp : Application() {
     override fun onCreate() {
         super.onCreate()
@@ -53,7 +57,8 @@ class MhrvApp : Application() {
                     "uncaught on thread=${thread.name} (id=${thread.id}): ${throwable.message}",
                     throwable,
                 )
-            } catch (_: Throwable) { }
+            } catch (_: Throwable) {
+            }
             // Let the default handler still terminate the process and
             // show the system "app closed" dialog — we just wanted to
             // get a log line out the door first.

android/app/src/main/java/com/therealaleph/mhrv/Native.kt

@@ -126,4 +126,4 @@ object Native {
      * @return 0 on normal shutdown, negative on error. BLOCKS.
      */
     external fun runTun2proxy(cliArgs: String, tunMtu: Int): Int
-}
+}

android/app/src/main/java/com/therealaleph/mhrv/data/CaCertInfo.kt

@@ -0,0 +1,7 @@
+package com.therealaleph.mhrv.data
+
+data class CaCertInfo(
+    val fingerprint: ByteArray,
+    val fingerprintHex: String,
+    val subjectCn: String?
+)

android/app/src/main/java/com/therealaleph/mhrv/CaInstall.kt → android/app/src/main/java/com/therealaleph/mhrv/data/CaInstall.kt

@@ -1,4 +1,4 @@
-package com.therealaleph.mhrv
+package com.therealaleph.mhrv.data
 
 import android.content.ContentValues
 import android.content.Context
@@ -9,10 +9,12 @@ import android.provider.MediaStore
 import android.provider.Settings
 import android.security.KeyChain
 import android.util.Base64
+import com.therealaleph.mhrv.Native
 import java.io.File
 import java.security.KeyStore
 import java.security.MessageDigest
 import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
 
 /**
  * Helpers for the MITM-CA install UX.
@@ -195,7 +197,7 @@ object CaInstall {
         val der = readDer(ctx) ?: return null
         return try {
             val cf = CertificateFactory.getInstance("X.509")
-            val cert = cf.generateCertificate(der.inputStream()) as java.security.cert.X509Certificate
+            val cert = cf.generateCertificate(der.inputStream()) as X509Certificate
             val dn = cert.subjectX500Principal.name  // RFC 2253, CN=foo,O=bar
             Regex("""CN=([^,]+)""").find(dn)?.groupValues?.get(1)
         } catch (_: Throwable) { null }
@@ -230,4 +232,4 @@ object CaInstall {
         if (body.isEmpty()) return null
         return try { Base64.decode(body, Base64.DEFAULT) } catch (_: Throwable) { null }
     }
-}
+}

android/app/src/main/java/com/therealaleph/mhrv/data/CaRepository.kt

@@ -0,0 +1,7 @@
+package com.therealaleph.mhrv.data
+
+interface CaRepository {
+    suspend fun prepareCaDialogData(): CaCertInfo?
+    suspend fun saveToDownloads(): String?
+    suspend fun checkInstalled(fingerprint: ByteArray): Boolean
+}

android/app/src/main/java/com/therealaleph/mhrv/data/CaRepositoryImpl.kt

@@ -0,0 +1,36 @@
+package com.therealaleph.mhrv.data
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class CaRepositoryImpl @Inject constructor(@ApplicationContext private val ctx: Context) :
+    CaRepository {
+
+    override suspend fun prepareCaDialogData(): CaCertInfo? {
+        return withContext(Dispatchers.IO) {
+            val exported = CaInstall.export(ctx)
+            if (!exported) return@withContext null
+            val fingerprint = CaInstall.fingerprint(ctx) ?: return@withContext null
+            val hex = CaInstall.fingerprintHex(fingerprint)
+            val subjectCn = CaInstall.subjectCn(ctx)
+            return@withContext CaCertInfo(
+                fingerprint, hex, subjectCn
+            )
+        }
+    }
+
+    override suspend fun saveToDownloads(): String? {
+        return withContext(Dispatchers.IO) {
+            return@withContext CaInstall.saveToDownloads(ctx)
+        }
+    }
+
+    override suspend fun checkInstalled(fingerprint: ByteArray): Boolean {
+        return withContext(Dispatchers.IO) {
+            return@withContext CaInstall.isInstalled(fingerprint)
+        }
+    }
+}

android/app/src/main/java/com/therealaleph/mhrv/data/ConfigRepository.kt

@@ -0,0 +1,12 @@
+package com.therealaleph.mhrv.data
+
+import android.content.Context
+import kotlinx.coroutines.flow.StateFlow
+
+interface ConfigRepository {
+    val config: StateFlow<MhrvConfig>
+    suspend fun saveConfig(cfg: MhrvConfig)
+    suspend fun loadConfig(): MhrvConfig
+    fun encodeConfig(cfg: MhrvConfig): String
+    fun decodeConfig(string: String): MhrvConfig?
+}