Move VaultCache to common module

app/src/main/java/dev/medzik/librepass/android/MainActivity.kt

@@ -9,12 +9,12 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavController
 import dagger.hilt.android.AndroidEntryPoint
 import dev.medzik.android.utils.openEmailApplication
+import dev.medzik.librepass.android.common.VaultCache
 import dev.medzik.librepass.android.common.popUpToDestination
 import dev.medzik.librepass.android.database.Repository
 import dev.medzik.librepass.android.ui.LibrePassNavigation
 import dev.medzik.librepass.android.ui.screens.auth.Unlock
 import dev.medzik.librepass.android.ui.theme.LibrePassTheme
-import dev.medzik.librepass.android.utils.Vault
 import org.apache.commons.lang3.exception.ExceptionUtils
 import javax.inject.Inject
 
@@ -24,7 +24,7 @@ class MainActivity : FragmentActivity() {
     lateinit var repository: Repository
 
     @Inject
-    lateinit var vault: Vault
+    lateinit var vault: VaultCache
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -46,8 +46,8 @@ class MainActivity : FragmentActivity() {
 
         MigrationsManager.run(this, repository)
 
-        // retrieves aes key to decrypt vault if key is valid
-        vault.getVaultSecrets(this)
+        // retrieves aes key for vault decryption if key is valid
+        vault.getSecretsIfNotExpired(this)
 
         setContent {
             LibrePassTheme(

app/src/main/java/dev/medzik/librepass/android/ui/LibrePassViewModel.kt

@@ -2,14 +2,14 @@ package dev.medzik.librepass.android.ui
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dev.medzik.librepass.android.common.VaultCache
 import dev.medzik.librepass.android.database.CredentialsDao
 import dev.medzik.librepass.android.database.LocalCipherDao
-import dev.medzik.librepass.android.utils.Vault
 import javax.inject.Inject
 
 @HiltViewModel
 class LibrePassViewModel @Inject constructor(
     val cipherRepository: LocalCipherDao,
     val credentialRepository: CredentialsDao,
-    val vault: Vault
+    val vault: VaultCache
 ) : ViewModel()

app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/CipherEdit.kt

@@ -39,6 +39,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import java.util.Date
+import java.util.UUID
 
 @Serializable
 data class CipherEdit(val cipherId: String)
@@ -51,7 +52,7 @@ fun CipherEditScreen(
 ) {
     val context = LocalContext.current
 
-    val oldCipher = remember { viewModel.vault.find(args.cipherId) } ?: return
+    val oldCipher = remember { viewModel.vault.find(UUID.fromString(args.cipherId)) } ?: return
     var cipher by rememberMutable(oldCipher)
 
     var loading by rememberMutableBoolean()

app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/CipherView.kt

@@ -70,6 +70,7 @@ import kotlinx.coroutines.delay
 import kotlinx.serialization.Serializable
 import java.text.SimpleDateFormat
 import java.util.Locale
+import java.util.UUID
 import java.util.concurrent.TimeUnit
 
 @Serializable
@@ -81,7 +82,7 @@ fun CipherViewScreen(
     args: CipherView,
     viewModel: LibrePassViewModel = hiltViewModel()
 ) {
-    val cipher = remember { viewModel.vault.find(args.cipherId) } ?: return
+    val cipher = remember { viewModel.vault.find(UUID.fromString(args.cipherId)) } ?: return
 
     var totpCode by rememberMutable("")
     var totpElapsed by rememberMutable(0)

app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/OtpConfigure.kt

@@ -14,6 +14,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -36,6 +37,7 @@ import dev.medzik.otp.OTPParameters
 import dev.medzik.otp.OTPType
 import dev.medzik.otp.TOTPGenerator
 import kotlinx.serialization.Serializable
+import java.util.UUID
 
 @Serializable
 data class OtpConfigure(val cipherId: String)
@@ -46,7 +48,7 @@ fun OtpConfigureScreen(
     args: OtpConfigure,
     viewModel: LibrePassViewModel = hiltViewModel()
 ) {
-    val cipher = viewModel.vault.find(args.cipherId)
+    val cipher = remember { viewModel.vault.find(UUID.fromString(args.cipherId)) } ?: return
 
     Scaffold(
         topBar = {
@@ -140,7 +142,7 @@ fun OtpConfigureScreen(
                 }
             } else {
                 var beginParams: OTPParameters? = null
-                if (cipher?.loginData?.twoFactor != null) {
+                if (cipher.loginData?.twoFactor != null) {
                     beginParams = OTPParameters.parseUrl(cipher.loginData?.twoFactor)
                 }
 

app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/Search.kt

@@ -7,9 +7,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -32,7 +38,7 @@ fun SearchScreen(
     navController: NavController,
     viewModel: LibrePassViewModel = hiltViewModel()
 ) {
-    val ciphers = viewModel.vault.sortAlphabetically()
+    val ciphers = remember { viewModel.vault.getSortedCiphers() }
 
     var searchText by rememberMutableString()
 

app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/Vault.kt

@@ -10,10 +10,22 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.*
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
 import androidx.compose.material3.pulltorefresh.PullToRefreshContainer
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -42,7 +54,7 @@ import dev.medzik.librepass.client.api.CipherClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import java.util.*
+import java.util.Date
 import java.util.concurrent.TimeUnit
 
 @Serializable
@@ -55,14 +67,12 @@ fun VaultScreen(
     viewModel: LibrePassViewModel = hiltViewModel()
 ) {
     val context = LocalContext.current
-
     val scope = rememberCoroutineScope()
 
     val pullToRefreshState = rememberPullToRefreshState()
 
-    var ciphers by remember { mutableStateOf(viewModel.vault.sortAlphabetically()) }
-
-    val credentials = viewModel.credentialRepository.get() ?: return
+    var ciphers by remember { mutableStateOf(viewModel.vault.getSortedCiphers()) }
+    val credentials = remember { viewModel.credentialRepository.get() } ?: return
 
     val cipherClient = CipherClient(
         apiKey = credentials.apiKey,
@@ -101,7 +111,7 @@ fun VaultScreen(
         }
 
         // sort ciphers and update UI
-        ciphers = viewModel.vault.sortAlphabetically()
+        ciphers = viewModel.vault.getSortedCiphers()
     }
 
     fun reSetupBiometrics() {
@@ -163,11 +173,11 @@ fun VaultScreen(
 
         // decrypt database if needed
         if (viewModel.vault.ciphers.isEmpty()) {
-            viewModel.vault.decryptDatabase(dbCiphers)
+            viewModel.vault.decrypt(dbCiphers)
         }
 
         // sort ciphers and update UI
-        ciphers = viewModel.vault.sortAlphabetically()
+        ciphers = viewModel.vault.getSortedCiphers()
 
         // sync remote ciphers
         if (context.haveNetworkConnection()) {

common/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.kotlin.parcelize)
 }
 
@@ -23,7 +23,6 @@ android {
     }
 
     buildFeatures {
-        compose = true
         buildConfig = false
     }
 }
@@ -33,5 +32,14 @@ dependencies {
     implementation(libs.compose.material3)
     implementation(libs.compose.navigation)
     implementation(libs.compose.ui)
+    implementation(libs.medzik.android.crypto)
+    implementation(libs.medzik.android.utils)
+
     implementation(libs.librepass.client)
+
+    implementation(libs.dagger.hilt)
+    implementation(libs.hilt.navigation.compose)
+    ksp(libs.dagger.hilt.compiler)
+
+    implementation(projects.databaseLogic)
 }