Feat/v2/autofill

app/build.gradle.kts

@@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.androidx.room)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
@@ -64,11 +63,13 @@ android {
 
 kotlin {
     compilerOptions {
+        freeCompilerArgs.add("-Xcontext-parameters")
         jvmTarget = JvmTarget.JVM_17
     }
 }
 
 dependencies {
+    implementation(libs.okhttp)
 
     // Koin DI
     implementation(project.dependencies.platform(libs.koin.bom))
@@ -77,14 +78,7 @@ dependencies {
     implementation(libs.koin.annotations)
     ksp(libs.koin.ksp.compiler)
 
-    // Room
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
-
-    // Automation
-    implementation(projects.automation)
-    ksp(projects.automationProcessor)
+    implementation(projects.core.item)
 
     // Datastore
     implementation(libs.androidx.datastore)
@@ -96,6 +90,8 @@ dependencies {
     implementation(libs.offrange.passgen)
     implementation(libs.argon2kt)
 
+    implementation(libs.androidx.autofill)
+
     // Use GMS ML Kit for barcode scanning on the Play Store to minimize app size; use ZXing for F-Droid builds.
     "playStoreImplementation"(libs.gms.mlkit.barcode.scanning)
     "fdroidImplementation"(libs.zxing.barcode.scanning)
@@ -153,12 +149,4 @@ protobuf {
 composeCompiler {
     reportsDestination = layout.buildDirectory.dir("compose_compiler")
     metricsDestination = layout.buildDirectory.dir("compose_compiler")
-}
-
-room {
-    schemaDirectory("$projectDir/schemas")
-}
-
-ksp {
-    arg("automation.packageName", "de.davis.keygo.generated")
 }

app/src/main/AndroidManifest.xml

@@ -43,6 +43,24 @@
                     android:scheme="otpauth" />
             </intent-filter>
         </activity>
+
+        <service
+            android:name=".autofill.presentation.KeyGoAutofillService"
+            android:exported="true"
+            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
+            <meta-data
+                android:name="android.autofill"
+                android:resource="@xml/keygo_autofill_service" />
+            <intent-filter>
+                <action android:name="android.service.autofill.AutofillService" />
+            </intent-filter>
+        </service>
+
+        <activity
+            android:name=".autofill.presentation.activity.AutofillActivity"
+            android:excludeFromRecents="true"
+            android:exported="false"
+            android:theme="@style/Theme.KeyGo.Auth.Transparent" />
     </application>
 
 </manifest>

app/src/main/kotlin/de/davis/keygo/app/KeyGoApplication.kt

@@ -1,5 +1,15 @@
 package de.davis.keygo.app
 
 import android.app.Application
+import de.davis.keygo.app.di.init
+import org.koin.core.context.startKoin
 
-class KeyGoApplication : Application()
+class KeyGoApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        startKoin {
+            init(this@KeyGoApplication)
+        }
+    }
+}

app/src/main/kotlin/de/davis/keygo/app/di/Koin.kt

@@ -2,8 +2,10 @@ package de.davis.keygo.app.di
 
 import android.content.Context
 import de.davis.keygo.auth.di.AuthModule
-import de.davis.keygo.core.data.local.datasource.KeyGoDatabase
+import de.davis.keygo.autofill.di.AutofillModule
 import de.davis.keygo.core.di.CoreModule
+import de.davis.keygo.core.item.data.local.datasource.ItemDatabase
+import de.davis.keygo.core.util.di.CoreUtilModule
 import de.davis.keygo.dashboard.di.DashboardModule
 import de.davis.keygo.item.di.ItemModule
 import de.davis.keygo.migration.create_access.di.MigrationCreateAccessModule
@@ -17,12 +19,14 @@ fun KoinApplication.init(androidContext: Context) {
 
     // modules
     modules(
-        KeyGoDatabase.koinModule,
+        ItemDatabase.koinModule,
         CoreModule.module,
+        CoreUtilModule.module,
         AuthModule.module,
         DashboardModule.module,
         ItemModule.module,
         TotpModule.module,
+        AutofillModule.module,
 
         MigrationCreateAccessModule.module
     )

app/src/main/kotlin/de/davis/keygo/auth/data/repository/KeyDerivationRepositoryImpl.kt

@@ -3,9 +3,9 @@ package de.davis.keygo.auth.data.repository
 import com.lambdapioneer.argon2kt.Argon2Kt
 import com.lambdapioneer.argon2kt.Argon2Mode
 import com.lambdapioneer.argon2kt.Argon2Version
-import de.davis.keygo.auth.domain.model.CryptographyError
 import de.davis.keygo.auth.domain.repository.KeyDerivationRepository
-import de.davis.keygo.core.domain.Result
+import de.davis.keygo.core.identity.common.domain.model.CryptographyError
+import de.davis.keygo.core.util.Result
 import org.koin.core.annotation.Single
 
 @Single

app/src/main/kotlin/de/davis/keygo/auth/data/repository/PasswordWrappedKeyRepositoryImpl.kt

@@ -0,0 +1,22 @@
+package de.davis.keygo.auth.data.repository
+
+import androidx.datastore.core.DataStore
+import de.davis.keygo.auth.data.local.model.ProtoPasswordKeyData
+import de.davis.keygo.auth.data.mapper.toDomain
+import de.davis.keygo.auth.data.mapper.toProto
+import de.davis.keygo.auth.domain.model.PasswordWrappedKeyData
+import de.davis.keygo.core.di.annotation.PasswordQualifier
+import de.davis.keygo.core.identity.common.data.repository.DefaultWrappedKeyRepository
+import de.davis.keygo.core.identity.common.domain.repository.WrappedKeyRepository
+import org.koin.core.annotation.Single
+
+@Suppress("FunctionName")
+@Single(binds = [WrappedKeyRepository::class])
+@PasswordQualifier
+fun PasswordWrappedKeyRepositoryImpl(@PasswordQualifier dataStore: DataStore<ProtoPasswordKeyData>) =
+    DefaultWrappedKeyRepository(
+        dataStore = dataStore,
+        toDomain = ProtoPasswordKeyData::toDomain,
+        toProto = PasswordWrappedKeyData::toProto,
+        defaultInstance = ProtoPasswordKeyData::getDefaultInstance
+    )

app/src/main/kotlin/de/davis/keygo/auth/di/AuthModule.kt

@@ -3,9 +3,7 @@ package de.davis.keygo.auth.di
 import android.content.Context
 import androidx.datastore.dataStore
 import com.lambdapioneer.argon2kt.Argon2Kt
-import de.davis.keygo.auth.data.local.model.ProtoBiometricKeyData
 import de.davis.keygo.auth.data.local.model.ProtoPasswordKeyData
-import de.davis.keygo.auth.di.annotation.BiometricQualifier
 import de.davis.keygo.core.di.DefaultProtoSerializer
 import de.davis.keygo.core.di.annotation.PasswordQualifier
 import org.koin.core.annotation.ComponentScan
@@ -24,24 +22,11 @@ object AuthModule {
         )
     )
 
-    private val Context.protoBiometricKeyDataStore by dataStore(
-        "biometric_key_data.pb",
-        DefaultProtoSerializer(
-            defaultInstance = ProtoBiometricKeyData.getDefaultInstance(),
-            parser = ProtoBiometricKeyData.parser()
-        )
-    )
-
     @Single
     internal fun provideArgon2Kt() = Argon2Kt()
 
     @Single
     @PasswordQualifier
     internal fun provideProtoPasswordKeyDataStore(context: Context) =
         context.protoPasswordKeyDataStore
-
-    @Single
-    @BiometricQualifier
-    internal fun provideProtoBiometricKeyDataStore(context: Context) =
-        context.protoBiometricKeyDataStore
 }

app/src/main/kotlin/de/davis/keygo/auth/domain/repository/KeyDerivationRepository.kt

@@ -1,7 +1,7 @@
 package de.davis.keygo.auth.domain.repository
 
-import de.davis.keygo.auth.domain.model.CryptographyError
-import de.davis.keygo.core.domain.Result
+import de.davis.keygo.core.identity.common.domain.model.CryptographyError
+import de.davis.keygo.core.util.Result
 
 interface KeyDerivationRepository {
 

app/src/main/kotlin/de/davis/keygo/auth/domain/repository/PasswordWrappedKeyRepository.kt

@@ -1,23 +1,6 @@
 package de.davis.keygo.auth.domain.repository
 
-import androidx.datastore.core.DataStore
-import de.davis.keygo.auth.data.local.model.ProtoPasswordKeyData
-import de.davis.keygo.auth.data.mapper.toDomain
-import de.davis.keygo.auth.data.mapper.toProto
-import de.davis.keygo.auth.data.repository.DefaultWrappedKeyRepository
 import de.davis.keygo.auth.domain.model.PasswordWrappedKeyData
-import de.davis.keygo.core.di.annotation.PasswordQualifier
-import org.koin.core.annotation.Single
+import de.davis.keygo.core.identity.common.domain.repository.WrappedKeyRepository
 
-typealias PasswordWrappedKeyRepository = WrappedKeyRepository<PasswordWrappedKeyData>
-
-@Suppress("FunctionName")
-@Single(binds = [WrappedKeyRepository::class])
-@PasswordQualifier
-fun PasswordWrappedKeyRepositoryImpl(@PasswordQualifier dataStore: DataStore<ProtoPasswordKeyData>) =
-    DefaultWrappedKeyRepository(
-        dataStore = dataStore,
-        toDomain = ProtoPasswordKeyData::toDomain,
-        toProto = PasswordWrappedKeyData::toProto,
-        defaultInstance = ProtoPasswordKeyData::getDefaultInstance
-    )
+typealias PasswordWrappedKeyRepository = WrappedKeyRepository<PasswordWrappedKeyData>

app/src/main/kotlin/de/davis/keygo/auth/domain/usecase/CreateAccessUseCase.kt

@@ -1,22 +1,22 @@
 package de.davis.keygo.auth.domain.usecase
 
-import de.davis.keygo.auth.data.repository.BiometricWrappedKeyRepository
-import de.davis.keygo.auth.di.annotation.BiometricQualifier
-import de.davis.keygo.auth.domain.factory.CipherFactory
-import de.davis.keygo.auth.domain.model.BiometricWrappedKeyData
-import de.davis.keygo.auth.domain.model.CryptographicMode
-import de.davis.keygo.auth.domain.model.CryptographyError
 import de.davis.keygo.auth.domain.model.PasswordWrappedKeyData
 import de.davis.keygo.auth.domain.repository.DeviceInfoRepository
 import de.davis.keygo.auth.domain.repository.KeyDerivationRepository
 import de.davis.keygo.auth.domain.repository.PasswordWrappedKeyRepository
+import de.davis.keygo.core.di.annotation.BiometricQualifier
 import de.davis.keygo.core.di.annotation.PasswordQualifier
-import de.davis.keygo.core.domain.Result
 import de.davis.keygo.core.domain.Session
-import de.davis.keygo.core.domain.asUnitResult
 import de.davis.keygo.core.domain.model.crypto.asAesKey
-import de.davis.keygo.core.domain.onSuccess
-import de.davis.keygo.core.domain.zip
+import de.davis.keygo.core.identity.common.domain.CipherFactory
+import de.davis.keygo.core.identity.common.domain.model.BiometricWrappedKeyData
+import de.davis.keygo.core.identity.common.domain.model.CryptographicMode
+import de.davis.keygo.core.identity.common.domain.model.CryptographyError
+import de.davis.keygo.core.identity.common.domain.repository.BiometricWrappedKeyRepository
+import de.davis.keygo.core.util.Result
+import de.davis.keygo.core.util.asUnitResult
+import de.davis.keygo.core.util.onSuccess
+import de.davis.keygo.core.util.zip
 import org.koin.core.annotation.Single
 import java.security.SecureRandom
 import javax.crypto.Cipher

app/src/main/kotlin/de/davis/keygo/auth/domain/usecase/UnlockWithPasswordUseCase.kt

@@ -1,19 +1,19 @@
 package de.davis.keygo.auth.domain.usecase
 
-import de.davis.keygo.auth.domain.factory.CipherFactory
-import de.davis.keygo.auth.domain.model.CryptographicMode
-import de.davis.keygo.auth.domain.model.CryptographyError
 import de.davis.keygo.auth.domain.repository.DeviceInfoRepository
 import de.davis.keygo.auth.domain.repository.KeyDerivationRepository
 import de.davis.keygo.auth.domain.repository.PasswordWrappedKeyRepository
 import de.davis.keygo.core.di.annotation.PasswordQualifier
-import de.davis.keygo.core.domain.Result
 import de.davis.keygo.core.domain.Session
-import de.davis.keygo.core.domain.asResult
-import de.davis.keygo.core.domain.asUnitResult
 import de.davis.keygo.core.domain.model.crypto.asAesKey
-import de.davis.keygo.core.domain.onSuccess
-import de.davis.keygo.core.domain.zip
+import de.davis.keygo.core.identity.common.domain.CipherFactory
+import de.davis.keygo.core.identity.common.domain.model.CryptographicMode
+import de.davis.keygo.core.identity.common.domain.model.CryptographyError
+import de.davis.keygo.core.util.Result
+import de.davis.keygo.core.util.asResult
+import de.davis.keygo.core.util.asUnitResult
+import de.davis.keygo.core.util.onSuccess
+import de.davis.keygo.core.util.zip
 import org.koin.core.annotation.Single
 
 @Single

app/src/main/kotlin/de/davis/keygo/auth/presentation/AuthScreen.kt

@@ -3,7 +3,9 @@ package de.davis.keygo.auth.presentation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import de.davis.keygo.auth.presentation.model.AuthUIEvent
+import de.davis.keygo.core.identity.biometric.presentation.BiometricPromptSupport
+import de.davis.keygo.core.identity.biometric.presentation.LocalBiometricManager
+import de.davis.keygo.core.identity.biometric.presentation.model.BiometricRequest
 import de.davis.keygo.core.presentation.ObserveAsEvents
 import org.koin.androidx.compose.koinViewModel
 
@@ -16,18 +18,18 @@ fun AuthScreen(onSuccess: () -> Unit) {
         onSuccess()
     }
 
-    BiometricAuthHandler(
-        flow = viewModel.biometricRequests,
-        onAuthenticationSucceeded = {
-            viewModel.onEvent(AuthUIEvent.BiometricSuccess(it))
-        },
-        onAuthenticationError = { _, _ ->
-            viewModel.onEvent(AuthUIEvent.BiometricError)
-        },
-        onAuthenticationFailed = {
-            viewModel.onEvent(AuthUIEvent.BiometricFailure)
+    BiometricPromptSupport {
+        val biometricManager = LocalBiometricManager.current
+
+        ObserveAsEvents(viewModel.biometricRequests) {
+            when (it) {
+                is BiometricRequest.Class3 -> {
+                    val result = biometricManager.authenticate(it)
+                    viewModel.onBiometricResult(result)
+                }
+            }
         }
-    )
 
-    AuthContent(state = state, onEvent = viewModel::onEvent)
+        AuthContent(state = state, onEvent = viewModel::onEvent)
+    }
 }