fix: Change ContextualDatabase

2025-12-04 15:49:33 +01:00 · 2023-05-14 22:21:34 +02:00
parent 05865fe8c3
commit 939b319563
15 changed files with 61 additions and 60 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -53,7 +53,6 @@ import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.adapters.TagsAdapter
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
@@ -527,7 +526,7 @@ class EntryActivity : DatabaseLockActivity() {
         * Open standard Entry activity
         */
        fun launch(activity: Activity,
-                   database: Database,
+                   database: ContextualDatabase,
                   entryId: NodeId<UUID>,
                   activityResultLauncher: ActivityResultLauncher<Intent>) {
            if (database.loaded) {
@@ -543,7 +542,7 @@ class EntryActivity : DatabaseLockActivity() {
         * Open history Entry activity
         */
        fun launch(activity: Activity,
-                   database: Database,
+                   database: ContextualDatabase,
                   entryId: NodeId<UUID>,
                   historyPosition: Int,
                   activityResultLauncher: ActivityResultLauncher<Intent>) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -67,7 +67,6 @@ import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Field
@@ -452,7 +451,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        finishForEntryResult(entry)
    }

-    private fun entryValidatedForKeyboardSelection(database: Database, entry: Entry) {
+    private fun entryValidatedForKeyboardSelection(database: ContextualDatabase, entry: Entry) {
        // Populate Magikeyboard with entry
        MagikeyboardService.populateKeyboardAndMoveAppToBackground(
            this,
@@ -778,7 +777,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to update an existing entry by his [entryId]
         */
        fun launchToUpdate(activity: Activity,
-                           database: Database,
+                           database: ContextualDatabase,
                           entryId: NodeId<UUID>,
                           activityResultLauncher: ActivityResultLauncher<Intent>) {
            if (database.loaded && !database.isReadOnly) {
@@ -794,7 +793,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to add a new entry in an existent group
         */
        fun launchToCreate(activity: Activity,
-                           database: Database,
+                           database: ContextualDatabase,
                           groupId: NodeId<*>,
                           activityResultLauncher: ActivityResultLauncher<Intent>) {
            if (database.loaded && !database.isReadOnly) {
@@ -807,7 +806,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        }

        fun launchToUpdateForSave(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  entryId: NodeId<UUID>,
                                  searchInfo: SearchInfo) {
            if (database.loaded && !database.isReadOnly) {
@@ -824,7 +823,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        }

        fun launchToCreateForSave(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  groupId: NodeId<*>,
                                  searchInfo: SearchInfo) {
            if (database.loaded && !database.isReadOnly) {
@@ -844,7 +843,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to add a new entry in keyboard selection
         */
        fun launchForKeyboardSelectionResult(context: Context,
-                                             database: Database,
+                                             database: ContextualDatabase,
                                             groupId: NodeId<*>,
                                             searchInfo: SearchInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
@@ -865,7 +864,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         */
        @RequiresApi(api = Build.VERSION_CODES.O)
        fun launchForAutofillResult(activity: AppCompatActivity,
-                                    database: Database,
+                                    database: ContextualDatabase,
                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
                                    autofillComponent: AutofillComponent,
                                    groupId: NodeId<*>,
@@ -889,7 +888,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to register an updated entry (from autofill)
         */
        fun launchToUpdateForRegistration(context: Context,
-                                          database: Database,
+                                          database: ContextualDatabase,
                                          entryId: NodeId<UUID>,
                                          registerInfo: RegisterInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
@@ -909,7 +908,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to register a new entry (from autofill)
         */
        fun launchToCreateForRegistration(context: Context,
-                                          database: Database,
+                                          database: ContextualDatabase,
                                          groupId: NodeId<*>,
                                          registerInfo: RegisterInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
@@ -6,7 +6,6 @@ import androidx.fragment.app.activityViewModels
 import com.kunzisoft.keepass.activities.legacy.DatabaseRetrieval
 import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrFocused
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.icons.IconDrawableFactory
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.timeout.TimeoutHelper
@@ -15,7 +14,7 @@ import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {

    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    private var mDatabase: Database? = null
+    private var mDatabase: ContextualDatabase? = null

    protected var mIconDrawableFactory: IconDrawableFactory? = null

--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/DatabaseFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/DatabaseFragment.kt
@@ -7,7 +7,6 @@ import com.kunzisoft.keepass.activities.legacy.DatabaseRetrieval
 import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrFocused
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
@@ -15,7 +14,7 @@ import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 abstract class DatabaseFragment : StylishFragment(), DatabaseRetrieval {

    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    protected var mDatabase: Database? = null
+    protected var mDatabase: ContextualDatabase? = null

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
@@ -38,7 +38,6 @@ import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.MainCredential
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.node.Node
@@ -303,7 +302,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
        mDatabaseTaskProvider?.startDatabaseMoveNodes(nodesToMove, newParent, mAutoSaveEnable)
    }

-    private fun eachNodeRecyclable(database: Database, nodes: List<Node>): Boolean {
+    private fun eachNodeRecyclable(database: ContextualDatabase, nodes: List<Node>): Boolean {
        return nodes.find { node ->
            var cannotRecycle = true
            if (node is Entry) {
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -32,7 +32,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.ImageViewerActivity
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.helper.getLocalizedName
 import com.kunzisoft.keepass.model.AttachmentState
@@ -46,7 +46,7 @@ import kotlin.math.max
 class EntryAttachmentsItemsAdapter(context: Context)
    : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {

-    var database: Database? = null
+    var database: ContextualDatabase? = null
    var onItemClickListener: ((item: EntryAttachmentState)->Unit)? = null
    var onBinaryPreviewLoaded: ((item: EntryAttachmentState) -> Unit)? = null

--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -37,7 +37,6 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.AutofillLauncherActivity
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.model.CreditCard
 import com.kunzisoft.keepass.model.RegisterInfo
@@ -154,7 +153,7 @@ class KeeAutofillService : AutofillService() {

    @SuppressLint("RestrictedApi")
    private fun showUIForEntrySelection(parseResult: StructureParser.Result,
-                                        database: Database?,
+                                        database: ContextualDatabase?,
                                        searchInfo: SearchInfo,
                                        inlineSuggestionsRequest: CompatInlineSuggestionsRequest?,
                                        callback: FillCallback) {
--- a/app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt
@@ -29,9 +29,9 @@ import android.os.IBinder
 import android.util.Log
 import androidx.core.app.ServiceCompat
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
@@ -48,7 +48,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 class AttachmentFileNotificationService: LockNotificationService() {

    private var mDatabaseTaskProvider: DatabaseTaskProvider? = null
-    private var mDatabase: Database? = null
+    private var mDatabase: ContextualDatabase? = null
    private val mPendingCommands: MutableList<Intent?> = mutableListOf()

    override val notificationId: Int = 10000
@@ -366,7 +366,7 @@ class AttachmentFileNotificationService: LockNotificationService() {

    private class AttachmentFileAction(
        private val attachmentNotification: AttachmentNotification,
-        private val database: Database,
+        private val database: ContextualDatabase,
        private val contentResolver: ContentResolver) {

        private val updateMinFrequency = 1000
--- a/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
@@ -37,7 +37,6 @@ import com.kunzisoft.keepass.database.action.*
 import com.kunzisoft.keepass.database.action.history.DeleteEntryHistoryDatabaseRunnable
 import com.kunzisoft.keepass.database.action.history.RestoreEntryHistoryDatabaseRunnable
 import com.kunzisoft.keepass.database.action.node.*
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
@@ -1288,7 +1287,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
        const val NEW_ELEMENT_KEY = "NEW_ELEMENT_KEY" // Warning type of this thing change every time
        const val DATA_BYTES = "DATA_BYTES"

-        fun getListNodesFromBundle(database: Database, bundle: Bundle): List<Node> {
+        fun getListNodesFromBundle(database: ContextualDatabase, bundle: Bundle): List<Node> {
            val nodesAction = ArrayList<Node>()
            bundle.getParcelableArrayList<NodeId<*>>(GROUPS_ID_KEY)?.forEach {
                database.getGroupById(it)?.let { groupRetrieve ->
--- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
@@ -36,7 +36,6 @@ import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrF
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.helper.*
@@ -49,7 +48,7 @@ import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetrieval {

    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    private var mDatabase: Database? = null
+    private var mDatabase: ContextualDatabase? = null
    private var mDatabaseReadOnly: Boolean = false
    private var mMergeDataAllowed: Boolean = false
    private var mDatabaseAutoSaveEnabled: Boolean = true
@@ -150,7 +149,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev
        }
    }

-    private fun onCreateDatabasePreference(database: Database) {
+    private fun onCreateDatabasePreference(database: ContextualDatabase) {
        val dbGeneralPrefCategory: PreferenceCategory? = findPreference(getString(R.string.database_category_general_key))

        // Database name
@@ -283,7 +282,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev
        }
    }

-    private fun refreshRecycleBinGroup(database: Database?) {
+    private fun refreshRecycleBinGroup(database: ContextualDatabase?) {
        recycleBinGroupPref?.apply {
            if (database?.isRecycleBinEnabled == true) {
                summary = database.recycleBin?.toString()
@@ -295,7 +294,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev
        }
    }

-    private fun refreshTemplatesGroup(database: Database?) {
+    private fun refreshTemplatesGroup(database: ContextualDatabase?) {
        templatesGroupPref?.apply {
            if (database?.isTemplatesEnabled == true) {
                summary = database.templatesGroup?.toString()
@@ -307,7 +306,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev
        }
    }

-    private fun onCreateDatabaseSecurityPreference(database: Database) {
+    private fun onCreateDatabaseSecurityPreference(database: ContextualDatabase) {
        // Encryption Algorithm
        mEncryptionAlgorithmPref = findPreference<DialogListExplanationPreference>(getString(R.string.encryption_algorithm_key))?.apply {
            summary = database.getEncryptionAlgorithmName()
@@ -334,7 +333,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev
        }
    }

-    private fun onCreateDatabaseMasterKeyPreference(database: Database) {
+    private fun onCreateDatabaseMasterKeyPreference(database: ContextualDatabase) {
        findPreference<Preference>(getString(R.string.settings_database_change_credentials_key))?.apply {
            isEnabled = if (!mDatabaseReadOnly) {
                onPreferenceClickListener = Preference.OnPreferenceClickListener {
--- a/app/src/main/java/com/kunzisoft/keepass/tasks/BinaryDatabaseManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/tasks/BinaryDatabaseManager.kt
@@ -5,7 +5,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.binary.BinaryCache
 import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.utils.UriHelper.getUriInputStream
@@ -23,7 +23,7 @@ import kotlin.math.pow

 object BinaryDatabaseManager {

-    fun downloadFromDatabase(database: Database,
+    fun downloadFromDatabase(database: ContextualDatabase,
                             attachmentToUploadUri: Uri,
                             binaryData: BinaryData,
                             contentResolver: ContentResolver,
@@ -57,7 +57,7 @@ object BinaryDatabaseManager {
        }
    }

-    fun uploadToDatabase(database: Database,
+    fun uploadToDatabase(database: ContextualDatabase,
                         attachmentFromDownloadUri: Uri,
                         binaryData: BinaryData,
                         contentResolver: ContentResolver,
@@ -93,7 +93,7 @@ object BinaryDatabaseManager {
    }

    fun resizeBitmapAndStoreDataInBinaryFile(contentResolver: ContentResolver,
-                                             database: Database,
+                                             database: ContextualDatabase,
                                             bitmapUri: Uri?,
                                             binaryData: BinaryData?) {
        try {
@@ -139,7 +139,7 @@ object BinaryDatabaseManager {
        return Bitmap.createScaledBitmap(this, width, height, true)
    }

-    fun loadBitmap(database: Database,
+    fun loadBitmap(database: ContextualDatabase,
                   binaryData: BinaryData,
                   maxWidth: Int,
                   actionOnFinish: (Bitmap?) -> Unit) {
--- a/app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt
@@ -30,7 +30,7 @@ import android.content.IntentFilter
 import android.os.Build
 import android.util.Log
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.services.ClipboardEntryNotificationService
 import com.kunzisoft.keepass.services.KeyboardEntryNotificationService
@@ -150,7 +150,7 @@ fun Context.unregisterLockReceiver(lockReceiver: LockReceiver?) {
    }
 }

-fun Context.closeDatabase(database: Database?) {
+fun Context.closeDatabase(database: ContextualDatabase?) {
    // Stop the Magikeyboard service
    stopService(Intent(this, KeyboardEntryNotificationService::class.java))
    MagikeyboardService.removeEntry(this)
--- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryEditViewModel.kt
@@ -3,15 +3,24 @@ package com.kunzisoft.keepass.viewmodels
 import android.net.Uri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.kunzisoft.keepass.utils.IOActionTask
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.Field
+import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.template.Template
-import com.kunzisoft.keepass.model.*
+import com.kunzisoft.keepass.model.AttachmentState
+import com.kunzisoft.keepass.model.EntryAttachmentState
+import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.model.RegisterInfo
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.model.StreamDirection
 import com.kunzisoft.keepass.otp.OtpElement
-import java.util.*
+import com.kunzisoft.keepass.utils.IOActionTask
+import java.util.UUID


 class EntryEditViewModel: NodeEditViewModel() {
@@ -64,11 +73,11 @@ class EntryEditViewModel: NodeEditViewModel() {
    val onBinaryPreviewLoaded : LiveData<AttachmentPosition> get() = _onBinaryPreviewLoaded
    private val _onBinaryPreviewLoaded = SingleLiveEvent<AttachmentPosition>()

-    fun loadDatabase(database: Database?) {
+    fun loadDatabase(database: ContextualDatabase?) {
        loadTemplateEntry(database, mEntryId, mParentId, mRegisterInfo, mSearchInfo)
    }

-    fun loadTemplateEntry(database: Database?,
+    fun loadTemplateEntry(database: ContextualDatabase?,
                          entryId: NodeId<UUID>?,
                          parentId: NodeId<*>?,
                          registerInfo: RegisterInfo?,
@@ -150,7 +159,7 @@ class EntryEditViewModel: NodeEditViewModel() {
        }
    }

-    private fun decodeTemplateEntry(database: Database,
+    private fun decodeTemplateEntry(database: ContextualDatabase,
                                    entry: Entry?,
                                    isTemplate: Boolean,
                                    registerInfo: RegisterInfo?,
@@ -184,11 +193,11 @@ class EntryEditViewModel: NodeEditViewModel() {
        }
    }

-    fun requestEntryInfoUpdate(database: Database?) {
+    fun requestEntryInfoUpdate(database: ContextualDatabase?) {
        _requestEntryInfoUpdate.value = EntryUpdate(database, mEntry, mParent)
    }

-    fun saveEntryInfo(database: Database?, entry: Entry?, parent: Group?, entryInfo: EntryInfo) {
+    fun saveEntryInfo(database: ContextualDatabase?, entry: Entry?, parent: Group?, entryInfo: EntryInfo) {
        IOActionTask(
            {
                removeTempAttachmentsNotCompleted(entryInfo)
@@ -316,7 +325,7 @@ class EntryEditViewModel: NodeEditViewModel() {
                              val templates: List<Template>,
                              val defaultTemplate: Template,
                              val entryInfo: EntryInfo?)
-    data class EntryUpdate(val database: Database?, val entry: Entry?, val parent: Group?)
+    data class EntryUpdate(val database: ContextualDatabase?, val entry: Entry?, val parent: Group?)
    data class EntrySave(val oldEntry: Entry, val newEntry: Entry, val parent: Group?)
    data class FieldEdition(val oldField: Field?, val newField: Field?)
    data class AttachmentBuild(val attachmentToUploadUri: Uri, val fileName: String)
--- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/EntryViewModel.kt
@@ -22,16 +22,16 @@ package com.kunzisoft.keepass.viewmodels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.kunzisoft.keepass.utils.IOActionTask
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.template.Template
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.otp.OtpElement
-import java.util.*
+import com.kunzisoft.keepass.utils.IOActionTask
+import java.util.UUID


 class EntryViewModel: ViewModel() {
@@ -59,11 +59,11 @@ class EntryViewModel: ViewModel() {
    val historySelected : LiveData<EntryHistory> get() = _historySelected
    private val _historySelected = SingleLiveEvent<EntryHistory>()

-    fun loadDatabase(database: Database?) {
+    fun loadDatabase(database: ContextualDatabase?) {
        loadEntry(database, mMainEntryId, mHistoryPosition)
    }

-    fun loadEntry(database: Database?, mainEntryId: NodeId<UUID>?, historyPosition: Int = -1) {
+    fun loadEntry(database: ContextualDatabase?, mainEntryId: NodeId<UUID>?, historyPosition: Int = -1) {
        this.mMainEntryId = mainEntryId
        this.mHistoryPosition = historyPosition

--- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/GroupViewModel.kt
@@ -22,8 +22,8 @@ package com.kunzisoft.keepass.viewmodels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.utils.IOActionTask
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.helper.SearchHelper
@@ -41,7 +41,7 @@ class GroupViewModel: ViewModel() {
    val firstPositionVisible : LiveData<Int> get() = _firstPositionVisible
    private val _firstPositionVisible = MutableLiveData<Int>()

-    fun loadMainGroup(database: Database?,
+    fun loadMainGroup(database: ContextualDatabase?,
                      groupId: NodeId<*>?,
                      showFromPosition: Int?) {
        IOActionTask(
@@ -63,7 +63,7 @@ class GroupViewModel: ViewModel() {
        ).execute()
    }

-    fun loadSearchGroup(database: Database?,
+    fun loadSearchGroup(database: ContextualDatabase?,
                        searchParameters: SearchParameters,
                        fromGroup: NodeId<*>?,
                        showFromPosition: Int?) {