Add Go lib

2025-12-04 15:49:33 +01:00 · 2021-03-26 20:05:28 +01:00
567 changed files with 12884 additions and 34971 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,7 +24,6 @@ A clear and concise description of what you expected to happen.
 - Created with: [e.g Windows KeePass 2.42]
 - Version: [e.g. 2]
 - Location: [e.g. Remote file retrieved with GDrive app]
- - File provider (`content://` URI): [e.g. `content://com.google.android.apps.docs.storage/5`]
 - Size: [e.g. 150Mo]
 - Contains attachment: [e.g. Yes]

--- a/127
+++ b/127
@@ -1,131 +1,6 @@
-KeePassDX(3.3.1)
- * Fix Japanese keyboard in search #1248
- * Better OOM management #256
- * Fix filters #1249
- * Fix temp advanced unlocking #1245
- * Best autofill recognition #1250
- * Workaround to fill OTP token in multiple fields with Magikeyboard (long press) #1158
-
-KeePassDX(3.3.0)
- * Quick search and dynamic filters #163 #462 #521
- * Keep search context #1141
- * Add searchable groups #905 #1006
- * Search with regular expression #175
- * Merge from file and save as copy #1221 #1204 #840
- * Fix custom data #1236
- * Fix education hints #1192
- * Fix save and app instance in selection mode
- * New UI and fix styles
- * Add "Simple" and "Reply" themes
-
-KeePassDX(3.2.0)
- * Manage data merge #840 #977
- * Manage Tags #633
- * Inherit colors and icon from template #1213 #1130
- * Entry colors setting #1207
- * Setting to keep the screen on when watching the entry #1119
- * Add path in quick search
- * Small fixes
-
-KeePassDX(3.1.0)
- * Add breadcrumb
- * Add path in search results #1148
- * Add group info dialog #1177
- * Manage colors #64 #913
- * Fix UI in Android 8 #509
- * Upgrade libs and SDK to 31 #833
- * Fix parser of database v1 #1201
- * Stop asking WRITE_EXTERNAL_STORAGE permission
-
-KeePassDX(3.0.4)
- * Fix autofill inline bugs #1173 #1165
- * Small UI change
-
-KeePassDX(3.0.3)
- * Change default Argon2 parameters #1098
- * Add & edit custom icon name #976
- * Fix templates #1128 #1133 #1138
- * Update Autofill compatibility list #725 #1154
- * Improve fingerprint usage #1137 #1145
- * Change backup configuration #1144
- * Add lock button in database notification
-
-KeePassDX(3.0.2)
- * Samsung DeX mode #1114 #245 (Thx @chenxiaolong)
-
-KeePassDX(3.0.1)
- * Fix text size and smallest margin #1085
- * Fix number of lines during an edition #1073
- * Fix Magikeyboard URL auto action #1100
- * Fix exception after group name change and save #1112
- * Fix timeout reset #1107
- * Fix search actions #1091 #1092
- * Small changes #1106 #1085
-
-KeePassDX(3.0.0)
- * Add / Manage dynamic templates #191
- * Manually select RecycleBin group and Templates group #191
- * Setting to display OTP Token in list #655
- * Fix timeout in dialogs #716
- * Check URI permissions #626
- * Better autofill implementation #943 #946 #984 #1070 (Thx @uduerholz)
- * Improvements #680 #1035 #1043 #942 #1021 #1027 #1046 #1082 #1083 (Thx @chenxiaolong)
-
-KeePassDX(2.10.5)
- * Increase the saving speed of database #1028
- * Fix advanced unlocking by device credential #1029
-
-KeePassDX(2.10.4)
- * Hot fix to increase the opening speed of database #1028
-
-KeePassDX(2.10.3)
- * Improve Magikeyboard options description #1022 #1023 (Thx @djibux)
- * Fix database opened without notification (database is now closed when screen is killed in background #1025)
- * Fix biometric prompt #1018
-
-KeePassDX(2.10.2)
- * Fix search fields references #987
- * Fix Auto-Types with same key #997
-
-KeePassDX(2.10.1)
- * Fix parcelable with custom data #986
-
-KeePassDX(2.10.0)
- * Manage new database format 4.1 #956
- * Fix show button consistency #980
- * Fix persistent notification #979
-
-KeePassDX(2.9.20)
- * Fix search with non-latin chars #971
- * Fix action mode with search #972 (rollback ignore accents #945)
- * Fix timeout with 0s #974
-
-KeePassDX(2.9.19)
- * Fix search slowdown #964
- * Fix closing notification after lock request #965
- * Better temp advanced unlocking code implementation #965
- * Fix OTP token generation #967
-
-KeePassDX(2.9.18)
- * Move groups #658
- * Improve autofill recognition #960
- * Remove diacritical marks in search string #945
- * Fix search in references #962
- * Fix themes in Libre version
-
-KeePassDX(2.9.17)
- * Import / Export app properties #839
- * Force twofish padding compatibility #955
- * Better timeout preference #579
-
-KeePassDX(2.9.16)
- * Fix small bugs #948
-
 KeePassDX(2.9.15)
- * Fix themes #935 #926
+ * Fix themes #935
 * Decrease default clipboard time #934
- * Better opening performance #929 #933
- * Fix memory usage setting #941

 KeePassDX(2.9.14)
 * Add custom icons #96
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@
 - Material design with **themes**.
 - **Auto-Fill** and Integration.
 - Field filling **keyboard**.
- - Dynamic **templates** 
 - **History** of each entry.
 - Precise management of **settings**.
 - Code written in **native languages** *(Kotlin / Java / JNI / C)*.
@@ -43,7 +42,7 @@ Optional visual styles are accessible after a contribution (and a congratulatory

 * Add features by making a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
 * Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** KeePassDX to your language (on [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or by sending a [pull request](https://help.github.com/articles/about-pull-requests/)).
-* **[Donate](https://www.keepassdx.com/#donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
+* **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
 * Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePassDX.

 ## Download
@@ -72,7 +71,7 @@ Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/w

 ## License

-  Copyright © 2022 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
+  Copyright © 2020 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).

  This file is part of KeePassDX.

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,19 +1,18 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'

 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
    ndkVersion "21.4.7075529"

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
        minSdkVersion 15
-        targetSdkVersion 31
-        versionCode = 103
-        versionName = "3.3.1"
+        targetSdkVersion 30
+        versionCode = 66
+        versionName = "2.9.15"
        multiDexEnabled true

        testApplicationId = "com.kunzisoft.keepass.tests"
@@ -69,14 +68,10 @@ android {
            buildConfigField "boolean", "FULL_VERSION", "false"
            buildConfigField "boolean", "CLOSED_STORE", "true"
            buildConfigField "String[]", "STYLES_DISABLED",
-                            "{\"KeepassDXStyle_Simple\"," +
-                            "\"KeepassDXStyle_Simple_Night\"," +
-                            "\"KeepassDXStyle_Blue\"," +
+                            "{\"KeepassDXStyle_Blue\"," +
                            "\"KeepassDXStyle_Blue_Night\"," +
                            "\"KeepassDXStyle_Red\"," +
                            "\"KeepassDXStyle_Red_Night\"," +
-                            "\"KeepassDXStyle_Reply\"," +
-                            "\"KeepassDXStyle_Reply_Night\"," +
                            "\"KeepassDXStyle_Purple\"," +
                            "\"KeepassDXStyle_Purple_Dark\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
@@ -104,47 +99,44 @@ android {
    }
 }

-def room_version = "2.4.2"
+def room_version = "2.2.6"

 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "com.android.support:multidex:1.0.3"
-    implementation "androidx.appcompat:appcompat:$android_appcompat_version"
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.1.0'
-    implementation 'androidx.media:media:1.5.0'
+    implementation 'androidx.biometric:biometric:1.1.0-rc01'
    // Lifecycle - LiveData - ViewModel - Coroutines
-    implementation "androidx.core:core-ktx:$android_core_version"
-    implementation 'androidx.fragment:fragment-ktx:1.4.1'
-    implementation "com.google.android.material:material:$android_material_version"
-    // Token auto complete
-    // From sources until https://github.com/splitwise/TokenAutoComplete/pull/422 fixed
-    // implementation "com.splitwise:tokenautocomplete:4.0.0-beta04"
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    // WARNING: Don't upgrade because slowdown https://github.com/Kunzisoft/KeePassDX/issues/923
+    implementation 'com.google.android.material:material:1.1.0'
    // Database
    implementation "androidx.room:room-runtime:$room_version"
    kapt "androidx.room:room-compiler:$room_version"
    // Autofill
    implementation "androidx.autofill:autofill:1.1.0"
    // Time
-    implementation 'joda-time:joda-time:2.10.13'
+    implementation 'joda-time:joda-time:2.10.6'
    // Color
-    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.6'
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.4'
    // Education
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
    // Apache Commons
    implementation 'commons-io:commons-io:2.8.0'
    implementation 'commons-codec:commons-codec:1.15'
    // Encrypt lib
    implementation project(path: ':crypto')
+    implementation fileTree(include: ['encrypt.aar'], dir: 'libs')
    // Icon pack
    implementation project(path: ':icon-pack-classic')
    implementation project(path: ':icon-pack-material')

    // Tests
-    androidTestImplementation "androidx.test:runner:$android_test_version"
-    androidTestImplementation "androidx.test:rules:$android_test_version"
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
 }
--- a/app/libs/encrypt.aar
+++ b/app/libs/encrypt.aar
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
@@ -1,24 +0,0 @@
-package com.kunzisoft.keepass.tests.template
-
-import com.kunzisoft.keepass.database.element.template.TemplateAttributeOption
-import junit.framework.TestCase
-import org.junit.Assert
-
-class TemplateAttributeOptionTest: TestCase() {
-
-    fun testSerializeOptions() {
-        val options = TemplateAttributeOption().apply {
-            put("TestA", "TestB")
-            put("{D", "}C")
-            put("E,gyu", "15,jk")
-            put("ù*:**", "78:96?545")
-        }
-
-        val strings = TemplateAttributeOption.getStringFromOptions(options)
-        val optionsAfterSerialization = TemplateAttributeOption.getOptionsFromString(strings)
-        val otherString = TemplateAttributeOption.getStringFromOptions(optionsAfterSerialization)
-
-        Assert.assertEquals("Output not equal to input", strings, otherString)
-    }
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/UUIDTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/UUIDTest.kt
@@ -1,15 +0,0 @@
-package com.kunzisoft.keepass.tests.utils
-
-import com.kunzisoft.keepass.utils.UuidUtil
-import junit.framework.TestCase
-import java.util.*
-
-class UUIDTest: TestCase() {
-
-    fun testUUID() {
-        val randomUUID = UUID.randomUUID()
-        val hexStringUUID = UuidUtil.toHexString(randomUUID)
-        val retrievedUUID = UuidUtil.fromHexString(hexStringUUID)
-        assertEquals(randomUUID, retrievedUUID)
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,12 +10,15 @@
      android:anyDensity="true" />
    <uses-permission
        android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.SCHEDULE_EXACT_ALARM" />
    <uses-permission
        android:name="android.permission.USE_BIOMETRIC" />
    <uses-permission
        android:name="android.permission.VIBRATE"/>
+    <!-- Write permission until Android 10 -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
    <!-- Open apps from links -->
    <uses-permission
        android:name="android.permission.QUERY_ALL_PACKAGES"
@@ -27,31 +30,29 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:name="com.kunzisoft.keepass.app.App"
        android:allowBackup="true"
-        android:fullBackupContent="@xml/old_backup_rules"
-        android:dataExtractionRules="@xml/backup_rules"
+        android:fullBackupContent="@xml/backup_rules"
        android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
        android:largeHeap="true"
        android:resizeableActivity="true"
        android:theme="@style/KeepassDXStyle.Night"
-        tools:targetApi="s">
+        tools:targetApi="n">
        <meta-data
            android:name="com.google.android.backup.api_key"
            android:value="${googleAndroidBackupAPIKey}" />
        <activity
            android:name="com.kunzisoft.keepass.activities.FileDatabaseSelectActivity"
            android:theme="@style/KeepassDXStyle.SplashScreen"
+            android:label="@string/app_name"
            android:launchMode="singleTop"
-            android:exported="true"
            android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" >
+            android:windowSoftInputMode="stateHidden" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity
-            android:name="com.kunzisoft.keepass.activities.MainCredentialActivity"
-            android:exported="true"
+            android:name="com.kunzisoft.keepass.activities.PasswordActivity"
            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="adjustResize|stateUnchanged">
            <intent-filter>
@@ -110,9 +111,9 @@
        <!-- Main Activity -->
        <activity
            android:name="com.kunzisoft.keepass.activities.GroupActivity"
-            android:exported="false"
            android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:launchMode="singleTask">
            <meta-data
                android:name="android.app.default_searchable"
                android:value="com.kunzisoft.keepass.search.SearchResults"
@@ -154,8 +155,7 @@
            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
-            android:theme="@style/Theme.Transparent"
-            android:exported="true">
+            android:theme="@style/Theme.Transparent">
            <intent-filter>
                <action android:name="android.intent.action.SEND" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -174,8 +174,7 @@
            android:theme="@style/Theme.Transparent" />
        <activity
            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
-            android:label="@string/keyboard_setting_label"
-            android:exported="true">
+            android:label="@string/keyboard_setting_label">
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
            </intent-filter>
@@ -201,7 +200,6 @@
        <service
            android:name="com.kunzisoft.keepass.autofill.KeeAutofillService"
            android:label="@string/autofill_service_name"
-            android:exported="true"
            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
            <meta-data
                android:name="android.autofill"
@@ -211,9 +209,8 @@
            </intent-filter>
        </service>
        <service
-            android:name="com.kunzisoft.keepass.magikeyboard.MagikeyboardService"
+            android:name="com.kunzisoft.keepass.magikeyboard.MagikIME"
            android:label="@string/keyboard_label"
-            android:exported="true"
            android:permission="android.permission.BIND_INPUT_METHOD" >
            <meta-data android:name="android.view.im"
                android:resource="@xml/keyboard_method"/>
@@ -225,14 +222,6 @@
            android:name="com.kunzisoft.keepass.services.KeyboardEntryNotificationService"
            android:enabled="true"
            android:exported="false" />
-        <receiver
-            android:name="com.kunzisoft.keepass.receivers.DexModeReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.app.action.ENTER_KNOX_DESKTOP_MODE" />
-                <action android:name="android.app.action.EXIT_KNOX_DESKTOP_MODE" />
-            </intent-filter>
-        </receiver>

        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
    </application>
--- a/app/src/main/java/com/igreenwood/loupe/Loupe.kt
+++ b/app/src/main/java/com/igreenwood/loupe/Loupe.kt
@@ -30,7 +30,6 @@ package com.igreenwood.loupe
 import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
-import android.annotation.SuppressLint
 import android.graphics.Matrix
 import android.graphics.PointF
 import android.graphics.Rect
@@ -109,8 +108,6 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
    var viewDragFriction = DEFAULT_VIEW_DRAG_FRICTION
    // drag distance threshold in dp for swipe to dismiss
    var dragDismissDistanceInDp = DEFAULT_DRAG_DISMISS_DISTANCE_IN_DP
-    // on view touched
-    var onViewTouchedListener: View.OnTouchListener? = null
    // on view translate listener
    var onViewTranslateListener: OnViewTranslateListener? = null
    // on scale changed
@@ -275,10 +272,7 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
    private var imageViewRef: WeakReference<ImageView> = WeakReference(imageView)
    private var containerRef: WeakReference<ViewGroup> = WeakReference(container)

-    @SuppressLint("ClickableViewAccessibility")
    override fun onTouch(view: View?, event: MotionEvent?): Boolean {
-        onViewTouchedListener?.onTouch(view, event)
-
        event ?: return false
        val imageView = imageViewRef.get() ?: return false
        val container = containerRef.get() ?: return false
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
@@ -23,79 +23,45 @@ import android.app.Activity
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.IntentSender
 import android.os.Build
 import android.os.Bundle
+import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
-import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.autofill.CompatInlineSuggestionsRequest
+import com.kunzisoft.keepass.autofill.AutofillHelper.EXTRA_INLINE_SUGGESTIONS_REQUEST
 import com.kunzisoft.keepass.autofill.KeeAutofillService
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.LOCK_ACTION

@RequiresApi(api = Build.VERSION_CODES.O)
-class AutofillLauncherActivity : DatabaseModeActivity() {
+class AutofillLauncherActivity : AppCompatActivity() {

-    private var mAutofillActivityResultLauncher: ActivityResultLauncher<Intent>? =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            AutofillHelper.buildActivityResultLauncher(this, true)
-        else null
-
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
+    override fun onCreate(savedInstanceState: Bundle?) {

        // Retrieve selection mode
        EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode ->
            when (specialMode) {
                SpecialMode.SELECTION -> {
-                    intent.getBundleExtra(KEY_SELECTION_BUNDLE)?.let { bundle ->
-                        // To pass extra inline request
-                        var compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            compatInlineSuggestionsRequest = bundle.getParcelable(KEY_INLINE_SUGGESTION)
-                        }
-                        // Build search param
-                        bundle.getParcelable<SearchInfo>(KEY_SEARCH_INFO)?.let { searchInfo ->
-                            SearchInfo.getConcreteWebDomain(
-                                this,
-                                searchInfo.webDomain
-                            ) { concreteWebDomain ->
-                                // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
-                                val assistStructure = AutofillHelper
-                                    .retrieveAutofillComponent(intent)
-                                    ?.assistStructure
-                                val newAutofillComponent = if (assistStructure != null) {
-                                    AutofillComponent(
-                                        assistStructure,
-                                        compatInlineSuggestionsRequest
-                                    )
-                                } else {
-                                    null
-                                }
-                                searchInfo.webDomain = concreteWebDomain
-                                launchSelection(database, newAutofillComponent, searchInfo)
-                            }
-                        }
+                    // Build search param
+                    val searchInfo = SearchInfo().apply {
+                        applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
+                        webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+                        webScheme = intent.getStringExtra(KEY_SEARCH_SCHEME)
+                    }
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                        searchInfo.webDomain = concreteWebDomain
+                        launchSelection(searchInfo)
                    }
-                    // Remove bundle
-                    intent.removeExtra(KEY_SELECTION_BUNDLE)
                }
                SpecialMode.REGISTRATION -> {
                    // To register info
@@ -103,7 +69,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                    val searchInfo = SearchInfo(registerInfo?.searchInfo)
                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
                        searchInfo.webDomain = concreteWebDomain
-                        launchRegistration(database, searchInfo, registerInfo)
+                        launchRegistration(searchInfo, registerInfo)
                    }
                }
                else -> {
@@ -113,11 +79,14 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                }
            }
        }
+
+        super.onCreate(savedInstanceState)
    }

-    private fun launchSelection(database: Database?,
-                                autofillComponent: AutofillComponent?,
-                                searchInfo: SearchInfo) {
+    private fun launchSelection(searchInfo: SearchInfo) {
+        // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
+        val autofillComponent = AutofillHelper.retrieveAutofillComponent(intent)
+
        if (autofillComponent == null) {
            setResult(Activity.RESULT_CANCELED)
            finish()
@@ -129,28 +98,28 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
            setResult(Activity.RESULT_CANCELED)
            finish()
        } else {
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
            // If database is open
            SearchHelper.checkAutoSearchInfo(this,
-                    database,
+                    Database.getInstance(),
                    searchInfo,
-                    { openedDatabase, items ->
+                    { items ->
                        // Items found
-                        AutofillHelper.buildResponseAndSetResult(this, openedDatabase, items)
+                        AutofillHelper.buildResponseAndSetResult(this, items)
                        finish()
                    },
-                    { openedDatabase ->
+                    {
                        // Show the database UI to select the entry
                        GroupActivity.launchForAutofillResult(this,
-                            openedDatabase,
-                            mAutofillActivityResultLauncher,
-                            autofillComponent,
-                            searchInfo,
-                            false)
+                                readOnly,
+                                autofillComponent,
+                                searchInfo,
+                                false)
                    },
                    {
                        // If database not open
                        FileDatabaseSelectActivity.launchForAutofillResult(this,
-                                mAutofillActivityResultLauncher,
                                autofillComponent,
                                searchInfo)
                    }
@@ -158,9 +127,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
        }
    }

-    private fun launchRegistration(database: Database?,
-                                   searchInfo: SearchInfo,
-                                   registerInfo: RegisterInfo?) {
+    private fun launchRegistration(searchInfo: SearchInfo, registerInfo: RegisterInfo?) {
        if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
                        PreferencesUtil.applicationIdBlocklist(this))
                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
@@ -168,26 +135,25 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
            showBlockRestartMessage()
            setResult(Activity.RESULT_CANCELED)
        } else {
-            val readOnly = database?.isReadOnly != false
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
            SearchHelper.checkAutoSearchInfo(this,
                    database,
                    searchInfo,
-                    { openedDatabase, _ ->
+                    { _ ->
                        if (!readOnly) {
                            // Show the database UI to select the entry
                            GroupActivity.launchForRegistration(this,
-                                openedDatabase,
-                                registerInfo)
+                                    registerInfo)
                        } else {
                            showReadOnlySaveMessage()
                        }
                    },
-                    { openedDatabase ->
+                    {
                        if (!readOnly) {
                            // Show the database UI to select the entry
                            GroupActivity.launchForRegistration(this,
-                                openedDatabase,
-                                registerInfo)
+                                    registerInfo)
                        } else {
                            showReadOnlySaveMessage()
                        }
@@ -211,47 +177,53 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
        Toast.makeText(this.applicationContext, R.string.autofill_read_only_save, Toast.LENGTH_LONG).show()
    }

+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+
+        if (PreferencesUtil.isAutofillCloseDatabaseEnable(this)) {
+            // Close the database
+            sendBroadcast(Intent(LOCK_ACTION))
+        }
+
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
    companion object {

-        private const val KEY_SELECTION_BUNDLE = "KEY_SELECTION_BUNDLE"
-        private const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
-        private const val KEY_INLINE_SUGGESTION = "KEY_INLINE_SUGGESTION"
+        private const val KEY_SEARCH_APPLICATION_ID = "KEY_SEARCH_APPLICATION_ID"
+        private const val KEY_SEARCH_DOMAIN = "KEY_SEARCH_DOMAIN"
+        private const val KEY_SEARCH_SCHEME = "KEY_SEARCH_SCHEME"

        private const val KEY_REGISTER_INFO = "KEY_REGISTER_INFO"

-        fun getPendingIntentForSelection(context: Context,
-                                         searchInfo: SearchInfo? = null,
-                                         compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null): PendingIntent {
+        fun getAuthIntentSenderForSelection(context: Context,
+                                            searchInfo: SearchInfo? = null,
+                                            inlineSuggestionsRequest: InlineSuggestionsRequest? = null): IntentSender {
            return PendingIntent.getActivity(context, 0,
-                // Doesn't work with direct extra Parcelable (don't know why?)
-                // Wrap into a bundle to bypass the problem
-                Intent(context, AutofillLauncherActivity::class.java).apply {
-                    putExtra(KEY_SELECTION_BUNDLE, Bundle().apply {
-                        putParcelable(KEY_SEARCH_INFO, searchInfo)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            putParcelable(KEY_INLINE_SUGGESTION, compatInlineSuggestionsRequest)
+                    // Doesn't work with Parcelable (don't know why?)
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
+                        searchInfo?.let {
+                            putExtra(KEY_SEARCH_APPLICATION_ID, it.applicationId)
+                            putExtra(KEY_SEARCH_DOMAIN, it.webDomain)
+                            putExtra(KEY_SEARCH_SCHEME, it.webScheme)
                        }
-                    })
-                },
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
-                } else {
-                    PendingIntent.FLAG_CANCEL_CURRENT
-                })
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                            inlineSuggestionsRequest?.let {
+                                putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+                            }
+                        }
+                    },
+                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
        }

-        fun getPendingIntentForRegistration(context: Context,
-                                            registerInfo: RegisterInfo): PendingIntent {
+        fun getAuthIntentSenderForRegistration(context: Context,
+                                               registerInfo: RegisterInfo): IntentSender {
            return PendingIntent.getActivity(context, 0,
-                Intent(context, AutofillLauncherActivity::class.java).apply {
-                    EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
-                    putExtra(KEY_REGISTER_INFO, registerInfo)
-                },
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
-                } else {
-                    PendingIntent.FLAG_CANCEL_CURRENT
-                })
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
+                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
+                        putExtra(KEY_REGISTER_INFO, registerInfo)
+                    },
+                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
        }

        fun launchForRegistration(context: Context,
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -32,89 +32,68 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.viewModels
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
-import androidx.core.graphics.ColorUtils
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
-import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.fragments.EntryFragment
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
-import com.kunzisoft.keepass.adapters.TagsAdapter
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
 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.Entry
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
-import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
+import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryAttachmentState
-import com.kunzisoft.keepass.otp.OtpType
+import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.services.AttachmentFileNotificationService
 import com.kunzisoft.keepass.services.ClipboardEntryNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
+import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.utils.UuidUtil
-import com.kunzisoft.keepass.view.changeControlColor
-import com.kunzisoft.keepass.view.changeTitleColor
-import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.utils.*
+import com.kunzisoft.keepass.view.EntryContentsView
 import com.kunzisoft.keepass.view.showActionErrorIfNeeded
-import com.kunzisoft.keepass.viewmodels.EntryViewModel
 import java.util.*
+import kotlin.collections.HashMap

-class EntryActivity : DatabaseLockActivity() {
+class EntryActivity : LockingActivity() {

    private var coordinatorLayout: CoordinatorLayout? = null
    private var collapsingToolbarLayout: CollapsingToolbarLayout? = null
-    private var appBarLayout: AppBarLayout? = null
    private var titleIconView: ImageView? = null
    private var historyView: View? = null
-    private var tagsListView: RecyclerView? = null
-    private var tagsAdapter: TagsAdapter? = null
-    private var entryProgress: LinearProgressIndicator? = null
+    private var entryContentsView: EntryContentsView? = null
+    private var entryProgress: ProgressBar? = null
    private var lockView: View? = null
    private var toolbar: Toolbar? = null
-    private var loadingView: ProgressBar? = null

-    private val mEntryViewModel: EntryViewModel by viewModels()
+    private var mDatabase: Database? = null

-    private val mEntryActivityEducation = EntryActivityEducation(this)
+    private var mEntry: Entry? = null

-    private var mMainEntryId: NodeId<UUID>? = null
-    private var mHistoryPosition: Int = -1
-    private var mEntryIsHistory: Boolean = false
-    private var mUrl: String? = null
-    private var mEntryLoaded = false
+    private var mIsHistory: Boolean = false
+    private var mEntryLastVersion: Entry? = null
+    private var mEntryHistoryPosition: Int = -1
+
+    private var mShowPassword: Boolean = false

    private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
-    private var mExternalFileHelper: ExternalFileHelper? = null
-    private var mAttachmentSelected: Attachment? = null
+    private var mAttachmentsToDownload: HashMap<Int, Attachment> = HashMap()

-    private var mEntryActivityResultLauncher = EntryEditActivity.registerForEntryResult(this) {
-        // Reload the current id from database
-        mEntryViewModel.loadDatabase(mDatabase)
-    }
+    private var clipboardHelper: ClipboardHelper? = null
+    private var mFirstLaunchOfActivity: Boolean = false

-    private var mIcon: IconImage? = null
-    private var mColorAccent: Int = 0
-    private var mControlColor: Int = 0
-    private var mColorPrimary: Int = 0
-    private var mColorBackground: Int = 0
-    private var mBackgroundColor: Int? = null
-    private var mForegroundColor: Int? = null
+    private var iconColor: Int = 0

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -126,191 +105,60 @@ class EntryActivity : DatabaseLockActivity() {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

+        mDatabase = Database.getInstance()
+        mReadOnly = mDatabase!!.isReadOnly || mReadOnly
+
+        mShowPassword = !PreferencesUtil.isPasswordMask(this)
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+        iconColor = taIconColor.getColor(0, Color.BLACK)
+        taIconColor.recycle()
+
+        // Refresh Menu contents in case onCreateMenuOptions was called before mEntry was set
+        invalidateOptionsMenu()
+
        // Get views
        coordinatorLayout = findViewById(R.id.toolbar_coordinator)
        collapsingToolbarLayout = findViewById(R.id.toolbar_layout)
-        appBarLayout = findViewById(R.id.app_bar)
        titleIconView = findViewById(R.id.entry_icon)
        historyView = findViewById(R.id.history_container)
-        tagsListView = findViewById(R.id.entry_tags_list_view)
+        entryContentsView = findViewById(R.id.entry_contents)
+        entryContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
+        entryContentsView?.setAttachmentCipherKey(mDatabase)
        entryProgress = findViewById(R.id.entry_progress)
        lockView = findViewById(R.id.lock_button)
-        loadingView = findViewById(R.id.loading)
-
-        // Empty title
-        collapsingToolbarLayout?.title = " "
-        toolbar?.title = " "
-
-        // Retrieve the textColor to tint the toolbar
-        val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
-        val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl))
-        val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary))
-        val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
-        mColorAccent = taColorAccent.getColor(0, Color.BLACK)
-        mControlColor = taControlColor.getColor(0, Color.BLACK)
-        mColorPrimary = taColorPrimary.getColor(0, Color.BLACK)
-        mColorBackground = taColorBackground.getColor(0, Color.BLACK)
-        taColorAccent.recycle()
-        taControlColor.recycle()
-        taColorPrimary.recycle()
-        taColorBackground.recycle()
-
-        // Init Tags adapter
-        tagsAdapter = TagsAdapter(this)
-        tagsListView?.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-            adapter = tagsAdapter
-        }
-
-        // Get Entry from UUID
-        try {
-            intent.getParcelableExtra<NodeId<UUID>?>(KEY_ENTRY)?.let { mainEntryId ->
-                intent.removeExtra(KEY_ENTRY)
-                val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, -1)
-                intent.removeExtra(KEY_ENTRY_HISTORY_POSITION)
-
-                mEntryViewModel.loadEntry(mDatabase, mainEntryId, historyPosition)
-            }
-        } catch (e: ClassCastException) {
-            Log.e(TAG, "Unable to retrieve the entry key")
-        }
-
-        // Init SAF manager
-        mExternalFileHelper = ExternalFileHelper(this)
-        mExternalFileHelper?.buildCreateDocument { createdFileUri ->
-            mAttachmentSelected?.let { attachment ->
-                if (createdFileUri != null) {
-                    mAttachmentFileBinderManager
-                        ?.startDownloadAttachment(createdFileUri, attachment)
-                }
-                mAttachmentSelected = null
-            }
-        }
-        // Init attachment service binder manager
-        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)

        lockView?.setOnClickListener {
            lockAndExit()
        }

-        mEntryViewModel.entryInfoHistory.observe(this) { entryInfoHistory ->
-            if (entryInfoHistory != null) {
-                this.mMainEntryId = entryInfoHistory.mainEntryId
+        // Focus view to reinitialize timeout
+        coordinatorLayout?.resetAppTimeoutWhenViewFocusedOrChanged(this)

-                // Manage history position
-                val historyPosition = entryInfoHistory.historyPosition
-                this.mHistoryPosition = historyPosition
-                val entryIsHistory = historyPosition > -1
-                this.mEntryIsHistory = entryIsHistory
-                // Assign history dedicated view
-                historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE
-                if (entryIsHistory) {
-                    collapsingToolbarLayout?.contentScrim =
-                        ColorDrawable(mColorAccent)
+        // Init the clipboard helper
+        clipboardHelper = ClipboardHelper(this)
+        mFirstLaunchOfActivity = savedInstanceState?.getBoolean(KEY_FIRST_LAUNCH_ACTIVITY) ?: true
+
+        // Init attachment service binder manager
+        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
+
+        mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
+            when (actionTask) {
+                ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
+                ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
+                    // Close the current activity after an history action
+                    if (result.isSuccess)
+                        finish()
                }
-
-                val entryInfo = entryInfoHistory.entryInfo
-                // Manage entry copy to start notification if allowed (at the first start)
-                if (savedInstanceState == null) {
-                    // Manage entry to launch copying notification if allowed
-                    ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
-                    // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
-                    if (PreferencesUtil.isKeyboardEntrySelectionEnable(this)) {
-                        MagikeyboardService.addEntryAndLaunchNotificationIfAllowed(this, entryInfo)
-                    }
-                }
-                // Assign title icon
-                mIcon = entryInfo.icon
-                // Assign title text
-                val entryTitle =
-                    if (entryInfo.title.isNotEmpty()) entryInfo.title else UuidUtil.toHexString(entryInfo.id)
-                collapsingToolbarLayout?.title = entryTitle
-                toolbar?.title = entryTitle
-                mUrl = entryInfo.url
-                // Assign tags
-                val tags = entryInfo.tags
-                tagsListView?.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
-                tagsAdapter?.setTags(tags)
-                // Assign colors
-                val showEntryColors = PreferencesUtil.showEntryColors(this)
-                mBackgroundColor = if (showEntryColors) entryInfo.backgroundColor else null
-                mForegroundColor = if (showEntryColors) entryInfo.foregroundColor else null
-
-                loadingView?.hideByFading()
-                mEntryLoaded = true
-            } else {
-                finish()
-            }
-            // Refresh Menu
-            invalidateOptionsMenu()
-        }
-
-        mEntryViewModel.onOtpElementUpdated.observe(this) { otpElement ->
-            if (otpElement == null) {
-                entryProgress?.visibility = View.GONE
-            } else when (otpElement.type) {
-                // Only add token if HOTP
-                OtpType.HOTP -> {
-                    entryProgress?.visibility = View.GONE
-                }
-                // Refresh view if TOTP
-                OtpType.TOTP -> {
-                    entryProgress?.apply {
-                        max = otpElement.period
-                        setProgressCompat(otpElement.secondsRemaining, true)
-                        visibility = View.VISIBLE
-                    }
-                }
-            }
-        }
-
-        mEntryViewModel.attachmentSelected.observe(this) { attachmentSelected ->
-            mAttachmentSelected = attachmentSelected
-            mExternalFileHelper?.createDocument(attachmentSelected.name)
-        }
-
-        mEntryViewModel.historySelected.observe(this) { historySelected ->
-            mDatabase?.let { database ->
-                launch(
-                    this,
-                    database,
-                    historySelected.nodeId,
-                    historySelected.historyPosition,
-                    mEntryActivityResultLauncher
-                )
-            }
-        }
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun viewToInvalidateTimeout(): View? {
-        return coordinatorLayout
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        mEntryViewModel.loadDatabase(database)
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-        when (actionTask) {
-            ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
-            ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
-                // Close the current activity after an history action
-                if (result.isSuccess)
+                ACTION_DATABASE_RELOAD_TASK -> {
+                    // Close the current activity
+                    this.showActionErrorIfNeeded(result)
                    finish()
+                }
            }
+            coordinatorLayout?.showActionErrorIfNeeded(result)
        }
-        coordinatorLayout?.showActionErrorIfNeeded(result)
    }

    override fun onResume() {
@@ -323,19 +171,63 @@ class EntryActivity : DatabaseLockActivity() {
            View.GONE
        }

-        mAttachmentFileBinderManager?.apply {
-            registerProgressTask()
-            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
-                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
-                    mEntryViewModel.onAttachmentAction(entryAttachmentState)
+        // Get Entry from UUID
+        try {
+            val keyEntry: NodeId<UUID>? = intent.getParcelableExtra(KEY_ENTRY)
+            if (keyEntry != null) {
+                mEntry = mDatabase?.getEntryById(keyEntry)
+                mEntryLastVersion = mEntry
+            }
+        } catch (e: ClassCastException) {
+            Log.e(TAG, "Unable to retrieve the entry key")
+        }
+
+        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, mEntryHistoryPosition)
+        mEntryHistoryPosition = historyPosition
+        if (historyPosition >= 0) {
+            mIsHistory = true
+            mEntry = mEntry?.getHistory()?.get(historyPosition)
+        }
+
+        if (mEntry == null) {
+            Toast.makeText(this, R.string.entry_not_found, Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        // Update last access time.
+        mEntry?.touch(modified = false, touchParents = false)
+
+        mEntry?.let { entry ->
+            // Fill data in resume to update from EntryEditActivity
+            fillEntryDataInContentsView(entry)
+            // Refresh Menu
+            invalidateOptionsMenu()
+
+            val entryInfo = entry.getEntryInfo(mDatabase)
+            // Manage entry copy to start notification if allowed
+            if (mFirstLaunchOfActivity) {
+                // Manage entry to launch copying notification if allowed
+                ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
+                // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
+                if (PreferencesUtil.isKeyboardEntrySelectionEnable(this)) {
+                    MagikIME.addEntryAndLaunchNotificationIfAllowed(this, entryInfo)
                }
            }
        }

-        // Keep the screen on
-        if (PreferencesUtil.isKeepScreenOnEnabled(this)) {
-            window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        mAttachmentFileBinderManager?.apply {
+            registerProgressTask()
+            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
+                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
+                    if (entryAttachmentState.streamDirection != StreamDirection.UPLOAD) {
+                        entryContentsView?.putAttachment(entryAttachmentState)
+                    }
+                }
+            }
        }
+
+        mFirstLaunchOfActivity = false
    }

    override fun onPause() {
@@ -344,93 +236,223 @@ class EntryActivity : DatabaseLockActivity() {
        super.onPause()
    }

-    private fun applyToolbarColors() {
-        appBarLayout?.setBackgroundColor(mBackgroundColor ?: mColorPrimary)
-        collapsingToolbarLayout?.contentScrim = ColorDrawable(mBackgroundColor ?: mColorPrimary)
-        val backgroundDarker = if (mBackgroundColor != null) {
-            ColorUtils.blendARGB(mBackgroundColor!!, Color.WHITE, 0.1f)
-        } else {
-            mColorBackground
+    private fun fillEntryDataInContentsView(entry: Entry) {
+
+        val entryInfo = entry.getEntryInfo(mDatabase)
+
+        // Assign title icon
+        titleIconView?.let { iconView ->
+            mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconView, entryInfo.icon, iconColor)
        }
-        titleIconView?.background?.colorFilter = BlendModeColorFilterCompat
-            .createBlendModeColorFilterCompat(backgroundDarker, BlendModeCompat.SRC_IN)
-        mIcon?.let { icon ->
-            titleIconView?.let { iconView ->
-                mIconDrawableFactory?.assignDatabaseIcon(
-                    iconView,
-                    icon,
-                    mForegroundColor ?: mColorAccent
+
+        // Assign title text
+        val entryTitle = entryInfo.title
+        collapsingToolbarLayout?.title = entryTitle
+        toolbar?.title = entryTitle
+
+        // Assign basic fields
+        entryContentsView?.assignUserName(entryInfo.username) {
+            clipboardHelper?.timeoutCopyToClipboard(entryInfo.username,
+                    getString(R.string.copy_field,
+                            getString(R.string.entry_user_name)))
+        }
+
+        val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
+                PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)
+        val allowCopyPasswordAndProtectedFields =
+                PreferencesUtil.allowCopyPasswordAndProtectedFields(this)
+
+        val showWarningClipboardDialogOnClickListener = View.OnClickListener {
+            AlertDialog.Builder(this@EntryActivity)
+                    .setMessage(getString(R.string.allow_copy_password_warning) +
+                            "\n\n" +
+                            getString(R.string.clipboard_warning))
+                    .create().apply {
+                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
+                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, true)
+                            dialog.dismiss()
+                            fillEntryDataInContentsView(entry)
+                        }
+                        setButton(AlertDialog.BUTTON_NEGATIVE, getText(R.string.disable)) { dialog, _ ->
+                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, false)
+                            dialog.dismiss()
+                            fillEntryDataInContentsView(entry)
+                        }
+                        show()
+                    }
+        }
+
+        val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
+            View.OnClickListener {
+                clipboardHelper?.timeoutCopyToClipboard(entryInfo.password,
+                        getString(R.string.copy_field,
+                                getString(R.string.entry_password)))
+            }
+        } else {
+            // If dialog not already shown
+            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                showWarningClipboardDialogOnClickListener
+            } else {
+                null
+            }
+        }
+        entryContentsView?.assignPassword(entryInfo.password,
+                allowCopyPasswordAndProtectedFields,
+                onPasswordCopyClickListener)
+
+        //Assign OTP field
+        entry.getOtpElement()?.let { otpElement ->
+            entryContentsView?.assignOtp(otpElement, entryProgress) {
+                clipboardHelper?.timeoutCopyToClipboard(
+                        otpElement.token,
+                        getString(R.string.copy_field, getString(R.string.entry_otp))
                )
            }
        }
-        toolbar?.changeControlColor(mForegroundColor ?: mControlColor)
-        collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mControlColor)
+
+        entryContentsView?.assignURL(entryInfo.url)
+        entryContentsView?.assignNotes(entryInfo.notes)
+
+        // Assign custom fields
+        if (mDatabase?.allowEntryCustomFields() == true) {
+            entryContentsView?.clearExtraFields()
+            entryInfo.customFields.forEach { field ->
+                val label = field.name
+                // OTP field is already managed in dedicated view
+                if (label != OtpEntryFields.OTP_TOKEN_FIELD) {
+                    val value = field.protectedValue
+                    val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
+                    if (allowCopyProtectedField) {
+                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
+                            clipboardHelper?.timeoutCopyToClipboard(
+                                    value.toString(),
+                                    getString(R.string.copy_field, label)
+                            )
+                        }
+                    } else {
+                        // If dialog not already shown
+                        if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+                        } else {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
+                        }
+                    }
+                }
+            }
+        }
+        entryContentsView?.setHiddenProtectedValue(!mShowPassword)
+
+        // Manage attachments
+        entryContentsView?.assignAttachments(entryInfo.attachments.toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
+            createDocument(this, attachmentItem.name)?.let { requestCode ->
+                mAttachmentsToDownload[requestCode] = attachmentItem
+            }
+        }
+
+        // Assign dates
+        entryContentsView?.assignCreationDate(entryInfo.creationTime)
+        entryContentsView?.assignModificationDate(entryInfo.lastModificationTime)
+        entryContentsView?.setExpires(entryInfo.expires, entryInfo.expiryTime)
+
+        // Manage history
+        historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
+        if (mIsHistory) {
+            val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+            collapsingToolbarLayout?.contentScrim = ColorDrawable(taColorAccent.getColor(0, Color.BLACK))
+            taColorAccent.recycle()
+        }
+        entryContentsView?.assignHistory(entry.getHistory()) { historyItem, position ->
+            launch(this, historyItem, mReadOnly, position)
+        }
+
+        // Assign special data
+        entryContentsView?.assignUUID(entry.nodeId.id)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        when (requestCode) {
+            EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE ->
+                // Not directly get the entry from intent data but from database
+                mEntry?.let {
+                    fillEntryDataInContentsView(it)
+                }
+        }
+
+        onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
+            if (createdFileUri != null) {
+                mAttachmentsToDownload[requestCode]?.let { attachmentToDownload ->
+                    mAttachmentFileBinderManager
+                            ?.startDownloadAttachment(createdFileUri, attachmentToDownload)
+                }
+            }
+        }
    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)
-        if (mEntryLoaded) {
-            val inflater = menuInflater

-            inflater.inflate(R.menu.entry, menu)
-            inflater.inflate(R.menu.database, menu)
+        val inflater = menuInflater
+        MenuUtil.contributionMenuInflater(inflater, menu)
+        inflater.inflate(R.menu.entry, menu)
+        inflater.inflate(R.menu.database, menu)
+        if (mIsHistory && !mReadOnly) {
+            inflater.inflate(R.menu.entry_history, menu)
+        }
+        if (mIsHistory || mReadOnly) {
+            menu.findItem(R.id.menu_save_database)?.isVisible = false
+            menu.findItem(R.id.menu_edit)?.isVisible = false
+        }
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            menu.findItem(R.id.menu_reload_database)?.isVisible = false
+        }

-            if (mEntryIsHistory && !mDatabaseReadOnly) {
-                inflater.inflate(R.menu.entry_history, menu)
-            }
-
-            // Show education views
-            Handler(Looper.getMainLooper()).post {
-                performedNextEducation(menu)
+        val gotoUrl = menu.findItem(R.id.menu_goto_url)
+        gotoUrl?.apply {
+            // In API >= 11 onCreateOptionsMenu may be called before onCreate completes
+            // so mEntry may not be set
+            if (mEntry == null) {
+                isVisible = false
+            } else {
+                if (mEntry?.url?.isEmpty() != false) {
+                    // disable button if url is not available
+                    isVisible = false
+                }
            }
        }
+
+        // Show education views
+        Handler(Looper.getMainLooper()).post { performedNextEducation(EntryActivityEducation(this), menu) }
+
        return true
    }

-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        if (mUrl?.isEmpty() != false) {
-            menu?.findItem(R.id.menu_goto_url)?.isVisible = false
-        }
-        if (mEntryIsHistory || mDatabaseReadOnly) {
-            menu?.findItem(R.id.menu_save_database)?.isVisible = false
-            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
-            menu?.findItem(R.id.menu_edit)?.isVisible = false
-        }
-        if (!mMergeDataAllowed) {
-            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
-        }
-        if (mSpecialMode != SpecialMode.DEFAULT) {
-            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
-            menu?.findItem(R.id.menu_reload_database)?.isVisible = false
-        }
-        applyToolbarColors()
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    private fun performedNextEducation(menu: Menu) {
-        val entryFragment = supportFragmentManager.findFragmentByTag(ENTRY_FRAGMENT_TAG)
-                as? EntryFragment?
-        val entryFieldCopyView: View? = entryFragment?.firstEntryFieldCopyView()
+    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
+                                       menu: Menu) {
+        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
        val entryCopyEducationPerformed = entryFieldCopyView != null
-                && mEntryActivityEducation.checkAndPerformedEntryCopyEducation(
-                entryFieldCopyView,
-                {
-                    entryFragment.launchEntryCopyEducationAction()
-                },
-                {
-                    performedNextEducation(menu)
-                })
+                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
+                        entryFieldCopyView,
+                        {
+                            val appNameString = getString(R.string.app_name)
+                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
+                                    getString(R.string.copy_field, appNameString))
+                        },
+                        {
+                            performedNextEducation(entryActivityEducation, menu)
+                        })

        if (!entryCopyEducationPerformed) {
            val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
            // entryEditEducationPerformed
-            menuEditView != null && mEntryActivityEducation.checkAndPerformedEntryEditEducation(
+            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
                    menuEditView,
                    {
                        onOptionsItemSelected(menu.findItem(R.id.menu_edit))
                    },
                    {
-                        performedNextEducation(menu)
+                        performedNextEducation(entryActivityEducation, menu)
                    }
            )
        }
@@ -438,58 +460,65 @@ class EntryActivity : DatabaseLockActivity() {

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
+            R.id.menu_contribute -> {
+                MenuUtil.onContributionItemSelected(this)
+                return true
+            }
            R.id.menu_edit -> {
-                mDatabase?.let { database ->
-                    mMainEntryId?.let { entryId ->
-                        EntryEditActivity.launchToUpdate(
-                            this,
-                            database,
-                            entryId,
-                            mEntryActivityResultLauncher
-                        )
-                    }
+                mEntry?.let {
+                    EntryEditActivity.launch(this@EntryActivity, it)
                }
                return true
            }
            R.id.menu_goto_url -> {
-                mUrl?.let { url ->
-                    UriUtil.gotoUrl(this, url)
+                var url: String = mEntry?.url ?: ""
+
+                // Default http:// if no protocol specified
+                if (!url.contains("://")) {
+                    url = "http://$url"
                }
+
+                UriUtil.gotoUrl(this, url)
                return true
            }
            R.id.menu_restore_entry_history -> {
-                mMainEntryId?.let { mainEntryId ->
-                    restoreEntryHistory(
-                        mainEntryId,
-                        mHistoryPosition)
+                mEntryLastVersion?.let { mainEntry ->
+                    mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory(
+                            mainEntry,
+                            mEntryHistoryPosition,
+                            !mReadOnly && mAutoSaveEnable)
                }
            }
            R.id.menu_delete_entry_history -> {
-                mMainEntryId?.let { mainEntryId ->
-                    deleteEntryHistory(
-                        mainEntryId,
-                        mHistoryPosition)
+                mEntryLastVersion?.let { mainEntry ->
+                    mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(
+                            mainEntry,
+                            mEntryHistoryPosition,
+                            !mReadOnly && mAutoSaveEnable)
                }
            }
            R.id.menu_save_database -> {
-                saveDatabase()
-            }
-            R.id.menu_merge_database -> {
-                mergeDatabase()
+                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
            }
            R.id.menu_reload_database -> {
-                reloadDatabase()
+                mProgressDatabaseTaskProvider?.startDatabaseReload(false)
            }
            android.R.id.home -> finish() // close this activity and return to preview activity (if there is any)
        }
        return super.onOptionsItemSelected(item)
    }

+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putBoolean(KEY_FIRST_LAUNCH_ACTIVITY, mFirstLaunchOfActivity)
+    }
+
    override fun finish() {
        // Transit data in previous Activity after an update
        Intent().apply {
-            putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mMainEntryId)
-            setResult(Activity.RESULT_OK, this)
+            putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mEntry)
+            setResult(EntryEditActivity.UPDATE_ENTRY_RESULT_CODE, this)
        }
        super.finish()
    }
@@ -497,42 +526,19 @@ class EntryActivity : DatabaseLockActivity() {
    companion object {
        private val TAG = EntryActivity::class.java.name

+        private const val KEY_FIRST_LAUNCH_ACTIVITY = "KEY_FIRST_LAUNCH_ACTIVITY"
+
        const val KEY_ENTRY = "KEY_ENTRY"
        const val KEY_ENTRY_HISTORY_POSITION = "KEY_ENTRY_HISTORY_POSITION"

-        const val ENTRY_FRAGMENT_TAG = "ENTRY_FRAGMENT_TAG"
-
-        /**
-         * Open standard Entry activity
-         */
-        fun launch(activity: Activity,
-                   database: Database,
-                   entryId: NodeId<UUID>,
-                   activityResultLauncher: ActivityResultLauncher<Intent>) {
-            if (database.loaded) {
-                if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
-                    val intent = Intent(activity, EntryActivity::class.java)
-                    intent.putExtra(KEY_ENTRY, entryId)
-                    activityResultLauncher.launch(intent)
-                }
-            }
-        }
-
-        /**
-         * Open history Entry activity
-         */
-        fun launch(activity: Activity,
-                   database: Database,
-                   entryId: NodeId<UUID>,
-                   historyPosition: Int,
-                   activityResultLauncher: ActivityResultLauncher<Intent>) {
-            if (database.loaded) {
-                if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
-                    val intent = Intent(activity, EntryActivity::class.java)
-                    intent.putExtra(KEY_ENTRY, entryId)
+        fun launch(activity: Activity, entry: Entry, readOnly: Boolean, historyPosition: Int? = null) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
+                val intent = Intent(activity, EntryActivity::class.java)
+                intent.putExtra(KEY_ENTRY, entry.nodeId)
+                ReadOnlyHelper.putReadOnlyInIntent(intent, readOnly)
+                if (historyPosition != null)
                    intent.putExtra(KEY_ENTRY_HISTORY_POSITION, historyPosition)
-                    activityResultLauncher.launch(intent)
-                }
+                activity.startActivityForResult(intent, EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
@@ -22,13 +22,14 @@ package com.kunzisoft.keepass.activities
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
+import android.os.Bundle
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
+import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.otp.OtpEntryFields
@@ -38,18 +39,10 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 * Activity to search or select entry in database,
 * Commonly used with Magikeyboard
 */
-class EntrySelectionLauncherActivity : DatabaseModeActivity() {
+class EntrySelectionLauncherActivity : AppCompatActivity() {

-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
+    override fun onCreate(savedInstanceState: Bundle?) {

-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
        var sharedWebDomain: String? = null
        var otpString: String? = null

@@ -75,39 +68,39 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
            else -> {}
        }

+
        // Build domain search param
        val searchInfo = SearchInfo().apply {
            this.webDomain = sharedWebDomain
            this.otpString = otpString
        }
-
        SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
            searchInfo.webDomain = concreteWebDomain
-            launch(database, searchInfo)
+            launch(searchInfo)
        }
+
+        super.onCreate(savedInstanceState)
    }

-    private fun launch(database: Database?,
-                       searchInfo: SearchInfo) {
+    private fun launch(searchInfo: SearchInfo) {

        if (!searchInfo.containsOnlyNullValues()) {
            // Setting to integrate Magikeyboard
            val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)

            // If database is open
-            val readOnly = database?.isReadOnly != false
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
            SearchHelper.checkAutoSearchInfo(this,
                    database,
                    searchInfo,
-                    { openedDatabase, items ->
+                    { items ->
                        // Items found
                        if (searchInfo.otpString != null) {
                            if (!readOnly) {
-                                GroupActivity.launchForSaveResult(
-                                    this,
-                                    openedDatabase,
-                                    searchInfo,
-                                    false)
+                                GroupActivity.launchForSaveResult(this,
+                                        searchInfo,
+                                        false)
                            } else {
                                Toast.makeText(applicationContext,
                                        R.string.autofill_read_only_save,
@@ -118,32 +111,30 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                            if (items.size == 1) {
                                // Automatically populate keyboard
                                val entryPopulate = items[0]
-                                populateKeyboardAndMoveAppToBackground(
-                                    this,
+                                populateKeyboardAndMoveAppToBackground(this,
                                        entryPopulate,
                                        intent)
                            } else {
                                // Select the one we want
                                GroupActivity.launchForKeyboardSelectionResult(this,
-                                    openedDatabase,
-                                    searchInfo,
-                                    true)
+                                        readOnly,
+                                        searchInfo,
+                                        true)
                            }
                        } else {
                            GroupActivity.launchForSearchResult(this,
-                                openedDatabase,
-                                searchInfo,
-                                true)
+                                    readOnly,
+                                    searchInfo,
+                                    true)
                        }
                    },
-                    { openedDatabase ->
+                    {
                        // Show the database UI to select the entry
                        if (searchInfo.otpString != null) {
                            if (!readOnly) {
                                GroupActivity.launchForSaveResult(this,
-                                    openedDatabase,
-                                    searchInfo,
-                                    false)
+                                        searchInfo,
+                                        false)
                            } else {
                                Toast.makeText(applicationContext,
                                        R.string.autofill_read_only_save,
@@ -152,14 +143,13 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                            }
                        } else if (readOnly || searchShareForMagikeyboard) {
                            GroupActivity.launchForKeyboardSelectionResult(this,
-                                openedDatabase,
-                                searchInfo,
-                                false)
+                                    readOnly,
+                                    searchInfo,
+                                    false)
                        } else {
                            GroupActivity.launchForSaveResult(this,
-                                openedDatabase,
-                                searchInfo,
-                                false)
+                                    searchInfo,
+                                    false)
                        }
                    },
                    {
@@ -193,7 +183,7 @@ fun populateKeyboardAndMoveAppToBackground(activity: Activity,
                                           intent: Intent,
                                           toast: Boolean = true) {
    // Populate Magikeyboard with entry
-    MagikeyboardService.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
+    MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
    // Consume the selection mode
    EntrySelectionHelper.removeModesFromIntent(intent)
    activity.moveTaskToBack(true)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -31,10 +31,8 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -42,16 +40,16 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.SetMainCredentialDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.model.MainCredential
@@ -62,14 +60,13 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import java.io.FileNotFoundException

-class FileDatabaseSelectActivity : DatabaseModeActivity(),
-        SetMainCredentialDialogFragment.AssignMainCredentialDialogListener {
+class FileDatabaseSelectActivity : SpecialModeActivity(),
+        AssignMasterKeyDialogFragment.AssignPasswordDialogListener {

    // Views
    private lateinit var coordinatorLayout: CoordinatorLayout
@@ -78,8 +75,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),

    private val databaseFilesViewModel: DatabaseFilesViewModel by viewModels()

-    private val mFileDatabaseSelectActivityEducation = FileDatabaseSelectActivityEducation(this)
-
    // Adapter to manage database history list
    private var mAdapterDatabaseHistory: FileDatabaseHistoryAdapter? = null

@@ -87,22 +82,13 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),

    private var mDatabaseFileUri: Uri? = null

-    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mSelectFileHelper: SelectFileHelper? = null

-    private var mAutofillActivityResultLauncher: ActivityResultLauncher<Intent>? =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            AutofillHelper.buildActivityResultLauncher(this)
-        else null
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        // Enabling/disabling MagikeyboardService is normally done by DexModeReceiver, but this
-        // additional check will allow the keyboard to be reenabled more easily if the app crashes
-        // or is force quit within DeX mode and then the user leaves DeX mode. Without this, the
-        // user would need to enter and exit DeX mode once to reenable the service.
-        MagikeyboardUtil.setEnabled(this, !DexUtil.isDexMode(resources.configuration))
-
        mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(applicationContext)

        setContentView(R.layout.activity_file_selection)
@@ -117,25 +103,14 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        createDatabaseButtonView?.setOnClickListener { createNewFile() }

        // Open database button
-        mExternalFileHelper = ExternalFileHelper(this)
-        mExternalFileHelper?.buildOpenDocument { uri ->
-            uri?.let {
-                launchPasswordActivityWithPath(uri)
+        mSelectFileHelper = SelectFileHelper(this)
+        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
+        openDatabaseButtonView?.apply {
+            mSelectFileHelper?.selectFileOnClickViewListener?.let {
+                setOnClickListener(it)
+                setOnLongClickListener(it)
            }
        }
-        mExternalFileHelper?.buildCreateDocument("application/x-keepass") { databaseFileCreatedUri ->
-            mDatabaseFileUri = databaseFileCreatedUri
-            if (mDatabaseFileUri != null) {
-                SetMainCredentialDialogFragment.getInstance(true)
-                    .show(supportFragmentManager, "passwordDialog")
-            } else {
-                val error = getString(R.string.error_create_database)
-                Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
-                Log.e(TAG, error)
-            }
-        }
-        openDatabaseButtonView = findViewById(R.id.open_database_button)
-        openDatabaseButtonView?.setOpenDocumentClickListener(mExternalFileHelper)

        // History list
        val fileDatabaseHistoryRecyclerView = findViewById<RecyclerView>(R.id.file_list)
@@ -156,6 +131,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
            }
        }
        mAdapterDatabaseHistory?.setOnFileDatabaseHistoryDeleteListener { fileDatabaseHistoryToDelete ->
+            // Remove from app database
            databaseFilesViewModel.deleteDatabaseFile(fileDatabaseHistoryToDelete)
            true
        }
@@ -186,31 +162,29 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),

        // Observe list of databases
        databaseFilesViewModel.databaseFilesLoaded.observe(this) { databaseFiles ->
-            try {
-                when (databaseFiles.databaseFileAction) {
-                    DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
-                        mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+            when (databaseFiles.databaseFileAction) {
+                DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
+                    mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
+                        mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
                    }
-                    DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
-                        databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
-                            mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
-                        }
-                    }
-                    DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
-                        databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
-                            mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
-                        }
-                    }
-                    DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
-                        databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
-                            mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
-                        }
+                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                            PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
+                        mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
+                    }
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
+                        mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
                    }
                }
-                databaseFilesViewModel.consumeAction()
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to observe database action", e)
            }
+            databaseFilesViewModel.consumeAction()
        }

        // Observe default database
@@ -218,62 +192,37 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
            // Retrieve settings for default database
            mAdapterDatabaseHistory?.setDefaultDatabase(it)
        }
-    }

-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-        if (database != null) {
-            launchGroupActivityIfLoaded(database)
-        }
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-
-        if (result.isSuccess) {
-            // Update list
-            when (actionTask) {
-                ACTION_DATABASE_CREATE_TASK,
-                ACTION_DATABASE_LOAD_TASK -> {
-                    result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
-                        val mainCredential =
-                            result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
-                                ?: MainCredential()
-                        databaseFilesViewModel.addDatabaseFile(
-                            databaseUri,
-                            mainCredential.keyFileUri
-                        )
+        // Attach the dialog thread to this activity
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
+            onActionFinish = { actionTask, result ->
+                when (actionTask) {
+                    ACTION_DATABASE_CREATE_TASK -> {
+                        result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
+                            val mainCredential = result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY) ?: MainCredential()
+                            databaseFilesViewModel.addDatabaseFile(databaseUri, mainCredential.keyFileUri)
+                        }
+                    }
+                    ACTION_DATABASE_LOAD_TASK -> {
+                        val database = Database.getInstance()
+                        if (result.isSuccess
+                                && database.loaded) {
+                            launchGroupActivity(database)
+                        } else {
+                            var resultError = ""
+                            val resultMessage = result.message
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError)
+                            Snackbar.make(coordinatorLayout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
+                        }
                    }
                }
            }
-            // Launch activity
-            when (actionTask) {
-                ACTION_DATABASE_CREATE_TASK -> {
-                    GroupActivity.launch(
-                        this@FileDatabaseSelectActivity,
-                        database,
-                        PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity)
-                    )
-                }
-                ACTION_DATABASE_LOAD_TASK -> {
-                    launchGroupActivityIfLoaded(database)
-                }
-            }
-        } else {
-            var resultError = ""
-            val resultMessage = result.message
-            // Show error message
-            if (resultMessage != null && resultMessage.isNotEmpty()) {
-                resultError = "$resultError $resultMessage"
-            }
-            Log.e(TAG, resultError)
-            Snackbar.make(coordinatorLayout,
-                resultError,
-                Snackbar.LENGTH_LONG).asError().show()
        }
    }

@@ -281,9 +230,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     * Create a new file by calling the content provider
     */
    private fun createNewFile() {
-        mExternalFileHelper?.createDocument(
-            getString(R.string.database_file_name_default) +
-                getString(R.string.database_file_extension_default))
+        createDocument(this, getString(R.string.database_file_name_default) +
+                getString(R.string.database_file_extension_default), "application/x-keepass")
    }

    private fun fileNoFoundAction(e: FileNotFoundException) {
@@ -293,26 +241,22 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
    }

    private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
-        MainCredentialActivity.launch(this,
+        PasswordActivity.launch(this,
                databaseUri,
                keyFile,
                { exception ->
                    fileNoFoundAction(exception)
                },
                { onCancelSpecialMode() },
-                { onLaunchActivitySpecialMode() },
-                mAutofillActivityResultLauncher)
+                { onLaunchActivitySpecialMode() })
    }

-    private fun launchGroupActivityIfLoaded(database: Database) {
-        if (database.loaded) {
-            GroupActivity.launch(this,
-                database,
+    private fun launchGroupActivity(database: Database) {
+        GroupActivity.launch(this,
+                database.isReadOnly,
                { onValidateSpecialMode() },
                { onCancelSpecialMode() },
-                { onLaunchActivitySpecialMode() },
-                mAutofillActivityResultLauncher)
-        }
+                { onLaunchActivitySpecialMode() })
    }

    override fun onValidateSpecialMode() {
@@ -338,7 +282,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        // Show open and create button or special mode
        when (mSpecialMode) {
            SpecialMode.DEFAULT -> {
-                if (ExternalFileHelper.allowCreateDocumentByStorageAccessFramework(packageManager)) {
+                if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
                    // There is an activity which can handle this intent.
                    createDatabaseButtonView?.visibility = View.VISIBLE
                } else{
@@ -352,18 +296,30 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
            }
        }

-        mDatabase?.let { database ->
-            launchGroupActivityIfLoaded(database)
-        }
-
-        // Show recent files if allowed
-        if (PreferencesUtil.showRecentFiles(this@FileDatabaseSelectActivity)) {
-            databaseFilesViewModel.loadListOfDatabases()
+        val database = Database.getInstance()
+        if (database.loaded) {
+            launchGroupActivity(database)
        } else {
-            mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+            // Construct adapter with listeners
+            if (PreferencesUtil.showRecentFiles(this)) {
+                databaseFilesViewModel.loadListOfDatabases()
+            } else {
+                mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+                mAdapterDatabaseHistory?.notifyDataSetChanged()
+            }
+
+            // Register progress task
+            mProgressDatabaseTaskProvider?.registerProgressTask()
        }
    }

+    override fun onPause() {
+        // Unregister progress task
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
        // only to keep the current activity
@@ -373,10 +329,15 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
    }

    override fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential) {
+
        try {
            mDatabaseFileUri?.let { databaseUri ->
+
                // Create the new database
-                createDatabase(databaseUri, mainCredential)
+                mProgressDatabaseTaskProvider?.startDatabaseCreate(
+                        databaseUri,
+                        mainCredential
+                )
            }
        } catch (e: Exception) {
            val error = getString(R.string.error_create_database_file)
@@ -387,6 +348,33 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),

    override fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential) {}

+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+        }
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            if (uri != null) {
+                launchPasswordActivityWithPath(uri)
+            }
+        }
+
+        // Retrieve the created URI from the file manager
+        onCreateDocumentResult(requestCode, resultCode, data) { databaseFileCreatedUri ->
+            mDatabaseFileUri = databaseFileCreatedUri
+            if (mDatabaseFileUri != null) {
+                AssignMasterKeyDialogFragment.getInstance(true)
+                        .show(supportFragmentManager, "passwordDialog")
+            } else {
+                val error = getString(R.string.error_create_database)
+                Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
+                Log.e(TAG, error)
+            }
+        }
+    }
+
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)

@@ -394,40 +382,39 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
            MenuUtil.defaultMenuInflater(menuInflater, menu)
        }

-        Handler(Looper.getMainLooper()).post {
-            performedNextEducation()
-        }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }

        return true
    }

-    private fun performedNextEducation() {
+    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
        // If no recent files
        val createDatabaseEducationPerformed =
                createDatabaseButtonView != null
                && createDatabaseButtonView!!.visibility == View.VISIBLE
-                && mFileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
+                && mAdapterDatabaseHistory != null
+                && mAdapterDatabaseHistory!!.itemCount == 0
+                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
                        createDatabaseButtonView!!,
                {
                    createNewFile()
                },
                {
                    // But if the user cancel, it can also select a database
-                    performedNextEducation()
+                    performedNextEducation(fileDatabaseSelectActivityEducation)
                })
        if (!createDatabaseEducationPerformed) {
            // selectDatabaseEducationPerformed
            openDatabaseButtonView != null
-            && mFileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
-                openDatabaseButtonView!!,
-            { tapTargetView ->
-                tapTargetView?.let {
-                    mExternalFileHelper?.openDocument()
-                }
-            },
-            {
-
-            })
+                    && fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
+                    openDatabaseButtonView!!,
+                    {tapTargetView ->
+                        tapTargetView?.let {
+                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+                        }
+                    },
+                    {}
+            )
        }
    }

@@ -501,13 +488,11 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         */

        @RequiresApi(api = Build.VERSION_CODES.O)
-        fun launchForAutofillResult(activity: AppCompatActivity,
-                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
+        fun launchForAutofillResult(activity: Activity,
                                    autofillComponent: AutofillComponent,
                                    searchInfo: SearchInfo? = null) {
            AutofillHelper.startActivityForAutofillResult(activity,
                    Intent(activity, FileDatabaseSelectActivity::class.java),
-                    activityResultLauncher,
                    autofillComponent,
                    searchInfo)
        }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
@@ -27,20 +27,16 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.commit
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.IconEditDialogFragment
 import com.kunzisoft.keepass.activities.fragments.IconPickerFragment
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
-import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
@@ -53,7 +49,7 @@ import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
 import kotlinx.coroutines.*


-class IconPickerActivity : DatabaseLockActivity() {
+class IconPickerActivity : LockingActivity() {

    private lateinit var toolbar: Toolbar
    private lateinit var coordinatorLayout: CoordinatorLayout
@@ -68,13 +64,17 @@ class IconPickerActivity : DatabaseLockActivity() {
    private var mCustomIconsSelectionMode = false
    private var mIconsSelected: List<IconImageCustom> = ArrayList()

-    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mDatabase: Database? = null
+
+    private var mSelectFileHelper: SelectFileHelper? = null

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

        setContentView(R.layout.activity_icon_picker)

+        mDatabase = Database.getInstance()
+
        toolbar = findViewById(R.id.toolbar)
        toolbar.title = " "
        setSupportActionBar(toolbar)
@@ -84,12 +84,18 @@ class IconPickerActivity : DatabaseLockActivity() {

        coordinatorLayout = findViewById(R.id.icon_picker_coordinator)

-        mExternalFileHelper = ExternalFileHelper(this)
-        mExternalFileHelper?.buildOpenDocument { uri ->
-            addCustomIcon(uri)
-        }
-
        uploadButton = findViewById(R.id.icon_picker_upload)
+        if (mDatabase?.allowCustomIcons == true) {
+            uploadButton.setOnClickListener {
+                mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+            }
+            uploadButton.setOnLongClickListener {
+                mSelectFileHelper?.selectFileOnClickViewListener?.onLongClick(it)
+                true
+            }
+        } else {
+            uploadButton.visibility = View.GONE
+        }

        lockView = findViewById(R.id.lock_button)
        lockView?.setOnClickListener {
@@ -115,6 +121,11 @@ class IconPickerActivity : DatabaseLockActivity() {
            mIconImage = savedInstanceState.getParcelable(EXTRA_ICON) ?: mIconImage
        }

+        // Focus view to reinitialize timeout
+        findViewById<ViewGroup>(R.id.icon_picker_container)?.resetAppTimeoutWhenViewFocusedOrChanged(this)
+
+        mSelectFileHelper = SelectFileHelper(this)
+
        iconPickerViewModel.standardIconPicked.observe(this) { iconStandard ->
            mIconImage.standard = iconStandard
            // Remove the custom icon if a standard one is selected
@@ -146,34 +157,6 @@ class IconPickerActivity : DatabaseLockActivity() {
            }
            uploadButton.isEnabled = true
        }
-        iconPickerViewModel.customIconUpdated.observe(this) { iconCustomUpdated ->
-            if (iconCustomUpdated.error && !iconCustomUpdated.errorConsumed) {
-                Snackbar.make(coordinatorLayout, iconCustomUpdated.errorStringId, Snackbar.LENGTH_LONG).asError().show()
-                iconCustomUpdated.errorConsumed = true
-            }
-            iconCustomUpdated.iconCustom?.let {
-                mDatabase?.updateCustomIcon(it)
-            }
-            iconPickerViewModel.deselectAllCustomIcons()
-        }
-    }
-
-    override fun viewToInvalidateTimeout(): View? {
-        return findViewById<ViewGroup>(R.id.icon_picker_container)
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        if (database?.allowCustomIcons == true) {
-            uploadButton.setOpenDocumentClickListener(mExternalFileHelper)
-        } else {
-            uploadButton.visibility = View.GONE
-        }
    }

    private fun updateIconsSelectedViews() {
@@ -209,20 +192,11 @@ class IconPickerActivity : DatabaseLockActivity() {

    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
        super.onCreateOptionsMenu(menu)
-        menuInflater.inflate(R.menu.icon, menu)
-        return true
-    }

-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        menu?.findItem(R.id.menu_edit)?.apply {
-            isEnabled = mIconsSelected.size == 1
-            isVisible = isEnabled
+        if (mCustomIconsSelectionMode) {
+            menuInflater.inflate(R.menu.icon, menu)
        }
-        menu?.findItem(R.id.menu_delete)?.apply {
-            isEnabled = mCustomIconsSelectionMode
-            isVisible = isEnabled
-        }
-        return super.onPrepareOptionsMenu(menu)
+        return true
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -234,17 +208,11 @@ class IconPickerActivity : DatabaseLockActivity() {
                    onBackPressed()
                }
            }
-            R.id.menu_edit -> {
-                updateCustomIcon(mIconsSelected[0])
-            }
            R.id.menu_delete -> {
                mIconsSelected.forEach { iconToRemove ->
                    removeCustomIcon(iconToRemove)
                }
            }
-            R.id.menu_external_icon -> {
-                UriUtil.gotoUrl(this, R.string.external_icon_url)
-            }
        }

        return super.onOptionsItemSelected(item)
@@ -301,11 +269,6 @@ class IconPickerActivity : DatabaseLockActivity() {
        }
    }

-    private fun updateCustomIcon(iconImageCustom: IconImageCustom) {
-        IconEditDialogFragment.update(iconImageCustom)
-            .show(supportFragmentManager, IconEditDialogFragment.TAG_UPDATE_ICON)
-    }
-
    private fun removeCustomIcon(iconImageCustom: IconImageCustom) {
        uploadButton.isEnabled = false
        iconPickerViewModel.deselectAllCustomIcons()
@@ -315,6 +278,14 @@ class IconPickerActivity : DatabaseLockActivity() {
        )
    }

+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            addCustomIcon(uri)
+        }
+    }
+
    private fun setResult() {
        setResult(Activity.RESULT_OK, Intent().apply {
            putExtra(EXTRA_ICON, mIconImage)
@@ -329,28 +300,30 @@ class IconPickerActivity : DatabaseLockActivity() {
    companion object {

        private const val ICON_PICKER_FRAGMENT_TAG = "ICON_PICKER_FRAGMENT_TAG"
+
+        private const val ICON_SELECTED_REQUEST = 15861
        private const val EXTRA_ICON = "EXTRA_ICON"
+
        private const val MAX_ICON_SIZE = 5242880

-        fun registerIconSelectionForResult(context: FragmentActivity,
-                                           listener: (icon: IconImage) -> Unit): ActivityResultLauncher<Intent> {
-            return context.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == Activity.RESULT_OK) {
-                    listener.invoke(result.data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
+        fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?, listener: (icon: IconImage) -> Unit) {
+            if (requestCode == ICON_SELECTED_REQUEST) {
+                if (resultCode == Activity.RESULT_OK) {
+                    listener.invoke(data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
                }
            }
        }

-        fun launch(context: FragmentActivity,
-                   previousIcon: IconImage?,
-                   resultLauncher: ActivityResultLauncher<Intent>) {
+        fun launch(context: Activity,
+                   previousIcon: IconImage?) {
            // Create an instance to return the picker icon
-            resultLauncher.launch(
-                Intent(context, IconPickerActivity::class.java).apply {
+            context.startActivityForResult(
+                    Intent(context,
+                    IconPickerActivity::class.java).apply {
                        if (previousIcon != null)
                            putExtra(EXTRA_ICON, previousIcon)
-                    }
-            )
+                    },
+                    ICON_SELECTED_REQUEST)
        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
@@ -19,7 +19,6 @@
 */
 package com.kunzisoft.keepass.activities

-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -32,19 +31,16 @@ import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.igreenwood.loupe.Loupe
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import kotlin.math.max

-class ImageViewerActivity : DatabaseLockActivity() {
+class ImageViewerActivity : LockingActivity() {

-    private var imageContainerView: ViewGroup? = null
-    private lateinit var imageView: ImageView
-    private lateinit var progressView: View
+    private var mDatabase: Database? = null

-    @SuppressLint("ClickableViewAccessibility")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -54,21 +50,49 @@ class ImageViewerActivity : DatabaseLockActivity() {
        setSupportActionBar(toolbar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)
-        toolbar.setOnTouchListener { _, _ ->
-            resetAppTimeout()
-            false
+
+        val imageContainerView: ViewGroup = findViewById(R.id.image_viewer_container)
+        val imageView: ImageView = findViewById(R.id.image_viewer_image)
+        val progressView: View = findViewById(R.id.image_viewer_progress)
+
+        // Approximately, to not OOM and allow a zoom
+        val mImagePreviewMaxWidth = max(
+                resources.displayMetrics.widthPixels * 2,
+                resources.displayMetrics.heightPixels * 2
+        )
+
+        mDatabase = Database.getInstance()
+
+        try {
+            progressView.visibility = View.VISIBLE
+            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
+
+                supportActionBar?.title = attachment.name
+
+                val size = attachment.binaryData.getSize()
+                supportActionBar?.subtitle = Formatter.formatFileSize(this, size)
+
+                mDatabase?.let { database ->
+                    BinaryDatabaseManager.loadBitmap(
+                            database,
+                            attachment.binaryData,
+                            mImagePreviewMaxWidth
+                    ) { bitmapLoaded ->
+                        if (bitmapLoaded == null) {
+                            finish()
+                        } else {
+                            progressView.visibility = View.GONE
+                            imageView.setImageBitmap(bitmapLoaded)
+                        }
+                    }
+                }
+            } ?: finish()
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to view the binary", e)
+            finish()
        }

-        imageContainerView = findViewById(R.id.image_viewer_container)
-        imageView = findViewById(R.id.image_viewer_image)
-        progressView = findViewById(R.id.image_viewer_progress)
-
-        Loupe.create(imageView, imageContainerView!!) {
-            onViewTouchedListener = View.OnTouchListener { _, _ ->
-                // to reset timeout when Loupe image view touched
-                resetAppTimeout()
-                false
-            }
+        Loupe.create(imageView, imageContainerView) {
            onViewTranslateListener = object : Loupe.OnViewTranslateListener {

                override fun onStart(view: ImageView) {
@@ -91,54 +115,6 @@ class ImageViewerActivity : DatabaseLockActivity() {
        }
    }

-    override fun viewToInvalidateTimeout(): View? {
-        // Null to manually manage events
-        return null
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        try {
-            progressView.visibility = View.VISIBLE
-            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
-
-                supportActionBar?.title = attachment.name
-
-                val size = attachment.binaryData.getSize()
-                supportActionBar?.subtitle = Formatter.formatFileSize(this, size)
-
-                // Approximately, to not OOM and allow a zoom
-                val mImagePreviewMaxWidth = max(
-                    resources.displayMetrics.widthPixels * 2,
-                    resources.displayMetrics.heightPixels * 2
-                )
-
-                database?.let { database ->
-                    BinaryDatabaseManager.loadBitmap(
-                        database,
-                        attachment.binaryData,
-                        mImagePreviewMaxWidth
-                    ) { bitmapLoaded ->
-                        if (bitmapLoaded == null) {
-                            finish()
-                        } else {
-                            progressView.visibility = View.GONE
-                            imageView.setImageBitmap(bitmapLoaded)
-                        }
-                    }
-                }
-            } ?: finish()
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to view the binary", e)
-            finish()
-        }
-    }
-
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            android.R.id.home -> finish()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
@@ -19,41 +19,36 @@
 */
 package com.kunzisoft.keepass.activities

-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper

 /**
 * Activity to select entry in database and populate it in Magikeyboard
 */
-class MagikeyboardLauncherActivity : DatabaseModeActivity() {
+class MagikeyboardLauncherActivity : AppCompatActivity() {

-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val database = Database.getInstance()
+        val readOnly = database.isReadOnly
        SearchHelper.checkAutoSearchInfo(this,
-            database,
-            null,
-            { _, _ ->
-                // Not called
-                // if items found directly returns before calling this activity
-            },
-            { openedDatabase ->
-                // Select if not found
-                GroupActivity.launchForKeyboardSelectionResult(this, openedDatabase)
-            },
-            {
-                // Pass extra to get entry
-                FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this)
-            }
+                database,
+                null,
+                {
+                    // Not called
+                    // if items found directly returns before calling this activity
+                },
+                {
+                    // Select if not found
+                    GroupActivity.launchForKeyboardSelectionResult(this, readOnly)
+                },
+                {
+                    // Pass extra to get entry
+                    FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this)
+                }
        )
        finish()
+        super.onCreate(savedInstanceState)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt
@@ -22,6 +22,7 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
+import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
@@ -29,17 +30,18 @@ import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.View
 import android.widget.CompoundButton
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
-import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView

-class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
+class AssignMasterKeyDialogFragment : DialogFragment() {

    private var mMasterPassword: String? = null
    private var mKeyFile: Uri? = null
@@ -56,9 +58,9 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
    private var keyFileCheckBox: CompoundButton? = null
    private var keyFileSelectionView: KeyFileSelectionView? = null

-    private var mListener: AssignMainCredentialDialogListener? = null
+    private var mListener: AssignPasswordDialogListener? = null

-    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mSelectFileHelper: SelectFileHelper? = null

    private var mEmptyPasswordConfirmationDialog: AlertDialog? = null
    private var mNoKeyConfirmationDialog: AlertDialog? = null
@@ -74,7 +76,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
        }
    }

-    interface AssignMainCredentialDialogListener {
+    interface AssignPasswordDialogListener {
        fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential)
        fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential)
    }
@@ -82,10 +84,10 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
    override fun onAttach(activity: Context) {
        super.onAttach(activity)
        try {
-            mListener = activity as AssignMainCredentialDialogListener
+            mListener = activity as AssignPasswordDialogListener
        } catch (e: ClassCastException) {
            throw ClassCastException(activity.toString()
-                    + " must implement " + AssignMainCredentialDialogListener::class.java.name)
+                    + " must implement " + AssignPasswordDialogListener::class.java.name)
        }
    }

@@ -112,7 +114,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
            val builder = AlertDialog.Builder(activity)
            val inflater = activity.layoutInflater

-            rootView = inflater.inflate(R.layout.fragment_set_main_credential, null)
+            rootView = inflater.inflate(R.layout.fragment_set_password, null)
            builder.setView(rootView)
                    // Add action buttons
                    .setPositiveButton(android.R.string.ok) { _, _ -> }
@@ -131,20 +133,11 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)

-            mExternalFileHelper = ExternalFileHelper(this)
-            mExternalFileHelper?.buildOpenDocument { uri ->
-                uri?.let { pathUri ->
-                    UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
-                        keyFileSelectionView?.error = null
-                        keyFileCheckBox?.isChecked = true
-                        keyFileSelectionView?.uri = pathUri
-                        if (lengthFile <= 0L) {
-                            showEmptyKeyFileConfirmationDialog()
-                        }
-                    }
-                }
+            mSelectFileHelper = SelectFileHelper(this)
+            keyFileSelectionView?.apply {
+                setOnClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
+                setOnLongClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
            }
-            keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)

            val dialog = builder.create()

@@ -219,11 +212,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                passwordRepeatTextInputLayout?.error = getString(R.string.error_pass_match)
            }

-            if ((mMasterPassword == null
-                        || mMasterPassword!!.isEmpty())
-                && (keyFileCheckBox == null
-                        || !keyFileCheckBox!!.isChecked
-                        || keyFileSelectionView?.uri == null)) {
+            if (mMasterPassword == null || mMasterPassword!!.isEmpty()) {
                error = true
                showEmptyPasswordConfirmationDialog()
            }
@@ -254,7 +243,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                    .setPositiveButton(android.R.string.ok) { _, _ ->
                        if (!verifyKeyFile()) {
                            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                            this@SetMainCredentialDialogFragment.dismiss()
+                            this@AssignMasterKeyDialogFragment.dismiss()
                        }
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
@@ -269,7 +258,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
            builder.setMessage(R.string.warning_no_encryption_key)
                    .setPositiveButton(android.R.string.ok) { _, _ ->
                        mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                        this@SetMainCredentialDialogFragment.dismiss()
+                        this@AssignMasterKeyDialogFragment.dismiss()
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
            mNoKeyConfirmationDialog = builder.create()
@@ -297,12 +286,29 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
        }
    }

+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            uri?.let { pathUri ->
+                UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
+                    keyFileSelectionView?.error = null
+                    keyFileCheckBox?.isChecked = true
+                    keyFileSelectionView?.uri = pathUri
+                    if (lengthFile <= 0L) {
+                        showEmptyKeyFileConfirmationDialog()
+                    }
+                }
+            }
+        }
+    }
+
    companion object {

        private const val ALLOW_NO_MASTER_KEY_ARG = "ALLOW_NO_MASTER_KEY_ARG"

-        fun getInstance(allowNoMasterKey: Boolean): SetMainCredentialDialogFragment {
-            val fragment = SetMainCredentialDialogFragment()
+        fun getInstance(allowNoMasterKey: Boolean): AssignMasterKeyDialogFragment {
+            val fragment = AssignMasterKeyDialogFragment()
            val args = Bundle()
            args.putBoolean(ALLOW_NO_MASTER_KEY_ARG, allowNoMasterKey)
            fragment.arguments = args
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt
@@ -1,95 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.graphics.Color
-import android.os.Bundle
-import android.widget.CompoundButton
-import androidx.annotation.ColorInt
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
-import com.kunzisoft.androidclearchroma.view.ChromaColorView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel
-
-class ColorPickerDialogFragment : DatabaseDialogFragment() {
-
-    private val mColorPickerViewModel: ColorPickerViewModel by activityViewModels()
-
-    private lateinit var enableSwitchView: CompoundButton
-    private lateinit var chromaColorView: ChromaColorView
-
-    private var mDefaultColor = Color.WHITE
-    private var mActivated = false
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_color_picker, null)
-            enableSwitchView = root.findViewById(R.id.switch_element)
-            chromaColorView = root.findViewById(R.id.chroma_color_view)
-
-            if (savedInstanceState != null) {
-                if (savedInstanceState.containsKey(ARG_INITIAL_COLOR)) {
-                    mDefaultColor = savedInstanceState.getInt(ARG_INITIAL_COLOR)
-                }
-                if (savedInstanceState.containsKey(ARG_ACTIVATED)) {
-                    mActivated = savedInstanceState.getBoolean(ARG_ACTIVATED)
-                }
-            } else {
-                arguments?.apply {
-                    if (containsKey(ARG_INITIAL_COLOR)) {
-                        mDefaultColor = getInt(ARG_INITIAL_COLOR)
-                    }
-                    if (containsKey(ARG_ACTIVATED)) {
-                        mActivated = getBoolean(ARG_ACTIVATED)
-                    }
-                }
-            }
-            enableSwitchView.isChecked = mActivated
-            chromaColorView.currentColor = mDefaultColor
-
-            chromaColorView.setOnColorChangedListener {
-                if (!enableSwitchView.isChecked)
-                    enableSwitchView.isChecked = true
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    val color: Int? = if (enableSwitchView.isChecked)
-                        chromaColorView.currentColor
-                    else
-                        null
-                    mColorPickerViewModel.pickColor(color)
-                }
-                .setNegativeButton(android.R.string.cancel) { _, _ ->
-                    // Do nothing
-                }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putInt(ARG_INITIAL_COLOR, chromaColorView.currentColor)
-        outState.putBoolean(ARG_ACTIVATED, mActivated)
-    }
-
-    companion object {
-        private const val ARG_INITIAL_COLOR = "ARG_INITIAL_COLOR"
-        private const val ARG_ACTIVATED = "ARG_ACTIVATED"
-
-        fun newInstance(
-            @ColorInt initialColor: Int?,
-        ): ColorPickerDialogFragment {
-            return ColorPickerDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(ARG_INITIAL_COLOR, initialColor ?: Color.WHITE)
-                    putBoolean(ARG_ACTIVATED, initialColor != null)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
@@ -23,11 +23,12 @@ import android.app.Dialog
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo


-class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
+class DatabaseChangedDialogFragment : DialogFragment() {

    var actionDatabaseListener: ActionDatabaseChangedListener? = null

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
@@ -1,72 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
-import com.kunzisoft.keepass.activities.legacy.DatabaseRetrieval
-import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrFocused
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
-
-abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {
-
-    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    private var mDatabase: Database? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        mDatabaseViewModel.database.observe(this) { database ->
-            this.mDatabase = database
-            resetAppTimeoutOnTouchOrFocus()
-            onDatabaseRetrieved(database)
-        }
-
-        mDatabaseViewModel.actionFinished.observe(this) { result ->
-            onDatabaseActionFinished(result.database, result.actionTask, result.result)
-        }
-    }
-
-    @Suppress("DEPRECATION")
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-
-        resetAppTimeoutOnTouchOrFocus()
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        // Can be overridden by a subclass
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        // Can be overridden by a subclass
-    }
-
-    fun resetAppTimeout() {
-        context?.let {
-            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(it,
-                mDatabase?.loaded ?: false)
-        }
-    }
-
-    open fun overrideTimeoutTouchAndFocusEvents(): Boolean {
-        return false
-    }
-
-    private fun resetAppTimeoutOnTouchOrFocus() {
-        if (!overrideTimeoutTouchAndFocusEvents()) {
-            context?.let {
-                dialog?.window?.decorView?.resetAppTimeoutWhenViewTouchedOrFocused(
-                    it,
-                    mDatabase?.loaded
-                )
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment

-// Not as DatabaseDialogFragment because crash on KitKat
 class DatePickerFragment : DialogFragment() {

    private var mDefaultYear: Int = 2000
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
@@ -20,38 +20,61 @@
 package com.kunzisoft.keepass.activities.dialogs

 import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.viewmodels.NodesViewModel
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getListNodesFromBundle

-class DeleteNodesDialogFragment : DatabaseDialogFragment() {
+open class DeleteNodesDialogFragment : DialogFragment() {

-    private var mNodesToDelete: List<Node> = listOf()
-    private val mNodesViewModel: NodesViewModel by activityViewModels()
+    private var mNodesToDelete: List<Node> = ArrayList()
+    private var mListener: DeleteNodeListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as DeleteNodeListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + DeleteNodeListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    protected open fun retrieveMessage(): String {
+        return getString(R.string.warning_permanently_delete_nodes)
+    }

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        mNodesViewModel.nodesToDelete.observe(this) { nodes ->
-            this.mNodesToDelete = nodes
-        }
-        var recycleBin = false
+
        arguments?.apply {
-            if (containsKey(RECYCLE_BIN_TAG)) {
-                recycleBin = this.getBoolean(RECYCLE_BIN_TAG)
+            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
+                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
+                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), this)
+            }
+        } ?: savedInstanceState?.apply {
+            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
+                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
+                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), savedInstanceState)
            }
        }
        activity?.let { activity ->
            // Use the Builder class for convenient dialog construction
            val builder = AlertDialog.Builder(activity)

-            builder.setMessage(if (recycleBin)
-                getString(R.string.warning_empty_recycle_bin)
-            else
-                getString(R.string.warning_permanently_delete_nodes))
+            builder.setMessage(retrieveMessage())
            builder.setPositiveButton(android.R.string.ok) { _, _ ->
-                mNodesViewModel.permanentlyDeleteNodes(mNodesToDelete)
+                mListener?.permanentlyDeleteNodes(mNodesToDelete)
            }
            builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
            // Create the AlertDialog object and return it
@@ -60,14 +83,19 @@ class DeleteNodesDialogFragment : DatabaseDialogFragment() {
        return super.onCreateDialog(savedInstanceState)
    }

-    companion object {
-        private const val RECYCLE_BIN_TAG = "RECYCLE_BIN_TAG"
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putAll(getBundleFromListNodes(mNodesToDelete))
+    }

-        fun getInstance(recycleBin: Boolean): DeleteNodesDialogFragment {
+    interface DeleteNodeListener {
+        fun permanentlyDeleteNodes(nodes: List<Node>)
+    }
+
+    companion object {
+        fun getInstance(nodesToDelete: List<Node>): DeleteNodesDialogFragment {
            return DeleteNodesDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putBoolean(RECYCLE_BIN_TAG, recycleBin)
-                }
+                arguments = getBundleFromListNodes(nodesToDelete)
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EmptyRecycleBinDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EmptyRecycleBinDialogFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Jeremy Jamet / Kunzisoft.
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
 *
 * This file is part of KeePassDX.
 *
@@ -17,22 +17,23 @@
 *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.kunzisoft.keepass.model
+package com.kunzisoft.keepass.activities.dialogs

-enum class CredentialStorage {
-    PASSWORD, KEY_FILE, HARDWARE_KEY;
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+
+class EmptyRecycleBinDialogFragment : DeleteNodesDialogFragment() {
+
+    override fun retrieveMessage(): String {
+        return getString(R.string.warning_empty_recycle_bin)
+    }

    companion object {
-        fun getFromOrdinal(ordinal: Int): CredentialStorage {
-            return when (ordinal) {
-                0 -> PASSWORD
-                1 -> KEY_FILE
-                2 -> HARDWARE_KEY
-                else -> DEFAULT
+        fun getInstance(nodesToDelete: List<Node>): EmptyRecycleBinDialogFragment {
+            return EmptyRecycleBinDialogFragment().apply {
+                arguments = getBundleFromListNodes(nodesToDelete)
            }
        }
-
-        val DEFAULT: CredentialStorage
-            get() = PASSWORD
    }
-}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
@@ -31,13 +31,14 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.security.ProtectedString
+import com.kunzisoft.keepass.model.Field


-class EntryCustomFieldDialogFragment: DatabaseDialogFragment() {
+class EntryCustomFieldDialogFragment: DialogFragment() {

    private var oldField: Field? = null

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
@@ -22,18 +22,18 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.widget.*
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.view.applyFontVisibility

-class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
+class GeneratePasswordDialogFragment : DialogFragment() {

    private var mListener: GeneratePasswordListener? = null

@@ -42,8 +42,6 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
    private var passwordInputLayoutView: TextInputLayout? = null
    private var passwordView: EditText? = null

-    private var mPasswordField: Field? = null
-
    private var uppercaseBox: CompoundButton? = null
    private var lowercaseBox: CompoundButton? = null
    private var digitsBox: CompoundButton? = null
@@ -79,7 +77,7 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
            passwordView = root?.findViewById(R.id.password)
            passwordView?.applyFontVisibility()
            val passwordCopyView: ImageView? = root?.findViewById(R.id.password_copy_button)
-            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyProtectedFields(activity))
+            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyPasswordAndProtectedFields(activity))
                View.VISIBLE else View.GONE
            val clipboardHelper = ClipboardHelper(activity)
            passwordCopyView?.setOnClickListener {
@@ -100,8 +98,6 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
            bracketsBox = root?.findViewById(R.id.cb_brackets)
            extendedBox = root?.findViewById(R.id.cb_extended)

-            mPasswordField = arguments?.getParcelable(KEY_PASSWORD_FIELD)
-
            assignDefaultCharacters()

            val seekBar = root?.findViewById<SeekBar>(R.id.seekbar_length)
@@ -124,18 +120,16 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {

            builder.setView(root)
                    .setPositiveButton(R.string.accept) { _, _ ->
-                        mPasswordField?.let { passwordField ->
-                            passwordView?.text?.toString()?.let { passwordValue ->
-                                passwordField.protectedValue.stringValue = passwordValue
-                            }
-                            mListener?.acceptPassword(passwordField)
-                        }
+                        val bundle = Bundle()
+                        bundle.putString(KEY_PASSWORD_ID, passwordView!!.text.toString())
+                        mListener?.acceptPassword(bundle)
+
                        dismiss()
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        mPasswordField?.let { passwordField ->
-                            mListener?.cancelPassword(passwordField)
-                        }
+                        val bundle = Bundle()
+                        mListener?.cancelPassword(bundle)
+
                        dismiss()
                    }

@@ -206,19 +200,11 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
    }

    interface GeneratePasswordListener {
-        fun acceptPassword(passwordField: Field)
-        fun cancelPassword(passwordField: Field)
+        fun acceptPassword(bundle: Bundle)
+        fun cancelPassword(bundle: Bundle)
    }

    companion object {
-        private const val KEY_PASSWORD_FIELD = "KEY_PASSWORD_FIELD"
-
-        fun getInstance(field: Field): GeneratePasswordDialogFragment {
-            return GeneratePasswordDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putParcelable(KEY_PASSWORD_FIELD, field)
-                }
-            }
-        }
+        const val KEY_PASSWORD_ID = "KEY_PASSWORD_ID"
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
@@ -1,204 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.adapters.TagsAdapter
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.utils.UuidUtil
-import com.kunzisoft.keepass.view.DateTimeFieldView
-
-class GroupDialogFragment : DatabaseDialogFragment() {
-
-    private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null
-    private var mGroupInfo = GroupInfo()
-
-    private lateinit var iconView: ImageView
-    private var mIconColor: Int = 0
-    private lateinit var nameTextView: TextView
-    private lateinit var tagsListView: RecyclerView
-    private var tagsAdapter: TagsAdapter? = null
-    private lateinit var notesTextLabelView: TextView
-    private lateinit var notesTextView: TextView
-    private lateinit var expirationView: DateTimeFieldView
-    private lateinit var creationView: TextView
-    private lateinit var modificationView: TextView
-    private lateinit var searchableLabelView: TextView
-    private lateinit var searchableView: TextView
-    private lateinit var autoTypeLabelView: TextView
-    private lateinit var autoTypeView: TextView
-    private lateinit var uuidContainerView: ViewGroup
-    private lateinit var uuidReferenceView: TextView
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-        mPopulateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
-        }
-        mPopulateIconMethod?.invoke(iconView, mGroupInfo.icon)
-
-        if (database?.allowCustomSearchableGroup() == true) {
-            searchableLabelView.visibility = View.VISIBLE
-            searchableView.visibility = View.VISIBLE
-        } else {
-            searchableLabelView.visibility = View.GONE
-            searchableView.visibility = View.GONE
-        }
-
-        // TODO Auto-Type
-        /*
-        if (database?.allowAutoType() == true) {
-            autoTypeLabelView.visibility = View.VISIBLE
-            autoTypeView.visibility = View.VISIBLE
-        } else {
-            autoTypeLabelView.visibility = View.GONE
-            autoTypeView.visibility = View.GONE
-        }
-         */
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_group, null)
-            iconView = root.findViewById(R.id.group_icon)
-            nameTextView = root.findViewById(R.id.group_name)
-            tagsListView = root.findViewById(R.id.group_tags_list_view)
-            notesTextLabelView = root.findViewById(R.id.group_note_label)
-            notesTextView = root.findViewById(R.id.group_note)
-            expirationView = root.findViewById(R.id.group_expiration)
-            creationView = root.findViewById(R.id.group_created)
-            modificationView = root.findViewById(R.id.group_modified)
-            searchableLabelView = root.findViewById(R.id.group_searchable_label)
-            searchableView = root.findViewById(R.id.group_searchable)
-            autoTypeLabelView = root.findViewById(R.id.group_auto_type_label)
-            autoTypeView = root.findViewById(R.id.group_auto_type)
-            uuidContainerView = root.findViewById(R.id.group_UUID_container)
-            uuidReferenceView = root.findViewById(R.id.group_UUID_reference)
-
-            // Retrieve the textColor to tint the icon
-            val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
-            mIconColor = ta.getColor(0, Color.WHITE)
-            ta.recycle()
-
-            if (savedInstanceState != null
-                    && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
-                mGroupInfo = savedInstanceState.getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
-            } else {
-                arguments?.apply {
-                    if (containsKey(KEY_GROUP_INFO)) {
-                        mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
-                    }
-                }
-            }
-
-            // populate info in views
-            val title = mGroupInfo.title
-            if (title.isEmpty()) {
-                nameTextView.visibility = View.GONE
-            } else {
-                nameTextView.text = title
-                nameTextView.visibility = View.VISIBLE
-            }
-            tagsAdapter = TagsAdapter(activity)
-            tagsListView.apply {
-                layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-                adapter = tagsAdapter
-            }
-            val tags = mGroupInfo.tags
-            tagsListView.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
-            tagsAdapter?.setTags(tags)
-            val notes = mGroupInfo.notes
-            if (notes == null || notes.isEmpty()) {
-                notesTextLabelView.visibility = View.GONE
-                notesTextView.visibility = View.GONE
-            } else {
-                notesTextView.text = notes
-                notesTextLabelView.visibility = View.VISIBLE
-                notesTextView.visibility = View.VISIBLE
-            }
-            expirationView.activation = mGroupInfo.expires
-            expirationView.dateTime = mGroupInfo.expiryTime
-            creationView.text = mGroupInfo.creationTime.getDateTimeString(resources)
-            modificationView.text = mGroupInfo.lastModificationTime.getDateTimeString(resources)
-            searchableView.text = stringFromInheritableBoolean(mGroupInfo.searchable)
-            autoTypeView.text = stringFromInheritableBoolean(mGroupInfo.enableAutoType,
-                mGroupInfo.defaultAutoTypeSequence)
-            val uuid = UuidUtil.toHexString(mGroupInfo.id)
-            if (uuid == null || uuid.isEmpty()) {
-                uuidContainerView.visibility = View.GONE
-            } else {
-                uuidReferenceView.text = uuid
-                uuidContainerView.apply {
-                    visibility = if (PreferencesUtil.showUUID(context)) View.VISIBLE else View.GONE
-                }
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                    .setPositiveButton(android.R.string.ok){ _, _ ->
-                        // Do nothing
-                    }
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    private fun stringFromInheritableBoolean(enable: Boolean?, value: String? = null): String {
-        val valueString = if (value != null && value.isNotEmpty()) " [$value]" else ""
-        return when {
-            enable == null -> getString(R.string.inherited) + valueString
-            enable -> getString(R.string.enable) + valueString
-            else -> getString(R.string.disable)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putParcelable(KEY_GROUP_INFO, mGroupInfo)
-        super.onSaveInstanceState(outState)
-    }
-
-    data class Error(val isError: Boolean, val messageId: Int?)
-
-    companion object {
-        const val TAG_SHOW_GROUP = "TAG_SHOW_GROUP"
-        private const val KEY_GROUP_INFO = "KEY_GROUP_INFO"
-
-        fun launch(groupInfo: GroupInfo): GroupDialogFragment {
-            val bundle = Bundle()
-            bundle.putParcelable(KEY_GROUP_INFO, groupInfo)
-            val fragment = GroupDialogFragment()
-            fragment.arguments = bundle
-            return fragment
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
@@ -20,52 +20,43 @@
 package com.kunzisoft.keepass.activities.dialogs

 import android.app.Dialog
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import android.widget.*
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.*
-import com.kunzisoft.keepass.adapters.TagsProposalAdapter
+import com.kunzisoft.keepass.activities.IconPickerActivity
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.view.DateTimeEditFieldView
-import com.kunzisoft.keepass.view.InheritedCompletionView
-import com.kunzisoft.keepass.view.TagsCompletionView
-import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
-import com.tokenautocomplete.FilteredArrayAdapter
+import com.kunzisoft.keepass.view.ExpirationView
 import org.joda.time.DateTime

-class GroupEditDialogFragment : DatabaseDialogFragment() {
+class GroupEditDialogFragment : DialogFragment() {

-    private val mGroupEditViewModel: GroupEditViewModel by activityViewModels()
+    private var mDatabase: Database? = null

-    private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null
-    private var mEditGroupDialogAction = NONE
+    private var mEditGroupListener: EditGroupListener? = null
+
+    private var mEditGroupDialogAction = EditGroupDialogAction.NONE
    private var mGroupInfo = GroupInfo()
-    private var mGroupNamesNotAllowed: List<String>? = null

    private lateinit var iconButtonView: ImageView
-    private var mIconColor: Int = 0
+    private var iconColor: Int = 0
    private lateinit var nameTextLayoutView: TextInputLayout
    private lateinit var nameTextView: TextView
    private lateinit var notesTextLayoutView: TextInputLayout
    private lateinit var notesTextView: TextView
-    private lateinit var expirationView: DateTimeEditFieldView
-    private lateinit var searchableContainerView: TextInputLayout
-    private lateinit var searchableView: InheritedCompletionView
-    private lateinit var autoTypeContainerView: ViewGroup
-    private lateinit var autoTypeInheritedView: InheritedCompletionView
-    private lateinit var autoTypeSequenceView: TextView
-    private lateinit var tagsContainerView: TextInputLayout
-    private lateinit var tagsCompletionView: TagsCompletionView
-    private var tagsAdapter: FilteredArrayAdapter<String>? = null
+    private lateinit var expirationView: ExpirationView

    enum class EditGroupDialogAction {
        CREATION, UPDATE, NONE;
@@ -77,71 +68,22 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
        }
    }

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        mGroupEditViewModel.onIconSelected.observe(this) { iconImage ->
-            mGroupInfo.icon = iconImage
-            mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
-        }
-
-        mGroupEditViewModel.onDateSelected.observe(this) { viewModelDate ->
-            // Save the date
-            mGroupInfo.expiryTime = DateInstant(
-                DateTime(mGroupInfo.expiryTime.date)
-                    .withYear(viewModelDate.year)
-                    .withMonthOfYear(viewModelDate.month + 1)
-                    .withDayOfMonth(viewModelDate.day)
-                    .toDate())
-            expirationView.dateTime = mGroupInfo.expiryTime
-            if (expirationView.dateTime.type == DateInstant.Type.DATE_TIME) {
-                val instantTime = DateInstant(mGroupInfo.expiryTime.date, DateInstant.Type.TIME)
-                // Trick to recall selection with time
-                mGroupEditViewModel.requestDateTimeSelection(instantTime)
-            }
-        }
-
-        mGroupEditViewModel.onTimeSelected.observe(this) { viewModelTime ->
-            // Save the time
-            mGroupInfo.expiryTime = DateInstant(
-                DateTime(mGroupInfo.expiryTime.date)
-                    .withHourOfDay(viewModelTime.hours)
-                    .withMinuteOfHour(viewModelTime.minutes)
-                    .toDate(), mGroupInfo.expiryTime.type)
-            expirationView.dateTime = mGroupInfo.expiryTime
-        }
-
-        mGroupEditViewModel.groupNamesNotAllowed.observe(this) { namesNotAllowed ->
-            this.mGroupNamesNotAllowed = namesNotAllowed
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            // Instantiate the NoticeDialogListener so we can send events to the host
+            mEditGroupListener = context as EditGroupListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + GroupEditDialogFragment::class.java.name)
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        mPopulateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
-        }
-        mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
-
-        searchableContainerView.visibility = if (database?.allowCustomSearchableGroup() == true) {
-            View.VISIBLE
-        } else {
-            View.GONE
-        }
-
-        if (database?.allowAutoType() == true) {
-            autoTypeContainerView.visibility = View.VISIBLE
-        } else {
-            autoTypeContainerView.visibility = View.GONE
-        }
-
-        tagsAdapter = TagsProposalAdapter(requireContext(), database?.tagPool)
-        tagsCompletionView.apply {
-            threshold = 1
-            setAdapter(tagsAdapter)
-        }
-        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
+    override fun onDetach() {
+        mEditGroupListener = null
+        super.onDetach()
    }

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -153,19 +95,15 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
            notesTextLayoutView = root.findViewById(R.id.group_edit_note_container)
            notesTextView = root.findViewById(R.id.group_edit_note)
            expirationView = root.findViewById(R.id.group_edit_expiration)
-            searchableContainerView = root.findViewById(R.id.group_edit_searchable_container)
-            searchableView = root.findViewById(R.id.group_edit_searchable)
-            autoTypeContainerView = root.findViewById(R.id.group_edit_auto_type_container)
-            autoTypeInheritedView = root.findViewById(R.id.group_edit_auto_type_inherited)
-            autoTypeSequenceView = root.findViewById(R.id.group_edit_auto_type_sequence)
-            tagsContainerView = root.findViewById(R.id.group_tags_label)
-            tagsCompletionView = root.findViewById(R.id.group_tags_completion_view)

            // Retrieve the textColor to tint the icon
            val ta = activity.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-            mIconColor = ta.getColor(0, Color.WHITE)
+            iconColor = ta.getColor(0, Color.WHITE)
            ta.recycle()

+            // Init elements
+            mDatabase = Database.getInstance()
+
            if (savedInstanceState != null
                    && savedInstanceState.containsKey(KEY_ACTION_ID)
                    && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
@@ -182,22 +120,32 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
            }

            // populate info in views
-            populateInfoToViews(mGroupInfo)
-
-            iconButtonView.setOnClickListener { _ ->
-                mGroupEditViewModel.requestIconSelection(mGroupInfo.icon)
-            }
-            expirationView.setOnDateClickListener = { dateInstant ->
-                mGroupEditViewModel.requestDateTimeSelection(dateInstant)
+            populateInfoToViews()
+            expirationView.setOnDateClickListener = {
+                expirationView.expiryTime.date.let { expiresDate ->
+                    val dateTime = DateTime(expiresDate)
+                    val defaultYear = dateTime.year
+                    val defaultMonth = dateTime.monthOfYear-1
+                    val defaultDay = dateTime.dayOfMonth
+                    DatePickerFragment.getInstance(defaultYear, defaultMonth, defaultDay)
+                            .show(parentFragmentManager, "DatePickerFragment")
+                }
            }

            val builder = AlertDialog.Builder(activity)
            builder.setView(root)
                    .setPositiveButton(android.R.string.ok, null)
                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        // Do nothing
+                        retrieveGroupInfoFromViews()
+                        mEditGroupListener?.cancelEditGroup(
+                                mEditGroupDialogAction,
+                                mGroupInfo)
                    }

+            iconButtonView.setOnClickListener { _ ->
+                IconPickerActivity.launch(activity, mGroupInfo.icon)
+            }
+
            return builder.create()
        }
        return super.onCreateDialog(savedInstanceState)
@@ -207,47 +155,40 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
        super.onResume()

        // To prevent auto dismiss
-        val alertDialog = dialog as AlertDialog?
-        if (alertDialog != null) {
-            val positiveButton = alertDialog.getButton(Dialog.BUTTON_POSITIVE) as Button
+        val d = dialog as AlertDialog?
+        if (d != null) {
+            val positiveButton = d.getButton(Dialog.BUTTON_POSITIVE) as Button
            positiveButton.setOnClickListener {
                retrieveGroupInfoFromViews()
                if (isValid()) {
-                    when (mEditGroupDialogAction) {
-                        CREATION ->
-                            mGroupEditViewModel.approveGroupCreation(mGroupInfo)
-                        UPDATE ->
-                            mGroupEditViewModel.approveGroupUpdate(mGroupInfo)
-                        NONE -> {}
-                    }
-                    alertDialog.dismiss()
+                    mEditGroupListener?.approveEditGroup(
+                            mEditGroupDialogAction,
+                            mGroupInfo)
+                    d.dismiss()
                }
            }
        }
    }

-    private fun populateInfoToViews(groupInfo: GroupInfo) {
-        mGroupEditViewModel.selectIcon(groupInfo.icon)
-        nameTextView.text = groupInfo.title
-        notesTextLayoutView.visibility = if (groupInfo.notes == null) View.GONE else View.VISIBLE
-        groupInfo.notes?.let {
+    fun getExpiryTime(): DateInstant {
+        retrieveGroupInfoFromViews()
+        return mGroupInfo.expiryTime
+    }
+
+    fun setExpiryTime(expiryTime: DateInstant) {
+        mGroupInfo.expiryTime = expiryTime
+        populateInfoToViews()
+    }
+
+    private fun populateInfoToViews() {
+        assignIconView()
+        nameTextView.text = mGroupInfo.title
+        notesTextLayoutView.visibility = if (mGroupInfo.notes == null) View.GONE else View.VISIBLE
+        mGroupInfo.notes?.let {
            notesTextView.text = it
        }
-        expirationView.activation = groupInfo.expires
-        expirationView.dateTime = groupInfo.expiryTime
-
-        // Set searchable
-        searchableView.setValue(groupInfo.searchable)
-        // Set auto-type
-        autoTypeInheritedView.setValue(groupInfo.enableAutoType)
-        autoTypeSequenceView.text = groupInfo.defaultAutoTypeSequence
-        // Set Tags
-        groupInfo.tags.let { tags ->
-            tagsCompletionView.setText("")
-            for (i in 0 until tags.size()) {
-                tagsCompletionView.addObjectSync(tags.get(i))
-            }
-        }
+        expirationView.expires = mGroupInfo.expires
+        expirationView.expiryTime = mGroupInfo.expiryTime
    }

    private fun retrieveGroupInfoFromViews() {
@@ -257,12 +198,17 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
        if (newNotes.isNotEmpty()) {
            mGroupInfo.notes = newNotes
        }
-        mGroupInfo.expires = expirationView.activation
-        mGroupInfo.expiryTime = expirationView.dateTime
-        mGroupInfo.searchable = searchableView.getValue()
-        mGroupInfo.enableAutoType = autoTypeInheritedView.getValue()
-        mGroupInfo.defaultAutoTypeSequence = autoTypeSequenceView.text.toString()
-        mGroupInfo.tags = tagsCompletionView.getTags()
+        mGroupInfo.expires = expirationView.expires
+        mGroupInfo.expiryTime = expirationView.expiryTime
+    }
+
+    private fun assignIconView() {
+        mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconButtonView, mGroupInfo.icon, iconColor)
+    }
+
+    fun setIcon(icon: IconImage) {
+        mGroupInfo.icon = icon
+        assignIconView()
    }

    override fun onSaveInstanceState(outState: Bundle) {
@@ -273,36 +219,25 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
    }

    private fun isValid(): Boolean {
-        val name = nameTextView.text.toString()
-        val error = when {
-            name.isEmpty() -> {
-                Error(true, R.string.error_no_name)
-            }
-            mGroupNamesNotAllowed == null -> {
-                Error(true, R.string.error_word_reserved)
-            }
-            mGroupNamesNotAllowed?.find { it.equals(name, ignoreCase = true) } != null -> {
-                Error(true, R.string.error_word_reserved)
-            }
-            else -> {
-                Error(false, null)
-            }
+        if (nameTextView.text.toString().isEmpty()) {
+            nameTextLayoutView.error = getString(R.string.error_no_name)
+            return false
        }
-        error.messageId?.let { messageId ->
-            nameTextLayoutView.error = getString(messageId)
-        } ?: kotlin.run {
-            nameTextLayoutView.error = null
-        }
-        return !error.isError
+        return true
    }

-    data class Error(val isError: Boolean, val messageId: Int?)
+    interface EditGroupListener {
+        fun approveEditGroup(action: EditGroupDialogAction,
+                             groupInfo: GroupInfo)
+        fun cancelEditGroup(action: EditGroupDialogAction,
+                            groupInfo: GroupInfo)
+    }

    companion object {

        const val TAG_CREATE_GROUP = "TAG_CREATE_GROUP"
-        private const val KEY_ACTION_ID = "KEY_ACTION_ID"
-        private const val KEY_GROUP_INFO = "KEY_GROUP_INFO"
+        const val KEY_ACTION_ID = "KEY_ACTION_ID"
+        const val KEY_GROUP_INFO = "KEY_GROUP_INFO"

        fun create(groupInfo: GroupInfo): GroupEditDialogFragment {
            val bundle = Bundle()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
@@ -1,126 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
-import com.google.android.material.textfield.TextInputLayout
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
-
-class IconEditDialogFragment : DatabaseDialogFragment() {
-
-    private val mIconPickerViewModel: IconPickerViewModel by activityViewModels()
-
-    private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null
-    private lateinit var iconView: ImageView
-    private lateinit var nameTextLayoutView: TextInputLayout
-    private lateinit var nameTextView: TextView
-
-    private var mCustomIcon: IconImageCustom? = null
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-        mPopulateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon)
-        }
-        mCustomIcon?.let { customIcon ->
-            populateViewsWithCustomIcon(customIcon)
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_icon_edit, null)
-            iconView = root.findViewById(R.id.icon_edit_image)
-            nameTextLayoutView = root.findViewById(R.id.icon_edit_name_container)
-            nameTextView = root.findViewById(R.id.icon_edit_name)
-
-            if (savedInstanceState != null
-                    && savedInstanceState.containsKey(KEY_CUSTOM_ICON_ID)) {
-                mCustomIcon = savedInstanceState.getParcelable(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
-            } else {
-                arguments?.apply {
-                    if (containsKey(KEY_CUSTOM_ICON_ID)) {
-                        mCustomIcon = getParcelable(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
-                    }
-                }
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        retrieveIconInfoFromViews()
-                        mCustomIcon?.let { customIcon ->
-                            mIconPickerViewModel.updateCustomIcon(
-                                IconPickerViewModel.IconCustomState(customIcon, false)
-                            )
-                        }
-                    }
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        // Do nothing
-                        mIconPickerViewModel.updateCustomIcon(
-                            IconPickerViewModel.IconCustomState(null, false)
-                        )
-                    }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    private fun populateViewsWithCustomIcon(customIcon: IconImageCustom) {
-        mPopulateIconMethod?.invoke(iconView, customIcon.getIconImageToDraw())
-        nameTextView.text = customIcon.name
-    }
-
-    private fun retrieveIconInfoFromViews() {
-        mCustomIcon?.name = nameTextView.text.toString()
-        mCustomIcon?.lastModificationTime = DateInstant()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        retrieveIconInfoFromViews()
-        outState.putParcelable(KEY_CUSTOM_ICON_ID, mCustomIcon)
-        super.onSaveInstanceState(outState)
-    }
-
-    companion object {
-
-        const val TAG_UPDATE_ICON = "TAG_UPDATE_ICON"
-        const val KEY_CUSTOM_ICON_ID = "KEY_CUSTOM_ICON_ID"
-
-        fun update(customIcon: IconImageCustom): IconEditDialogFragment {
-            val bundle = Bundle()
-            bundle.putParcelable(KEY_CUSTOM_ICON_ID, IconImageCustom(customIcon))
-            val fragment = IconEditDialogFragment()
-            fragment.arguments = bundle
-            return fragment
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt
@@ -1,126 +0,0 @@
-/*
- * Copyright 2022 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.view.MainCredentialView
-
-class MainCredentialDialogFragment : DatabaseDialogFragment() {
-
-    private var mainCredentialView: MainCredentialView? = null
-
-    private var mListener: AskMainCredentialDialogListener? = null
-
-    private var mExternalFileHelper: ExternalFileHelper? = null
-
-    interface AskMainCredentialDialogListener {
-        fun onAskMainCredentialDialogPositiveClick(databaseUri: Uri?, mainCredential: MainCredential)
-        fun onAskMainCredentialDialogNegativeClick(databaseUri: Uri?, mainCredential: MainCredential)
-    }
-
-    override fun onAttach(activity: Context) {
-        super.onAttach(activity)
-        try {
-            mListener = activity as AskMainCredentialDialogListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(activity.toString()
-                    + " must implement " + AskMainCredentialDialogListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-
-            var databaseUri: Uri? = null
-            arguments?.apply {
-                if (containsKey(KEY_ASK_CREDENTIAL_URI))
-                    databaseUri = getParcelable(KEY_ASK_CREDENTIAL_URI)
-            }
-
-            val builder = AlertDialog.Builder(activity)
-
-            val root = activity.layoutInflater.inflate(R.layout.fragment_main_credential, null)
-            mainCredentialView = root.findViewById(R.id.main_credential_view)
-            databaseUri?.let {
-                root.findViewById<TextView>(R.id.title_database)?.text =
-                    UriUtil.getFileData(requireContext(), it)?.name
-            }
-            builder.setView(root)
-                    // Add action buttons
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        mListener?.onAskMainCredentialDialogPositiveClick(
-                            databaseUri,
-                            retrieveMainCredential()
-                        )
-                    }
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        mListener?.onAskMainCredentialDialogNegativeClick(
-                            databaseUri,
-                            retrieveMainCredential()
-                        )
-                    }
-
-
-            mExternalFileHelper = ExternalFileHelper(this)
-            mExternalFileHelper?.buildOpenDocument { uri ->
-                if (uri != null) {
-                    mainCredentialView?.populateKeyFileTextView(uri)
-                }
-            }
-            mainCredentialView?.setOpenKeyfileClickListener(mExternalFileHelper)
-
-            return builder.create()
-        }
-
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    private fun retrieveMainCredential(): MainCredential {
-        return mainCredentialView?.getMainCredential() ?: MainCredential()
-    }
-
-    companion object {
-
-        private const val KEY_ASK_CREDENTIAL_URI = "KEY_ASK_CREDENTIAL_URI"
-        const val TAG_ASK_MAIN_CREDENTIAL = "TAG_ASK_MAIN_CREDENTIAL"
-
-        fun getInstance(uri: Uri?): MainCredentialDialogFragment {
-            val fragment = MainCredentialDialogFragment()
-            val args = Bundle()
-            args.putParcelable(KEY_ASK_CREDENTIAL_URI, uri)
-            fragment.arguments = args
-            return fragment
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
@@ -19,11 +19,11 @@
 */
 package com.kunzisoft.keepass.activities.dialogs

+import android.app.AlertDialog
 import android.app.Dialog
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.MainCredential
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
@@ -25,13 +25,14 @@ import android.net.Uri
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Attachment

 /**
 * Custom Dialog to confirm big file to upload
 */
-class ReplaceFileDialogFragment : DatabaseDialogFragment() {
+class ReplaceFileDialogFragment : DialogFragment() {

    private var mActionChooseListener: ActionChooseListener? = null

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
@@ -31,6 +31,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
@@ -48,7 +49,7 @@ import com.kunzisoft.keepass.otp.TokenCalculator
 import com.kunzisoft.keepass.utils.UriUtil
 import java.util.*

-class SetOTPDialogFragment : DatabaseDialogFragment() {
+class SetOTPDialogFragment : DialogFragment() {

    private var mCreateOTPElementListener: CreateOtpListener? = null

@@ -79,15 +80,11 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
    private var mOnFocusChangeListener = View.OnFocusChangeListener { _, isFocus ->
        if (!isFocus)
            mManualEvent = true
-        else
-            resetAppTimeout()
    }
-    @SuppressLint("ClickableViewAccessibility")
    private var mOnTouchListener = View.OnTouchListener { _, event ->
        when (event.action) {
            MotionEvent.ACTION_DOWN -> {
                mManualEvent = true
-                resetAppTimeout()
            }
        }
        false
@@ -98,10 +95,6 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
    private var mPeriodWellFormed = false
    private var mDigitsWellFormed = false

-    override fun overrideTimeoutTouchAndFocusEvents(): Boolean {
-        return true
-    }
-
    override fun onAttach(context: Context) {
        super.onAttach(context)
        // Verify that the host activity implements the callback interface
@@ -232,11 +225,8 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
            val builder = AlertDialog.Builder(activity)
            builder.apply {
                setView(root)
-                        .setPositiveButton(android.R.string.ok) { _, _ ->
-                            resetAppTimeout()
-                        }
+                        .setPositiveButton(android.R.string.ok) {_, _ -> }
                        .setNegativeButton(android.R.string.cancel) { _, _ ->
-                            resetAppTimeout()
                        }
            }

@@ -309,7 +299,7 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
            override fun afterTextChanged(s: Editable?) {
                s?.toString()?.let { userString ->
                    try {
-                        mOtpElement.setBase32Secret(userString.uppercase(Locale.ENGLISH))
+                        mOtpElement.setBase32Secret(userString.toUpperCase(Locale.ENGLISH))
                        otpSecretContainer?.error = null
                    } catch (exception: Exception) {
                        otpSecretContainer?.error = getString(R.string.error_otp_secret_key)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
@@ -22,15 +22,16 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import androidx.annotation.IdRes
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.widget.CompoundButton
 import android.widget.RadioGroup
-import androidx.annotation.IdRes
-import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.SortNodeEnum

-class SortDialogFragment : DatabaseDialogFragment() {
+class SortDialogFragment : DialogFragment() {

    private var mListener: SortSelectionListener? = null

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.text.format.DateFormat
 import androidx.fragment.app.DialogFragment

-// Not as DatabaseDialogFragment because crash on KitKat
 class TimePickerFragment : DialogFragment() {

    private var defaultHour: Int = 0
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/DatabaseFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/DatabaseFragment.kt
@@ -1,51 +0,0 @@
-package com.kunzisoft.keepass.activities.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.activityViewModels
-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.element.Database
-import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
-
-abstract class DatabaseFragment : StylishFragment(), DatabaseRetrieval {
-
-    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    protected var mDatabase: Database? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        mDatabaseViewModel.database.observe(viewLifecycleOwner) { database ->
-            if (mDatabase == null || mDatabase != database) {
-                this.mDatabase = database
-                onDatabaseRetrieved(database)
-            }
-        }
-
-        mDatabaseViewModel.actionFinished.observe(viewLifecycleOwner) { result ->
-            onDatabaseActionFinished(result.database, result.actionTask, result.result)
-        }
-    }
-
-    protected fun resetAppTimeoutWhenViewFocusedOrChanged(view: View?) {
-        context?.let {
-            view?.resetAppTimeoutWhenViewTouchedOrFocused(it, mDatabase?.loaded)
-        }
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        // Can be overridden by a subclass
-    }
-
-    protected fun buildNewBinaryAttachment(): BinaryData? {
-        return mDatabase?.buildNewBinaryAttachment()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
@@ -19,301 +19,431 @@
 */
 package com.kunzisoft.keepass.activities.fragments

+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.ImageView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.ReplaceFileDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
+import com.kunzisoft.keepass.activities.EntryEditActivity
+import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
-import com.kunzisoft.keepass.adapters.TagsProposalAdapter
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.template.Template
-import com.kunzisoft.keepass.model.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachmentState
-import com.kunzisoft.keepass.model.EntryInfo
-import com.kunzisoft.keepass.model.StreamDirection
-import com.kunzisoft.keepass.view.*
-import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
-import com.tokenautocomplete.FilteredArrayAdapter
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.education.EntryEditActivityEducation
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+import com.kunzisoft.keepass.model.*
+import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.ExpirationView
+import com.kunzisoft.keepass.view.applyFontVisibility
+import com.kunzisoft.keepass.view.collapse
+import com.kunzisoft.keepass.view.expand

+class EntryEditFragment: StylishFragment() {

-class EntryEditFragment: DatabaseFragment() {
-
-    private val mEntryEditViewModel: EntryEditViewModel by activityViewModels()
-
-    private lateinit var rootView: View
-    private lateinit var templateView: TemplateEditView
-    private lateinit var attachmentsContainerView: ViewGroup
+    private lateinit var entryTitleLayoutView: TextInputLayout
+    private lateinit var entryTitleView: EditText
+    private lateinit var entryIconView: ImageView
+    private lateinit var entryUserNameView: EditText
+    private lateinit var entryUrlView: EditText
+    private lateinit var entryPasswordLayoutView: TextInputLayout
+    private lateinit var entryPasswordView: EditText
+    private lateinit var entryPasswordGeneratorView: View
+    private lateinit var entryExpirationView: ExpirationView
+    private lateinit var entryNotesView: EditText
+    private lateinit var extraFieldsContainerView: View
+    private lateinit var extraFieldsListView: ViewGroup
+    private lateinit var attachmentsContainerView: View
    private lateinit var attachmentsListView: RecyclerView
-    private var attachmentsAdapter: EntryAttachmentsItemsAdapter? = null
-    private lateinit var tagsContainerView: TextInputLayout
-    private lateinit var tagsCompletionView: TagsCompletionView
-    private var tagsAdapter: FilteredArrayAdapter<String>? = null

-    private var mTemplate: Template? = null
-    private var mAllowMultipleAttachments: Boolean = false
+    private lateinit var attachmentsAdapter: EntryAttachmentsItemsAdapter

-    private var mIconColor: Int = 0
+    private var fontInVisibility: Boolean = false
+    private var iconColor: Int = 0

-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+    var drawFactory: IconDrawableFactory? = null
+    var setOnDateClickListener: (() -> Unit)? = null
+    var setOnPasswordGeneratorClickListener: View.OnClickListener? = null
+    var setOnIconViewClickListener: ((IconImage) -> Unit)? = null
+    var setOnEditCustomField: ((Field) -> Unit)? = null
+    var setOnRemoveAttachment: ((Attachment) -> Unit)? = null
+
+    // Elements to modify the current entry
+    private var mEntryInfo = EntryInfo()
+    private var mLastFocusedEditField: FocusedEditField? = null
+    private var mExtraViewToRequestFocus: EditText? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)

-        // Retrieve the textColor to tint the icon
-        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        mIconColor = taIconColor?.getColor(0, Color.BLACK) ?: Color.BLACK
-        taIconColor?.recycle()
+        val rootView = inflater.cloneInContext(contextThemed)
+            .inflate(R.layout.fragment_entry_edit_contents, container, false)

-        return inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_entry_edit, container, false)
-    }
+        fontInVisibility = PreferencesUtil.fieldFontIsInVisibility(requireContext())

-    override fun onViewCreated(view: View,
-                               savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        rootView = view
-        // Hide only the first time
-        if (savedInstanceState == null) {
-            view.isVisible = false
+        entryTitleLayoutView = rootView.findViewById(R.id.entry_edit_container_title)
+        entryTitleView = rootView.findViewById(R.id.entry_edit_title)
+        entryIconView = rootView.findViewById(R.id.entry_edit_icon_button)
+        entryIconView.setOnClickListener {
+            setOnIconViewClickListener?.invoke(mEntryInfo.icon)
        }
-        templateView = view.findViewById(R.id.template_view)
-        attachmentsContainerView = view.findViewById(R.id.entry_attachments_container)
-        attachmentsListView = view.findViewById(R.id.entry_attachments_list)
-        tagsContainerView = view.findViewById(R.id.entry_tags_label)
-        tagsCompletionView = view.findViewById(R.id.entry_tags_completion_view)

+        entryUserNameView = rootView.findViewById(R.id.entry_edit_user_name)
+        entryUrlView = rootView.findViewById(R.id.entry_edit_url)
+        entryPasswordLayoutView = rootView.findViewById(R.id.entry_edit_container_password)
+        entryPasswordView = rootView.findViewById(R.id.entry_edit_password)
+        entryPasswordGeneratorView = rootView.findViewById(R.id.entry_edit_password_generator_button)
+        entryPasswordGeneratorView.setOnClickListener {
+            setOnPasswordGeneratorClickListener?.onClick(it)
+        }
+        entryExpirationView = rootView.findViewById(R.id.entry_edit_expiration)
+        entryExpirationView.setOnDateClickListener = setOnDateClickListener
+
+        entryNotesView = rootView.findViewById(R.id.entry_edit_notes)
+
+        extraFieldsContainerView = rootView.findViewById(R.id.extra_fields_container)
+        extraFieldsListView = rootView.findViewById(R.id.extra_fields_list)
+
+        attachmentsContainerView = rootView.findViewById(R.id.entry_attachments_container)
+        attachmentsListView = rootView.findViewById(R.id.entry_attachments_list)
        attachmentsAdapter = EntryAttachmentsItemsAdapter(requireContext())
-        attachmentsListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            adapter = attachmentsAdapter
-            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-        }
-
-        templateView.apply {
-            setOnIconClickListener {
-                mEntryEditViewModel.requestIconSelection(templateView.getIcon())
-            }
-            setOnBackgroundColorClickListener {
-                mEntryEditViewModel.requestBackgroundColorSelection(templateView.getBackgroundColor())
-            }
-            setOnForegroundColorClickListener {
-                mEntryEditViewModel.requestForegroundColorSelection(templateView.getForegroundColor())
-            }
-            setOnCustomEditionActionClickListener { field ->
-                mEntryEditViewModel.requestCustomFieldEdition(field)
-            }
-            setOnPasswordGenerationActionClickListener { field ->
-                mEntryEditViewModel.requestPasswordSelection(field)
-            }
-            setOnDateInstantClickListener { dateInstant ->
-                mEntryEditViewModel.requestDateTimeSelection(dateInstant)
-            }
-        }
-
-        if (savedInstanceState != null) {
-            val attachments: List<Attachment> =
-                savedInstanceState.getParcelableArrayList(ATTACHMENTS_TAG) ?: listOf()
-            setAttachments(attachments)
-        }
-
-        mEntryEditViewModel.onTemplateChanged.observe(viewLifecycleOwner) { template ->
-            this.mTemplate = template
-            templateView.setTemplate(template)
-        }
-
-        mEntryEditViewModel.templatesEntry.observe(viewLifecycleOwner) { templateEntry ->
-            if (templateEntry != null) {
-                val selectedTemplate = if (mTemplate != null)
-                    mTemplate
-                else
-                    templateEntry.defaultTemplate
-                templateView.setTemplate(selectedTemplate)
-                // Load entry info only the first time to keep change locally
-                if (savedInstanceState == null) {
-                    assignEntryInfo(templateEntry.entryInfo)
-                }
-                // To prevent flickering
-                rootView.showByFading()
-                // Apply timeout reset
-                resetAppTimeoutWhenViewFocusedOrChanged(rootView)
-            }
-        }
-
-        mEntryEditViewModel.requestEntryInfoUpdate.observe(viewLifecycleOwner) {
-            val entryInfo = retrieveEntryInfo()
-            mEntryEditViewModel.saveEntryInfo(it.database, it.entry, it.parent, entryInfo)
-        }
-
-        mEntryEditViewModel.onIconSelected.observe(viewLifecycleOwner) { iconImage ->
-            templateView.setIcon(iconImage)
-        }
-
-        mEntryEditViewModel.onBackgroundColorSelected.observe(viewLifecycleOwner) { color ->
-            templateView.setBackgroundColor(color)
-        }
-
-        mEntryEditViewModel.onForegroundColorSelected.observe(viewLifecycleOwner) { color ->
-            templateView.setForegroundColor(color)
-        }
-
-        mEntryEditViewModel.onPasswordSelected.observe(viewLifecycleOwner) { passwordField ->
-            templateView.setPasswordField(passwordField)
-        }
-
-        mEntryEditViewModel.onDateSelected.observe(viewLifecycleOwner) { viewModelDate ->
-            // Save the date
-            templateView.setCurrentDateTimeValue(viewModelDate)
-        }
-
-        mEntryEditViewModel.onTimeSelected.observe(viewLifecycleOwner) { viewModelTime ->
-            // Save the time
-            templateView.setCurrentTimeValue(viewModelTime)
-        }
-
-        mEntryEditViewModel.onCustomFieldEdited.observe(viewLifecycleOwner) { fieldAction ->
-            val oldField = fieldAction.oldField
-            val newField = fieldAction.newField
-            // Field to add
-            if (oldField == null) {
-                newField?.let {
-                    if (!templateView.putCustomField(it)) {
-                        mEntryEditViewModel.showCustomFieldEditionError()
-                    }
-                }
-            }
-            // Field to replace
-            oldField?.let {
-                newField?.let {
-                    if (!templateView.replaceCustomField(oldField, newField)) {
-                        mEntryEditViewModel.showCustomFieldEditionError()
-                    }
-                }
-            }
-            // Field to remove
-            if (newField == null) {
-                oldField?.let {
-                    templateView.removeCustomField(it)
-                }
-            }
-        }
-
-        mEntryEditViewModel.requestSetupOtp.observe(viewLifecycleOwner) {
-            // Retrieve the current otpElement if exists
-            // and open the dialog to set up the OTP
-            SetOTPDialogFragment.build(templateView.getEntryInfo().otpModel)
-                .show(parentFragmentManager, "addOTPDialog")
-        }
-
-        mEntryEditViewModel.onOtpCreated.observe(viewLifecycleOwner) {
-            // Update the otp field with otpauth:// url
-            templateView.putOtpElement(it)
-        }
-
-        mEntryEditViewModel.onBuildNewAttachment.observe(viewLifecycleOwner) {
-            val attachmentToUploadUri = it.attachmentToUploadUri
-            val fileName = it.fileName
-
-            buildNewBinaryAttachment()?.let { binaryAttachment ->
-                val entryAttachment = Attachment(fileName, binaryAttachment)
-                // Ask to replace the current attachment
-                if ((!mAllowMultipleAttachments
-                            && containsAttachment()) ||
-                    containsAttachment(EntryAttachmentState(entryAttachment, StreamDirection.UPLOAD))) {
-                    ReplaceFileDialogFragment.build(attachmentToUploadUri, entryAttachment)
-                        .show(parentFragmentManager, "replacementFileFragment")
-                } else {
-                    mEntryEditViewModel.startUploadAttachment(attachmentToUploadUri, entryAttachment)
-                }
-            }
-        }
-
-        mEntryEditViewModel.onAttachmentAction.observe(viewLifecycleOwner) { entryAttachmentState ->
-            when (entryAttachmentState?.downloadState) {
-                AttachmentState.START -> {
-                    putAttachment(entryAttachmentState)
-                    getAttachmentViewPosition(entryAttachmentState) { attachment, position ->
-                        mEntryEditViewModel.binaryPreviewLoaded(attachment, position)
-                    }
-                }
-                AttachmentState.IN_PROGRESS -> {
-                    putAttachment(entryAttachmentState)
-                }
-                AttachmentState.COMPLETE -> {
-                    putAttachment(entryAttachmentState) { entryAttachment ->
-                        getAttachmentViewPosition(entryAttachment) { attachment, position ->
-                            mEntryEditViewModel.binaryPreviewLoaded(attachment, position)
-                        }
-                    }
-                    mEntryEditViewModel.onAttachmentAction(null)
-                }
-                AttachmentState.CANCELED,
-                AttachmentState.ERROR -> {
-                    removeAttachment(entryAttachmentState)
-                    mEntryEditViewModel.onAttachmentAction(null)
-                }
-                else -> {}
-            }
-        }
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-
-        templateView.populateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
-        }
-
-        mAllowMultipleAttachments = database?.allowMultipleAttachments == true
-
-        attachmentsAdapter?.database = database
-        attachmentsAdapter?.onListSizeChangedListener = { previousSize, newSize ->
+        // TODO retrieve current database with its unique key
+        attachmentsAdapter.database = Database.getInstance()
+        //attachmentsAdapter.database = arguments?.getInt(KEY_DATABASE)
+        attachmentsAdapter.onListSizeChangedListener = { previousSize, newSize ->
            if (previousSize > 0 && newSize == 0) {
                attachmentsContainerView.collapse(true)
            } else if (previousSize == 0 && newSize == 1) {
                attachmentsContainerView.expand(true)
            }
        }
-
-        tagsAdapter = TagsProposalAdapter(requireContext(), database?.tagPool)
-        tagsCompletionView.apply {
-            threshold = 1
-            setAdapter(tagsAdapter)
+        attachmentsListView.apply {
+            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            adapter = attachmentsAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
        }
-        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        iconColor = taIconColor?.getColor(0, Color.WHITE) ?: Color.WHITE
+        taIconColor?.recycle()
+
+        rootView?.resetAppTimeoutWhenViewFocusedOrChanged(requireContext())
+
+        // Retrieve the new entry after an orientation change
+        if (arguments?.containsKey(KEY_TEMP_ENTRY_INFO) == true)
+            mEntryInfo = arguments?.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        else if (savedInstanceState?.containsKey(KEY_TEMP_ENTRY_INFO) == true) {
+            mEntryInfo = savedInstanceState.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        }
+
+        if (savedInstanceState?.containsKey(KEY_LAST_FOCUSED_FIELD) == true) {
+            mLastFocusedEditField = savedInstanceState.getParcelable(KEY_LAST_FOCUSED_FIELD) ?: mLastFocusedEditField
+        }
+
+        populateViewsWithEntry()
+
+        return rootView
    }

-    private fun assignEntryInfo(entryInfo: EntryInfo?) {
-        // Populate entry views
-        templateView.setEntryInfo(entryInfo)
+    override fun onDetach() {
+        super.onDetach()

-        // Set Tags
-        entryInfo?.tags?.let { tags ->
-            tagsCompletionView.setText("")
-            for (i in 0 until tags.size()) {
-                tagsCompletionView.addObjectSync(tags.get(i))
+        drawFactory = null
+        setOnDateClickListener = null
+        setOnPasswordGeneratorClickListener = null
+        setOnIconViewClickListener = null
+        setOnRemoveAttachment = null
+        setOnEditCustomField = null
+    }
+
+    fun getEntryInfo(): EntryInfo {
+        populateEntryWithViews()
+        return mEntryInfo
+    }
+
+    fun generatePasswordEducationPerformed(entryEditActivityEducation: EntryEditActivityEducation): Boolean {
+        return entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+                entryPasswordGeneratorView,
+                {
+                    GeneratePasswordDialogFragment().show(parentFragmentManager, "PasswordGeneratorFragment")
+                },
+                {
+                    try {
+                        (activity as? EntryEditActivity?)?.performedNextEducation(entryEditActivityEducation)
+                    } catch (ignore: Exception) {}
+                }
+        )
+    }
+
+    private fun populateViewsWithEntry() {
+        // Set info in view
+        icon = mEntryInfo.icon
+        title = mEntryInfo.title
+        username = mEntryInfo.username
+        url = mEntryInfo.url
+        password = mEntryInfo.password
+        expires = mEntryInfo.expires
+        expiryTime = mEntryInfo.expiryTime
+        notes = mEntryInfo.notes
+        assignExtraFields(mEntryInfo.customFields) { fields ->
+            setOnEditCustomField?.invoke(fields)
+        }
+        assignAttachments(mEntryInfo.attachments, StreamDirection.UPLOAD) { attachment ->
+            setOnRemoveAttachment?.invoke(attachment)
+        }
+    }
+
+    private fun populateEntryWithViews() {
+        // Icon already populate
+        mEntryInfo.title = title
+        mEntryInfo.username = username
+        mEntryInfo.url = url
+        mEntryInfo.password = password
+        mEntryInfo.expires = expires
+        mEntryInfo.expiryTime = expiryTime
+        mEntryInfo.notes = notes
+        mEntryInfo.customFields = getExtraFields()
+        mEntryInfo.otpModel = OtpEntryFields.parseFields { key ->
+            getExtraFields().firstOrNull { it.name == key }?.protectedValue?.toString()
+        }?.otpModel
+        mEntryInfo.attachments = getAttachments()
+    }
+
+    var title: String
+        get() {
+            return entryTitleView.text.toString()
+        }
+        set(value) {
+            entryTitleView.setText(value)
+            if (fontInVisibility)
+                entryTitleView.applyFontVisibility()
+        }
+
+    var icon: IconImage
+        get() {
+            return mEntryInfo.icon
+        }
+        set(value) {
+            mEntryInfo.icon = value
+            drawFactory?.assignDatabaseIcon(entryIconView, value, iconColor)
+        }
+
+    var username: String
+        get() {
+            return entryUserNameView.text.toString()
+        }
+        set(value) {
+            entryUserNameView.setText(value)
+            if (fontInVisibility)
+                entryUserNameView.applyFontVisibility()
+        }
+
+    var url: String
+        get() {
+            return entryUrlView.text.toString()
+        }
+        set(value) {
+            entryUrlView.setText(value)
+            if (fontInVisibility)
+                entryUrlView.applyFontVisibility()
+        }
+
+    var password: String
+        get() {
+            return entryPasswordView.text.toString()
+        }
+        set(value) {
+            entryPasswordView.setText(value)
+            if (fontInVisibility) {
+                entryPasswordView.applyFontVisibility()
            }
        }

-        // Manage attachments
-        setAttachments(entryInfo?.attachments ?: listOf())
+    var expires: Boolean
+        get() {
+            return entryExpirationView.expires
+        }
+        set(value) {
+            entryExpirationView.expires = value
+        }
+
+    var expiryTime: DateInstant
+        get() {
+            return entryExpirationView.expiryTime
+        }
+        set(value) {
+            entryExpirationView.expiryTime = value
+        }
+
+    var notes: String
+        get() {
+            return entryNotesView.text.toString()
+        }
+        set(value) {
+            entryNotesView.setText(value)
+            if (fontInVisibility)
+                entryNotesView.applyFontVisibility()
+        }
+
+    /* -------------
+     * Extra Fields
+     * -------------
+     */
+
+    private var mExtraFieldsList: MutableList<Field> = ArrayList()
+    private var mOnEditButtonClickListener: ((item: Field)->Unit)? = null
+
+    private fun buildViewFromField(extraField: Field): View? {
+        val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
+        val itemView: View? = inflater?.inflate(R.layout.item_entry_edit_extra_field, extraFieldsListView, false)
+        itemView?.id = View.NO_ID
+
+        val extraFieldValueContainer: TextInputLayout? = itemView?.findViewById(R.id.entry_extra_field_value_container)
+        extraFieldValueContainer?.endIconMode = if (extraField.protectedValue.isProtected)
+             TextInputLayout.END_ICON_PASSWORD_TOGGLE else TextInputLayout.END_ICON_NONE
+        extraFieldValueContainer?.hint = extraField.name
+        extraFieldValueContainer?.id = View.NO_ID
+
+        val extraFieldValue: TextInputEditText? = itemView?.findViewById(R.id.entry_extra_field_value)
+        extraFieldValue?.apply {
+            if (extraField.protectedValue.isProtected) {
+                inputType = extraFieldValue.inputType or EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
+            }
+            setText(extraField.protectedValue.toString())
+            if (fontInVisibility)
+                applyFontVisibility()
+        }
+        extraFieldValue?.id = View.NO_ID
+        extraFieldValue?.tag = "FIELD_VALUE_TAG"
+        if (mLastFocusedEditField?.field == extraField) {
+            mExtraViewToRequestFocus = extraFieldValue
+        }
+
+        val extraFieldEditButton: View? = itemView?.findViewById(R.id.entry_extra_field_edit)
+        extraFieldEditButton?.setOnClickListener {
+            mOnEditButtonClickListener?.invoke(extraField)
+        }
+        extraFieldEditButton?.id = View.NO_ID
+
+        return itemView
    }

-    private fun retrieveEntryInfo(): EntryInfo {
-        val entryInfo = templateView.getEntryInfo()
-        entryInfo.tags = tagsCompletionView.getTags()
-        entryInfo.attachments = getAttachments().toMutableList()
-        return entryInfo
+    fun getExtraFields(): List<Field> {
+        mLastFocusedEditField = null
+        for (index in 0 until extraFieldsListView.childCount) {
+            val extraFieldValue: EditText = extraFieldsListView.getChildAt(index)
+                    .findViewWithTag("FIELD_VALUE_TAG")
+            val extraField = mExtraFieldsList[index]
+            extraField.protectedValue.stringValue = extraFieldValue.text?.toString() ?: ""
+            if (extraFieldValue.isFocused) {
+                mLastFocusedEditField = FocusedEditField().apply {
+                    field = extraField
+                    cursorSelectionStart = extraFieldValue.selectionStart
+                    cursorSelectionEnd = extraFieldValue.selectionEnd
+                }
+            }
+        }
+        return mExtraFieldsList
+    }
+
+    /**
+     * Remove all children and add new views for each field
+     */
+    fun assignExtraFields(fields: List<Field>,
+                          onEditButtonClickListener: ((item: Field)->Unit)?) {
+        extraFieldsContainerView.visibility = if (fields.isEmpty()) View.GONE else View.VISIBLE
+        // Reinit focused field
+        mExtraFieldsList.clear()
+        mExtraFieldsList.addAll(fields)
+        extraFieldsListView.removeAllViews()
+        fields.forEach {
+            extraFieldsListView.addView(buildViewFromField(it))
+        }
+        // Request last focus
+        mLastFocusedEditField?.let { focusField ->
+            mExtraViewToRequestFocus?.apply {
+                requestFocus()
+                setSelection(focusField.cursorSelectionStart,
+                                focusField.cursorSelectionEnd)
+            }
+        }
+        mLastFocusedEditField = null
+        mOnEditButtonClickListener = onEditButtonClickListener
+    }
+
+    /**
+     * Update an extra field or create a new one if doesn't exists, the old value is lost
+     */
+    fun putExtraField(extraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val oldField = mExtraFieldsList.firstOrNull { it.name == extraField.name }
+        oldField?.let {
+            val index = mExtraFieldsList.indexOf(oldField)
+            mExtraFieldsList.removeAt(index)
+            mExtraFieldsList.add(index, extraField)
+            extraFieldsListView.removeViewAt(index)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView, index)
+            newView?.requestFocus()
+        } ?: kotlin.run {
+            mExtraFieldsList.add(extraField)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView)
+            newView?.requestFocus()
+        }
+    }
+
+    /**
+     * Update an extra field and keep the old value
+     */
+    fun replaceExtraField(oldExtraField: Field, newExtraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        val oldValueEditText: EditText = extraFieldsListView.getChildAt(index)
+                .findViewWithTag("FIELD_VALUE_TAG")
+        val oldValue = oldValueEditText.text.toString()
+        val newExtraFieldWithOldValue = Field(newExtraField).apply {
+            this.protectedValue.stringValue = oldValue
+        }
+        mExtraFieldsList.removeAt(index)
+        mExtraFieldsList.add(index, newExtraFieldWithOldValue)
+        extraFieldsListView.removeViewAt(index)
+        val newView = buildViewFromField(newExtraFieldWithOldValue)
+        extraFieldsListView.addView(newView, index)
+        newView?.requestFocus()
+    }
+
+    fun removeExtraField(oldExtraField: Field) {
+        val previousSize = mExtraFieldsList.size
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        extraFieldsListView.getChildAt(index)?.let {
+            it.collapse(true) {
+                mExtraFieldsList.removeAt(index)
+                extraFieldsListView.removeViewAt(index)
+                val newSize = mExtraFieldsList.size
+
+                if (previousSize > 0 && newSize == 0) {
+                    extraFieldsContainerView.collapse(true)
+                } else if (previousSize == 0 && newSize == 1) {
+                    extraFieldsContainerView.expand(true)
+                }
+            }
+        }
    }

    /* -------------
@@ -321,84 +451,78 @@ class EntryEditFragment: DatabaseFragment() {
     * -------------
     */

-    private fun getAttachments(): List<Attachment> {
-        return attachmentsAdapter?.itemsList?.map { it.attachment } ?: listOf()
+    fun getAttachments(): List<Attachment> {
+        return attachmentsAdapter.itemsList.map { it.attachment }
    }

-    private fun setAttachments(attachments: List<Attachment>) {
+    fun assignAttachments(attachments: List<Attachment>,
+                          streamDirection: StreamDirection,
+                          onDeleteItem: (attachment: Attachment)->Unit) {
        attachmentsContainerView.visibility = if (attachments.isEmpty()) View.GONE else View.VISIBLE
-        attachmentsAdapter?.assignItems(attachments.map {
-            EntryAttachmentState(it, StreamDirection.UPLOAD)
-        })
-        attachmentsAdapter?.onDeleteButtonClickListener = { item ->
-            val attachment = item.attachment
-            removeAttachment(EntryAttachmentState(attachment, StreamDirection.DOWNLOAD))
-            mEntryEditViewModel.deleteAttachment(attachment)
+        attachmentsAdapter.assignItems(attachments.map { EntryAttachmentState(it, streamDirection) })
+        attachmentsAdapter.onDeleteButtonClickListener = { item ->
+            onDeleteItem.invoke(item.attachment)
        }
    }

-    private fun containsAttachment(): Boolean {
-        return attachmentsAdapter?.isEmpty() != true
+    fun containsAttachment(): Boolean {
+        return !attachmentsAdapter.isEmpty()
    }

-    private fun containsAttachment(attachment: EntryAttachmentState): Boolean {
-        return attachmentsAdapter?.contains(attachment) ?: false
+    fun containsAttachment(attachment: EntryAttachmentState): Boolean {
+        return attachmentsAdapter.contains(attachment)
    }

-    private fun putAttachment(attachment: EntryAttachmentState,
-                              onPreviewLoaded: ((attachment: EntryAttachmentState) -> Unit)? = null) {
-        // When only one attachment is allowed
-        if (!mAllowMultipleAttachments
-            && attachment.downloadState == AttachmentState.START) {
-            attachmentsAdapter?.clear()
-        }
+    fun putAttachment(attachment: EntryAttachmentState,
+                      onPreviewLoaded: (()-> Unit)? = null) {
        attachmentsContainerView.visibility = View.VISIBLE
-        attachmentsAdapter?.putItem(attachment)
-        attachmentsAdapter?.onBinaryPreviewLoaded = {
-            onPreviewLoaded?.invoke(attachment)
+        attachmentsAdapter.putItem(attachment)
+        attachmentsAdapter.onBinaryPreviewLoaded = {
+            onPreviewLoaded?.invoke()
        }
    }

-    private fun removeAttachment(attachment: EntryAttachmentState) {
-        attachmentsAdapter?.removeItem(attachment)
+    fun removeAttachment(attachment: EntryAttachmentState) {
+        attachmentsAdapter.removeItem(attachment)
    }

-    private fun getAttachmentViewPosition(attachment: EntryAttachmentState,
-                                          position: (attachment: EntryAttachmentState, Float) -> Unit) {
+    fun clearAttachments() {
+        attachmentsAdapter.clear()
+    }
+
+    fun getAttachmentViewPosition(attachment: EntryAttachmentState, position: (Float) -> Unit) {
        attachmentsListView.postDelayed({
-            attachmentsAdapter?.indexOf(attachment)?.let { index ->
-                position.invoke(attachment,
-                    attachmentsContainerView.y
-                        + attachmentsListView.y
-                        + (attachmentsListView.getChildAt(index)?.y
-                        ?: 0F)
-                )
-            }
+            position.invoke(attachmentsContainerView.y
+                    + attachmentsListView.y
+                    + (attachmentsListView.getChildAt(attachmentsAdapter.indexOf(attachment))?.y
+                    ?: 0F)
+            )
        }, 250)
    }

    override fun onSaveInstanceState(outState: Bundle) {
+        populateEntryWithViews()
+        outState.putParcelable(KEY_TEMP_ENTRY_INFO, mEntryInfo)
+        outState.putParcelable(KEY_LAST_FOCUSED_FIELD, mLastFocusedEditField)
+
        super.onSaveInstanceState(outState)
-        outState.putParcelableArrayList(ATTACHMENTS_TAG, ArrayList(getAttachments()))
-    }
-
-    /* -------------
-     * Education
-     * -------------
-     */
-
-    fun getActionImageView(): View? {
-        return templateView.getActionImageView()
-    }
-
-    fun launchGeneratePasswordEductionAction() {
-        mEntryEditViewModel.requestPasswordSelection(templateView.getPasswordField())
    }

    companion object {
-        private val TAG = EntryEditFragment::class.java.name
+        const val KEY_TEMP_ENTRY_INFO = "KEY_TEMP_ENTRY_INFO"
+        const val KEY_DATABASE = "KEY_DATABASE"
+        const val KEY_LAST_FOCUSED_FIELD = "KEY_LAST_FOCUSED_FIELD"

-        private const val ATTACHMENTS_TAG = "ATTACHMENTS_TAG"
+        fun getInstance(entryInfo: EntryInfo?): EntryEditFragment {
+                        //database: Database?): EntryEditFragment {
+            return EntryEditFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_TEMP_ENTRY_INFO, entryInfo)
+                    // TODO Unique database key database.key
+                    putInt(KEY_DATABASE, 0)
+                }
+            }
+        }
    }

 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
@@ -1,246 +0,0 @@
-package com.kunzisoft.keepass.activities.fragments
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.SimpleItemAnimator
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
-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.template.TemplateField
-import com.kunzisoft.keepass.model.EntryAttachmentState
-import com.kunzisoft.keepass.model.EntryInfo
-import com.kunzisoft.keepass.model.StreamDirection
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.timeout.ClipboardHelper
-import com.kunzisoft.keepass.utils.UuidUtil
-import com.kunzisoft.keepass.view.TemplateView
-import com.kunzisoft.keepass.view.showByFading
-import com.kunzisoft.keepass.viewmodels.EntryViewModel
-import java.util.*
-
-class EntryFragment: DatabaseFragment() {
-
-    private lateinit var rootView: View
-    private lateinit var templateView: TemplateView
-
-    private lateinit var creationDateView: TextView
-    private lateinit var modificationDateView: TextView
-
-    private lateinit var attachmentsContainerView: View
-    private lateinit var attachmentsListView: RecyclerView
-    private var attachmentsAdapter: EntryAttachmentsItemsAdapter? = null
-
-    private lateinit var customDataView: TextView
-
-    private lateinit var uuidContainerView: View
-    private lateinit var uuidReferenceView: TextView
-
-    private var mClipboardHelper: ClipboardHelper? = null
-
-    private val mEntryViewModel: EntryViewModel by activityViewModels()
-
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry, container, false)
-    }
-    
-    override fun onViewCreated(view: View,
-                               savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        context?.let { context ->
-            mClipboardHelper = ClipboardHelper(context)
-        }
-
-        rootView = view
-        // Hide only the first time
-        if (savedInstanceState == null) {
-            view.isVisible = false
-        }
-        templateView = view.findViewById(R.id.entry_template)
-        loadTemplateSettings()
-
-        attachmentsContainerView = view.findViewById(R.id.entry_attachments_container)
-        attachmentsListView = view.findViewById(R.id.entry_attachments_list)
-        attachmentsListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-        }
-
-        creationDateView = view.findViewById(R.id.entry_created)
-        modificationDateView = view.findViewById(R.id.entry_modified)
-
-        // TODO Custom data
-        // customDataView = view.findViewById(R.id.entry_custom_data)
-
-        uuidContainerView = view.findViewById(R.id.entry_UUID_container)
-        uuidContainerView.apply {
-            visibility = if (PreferencesUtil.showUUID(context)) View.VISIBLE else View.GONE
-        }
-        uuidReferenceView = view.findViewById(R.id.entry_UUID_reference)
-
-        mEntryViewModel.entryInfoHistory.observe(viewLifecycleOwner) { entryInfoHistory ->
-            if (entryInfoHistory != null) {
-                templateView.setTemplate(entryInfoHistory.template)
-                assignEntryInfo(entryInfoHistory.entryInfo)
-                // Smooth appearing
-                rootView.showByFading()
-                resetAppTimeoutWhenViewFocusedOrChanged(rootView)
-            }
-        }
-
-        mEntryViewModel.onAttachmentAction.observe(viewLifecycleOwner) { entryAttachmentState ->
-            entryAttachmentState?.let {
-                if (it.streamDirection != StreamDirection.UPLOAD) {
-                    putAttachment(it)
-                }
-            }
-        }
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        context?.let { context ->
-            attachmentsAdapter = EntryAttachmentsItemsAdapter(context)
-            attachmentsAdapter?.database = database
-        }
-
-        attachmentsListView.adapter = attachmentsAdapter
-    }
-
-    private fun loadTemplateSettings() {
-        context?.let { context ->
-            templateView.setFirstTimeAskAllowCopyProtectedFields(PreferencesUtil.isFirstTimeAskAllowCopyProtectedFields(context))
-            templateView.setAllowCopyProtectedFields(PreferencesUtil.allowCopyProtectedFields(context))
-        }
-    }
-
-    private fun assignEntryInfo(entryInfo: EntryInfo?) {
-        // Set copy buttons
-        templateView.apply {
-            setOnAskCopySafeClickListener {
-                showClipboardDialog()
-            }
-
-            setOnCopyActionClickListener { field ->
-                mClipboardHelper?.timeoutCopyToClipboard(
-                    field.protectedValue.stringValue,
-                    getString(
-                        R.string.copy_field,
-                        TemplateField.getLocalizedName(context, field.name)
-                    )
-                )
-            }
-        }
-
-        // Populate entry views
-        templateView.setEntryInfo(entryInfo)
-
-        // OTP timer updated
-        templateView.setOnOtpElementUpdated { otpElementUpdated ->
-            mEntryViewModel.onOtpElementUpdated(otpElementUpdated)
-        }
-
-        // Manage attachments
-        assignAttachments(entryInfo?.attachments ?: listOf())
-
-        // Assign dates
-        creationDateView.text = entryInfo?.creationTime?.getDateTimeString(resources)
-        modificationDateView.text = entryInfo?.lastModificationTime?.getDateTimeString(resources)
-
-        // TODO Custom data
-        // customDataView.text = entryInfo?.customData?.toString()
-
-        // Assign special data
-        uuidReferenceView.text = UuidUtil.toHexString(entryInfo?.id)
-    }
-
-    private fun showClipboardDialog() {
-        context?.let {
-            AlertDialog.Builder(it)
-                .setMessage(
-                    getString(R.string.allow_copy_password_warning) +
-                            "\n\n" +
-                            getString(R.string.clipboard_warning)
-                )
-                .create().apply {
-                    setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
-                        PreferencesUtil.setAllowCopyPasswordAndProtectedFields(context, true)
-                        finishDialog(dialog)
-                    }
-                    setButton(AlertDialog.BUTTON_NEGATIVE, getText(R.string.disable)) { dialog, _ ->
-                        PreferencesUtil.setAllowCopyPasswordAndProtectedFields(context, false)
-                        finishDialog(dialog)
-                    }
-                    show()
-                }
-        }
-    }
-
-    private fun finishDialog(dialog: DialogInterface) {
-        dialog.dismiss()
-        loadTemplateSettings()
-        templateView.reload()
-    }
-
-    /* -------------
-     * Attachments
-     * -------------
-     */
-
-    private fun assignAttachments(attachments: List<Attachment>) {
-        attachmentsContainerView.visibility = if (attachments.isEmpty()) View.GONE else View.VISIBLE
-        attachmentsAdapter?.assignItems(attachments.map {
-            EntryAttachmentState(it, StreamDirection.DOWNLOAD)
-        })
-        attachmentsAdapter?.onItemClickListener = { item ->
-            mEntryViewModel.onAttachmentSelected(item.attachment)
-        }
-    }
-
-    fun putAttachment(attachmentToDownload: EntryAttachmentState) {
-        attachmentsAdapter?.putItem(attachmentToDownload)
-    }
-
-    /* -------------
-     * Education
-     * -------------
-     */
-
-    fun firstEntryFieldCopyView(): View? {
-        return try {
-            templateView.getActionImageView()
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    fun launchEntryCopyEducationAction() {
-        val appNameString = getString(R.string.app_name)
-        mClipboardHelper?.timeoutCopyToClipboard(appNameString,
-            getString(R.string.copy_field, appNameString))
-    }
-
-    companion object {
-
-        fun getInstance(): EntryFragment {
-            return EntryFragment().apply {
-                arguments = Bundle()
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryHistoryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryHistoryFragment.kt
@@ -1,72 +0,0 @@
-package com.kunzisoft.keepass.activities.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.stylish.StylishFragment
-import com.kunzisoft.keepass.adapters.EntryHistoryAdapter
-import com.kunzisoft.keepass.model.EntryInfo
-import com.kunzisoft.keepass.viewmodels.EntryViewModel
-
-class EntryHistoryFragment: StylishFragment() {
-
-    private lateinit var historyContainerView: View
-    private lateinit var historyListView: RecyclerView
-    private var historyAdapter: EntryHistoryAdapter? = null
-
-    private val mEntryViewModel: EntryViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry_history, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        context?.let { context ->
-            historyAdapter = EntryHistoryAdapter(context)
-        }
-
-        historyContainerView = view.findViewById(R.id.entry_history_container)
-        historyListView = view.findViewById(R.id.entry_history_list)
-        historyListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
-            adapter = historyAdapter
-        }
-
-        mEntryViewModel.entryHistory.observe(viewLifecycleOwner) {
-            assignHistory(it)
-        }
-    }
-
-    /* -------------
-     * History
-     * -------------
-     */
-    private fun assignHistory(history: List<EntryInfo>?) {
-        historyAdapter?.clear()
-        history?.let {
-            historyAdapter?.entryHistoryList?.addAll(history)
-        }
-        historyAdapter?.onItemClickListener = { item, position ->
-            mEntryViewModel.onHistorySelected(item, position)
-        }
-        historyContainerView.visibility = if (historyAdapter?.entryHistoryList?.isEmpty() != false)
-            View.GONE
-        else
-            View.VISIBLE
-        historyAdapter?.notifyDataSetChanged()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
@@ -22,7 +22,6 @@ package com.kunzisoft.keepass.activities.fragments
 import android.os.Bundle
 import android.view.View
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom


@@ -32,8 +31,8 @@ class IconCustomFragment : IconFragment<IconImageCustom>() {
        return R.layout.fragment_icon_grid
    }

-    override fun defineIconList(database: Database?) {
-        database?.doForEachCustomIcons { customIcon, _ ->
+    override fun defineIconList() {
+        mDatabase?.doForEachCustomIcons { customIcon, _ ->
            iconPickerAdapter.addIcon(customIcon, false)
        }
    }
@@ -55,10 +54,8 @@ class IconCustomFragment : IconFragment<IconImageCustom>() {
                iconCustomAdded?.iconCustom?.let { icon ->
                    iconPickerAdapter.addIcon(icon)
                    iconCustomAdded.iconCustom = null
-                    try {
-                        iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
-                    } catch (ignore: Exception) {}
                }
+                iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
            }
        }
        iconPickerViewModel.customIconRemoved.observe(viewLifecycleOwner) { iconCustomRemoved ->
@@ -69,14 +66,6 @@ class IconCustomFragment : IconFragment<IconImageCustom>() {
                }
            }
        }
-        iconPickerViewModel.customIconUpdated.observe(viewLifecycleOwner) { iconCustomUpdated ->
-            if (!iconCustomUpdated.error) {
-                iconCustomUpdated?.iconCustom?.let { icon ->
-                    iconPickerAdapter.updateIcon(icon)
-                    iconCustomUpdated.iconCustom = null
-                }
-            }
-        }
    }

    override fun onIconClickListener(icon: IconImageCustom) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
@@ -19,6 +19,7 @@
 */
 package com.kunzisoft.keepass.activities.fragments

+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -27,6 +28,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.adapters.IconPickerAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImageDraw
@@ -36,48 +38,39 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

-abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
+abstract class IconFragment<T: IconImageDraw> : StylishFragment(),
        IconPickerAdapter.IconPickerListener<T> {

    protected lateinit var iconsGridView: RecyclerView
    protected lateinit var iconPickerAdapter: IconPickerAdapter<T>
    protected var iconActionSelectionMode = false

+    protected var mDatabase: Database? = null
+
    protected val iconPickerViewModel: IconPickerViewModel by activityViewModels()

    abstract fun retrieveMainLayoutId(): Int

-    abstract fun defineIconList(database: Database?)
+    abstract fun defineIconList()

-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
-        return inflater.inflate(retrieveMainLayoutId(), container, false)
-    }
+    override fun onAttach(context: Context) {
+        super.onAttach(context)

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        mDatabase = Database.getInstance()

        // Retrieve the textColor to tint the icon
        val ta = contextThemed?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
        val tintColor = ta?.getColor(0, Color.BLACK) ?: Color.BLACK
        ta?.recycle()

-        iconsGridView = view.findViewById(R.id.icons_grid_view)
-        iconPickerAdapter = IconPickerAdapter(requireContext(), tintColor)
-        iconPickerAdapter.iconPickerListener = this
-        iconsGridView.adapter = iconPickerAdapter
-
-        resetAppTimeoutWhenViewFocusedOrChanged(view)
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        iconPickerAdapter.iconDrawableFactory = database?.iconDrawableFactory
+        iconPickerAdapter = IconPickerAdapter<T>(context, tintColor).apply {
+            iconDrawableFactory = mDatabase?.iconDrawableFactory
+        }

        CoroutineScope(Dispatchers.IO).launch {
            val populateList = launch {
                iconPickerAdapter.clear()
-                defineIconList(database)
+                defineIconList()
            }
            withContext(Dispatchers.Main) {
                populateList.join()
@@ -86,6 +79,21 @@ abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
        }
    }

+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        val root = inflater.inflate(retrieveMainLayoutId(), container, false)
+        iconsGridView = root.findViewById(R.id.icons_grid_view)
+        iconsGridView.adapter = iconPickerAdapter
+        return root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerAdapter.iconPickerListener = this
+    }
+
    fun onIconDeleteClicked() {
        iconActionSelectionMode = false
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt
@@ -9,18 +9,20 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.adapters.IconPickerPagerAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel

-class IconPickerFragment : DatabaseFragment() {
+class IconPickerFragment : StylishFragment() {

    private var iconPickerPagerAdapter: IconPickerPagerAdapter? = null
    private lateinit var viewPager: ViewPager2
-    private lateinit var tabLayout: TabLayout

    private val iconPickerViewModel: IconPickerViewModel by activityViewModels()

+    private var mDatabase: Database? = null
+
    override fun onCreateView(
            inflater: LayoutInflater,
            container: ViewGroup?,
@@ -30,11 +32,19 @@ class IconPickerFragment : DatabaseFragment() {
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        mDatabase = Database.getInstance()

        viewPager = view.findViewById(R.id.icon_picker_pager)
-        tabLayout = view.findViewById(R.id.icon_picker_tabs)
-        resetAppTimeoutWhenViewFocusedOrChanged(view)
+        val tabLayout = view.findViewById<TabLayout>(R.id.icon_picker_tabs)
+        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
+                if (mDatabase?.allowCustomIcons == true) 2 else 1)
+        viewPager.adapter = iconPickerPagerAdapter
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            tab.text = when (position) {
+                1 -> getString(R.string.icon_section_custom)
+                else -> getString(R.string.icon_section_standard)
+            }
+        }.attach()

        arguments?.apply {
            if (containsKey(ICON_TAB_ARG)) {
@@ -48,18 +58,6 @@ class IconPickerFragment : DatabaseFragment() {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
-        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
-            if (database?.allowCustomIcons == true) 2 else 1)
-        viewPager.adapter = iconPickerPagerAdapter
-        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
-            tab.text = when (position) {
-                1 -> getString(R.string.icon_section_custom)
-                else -> getString(R.string.icon_section_standard)
-            }
-        }.attach()
-    }
-
    enum class IconTab {
        STANDARD, CUSTOM
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
@@ -20,7 +20,6 @@
 package com.kunzisoft.keepass.activities.fragments

 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard


@@ -30,8 +29,8 @@ class IconStandardFragment : IconFragment<IconImageStandard>() {
        return R.layout.fragment_icon_grid
    }

-    override fun defineIconList(database: Database?) {
-        database?.doForEachStandardIcons { standardIcon ->
+    override fun defineIconList() {
+        mDatabase?.doForEachStandardIcons { standardIcon ->
            iconPickerAdapter.addIcon(standardIcon, false)
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/ListNodesFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/ListNodesFragment.kt
@@ -20,43 +20,38 @@
 package com.kunzisoft.keepass.activities.fragments

 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.*
 import androidx.appcompat.view.ActionMode
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.EntryEditActivity
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.adapters.NodesAdapter
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.NodeAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.viewmodels.GroupViewModel
 import java.util.*

-class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListener {
+class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {

    private var nodeClickListener: NodeClickListener? = null
    private var onScrollListener: OnScrollListener? = null
-    private var groupRefreshed: GroupRefreshedListener? = null

    private var mNodesRecyclerView: RecyclerView? = null
-    private var mLayoutManager: LinearLayoutManager? = null
-    private var mAdapter: NodesAdapter? = null
-
-    private val mGroupViewModel: GroupViewModel by activityViewModels()
-
-    private var mCurrentGroup: Group? = null
+    var mainGroup: Group? = null
+        private set
+    private var mAdapter: NodeAdapter? = null

    var nodeActionSelectionMode = false
        private set
@@ -68,47 +63,21 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
    private var notFoundView: View? = null
    private var isASearchResult: Boolean = false

+
+    private var readOnly: Boolean = false
    private var specialMode: SpecialMode = SpecialMode.DEFAULT

-    private var mRecycleBinEnable: Boolean = false
-    private var mRecycleBin: Group? = null
-
-    var mEntryActivityResultLauncher = EntryEditActivity.registerForEntryResult(this) { entryId ->
-        entryId?.let {
-            // Simply refresh the list
-            rebuildList()
-            // Scroll to the new entry
-            mDatabase?.getEntryById(it)?.let { entry ->
-                mAdapter?.indexOf(entry)?.let { position ->
-                    mNodesRecyclerView?.scrollToPosition(position)
-                }
-            }
-        } ?: Log.e(this.javaClass.name, "Entry cannot be retrieved in Activity Result")
-    }
-
-    private var mRecycleViewScrollListener = object : RecyclerView.OnScrollListener() {
-        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-            super.onScrollStateChanged(recyclerView, newState)
-            if (newState == SCROLL_STATE_IDLE) {
-                mGroupViewModel.assignPosition(getFirstVisiblePosition())
-            }
-        }
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-            super.onScrolled(recyclerView, dx, dy)
-            onScrollListener?.onScrolled(dy)
-        }
-    }
+    val isEmpty: Boolean
+        get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0

    override fun onAttach(context: Context) {
        super.onAttach(context)
-
-        // TODO Change to ViewModel
        try {
            nodeClickListener = context as NodeClickListener
        } catch (e: ClassCastException) {
            // The activity doesn't implement the interface, throw exception
            throw ClassCastException(context.toString()
-                    + " must implement " + NodesAdapter.NodeClickCallback::class.java.name)
+                    + " must implement " + NodeAdapter.NodeClickCallback::class.java.name)
        }

        try {
@@ -116,24 +85,14 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        } catch (e: ClassCastException) {
            onScrollListener = null
            // Context menu can be omit
-            Log.w(
-                TAG, context.toString()
+            Log.w(TAG, context.toString()
                    + " must implement " + RecyclerView.OnScrollListener::class.java.name)
        }
-
-        try {
-            groupRefreshed = context as GroupRefreshedListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + GroupRefreshedListener::class.java.name)
-        }
    }

    override fun onDetach() {
        nodeClickListener = null
        onScrollListener = null
-        groupRefreshed = null
        super.onDetach()
    }

@@ -141,140 +100,129 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        super.onCreate(savedInstanceState)

        setHasOptionsMenu(true)
-    }

-    override fun onDatabaseRetrieved(database: Database?) {
-        mRecycleBinEnable = database?.isRecycleBinEnabled == true
-        mRecycleBin = database?.recycleBin
+        readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState, arguments)
+
+        arguments?.let { args ->
+            // Contains all the group in element
+            if (args.containsKey(GROUP_KEY)) {
+                mainGroup = args.getParcelable(GROUP_KEY)
+            }
+            if (args.containsKey(IS_SEARCH)) {
+                isASearchResult = args.getBoolean(IS_SEARCH)
+            }
+        }

        contextThemed?.let { context ->
-            database?.let { database ->
-                mAdapter = NodesAdapter(context, database).apply {
-                    setOnNodeClickListener(object : NodesAdapter.NodeClickCallback {
-                        override fun onNodeClick(database: Database, node: Node) {
-                            if (mCurrentGroup?.isVirtual == false
-                                && nodeActionSelectionMode) {
-                                if (listActionNodes.contains(node)) {
-                                    // Remove selected item if already selected
-                                    listActionNodes.remove(node)
-                                } else {
-                                    // Add selected item if not already selected
-                                    listActionNodes.add(node)
-                                }
-                                nodeClickListener?.onNodeSelected(database, listActionNodes)
-                                setActionNodes(listActionNodes)
-                                notifyNodeChanged(node)
+            mAdapter = NodeAdapter(context)
+            mAdapter?.apply {
+                setOnNodeClickListener(object : NodeAdapter.NodeClickCallback {
+                    override fun onNodeClick(node: Node) {
+                        if (nodeActionSelectionMode) {
+                            if (listActionNodes.contains(node)) {
+                                // Remove selected item if already selected
+                                listActionNodes.remove(node)
                            } else {
-                                nodeClickListener?.onNodeClick(database, node)
+                                // Add selected item if not already selected
+                                listActionNodes.add(node)
                            }
+                            nodeClickListener?.onNodeSelected(listActionNodes)
+                            setActionNodes(listActionNodes)
+                            notifyNodeChanged(node)
+                        } else {
+                            nodeClickListener?.onNodeClick(node)
                        }
+                    }

-                        override fun onNodeLongClick(database: Database, node: Node): Boolean {
-                            if (mCurrentGroup?.isVirtual == false
-                                && nodeActionPasteMode == PasteMode.UNDEFINED) {
-                                // Select the first item after a long click
-                                if (!listActionNodes.contains(node))
-                                    listActionNodes.add(node)
+                    override fun onNodeLongClick(node: Node): Boolean {
+                        if (nodeActionPasteMode == PasteMode.UNDEFINED) {
+                            // Select the first item after a long click
+                            if (!listActionNodes.contains(node))
+                                listActionNodes.add(node)

-                                nodeClickListener?.onNodeSelected(database, listActionNodes)
+                            nodeClickListener?.onNodeSelected(listActionNodes)

-                                setActionNodes(listActionNodes)
-                                notifyNodeChanged(node)
-                            }
-                            return true
+                            setActionNodes(listActionNodes)
+                            notifyNodeChanged(node)
                        }
-                    })
-                }
-                mNodesRecyclerView?.adapter = mAdapter
+                        return true
+                    }
+                })
            }
        }
    }

-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-
-        // Too many special cases to make specific additions or deletions,
-        // rebuilt the list works well.
-        if (result.isSuccess) {
-            rebuildList()
-        }
+    override fun onSaveInstanceState(outState: Bundle) {
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
+        super.onSaveInstanceState(outState)
    }

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)
+
        // To apply theme
-        return inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_nodes, container, false)
-    }
+        val rootView = inflater.cloneInContext(contextThemed)
+                .inflate(R.layout.fragment_list_nodes, container, false)
+        mNodesRecyclerView = rootView.findViewById(R.id.nodes_list)
+        notFoundView = rootView.findViewById(R.id.not_found_container)

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        mNodesRecyclerView = view.findViewById(R.id.nodes_list)
-        notFoundView = view.findViewById(R.id.not_found_container)
-
-        mLayoutManager = LinearLayoutManager(context)
        mNodesRecyclerView?.apply {
            scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
-            layoutManager = mLayoutManager
+            layoutManager = LinearLayoutManager(context)
            adapter = mAdapter
        }
-        resetAppTimeoutWhenViewFocusedOrChanged(view)

-        mGroupViewModel.group.observe(viewLifecycleOwner) {
-            mCurrentGroup = it.group
-            isASearchResult = it.group.isVirtual
-            rebuildList()
-            it.showFromPosition?.let { position ->
-                mNodesRecyclerView?.scrollToPosition(position)
-            }
+        onScrollListener?.let { onScrollListener ->
+            mNodesRecyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(recyclerView, dx, dy)
+                    onScrollListener.onScrolled(dy)
+                }
+            })
        }
+
+        return rootView
    }

    override fun onResume() {
        super.onResume()

-        mNodesRecyclerView?.addOnScrollListener(mRecycleViewScrollListener)
        activity?.intent?.let {
            specialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(it)
        }

-        rebuildList()
-    }
-
-    override fun onPause() {
-
-        mNodesRecyclerView?.removeOnScrollListener(mRecycleViewScrollListener)
-        super.onPause()
-    }
-
-    fun getFirstVisiblePosition(): Int {
-        return mLayoutManager?.findFirstVisibleItemPosition() ?: 0
-    }
-
-    private fun rebuildList() {
+        // Refresh data
        try {
-            // Add elements to the list
-            mCurrentGroup?.let { currentGroup ->
-                // Thrown an exception when sort cannot be performed
-                mAdapter?.rebuildList(currentGroup)
-            }
-        } catch (e:Exception) {
-            Log.e(TAG, "Unable to rebuild the list", e)
+            rebuildList()
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to rebuild the list during resume")
+            e.printStackTrace()
        }

-        if (isASearchResult && mAdapter != null && mAdapter!!.isEmpty) {
+        if (isASearchResult && mAdapter!= null && mAdapter!!.isEmpty) {
            // To show the " no search entry found "
+            mNodesRecyclerView?.visibility = View.GONE
            notFoundView?.visibility = View.VISIBLE
        } else {
+            mNodesRecyclerView?.visibility = View.VISIBLE
            notFoundView?.visibility = View.GONE
        }
+    }

-        groupRefreshed?.onGroupRefreshed()
+    @Throws(IllegalArgumentException::class)
+    fun rebuildList() {
+        // Add elements to the list
+        mainGroup?.let { mainGroup ->
+            mAdapter?.apply {
+                // Thrown an exception when sort cannot be performed
+                rebuildList(mainGroup)
+                // To visually change the elements
+                if (PreferencesUtil.APPEARANCE_CHANGED) {
+                    notifyDataSetChanged()
+                    PreferencesUtil.APPEARANCE_CHANGED = false
+                }
+            }
+        }
    }

    override fun onSortSelected(sortNodeEnum: SortNodeEnum,
@@ -289,7 +237,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
            mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
            rebuildList()
        } catch (e:Exception) {
-            Log.e(TAG, "Unable to sort the list", e)
+            Log.e(TAG, "Unable to rebuild the list with the sort")
+            e.printStackTrace()
        }
    }

@@ -305,19 +254,17 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
            R.id.menu_sort -> {
                context?.let { context ->
                    val sortDialogFragment: SortDialogFragment =
-                            if (mRecycleBinEnable) {
+                            if (Database.getInstance().isRecycleBinEnabled) {
                                SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(context),
-                                    PreferencesUtil.getAscendingSort(context),
-                                    PreferencesUtil.getGroupsBeforeSort(context),
-                                    PreferencesUtil.getRecycleBinBottomSort(context)
-                                )
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context),
+                                        PreferencesUtil.getRecycleBinBottomSort(context))
                            } else {
                                SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(context),
-                                    PreferencesUtil.getAscendingSort(context),
-                                    PreferencesUtil.getGroupsBeforeSort(context)
-                                )
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context))
                            }

                    sortDialogFragment.show(childFragmentManager, "sortDialog")
@@ -329,32 +276,34 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        }
    }

-    fun actionNodesCallback(database: Database,
-                            nodes: List<Node>,
+    fun actionNodesCallback(nodes: List<Node>,
                            menuListener: NodesActionMenuListener?,
-                            onDestroyActionMode: (mode: ActionMode?) -> Unit) : ActionMode.Callback {
+                            actionModeCallback: ActionMode.Callback) : ActionMode.Callback {

        return object : ActionMode.Callback {

            override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
                nodeActionSelectionMode = false
                nodeActionPasteMode = PasteMode.UNDEFINED
-                return true
+                return actionModeCallback.onCreateActionMode(mode, menu)
            }

            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
                menu?.clear()
+
                if (nodeActionPasteMode != PasteMode.UNDEFINED) {
                    mode?.menuInflater?.inflate(R.menu.node_paste_menu, menu)
                } else {
                    nodeActionSelectionMode = true
                    mode?.menuInflater?.inflate(R.menu.node_menu, menu)

+                    val database = Database.getInstance()
+
                    // Open and Edit for a single item
                    if (nodes.size == 1) {
                        // Edition
-                        if (database.isReadOnly
-                                || (mRecycleBinEnable && nodes[0] == mRecycleBin)) {
+                        if (readOnly
+                                || (database.isRecycleBinEnabled && nodes[0] == database.recycleBin)) {
                            menu?.removeItem(R.id.menu_edit)
                        }
                    } else {
@@ -362,59 +311,56 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                        menu?.removeItem(R.id.menu_edit)
                    }

-                    // Move
-                    if (database.isReadOnly
-                            || isASearchResult) {
+                    // Copy and Move (not for groups)
+                    if (readOnly
+                            || isASearchResult
+                            || nodes.any { it.type == Type.GROUP }) {
+                        // TODO Copy For Group
+                        menu?.removeItem(R.id.menu_copy)
                        menu?.removeItem(R.id.menu_move)
                    }

-                    // Copy (not allowed for group)
-                    if (database.isReadOnly
-                            || isASearchResult
-                            || nodes.any { it.type == Type.GROUP }) {
-                        menu?.removeItem(R.id.menu_copy)
-                    }
-
                    // Deletion
-                    if (database.isReadOnly
-                            || (mRecycleBinEnable && nodes.any { it == mRecycleBin })) {
+                    if (readOnly
+                            || (database.isRecycleBinEnabled && nodes.any { it == database.recycleBin })) {
                        menu?.removeItem(R.id.menu_delete)
                    }
                }

                // Add the number of items selected in title
                mode?.title = nodes.size.toString()
-                return true
+
+                return actionModeCallback.onPrepareActionMode(mode, menu)
            }

            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
                if (menuListener == null)
                    return false
                return when (item?.itemId) {
-                    R.id.menu_open -> menuListener.onOpenMenuClick(database, nodes[0])
-                    R.id.menu_edit -> menuListener.onEditMenuClick(database, nodes[0])
+                    R.id.menu_open -> menuListener.onOpenMenuClick(nodes[0])
+                    R.id.menu_edit -> menuListener.onEditMenuClick(nodes[0])
                    R.id.menu_copy -> {
                        nodeActionPasteMode = PasteMode.PASTE_FROM_COPY
                        mAdapter?.unselectActionNodes()
-                        val returnValue = menuListener.onCopyMenuClick(database, nodes)
+                        val returnValue = menuListener.onCopyMenuClick(nodes)
                        nodeActionSelectionMode = false
                        returnValue
                    }
                    R.id.menu_move -> {
                        nodeActionPasteMode = PasteMode.PASTE_FROM_MOVE
                        mAdapter?.unselectActionNodes()
-                        val returnValue = menuListener.onMoveMenuClick(database, nodes)
+                        val returnValue = menuListener.onMoveMenuClick(nodes)
                        nodeActionSelectionMode = false
                        returnValue
                    }
-                    R.id.menu_delete -> menuListener.onDeleteMenuClick(database, nodes)
+                    R.id.menu_delete -> menuListener.onDeleteMenuClick(nodes)
                    R.id.menu_paste -> {
-                        val returnValue = menuListener.onPasteMenuClick(database, nodeActionPasteMode, nodes)
+                        val returnValue = menuListener.onPasteMenuClick(nodeActionPasteMode, nodes)
                        nodeActionPasteMode = PasteMode.UNDEFINED
                        nodeActionSelectionMode = false
                        returnValue
                    }
-                    else -> false
+                    else -> actionModeCallback.onActionItemClicked(mode, item)
                }
            }

@@ -424,29 +370,83 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                mAdapter?.unselectActionNodes()
                nodeActionPasteMode = PasteMode.UNDEFINED
                nodeActionSelectionMode = false
-                onDestroyActionMode(mode)
+                actionModeCallback.onDestroyActionMode(mode)
            }
        }
    }

+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        when (requestCode) {
+            EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE -> {
+                if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE
+                        || resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
+                    data?.getParcelableExtra<Node>(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY)?.let { changedNode ->
+                        if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
+                            addNode(changedNode)
+                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE)
+                            mAdapter?.notifyDataSetChanged()
+                    } ?: Log.e(this.javaClass.name, "New node can be retrieve in Activity Result")
+                }
+            }
+        }
+    }
+
+    fun contains(node: Node): Boolean {
+        return mAdapter?.contains(node) ?: false
+    }
+
+    fun addNode(newNode: Node) {
+        mAdapter?.addNode(newNode)
+    }
+
+    fun addNodes(newNodes: List<Node>) {
+        mAdapter?.addNodes(newNodes)
+    }
+
+    fun updateNode(oldNode: Node, newNode: Node? = null) {
+        mAdapter?.updateNode(oldNode, newNode ?: oldNode)
+    }
+
+    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
+        mAdapter?.updateNodes(oldNodes, newNodes)
+    }
+
+    fun removeNode(pwNode: Node) {
+        mAdapter?.removeNode(pwNode)
+    }
+
+    fun removeNodes(nodes: List<Node>) {
+        mAdapter?.removeNodes(nodes)
+    }
+
+    fun removeNodeAt(position: Int) {
+        mAdapter?.removeNodeAt(position)
+    }
+
+    fun removeNodesAt(positions: IntArray) {
+        mAdapter?.removeNodesAt(positions)
+    }
+
    /**
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickListener {
-        fun onNodeClick(database: Database, node: Node)
-        fun onNodeSelected(database: Database, nodes: List<Node>): Boolean
+        fun onNodeClick(node: Node)
+        fun onNodeSelected(nodes: List<Node>): Boolean
    }

    /**
     * Menu listener to redefine to do an action in menu
     */
    interface NodesActionMenuListener {
-        fun onOpenMenuClick(database: Database, node: Node): Boolean
-        fun onEditMenuClick(database: Database, node: Node): Boolean
-        fun onCopyMenuClick(database: Database, nodes: List<Node>): Boolean
-        fun onMoveMenuClick(database: Database, nodes: List<Node>): Boolean
-        fun onDeleteMenuClick(database: Database, nodes: List<Node>): Boolean
-        fun onPasteMenuClick(database: Database, pasteMode: PasteMode?, nodes: List<Node>): Boolean
+        fun onOpenMenuClick(node: Node): Boolean
+        fun onEditMenuClick(node: Node): Boolean
+        fun onCopyMenuClick(nodes: List<Node>): Boolean
+        fun onMoveMenuClick(nodes: List<Node>): Boolean
+        fun onDeleteMenuClick(nodes: List<Node>): Boolean
+        fun onPasteMenuClick(pasteMode: PasteMode?, nodes: List<Node>): Boolean
    }

    enum class PasteMode {
@@ -464,11 +464,23 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        fun onScrolled(dy: Int)
    }

-    interface GroupRefreshedListener {
-        fun onGroupRefreshed()
-    }
-
    companion object {
-        private val TAG = GroupFragment::class.java.name
+
+        private val TAG = ListNodesFragment::class.java.name
+
+        private const val GROUP_KEY = "GROUP_KEY"
+        private const val IS_SEARCH = "IS_SEARCH"
+
+        fun newInstance(group: Group?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
+            val bundle = Bundle()
+            if (group != null) {
+                bundle.putParcelable(GROUP_KEY, group)
+            }
+            bundle.putBoolean(IS_SEARCH, isASearch)
+            ReadOnlyHelper.putReadOnlyInBundle(bundle, readOnly)
+            val listNodesFragment = ListNodesFragment()
+            listNodesFragment.arguments = bundle
+            return listNodesFragment
+        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
@@ -1,225 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.helpers
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.util.Log
-import android.view.View
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
-import com.kunzisoft.keepass.utils.UriUtil
-
-class ExternalFileHelper {
-
-    private var activity: FragmentActivity? = null
-    private var fragment: Fragment? = null
-
-    private var getContentResultLauncher: ActivityResultLauncher<String>? = null
-    private var openDocumentResultLauncher: ActivityResultLauncher<Array<String>>? = null
-    private var createDocumentResultLauncher: ActivityResultLauncher<String>? = null
-
-    constructor(context: FragmentActivity) {
-        this.activity = context
-        this.fragment = null
-    }
-
-    constructor(context: Fragment) {
-        this.activity = context.activity
-        this.fragment = context
-    }
-
-    fun buildOpenDocument(onFileSelected: ((uri: Uri?) -> Unit)?) {
-
-        val resultCallback = ActivityResultCallback<Uri> { result ->
-            result?.let { uri ->
-                UriUtil.takeUriPermission(activity?.contentResolver, uri)
-                onFileSelected?.invoke(uri)
-            }
-        }
-
-        getContentResultLauncher = if (fragment != null) {
-            fragment?.registerForActivityResult(
-                GetContent(),
-                resultCallback
-            )
-        } else {
-            activity?.registerForActivityResult(
-                GetContent(),
-                resultCallback
-            )
-        }
-
-        openDocumentResultLauncher = if (fragment != null) {
-            fragment?.registerForActivityResult(
-                OpenDocument(),
-                resultCallback
-            )
-        } else {
-            activity?.registerForActivityResult(
-                OpenDocument(),
-                resultCallback
-            )
-        }
-    }
-
-    fun buildCreateDocument(typeString: String = "application/octet-stream",
-                            onFileCreated: (fileCreated: Uri?)->Unit) {
-
-        val resultCallback = ActivityResultCallback<Uri> { result ->
-            onFileCreated.invoke(result)
-        }
-
-        createDocumentResultLauncher = if (fragment != null) {
-            fragment?.registerForActivityResult(
-                CreateDocument(typeString),
-                resultCallback
-            )
-        } else {
-            activity?.registerForActivityResult(
-                CreateDocument(typeString),
-                resultCallback
-            )
-        }
-    }
-
-    fun openDocument(getContent: Boolean = false,
-                     typeString: String = "*/*") {
-        try {
-            if (getContent) {
-                getContentResultLauncher?.launch(typeString)
-            } else {
-                openDocumentResultLauncher?.launch(arrayOf(typeString))
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to open document", e)
-            showFileManagerDialogFragment()
-        }
-    }
-
-    fun createDocument(titleString: String) {
-        try {
-            createDocumentResultLauncher?.launch(titleString)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to create document", e)
-            showFileManagerDialogFragment()
-        }
-    }
-
-    /**
-     * Show Browser dialog to select file picker app
-     */
-    private fun showFileManagerDialogFragment() {
-        try {
-            if (fragment != null) {
-                fragment?.parentFragmentManager
-            } else {
-                activity?.supportFragmentManager
-            }?.let { fragmentManager ->
-                FileManagerDialogFragment().show(fragmentManager, "browserDialog")
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Can't open BrowserDialog", e)
-        }
-    }
-
-    class OpenDocument : ActivityResultContracts.OpenDocument() {
-        @SuppressLint("InlinedApi")
-        override fun createIntent(context: Context, input: Array<out String>): Intent {
-            return super.createIntent(context, input).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-                }
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            }
-        }
-    }
-
-    class GetContent : ActivityResultContracts.GetContent() {
-        @SuppressLint("InlinedApi")
-        override fun createIntent(context: Context, input: String): Intent {
-            return super.createIntent(context, input).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-                }
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            }
-        }
-    }
-
-    class CreateDocument(private val typeString: String) : ActivityResultContracts.CreateDocument() {
-        override fun createIntent(context: Context, input: String): Intent {
-            return super.createIntent(context, input).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = typeString
-            }
-        }
-    }
-
-
-    companion object {
-
-        private const val TAG = "OpenFileHelper"
-
-        @SuppressLint("InlinedApi")
-        fun allowCreateDocumentByStorageAccessFramework(packageManager: PackageManager,
-                                                        typeString: String = "application/octet-stream"): Boolean {
-            return when {
-                // To check if a custom file manager can manage the ACTION_CREATE_DOCUMENT
-                Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT -> {
-                    packageManager.queryIntentActivities(Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                        addCategory(Intent.CATEGORY_OPENABLE)
-                        type = typeString
-                    }, PackageManager.MATCH_DEFAULT_ONLY).isNotEmpty()
-                }
-                else -> true
-            }
-        }
-    }
-}
-
-fun View.setOpenDocumentClickListener(externalFileHelper: ExternalFileHelper?) {
-    externalFileHelper?.let { fileHelper ->
-        setOnClickListener {
-            fileHelper.openDocument(false)
-        }
-        setOnLongClickListener {
-            fileHelper.openDocument(true)
-            true
-        }
-    } ?: kotlin.run {
-        setOnClickListener(null)
-        setOnLongClickListener(null)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ReadOnlyHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ReadOnlyHelper.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.helpers
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+import com.kunzisoft.keepass.settings.PreferencesUtil
+
+object ReadOnlyHelper {
+
+    private const val READ_ONLY_KEY = "READ_ONLY_KEY"
+
+    const val READ_ONLY_DEFAULT = false
+
+    fun retrieveReadOnlyFromIntent(intent: Intent): Boolean {
+        return intent.getBooleanExtra(READ_ONLY_KEY, READ_ONLY_DEFAULT)
+    }
+
+    fun retrieveReadOnlyFromInstanceStateOrPreference(context: Context, savedInstanceState: Bundle?): Boolean {
+        return if (savedInstanceState != null && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            savedInstanceState.getBoolean(READ_ONLY_KEY)
+        } else {
+            PreferencesUtil.enableReadOnlyDatabase(context)
+        }
+    }
+
+    fun retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState: Bundle?, arguments: Bundle?): Boolean {
+        var readOnly = READ_ONLY_DEFAULT
+        if (savedInstanceState != null && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY)
+        } else if (arguments != null && arguments.containsKey(READ_ONLY_KEY)) {
+            readOnly = arguments.getBoolean(READ_ONLY_KEY)
+        }
+        return readOnly
+    }
+
+    fun retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState: Bundle?, intent: Intent?): Boolean {
+        var readOnly = READ_ONLY_DEFAULT
+        if (savedInstanceState != null && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY)
+        } else {
+            if (intent != null)
+                readOnly = intent.getBooleanExtra(READ_ONLY_KEY, READ_ONLY_DEFAULT)
+        }
+        return readOnly
+    }
+
+    fun putReadOnlyInIntent(intent: Intent, readOnly: Boolean) {
+        intent.putExtra(READ_ONLY_KEY, readOnly)
+    }
+
+    fun putReadOnlyInBundle(bundle: Bundle, readOnly: Boolean) {
+        bundle.putBoolean(READ_ONLY_KEY, readOnly)
+    }
+
+    fun onSaveInstanceState(outState: Bundle, readOnly: Boolean) {
+        outState.putBoolean(READ_ONLY_KEY, readOnly)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/SelectFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/SelectFileHelper.kt
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.helpers
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Activity.RESULT_OK
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import android.view.MenuItem
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
+import com.kunzisoft.keepass.utils.UriUtil
+
+class SelectFileHelper {
+
+    private var activity: Activity? = null
+    private var fragment: Fragment? = null
+
+    val selectFileOnClickViewListener: SelectFileOnClickViewListener
+        get() = SelectFileOnClickViewListener()
+
+    constructor(context: Activity) {
+        this.activity = context
+        this.fragment = null
+    }
+
+    constructor(context: Fragment) {
+        this.activity = context.activity
+        this.fragment = context
+    }
+
+    inner class SelectFileOnClickViewListener :
+            View.OnClickListener,
+            View.OnLongClickListener,
+            MenuItem.OnMenuItemClickListener {
+
+        private fun onAbstractClick(longClick: Boolean = false) {
+            try {
+                if (longClick) {
+                    try {
+                        openActivityWithActionGetContent()
+                    } catch (e: Exception) {
+                        openActivityWithActionOpenDocument()
+                    }
+                } else {
+                    try {
+                        openActivityWithActionOpenDocument()
+                    } catch (e: Exception) {
+                        openActivityWithActionGetContent()
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Enable to start the file picker activity", e)
+                // Open browser dialog
+                if (lookForOpenIntentsFilePicker())
+                    showBrowserDialog()
+            }
+        }
+
+        override fun onClick(v: View) {
+            onAbstractClick()
+        }
+
+        override fun onLongClick(v: View?): Boolean {
+            onAbstractClick(true)
+            return true
+        }
+
+        override fun onMenuItemClick(item: MenuItem?): Boolean {
+            onAbstractClick()
+            return true
+        }
+    }
+
+    @SuppressLint("InlinedApi")
+    private fun openActivityWithActionOpenDocument() {
+        val intentOpenDocument = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = "*/*"
+            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+        if (fragment != null)
+            fragment?.startActivityForResult(intentOpenDocument, OPEN_DOC)
+        else
+            activity?.startActivityForResult(intentOpenDocument, OPEN_DOC)
+    }
+
+    @SuppressLint("InlinedApi")
+    private fun openActivityWithActionGetContent() {
+        val intentGetContent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = "*/*"
+            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+        if (fragment != null)
+            fragment?.startActivityForResult(intentGetContent, GET_CONTENT)
+        else
+            activity?.startActivityForResult(intentGetContent, GET_CONTENT)
+    }
+
+    private fun lookForOpenIntentsFilePicker(): Boolean {
+        var showBrowser = false
+        try {
+            if (isIntentAvailable(activity!!, OPEN_INTENTS_FILE_BROWSE)) {
+                val intent = Intent(OPEN_INTENTS_FILE_BROWSE)
+                if (fragment != null)
+                    fragment?.startActivityForResult(intent, FILE_BROWSE)
+                else
+                    activity?.startActivityForResult(intent, FILE_BROWSE)
+            } else {
+                showBrowser = true
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Enable to start OPEN_INTENTS_FILE_BROWSE", e)
+            showBrowser = true
+        }
+
+        return showBrowser
+    }
+
+    /**
+     * Indicates whether the specified action can be used as an intent. This
+     * method queries the package manager for installed packages that can
+     * respond to an intent with the specified action. If no suitable package is
+     * found, this method returns false.
+     *
+     * @param context The application's environment.
+     * @param action The Intent action to check for availability.
+     *
+     * @return True if an Intent with the specified action can be sent and
+     * responded to, false otherwise.
+     */
+    private fun isIntentAvailable(context: Context, action: String): Boolean {
+        val packageManager = context.packageManager
+        val intent = Intent(action)
+        val list = packageManager.queryIntentActivities(intent,
+                PackageManager.MATCH_DEFAULT_ONLY)
+        return list.size > 0
+    }
+
+    /**
+     * Show Browser dialog to select file picker app
+     */
+    private fun showBrowserDialog() {
+        try {
+            val fileManagerDialogFragment = FileManagerDialogFragment()
+            fragment?.let {
+                fileManagerDialogFragment.show(it.parentFragmentManager, "browserDialog")
+            } ?: fileManagerDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
+        } catch (e: Exception) {
+            Log.e(TAG, "Can't open BrowserDialog", e)
+        }
+    }
+
+    /**
+     * To use in onActivityResultCallback in Fragment or Activity
+     * @param keyFileCallback Callback retrieve from data
+     * @return true if requestCode was captured, false elsechere
+     */
+    fun onActivityResultCallback(
+            requestCode: Int,
+            resultCode: Int,
+            data: Intent?,
+            keyFileCallback: ((uri: Uri?) -> Unit)?): Boolean {
+
+        when (requestCode) {
+            FILE_BROWSE -> {
+                if (resultCode == RESULT_OK) {
+                    val filename = data?.dataString
+                    var keyUri: Uri? = null
+                    if (filename != null) {
+                        keyUri = UriUtil.parse(filename)
+                    }
+                    keyFileCallback?.invoke(keyUri)
+                }
+                return true
+            }
+            GET_CONTENT, OPEN_DOC -> {
+                if (resultCode == RESULT_OK) {
+                    if (data != null) {
+                        val uri = data.data
+                        if (uri != null) {
+                            try {
+                                // try to persist read and write permissions
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                                    activity?.contentResolver?.apply {
+                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                // nop
+                            }
+                            keyFileCallback?.invoke(uri)
+                        }
+                    }
+                }
+                return true
+            }
+        }
+        return false
+    }
+
+    companion object {
+
+        private const val TAG = "OpenFileHelper"
+
+        const val OPEN_INTENTS_FILE_BROWSE = "org.openintents.action.PICK_FILE"
+
+        private const val GET_CONTENT = 25745
+        private const val OPEN_DOC = 25845
+        private const val FILE_BROWSE = 25645
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
@@ -1,80 +0,0 @@
-package com.kunzisoft.keepass.activities.legacy
-
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.viewModels
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
-
-abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval {
-
-    protected val mDatabaseViewModel: DatabaseViewModel by viewModels()
-    protected var mDatabaseTaskProvider: DatabaseTaskProvider? = null
-    protected var mDatabase: Database? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        mDatabaseTaskProvider = DatabaseTaskProvider(this)
-
-        mDatabaseTaskProvider?.onDatabaseRetrieved = { database ->
-            val databaseWasReloaded = database?.wasReloaded == true
-            if (databaseWasReloaded && finishActivityIfReloadRequested()) {
-                finish()
-            } else if (mDatabase == null || mDatabase != database || databaseWasReloaded) {
-                database?.wasReloaded = false
-                onDatabaseRetrieved(database)
-            }
-        }
-        mDatabaseTaskProvider?.onActionFinish = { database, actionTask, result ->
-            onDatabaseActionFinished(database, actionTask, result)
-        }
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        mDatabase = database
-        mDatabaseViewModel.defineDatabase(database)
-        // optional method implementation
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        mDatabaseViewModel.onActionFinished(database, actionTask, result)
-        // optional method implementation
-    }
-
-    fun createDatabase(databaseUri: Uri,
-                       mainCredential: MainCredential) {
-        mDatabaseTaskProvider?.startDatabaseCreate(databaseUri, mainCredential)
-    }
-
-    fun loadDatabase(databaseUri: Uri,
-                     mainCredential: MainCredential,
-                     readOnly: Boolean,
-                     cipherEncryptDatabase: CipherEncryptDatabase?,
-                     fixDuplicateUuid: Boolean) {
-        mDatabaseTaskProvider?.startDatabaseLoad(databaseUri, mainCredential, readOnly, cipherEncryptDatabase, fixDuplicateUuid)
-    }
-
-    protected fun closeDatabase() {
-        mDatabase?.clearAndClose(this)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mDatabaseTaskProvider?.registerProgressTask()
-    }
-
-    override fun onPause() {
-        mDatabaseTaskProvider?.unregisterProgressTask()
-        super.onPause()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
@@ -1,491 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.legacy
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.activity.viewModels
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.SpecialMode
-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
-import com.kunzisoft.keepass.database.element.node.NodeId
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.*
-import com.kunzisoft.keepass.view.showActionErrorIfNeeded
-import com.kunzisoft.keepass.viewmodels.NodesViewModel
-import java.util.*
-
-abstract class DatabaseLockActivity : DatabaseModeActivity(),
-    PasswordEncodingDialogFragment.Listener {
-
-    private val mNodesViewModel: NodesViewModel by viewModels()
-
-    protected var mTimeoutEnable: Boolean = true
-
-    private var mLockReceiver: LockReceiver? = null
-    private var mExitLock: Boolean = false
-
-    protected var mDatabaseReadOnly: Boolean = true
-    protected var mMergeDataAllowed: Boolean = false
-    private var mAutoSaveEnable: Boolean = true
-
-    protected var mIconDrawableFactory: IconDrawableFactory? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState != null
-            && savedInstanceState.containsKey(TIMEOUT_ENABLE_KEY)
-        ) {
-            mTimeoutEnable = savedInstanceState.getBoolean(TIMEOUT_ENABLE_KEY)
-        } else {
-            if (intent != null)
-                mTimeoutEnable =
-                    intent.getBooleanExtra(TIMEOUT_ENABLE_KEY, TIMEOUT_ENABLE_KEY_DEFAULT)
-        }
-
-        mNodesViewModel.nodesToPermanentlyDelete.observe(this) { nodes ->
-            deleteDatabaseNodes(nodes)
-        }
-
-        mDatabaseViewModel.saveDatabase.observe(this) { save ->
-            mDatabaseTaskProvider?.startDatabaseSave(save)
-        }
-
-        mDatabaseViewModel.mergeDatabase.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseMerge()
-        }
-
-        mDatabaseViewModel.reloadDatabase.observe(this) { fixDuplicateUuid ->
-            mDatabaseTaskProvider?.askToStartDatabaseReload(mDatabase?.dataModifiedSinceLastLoading != false) {
-                mDatabaseTaskProvider?.startDatabaseReload(fixDuplicateUuid)
-            }
-        }
-
-        mDatabaseViewModel.saveName.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveName(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveDescription.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveDescription(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveDefaultUsername.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveDefaultUsername(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveColor.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveColor(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveCompression.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveCompression(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.removeUnlinkData.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseRemoveUnlinkedData(it)
-        }
-
-        mDatabaseViewModel.saveRecycleBin.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveRecycleBin(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveTemplatesGroup.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveTemplatesGroup(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveMaxHistoryItems.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveMaxHistoryItems(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveMaxHistorySize.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveMaxHistorySize(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveEncryption.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveEncryption(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveKeyDerivation.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveKeyDerivation(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveIterations.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveIterations(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveMemoryUsage.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveMemoryUsage(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveParallelism.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveParallelism(it.oldValue, it.newValue, it.save)
-        }
-
-        mExitLock = false
-    }
-
-    open fun finishActivityIfDatabaseNotLoaded(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        // End activity if database not loaded
-        if (finishActivityIfDatabaseNotLoaded() && (database == null || !database.loaded)) {
-            finish()
-        }
-
-        // Focus view to reinitialize timeout,
-        // view is not necessary loaded so retry later in resume
-        viewToInvalidateTimeout()
-            ?.resetAppTimeoutWhenViewTouchedOrFocused(this, database?.loaded)
-
-        database?.let {
-            // check timeout
-            if (mTimeoutEnable) {
-                if (mLockReceiver == null) {
-                    mLockReceiver = LockReceiver {
-                        mDatabase = null
-                        closeDatabase(database)
-                        if (LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == null)
-                            LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
-                        mExitLock = true
-                        closeOptionsMenu()
-                        finish()
-                    }
-                    registerLockReceiver(mLockReceiver)
-                }
-
-                // After the first creation
-                // or If simply swipe with another application
-                // If the time is out -> close the Activity
-                TimeoutHelper.checkTimeAndLockIfTimeout(this)
-                // If onCreate already record time
-                if (!mExitLock)
-                    TimeoutHelper.recordTime(this, database.loaded)
-            }
-
-            mDatabaseReadOnly = database.isReadOnly
-            mMergeDataAllowed = database.isMergeDataAllowed()
-            mIconDrawableFactory = database.iconDrawableFactory
-
-            checkRegister()
-        }
-    }
-
-    abstract fun viewToInvalidateTimeout(): View?
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-        when (actionTask) {
-            DatabaseTaskNotificationService.ACTION_DATABASE_MERGE_TASK,
-            DatabaseTaskNotificationService.ACTION_DATABASE_RELOAD_TASK -> {
-                // Reload the current activity
-                if (result.isSuccess) {
-                    reloadActivity()
-                } else {
-                    this.showActionErrorIfNeeded(result)
-                    finish()
-                }
-            }
-        }
-    }
-
-    override fun onPasswordEncodingValidateListener(databaseUri: Uri?,
-                                                    mainCredential: MainCredential) {
-        assignDatabasePassword(databaseUri, mainCredential)
-    }
-
-    private fun assignDatabasePassword(databaseUri: Uri?,
-                                       mainCredential: MainCredential) {
-        if (databaseUri != null) {
-            mDatabaseTaskProvider?.startDatabaseAssignPassword(databaseUri, mainCredential)
-        }
-    }
-
-    fun assignPassword(mainCredential: MainCredential) {
-        mDatabase?.let { database ->
-            database.fileUri?.let { databaseUri ->
-                // Show the progress dialog now or after dialog confirmation
-                if (database.validatePasswordEncoding(mainCredential)) {
-                    assignDatabasePassword(databaseUri, mainCredential)
-                } else {
-                    PasswordEncodingDialogFragment.getInstance(databaseUri, mainCredential)
-                        .show(supportFragmentManager, "passwordEncodingTag")
-                }
-            }
-        }
-    }
-
-    fun saveDatabase() {
-        mDatabaseTaskProvider?.startDatabaseSave(true)
-    }
-
-    fun saveDatabaseTo(uri: Uri) {
-        mDatabaseTaskProvider?.startDatabaseSave(true, uri)
-    }
-
-    fun mergeDatabase() {
-        mDatabaseTaskProvider?.startDatabaseMerge()
-    }
-
-    fun mergeDatabaseFrom(uri: Uri, mainCredential: MainCredential) {
-        mDatabaseTaskProvider?.startDatabaseMerge(uri, mainCredential)
-    }
-
-    fun reloadDatabase() {
-        mDatabaseTaskProvider?.askToStartDatabaseReload(mDatabase?.dataModifiedSinceLastLoading != false) {
-            mDatabaseTaskProvider?.startDatabaseReload(false)
-        }
-    }
-
-    fun createEntry(newEntry: Entry,
-                    parent: Group) {
-        mDatabaseTaskProvider?.startDatabaseCreateEntry(newEntry, parent, mAutoSaveEnable)
-    }
-
-    fun updateEntry(oldEntry: Entry,
-                    entryToUpdate: Entry) {
-        mDatabaseTaskProvider?.startDatabaseUpdateEntry(oldEntry, entryToUpdate, mAutoSaveEnable)
-    }
-
-    fun copyNodes(nodesToCopy: List<Node>,
-                  newParent: Group) {
-        mDatabaseTaskProvider?.startDatabaseCopyNodes(nodesToCopy, newParent, mAutoSaveEnable)
-    }
-
-    fun moveNodes(nodesToMove: List<Node>,
-                  newParent: Group) {
-        mDatabaseTaskProvider?.startDatabaseMoveNodes(nodesToMove, newParent, mAutoSaveEnable)
-    }
-
-    private fun eachNodeRecyclable(database: Database, nodes: List<Node>): Boolean {
-        return nodes.find { node ->
-            var cannotRecycle = true
-            if (node is Entry) {
-                cannotRecycle = !database.canRecycle(node)
-            } else if (node is Group) {
-                cannotRecycle = !database.canRecycle(node)
-            }
-            cannotRecycle
-        } == null
-    }
-
-    fun deleteNodes(nodes: List<Node>, recycleBin: Boolean = false) {
-        mDatabase?.let { database ->
-            // If recycle bin enabled, ensure it exists
-            if (database.isRecycleBinEnabled) {
-                database.ensureRecycleBinExists(resources)
-            }
-
-            // If recycle bin enabled and not in recycle bin, move in recycle bin
-            if (eachNodeRecyclable(database, nodes)) {
-                deleteDatabaseNodes(nodes)
-            }
-            // else open the dialog to confirm deletion
-            else {
-                DeleteNodesDialogFragment.getInstance(recycleBin)
-                    .show(supportFragmentManager, "deleteNodesDialogFragment")
-                mNodesViewModel.deleteNodes(nodes)
-            }
-        }
-    }
-
-    private fun deleteDatabaseNodes(nodes: List<Node>) {
-        mDatabaseTaskProvider?.startDatabaseDeleteNodes(nodes, mAutoSaveEnable)
-    }
-
-    fun createGroup(parent: Group,
-                    groupInfo: GroupInfo?) {
-        // Build the group
-        mDatabase?.createGroup()?.let { newGroup ->
-            groupInfo?.let { info ->
-                newGroup.setGroupInfo(info)
-            }
-            // Not really needed here because added in runnable but safe
-            newGroup.parent = parent
-            mDatabaseTaskProvider?.startDatabaseCreateGroup(newGroup, parent, mAutoSaveEnable)
-        }
-    }
-
-    fun updateGroup(oldGroup: Group,
-                    groupInfo: GroupInfo) {
-        // If group updated save it in the database
-        val updateGroup = Group(oldGroup).let { updateGroup ->
-            updateGroup.apply {
-                // WARNING remove parent and children to keep memory
-                removeParent()
-                removeChildren()
-                this.setGroupInfo(groupInfo)
-            }
-        }
-        mDatabaseTaskProvider?.startDatabaseUpdateGroup(oldGroup, updateGroup, mAutoSaveEnable)
-    }
-
-    fun restoreEntryHistory(mainEntryId: NodeId<UUID>,
-                            entryHistoryPosition: Int) {
-        mDatabaseTaskProvider
-            ?.startDatabaseRestoreEntryHistory(mainEntryId, entryHistoryPosition, mAutoSaveEnable)
-    }
-
-    fun deleteEntryHistory(mainEntryId: NodeId<UUID>,
-                           entryHistoryPosition: Int) {
-        mDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(mainEntryId, entryHistoryPosition, mAutoSaveEnable)
-    }
-
-    private fun checkRegister() {
-        // If in ave or registration mode, don't allow read only
-        if ((mSpecialMode == SpecialMode.SAVE
-                    || mSpecialMode == SpecialMode.REGISTRATION)
-            && mDatabaseReadOnly) {
-            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
-            EntrySelectionHelper.removeModesFromIntent(intent)
-            finish()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        // To refresh when back to normal workflow from selection workflow
-        mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
-
-        // Invalidate timeout by touch
-        mDatabase?.let { database ->
-            viewToInvalidateTimeout()
-                ?.resetAppTimeoutWhenViewTouchedOrFocused(this, database.loaded)
-        }
-
-        invalidateOptionsMenu()
-
-        LOCKING_ACTIVITY_UI_VISIBLE = true
-    }
-
-    protected fun checkTimeAndLockIfTimeoutOrResetTimeout(action: (() -> Unit)? = null) {
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
-            mDatabase?.loaded == true,
-            action)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
-        super.onSaveInstanceState(outState)
-    }
-
-    override fun onPause() {
-        LOCKING_ACTIVITY_UI_VISIBLE = false
-
-        super.onPause()
-
-        if (mTimeoutEnable) {
-            // If the time is out during our navigation in activity -> close the Activity
-            TimeoutHelper.checkTimeAndLockIfTimeout(this)
-        }
-    }
-
-    override fun onDestroy() {
-        unregisterLockReceiver(mLockReceiver)
-        super.onDestroy()
-    }
-
-    protected fun lockAndExit() {
-        sendBroadcast(Intent(LOCK_ACTION))
-    }
-
-    fun resetAppTimeout() {
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
-            mDatabase?.loaded ?: false)
-    }
-
-    override fun onBackPressed() {
-        if (mTimeoutEnable) {
-            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
-                mDatabase?.loaded == true) {
-                super.onBackPressed()
-            }
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-    companion object {
-
-        const val TAG = "LockingActivity"
-
-        const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
-        const val TIMEOUT_ENABLE_KEY_DEFAULT = true
-
-        private var LOCKING_ACTIVITY_UI_VISIBLE = false
-        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
-    }
-}
-
-/**
- * To reset the app timeout when a view is focused or changed
- */
-@SuppressLint("ClickableViewAccessibility")
-fun View.resetAppTimeoutWhenViewTouchedOrFocused(context: Context, databaseLoaded: Boolean?) {
-    // Log.d(DatabaseLockActivity.TAG, "View prepared to reset app timeout")
-    setOnTouchListener { _, event ->
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                // Log.d(DatabaseLockActivity.TAG, "View touched, try to reset app timeout")
-                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-                    databaseLoaded ?: false)
-            }
-        }
-        false
-    }
-    setOnFocusChangeListener { _, _ ->
-        // Log.d(DatabaseLockActivity.TAG, "View focused, try to reset app timeout")
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-            databaseLoaded ?: false)
-    }
-    if (this is ViewGroup) {
-        for (i in 0..childCount) {
-            getChildAt(i)?.resetAppTimeoutWhenViewTouchedOrFocused(context, databaseLoaded)
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseRetrieval.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseRetrieval.kt
@@ -1,11 +0,0 @@
-package com.kunzisoft.keepass.activities.legacy
-
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.tasks.ActionRunnable
-
-interface DatabaseRetrieval {
-    fun onDatabaseRetrieved(database: Database?)
-    fun onDatabaseActionFinished(database: Database,
-                                 actionTask: String,
-                                 result: ActionRunnable.Result)
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.lock
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.timeout.TimeoutHelper
+import com.kunzisoft.keepass.utils.*
+
+abstract class LockingActivity : SpecialModeActivity() {
+
+    protected var mTimeoutEnable: Boolean = true
+
+    private var mLockReceiver: LockReceiver? = null
+    private var mExitLock: Boolean = false
+
+    // Force readOnly if Entry Selection mode
+    protected var mReadOnly: Boolean
+        get() {
+            return mReadOnlyToSave
+        }
+        set(value) {
+            mReadOnlyToSave = value
+        }
+    private var mReadOnlyToSave: Boolean = false
+    protected var mAutoSaveEnable: Boolean = true
+
+    var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
+        private set
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
+
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(TIMEOUT_ENABLE_KEY)) {
+            mTimeoutEnable = savedInstanceState.getBoolean(TIMEOUT_ENABLE_KEY)
+        } else {
+            if (intent != null)
+                mTimeoutEnable = intent.getBooleanExtra(TIMEOUT_ENABLE_KEY, TIMEOUT_ENABLE_KEY_DEFAULT)
+        }
+
+        if (mTimeoutEnable) {
+            mLockReceiver = LockReceiver {
+                closeDatabase()
+                if (LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == null)
+                    LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
+                // Add onActivityForResult response
+                setResult(RESULT_EXIT_LOCK)
+                closeOptionsMenu()
+                finish()
+            }
+            registerLockReceiver(mLockReceiver)
+        }
+
+        mExitLock = false
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == RESULT_EXIT_LOCK) {
+            mExitLock = true
+            if (Database.getInstance().loaded) {
+                lockAndExit()
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // If in ave or registration mode, don't allow read only
+        if ((mSpecialMode == SpecialMode.SAVE
+                        || mSpecialMode == SpecialMode.REGISTRATION)
+                && mReadOnly) {
+            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            finish()
+        }
+
+        mProgressDatabaseTaskProvider?.registerProgressTask()
+
+        // To refresh when back to normal workflow from selection workflow
+        mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent)
+        mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
+
+        invalidateOptionsMenu()
+
+        if (mTimeoutEnable) {
+            // End activity if database not loaded
+            if (!Database.getInstance().loaded) {
+                finish()
+                return
+            }
+
+            // After the first creation
+            // or If simply swipe with another application
+            // If the time is out -> close the Activity
+            TimeoutHelper.checkTimeAndLockIfTimeout(this)
+            // If onCreate already record time
+            if (!mExitLock)
+                TimeoutHelper.recordTime(this)
+        }
+
+        LOCKING_ACTIVITY_UI_VISIBLE = true
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onPause() {
+        LOCKING_ACTIVITY_UI_VISIBLE = false
+
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
+
+        super.onPause()
+
+        if (mTimeoutEnable) {
+            // If the time is out during our navigation in activity -> close the Activity
+            TimeoutHelper.checkTimeAndLockIfTimeout(this)
+        }
+    }
+
+    override fun onDestroy() {
+        unregisterLockReceiver(mLockReceiver)
+        super.onDestroy()
+    }
+
+    protected fun lockAndExit() {
+        sendBroadcast(Intent(LOCK_ACTION))
+    }
+
+    override fun onBackPressed() {
+        if (mTimeoutEnable) {
+            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
+                super.onBackPressed()
+            }
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    companion object {
+
+        const val TAG = "LockingActivity"
+
+        const val RESULT_EXIT_LOCK = 1450
+
+        const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
+        const val TIMEOUT_ENABLE_KEY_DEFAULT = true
+
+        private var LOCKING_ACTIVITY_UI_VISIBLE = false
+        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
+    }
+}
+
+/**
+ * To reset the app timeout when a view is focused or changed
+ */
+@SuppressLint("ClickableViewAccessibility")
+fun View.resetAppTimeoutWhenViewFocusedOrChanged(context: Context) {
+    setOnTouchListener { _, event ->
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                //Log.d(LockingActivity.TAG, "View touched, try to reset app timeout")
+                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context)
+            }
+        }
+        false
+    }
+    setOnFocusChangeListener { _, _ ->
+        //Log.d(LockingActivity.TAG, "View focused, try to reset app timeout")
+        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context)
+    }
+    if (this is ViewGroup) {
+        for (i in 0..childCount) {
+            getChildAt(i)?.resetAppTimeoutWhenViewFocusedOrChanged(context)
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
@@ -1,23 +1,21 @@
-package com.kunzisoft.keepass.activities.legacy
+package com.kunzisoft.keepass.activities.selection

 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.View
 import android.widget.Toast
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.helpers.TypeMode
+import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.SpecialModeView

-
 /**
- * Activity to manage database special mode (ie: selection mode)
+ * Activity to manage special mode (ie: selection mode)
 */
-abstract class DatabaseModeActivity : DatabaseActivity() {
+abstract class SpecialModeActivity : StylishActivity() {

    protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
    private var mTypeMode: TypeMode = TypeMode.DEFAULT
@@ -66,7 +64,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
            EntrySelectionHelper.removeModesFromIntent(intent)
            EntrySelectionHelper.removeInfoFromIntent(intent)
            if (mSpecialMode != SpecialMode.DEFAULT) {
-                backToTheMainAppAndFinish()
+                // To move the app in background
+                moveTaskToBack(true)
            }
        }
    }
@@ -79,7 +78,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
            EntrySelectionHelper.removeModesFromIntent(intent)
            EntrySelectionHelper.removeInfoFromIntent(intent)
            if (mSpecialMode != SpecialMode.DEFAULT) {
-                backToTheMainAppAndFinish()
+                // To move the app in background
+                moveTaskToBack(true)
            }
        }
    }
@@ -89,19 +89,11 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
            // To get the app caller, only for IntentSender
            super.onBackPressed()
        } else {
-            backToTheMainAppAndFinish()
+            // To move the app in background
+            moveTaskToBack(true)
        }
    }

-    private fun backToTheMainAppAndFinish() {
-        // To move the app in background and return to the main app
-        moveTaskToBack(true)
-        // To remove this instance in the OS app selector
-        Handler(Looper.getMainLooper()).postDelayed({
-            finish()
-        }, 500)
-    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -169,17 +161,12 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
        }

        // To hide home button from the regular toolbar in special mode
-        if (mSpecialMode != SpecialMode.DEFAULT
-            && hideHomeButtonIfModeIsNotDefault()) {
+        if (mSpecialMode != SpecialMode.DEFAULT) {
            supportActionBar?.setDisplayHomeAsUpEnabled(false)
            supportActionBar?.setDisplayShowHomeEnabled(false)
        }
    }

-    open fun hideHomeButtonIfModeIsNotDefault(): Boolean {
-        return true
-    }
-
    private fun blockAutofill(searchInfo: SearchInfo?) {
        val webDomain = searchInfo?.webDomain
        val applicationId = searchInfo?.applicationId
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
@@ -37,16 +37,12 @@ object Stylish {
     * Initialize the class with a theme preference
     * @param context Context to retrieve the theme preference
     */
-    fun load(context: Context) {
+    fun init(context: Context) {
        Log.d(Stylish::class.java.name, "Attatching to " + context.packageName)
-        try {
-            themeString = PreferencesUtil.getStyle(context)
-        } catch (e: Exception) {
-            Log.e("Stylish", "Unable to get preference style", e)
-        }
+        themeString = PreferencesUtil.getStyle(context)
    }

-    fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
+    private fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
        val systemNightMode = when (PreferencesUtil.getStyleBrightness(context)) {
            context.getString(R.string.list_style_brightness_light) -> false
            context.getString(R.string.list_style_brightness_night) -> true
@@ -69,10 +65,8 @@ object Stylish {
            context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light)
            context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white)
            context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear)
-            context.getString(R.string.list_style_name_simple_night) -> context.getString(R.string.list_style_name_simple)
            context.getString(R.string.list_style_name_blue_night) -> context.getString(R.string.list_style_name_blue)
            context.getString(R.string.list_style_name_red_night) -> context.getString(R.string.list_style_name_red)
-            context.getString(R.string.list_style_name_reply_night) -> context.getString(R.string.list_style_name_reply)
            context.getString(R.string.list_style_name_purple_dark) -> context.getString(R.string.list_style_name_purple)
            else -> styleString
        }
@@ -83,25 +77,19 @@ object Stylish {
            context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night)
            context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black)
            context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark)
-            context.getString(R.string.list_style_name_simple) -> context.getString(R.string.list_style_name_simple_night)
            context.getString(R.string.list_style_name_blue) -> context.getString(R.string.list_style_name_blue_night)
            context.getString(R.string.list_style_name_red) -> context.getString(R.string.list_style_name_red_night)
-            context.getString(R.string.list_style_name_reply) -> context.getString(R.string.list_style_name_reply_night)
            context.getString(R.string.list_style_name_purple) -> context.getString(R.string.list_style_name_purple_dark)
            else -> styleString
        }
    }

-    fun defaultStyle(context: Context): String {
-        return context.getString(R.string.list_style_name_light)
-    }
-
    /**
     * Assign the style to the class attribute
     * @param styleString Style id String
     */
    fun assignStyle(context: Context, styleString: String) {
-        PreferencesUtil.setStyle(context, styleString)
+        themeString = retrieveEquivalentSystemStyle(context, styleString)
    }

    /**
@@ -117,14 +105,10 @@ object Stylish {
            context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black
            context.getString(R.string.list_style_name_clear) -> R.style.KeepassDXStyle_Clear
            context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark
-            context.getString(R.string.list_style_name_simple) -> R.style.KeepassDXStyle_Simple
-            context.getString(R.string.list_style_name_simple_night) -> R.style.KeepassDXStyle_Simple_Night
            context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue
            context.getString(R.string.list_style_name_blue_night) -> R.style.KeepassDXStyle_Blue_Night
            context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red
            context.getString(R.string.list_style_name_red_night) -> R.style.KeepassDXStyle_Red_Night
-            context.getString(R.string.list_style_name_reply) -> R.style.KeepassDXStyle_Reply
-            context.getString(R.string.list_style_name_reply_night) -> R.style.KeepassDXStyle_Reply_Night
            context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple
            context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark
            else -> R.style.KeepassDXStyle_Light
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
@@ -22,13 +22,10 @@ package com.kunzisoft.keepass.activities.stylish
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.view.WindowManager
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.settings.NestedAppSettingsFragment.Companion.DATABASE_PREFERENCE_CHANGED
+import android.util.Log
+import android.view.WindowManager

 /**
 * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from
@@ -38,7 +35,6 @@ abstract class StylishActivity : AppCompatActivity() {

    @StyleRes
    private var themeId: Int = 0
-    private var customStyle = true

    /* (non-Javadoc) Workaround for HTC Linkify issues
     * @see android.app.Activity#startActivity(android.content.Intent)
@@ -56,30 +52,10 @@ abstract class StylishActivity : AppCompatActivity() {
        }
    }

-    open fun applyCustomStyle(): Boolean {
-        return true
-    }
-
-    open fun finishActivityIfReloadRequested(): Boolean {
-        return false
-    }
-
-    open fun reloadActivity() {
-        if (!finishActivityIfReloadRequested()) {
-            startActivity(intent)
-        }
-        finish()
-        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
-    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-
-        customStyle = applyCustomStyle()
-        if (customStyle) {
-            this.themeId = Stylish.getThemeId(this)
-            setTheme(themeId)
-        }
+        this.themeId = Stylish.getThemeId(this)
+        setTheme(themeId)

        // Several gingerbread devices have problems with FLAG_SECURE
        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
@@ -87,17 +63,9 @@ abstract class StylishActivity : AppCompatActivity() {

    override fun onResume() {
        super.onResume()
-
-        if ((customStyle && Stylish.getThemeId(this) != this.themeId)
-            || DATABASE_PREFERENCE_CHANGED) {
-            DATABASE_PREFERENCE_CHANGED = false
+        if (Stylish.getThemeId(this) != this.themeId) {
            Log.d(this.javaClass.name, "Theme change detected, restarting activity")
-            recreateActivity()
+            this.recreate()
        }
    }
-
-    private fun recreateActivity() {
-        // To prevent KitKat bugs
-        Handler(Looper.getMainLooper()).post { recreate() }
-    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
@@ -23,14 +23,12 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
+import androidx.annotation.StyleRes
+import androidx.fragment.app.Fragment
+import androidx.appcompat.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.StyleRes
-import androidx.appcompat.view.ContextThemeWrapper
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.fragment.app.Fragment

 abstract class StylishFragment : Fragment() {

@@ -44,46 +42,32 @@ abstract class StylishFragment : Fragment() {
        contextThemed = ContextThemeWrapper(context, themeId)
    }

+    @Suppress("DEPRECATION")
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        // To fix status bar color
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            val window = requireActivity().window
            val defaultColor = Color.BLACK
-            val windowInset = WindowInsetsControllerCompat(window, window.decorView)
+
            try {
                val taStatusBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
                window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
                taStatusBarColor?.recycle()
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to retrieve theme : status bar color", e)
-            }
+            } catch (e: Exception) {}
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                try {
                    val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
-                    windowInset.isAppearanceLightStatusBars = taWindowStatusLight
-                            ?.getBoolean(0, false) == true
+                    if (taWindowStatusLight?.getBoolean(0, false) == true) {
+                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    }
                    taWindowStatusLight?.recycle()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to retrieve theme : window light status bar", e)
-                }
+                } catch (e: Exception) {}
            }
            try {
                val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
                window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
                taNavigationBarColor?.recycle()
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to retrieve theme : navigation bar color", e)
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                try {
-                    val taWindowLightNavigationBar = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightNavigationBar))
-                    windowInset.isAppearanceLightNavigationBars = taWindowLightNavigationBar
-                        ?.getBoolean(0, false) == true
-                    taWindowLightNavigationBar?.recycle()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to retrieve theme : navigation light navigation bar", e)
-                }
-            }
+            } catch (e: Exception) {}
        }
        return super.onCreateView(inflater, container, savedInstanceState)
    }
@@ -92,8 +76,4 @@ abstract class StylishFragment : Fragment() {
        contextThemed = null
        super.onDetach()
    }
-
-    companion object {
-        private val TAG = StylishFragment::class.java.simpleName
-    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -1,150 +0,0 @@
-package com.kunzisoft.keepass.adapters
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Color
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.strikeOut
-
-class BreadcrumbAdapter(val context: Context)
-    : RecyclerView.Adapter<BreadcrumbAdapter.BreadcrumbGroupViewHolder>() {
-
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var iconDrawableFactory: IconDrawableFactory? = null
-        @SuppressLint("NotifyDataSetChanged")
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    private var mNodeBreadcrumb: MutableList<Node?> = mutableListOf()
-    var onItemClickListener: ((item: Node, position: Int)->Unit)? = null
-    var onLongItemClickListener: ((item: Node, position: Int)->Unit)? = null
-
-    private var mShowNumberEntries = false
-    private var mShowUUID = false
-    private var mIconColor: Int = 0
-
-    init {
-        mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
-        mShowUUID = PreferencesUtil.showUUID(context)
-
-        // Retrieve the textColor to tint the icon
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        mIconColor = taTextColor.getColor(0, Color.WHITE)
-        taTextColor.recycle()
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun setNode(node: Node?) {
-        mNodeBreadcrumb.clear()
-        node?.let {
-            var currentNode = it
-            mNodeBreadcrumb.add(0, currentNode)
-            while (currentNode.containsParent()) {
-                currentNode.parent?.let { parent ->
-                    currentNode = parent
-                    mNodeBreadcrumb.add(0, currentNode)
-                }
-            }
-        }
-        notifyDataSetChanged()
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (position) {
-            mNodeBreadcrumb.size - 1 -> 0
-            else -> 1
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BreadcrumbGroupViewHolder {
-        return BreadcrumbGroupViewHolder(inflater.inflate(
-            when (viewType) {
-                0 -> R.layout.item_group
-                else -> R.layout.item_breadcrumb
-            }, parent, false)
-        )
-    }
-
-    override fun onBindViewHolder(holder: BreadcrumbGroupViewHolder, position: Int) {
-        val node = mNodeBreadcrumb[position]
-
-        holder.groupNameView.apply {
-            text = node?.title ?: ""
-            strikeOut(node?.isCurrentlyExpires ?: false)
-        }
-
-        holder.itemView.apply {
-            setOnClickListener {
-                node?.let {
-                    onItemClickListener?.invoke(it, position)
-                }
-            }
-            setOnLongClickListener {
-                node?.let {
-                    onLongItemClickListener?.invoke(it, position)
-                }
-                true
-            }
-        }
-
-        if (node?.type == Type.GROUP) {
-            (node as Group).let { group ->
-
-                holder.groupIconView?.let { imageView ->
-                    iconDrawableFactory?.assignDatabaseIcon(
-                        imageView,
-                        group.icon,
-                        mIconColor
-                    )
-                }
-
-                holder.groupNumbersView?.apply {
-                    if (mShowNumberEntries) {
-                        group.refreshNumberOfChildEntries(Group.ChildFilter.getDefaults(context))
-                        text = group.numberOfChildEntries.toString()
-                        visibility = View.VISIBLE
-                    } else {
-                        visibility = View.GONE
-                    }
-                }
-
-                holder.groupMetaView?.apply {
-                    val meta = group.nodeId.toVisualString()
-                    visibility = if (meta != null
-                        && !group.isVirtual
-                        && mShowUUID
-                    ) {
-                        text = meta
-                        View.VISIBLE
-                    } else {
-                        View.GONE
-                    }
-                }
-            }
-        }
-
-    }
-
-    override fun getItemCount(): Int {
-        return mNodeBreadcrumb.size
-    }
-
-    inner class BreadcrumbGroupViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var groupIconView: ImageView? = itemView.findViewById(R.id.group_icon)
-        var groupNumbersView: TextView? = itemView.findViewById(R.id.group_numbers)
-        var groupNameView: TextView = itemView.findViewById(R.id.group_name)
-        var groupMetaView: TextView? = itemView.findViewById(R.id.group_meta)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
@@ -26,13 +26,13 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.database.element.Entry

 class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHistoryAdapter.EntryHistoryViewHolder>() {

    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryHistoryList: MutableList<EntryInfo> = ArrayList()
-    var onItemClickListener: ((item: EntryInfo, position: Int)->Unit)? = null
+    var entryHistoryList: MutableList<Entry> = ArrayList()
+    var onItemClickListener: ((item: Entry, position: Int)->Unit)? = null

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryHistoryViewHolder {
        return EntryHistoryViewHolder(inflater.inflate(R.layout.item_list_entry_history, parent, false))
@@ -44,6 +44,7 @@ class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHist
        holder.lastModifiedView.text = entryHistory.lastModificationTime.getDateTimeString(context.resources)
        holder.titleView.text = entryHistory.title
        holder.usernameView.text = entryHistory.username
+        holder.urlView.text = entryHistory.url

        holder.itemView.setOnClickListener {
            onItemClickListener?.invoke(entryHistory, position)
@@ -63,5 +64,6 @@ class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHist
        var lastModifiedView: TextView = itemView.findViewById(R.id.entry_history_last_modified)
        var titleView: TextView = itemView.findViewById(R.id.entry_history_title)
        var usernameView: TextView = itemView.findViewById(R.id.entry_history_username)
+        var urlView: TextView = itemView.findViewById(R.id.entry_history_url)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FieldsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FieldsAdapter.kt
@@ -27,7 +27,7 @@ import android.view.ViewGroup
 import android.widget.TextView

 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Field
+import com.kunzisoft.keepass.model.Field

 import java.util.ArrayList

--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -30,8 +30,6 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.SortedList
-import androidx.recyclerview.widget.SortedListAdapterCallback
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.DatabaseFile
 import com.kunzisoft.keepass.view.collapse
@@ -46,43 +44,11 @@ class FileDatabaseHistoryAdapter(context: Context)
    private var fileSelectClearListener: ((DatabaseFile)->Boolean)? = null
    private var saveAliasListener: ((DatabaseFile)->Unit)? = null

-    private var mDefaultDatabase: DatabaseFile? = null
-    private var mExpandedDatabaseFile: SuperDatabaseFile? = null
-    private var mPreviousExpandedDatabaseFile: SuperDatabaseFile? = null
+    private val listDatabaseFiles = ArrayList<DatabaseFile>()

-    private val mListPosition = mutableListOf<SuperDatabaseFile>()
-    private val mSortedListDatabaseFiles = SortedList(SuperDatabaseFile::class.java,
-        object: SortedListAdapterCallback<SuperDatabaseFile>(this) {
-            override fun compare(item1: SuperDatabaseFile, item2: SuperDatabaseFile): Int {
-                val indexItem1 = mListPosition.indexOf(item1)
-                val indexItem2 = mListPosition.indexOf(item2)
-                return if (indexItem1 == -1 && indexItem2 == -1)
-                    -1
-                else if (indexItem1 < indexItem2)
-                    -1
-                else if (indexItem1 > indexItem2)
-                    1
-                else
-                    0
-            }
-
-            override fun areContentsTheSame(oldItem: SuperDatabaseFile, newItem: SuperDatabaseFile): Boolean {
-                val oldDatabaseFile = oldItem.databaseFile
-                val newDatabaseFile = newItem.databaseFile
-                return oldDatabaseFile.databaseUri == newDatabaseFile.databaseUri
-                        && oldDatabaseFile.databaseDecodedPath == newDatabaseFile.databaseDecodedPath
-                        && oldDatabaseFile.databaseAlias == newDatabaseFile.databaseAlias
-                        && oldDatabaseFile.databaseFileExists == newDatabaseFile.databaseFileExists
-                        && oldDatabaseFile.databaseLastModified == newDatabaseFile.databaseLastModified
-                        && oldDatabaseFile.databaseSize == newDatabaseFile.databaseSize
-                        && oldItem.default == newItem.default
-            }
-
-            override fun areItemsTheSame(item1: SuperDatabaseFile, item2: SuperDatabaseFile): Boolean {
-                return item1.databaseFile == item2.databaseFile
-            }
-        }
-    )
+    private var mDefaultDatabaseFile: DatabaseFile? = null
+    private var mExpandedDatabaseFile: DatabaseFile? = null
+    private var mPreviousExpandedDatabaseFile: DatabaseFile? = null

    @ColorInt
    private val defaultColor: Int
@@ -105,8 +71,7 @@ class FileDatabaseHistoryAdapter(context: Context)

    override fun onBindViewHolder(holder: FileDatabaseHistoryViewHolder, position: Int) {
        // Get info from position
-        val superDatabaseFile = mSortedListDatabaseFiles[position]
-        val databaseFile = superDatabaseFile.databaseFile
+        val databaseFile = listDatabaseFiles[position]

        // Click item to open file
        holder.fileContainer.setOnClickListener {
@@ -115,7 +80,7 @@ class FileDatabaseHistoryAdapter(context: Context)

        // Default database
        holder.defaultFileButton.apply {
-            this.isChecked = superDatabaseFile.default
+            this.isChecked = mDefaultDatabaseFile == databaseFile
            setOnClickListener {
                defaultDatabaseListener?.invoke(if (isChecked) databaseFile else null)
            }
@@ -150,7 +115,7 @@ class FileDatabaseHistoryAdapter(context: Context)
        }

        // Click on information
-        val isExpanded = superDatabaseFile == mExpandedDatabaseFile
+        val isExpanded = databaseFile == mExpandedDatabaseFile
        // Hides or shows info
        holder.fileExpandContainer.apply {
            if (isExpanded) {
@@ -186,16 +151,16 @@ class FileDatabaseHistoryAdapter(context: Context)
        }

        if (isExpanded) {
-            mPreviousExpandedDatabaseFile = superDatabaseFile
+            mPreviousExpandedDatabaseFile = databaseFile
        }
        holder.fileInformationButton.apply {
            animate().rotation(if (isExpanded) 180F else 0F).start()
            setOnClickListener {
-                mExpandedDatabaseFile = if (isExpanded) null else superDatabaseFile
+                mExpandedDatabaseFile = if (isExpanded) null else databaseFile
                // Notify change
-                val previousExpandedPosition = mListPosition.indexOf(mPreviousExpandedDatabaseFile)
+                val previousExpandedPosition = listDatabaseFiles.indexOf(mPreviousExpandedDatabaseFile)
                notifyItemChanged(previousExpandedPosition)
-                val expandedPosition = mListPosition.indexOf(mExpandedDatabaseFile)
+                val expandedPosition = listDatabaseFiles.indexOf(mExpandedDatabaseFile)
                notifyItemChanged(expandedPosition)
            }
        }
@@ -207,67 +172,50 @@ class FileDatabaseHistoryAdapter(context: Context)
    }

    override fun getItemCount(): Int {
-        return mSortedListDatabaseFiles.size()
+        return listDatabaseFiles.size
    }

    fun clearDatabaseFileHistoryList() {
-        mListPosition.clear()
-        mSortedListDatabaseFiles.clear()
+        listDatabaseFiles.clear()
    }

    fun addDatabaseFileHistory(fileDatabaseHistoryToAdd: DatabaseFile) {
-        val superToAdd = SuperDatabaseFile(fileDatabaseHistoryToAdd)
-        mListPosition.add(0, superToAdd)
-        mSortedListDatabaseFiles.add(superToAdd)
+        listDatabaseFiles.add(0, fileDatabaseHistoryToAdd)
+        notifyItemInserted(0)
    }

    fun updateDatabaseFileHistory(fileDatabaseHistoryToUpdate: DatabaseFile) {
-        val superToUpdate = SuperDatabaseFile(fileDatabaseHistoryToUpdate)
-        val index = mListPosition.indexOf(superToUpdate)
-        if (mListPosition.remove(superToUpdate)) {
-            mListPosition.add(index, superToUpdate)
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToUpdate)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToUpdate)) {
+            listDatabaseFiles.add(index, fileDatabaseHistoryToUpdate)
+            notifyItemChanged(index)
        }
-        mSortedListDatabaseFiles.updateItemAt(index, superToUpdate)
    }

    fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: DatabaseFile) {
-        val superToDelete = SuperDatabaseFile(fileDatabaseHistoryToDelete)
-        val index = mListPosition.indexOf(superToDelete)
-        mListPosition.remove(superToDelete)
-        mSortedListDatabaseFiles.removeItemAt(index)
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToDelete)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToDelete)) {
+            notifyItemRemoved(index)
+        }
    }

    fun replaceAllDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<DatabaseFile>) {
-        val superMapToReplace = listFileDatabaseHistoryToAdd.map {
-            SuperDatabaseFile(it)
+        if (listDatabaseFiles.isEmpty()) {
+            listFileDatabaseHistoryToAdd.forEach {
+                listDatabaseFiles.add(it)
+                notifyItemInserted(listDatabaseFiles.size)
+            }
+        } else {
+            listDatabaseFiles.clear()
+            listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
+            notifyDataSetChanged()
        }
-        mListPosition.clear()
-        mListPosition.addAll(superMapToReplace)
-        mSortedListDatabaseFiles.replaceAll(superMapToReplace)
    }

    fun setDefaultDatabase(databaseUri: Uri?) {
-        // Remove default from last item
-        val oldDefaultDatabasePosition = mListPosition.indexOfFirst {
-            it.default
-        }
-        if (oldDefaultDatabasePosition >= 0) {
-            val oldDefaultDatabase = mListPosition[oldDefaultDatabasePosition].apply {
-                default = false
-            }
-            mSortedListDatabaseFiles.updateItemAt(oldDefaultDatabasePosition, oldDefaultDatabase)
-        }
-        // Add default to new item
-        val newDefaultDatabaseFilePosition = mListPosition.indexOfFirst {
-            it.databaseFile.databaseUri == databaseUri
-        }
-        if (newDefaultDatabaseFilePosition >= 0) {
-            val newDefaultDatabase = mListPosition[newDefaultDatabaseFilePosition].apply {
-                default = true
-            }
-            mDefaultDatabase = newDefaultDatabase.databaseFile
-            mSortedListDatabaseFiles.updateItemAt(newDefaultDatabaseFilePosition, newDefaultDatabase)
-        }
+        val defaultDatabaseFile = listDatabaseFiles.firstOrNull { it.databaseUri == databaseUri }
+        mDefaultDatabaseFile = defaultDatabaseFile
+        notifyDataSetChanged()
    }

    fun setOnDefaultDatabaseListener(listener: ((DatabaseFile?) -> Unit)?) {
@@ -286,30 +234,6 @@ class FileDatabaseHistoryAdapter(context: Context)
        this.saveAliasListener = listener
    }

-    private inner class SuperDatabaseFile(
-        var databaseFile: DatabaseFile,
-        var default: Boolean = false
-    ) {
-
-        init {
-            if (mDefaultDatabase == databaseFile)
-                this.default = true
-        }
-
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (other !is SuperDatabaseFile) return false
-
-            if (databaseFile != other.databaseFile) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            return databaseFile.hashCode()
-        }
-    }
-
    class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

        var fileContainer: ViewGroup = itemView.findViewById(R.id.file_container_basic_info)
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerAdapter.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.icon.IconImageDraw
@@ -96,12 +95,6 @@ class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tint
    override fun onBindViewHolder(holder: CustomIconViewHolder, position: Int) {
        val icon = iconList[position]
        iconDrawableFactory?.assignDatabaseIcon(holder.iconImageView, icon, tintIcon)
-        icon.getIconImageToDraw().custom.name.let { iconName ->
-            holder.iconTextView.apply {
-                text = iconName
-                visibility = if (iconName.isNotEmpty()) View.VISIBLE else View.GONE
-            }
-        }
        holder.iconContainerView.isSelected = icon.selected
        holder.itemView.setOnClickListener {
            iconPickerListener?.onIconClickListener(icon)
@@ -124,6 +117,5 @@ class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tint
    inner class CustomIconViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
        var iconContainerView: ViewGroup = itemView.findViewById(R.id.icon_container)
        var iconImageView: ImageView = itemView.findViewById(R.id.icon_image)
-        var iconTextView: TextView = itemView.findViewById(R.id.icon_name)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -27,12 +27,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
-import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
@@ -41,11 +40,7 @@ import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.template.TemplateField
-import com.kunzisoft.keepass.otp.OtpElement
-import com.kunzisoft.keepass.otp.OtpType
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.view.setTextSize
 import com.kunzisoft.keepass.view.strikeOut
 import java.util.*
@@ -54,9 +49,8 @@ import java.util.*
 * Create node list adapter with contextMenu or not
 * @param context Context to use
 */
-class NodesAdapter (private val context: Context,
-                    private val database: Database)
-    : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {
+class NodeAdapter (private val context: Context)
+    : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {

    private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
    private val mNodeSortedListCallback: NodeSortedListCallback
@@ -66,36 +60,26 @@ class NodesAdapter (private val context: Context,
    private var mCalculateViewTypeTextSize = Array(2) { true } // number of view type
    private var mTextSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
    private var mPrefSizeMultiplier: Float = 0F
-    private var mTextDefaultDimension: Float = 0F
-    private var mSubTextDefaultDimension: Float = 0F
-    private var mMetaTextDefaultDimension: Float = 0F
-    private var mOtpTokenTextDefaultDimension: Float = 0F
+    private var mSubtextDefaultDimension: Float = 0F
+    private var mInfoTextDefaultDimension: Float = 0F
    private var mNumberChildrenTextDefaultDimension: Float = 0F
    private var mIconDefaultDimension: Float = 0F

-    private var mShowEntryColors: Boolean = true
    private var mShowUserNames: Boolean = true
    private var mShowNumberEntries: Boolean = true
-    private var mShowOTP: Boolean = false
-    private var mShowUUID: Boolean = false
    private var mEntryFilters = arrayOf<Group.ChildFilter>()
-    private var mOldVirtualGroup = false
-    private var mVirtualGroup = false

    private var mActionNodesList = LinkedList<Node>()
    private var mNodeClickCallback: NodeClickCallback? = null
-    private var mClipboardHelper = ClipboardHelper(context)
+
+    private val mDatabase: Database

    @ColorInt
-    private val mTextColorPrimary: Int
+    private val mContentSelectionColor: Int
    @ColorInt
-    private val mTextColor: Int
+    private val mIconGroupColor: Int
    @ColorInt
-    private val mTextColorSecondary: Int
-    @ColorInt
-    private val mColorAccentLight: Int
-    @ColorInt
-    private val mColorOnAccentColor: Int
+    private val mIconEntryColor: Int

    /**
     * Determine if the adapter contains or not any element
@@ -112,29 +96,22 @@ class NodesAdapter (private val context: Context,
        this.mNodeSortedListCallback = NodeSortedListCallback()
        this.mNodeSortedList = SortedList(Node::class.java, mNodeSortedListCallback)

+        // Database
+        this.mDatabase = Database.getInstance()
+
+        // Color of content selection
+        this.mContentSelectionColor = ContextCompat.getColor(context, R.color.white)
        // Retrieve the color to tint the icon
        val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
-        this.mTextColorPrimary = taTextColorPrimary.getColor(0, Color.BLACK)
+        this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
        taTextColorPrimary.recycle()
-        // To get text color
+        // In two times to fix bug compilation
        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        this.mTextColor = taTextColor.getColor(0, Color.BLACK)
+        this.mIconEntryColor = taTextColor.getColor(0, Color.BLACK)
        taTextColor.recycle()
-        // To get text color secondary
-        val taTextColorSecondary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorSecondary))
-        this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK)
-        taTextColorSecondary.recycle()
-        // To get background color for selection
-        val taColorAccentLight = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight))
-        this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY)
-        taColorAccentLight.recycle()
-        // To get text color for selection
-        val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
-        this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE)
-        taColorOnAccentColor.recycle()
    }

-    private fun assignPreferences() {
+    fun assignPreferences() {
        this.mPrefSizeMultiplier = PreferencesUtil.getListTextSize(context)

        notifyChangeSort(
@@ -146,11 +123,8 @@ class NodesAdapter (private val context: Context,
                        )
                )

-        this.mShowEntryColors = PreferencesUtil.showEntryColors(context)
        this.mShowUserNames = PreferencesUtil.showUsernamesListEntries(context)
        this.mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
-        this.mShowOTP = PreferencesUtil.showOTPToken(context)
-        this.mShowUUID = PreferencesUtil.showUUID(context)

        this.mEntryFilters = Group.ChildFilter.getDefaults(context)

@@ -162,8 +136,6 @@ class NodesAdapter (private val context: Context,
     * Rebuild the list by clear and build children from the group
     */
    fun rebuildList(group: Group) {
-        mOldVirtualGroup = mVirtualGroup
-        mVirtualGroup = group.isVirtual
        assignPreferences()
        mNodeSortedList.replaceAll(group.getFilteredChildren(mEntryFilters))
    }
@@ -174,26 +146,9 @@ class NodesAdapter (private val context: Context,
        }

        override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
-            if (mOldVirtualGroup != mVirtualGroup)
-                return false
-            var typeContentTheSame = true
-            if (oldItem is Entry && newItem is Entry) {
-                typeContentTheSame = oldItem.getVisualTitle() == newItem.getVisualTitle()
-                        && oldItem.username == newItem.username
-                        && oldItem.backgroundColor == newItem.backgroundColor
-                        && oldItem.foregroundColor == newItem.foregroundColor
-                        && oldItem.getOtpElement() == newItem.getOtpElement()
-                        && oldItem.containsAttachment() == newItem.containsAttachment()
-            } else if (oldItem is Group && newItem is Group) {
-                typeContentTheSame = oldItem.numberOfChildEntries == newItem.numberOfChildEntries
-                        && oldItem.notes == newItem.notes
-            }
-            return typeContentTheSame
-                    && oldItem.nodeId == newItem.nodeId
-                    && oldItem.type == newItem.type
+            return oldItem.type == newItem.type
                    && oldItem.title == newItem.title
                    && oldItem.icon == newItem.icon
-                    && oldItem.isCurrentlyExpires == newItem.isCurrentlyExpires
        }

        override fun areItemsTheSame(item1: Node, item2: Node): Boolean {
@@ -286,10 +241,6 @@ class NodesAdapter (private val context: Context,
        mNodeSortedList.endBatchedUpdates()
    }

-    fun indexOf(node: Node): Int {
-        return mNodeSortedList.indexOf(node)
-    }
-
    fun notifyNodeChanged(node: Node) {
        notifyItemChanged(mNodeSortedList.indexOf(node))
    }
@@ -315,7 +266,7 @@ class NodesAdapter (private val context: Context,
     */
    fun notifyChangeSort(sortNodeEnum: SortNodeEnum,
                         sortNodeParameters: SortNodeEnum.SortNodeParameters) {
-        this.mNodeComparator = sortNodeEnum.getNodeComparator(database, sortNodeParameters)
+        this.mNodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
    }

    override fun getItemViewType(position: Int): Int {
@@ -329,10 +280,8 @@ class NodesAdapter (private val context: Context,
            mInflater.inflate(R.layout.item_list_nodes_entry, parent, false)
        }
        val nodeViewHolder = NodeViewHolder(view)
-        mTextDefaultDimension = nodeViewHolder.text.textSize
-        mSubTextDefaultDimension = nodeViewHolder.subText?.textSize ?: mSubTextDefaultDimension
-        mMetaTextDefaultDimension = nodeViewHolder.meta.textSize
-        mOtpTokenTextDefaultDimension = nodeViewHolder.otpToken?.textSize ?: mOtpTokenTextDefaultDimension
+        mInfoTextDefaultDimension = nodeViewHolder.text.textSize
+        mSubtextDefaultDimension = nodeViewHolder.subText.textSize
        nodeViewHolder.numberChildren?.let {
            mNumberChildrenTextDefaultDimension = it.textSize
        }
@@ -343,125 +292,57 @@ class NodesAdapter (private val context: Context,
        val subNode = mNodeSortedList.get(position)

        // Node selection
-        holder.container.apply {
-            isSelected = mActionNodesList.contains(subNode)
+        holder.container.isSelected = mActionNodesList.contains(subNode)
+
+        // Assign image
+        val iconColor = if (holder.container.isSelected)
+            mContentSelectionColor
+        else when (subNode.type) {
+            Type.GROUP -> mIconGroupColor
+            Type.ENTRY -> mIconEntryColor
+        }
+        holder.imageIdentifier?.setColorFilter(iconColor)
+        holder.icon.apply {
+            mDatabase.iconDrawableFactory.assignDatabaseIcon(this, subNode.icon, iconColor)
+            // Relative size of the icon
+            layoutParams?.apply {
+                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
+                width = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
+            }
        }

        // Assign text
        holder.text.apply {
            text = subNode.title
-            setTextSize(mTextSizeUnit, mTextDefaultDimension, mPrefSizeMultiplier)
+            setTextSize(mTextSizeUnit, mInfoTextDefaultDimension, mPrefSizeMultiplier)
            strikeOut(subNode.isCurrentlyExpires)
        }
-        // Add meta text to show UUID
-        holder.meta.apply {
-            val nodeId = subNode.nodeId?.toVisualString()
-            if (mShowUUID && nodeId != null) {
-                text = nodeId
-                setTextSize(mTextSizeUnit, mMetaTextDefaultDimension, mPrefSizeMultiplier)
-                visibility = View.VISIBLE
-            } else {
-                visibility = View.GONE
-            }
-        }
-        // Add path to virtual group
-        if (mVirtualGroup) {
-            holder.path?.apply {
-                text = subNode.getPathString()
-                visibility = View.VISIBLE
-            }
-        } else {
-            holder.path?.visibility = View.GONE
-        }
-
-        // Assign icon colors
-        var iconColor = if (holder.container.isSelected)
-            mColorOnAccentColor
-        else when (subNode.type) {
-            Type.GROUP -> mTextColorPrimary
-            Type.ENTRY -> mTextColor
+        // Add subText with username
+        holder.subText.apply {
+            text = ""
+            strikeOut(subNode.isCurrentlyExpires)
+            visibility = View.GONE
        }

        // Specific elements for entry
        if (subNode.type == Type.ENTRY) {
            val entry = subNode as Entry
-            database.startManageEntry(entry)
+            mDatabase.startManageEntry(entry)

            holder.text.text = entry.getVisualTitle()
-            // Add subText with username
-            holder.subText?.apply {
+            holder.subText.apply {
                val username = entry.username
                if (mShowUserNames && username.isNotEmpty()) {
                    visibility = View.VISIBLE
                    text = username
-                    setTextSize(mTextSizeUnit, mSubTextDefaultDimension, mPrefSizeMultiplier)
-                    strikeOut(subNode.isCurrentlyExpires)
-                } else {
-                    visibility = View.GONE
+                    setTextSize(mTextSizeUnit, mSubtextDefaultDimension, mPrefSizeMultiplier)
                }
            }

-            val otpElement = entry.getOtpElement()
-            holder.otpContainer?.removeCallbacks(holder.otpRunnable)
-            if (otpElement != null
-                && mShowOTP
-                && otpElement.token.isNotEmpty()) {
-
-                // Execute runnable to show progress
-                holder.otpRunnable.action = {
-                    populateOtpView(holder, otpElement)
-                }
-                if (otpElement.type == OtpType.TOTP) {
-                    holder.otpRunnable.postDelayed()
-                }
-                populateOtpView(holder, otpElement)
-
-                holder.otpContainer?.visibility = View.VISIBLE
-            } else {
-                holder.otpContainer?.visibility = View.GONE
-            }
            holder.attachmentIcon?.visibility =
                    if (entry.containsAttachment()) View.VISIBLE else View.GONE

-            // Assign colors
-            val backgroundColor = if (mShowEntryColors) entry.backgroundColor else null
-            if (!holder.container.isSelected) {
-                if (backgroundColor != null) {
-                    holder.container.setBackgroundColor(backgroundColor)
-                } else {
-                    holder.container.setBackgroundColor(Color.TRANSPARENT)
-                }
-            } else {
-                holder.container.setBackgroundColor(mColorAccentLight)
-            }
-            val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
-            if (!holder.container.isSelected) {
-                if (foregroundColor != null) {
-                    holder.text.setTextColor(foregroundColor)
-                    holder.subText?.setTextColor(foregroundColor)
-                    holder.otpToken?.setTextColor(foregroundColor)
-                    holder.otpProgress?.setIndicatorColor(foregroundColor)
-                    holder.attachmentIcon?.setColorFilter(foregroundColor)
-                    holder.meta.setTextColor(foregroundColor)
-                    iconColor = foregroundColor
-                } else {
-                    holder.text.setTextColor(mTextColor)
-                    holder.subText?.setTextColor(mTextColorSecondary)
-                    holder.otpToken?.setTextColor(mTextColorSecondary)
-                    holder.otpProgress?.setIndicatorColor(mTextColorSecondary)
-                    holder.attachmentIcon?.setColorFilter(mTextColorSecondary)
-                    holder.meta.setTextColor(mTextColor)
-                }
-            } else {
-                holder.text.setTextColor(mColorOnAccentColor)
-                holder.subText?.setTextColor(mColorOnAccentColor)
-                holder.otpToken?.setTextColor(mColorOnAccentColor)
-                holder.otpProgress?.setIndicatorColor(mColorOnAccentColor)
-                holder.attachmentIcon?.setColorFilter(mColorOnAccentColor)
-                holder.meta.setTextColor(mColorOnAccentColor)
-            }
-
-            database.stopManageEntry(entry)
+            mDatabase.stopManageEntry(entry)
        }

        // Add number of entries in groups
@@ -469,7 +350,7 @@ class NodesAdapter (private val context: Context,
            if (mShowNumberEntries) {
                holder.numberChildren?.apply {
                    text = (subNode as Group)
-                            .numberOfChildEntries
+                            .getNumberOfChildEntries(mEntryFilters)
                            .toString()
                    setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                    visibility = View.VISIBLE
@@ -479,73 +360,15 @@ class NodesAdapter (private val context: Context,
            }
        }

-        // Assign image
-        holder.imageIdentifier?.setColorFilter(iconColor)
-        holder.icon.apply {
-            database.iconDrawableFactory.assignDatabaseIcon(this, subNode.icon, iconColor)
-            // Relative size of the icon
-            layoutParams?.apply {
-                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
-                width = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
-            }
-        }
-
        // Assign click
        holder.container.setOnClickListener {
-            mNodeClickCallback?.onNodeClick(database, subNode)
+            mNodeClickCallback?.onNodeClick(subNode)
        }
        holder.container.setOnLongClickListener {
-            mNodeClickCallback?.onNodeLongClick(database, subNode) ?: false
+            mNodeClickCallback?.onNodeLongClick(subNode) ?: false
        }
    }
-
-    private fun populateOtpView(holder: NodeViewHolder?, otpElement: OtpElement?) {
-        when (otpElement?.type) {
-            OtpType.HOTP -> {
-                holder?.otpProgress?.apply {
-                    max = 100
-                    setProgressCompat(100, true)
-                }
-            }
-            OtpType.TOTP -> {
-                holder?.otpProgress?.apply {
-                    max = otpElement.period
-                    setProgressCompat(otpElement.secondsRemaining, true)
-                }
-            }
-            null -> {}
-        }
-        holder?.otpToken?.apply {
-            text = otpElement?.token
-            setTextSize(mTextSizeUnit, mOtpTokenTextDefaultDimension, mPrefSizeMultiplier)
-        }
-        holder?.otpContainer?.setOnClickListener {
-            otpElement?.token?.let { token ->
-                Toast.makeText(
-                        context,
-                        context.getString(R.string.copy_field,
-                                TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN)),
-                        Toast.LENGTH_LONG
-                ).show()
-                mClipboardHelper.copyToClipboard(token)
-            }
-        }
-    }
-
-    class OtpRunnable(val view: View?): Runnable {
-
-        var action: (() -> Unit)? = null
-
-        override fun run() {
-            action?.invoke()
-            postDelayed()
-        }
-
-        fun postDelayed() {
-            view?.postDelayed(this, 1000)
-        }
-    }
-
+    
    override fun getItemCount(): Int {
        return mNodeSortedList.size()
    }
@@ -561,8 +384,8 @@ class NodesAdapter (private val context: Context,
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickCallback {
-        fun onNodeClick(database: Database, node: Node)
-        fun onNodeLongClick(database: Database, node: Node): Boolean
+        fun onNodeClick(node: Node)
+        fun onNodeLongClick(node: Node): Boolean
    }

    class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -570,18 +393,12 @@ class NodesAdapter (private val context: Context,
        var imageIdentifier: ImageView? = itemView.findViewById(R.id.node_image_identifier)
        var icon: ImageView = itemView.findViewById(R.id.node_icon)
        var text: TextView = itemView.findViewById(R.id.node_text)
-        var subText: TextView? = itemView.findViewById(R.id.node_subtext)
-        var meta: TextView = itemView.findViewById(R.id.node_meta)
-        var path: TextView? = itemView.findViewById(R.id.node_path)
-        var otpContainer: ViewGroup? = itemView.findViewById(R.id.node_otp_container)
-        var otpProgress: CircularProgressIndicator? = itemView.findViewById(R.id.node_otp_progress)
-        var otpToken: TextView? = itemView.findViewById(R.id.node_otp_token)
-        var otpRunnable: OtpRunnable = OtpRunnable(otpContainer)
+        var subText: TextView = itemView.findViewById(R.id.node_subtext)
        var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
        var attachmentIcon: ImageView? = itemView.findViewById(R.id.node_attachment_icon)
    }

    companion object {
-        private val TAG = NodesAdapter::class.java.name
+        private val TAG = NodeAdapter::class.java.name
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.database.Cursor
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.cursor.EntryCursorKDB
+import com.kunzisoft.keepass.database.cursor.EntryCursorKDBX
+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.DatabaseKDB
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.strikeOut
+
+class SearchEntryCursorAdapter(private val context: Context,
+                               private val database: Database)
+    : androidx.cursoradapter.widget.CursorAdapter(context, null, FLAG_REGISTER_CONTENT_OBSERVER) {
+
+    private val cursorInflater: LayoutInflater? = context.getSystemService(
+            Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
+    private var mDisplayUsername: Boolean = false
+    private var mOmitBackup: Boolean = true
+    private val iconColor: Int
+
+    init {
+        // Get the icon color
+        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        this.iconColor = taTextColor.getColor(0, Color.WHITE)
+        taTextColor.recycle()
+
+        reInit(context)
+    }
+
+    fun reInit(context: Context) {
+        this.mDisplayUsername = PreferencesUtil.showUsernamesListEntries(context)
+        this.mOmitBackup = PreferencesUtil.omitBackup(context)
+    }
+
+    override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
+
+        val view = cursorInflater!!.inflate(R.layout.item_search_entry, parent, false)
+        val viewHolder = ViewHolder()
+        viewHolder.imageViewIcon = view.findViewById(R.id.entry_icon)
+        viewHolder.textViewTitle = view.findViewById(R.id.entry_text)
+        viewHolder.textViewSubTitle = view.findViewById(R.id.entry_subtext)
+        view.tag = viewHolder
+
+        return view
+    }
+
+    override fun bindView(view: View, context: Context, cursor: Cursor) {
+        getEntryFrom(cursor)?.let { currentEntry ->
+            val viewHolder = view.tag as ViewHolder
+
+            // Assign image
+            viewHolder.imageViewIcon?.let { iconView ->
+                database.iconDrawableFactory.assignDatabaseIcon(iconView, currentEntry.icon, iconColor)
+            }
+
+            // Assign title
+            viewHolder.textViewTitle?.apply {
+                text = currentEntry.getVisualTitle()
+                strikeOut(currentEntry.isCurrentlyExpires)
+            }
+
+            // Assign subtitle
+            viewHolder.textViewSubTitle?.apply {
+                val entryUsername = currentEntry.username
+                text = if (mDisplayUsername && entryUsername.isNotEmpty()) {
+                    String.format("(%s)", entryUsername)
+                } else {
+                    ""
+                }
+                visibility = if (text.isEmpty()) View.GONE else View.VISIBLE
+                strikeOut(currentEntry.isCurrentlyExpires)
+            }
+        }
+    }
+
+    private fun getEntryFrom(cursor: Cursor): Entry? {
+        return database.createEntry()?.apply {
+            database.startManageEntry(this)
+            entryKDB?.let { entryKDB ->
+                (cursor as EntryCursorKDB).populateEntry(entryKDB,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
+            }
+            entryKDBX?.let { entryKDBX ->
+                (cursor as EntryCursorKDBX).populateEntry(entryKDBX,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
+            }
+            database.stopManageEntry(this)
+        }
+    }
+
+    override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor? {
+        return searchEntries(context, constraint.toString())
+    }
+
+    private fun searchEntries(context: Context, query: String): Cursor? {
+        var cursorKDB: EntryCursorKDB? = null
+        var cursorKDBX: EntryCursorKDBX? = null
+
+        if (database.type == DatabaseKDB.TYPE)
+            cursorKDB = EntryCursorKDB()
+        if (database.type == DatabaseKDBX.TYPE)
+            cursorKDBX = EntryCursorKDBX()
+
+        val searchGroup = database.createVirtualGroupFromSearch(query,
+                mOmitBackup,
+                SearchHelper.MAX_SEARCH_ENTRY)
+        if (searchGroup != null) {
+            // Search in hide entries but not meta-stream
+            for (entry in searchGroup.getFilteredChildEntries(Group.ChildFilter.getDefaults(context))) {
+                entry.entryKDB?.let {
+                    cursorKDB?.addEntry(it)
+                }
+                entry.entryKDBX?.let {
+                    cursorKDBX?.addEntry(it)
+                }
+            }
+        }
+
+        return cursorKDB ?: cursorKDBX
+    }
+
+    fun getEntryFromPosition(position: Int): Entry? {
+        var pwEntry: Entry? = null
+
+        val cursor = this.cursor
+        if (cursor.moveToFirst() && cursor.move(position)) {
+            pwEntry = getEntryFrom(cursor)
+        }
+        return pwEntry
+    }
+
+    private class ViewHolder {
+        var imageViewIcon: ImageView? = null
+        var textViewTitle: TextView? = null
+        var textViewSubTitle: TextView? = null
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/TagsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/TagsAdapter.kt
@@ -1,73 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Tags
-
-class TagsAdapter(context: Context) : RecyclerView.Adapter<TagsAdapter.TagViewHolder>() {
-
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var mTags: Tags = Tags()
-    var onItemClickListener: OnItemClickListener? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TagViewHolder {
-        val view = inflater.inflate(R.layout.item_tag, parent, false)
-        return TagViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: TagViewHolder, position: Int) {
-        val field = mTags.get(position)
-        holder.name.text = field
-        holder.bind(field, onItemClickListener)
-    }
-
-    override fun getItemCount(): Int {
-        return mTags.size()
-    }
-
-    fun setTags(tags: Tags) {
-        mTags.setTags(tags)
-        notifyDataSetChanged()
-    }
-
-    fun clear() {
-        mTags.clear()
-    }
-
-    interface OnItemClickListener {
-        fun onItemClick(item: String)
-    }
-
-    inner class TagViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-        var name: TextView = itemView.findViewById(R.id.tag_name)
-
-        fun bind(item: String, listener: OnItemClickListener?) {
-            itemView.setOnClickListener { listener?.onItemClick(item) }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/TagsProposalAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/TagsProposalAdapter.kt
@@ -1,19 +0,0 @@
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import com.kunzisoft.keepass.database.element.Tags
-import com.tokenautocomplete.FilteredArrayAdapter
-
-class TagsProposalAdapter(context: Context, proposal: Tags?)
-    : FilteredArrayAdapter<String>(
-    context,
-    android.R.layout.simple_list_item_1,
-    (proposal ?: Tags()).toList()
-) {
-
-    override fun keepObject(obj: String, mask: String?): Boolean {
-        if (mask == null)
-            return false
-        return obj.contains(mask, true)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
@@ -1,77 +0,0 @@
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import android.graphics.Color
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.ImageView
-import android.widget.TextView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.template.Template
-import com.kunzisoft.keepass.database.element.template.TemplateField
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-
-
-class TemplatesSelectorAdapter(
-    context: Context,
-    private var templates: List<Template>): BaseAdapter() {
-
-    var iconDrawableFactory: IconDrawableFactory? = null
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var mTextColor = Color.BLACK
-
-    init {
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        mTextColor = taTextColor.getColor(0, Color.BLACK)
-        taTextColor.recycle()
-    }
-
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val template: Template = getItem(position)
-
-        val holder: TemplateSelectorViewHolder
-        var templateView = convertView
-        if (templateView == null) {
-            holder = TemplateSelectorViewHolder()
-            templateView = inflater.inflate(R.layout.item_template, parent, false)
-            holder.background = templateView?.findViewById(R.id.template_background)
-            holder.icon = templateView?.findViewById(R.id.template_image)
-            holder.name = templateView?.findViewById(R.id.template_name)
-            templateView?.tag = holder
-        } else {
-            holder = templateView.tag as TemplateSelectorViewHolder
-        }
-
-        holder.background?.setBackgroundColor(template.backgroundColor ?: Color.TRANSPARENT)
-        val textColor = template.foregroundColor ?: mTextColor
-        holder.icon?.let { icon ->
-            iconDrawableFactory?.assignDatabaseIcon(icon, template.icon, textColor)
-        }
-        holder.name?.apply {
-            setTextColor(textColor)
-            text = TemplateField.getLocalizedName(context, template.title)
-        }
-
-        return templateView!!
-    }
-
-    override fun getCount(): Int {
-        return templates.size
-    }
-
-    override fun getItem(position: Int): Template {
-        return templates[position]
-    }
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    inner class TemplateSelectorViewHolder {
-        var background: View? = null
-        var icon: ImageView? = null
-        var name: TextView? = null
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/app/App.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/App.kt
@@ -21,13 +21,20 @@ package com.kunzisoft.keepass.app

 import androidx.multidex.MultiDexApplication
 import com.kunzisoft.keepass.activities.stylish.Stylish
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.utils.UriUtil

 class App : MultiDexApplication() {

    override fun onCreate() {
        super.onCreate()

-        Stylish.load(this)
+        Stylish.init(this)
        PRNGFixes.apply()
    }
+
+    override fun onTerminate() {
+        Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this))
+        super.onTerminate()
+    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
@@ -19,12 +19,12 @@
 */
 package com.kunzisoft.keepass.app.database

-import android.content.*
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
 import android.net.Uri
 import android.os.IBinder
-import android.util.Base64
-import android.util.Log
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
@@ -41,127 +41,68 @@ class CipherDatabaseAction(context: Context) {
    // Temp DAO to easily remove content if object no longer in memory
    private var useTempDao = PreferencesUtil.isTempAdvancedUnlockEnable(applicationContext)

+    private val mIntentAdvancedUnlockService = Intent(applicationContext,
+            AdvancedUnlockNotificationService::class.java)
    private var mBinder: AdvancedUnlockNotificationService.AdvancedUnlockBinder? = null
    private var mServiceConnection: ServiceConnection? = null

-    private var mDatabaseListeners = LinkedList<CipherDatabaseListener>()
-    private var mAdvancedUnlockBroadcastReceiver = AdvancedUnlockNotificationService.AdvancedUnlockReceiver {
-        deleteAll()
-        removeAllDataAndDetach()
-    }
+    private var mDatabaseListeners = LinkedList<DatabaseListener>()

    fun reloadPreferences() {
        useTempDao = PreferencesUtil.isTempAdvancedUnlockEnable(applicationContext)
    }

-    @Synchronized
-    private fun serviceActionTask(startService: Boolean = false, performedAction: () -> Unit) {
-        // Check if a service is currently running else call action without info
-        if (startService && mServiceConnection == null) {
-            attachService(performedAction)
-        } else {
-            performedAction.invoke()
-        }
-    }
-
    @Synchronized
    private fun attachService(performedAction: () -> Unit) {
-        applicationContext.registerReceiver(mAdvancedUnlockBroadcastReceiver, IntentFilter().apply {
-            addAction(AdvancedUnlockNotificationService.REMOVE_ADVANCED_UNLOCK_KEY_ACTION)
-        })
-
-        mServiceConnection = object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
-                mBinder = (serviceBinder as AdvancedUnlockNotificationService.AdvancedUnlockBinder)
-                performedAction.invoke()
-            }
-
-            override fun onServiceDisconnected(name: ComponentName?) {
-                onClear()
-            }
-        }
-        try {
-            AdvancedUnlockNotificationService.bindService(applicationContext,
-                    mServiceConnection!!,
-                    Context.BIND_AUTO_CREATE)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to start cipher action", e)
+        // Check if a service is currently running else do nothing
+        if (mBinder != null) {
            performedAction.invoke()
+        } else if (mServiceConnection == null) {
+            mServiceConnection = object : ServiceConnection {
+                override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
+                    mBinder = (serviceBinder as AdvancedUnlockNotificationService.AdvancedUnlockBinder)
+                    performedAction.invoke()
+                }
+
+                override fun onServiceDisconnected(name: ComponentName?) {
+                    mBinder = null
+                    mServiceConnection = null
+                    mDatabaseListeners.forEach {
+                        it.onDatabaseCleared()
+                    }
+                }
+            }
+            applicationContext.bindService(mIntentAdvancedUnlockService,
+                    mServiceConnection!!,
+                    Context.BIND_ABOVE_CLIENT)
+            if (mBinder == null) {
+                applicationContext.startService(mIntentAdvancedUnlockService)
+            }
        }
    }

-    @Synchronized
-    private fun detachService() {
-        try {
-            applicationContext.unregisterReceiver(mAdvancedUnlockBroadcastReceiver)
-        } catch (e: Exception) {}
-
-        mServiceConnection?.let {
-            AdvancedUnlockNotificationService.unbindService(applicationContext, it)
-        }
+    fun registerDatabaseListener(listener: DatabaseListener) {
+        mDatabaseListeners.add(listener)
    }

-    private fun removeAllDataAndDetach() {
-        detachService()
-        onClear()
+    fun unregisterDatabaseListener(listener: DatabaseListener) {
+        mDatabaseListeners.remove(listener)
    }

-    fun registerDatabaseListener(listenerCipher: CipherDatabaseListener) {
-        mDatabaseListeners.add(listenerCipher)
-    }
-
-    fun unregisterDatabaseListener(listenerCipher: CipherDatabaseListener) {
-        mDatabaseListeners.remove(listenerCipher)
-    }
-
-    private fun onClear() {
-        mBinder = null
-        mServiceConnection = null
-        mDatabaseListeners.forEach {
-            it.onCipherDatabaseCleared()
-        }
-    }
-
-    interface CipherDatabaseListener {
-        fun onCipherDatabaseCleared()
+    interface DatabaseListener {
+        fun onDatabaseCleared()
    }

    fun getCipherDatabase(databaseUri: Uri,
-                          cipherDatabaseResultListener: (CipherEncryptDatabase?) -> Unit) {
+                          cipherDatabaseResultListener: (CipherDatabaseEntity?) -> Unit) {
        if (useTempDao) {
-            serviceActionTask {
-                var cipherDatabase: CipherEncryptDatabase? = null
-                mBinder?.getCipherDatabase(databaseUri)?.let { cipherDatabaseEntity ->
-                    cipherDatabase = CipherEncryptDatabase().apply {
-                        this.databaseUri = Uri.parse(cipherDatabaseEntity.databaseUri)
-                        this.encryptedValue = Base64.decode(
-                            cipherDatabaseEntity.encryptedValue,
-                            Base64.NO_WRAP
-                        )
-                        this.specParameters = Base64.decode(
-                            cipherDatabaseEntity.specParameters,
-                            Base64.NO_WRAP
-                        )
-                    }
-                }
-                cipherDatabaseResultListener.invoke(cipherDatabase)
+            attachService {
+                cipherDatabaseResultListener.invoke(mBinder?.getCipherDatabase(databaseUri))
            }
        } else {
            IOActionTask(
                    {
-                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())?.let { cipherDatabaseEntity ->
-                            CipherEncryptDatabase().apply {
-                                this.databaseUri = Uri.parse(cipherDatabaseEntity.databaseUri)
-                                this.encryptedValue = Base64.decode(
-                                    cipherDatabaseEntity.encryptedValue,
-                                    Base64.NO_WRAP
-                                )
-                                this.specParameters = Base64.decode(
-                                    cipherDatabaseEntity.specParameters,
-                                    Base64.NO_WRAP
-                                )
-                            }
-                        }
+                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
                    },
                    {
                        cipherDatabaseResultListener.invoke(it)
@@ -177,27 +118,17 @@ class CipherDatabaseAction(context: Context) {
        }
    }

-    fun addOrUpdateCipherDatabase(cipherEncryptDatabase: CipherEncryptDatabase,
+    fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
                                  cipherDatabaseResultListener: (() -> Unit)? = null) {
-        cipherEncryptDatabase.databaseUri?.let { databaseUri ->
-
-            val cipherDatabaseEntity = CipherDatabaseEntity(
-                databaseUri.toString(),
-                Base64.encodeToString(cipherEncryptDatabase.encryptedValue, Base64.NO_WRAP),
-                Base64.encodeToString(cipherEncryptDatabase.specParameters, Base64.NO_WRAP),
-            )
-
-            if (useTempDao) {
-                // The only case to create service (not needed to get an info)
-                serviceActionTask(true) {
-                    mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
-                    cipherDatabaseResultListener?.invoke()
-                }
-            } else {
-                IOActionTask(
+        if (useTempDao) {
+            attachService {
+                mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
+                cipherDatabaseResultListener?.invoke()
+            }
+        } else {
+            IOActionTask(
                    {
-                        val cipherDatabaseRetrieve =
-                            cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
+                        val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
                        // Update values if element not yet in the database
                        if (cipherDatabaseRetrieve == null) {
                            cipherDatabaseDao.add(cipherDatabaseEntity)
@@ -208,15 +139,14 @@ class CipherDatabaseAction(context: Context) {
                    {
                        cipherDatabaseResultListener?.invoke()
                    }
-                ).execute()
-            }
+            ).execute()
        }
    }

    fun deleteByDatabaseUri(databaseUri: Uri,
                            cipherDatabaseResultListener: (() -> Unit)? = null) {
        if (useTempDao) {
-            serviceActionTask {
+            attachService {
                mBinder?.deleteByDatabaseUri(databaseUri)
                cipherDatabaseResultListener?.invoke()
            }
@@ -233,22 +163,15 @@ class CipherDatabaseAction(context: Context) {
    }

    fun deleteAll() {
-        if (useTempDao) {
-            serviceActionTask {
-                mBinder?.deleteAll()
-            }
+        attachService {
+            mBinder?.deleteAll()
        }
-        // To erase the residues
        IOActionTask(
                {
                    cipherDatabaseDao.deleteAll()
                }
        ).execute()
-        // Unbind
-        removeAllDataAndDetach()
    }

-    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction) {
-        private val TAG = CipherDatabaseAction::class.java.name
-    }
+    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction)
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt
@@ -189,36 +189,26 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
        ).execute()
    }

-    fun deleteKeyFileByDatabaseUri(databaseUri: Uri,
-                                   result: (() ->Unit)? = null) {
+    fun deleteKeyFileByDatabaseUri(databaseUri: Uri) {
        IOActionTask(
                {
                    databaseFileHistoryDao.deleteKeyFileByDatabaseUri(databaseUri.toString())
-                },
-                {
-                    result?.invoke()
                }
        ).execute()
    }

-    fun deleteAllKeyFiles(result: (() ->Unit)? = null) {
+    fun deleteAllKeyFiles() {
        IOActionTask(
                {
                    databaseFileHistoryDao.deleteAllKeyFiles()
-                },
-                {
-                    result?.invoke()
                }
        ).execute()
    }

-    fun deleteAll(result: (() ->Unit)? = null) {
+    fun deleteAll() {
        IOActionTask(
                {
                    databaseFileHistoryDao.deleteAll()
-                },
-                {
-                    result?.invoke()
                }
        ).execute()
    }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillComponent.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillComponent.kt
@@ -4,4 +4,4 @@ import android.app.assist.AssistStructure
 import android.view.inputmethod.InlineSuggestionsRequest

 data class AutofillComponent(val assistStructure: AssistStructure,
-                             val compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest?)
+                             val inlineSuggestionsRequest: InlineSuggestionsRequest?)
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
@@ -34,35 +34,31 @@ import android.service.autofill.InlinePresentation
 import android.util.Log
 import android.view.autofill.AutofillManager
 import android.view.autofill.AutofillValue
+import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.RemoteViews
 import android.widget.Toast
-import android.widget.inline.InlinePresentationSpec
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
 import androidx.autofill.inline.UiVersions
 import androidx.autofill.inline.v1.InlineSuggestionUi
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.AutofillLauncherActivity
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.template.TemplateField
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.AutofillSettingsActivity
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.utils.LOCK_ACTION


@RequiresApi(api = Build.VERSION_CODES.O)
 object AutofillHelper {

+    private const val AUTOFILL_RESPONSE_REQUEST_CODE = 8165
+
    private const val EXTRA_ASSIST_STRUCTURE = AutofillManager.EXTRA_ASSIST_STRUCTURE
-    private const val EXTRA_INLINE_SUGGESTIONS_REQUEST = "com.kunzisoft.keepass.autofill.INLINE_SUGGESTIONS_REQUEST"
+    const val EXTRA_INLINE_SUGGESTIONS_REQUEST = "com.kunzisoft.keepass.autofill.INLINE_SUGGESTIONS_REQUEST"

    fun retrieveAutofillComponent(intent: Intent?): AutofillComponent? {
        intent?.getParcelableExtra<AssistStructure?>(EXTRA_ASSIST_STRUCTURE)?.let { assistStructure ->
@@ -89,14 +85,13 @@ object AutofillHelper {
    }

    private fun newRemoteViews(context: Context,
-                               database: Database,
                               remoteViewsText: String,
                               remoteViewsIcon: IconImage? = null): RemoteViews {
        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
        if (remoteViewsIcon != null) {
            try {
-                database.iconDrawableFactory.getBitmapFromIcon(context,
+                Database.getInstance().iconDrawableFactory.getBitmapFromIcon(context,
                        remoteViewsIcon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
                    presentation.setImageViewBitmap(R.id.autofill_entry_icon, bitmap)
                }
@@ -108,104 +103,31 @@ object AutofillHelper {
    }

    private fun buildDataset(context: Context,
-                             database: Database,
-                             entryInfo: EntryInfo,
-                             struct: StructureParser.Result,
-                             additionalBuild: ((build: Dataset.Builder) -> Unit)? = null): Dataset? {
+                              entryInfo: EntryInfo,
+                              struct: StructureParser.Result,
+                              inlinePresentation: InlinePresentation?): Dataset? {
        val title = makeEntryTitle(entryInfo)
-        val views = newRemoteViews(context, database, title, entryInfo.icon)
+        val views = newRemoteViews(context, title, entryInfo.icon)
        val builder = Dataset.Builder(views)
-        builder.setId(entryInfo.id.toString())
+        builder.setId(entryInfo.id)

        struct.usernameId?.let { usernameId ->
            builder.setValue(usernameId, AutofillValue.forText(entryInfo.username))
        }
-        struct.passwordId?.let { passwordId ->
-            builder.setValue(passwordId, AutofillValue.forText(entryInfo.password))
+        struct.passwordId?.let { password ->
+            builder.setValue(password, AutofillValue.forText(entryInfo.password))
        }

-        if (entryInfo.expires) {
-            val year = entryInfo.expiryTime.getYearInt()
-            val month = entryInfo.expiryTime.getMonthInt()
-            val monthString = month.toString().padStart(2, '0')
-            val day = entryInfo.expiryTime.getDay()
-            val dayString = day.toString().padStart(2, '0')
-
-            struct.creditCardExpirationDateId?.let {
-                if (struct.isWebView) {
-                    // set date string as defined in https://html.spec.whatwg.org
-                    builder.setValue(it, AutofillValue.forText("$year\u002D$monthString"))
-                } else {
-                    builder.setValue(it, AutofillValue.forDate(entryInfo.expiryTime.date.time))
-                }
-            }
-            struct.creditCardExpirationYearId?.let {
-                var autofillValue: AutofillValue? = null
-
-                struct.creditCardExpirationYearOptions?.let { options ->
-                    var yearIndex = options.indexOf(year.toString().substring(0, 2))
-
-                    if (yearIndex == -1) {
-                        yearIndex = options.indexOf(year.toString())
-                    }
-                    if (yearIndex != -1) {
-                        autofillValue = AutofillValue.forList(yearIndex)
-                        builder.setValue(it, autofillValue)
-                    }
-                }
-
-                if (autofillValue == null) {
-                    builder.setValue(it, AutofillValue.forText(year.toString()))
-                }
-            }
-            struct.creditCardExpirationMonthId?.let {
-                if (struct.isWebView) {
-                    builder.setValue(it, AutofillValue.forText(monthString))
-                } else {
-                    if (struct.creditCardExpirationMonthOptions != null) {
-                        // index starts at 0
-                        builder.setValue(it, AutofillValue.forList(month - 1))
-                    } else {
-                        builder.setValue(it, AutofillValue.forText(monthString))
-                    }
-                }
-            }
-            struct.creditCardExpirationDayId?.let {
-                if (struct.isWebView) {
-                    builder.setValue(it, AutofillValue.forText(dayString))
-                } else {
-                    if (struct.creditCardExpirationDayOptions != null) {
-                        builder.setValue(it, AutofillValue.forList(day - 1))
-                    } else {
-                        builder.setValue(it, AutofillValue.forText(dayString))
-                    }
-                }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            inlinePresentation?.let {
+                builder.setInlinePresentation(it)
            }
        }
-        for (field in entryInfo.customFields) {
-            if (field.name == TemplateField.LABEL_HOLDER) {
-                struct.creditCardHolderId?.let { ccNameId ->
-                    builder.setValue(ccNameId, AutofillValue.forText(field.protectedValue.stringValue))
-                }
-            }
-            if (field.name == TemplateField.LABEL_NUMBER) {
-                struct.creditCardNumberId?.let { ccnId ->
-                    builder.setValue(ccnId, AutofillValue.forText(field.protectedValue.stringValue))
-                }
-            }
-            if (field.name == TemplateField.LABEL_CVV) {
-                struct.cardVerificationValueId?.let { cvvId ->
-                    builder.setValue(cvvId, AutofillValue.forText(field.protectedValue.stringValue))
-                }
-            }
-        }
-
-        additionalBuild?.invoke(builder)

        return try {
            builder.build()
-        } catch (e: Exception) {
-            // at least one value must be set
+        } catch (e: IllegalArgumentException) {
+            // if not value be set
            null
        }
    }
@@ -213,11 +135,9 @@ object AutofillHelper {
    /**
     * Method to assign a drawable to a new icon from a database icon
     */
-    private fun buildIconFromEntry(context: Context,
-                                   database: Database,
-                                   entryInfo: EntryInfo): Icon? {
+    private fun buildIconFromEntry(context: Context, entryInfo: EntryInfo): Icon? {
        try {
-            database.iconDrawableFactory.getBitmapFromIcon(context,
+            Database.getInstance().iconDrawableFactory.getBitmapFromIcon(context,
                    entryInfo.icon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
                return Icon.createWithBitmap(bitmap)
            }
@@ -230,82 +150,48 @@ object AutofillHelper {
    @RequiresApi(Build.VERSION_CODES.R)
    @SuppressLint("RestrictedApi")
    private fun buildInlinePresentationForEntry(context: Context,
-                                                database: Database,
-                                                compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest,
+                                                inlineSuggestionsRequest: InlineSuggestionsRequest,
                                                positionItem: Int,
                                                entryInfo: EntryInfo): InlinePresentation? {
-        compatInlineSuggestionsRequest.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
-            val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
-            val maxSuggestion = inlineSuggestionsRequest.maxSuggestionCount
+        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
+        val maxSuggestion = inlineSuggestionsRequest.maxSuggestionCount

-            if (positionItem <= maxSuggestion - 1
-                && inlinePresentationSpecs.size > positionItem
-            ) {
-                val inlinePresentationSpec = inlinePresentationSpecs[positionItem]
+        if (positionItem <= maxSuggestion-1
+                && inlinePresentationSpecs.size > positionItem) {
+            val inlinePresentationSpec = inlinePresentationSpecs[positionItem]

-                // Make sure that the IME spec claims support for v1 UI template.
-                val imeStyle = inlinePresentationSpec.style
-                if (!UiVersions.getVersions(imeStyle).contains(UiVersions.INLINE_UI_VERSION_1))
-                    return null
+            // Make sure that the IME spec claims support for v1 UI template.
+            val imeStyle = inlinePresentationSpec.style
+            if (!UiVersions.getVersions(imeStyle).contains(UiVersions.INLINE_UI_VERSION_1))
+                return null

-                // Build the content for IME UI
-                val pendingIntent = PendingIntent.getActivity(
-                    context,
+            // Build the content for IME UI
+            val pendingIntent = PendingIntent.getActivity(context,
                    0,
                    Intent(context, AutofillSettingsActivity::class.java),
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        PendingIntent.FLAG_IMMUTABLE
-                    } else {
-                        0
-                    }
-                )
-                return InlinePresentation(
+                    0)
+            return InlinePresentation(
                    InlineSuggestionUi.newContentBuilder(pendingIntent).apply {
                        setContentDescription(context.getString(R.string.autofill_sign_in_prompt))
                        setTitle(entryInfo.title)
                        setSubtitle(entryInfo.username)
-                        setStartIcon(
-                            Icon.createWithResource(context, R.mipmap.ic_launcher_round).apply {
-                                setTintBlendMode(BlendMode.DST)
-                            })
-                        buildIconFromEntry(context, database, entryInfo)?.let { icon ->
+                        setStartIcon(Icon.createWithResource(context, R.mipmap.ic_launcher_round).apply {
+                            setTintBlendMode(BlendMode.DST)
+                        })
+                        buildIconFromEntry(context, entryInfo)?.let { icon ->
                            setEndIcon(icon.apply {
                                setTintBlendMode(BlendMode.DST)
                            })
                        }
-                    }.build().slice, inlinePresentationSpec, false
-                )
-            }
+                    }.build().slice, inlinePresentationSpec, false)
        }
        return null
    }

-    @RequiresApi(Build.VERSION_CODES.R)
-    @SuppressLint("RestrictedApi")
-    private fun buildInlinePresentationForManualSelection(context: Context,
-                                                          inlinePresentationSpec: InlinePresentationSpec,
-                                                          pendingIntent: PendingIntent): InlinePresentation? {
-        // Make sure that the IME spec claims support for v1 UI template.
-        val imeStyle = inlinePresentationSpec.style
-        if (!UiVersions.getVersions(imeStyle).contains(UiVersions.INLINE_UI_VERSION_1))
-            return null
-
-        // Build the content for IME UI
-        return InlinePresentation(
-                InlineSuggestionUi.newContentBuilder(pendingIntent).apply {
-                    setContentDescription(context.getString(R.string.autofill_sign_in_prompt))
-                    setTitle(context.getString(R.string.autofill_select_entry))
-                    setStartIcon(Icon.createWithResource(context, R.drawable.ic_arrow_right_green_24dp).apply {
-                        setTintBlendMode(BlendMode.DST)
-                    })
-                }.build().slice, inlinePresentationSpec, false)
-    }
-
    fun buildResponse(context: Context,
-                      database: Database,
                      entriesInfo: List<EntryInfo>,
                      parseResult: StructureParser.Result,
-                      compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest?): FillResponse? {
+                      inlineSuggestionsRequest: InlineSuggestionsRequest?): FillResponse {
        val responseBuilder = FillResponse.Builder()
        // Add Header
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@@ -322,90 +208,31 @@ object AutofillHelper {
                }
            }
        }
-
        // Add inline suggestion for new IME and dataset
-        var numberInlineSuggestions = 0
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            compatInlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
-                numberInlineSuggestions = minOf(inlineSuggestionsRequest.maxSuggestionCount, entriesInfo.size)
-                if (PreferencesUtil.isAutofillManualSelectionEnable(context)) {
-                    if (entriesInfo.size >= inlineSuggestionsRequest.maxSuggestionCount) {
-                        --numberInlineSuggestions
-                    }
+        entriesInfo.forEachIndexed { index, entryInfo ->
+            val inlinePresentation = inlineSuggestionsRequest?.let {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    buildInlinePresentationForEntry(context, inlineSuggestionsRequest, index, entryInfo)
+                } else {
+                    null
                }
            }
-
-        }
-
-        entriesInfo.forEachIndexed { _, entry ->
-            if (numberInlineSuggestions > 0
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                && compatInlineSuggestionsRequest != null) {
-                responseBuilder.addDataset(buildDataset(context, database, entry, parseResult) { builder ->
-                    buildInlinePresentationForEntry(context, database,
-                        compatInlineSuggestionsRequest, numberInlineSuggestions--, entry
-                    )?.let { inlinePresentation ->
-                        builder.setInlinePresentation(inlinePresentation)
-                    }
-                })
-            } else {
-                responseBuilder.addDataset(buildDataset(context, database, entry, parseResult))
-            }
-        }
-
-        if (PreferencesUtil.isAutofillManualSelectionEnable(context)) {
-            val searchInfo = SearchInfo().apply {
-                applicationId = parseResult.applicationId
-                webDomain = parseResult.webDomain
-                webScheme = parseResult.webScheme
-                manualSelection = true
-            }
-            val manualSelectionView = RemoteViews(context.packageName, R.layout.item_autofill_select_entry)
-            val pendingIntent = AutofillLauncherActivity.getPendingIntentForSelection(context,
-                    searchInfo, compatInlineSuggestionsRequest)
-
-            parseResult.allAutofillIds().let { autofillIds ->
-                autofillIds.forEach { id ->
-                    val builder = Dataset.Builder(manualSelectionView)
-
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                        compatInlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
-                            val inlinePresentationSpec = inlineSuggestionsRequest.inlinePresentationSpecs[0]
-                            val inlinePresentation = buildInlinePresentationForManualSelection(context, inlinePresentationSpec, pendingIntent)
-                            inlinePresentation?.let {
-                                builder.setInlinePresentation(it)
-                            }
-                        }
-                    }
-                    builder.setValue(id, null)
-                    builder.setAuthentication(pendingIntent.intentSender)
-                    responseBuilder.addDataset(builder.build())
-                }
-            }
-        }
-
-        return try {
-            responseBuilder.build()
-        } catch (e: Exception) {
-            null
+            responseBuilder.addDataset(buildDataset(context, entryInfo, parseResult, inlinePresentation))
        }
+        return responseBuilder.build()
    }

    /**
     * Build the Autofill response for one entry
     */
-    fun buildResponseAndSetResult(activity: Activity,
-                                  database: Database,
-                                  entryInfo: EntryInfo) {
-        buildResponseAndSetResult(activity, database, ArrayList<EntryInfo>().apply { add(entryInfo) })
+    fun buildResponseAndSetResult(activity: Activity, entryInfo: EntryInfo) {
+        buildResponseAndSetResult(activity, ArrayList<EntryInfo>().apply { add(entryInfo) })
    }

    /**
     * Build the Autofill response for many entry
     */
-    fun buildResponseAndSetResult(activity: Activity,
-                                  database: Database,
-                                  entriesInfo: List<EntryInfo>) {
+    fun buildResponseAndSetResult(activity: Activity, entriesInfo: List<EntryInfo>) {
        if (entriesInfo.isEmpty()) {
            activity.setResult(Activity.RESULT_CANCELED)
        } else {
@@ -414,13 +241,13 @@ object AutofillHelper {
                StructureParser(structure).parse()?.let { result ->
                    // New Response
                    val response = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                        val compatInlineSuggestionsRequest = activity.intent?.getParcelableExtra<CompatInlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
-                        if (compatInlineSuggestionsRequest != null) {
+                        val inlineSuggestionsRequest = activity.intent?.getParcelableExtra<InlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
+                        if (inlineSuggestionsRequest != null) {
                            Toast.makeText(activity.applicationContext, R.string.autofill_inline_suggestions_keyboard, Toast.LENGTH_SHORT).show()
                        }
-                        buildResponse(activity, database, entriesInfo, result, compatInlineSuggestionsRequest)
+                        buildResponse(activity, entriesInfo, result, inlineSuggestionsRequest)
                    } else {
-                        buildResponse(activity, database, entriesInfo, result, null)
+                        buildResponse(activity, entriesInfo, result, null)
                    }
                    val mReplyIntent = Intent()
                    Log.d(activity.javaClass.name, "Successed Autofill auth.")
@@ -438,44 +265,37 @@ object AutofillHelper {
        }
    }

-    fun buildActivityResultLauncher(activity: AppCompatActivity,
-                                    lockDatabase: Boolean = false): ActivityResultLauncher<Intent> {
-        return activity.registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
-        ) {
-            // Utility method to loop and close each activity with return data
-            if (it.resultCode == Activity.RESULT_OK) {
-                activity.setResult(it.resultCode, it.data)
-            }
-            if (it.resultCode == Activity.RESULT_CANCELED) {
-                activity.setResult(Activity.RESULT_CANCELED)
-            }
-            activity.finish()
-
-            if (lockDatabase && PreferencesUtil.isAutofillCloseDatabaseEnable(activity)) {
-                // Close the database
-                activity.sendBroadcast(Intent(LOCK_ACTION))
-            }
-        }
-    }
-
    /**
     * Utility method to start an activity with an Autofill for result
     */
-    fun startActivityForAutofillResult(activity: AppCompatActivity,
+    fun startActivityForAutofillResult(activity: Activity,
                                       intent: Intent,
-                                       activityResultLauncher: ActivityResultLauncher<Intent>?,
                                       autofillComponent: AutofillComponent,
                                       searchInfo: SearchInfo?) {
        EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.SELECTION)
        intent.putExtra(EXTRA_ASSIST_STRUCTURE, autofillComponent.assistStructure)
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                && PreferencesUtil.isAutofillInlineSuggestionsEnable(activity)) {
-            autofillComponent.compatInlineSuggestionsRequest?.let {
+            autofillComponent.inlineSuggestionsRequest?.let {
                intent.putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
            }
        }
        EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
-        activityResultLauncher?.launch(intent)
+        activity.startActivityForResult(intent, AUTOFILL_RESPONSE_REQUEST_CODE)
+    }
+
+    /**
+     * Utility method to loop and close each activity with return data
+     */
+    fun onActivityResultSetResultAndFinish(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == AUTOFILL_RESPONSE_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                activity.setResult(resultCode, data)
+            }
+            if (resultCode == Activity.RESULT_CANCELED) {
+                activity.setResult(Activity.RESULT_CANCELED)
+            }
+            activity.finish()
+        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/CompatInlineSuggestionsRequest.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/CompatInlineSuggestionsRequest.kt
@@ -1,83 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.autofill
-
-import android.annotation.TargetApi
-import android.os.Build
-import android.os.Parcel
-import android.os.Parcelable
-import android.service.autofill.FillRequest
-import android.view.inputmethod.InlineSuggestionsRequest
-import androidx.annotation.RequiresApi
-
-/**
- * Utility class only to prevent java.lang.NoClassDefFoundError for old Android version and new lib compilation
- */
-@RequiresApi(Build.VERSION_CODES.O)
-class CompatInlineSuggestionsRequest : Parcelable {
-
-    @TargetApi(Build.VERSION_CODES.R)
-    var inlineSuggestionsRequest: InlineSuggestionsRequest? = null
-        private set
-
-    constructor(fillRequest: FillRequest) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            this.inlineSuggestionsRequest = fillRequest.inlineSuggestionsRequest
-        } else {
-            this.inlineSuggestionsRequest = null
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.R)
-    constructor(inlineSuggestionsRequest: InlineSuggestionsRequest?) {
-        this.inlineSuggestionsRequest = inlineSuggestionsRequest
-    }
-
-    constructor(parcel: Parcel) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            this.inlineSuggestionsRequest =
-                parcel.readParcelable(FillRequest::class.java.classLoader)
-        }
-        else {
-            this.inlineSuggestionsRequest = null
-        }
-    }
-
-    override fun writeToParcel(parcel: Parcel, flags: Int) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            parcel.writeParcelable(inlineSuggestionsRequest, flags)
-        }
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    companion object CREATOR : Parcelable.Creator<CompatInlineSuggestionsRequest> {
-        override fun createFromParcel(parcel: Parcel): CompatInlineSuggestionsRequest {
-            return CompatInlineSuggestionsRequest(parcel)
-        }
-
-        override fun newArray(size: Int): Array<CompatInlineSuggestionsRequest?> {
-            return arrayOfNulls(size)
-        }
-    }
-
-}
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -36,47 +36,29 @@ import androidx.autofill.inline.UiVersions
 import androidx.autofill.inline.v1.InlineSuggestionUi
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.AutofillLauncherActivity
-import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.model.CreditCard
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.AutofillSettingsActivity
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import org.joda.time.DateTime
 import java.util.concurrent.atomic.AtomicBoolean


@RequiresApi(api = Build.VERSION_CODES.O)
 class KeeAutofillService : AutofillService() {

-    private var mDatabaseTaskProvider: DatabaseTaskProvider? = null
-    private var mDatabase: Database? = null
-    private var applicationIdBlocklist: Set<String>? = null
-    private var webDomainBlocklist: Set<String>? = null
-    private var askToSaveData: Boolean = false
-    private var autofillInlineSuggestionsEnabled: Boolean = false
+    var applicationIdBlocklist: Set<String>? = null
+    var webDomainBlocklist: Set<String>? = null
+    var askToSaveData: Boolean = false
+    var autofillInlineSuggestionsEnabled: Boolean = false
    private var mLock = AtomicBoolean()

    override fun onCreate() {
        super.onCreate()
-
-        mDatabaseTaskProvider = DatabaseTaskProvider(this)
-        mDatabaseTaskProvider?.registerProgressTask()
-        mDatabaseTaskProvider?.onDatabaseRetrieved = { database ->
-            this.mDatabase = database
-        }
-
        getPreferences()
    }

-    override fun onDestroy() {
-        mDatabaseTaskProvider?.unregisterProgressTask()
-
-        super.onDestroy()
-    }
-
    private fun getPreferences() {
        applicationIdBlocklist = PreferencesUtil.applicationIdBlocklist(this)
        webDomainBlocklist = PreferencesUtil.webDomainBlocklist(this)
@@ -109,12 +91,11 @@ class KeeAutofillService : AutofillService() {
                        searchInfo.webDomain = webDomainWithoutSubDomain
                        val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                                && autofillInlineSuggestionsEnabled) {
-                            CompatInlineSuggestionsRequest(request)
+                            request.inlineSuggestionsRequest
                        } else {
                            null
                        }
-                        launchSelection(mDatabase,
-                                searchInfo,
+                        launchSelection(searchInfo,
                                parseResult,
                                inlineSuggestionsRequest,
                                callback)
@@ -124,28 +105,27 @@ class KeeAutofillService : AutofillService() {
        }
    }

-    private fun launchSelection(database: Database?,
-                                searchInfo: SearchInfo,
+    private fun launchSelection(searchInfo: SearchInfo,
                                parseResult: StructureParser.Result,
-                                inlineSuggestionsRequest: CompatInlineSuggestionsRequest?,
+                                inlineSuggestionsRequest: InlineSuggestionsRequest?,
                                callback: FillCallback) {
        SearchHelper.checkAutoSearchInfo(this,
-                database,
+                Database.getInstance(),
                searchInfo,
-                { openedDatabase, items ->
+                { items ->
                    callback.onSuccess(
-                            AutofillHelper.buildResponse(this, openedDatabase,
+                            AutofillHelper.buildResponse(this,
                                    items, parseResult, inlineSuggestionsRequest)
                    )
                },
-                { openedDatabase ->
+                {
                    // Show UI if no search result
-                    showUIForEntrySelection(parseResult, openedDatabase,
+                    showUIForEntrySelection(parseResult,
                            searchInfo, inlineSuggestionsRequest, callback)
                },
                {
                    // Show UI if database not open
-                    showUIForEntrySelection(parseResult, null,
+                    showUIForEntrySelection(parseResult,
                            searchInfo, inlineSuggestionsRequest, callback)
                }
        )
@@ -153,95 +133,45 @@ class KeeAutofillService : AutofillService() {

    @SuppressLint("RestrictedApi")
    private fun showUIForEntrySelection(parseResult: StructureParser.Result,
-                                        database: Database?,
                                        searchInfo: SearchInfo,
-                                        inlineSuggestionsRequest: CompatInlineSuggestionsRequest?,
+                                        inlineSuggestionsRequest: InlineSuggestionsRequest?,
                                        callback: FillCallback) {
        parseResult.allAutofillIds().let { autofillIds ->
            if (autofillIds.isNotEmpty()) {
                // If the entire Autofill Response is authenticated, AuthActivity is used
                // to generate Response.
-                val intentSender = AutofillLauncherActivity.getPendingIntentForSelection(this,
-                        searchInfo, inlineSuggestionsRequest).intentSender
+                val intentSender = AutofillLauncherActivity.getAuthIntentSenderForSelection(this,
+                        searchInfo, inlineSuggestionsRequest)
                val responseBuilder = FillResponse.Builder()
-                val remoteViewsUnlock: RemoteViews = if (database == null) {
-                    if (!parseResult.webDomain.isNullOrEmpty()) {
-                        RemoteViews(
-                            packageName,
-                            R.layout.item_autofill_unlock_web_domain
-                        ).apply {
-                            setTextViewText(
-                                R.id.autofill_web_domain_text,
-                                parseResult.webDomain
-                            )
-                        }
-                    } else if (!parseResult.applicationId.isNullOrEmpty()) {
-                        RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
-                            setTextViewText(
-                                R.id.autofill_app_id_text,
-                                parseResult.applicationId
-                            )
-                        }
-                    } else {
-                        RemoteViews(packageName, R.layout.item_autofill_unlock)
+                val remoteViewsUnlock: RemoteViews = if (!parseResult.webDomain.isNullOrEmpty()) {
+                    RemoteViews(packageName, R.layout.item_autofill_unlock_web_domain).apply {
+                        setTextViewText(R.id.autofill_web_domain_text, parseResult.webDomain)
+                    }
+                } else if (!parseResult.applicationId.isNullOrEmpty()) {
+                    RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
+                        setTextViewText(R.id.autofill_app_id_text, parseResult.applicationId)
                    }
                } else {
-                    if (!parseResult.webDomain.isNullOrEmpty()) {
-                        RemoteViews(
-                            packageName,
-                            R.layout.item_autofill_select_entry_web_domain
-                        ).apply {
-                            setTextViewText(
-                                R.id.autofill_web_domain_text,
-                                parseResult.webDomain
-                            )
-                        }
-                    } else if (!parseResult.applicationId.isNullOrEmpty()) {
-                        RemoteViews(packageName, R.layout.item_autofill_select_entry_app_id).apply {
-                            setTextViewText(
-                                R.id.autofill_app_id_text,
-                                parseResult.applicationId
-                            )
-                        }
-                    } else {
-                        RemoteViews(packageName, R.layout.item_autofill_select_entry)
-                    }
+                    RemoteViews(packageName, R.layout.item_autofill_unlock)
                }

-                // Tell the autofill framework the interest to save credentials
+                // Tell to service the interest to save credentials
                if (askToSaveData) {
                    var types: Int = SaveInfo.SAVE_DATA_TYPE_GENERIC
-                    val requiredIds = ArrayList<AutofillId>()
-                    val optionalIds = ArrayList<AutofillId>()
-
+                    val info = ArrayList<AutofillId>()
                    // Only if at least a password
                    parseResult.passwordId?.let { passwordInfo ->
                        parseResult.usernameId?.let { usernameInfo ->
                            types = types or SaveInfo.SAVE_DATA_TYPE_USERNAME
-                            requiredIds.add(usernameInfo)
+                            info.add(usernameInfo)
                        }
                        types = types or SaveInfo.SAVE_DATA_TYPE_PASSWORD
-                        requiredIds.add(passwordInfo)
+                        info.add(passwordInfo)
                    }
-                    // or a credit card form
-                    if (requiredIds.isEmpty()) {
-                        parseResult.creditCardNumberId?.let { numberId ->
-                            types = types or SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD
-                            requiredIds.add(numberId)
-                            Log.d(TAG, "Asking to save credit card number")
-                        }
-                        parseResult.creditCardExpirationDateId?.let { id -> optionalIds.add(id) }
-                        parseResult.creditCardExpirationYearId?.let { id -> optionalIds.add(id) }
-                        parseResult.creditCardExpirationMonthId?.let { id -> optionalIds.add(id) }
-                        parseResult.creditCardHolderId?.let { id -> optionalIds.add(id) }
-                        parseResult.cardVerificationValueId?.let { id -> optionalIds.add(id) }
-                    }
-                    if (requiredIds.isNotEmpty()) {
-                        val builder = SaveInfo.Builder(types, requiredIds.toTypedArray())
-                        if (optionalIds.isNotEmpty()) {
-                            builder.setOptionalIds(optionalIds.toTypedArray())
-                        }
-                        responseBuilder.setSaveInfo(builder.build())
+                    if (info.isNotEmpty()) {
+                        responseBuilder.setSaveInfo(
+                                SaveInfo.Builder(types, info.toTypedArray()).build()
+                        )
                    }
                }

@@ -249,7 +179,7 @@ class KeeAutofillService : AutofillService() {
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                        && autofillInlineSuggestionsEnabled) {
                    var inlinePresentation: InlinePresentation? = null
-                    inlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
+                    inlineSuggestionsRequest?.let {
                        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
                        if (inlineSuggestionsRequest.maxSuggestionCount > 0
                                && inlinePresentationSpecs.size > 0) {
@@ -262,13 +192,9 @@ class KeeAutofillService : AutofillService() {
                                inlinePresentation = InlinePresentation(
                                        InlineSuggestionUi.newContentBuilder(
                                                PendingIntent.getActivity(this,
-                                                    0,
-                                                    Intent(this, AutofillSettingsActivity::class.java),
-                                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                                        PendingIntent.FLAG_IMMUTABLE
-                                                    } else {
-                                                        0
-                                                    })
+                                                        0,
+                                                        Intent(this, AutofillSettingsActivity::class.java),
+                                                        0)
                                        ).apply {
                                            setContentDescription(getString(R.string.autofill_sign_in_prompt))
                                            setTitle(getString(R.string.autofill_sign_in_prompt))
@@ -281,9 +207,8 @@ class KeeAutofillService : AutofillService() {
                    }
                    // Build response
                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock, inlinePresentation)
-                } else {
-                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock)
                }
+                responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock)
                callback.onSuccess(responseBuilder.build())
            }
        }
@@ -298,35 +223,14 @@ class KeeAutofillService : AutofillService() {
                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
                    Log.d(TAG, "autofill onSaveRequest password")

-                    // Build expiration from date or from year and month
-                    var expiration: DateTime? = parseResult.creditCardExpirationValue
-                    if (parseResult.creditCardExpirationValue == null
-                        && parseResult.creditCardExpirationYearValue != 0
-                        && parseResult.creditCardExpirationMonthValue != 0) {
-                        expiration = DateTime()
-                            .withYear(parseResult.creditCardExpirationYearValue)
-                            .withMonthOfYear(parseResult.creditCardExpirationMonthValue)
-                        if (parseResult.creditCardExpirationDayValue != 0) {
-                            expiration = expiration.withDayOfMonth(parseResult.creditCardExpirationDayValue)
-                        }
-                    }
-
                    // Show UI to save data
-                    val registerInfo = RegisterInfo(
-                            SearchInfo().apply {
-                                applicationId = parseResult.applicationId
-                                webDomain = parseResult.webDomain
-                                webScheme = parseResult.webScheme
-                            },
+                    val registerInfo = RegisterInfo(SearchInfo().apply {
+                        applicationId = parseResult.applicationId
+                        webDomain = parseResult.webDomain
+                        webScheme = parseResult.webScheme
+                    },
                            parseResult.usernameValue?.textValue?.toString(),
-                            parseResult.passwordValue?.textValue?.toString(),
-                            CreditCard(
-                                parseResult.creditCardHolder,
-                                parseResult.creditCardNumber,
-                                expiration,
-                                parseResult.cardVerificationValue
-                            ))
-
+                            parseResult.passwordValue?.textValue?.toString())
                    // TODO Callback in each activity #765
                    //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                    //    callback.onSuccess(AutofillLauncherActivity.getAuthIntentSenderForRegistration(this,
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
@@ -21,14 +21,12 @@ package com.kunzisoft.keepass.autofill
 import android.app.assist.AssistStructure
 import android.os.Build
 import android.text.InputType
+import androidx.annotation.RequiresApi
 import android.util.Log
 import android.view.View
 import android.view.autofill.AutofillId
 import android.view.autofill.AutofillValue
-import androidx.annotation.RequiresApi
-import org.joda.time.DateTime
 import java.util.*
-import kotlin.collections.ArrayList


 /**
@@ -37,8 +35,10 @@ import kotlin.collections.ArrayList
@RequiresApi(api = Build.VERSION_CODES.O)
 class StructureParser(private val structure: AssistStructure) {
    private var result: Result? = null
+
    private var usernameNeeded = true
-    private var usernameIdCandidate: AutofillId? = null
+
+    private var usernameCandidate: AutofillId? = null
    private var usernameValueCandidate: AutofillValue? = null

    fun parse(saveValue: Boolean = false): Result? {
@@ -46,42 +46,37 @@ class StructureParser(private val structure: AssistStructure) {
            result = Result()
            result?.apply {
                allowSaveValues = saveValue
-                usernameIdCandidate = null
+                usernameCandidate = null
                usernameValueCandidate = null
                mainLoop@ for (i in 0 until structure.windowNodeCount) {
                    val windowNode = structure.getWindowNodeAt(i)
                    applicationId = windowNode.title.toString().split("/")[0]
                    Log.d(TAG, "Autofill applicationId: $applicationId")

-                    if (applicationId?.contains("PopupWindow:") == false) {
-                        if (parseViewNode(windowNode.rootViewNode))
-                            break@mainLoop
-                    }
+                    if (parseViewNode(windowNode.rootViewNode))
+                        break@mainLoop
                }
                // If not explicit username field found, add the field just before password field.
-                if (usernameId == null && passwordId != null && usernameIdCandidate != null) {
-                    usernameId = usernameIdCandidate
+                if (usernameId == null && passwordId != null && usernameCandidate != null) {
+                    usernameId = usernameCandidate
                    if (allowSaveValues) {
                        usernameValue = usernameValueCandidate
                    }
                }
            }

-            return if (result?.passwordId != null || result?.creditCardNumberId != null)
-                    result
-                else
-                    null
+            // Return the result only if password field is retrieved
+            return if ((!usernameNeeded || result?.usernameId != null)
+                    && result?.passwordId != null)
+                result
+            else
+                null
        } catch (e: Exception) {
            return null
        }
    }

    private fun parseViewNode(node: AssistStructure.ViewNode): Boolean {
-        // remember this
-        if (node.className == "android.webkit.WebView") {
-            result?.isWebView = true
-        }
-
        // Get the domain of a web app
        node.webDomain?.let { webDomain ->
            if (webDomain.isNotEmpty()) {
@@ -102,7 +97,8 @@ class StructureParser(private val structure: AssistStructure) {
        var returnValue = false
        // Only parse visible nodes
        if (node.visibility == View.VISIBLE) {
-            if (node.autofillId != null) {
+            if (node.autofillId != null
+                    && node.autofillType == View.AUTOFILL_TYPE_TEXT) {
                // Parse methods
                val hints = node.autofillHints
                if (hints != null && hints.isNotEmpty()) {
@@ -134,7 +130,7 @@ class StructureParser(private val structure: AssistStructure) {
                it.contains(View.AUTOFILL_HINT_USERNAME, true)
                        || it.contains(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
                        || it.contains("email", true)
-                        || it.contains(View.AUTOFILL_HINT_PHONE, true) -> {
+                        || it.contains(View.AUTOFILL_HINT_PHONE, true)-> {
                    result?.usernameId = autofillId
                    result?.usernameValue = node.autofillValue
                    Log.d(TAG, "Autofill username hint")
@@ -143,123 +139,14 @@ class StructureParser(private val structure: AssistStructure) {
                    result?.passwordId = autofillId
                    result?.passwordValue = node.autofillValue
                    Log.d(TAG, "Autofill password hint")
+                    // Username not needed in this case
+                    usernameNeeded = false
                    return true
                }
-                it.equals("cc-name", true) -> {
-                    Log.d(TAG, "Autofill credit card name hint")
-                    result?.creditCardHolderId = autofillId
-                    result?.creditCardHolder = node.autofillValue?.textValue?.toString()
-                }
-                it.contains(View.AUTOFILL_HINT_CREDIT_CARD_NUMBER, true)
-                        || it.equals("cc-number", true) -> {
-                    Log.d(TAG, "Autofill credit card number hint")
-                    result?.creditCardNumberId = autofillId
-                    result?.creditCardNumber = node.autofillValue?.textValue?.toString()
-                }
-                // expect date string as defined in https://html.spec.whatwg.org, e.g. 2014-12
-                it.equals("cc-exp", true) -> {
-                    Log.d(TAG, "Autofill credit card expiration date hint")
-                    result?.creditCardExpirationDateId = autofillId
-                    node.autofillValue?.let { value ->
-                        if (value.isText && value.textValue.length == 7) {
-                            value.textValue.let { date ->
-                                try {
-                                    result?.creditCardExpirationValue = DateTime()
-                                        .withYear(date.substring(2, 4).toInt())
-                                        .withMonthOfYear(date.substring(5, 7).toInt())
-                                } catch(e: Exception) {
-                                    Log.e(TAG, "Unable to retrieve expiration", e)
-                                }
-                            }
-                        }
-                    }
-                }
-                it.contains(View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE, true) -> {
-                    Log.d(TAG, "Autofill credit card expiration date hint")
-                    result?.creditCardExpirationDateId = autofillId
-                    node.autofillValue?.let { value ->
-                        if (value.isDate) {
-                            result?.creditCardExpirationValue = DateTime(value.dateValue)
-                        }
-                    }
-                }
-                it.contains(View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR, true)
-                        || it.equals("cc-exp-year", true) -> {
-                    Log.d(TAG, "Autofill credit card expiration year hint")
-                    result?.creditCardExpirationYearId = autofillId
-                    if (node.autofillOptions != null) {
-                        result?.creditCardExpirationYearOptions = node.autofillOptions
-                    }
-                    node.autofillValue?.let { value ->
-                        var year = 0
-                        try {
-                            if (value.isText) {
-                                year = value.textValue.toString().toInt()
-                            }
-                            if (value.isList) {
-                                year = node.autofillOptions?.get(value.listValue).toString().toInt()
-                            }
-                        } catch (e: Exception) {
-                            Log.e(TAG, "Unable to retrieve expiration year", e)
-                        }
-                        result?.creditCardExpirationYearValue = year % 100
-                    }
-                }
-                it.contains(View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH, true)
-                        || it.equals("cc-exp-month", true) -> {
-                    Log.d(TAG, "Autofill credit card expiration month hint")
-                    result?.creditCardExpirationMonthId = autofillId
-                    if (node.autofillOptions != null) {
-                        result?.creditCardExpirationMonthOptions = node.autofillOptions
-                    }
-                    node.autofillValue?.let { value ->
-                        var month = 0
-                        try {
-                            if (value.isText) {
-                                month = value.textValue.toString().toInt()
-                            }
-                            if (value.isList) {
-                                // assume list starts with January (index 0)
-                                month = value.listValue + 1
-                            }
-                        } catch (e: Exception) {
-                            Log.e(TAG, "Unable to retrieve expiration month", e)
-                        }
-                        result?.creditCardExpirationMonthValue = month
-                    }
-                }
-                it.contains(View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY, true)
-                        || it.equals("cc-exp-day", true) -> {
-                    Log.d(TAG, "Autofill credit card expiration day hint")
-                    result?.creditCardExpirationDayId = autofillId
-                    if (node.autofillOptions != null) {
-                        result?.creditCardExpirationDayOptions = node.autofillOptions
-                    }
-                    node.autofillValue?.let { value ->
-                        var day = 0
-                        try {
-                            if (value.isText) {
-                                day = value.textValue.toString().toInt()
-                            }
-                            if (value.isList) {
-                                day = node.autofillOptions?.get(value.listValue).toString().toInt()
-                            }
-                        } catch (e: Exception) {
-                            Log.e(TAG, "Unable to retrieve expiration day", e)
-                        }
-                        result?.creditCardExpirationDayValue = day
-                    }
-                }
-                it.contains(View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE, true)
-                        || it.contains("cc-csc", true) -> {
-                    Log.d(TAG, "Autofill card security code hint")
-                    result?.cardVerificationValueId = autofillId
-                    result?.cardVerificationValue = node.autofillValue?.textValue?.toString()
-                }
                // Ignore autocomplete="off"
                // https://developer.mozilla.org/en-US/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion
                it.equals("off", true) ||
-                        it.equals("on", true) -> {
+                it.equals("on", true) -> {
                    Log.d(TAG, "Autofill web hint")
                    return parseNodeByHtmlAttributes(node)
                }
@@ -272,19 +159,19 @@ class StructureParser(private val structure: AssistStructure) {
    private fun parseNodeByHtmlAttributes(node: AssistStructure.ViewNode): Boolean {
        val autofillId = node.autofillId
        val nodHtml = node.htmlInfo
-        when (nodHtml?.tag?.lowercase(Locale.ENGLISH)) {
+        when (nodHtml?.tag?.toLowerCase(Locale.ENGLISH)) {
            "input" -> {
                nodHtml.attributes?.forEach { pairAttribute ->
-                    when (pairAttribute.first.lowercase(Locale.ENGLISH)) {
+                    when (pairAttribute.first.toLowerCase(Locale.ENGLISH)) {
                        "type" -> {
-                            when (pairAttribute.second.lowercase(Locale.ENGLISH)) {
+                            when (pairAttribute.second.toLowerCase(Locale.ENGLISH)) {
                                "tel", "email" -> {
                                    result?.usernameId = autofillId
                                    result?.usernameValue = node.autofillValue
                                    Log.d(TAG, "Autofill username web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                }
                                "text" -> {
-                                    usernameIdCandidate = autofillId
+                                    usernameCandidate = autofillId
                                    usernameValueCandidate = node.autofillValue
                                    Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                }
@@ -332,30 +219,18 @@ class StructureParser(private val structure: AssistStructure) {
                            InputType.TYPE_TEXT_VARIATION_NORMAL,
                            InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
                            InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
-                        usernameIdCandidate = autofillId
+                        usernameCandidate = autofillId
                        usernameValueCandidate = node.autofillValue
                        Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) -> {
-                        // Some forms used visible password as username
-                        if (usernameIdCandidate == null && usernameValueCandidate == null) {
-                            usernameIdCandidate = autofillId
-                            usernameValueCandidate = node.autofillValue
-                            Log.d(TAG, "Autofill visible password android text type (as username): ${showHexInputType(inputType)}")
-                        } else if (result?.passwordId == null && result?.passwordValue == null) {
-                            result?.passwordId = autofillId
-                            result?.passwordValue = node.autofillValue
-                            Log.d(TAG, "Autofill visible password android text type (as password): ${showHexInputType(inputType)}")
-                            usernameNeeded = false
-                        }
-                    }
                    inputIsVariationType(inputType,
                            InputType.TYPE_TEXT_VARIATION_PASSWORD,
+                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
                            InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
                        result?.passwordId = autofillId
                        result?.passwordValue = node.autofillValue
                        Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
+                        usernameNeeded = false
                        return true
                    }
                    inputIsVariationType(inputType,
@@ -377,17 +252,16 @@ class StructureParser(private val structure: AssistStructure) {
                when {
                    inputIsVariationType(inputType,
                            InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
-                        if (usernameIdCandidate == null) {
-                            usernameIdCandidate = autofillId
-                            usernameValueCandidate = node.autofillValue
-                            Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
-                        }
+                        usernameCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
+                        Log.d(TAG, "Autofill usernale candidate android number type: ${showHexInputType(inputType)}")
                    }
                    inputIsVariationType(inputType,
                            InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
                        result?.passwordId = autofillId
                        result?.passwordValue = node.autofillValue
                        Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
+                        usernameNeeded = false
                        return true
                    }
                    else -> {
@@ -401,8 +275,8 @@ class StructureParser(private val structure: AssistStructure) {

    @RequiresApi(api = Build.VERSION_CODES.O)
    class Result {
-        var isWebView: Boolean = false
        var applicationId: String? = null
+
        var webDomain: String? = null
            set(value) {
                if (field == null)
@@ -415,12 +289,6 @@ class StructureParser(private val structure: AssistStructure) {
                    field = value
            }

-        // if the user selects the credit card expiration date from a list of options
-        // all options are stored here
-        var creditCardExpirationYearOptions: Array<CharSequence>? = null
-        var creditCardExpirationMonthOptions: Array<CharSequence>? = null
-        var creditCardExpirationDayOptions: Array<CharSequence>? = null
-
        var usernameId: AutofillId? = null
            set(value) {
                if (field == null)
@@ -433,48 +301,6 @@ class StructureParser(private val structure: AssistStructure) {
                    field = value
            }

-        var creditCardHolderId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var creditCardNumberId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var creditCardExpirationDateId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var creditCardExpirationYearId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var creditCardExpirationMonthId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var creditCardExpirationDayId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var cardVerificationValueId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
        fun allAutofillIds(): Array<AutofillId> {
            val all = ArrayList<AutofillId>()
            usernameId?.let {
@@ -483,15 +309,6 @@ class StructureParser(private val structure: AssistStructure) {
            passwordId?.let {
                all.add(it)
            }
-            creditCardHolderId?.let {
-                all.add(it)
-            }
-            creditCardNumberId?.let {
-                all.add(it)
-            }
-            cardVerificationValueId?.let {
-                all.add(it)
-            }
            return all.toTypedArray()
        }

@@ -509,52 +326,6 @@ class StructureParser(private val structure: AssistStructure) {
                if (allowSaveValues && field == null)
                    field = value
            }
-
-        var creditCardHolder: String? = null
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
-
-        var creditCardNumber: String? = null
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
-
-        // format MMYY
-        var creditCardExpirationValue: DateTime? = null
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
-
-        // for year of CC expiration date: YY
-        var creditCardExpirationYearValue = 0
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
-
-        // for month of CC expiration date: MM
-        var creditCardExpirationMonthValue = 0
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
-
-        var creditCardExpirationDayValue = 0
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
-
-        // the security code for the credit card (also called CVV)
-        var cardVerificationValue: String? = null
-            set(value) {
-                if (allowSaveValues)
-                    field = value
-            }
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
@@ -19,7 +19,6 @@
 */
 package com.kunzisoft.keepass.biometric

-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -28,26 +27,18 @@ import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
 import android.view.*
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
 import com.getkeepsafe.taptargetview.TapTargetView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.database.exception.IODatabaseException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
-import com.kunzisoft.keepass.model.CipherDecryptDatabase
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.CredentialStorage
+import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
-import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch

 class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedUnlockCallback {

@@ -63,18 +54,12 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    var databaseFileUri: Uri? = null
        private set

-    // TODO Retrieve credential storage from app database
-    var credentialDatabaseStorage: CredentialStorage = CredentialStorage.DEFAULT
-
    /**
     * Manage setting to auto open biometric prompt
     */
-    private var mAutoOpenPrompt: Boolean
+    private var mAutoOpenPrompt: Boolean = false
        get() {
-            return mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt && mAutoOpenPromptEnabled
-        }
-        set(value) {
-            mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = value
+            return field && mAutoOpenPromptEnabled
        }

    // Variable to check if the prompt can be open (if the right activity is currently shown)
@@ -83,9 +68,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU

    private lateinit var cipherDatabaseAction : CipherDatabaseAction

-    private var cipherDatabaseListener: CipherDatabaseAction.CipherDatabaseListener? = null
-
-    private val mAdvancedUnlockViewModel: AdvancedUnlockViewModel by activityViewModels()
+    private var cipherDatabaseListener: CipherDatabaseAction.DatabaseListener? = null

    // Only to fix multiple fingerprint menu #332
    private var mAllowAdvancedUnlockMenu = false
@@ -94,15 +77,6 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    // Only keep connection when we request a device credential activity
    private var keepConnection = false

-    private var mDeviceCredentialResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = false
-        // To wait resume
-        if (keepConnection) {
-            mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded = result.resultCode == Activity.RESULT_OK
-        }
-        keepConnection = false
-    }
-
    override fun onAttach(context: Context) {
        super.onAttach(context)

@@ -121,21 +95,10 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

+        retainInstance = true
        setHasOptionsMenu(true)

        cipherDatabaseAction = CipherDatabaseAction.getInstance(requireContext().applicationContext)
-
-        mAdvancedUnlockViewModel.onInitAdvancedUnlockModeRequested.observe(this) {
-            initAdvancedUnlockMode()
-        }
-
-        mAdvancedUnlockViewModel.onUnlockAvailabilityCheckRequested.observe(this) {
-            checkUnlockAvailability()
-        }
-
-        mAdvancedUnlockViewModel.onDatabaseFileLoaded.observe(this) {
-            onDatabaseLoaded(it)
-        }
    }

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -149,12 +112,21 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        return rootView
    }

+    private data class ActivityResult(var requestCode: Int, var resultCode: Int, var data: Intent?)
+    private var activityResult: ActivityResult? = null
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // To wait resume
+        if (keepConnection) {
+            activityResult = ActivityResult(requestCode, resultCode, data)
+        }
+        keepConnection = false
+    }
+
    override fun onResume() {
        super.onResume()
-        context?.let {
-            mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(it)
-            mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(it)
-        }
+        mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(requireContext())
+        mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(requireContext())
        keepConnection = false
    }

@@ -178,69 +150,61 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        return super.onOptionsItemSelected(item)
    }

-    private fun onDatabaseLoaded(databaseUri: Uri?) {
+    fun loadDatabase(databaseUri: Uri?, autoOpenPrompt: Boolean) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            // To get device credential unlock result, only if same database uri
            if (databaseUri != null
                    && mAdvancedUnlockEnabled) {
-                val deviceCredentialAuthSucceeded = mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded
-                deviceCredentialAuthSucceeded?.let {
+                activityResult?.let {
                    if (databaseUri == databaseFileUri) {
-                        if (deviceCredentialAuthSucceeded == true) {
-                            advancedUnlockManager?.advancedUnlockCallback?.onAuthenticationSucceeded()
-                        } else {
-                            advancedUnlockManager?.advancedUnlockCallback?.onAuthenticationFailed()
-                        }
+                        advancedUnlockManager?.onActivityResult(it.requestCode, it.resultCode)
                    } else {
                        disconnect()
                    }
                } ?: run {
-                    if (databaseUri != databaseFileUri) {
-                        connect(databaseUri)
-                    }
+                    this.mAutoOpenPrompt = autoOpenPrompt
+                    connect(databaseUri)
                }
            } else {
                disconnect()
            }
-            mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded = null
+            activityResult = null
        }
    }

    /**
     * Check unlock availability and change the current mode depending of device's state
     */
-    private fun checkUnlockAvailability() {
-        context?.let { context ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                allowOpenBiometricPrompt = true
-                if (PreferencesUtil.isBiometricUnlockEnable(context)) {
-                    mAdvancedUnlockInfoView?.setIconResource(R.drawable.fingerprint)
+    fun checkUnlockAvailability() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            allowOpenBiometricPrompt = true
+            if (PreferencesUtil.isBiometricUnlockEnable(requireContext())) {
+                mAdvancedUnlockInfoView?.setIconResource(R.drawable.fingerprint)

-                    // biometric not supported (by API level or hardware) so keep option hidden
-                    // or manually disable
-                    val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(context)
-                    if (!PreferencesUtil.isAdvancedUnlockEnable(context)
-                            || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
-                            || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
-                        toggleMode(Mode.BIOMETRIC_UNAVAILABLE)
-                    } else if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED) {
-                        toggleMode(Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED)
-                    } else {
-                        // biometric is available but not configured, show icon but in disabled state with some information
-                        if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
-                            toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
-                        } else {
-                            selectMode()
-                        }
-                    }
-                } else if (PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
-                    mAdvancedUnlockInfoView?.setIconResource(R.drawable.bolt)
-                    if (AdvancedUnlockManager.isDeviceSecure(context)) {
-                        selectMode()
-                    } else {
+                // biometric not supported (by API level or hardware) so keep option hidden
+                // or manually disable
+                val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(requireContext())
+                if (!PreferencesUtil.isAdvancedUnlockEnable(requireContext())
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
+                    toggleMode(Mode.BIOMETRIC_UNAVAILABLE)
+                } else if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED) {
+                    toggleMode(Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED)
+                } else {
+                    // biometric is available but not configured, show icon but in disabled state with some information
+                    if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
                        toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
+                    } else {
+                        selectMode()
                    }
                }
+            } else if (PreferencesUtil.isDeviceCredentialUnlockEnable(requireContext())) {
+                mAdvancedUnlockInfoView?.setIconResource(R.drawable.bolt)
+                if (AdvancedUnlockManager.isDeviceSecure(requireContext())) {
+                    selectMode()
+                } else {
+                    toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
+                }
            }
        }
    }
@@ -297,7 +261,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    private fun openBiometricSetting() {
        mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
            // ACTION_SECURITY_SETTINGS does not contain fingerprint enrollment on some devices...
-            context?.startActivity(Intent(Settings.ACTION_SETTINGS))
+            requireContext().startActivity(Intent(Settings.ACTION_SETTINGS))
        }
    }

@@ -332,23 +296,20 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        setAdvancedUnlockedTitleView(R.string.no_credentials_stored)
        setAdvancedUnlockedMessageView("")

-        context?.let { context ->
-            mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
-                onAuthenticationError(BiometricPrompt.ERROR_UNABLE_TO_PROCESS,
-                        context.getString(R.string.credential_before_click_advanced_unlock_button))
-            }
+        mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
+            onAuthenticationError(BiometricPrompt.ERROR_UNABLE_TO_PROCESS,
+                    requireContext().getString(R.string.credential_before_click_advanced_unlock_button))
        }
    }

    @RequiresApi(Build.VERSION_CODES.M)
    private fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt) {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            if (allowOpenBiometricPrompt) {
                if (cryptoPrompt.isDeviceCredentialOperation)
                    keepConnection = true
                try {
-                    advancedUnlockManager?.openAdvancedUnlockPrompt(cryptoPrompt,
-                        mDeviceCredentialResultLauncher)
+                    advancedUnlockManager?.openAdvancedUnlockPrompt(cryptoPrompt)
                } catch (e: Exception) {
                    Log.e(TAG, "Unable to open advanced unlock prompt", e)
                    setAdvancedUnlockedTitleView(R.string.advanced_unlock_prompt_not_initialized)
@@ -400,7 +361,8 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        } ?: throw Exception("AdvancedUnlockManager not initialized")
    }

-    private fun initAdvancedUnlockMode() {
+    @Synchronized
+    fun initAdvancedUnlockMode() {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            mAllowAdvancedUnlockMenu = false
            try {
@@ -440,10 +402,9 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    fun connect(databaseUri: Uri) {
        showViews(true)
        this.databaseFileUri = databaseUri
-        cipherDatabaseListener = object: CipherDatabaseAction.CipherDatabaseListener {
-            override fun onCipherDatabaseCleared() {
-                advancedUnlockManager?.closeBiometricPrompt()
-                checkUnlockAvailability()
+        cipherDatabaseListener = object: CipherDatabaseAction.DatabaseListener {
+            override fun onDatabaseCleared() {
+                deleteEncryptedDatabaseKey()
            }
        }
        cipherDatabaseAction.apply {
@@ -474,18 +435,18 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU

    @RequiresApi(Build.VERSION_CODES.M)
    fun deleteEncryptedDatabaseKey() {
-        mAllowAdvancedUnlockMenu = false
+        allowOpenBiometricPrompt = false
+        mAdvancedUnlockInfoView?.setIconViewClickListener(false, null)
        advancedUnlockManager?.closeBiometricPrompt()
        databaseFileUri?.let { databaseUri ->
            cipherDatabaseAction.deleteByDatabaseUri(databaseUri) {
                checkUnlockAvailability()
            }
-        } ?: checkUnlockAvailability()
+        }
    }

-    @RequiresApi(Build.VERSION_CODES.M)
    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
            setAdvancedUnlockedMessageView(errString.toString())
        }
@@ -493,7 +454,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU

    @RequiresApi(Build.VERSION_CODES.M)
    override fun onAuthenticationFailed() {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            Log.e(TAG, "Biometric authentication failed, biometric not recognized")
            setAdvancedUnlockedMessageView(R.string.advanced_unlock_not_recognized)
        }
@@ -501,7 +462,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU

    @RequiresApi(Build.VERSION_CODES.M)
    override fun onAuthenticationSucceeded() {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            when (biometricMode) {
                Mode.BIOMETRIC_UNAVAILABLE -> {
                }
@@ -518,6 +479,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
                    mBuilderListener?.retrieveCredentialForEncryption()?.let { credential ->
                        advancedUnlockManager?.encryptData(credential)
                    }
+                    AdvancedUnlockNotificationService.startServiceForTimeout(requireContext())
                }
                Mode.EXTRACT_CREDENTIAL -> {
                    // retrieve the encrypted value from preferences
@@ -535,50 +497,31 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        }
    }

-    override fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray) {
+    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {
        databaseFileUri?.let { databaseUri ->
-            mBuilderListener?.onCredentialEncrypted(
-                CipherEncryptDatabase().apply {
-                    this.databaseUri = databaseUri
-                    this.credentialStorage = credentialDatabaseStorage
-                    this.encryptedValue = encryptedValue
-                    this.specParameters = ivSpec
-                }
-            )
+            mBuilderListener?.onCredentialEncrypted(databaseUri, encryptedValue, ivSpec)
        }
    }

-    override fun handleDecryptedResult(decryptedValue: ByteArray) {
+    override fun handleDecryptedResult(decryptedValue: String) {
        // Load database directly with password retrieve
-        databaseFileUri?.let { databaseUri ->
-            mBuilderListener?.onCredentialDecrypted(
-                CipherDecryptDatabase().apply {
-                    this.databaseUri = databaseUri
-                    this.credentialStorage = credentialDatabaseStorage
-                    this.decryptedValue = decryptedValue
-                }
-            )
+        databaseFileUri?.let {
+            mBuilderListener?.onCredentialDecrypted(it, decryptedValue)
        }
    }

-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onUnrecoverableKeyException(e: Exception) {
-        setAdvancedUnlockedMessageView(R.string.advanced_unlock_invalid_key)
-    }
-
    @RequiresApi(Build.VERSION_CODES.M)
    override fun onInvalidKeyException(e: Exception) {
        setAdvancedUnlockedMessageView(R.string.advanced_unlock_invalid_key)
    }

-    @RequiresApi(Build.VERSION_CODES.M)
    override fun onGenericException(e: Exception) {
        val errorMessage = e.cause?.localizedMessage ?: e.localizedMessage ?: ""
        setAdvancedUnlockedMessageView(errorMessage)
    }

    private fun showViews(show: Boolean) {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            mAdvancedUnlockInfoView?.visibility = if (show)
                View.VISIBLE
            else {
@@ -589,21 +532,20 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU

    @RequiresApi(Build.VERSION_CODES.M)
    private fun setAdvancedUnlockedTitleView(textId: Int) {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            mAdvancedUnlockInfoView?.setTitle(textId)
        }
    }

    @RequiresApi(Build.VERSION_CODES.M)
    private fun setAdvancedUnlockedMessageView(textId: Int) {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            mAdvancedUnlockInfoView?.setMessage(textId)
        }
    }

-    @RequiresApi(Build.VERSION_CODES.M)
    private fun setAdvancedUnlockedMessageView(text: CharSequence) {
-        lifecycleScope.launch(Dispatchers.Main) {
+        activity?.runOnUiThread {
            mAdvancedUnlockInfoView?.message = text
        }
    }
@@ -639,10 +581,10 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    }

    interface BuilderListener {
-        fun retrieveCredentialForEncryption(): ByteArray
+        fun retrieveCredentialForEncryption(): String
        fun conditionToStoreCredential(): Boolean
-        fun onCredentialEncrypted(cipherEncryptDatabase: CipherEncryptDatabase)
-        fun onCredentialDecrypted(cipherDecryptDatabase: CipherDecryptDatabase)
+        fun onCredentialEncrypted(databaseUri: Uri, encryptedCredential: String, ivSpec: String)
+        fun onCredentialDecrypted(databaseUri: Uri, decryptedCredential: String)
    }

    override fun onPause() {
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
@@ -19,17 +19,15 @@
 */
 package com.kunzisoft.keepass.biometric

+import android.app.Activity
 import android.app.KeyguardManager
 import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Build
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyPermanentlyInvalidatedException
 import android.security.keystore.KeyProperties
+import android.util.Base64
 import android.util.Log
-import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.*
@@ -37,7 +35,6 @@ import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import java.security.KeyStore
 import java.security.UnrecoverableKeyException
@@ -139,24 +136,18 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
                        // and the constrains (purposes) in the constructor of the Builder
                        keyGenerator?.init(
                                KeyGenParameterSpec.Builder(
-                                    ADVANCED_UNLOCK_KEYSTORE_KEY,
-                                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
-                                    .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
-                                    .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
-                                    .apply {
+                                        ADVANCED_UNLOCK_KEYSTORE_KEY,
+                                        KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+                                        .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                                        .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
                                        // Require the user to authenticate with a fingerprint to authorize every use
                                        // of the key, don't use it for device credential because it's the user authentication
-                                        if (biometricUnlockEnable) {
-                                            setUserAuthenticationRequired(true)
+                                        .apply {
+                                            if (biometricUnlockEnable) {
+                                                setUserAuthenticationRequired(true)
+                                            }
                                        }
-                                        // To store in the security chip
-                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
-                                            && retrieveContext().packageManager.hasSystemFeature(
-                                                PackageManager.FEATURE_STRONGBOX_KEYSTORE)) {
-                                            setIsStrongBoxBacked(true)
-                                        }
-                                    }
-                                    .build())
+                                        .build())
                        keyGenerator?.generateKey()
                    }
                } catch (e: Exception) {
@@ -173,12 +164,8 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        return null
    }

-    fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,) {
-        initEncryptData(actionIfCypherInit, true)
-    }
-
-    private fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
-                                firstLaunch: Boolean) {
+    fun initEncryptData(actionIfCypherInit
+                        : (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
        if (!isKeyManagerInitialized) {
            return
        }
@@ -198,30 +185,28 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
            }
        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
            Log.e(TAG, "Unable to initialize encrypt data", unrecoverableKeyException)
-            advancedUnlockCallback?.onUnrecoverableKeyException(unrecoverableKeyException)
+            advancedUnlockCallback?.onInvalidKeyException(unrecoverableKeyException)
        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
            Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
-            if (firstLaunch) {
-                deleteAllEntryKeysInKeystoreForBiometric(retrieveContext())
-                initEncryptData(actionIfCypherInit, false)
-            } else {
-                advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
-            }
+            advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to initialize encrypt data", e)
            advancedUnlockCallback?.onGenericException(e)
        }
    }

-    fun encryptData(value: ByteArray) {
+    fun encryptData(value: String) {
        if (!isKeyManagerInitialized) {
            return
        }
        try {
-            val encrypted = cipher?.doFinal(value) ?: byteArrayOf()
+            val encrypted = cipher?.doFinal(value.toByteArray())
+            val encryptedBase64 = Base64.encodeToString(encrypted, Base64.NO_WRAP)
+
            // passes updated iv spec on to callback so this can be stored for decryption
            cipher?.parameters?.getParameterSpec(IvParameterSpec::class.java)?.let{ spec ->
-                advancedUnlockCallback?.handleEncryptedResult(encrypted, spec.iv)
+                val ivSpecValue = Base64.encodeToString(spec.iv, Base64.NO_WRAP)
+                advancedUnlockCallback?.handleEncryptedResult(encryptedBase64, ivSpecValue)
            }
        } catch (e: Exception) {
            Log.e(TAG, "Unable to encrypt data", e)
@@ -229,20 +214,16 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        }
    }

-    fun initDecryptData(ivSpecValue: ByteArray,
-                        actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
-        initDecryptData(ivSpecValue, actionIfCypherInit, true)
-    }
-
-    private fun initDecryptData(ivSpecValue: ByteArray,
-                        actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
-                        firstLaunch: Boolean = true) {
+    fun initDecryptData(ivSpecValue: String, actionIfCypherInit
+                        : (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
        if (!isKeyManagerInitialized) {
            return
        }
        try {
            // important to restore spec here that was used for decryption
-            val spec = IvParameterSpec(ivSpecValue)
+            val iv = Base64.decode(ivSpecValue, Base64.NO_WRAP)
+            val spec = IvParameterSpec(iv)
+
            getSecretKey()?.let { secretKey ->
                cipher?.let { cipher ->
                    cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
@@ -258,34 +239,25 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
            }
        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
            Log.e(TAG, "Unable to initialize decrypt data", unrecoverableKeyException)
-            if (firstLaunch) {
-                deleteKeystoreKey()
-                initDecryptData(ivSpecValue, actionIfCypherInit, firstLaunch)
-            } else {
-                advancedUnlockCallback?.onUnrecoverableKeyException(unrecoverableKeyException)
-            }
+            deleteKeystoreKey()
        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
-            if (firstLaunch) {
-                deleteAllEntryKeysInKeystoreForBiometric(retrieveContext())
-                initDecryptData(ivSpecValue, actionIfCypherInit, firstLaunch)
-            } else {
-                advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
-            }
+            advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to initialize decrypt data", e)
            advancedUnlockCallback?.onGenericException(e)
        }
    }

-    fun decryptData(encryptedValue: ByteArray) {
+    fun decryptData(encryptedValue: String) {
        if (!isKeyManagerInitialized) {
            return
        }
        try {
            // actual decryption here
-            cipher?.doFinal(encryptedValue)?.let { decrypted ->
-                advancedUnlockCallback?.handleDecryptedResult(decrypted)
+            val encrypted = Base64.decode(encryptedValue, Base64.NO_WRAP)
+            cipher?.doFinal(encrypted)?.let { decrypted ->
+                advancedUnlockCallback?.handleDecryptedResult(String(decrypted))
            }
        } catch (badPaddingException: BadPaddingException) {
            Log.e(TAG, "Unable to decrypt data", badPaddingException)
@@ -306,9 +278,9 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        }
    }

-    fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt,
-                                 deviceCredentialResultLauncher: ActivityResultLauncher<Intent>
-    ) {
+    @Suppress("DEPRECATION")
+    @Synchronized
+    fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt) {
        // Init advanced unlock prompt
        if (biometricPrompt == null) {
            biometricPrompt = BiometricPrompt(retrieveContext(),
@@ -339,10 +311,20 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        }
        else if (cryptoPrompt.isDeviceCredentialOperation) {
            val keyGuardManager = ContextCompat.getSystemService(retrieveContext(), KeyguardManager::class.java)
-            @Suppress("DEPRECATION")
-            deviceCredentialResultLauncher.launch(
-                keyGuardManager?.createConfirmDeviceCredentialIntent(promptTitle, promptDescription)
-            )
+            retrieveContext().startActivityForResult(
+                    keyGuardManager?.createConfirmDeviceCredentialIntent(promptTitle, promptDescription),
+                    REQUEST_DEVICE_CREDENTIAL)
+        }
+    }
+
+    @Synchronized
+    fun onActivityResult(requestCode: Int, resultCode: Int) {
+        if (requestCode == REQUEST_DEVICE_CREDENTIAL) {
+            if (resultCode == Activity.RESULT_OK) {
+                advancedUnlockCallback?.onAuthenticationSucceeded()
+            } else {
+                advancedUnlockCallback?.onAuthenticationFailed()
+            }
        }
    }

@@ -351,7 +333,6 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
    }

    interface AdvancedUnlockErrorCallback {
-        fun onUnrecoverableKeyException(e: Exception)
        fun onInvalidKeyException(e: Exception)
        fun onGenericException(e: Exception)
    }
@@ -360,8 +341,8 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        fun onAuthenticationSucceeded()
        fun onAuthenticationFailed()
        fun onAuthenticationError(errorCode: Int, errString: CharSequence)
-        fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray)
-        fun handleDecryptedResult(decryptedValue: ByteArray)
+        fun handleEncryptedResult(encryptedValue: String, ivSpec: String)
+        fun handleDecryptedResult(decryptedValue: String)
    }

    companion object {
@@ -374,6 +355,8 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        private const val ADVANCED_UNLOCK_BLOCKS_MODES = KeyProperties.BLOCK_MODE_CBC
        private const val ADVANCED_UNLOCK_ENCRYPTION_PADDING = KeyProperties.ENCRYPTION_PADDING_PKCS7

+        private const val REQUEST_DEVICE_CREDENTIAL = 556
+
        @RequiresApi(api = Build.VERSION_CODES.M)
        fun canAuthenticate(context: Context): Int {
            return try {
@@ -462,13 +445,9 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)

                    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {}

-                    override fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray) {}
+                    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {}

-                    override fun handleDecryptedResult(decryptedValue: ByteArray) {}
-
-                    override fun onUnrecoverableKeyException(e: Exception) {
-                        advancedCallback.onUnrecoverableKeyException(e)
-                    }
+                    override fun handleDecryptedResult(decryptedValue: String) {}

                    override fun onInvalidKeyException(e: Exception) {
                        advancedCallback.onInvalidKeyException(e)
@@ -481,33 +460,6 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
                deleteKeystoreKey()
            }
        }
-
-        fun deleteAllEntryKeysInKeystoreForBiometric(activity: FragmentActivity) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                deleteEntryKeyInKeystoreForBiometric(
-                    activity,
-                    object : AdvancedUnlockErrorCallback {
-                        fun showException(e: Exception) {
-                            Toast.makeText(activity,
-                                activity.getString(R.string.advanced_unlock_scanning_error, e.localizedMessage),
-                                Toast.LENGTH_SHORT).show()
-                        }
-
-                        override fun onUnrecoverableKeyException(e: Exception) {
-                            showException(e)
-                        }
-
-                        override fun onInvalidKeyException(e: Exception) {
-                            showException(e)
-                        }
-
-                        override fun onGenericException(e: Exception) {
-                            showException(e)
-                        }
-                    })
-            }
-            CipherDatabaseAction.getInstance(activity.applicationContext).deleteAll()
-        }
    }

 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/AssignMainCredentialInDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/AssignMainCredentialInDatabaseRunnable.kt
@@ -27,7 +27,7 @@ import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil

-open class AssignMainCredentialInDatabaseRunnable (
+open class AssignPasswordInDatabaseRunnable (
        context: Context,
        database: Database,
        protected val mDatabaseUri: Uri,
@@ -43,7 +43,7 @@ open class AssignMainCredentialInDatabaseRunnable (
            System.arraycopy(database.masterKey, 0, mBackupKey!!, 0, mBackupKey!!.size)

            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mMainCredential.keyFileUri)
-            database.assignMasterKey(mMainCredential.masterPassword, uriInputStream)
+            database.retrieveMasterKey(mMainCredential.masterPassword, uriInputStream)
        } catch (e: Exception) {
            erase(mBackupKey)
            setError(e)
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
@@ -26,25 +26,25 @@ import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.UriUtil

 class CreateDatabaseRunnable(context: Context,
                             private val mDatabase: Database,
                             databaseUri: Uri,
                             private val databaseName: String,
                             private val rootName: String,
-                             private val templateGroupName: String?,
                             mainCredential: MainCredential,
                             private val createDatabaseResult: ((Result) -> Unit)?)
-    : AssignMainCredentialInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {
+    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {

    override fun onStartRun() {
        try {
            // Create new database record
            mDatabase.apply {
-                createData(mDatabaseUri, databaseName, rootName, templateGroupName)
+                createData(mDatabaseUri, databaseName, rootName)
            }
        } catch (e: Exception) {
-            mDatabase.clearAndClose(context)
+            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
            setError(e)
        }

--- a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
@@ -22,11 +22,12 @@ package com.kunzisoft.keepass.database.action
 import android.content.Context
 import android.net.Uri
 import com.kunzisoft.keepass.app.database.CipherDatabaseAction
+import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.binary.LoadedKey
 import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
@@ -38,7 +39,7 @@ class LoadDatabaseRunnable(private val context: Context,
                           private val mUri: Uri,
                           private val mMainCredential: MainCredential,
                           private val mReadonly: Boolean,
-                           private val mCipherEncryptDatabase: CipherEncryptDatabase?,
+                           private val mCipherEntity: CipherDatabaseEntity?,
                           private val mFixDuplicateUUID: Boolean,
                           private val progressTaskUpdater: ProgressTaskUpdater?,
                           private val mLoadDatabaseResult: ((Result) -> Unit)?)
@@ -46,7 +47,7 @@ class LoadDatabaseRunnable(private val context: Context,

    override fun onStartRun() {
        // Clear before we load
-        mDatabase.clearAndClose(context)
+        mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
    }

    override fun onActionRun() {
@@ -59,6 +60,7 @@ class LoadDatabaseRunnable(private val context: Context,
                    { memoryWanted ->
                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
                    },
+                    LoadedKey.generateNewCipherKey(),
                    mFixDuplicateUUID,
                    progressTaskUpdater)
        }
@@ -75,15 +77,15 @@ class LoadDatabaseRunnable(private val context: Context,
            }

            // Register the biometric
-            mCipherEncryptDatabase?.let { cipherDatabase ->
+            mCipherEntity?.let { cipherDatabaseEntity ->
                CipherDatabaseAction.getInstance(context)
-                        .addOrUpdateCipherDatabase(cipherDatabase) // return value not called
+                        .addOrUpdateCipherDatabase(cipherDatabaseEntity) // return value not called
            }

            // Register the current time to init the lock timer
            PreferencesUtil.saveCurrentTime(context)
        } else {
-            mDatabase.clearAndClose(context)
+            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
        }
    }

--- a/app/src/main/java/com/kunzisoft/keepass/database/action/MergeDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/MergeDatabaseRunnable.kt
@@ -1,67 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.action
-
-import android.content.Context
-import android.net.Uri
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-
-class MergeDatabaseRunnable(private val context: Context,
-                            private val mDatabase: Database,
-                            private val mDatabaseToMergeUri: Uri?,
-                            private val mDatabaseToMergeMainCredential: MainCredential?,
-                            private val progressTaskUpdater: ProgressTaskUpdater?,
-                            private val mLoadDatabaseResult: ((Result) -> Unit)?)
-    : ActionRunnable() {
-
-    override fun onStartRun() {
-        mDatabase.wasReloaded = true
-    }
-
-    override fun onActionRun() {
-        try {
-            mDatabase.mergeData(mDatabaseToMergeUri,
-                mDatabaseToMergeMainCredential,
-                context.contentResolver,
-                { memoryWanted ->
-                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
-                },
-                progressTaskUpdater
-            )
-        } catch (e: LoadDatabaseException) {
-            setError(e)
-        }
-
-        if (result.isSuccess) {
-            // Register the current time to init the lock timer
-            PreferencesUtil.saveCurrentTime(context)
-        }
-    }
-
-    override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt
@@ -19,30 +19,24 @@
 */
 package com.kunzisoft.keepass.database.action

-import android.app.Service
 import android.content.*
-import android.content.Context.*
+import android.content.Context.BIND_ABOVE_CLIENT
+import android.content.Context.BIND_NOT_FOREGROUND
 import android.net.Uri
 import android.os.Bundle
 import android.os.IBinder
-import android.util.Log
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
-import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
+import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 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.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
@@ -54,7 +48,6 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MERGE_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK
@@ -74,34 +67,21 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_NAME_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_PARALLELISM_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_RECYCLE_BIN_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_TEMPLATES_GROUP_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment
 import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment.Companion.PROGRESS_TASK_DIALOG_TAG
 import com.kunzisoft.keepass.utils.DATABASE_START_TASK_ACTION
 import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
-import kotlinx.coroutines.launch
 import java.util.*
+import kotlin.collections.ArrayList

-/**
- * Utility class to connect an activity or a service to the DatabaseTaskNotificationService,
- * Useful to retrieve a database instance and sending tasks commands
- */
-class DatabaseTaskProvider {
+class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {

-    private var activity: FragmentActivity? = null
-    private var service: Service? = null
-    private var context: Context
-
-    var onDatabaseRetrieved: ((database: Database?) -> Unit)? = null
-
-    var onActionFinish: ((database: Database,
-                          actionTask: String,
+    var onActionFinish: ((actionTask: String,
                          result: ActionRunnable.Result) -> Unit)? = null

-    private var intentDatabaseTask: Intent
+    private var intentDatabaseTask = Intent(activity.applicationContext, DatabaseTaskNotificationService::class.java)

    private var databaseTaskBroadcastReceiver: BroadcastReceiver? = null
    private var mBinder: DatabaseTaskNotificationService.ActionTaskBinder? = null
@@ -111,31 +91,17 @@ class DatabaseTaskProvider {
    private var progressTaskDialogFragment: ProgressTaskDialogFragment? = null
    private var databaseChangedDialogFragment: DatabaseChangedDialogFragment? = null

-    constructor(activity: FragmentActivity) {
-        this.activity = activity
-        this.context = activity
-        this.intentDatabaseTask = Intent(activity.applicationContext,
-            DatabaseTaskNotificationService::class.java)
-    }
-
-    constructor(service: Service) {
-        this.service = service
-        this.context = service
-        this.intentDatabaseTask = Intent(service.applicationContext,
-            DatabaseTaskNotificationService::class.java)
-    }
-
    private val actionTaskListener = object: DatabaseTaskNotificationService.ActionTaskListener {
-        override fun onStartAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
+        override fun onStartAction(titleId: Int?, messageId: Int?, warningId: Int?) {
            startDialog(titleId, messageId, warningId)
        }

-        override fun onUpdateAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
+        override fun onUpdateAction(titleId: Int?, messageId: Int?, warningId: Int?) {
            updateDialog(titleId, messageId, warningId)
        }

-        override fun onStopAction(database: Database, actionTask: String, result: ActionRunnable.Result) {
-            onActionFinish?.invoke(database, actionTask, result)
+        override fun onStopAction(actionTask: String, result: ActionRunnable.Result) {
+            onActionFinish?.invoke(actionTask, result)
            // Remove the progress task
            stopDialog()
        }
@@ -150,56 +116,31 @@ class DatabaseTaskProvider {
    private var databaseInfoListener = object: DatabaseTaskNotificationService.DatabaseInfoListener {
        override fun onDatabaseInfoChanged(previousDatabaseInfo: SnapFileDatabaseInfo,
                                           newDatabaseInfo: SnapFileDatabaseInfo) {
-            activity?.let { activity ->
-                activity.lifecycleScope.launch {
-                    if (databaseChangedDialogFragment == null) {
-                        databaseChangedDialogFragment = activity.supportFragmentManager
-                            .findFragmentByTag(DATABASE_CHANGED_DIALOG_TAG) as DatabaseChangedDialogFragment?
-                        databaseChangedDialogFragment?.actionDatabaseListener =
-                            mActionDatabaseListener
-                    }
-                    if (progressTaskDialogFragment == null) {
-                        databaseChangedDialogFragment = DatabaseChangedDialogFragment.getInstance(
-                            previousDatabaseInfo,
-                            newDatabaseInfo
-                        )
-                        databaseChangedDialogFragment?.actionDatabaseListener =
-                            mActionDatabaseListener
-                        databaseChangedDialogFragment?.show(
-                            activity.supportFragmentManager,
-                            DATABASE_CHANGED_DIALOG_TAG
-                        )
-                    }
-                }
+            if (databaseChangedDialogFragment == null) {
+                databaseChangedDialogFragment = activity.supportFragmentManager
+                        .findFragmentByTag(DATABASE_CHANGED_DIALOG_TAG) as DatabaseChangedDialogFragment?
+                databaseChangedDialogFragment?.actionDatabaseListener = mActionDatabaseListener
+            }
+            if (progressTaskDialogFragment == null) {
+                databaseChangedDialogFragment = DatabaseChangedDialogFragment.getInstance(previousDatabaseInfo, newDatabaseInfo)
+                databaseChangedDialogFragment?.actionDatabaseListener = mActionDatabaseListener
+                databaseChangedDialogFragment?.show(activity.supportFragmentManager, DATABASE_CHANGED_DIALOG_TAG)
            }
-        }
-    }
-
-    private var databaseListener = object: DatabaseTaskNotificationService.DatabaseListener {
-        override fun onDatabaseRetrieved(database: Database?) {
-            onDatabaseRetrieved?.invoke(database)
        }
    }

    private fun startDialog(titleId: Int? = null,
                            messageId: Int? = null,
                            warningId: Int? = null) {
-        activity?.let { activity ->
-            activity.lifecycleScope.launch {
-                if (progressTaskDialogFragment == null) {
-                    progressTaskDialogFragment = activity.supportFragmentManager
-                        .findFragmentByTag(PROGRESS_TASK_DIALOG_TAG) as ProgressTaskDialogFragment?
-                }
-                if (progressTaskDialogFragment == null) {
-                    progressTaskDialogFragment = ProgressTaskDialogFragment()
-                    progressTaskDialogFragment?.show(
-                        activity.supportFragmentManager,
-                        PROGRESS_TASK_DIALOG_TAG
-                    )
-                }
-                updateDialog(titleId, messageId, warningId)
-            }
+        if (progressTaskDialogFragment == null) {
+            progressTaskDialogFragment = activity.supportFragmentManager
+                    .findFragmentByTag(PROGRESS_TASK_DIALOG_TAG) as ProgressTaskDialogFragment?
        }
+        if (progressTaskDialogFragment == null) {
+            progressTaskDialogFragment = ProgressTaskDialogFragment()
+            progressTaskDialogFragment?.show(activity.supportFragmentManager, PROGRESS_TASK_DIALOG_TAG)
+        }
+        updateDialog(titleId, messageId, warningId)
    }

    private fun updateDialog(titleId: Int?, messageId: Int?, warningId: Int?) {
@@ -226,19 +167,16 @@ class DatabaseTaskProvider {
            serviceConnection = object : ServiceConnection {
                override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
                    mBinder = (serviceBinder as DatabaseTaskNotificationService.ActionTaskBinder?)?.apply {
-                        addDatabaseListener(databaseListener)
-                        addDatabaseFileInfoListener(databaseInfoListener)
                        addActionTaskListener(actionTaskListener)
-                        getService().checkDatabase()
-                        getService().checkDatabaseInfo()
+                        addDatabaseFileInfoListener(databaseInfoListener)
                        getService().checkAction()
+                        getService().checkDatabaseInfo()
                    }
                }

                override fun onServiceDisconnected(name: ComponentName?) {
-                    mBinder?.removeActionTaskListener(actionTaskListener)
                    mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
-                    mBinder?.removeDatabaseListener(databaseListener)
+                    mBinder?.removeActionTaskListener(actionTaskListener)
                    mBinder = null
                }
            }
@@ -248,7 +186,7 @@ class DatabaseTaskProvider {
    private fun bindService() {
        initServiceConnection()
        serviceConnection?.let {
-            context.bindService(intentDatabaseTask, it, BIND_AUTO_CREATE or BIND_NOT_FOREGROUND or BIND_ABOVE_CLIENT)
+            activity.bindService(intentDatabaseTask, it, BIND_NOT_FOREGROUND or BIND_ABOVE_CLIENT)
        }
    }

@@ -257,7 +195,7 @@ class DatabaseTaskProvider {
     */
    private fun unBindService() {
        serviceConnection?.let {
-            context.unbindService(it)
+            activity.unbindService(it)
        }
        serviceConnection = null
    }
@@ -285,7 +223,7 @@ class DatabaseTaskProvider {
                }
            }
        }
-        context.registerReceiver(databaseTaskBroadcastReceiver,
+        activity.registerReceiver(databaseTaskBroadcastReceiver,
                IntentFilter().apply {
                    addAction(DATABASE_START_TASK_ACTION)
                    addAction(DATABASE_STOP_TASK_ACTION)
@@ -299,30 +237,25 @@ class DatabaseTaskProvider {
    fun unregisterProgressTask() {
        stopDialog()

-        mBinder?.removeActionTaskListener(actionTaskListener)
        mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
-        mBinder?.removeDatabaseListener(databaseListener)
+        mBinder?.removeActionTaskListener(actionTaskListener)
        mBinder = null

        unBindService()

        try {
-            context.unregisterReceiver(databaseTaskBroadcastReceiver)
+            activity.unregisterReceiver(databaseTaskBroadcastReceiver)
        } catch (e: IllegalArgumentException) {
            // If receiver not register, do nothing
        }
    }

    private fun start(bundle: Bundle? = null, actionTask: String) {
-        try {
-            if (bundle != null)
-                intentDatabaseTask.putExtras(bundle)
-            intentDatabaseTask.action = actionTask
-            context.startService(intentDatabaseTask)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to perform database action", e)
-            Toast.makeText(activity, R.string.error_start_database_action, Toast.LENGTH_LONG).show()
-        }
+        activity.stopService(intentDatabaseTask)
+        if (bundle != null)
+            intentDatabaseTask.putExtras(bundle)
+        intentDatabaseTask.action = actionTask
+        activity.startService(intentDatabaseTask)
    }

    /*
@@ -343,27 +276,18 @@ class DatabaseTaskProvider {
    fun startDatabaseLoad(databaseUri: Uri,
                          mainCredential: MainCredential,
                          readOnly: Boolean,
-                          cipherEncryptDatabase: CipherEncryptDatabase?,
+                          cipherEntity: CipherDatabaseEntity?,
                          fixDuplicateUuid: Boolean) {
        start(Bundle().apply {
            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
            putBoolean(DatabaseTaskNotificationService.READ_ONLY_KEY, readOnly)
-            putParcelable(DatabaseTaskNotificationService.CIPHER_DATABASE_KEY, cipherEncryptDatabase)
+            putParcelable(DatabaseTaskNotificationService.CIPHER_ENTITY_KEY, cipherEntity)
            putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
        }
                , ACTION_DATABASE_LOAD_TASK)
    }

-    fun startDatabaseMerge(fromDatabaseUri: Uri? = null,
-                           mainCredential: MainCredential? = null) {
-        start(Bundle().apply {
-            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, fromDatabaseUri)
-            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
-        }
-            , ACTION_DATABASE_MERGE_TASK)
-    }
-
    fun startDatabaseReload(fixDuplicateUuid: Boolean) {
        start(Bundle().apply {
            putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
@@ -371,19 +295,6 @@ class DatabaseTaskProvider {
                , ACTION_DATABASE_RELOAD_TASK)
    }

-    fun askToStartDatabaseReload(conditionToAsk: Boolean, approved: () -> Unit) {
-        if (conditionToAsk) {
-            AlertDialog.Builder(context)
-                .setMessage(R.string.warning_database_info_reloaded)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    approved.invoke()
-                }.create().show()
-        } else {
-            approved.invoke()
-        }
-    }
-
    fun startDatabaseAssignPassword(databaseUri: Uri,
                                    mainCredential: MainCredential) {

@@ -453,7 +364,9 @@ class DatabaseTaskProvider {
        nodesPaste.forEach { nodeVersioned ->
            when (nodeVersioned.type) {
                Type.GROUP -> {
-                    groupsIdToCopy.add((nodeVersioned as Group).nodeId)
+                    (nodeVersioned as Group).nodeId?.let { groupId ->
+                        groupsIdToCopy.add(groupId)
+                    }
                }
                Type.ENTRY -> {
                    entriesIdToCopy.add((nodeVersioned as Entry).nodeId)
@@ -496,22 +409,22 @@ class DatabaseTaskProvider {
      -----------------
    */

-    fun startDatabaseRestoreEntryHistory(mainEntryId: NodeId<UUID>,
+    fun startDatabaseRestoreEntryHistory(mainEntry: Entry,
                                         entryHistoryPosition: Int,
                                         save: Boolean) {
        start(Bundle().apply {
-            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntryId)
+            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntry.nodeId)
            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
                , ACTION_DATABASE_RESTORE_ENTRY_HISTORY)
    }

-    fun startDatabaseDeleteEntryHistory(mainEntryId: NodeId<UUID>,
+    fun startDatabaseDeleteEntryHistory(mainEntry: Entry,
                                        entryHistoryPosition: Int,
                                        save: Boolean) {
        start(Bundle().apply {
-            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntryId)
+            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntry.nodeId)
            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
@@ -586,28 +499,6 @@ class DatabaseTaskProvider {
                , ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK)
    }

-    fun startDatabaseSaveRecycleBin(oldRecycleBin: Group?,
-                                    newRecycleBin: Group?,
-                                    save: Boolean) {
-        start(Bundle().apply {
-            putParcelable(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldRecycleBin)
-            putParcelable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newRecycleBin)
-            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
-        }
-            , ACTION_DATABASE_UPDATE_RECYCLE_BIN_TASK)
-    }
-
-    fun startDatabaseSaveTemplatesGroup(oldTemplatesGroup: Group?,
-                                        newTemplatesGroup: Group?,
-                                        save: Boolean) {
-        start(Bundle().apply {
-            putParcelable(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldTemplatesGroup)
-            putParcelable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newTemplatesGroup)
-            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
-        }
-            , ACTION_DATABASE_UPDATE_TEMPLATES_GROUP_TASK)
-    }
-
    fun startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems: Int,
                                         newMaxHistoryItems: Int,
                                         save: Boolean) {
@@ -694,15 +585,10 @@ class DatabaseTaskProvider {
    /**
     * Save Database without parameter
     */
-    fun startDatabaseSave(save: Boolean, saveToUri: Uri? = null) {
+    fun startDatabaseSave(save: Boolean) {
        start(Bundle().apply {
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
-            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, saveToUri)
        }
                , ACTION_DATABASE_SAVE)
    }
-
-    companion object {
-        private val TAG = DatabaseTaskProvider::class.java.name
-    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt
@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.database.action

 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.binary.LoadedKey
 import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.settings.PreferencesUtil
@@ -34,18 +35,23 @@ class ReloadDatabaseRunnable(private val context: Context,
                             private val mLoadDatabaseResult: ((Result) -> Unit)?)
    : ActionRunnable() {

+    private var tempCipherKey: LoadedKey? = null
+
    override fun onStartRun() {
+        tempCipherKey = mDatabase.binaryCache.loadedCipherKey
        // Clear before we load
-        mDatabase.clearIndexesAndBinaries(UriUtil.getBinaryDir(context))
+        mDatabase.clear(UriUtil.getBinaryDir(context))
        mDatabase.wasReloaded = true
    }

    override fun onActionRun() {
        try {
            mDatabase.reloadData(context.contentResolver,
+                    UriUtil.getBinaryDir(context),
                    { memoryWanted ->
                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
                    },
+                    tempCipherKey ?: LoadedKey.generateNewCipherKey(),
                    progressTaskUpdater)
        } catch (e: LoadDatabaseException) {
            setError(e)
@@ -55,7 +61,8 @@ class ReloadDatabaseRunnable(private val context: Context,
            // Register the current time to init the lock timer
            PreferencesUtil.saveCurrentTime(context)
        } else {
-            mDatabase.clearAndClose(context)
+            tempCipherKey = null
+            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
        }
    }

--- a/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
@@ -20,15 +20,13 @@
 package com.kunzisoft.keepass.database.action

 import android.content.Context
-import android.net.Uri
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DatabaseException
 import com.kunzisoft.keepass.tasks.ActionRunnable

 open class SaveDatabaseRunnable(protected var context: Context,
                                protected var database: Database,
-                                private var saveDatabase: Boolean,
-                                private var databaseCopyUri: Uri? = null)
+                                private var saveDatabase: Boolean)
    : ActionRunnable() {

    var mAfterSaveDatabase: ((Result) -> Unit)? = null
@@ -36,10 +34,9 @@ open class SaveDatabaseRunnable(protected var context: Context,
    override fun onStartRun() {}

    override fun onActionRun() {
-        database.checkVersion()
        if (saveDatabase && result.isSuccess) {
            try {
-                database.saveData(databaseCopyUri, context.contentResolver)
+                database.saveData(context.contentResolver)
            } catch (e: DatabaseException) {
                setError(e)
            }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/ActionNodeDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/ActionNodeDatabaseRunnable.kt
@@ -36,11 +36,7 @@ abstract class ActionNodeDatabaseRunnable(
    abstract fun nodeAction()

    override fun onStartRun() {
-        try {
-            nodeAction()
-        } catch (e: Exception) {
-            setError(e)
-        }
+        nodeAction()
        super.onStartRun()
    }

--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteNodesRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteNodesRunnable.kt
@@ -31,47 +31,41 @@ class DeleteNodesRunnable(context: Context,
                          afterActionNodesFinish: AfterActionNodesFinish)
    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {

-    private var mOldParent: Group? = null
+    private var mParent: Group? = null
    private var mCanRecycle: Boolean = false

    private var mNodesToDeleteBackup = ArrayList<Node>()

    override fun nodeAction() {

-        foreachNode@ for(nodeToDelete in mNodesToDelete) {
-            mOldParent = nodeToDelete.parent
-            nodeToDelete.touch(modified = true, touchParents = true)
+        foreachNode@ for(currentNode in mNodesToDelete) {
+            mParent = currentNode.parent
+            mParent?.touch(modified = false, touchParents = true)

-            when (nodeToDelete.type) {
+            when (currentNode.type) {
                Type.GROUP -> {
-                    val groupToDelete = nodeToDelete as Group
                    // Create a copy to keep the old ref and remove it visually
-                    mNodesToDeleteBackup.add(Group(groupToDelete))
+                    mNodesToDeleteBackup.add(Group(currentNode as Group))
                    // Remove Node from parent
-                    mCanRecycle = database.canRecycle(groupToDelete)
+                    mCanRecycle = database.canRecycle(currentNode)
                    if (mCanRecycle) {
-                        database.recycle(groupToDelete, context.resources)
-                        groupToDelete.setPreviousParentGroup(mOldParent)
-                        groupToDelete.touch(modified = true, touchParents = true)
+                        database.recycle(currentNode, context.resources)
                    } else {
-                        database.deleteGroup(groupToDelete)
+                        database.deleteGroup(currentNode)
                    }
                }
                Type.ENTRY -> {
-                    val entryToDelete = nodeToDelete as Entry
                    // Create a copy to keep the old ref and remove it visually
-                    mNodesToDeleteBackup.add(Entry(entryToDelete))
+                    mNodesToDeleteBackup.add(Entry(currentNode as Entry))
                    // Remove Node from parent
-                    mCanRecycle = database.canRecycle(entryToDelete)
+                    mCanRecycle = database.canRecycle(currentNode)
                    if (mCanRecycle) {
-                        database.recycle(entryToDelete, context.resources)
-                        entryToDelete.setPreviousParentGroup(mOldParent)
-                        entryToDelete.touch(modified = true, touchParents = true)
+                        database.recycle(currentNode, context.resources)
                    } else {
-                        database.deleteEntry(entryToDelete)
+                        database.deleteEntry(currentNode)
                    }
                    // Remove the oldest attachments
-                    entryToDelete.getAttachments(database.attachmentPool).forEach {
+                    currentNode.getAttachments(database.attachmentPool).forEach {
                        database.removeAttachmentIfNotUsed(it)
                    }
                }
@@ -82,7 +76,7 @@ class DeleteNodesRunnable(context: Context,
    override fun nodeFinish(): ActionNodesValues {
        if (!result.isSuccess) {
            if (mCanRecycle) {
-                mOldParent?.let {
+                mParent?.let {
                    mNodesToDeleteBackup.forEach { backupNode ->
                        when (backupNode.type) {
                            Type.GROUP -> {
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveNodesRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveNodesRunnable.kt
@@ -24,7 +24,7 @@ import android.util.Log
 import com.kunzisoft.keepass.database.element.*
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.exception.MoveEntryDatabaseException
+import com.kunzisoft.keepass.database.exception.EntryDatabaseException
 import com.kunzisoft.keepass.database.exception.MoveGroupDatabaseException

 class MoveNodesRunnable constructor(
@@ -43,19 +43,15 @@ class MoveNodesRunnable constructor(
        foreachNode@ for(nodeToMove in mNodesToMove) {
            // Move node in new parent
            mOldParent = nodeToMove.parent
-            nodeToMove.touch(modified = true, touchParents = true)

            when (nodeToMove.type) {
                Type.GROUP -> {
                    val groupToMove = nodeToMove as Group
-                    // Move group if the parent change
-                    if (mOldParent != mNewParent
-                            // and if not in the current group
-                            && groupToMove != mNewParent
+                    // Move group in new parent if not in the current group
+                    if (groupToMove != mNewParent
                            && !mNewParent.isContainedIn(groupToMove)) {
+                        nodeToMove.touch(modified = true, touchParents = true)
                        database.moveGroupTo(groupToMove, mNewParent)
-                        groupToMove.setPreviousParentGroup(mOldParent)
-                        groupToMove.touch(modified = true, touchParents = true)
                    } else {
                        // Only finish thread
                        setError(MoveGroupDatabaseException())
@@ -68,12 +64,11 @@ class MoveNodesRunnable constructor(
                    if (mOldParent != mNewParent
                            // and root can contains entry
                            && (mNewParent != database.rootGroup || database.rootCanContainsEntry())) {
+                        nodeToMove.touch(modified = true, touchParents = true)
                        database.moveEntryTo(entryToMove, mNewParent)
-                        entryToMove.setPreviousParentGroup(mOldParent)
-                        entryToMove.touch(modified = true, touchParents = true)
                    } else {
                        // Only finish thread
-                        setError(MoveEntryDatabaseException())
+                        setError(EntryDatabaseException())
                        break@foreachNode
                    }
                }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateEntryRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateEntryRunnable.kt
@@ -34,52 +34,54 @@ class UpdateEntryRunnable constructor(
        afterActionNodesFinish: AfterActionNodesFinish?)
    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {

+    // Keep backup of original values in case save fails
+    private var mBackupEntryHistory: Entry = Entry(mOldEntry)
+
    override fun nodeAction() {
-        if (mOldEntry.nodeId == mNewEntry.nodeId) {
-            // WARNING : Re attribute parent removed in entry edit activity to save memory
-            mNewEntry.addParentFrom(mOldEntry)
+        // WARNING : Re attribute parent removed in entry edit activity to save memory
+        mNewEntry.addParentFrom(mOldEntry)

-            // Build oldest attachments
-            val oldEntryAttachments = mOldEntry.getAttachments(database.attachmentPool, true)
-            val newEntryAttachments = mNewEntry.getAttachments(database.attachmentPool, true)
-            val attachmentsToRemove = ArrayList<Attachment>(oldEntryAttachments)
-            // Not use equals because only check name
-            newEntryAttachments.forEach { newAttachment ->
-                oldEntryAttachments.forEach { oldAttachment ->
-                    if (oldAttachment.name == newAttachment.name
-                        && oldAttachment.binaryData == newAttachment.binaryData
-                    )
-                        attachmentsToRemove.remove(oldAttachment)
-                }
+        // Build oldest attachments
+        val oldEntryAttachments = mOldEntry.getAttachments(database.attachmentPool, true)
+        val newEntryAttachments = mNewEntry.getAttachments(database.attachmentPool, true)
+        val attachmentsToRemove = ArrayList<Attachment>(oldEntryAttachments)
+        // Not use equals because only check name
+        newEntryAttachments.forEach { newAttachment ->
+            oldEntryAttachments.forEach { oldAttachment ->
+                if (oldAttachment.name == newAttachment.name
+                        && oldAttachment.binaryData == newAttachment.binaryData)
+                    attachmentsToRemove.remove(oldAttachment)
            }
+        }

-            // Update entry with new values
-            mNewEntry.touch(modified = true, touchParents = true)
+        // Update entry with new values
+        mOldEntry.updateWith(mNewEntry)
+        mNewEntry.touch(modified = true, touchParents = true)

-            // Create an entry history (an entry history don't have history)
-            mNewEntry.addEntryToHistory(Entry(mOldEntry, copyHistory = false))
-            database.removeOldestEntryHistory(mNewEntry, database.attachmentPool)
+        // Create an entry history (an entry history don't have history)
+        mOldEntry.addEntryToHistory(Entry(mBackupEntryHistory, copyHistory = false))
+        database.removeOldestEntryHistory(mOldEntry, database.attachmentPool)

-            // Only change data in index
-            database.updateEntry(mNewEntry)
+        // Only change data in index
+        database.updateEntry(mOldEntry)

-            // Remove oldest attachments
-            attachmentsToRemove.forEach {
-                database.removeAttachmentIfNotUsed(it)
-            }
+        // Remove oldest attachments
+        attachmentsToRemove.forEach {
+            database.removeAttachmentIfNotUsed(it)
        }
    }

    override fun nodeFinish(): ActionNodesValues {
        if (!result.isSuccess) {
+            mOldEntry.updateWith(mBackupEntryHistory)
            // If we fail to save, back out changes to global structure
            database.updateEntry(mOldEntry)
        }

        val oldNodesReturn = ArrayList<Node>()
-        oldNodesReturn.add(mOldEntry)
+        oldNodesReturn.add(mBackupEntryHistory)
        val newNodesReturn = ArrayList<Node>()
-        newNodesReturn.add(mNewEntry)
+        newNodesReturn.add(mOldEntry)
        return ActionNodesValues(oldNodesReturn, newNodesReturn)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateGroupRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateGroupRunnable.kt
@@ -33,36 +33,33 @@ class UpdateGroupRunnable constructor(
        afterActionNodesFinish: AfterActionNodesFinish?)
    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {

+    // Keep backup of original values in case save fails
+    private val mBackupGroup: Group = Group(mOldGroup)
+
    override fun nodeAction() {
-        if (mOldGroup.nodeId == mNewGroup.nodeId) {
-            // WARNING : Re attribute parent and children removed in group activity to save memory
-            mNewGroup.addParentFrom(mOldGroup)
-            mNewGroup.addChildrenFrom(mOldGroup)
+        // WARNING : Re attribute parent and children removed in group activity to save memory
+        mNewGroup.addParentFrom(mOldGroup)
+        mNewGroup.addChildrenFrom(mOldGroup)

-            // Update group with new values
-            mNewGroup.touch(modified = true, touchParents = true)
+        // Update group with new values
+        mOldGroup.updateWith(mNewGroup)
+        mOldGroup.touch(modified = true, touchParents = true)

-            if (database.rootGroup == mOldGroup) {
-                database.rootGroup = mNewGroup
-            }
-            // Only change data in index
-            database.updateGroup(mNewGroup)
-        }
+        // Only change data in index
+        database.updateGroup(mOldGroup)
    }

    override fun nodeFinish(): ActionNodesValues {
        if (!result.isSuccess) {
            // If we fail to save, back out changes to global structure
-            if (database.rootGroup == mNewGroup) {
-                database.rootGroup = mOldGroup
-            }
+            mOldGroup.updateWith(mBackupGroup)
            database.updateGroup(mOldGroup)
        }

        val oldNodesReturn = ArrayList<Node>()
-        oldNodesReturn.add(mOldGroup)
+        oldNodesReturn.add(mBackupGroup)
        val newNodesReturn = ArrayList<Node>()
-        newNodesReturn.add(mNewGroup)
+        newNodesReturn.add(mOldGroup)
        return ActionNodesValues(oldNodesReturn, newNodesReturn)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/crypto/CipherEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/crypto/CipherEngine.kt
@@ -36,9 +36,6 @@ abstract class CipherEngine {
        return 16
    }

-    // Used only with padding workaround
-    var forcePaddingCompatibility = false
-
    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
    abstract fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher

--- a/app/src/main/java/com/kunzisoft/keepass/database/crypto/TwofishEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/crypto/TwofishEngine.kt
@@ -30,7 +30,7 @@ class TwofishEngine : CipherEngine() {

    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher {
-        return CipherFactory.getTwofish(opmode, key, IV, forcePaddingCompatibility)
+        return CipherFactory.getTwofish(opmode, key, IV)
    }

    override fun getEncryptionAlgorithm(): EncryptionAlgorithm {
--- a/app/src/main/java/com/kunzisoft/keepass/database/crypto/kdf/AesKdf.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/crypto/kdf/AesKdf.kt
@@ -21,8 +21,8 @@ package com.kunzisoft.keepass.database.crypto.kdf

 import com.kunzisoft.encrypt.HashManager
 import com.kunzisoft.keepass.utils.UnsignedLong
-import com.kunzisoft.encrypt.aes.AESTransformer
 import com.kunzisoft.keepass.utils.bytes16ToUuid
+import encrypt.Encrypt
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -58,7 +58,8 @@ class AesKdf : KdfEngine() {

        val rounds = kdfParameters.getUInt64(PARAM_ROUNDS)?.toKotlinLong()

-        return AESTransformer.transformKey(seed, currentMasterKey, rounds) ?: ByteArray(0)
+        return Encrypt.transformAESKey(currentMasterKey, seed, rounds!!)
+        //return AESTransformer.transformKey(seed, currentMasterKey, rounds) ?: ByteArray(0)
    }

    override fun randomize(kdfParameters: KdfParameters) {
--- a/app/src/main/java/com/kunzisoft/keepass/database/crypto/kdf/Argon2Kdf.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/crypto/kdf/Argon2Kdf.kt
@@ -21,9 +21,8 @@ package com.kunzisoft.keepass.database.crypto.kdf

 import com.kunzisoft.keepass.utils.UnsignedInt
 import com.kunzisoft.keepass.utils.UnsignedLong
-import com.kunzisoft.encrypt.argon2.Argon2Transformer
-import com.kunzisoft.encrypt.argon2.Argon2Type
 import com.kunzisoft.keepass.utils.bytes16ToUuid
+import encrypt.Encrypt
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -63,7 +62,14 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
        // val secretKey = kdfParameters.getByteArray(PARAM_SECRET_KEY)
        // val assocData = kdfParameters.getByteArray(PARAM_ASSOC_DATA)

-        val argonType = if (type == Type.ARGON2_ID) Argon2Type.ARGON2_ID else Argon2Type.ARGON2_D
+        // With Go lib
+        return when(type) {
+            Type.ARGON2_D -> Encrypt.transformArgon2DKey(masterKey, salt, iterations, memory, parallelism.toShort(), 32)
+            else -> Encrypt.transformArgon2IDKey(masterKey, salt, iterations, memory, parallelism.toShort(), 32)
+        }
+
+        /*
+        val argonType = if (type == Type.ARGON2_ID) Argon2Type.ARGON2_ID else Argon2Type.ARGON2_ID

        return Argon2Transformer.transformKey(
                argonType,
@@ -73,6 +79,7 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
                memory,
                iterations,
                version)
+         */
    }

    override fun randomize(kdfParameters: KdfParameters) {
@@ -192,17 +199,17 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
        private val MIN_VERSION = UnsignedInt(0x10)
        private val MAX_VERSION = UnsignedInt(0x13)

-        private val DEFAULT_ITERATIONS = UnsignedLong(3L)
+        private val DEFAULT_ITERATIONS = UnsignedLong(2L)
        private val MIN_ITERATIONS = UnsignedLong(1L)
        private val MAX_ITERATIONS = UnsignedLong(4294967295L)

-        private val DEFAULT_MEMORY = UnsignedLong((1024L * 1024L * 16L))
+        private val DEFAULT_MEMORY = UnsignedLong((1024L * 1024L))
        private val MIN_MEMORY = UnsignedLong(1024L * 8L)
        private val MAX_MEMORY = UnsignedInt.MAX_VALUE.toKotlinLong()
        private const val MEMORY_BLOCK_SIZE: Long = 1024L

-        private val DEFAULT_PARALLELISM = UnsignedInt(4)
+        private val DEFAULT_PARALLELISM = UnsignedInt(2)
        private val MIN_PARALLELISM = UnsignedInt.fromKotlinLong(1L)
-        private val MAX_PARALLELISM = UnsignedInt.fromKotlinLong(((1 shl 24) - 1).toLong())
+        private val MAX_PARALLELISM = UnsignedInt.fromKotlinLong(((1 shl 24) - 1))
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.cursor
+
+import android.database.MatrixCursor
+import android.provider.BaseColumns
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.entry.EntryVersioned
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.node.NodeId
+import java.util.*
+
+abstract class EntryCursor<EntryId, PwEntryV : EntryVersioned<*, EntryId, *, *>> : MatrixCursor(arrayOf(
+        _ID,
+        COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS,
+        COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS,
+        COLUMN_INDEX_TITLE,
+        COLUMN_INDEX_ICON_STANDARD,
+        COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS,
+        COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS,
+        COLUMN_INDEX_USERNAME,
+        COLUMN_INDEX_PASSWORD,
+        COLUMN_INDEX_URL,
+        COLUMN_INDEX_NOTES,
+        COLUMN_INDEX_EXPIRY_TIME,
+        COLUMN_INDEX_EXPIRES
+    )) {
+
+    protected var entryId: Long = 0
+
+    abstract fun addEntry(entry: PwEntryV)
+
+    abstract fun getPwNodeId(): NodeId<EntryId>
+
+    open fun populateEntry(pwEntry: PwEntryV,
+                           retrieveStandardIcon: (Int) -> IconImageStandard,
+                           retrieveCustomIcon: (UUID) -> IconImageCustom) {
+        pwEntry.nodeId = getPwNodeId()
+        pwEntry.title = getString(getColumnIndex(COLUMN_INDEX_TITLE))
+
+        val iconStandard = retrieveStandardIcon.invoke(getInt(getColumnIndex(COLUMN_INDEX_ICON_STANDARD)))
+        val iconCustom = retrieveCustomIcon.invoke(UUID(getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
+                getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))))
+        pwEntry.icon = IconImage(iconStandard, iconCustom)
+
+        pwEntry.username = getString(getColumnIndex(COLUMN_INDEX_USERNAME))
+        pwEntry.password = getString(getColumnIndex(COLUMN_INDEX_PASSWORD))
+        pwEntry.url = getString(getColumnIndex(COLUMN_INDEX_URL))
+        pwEntry.notes = getString(getColumnIndex(COLUMN_INDEX_NOTES))
+        pwEntry.expiryTime = DateInstant(getString(getColumnIndex(COLUMN_INDEX_EXPIRY_TIME)))
+        pwEntry.expires = getString(getColumnIndex(COLUMN_INDEX_EXPIRES))
+                                        .toLowerCase(Locale.ENGLISH) != "false"
+    }
+
+    companion object {
+        const val _ID = BaseColumns._ID
+        const val COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS = "UUID_most_significant_bits"
+        const val COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS = "UUID_least_significant_bits"
+        const val COLUMN_INDEX_TITLE = "title"
+        const val COLUMN_INDEX_ICON_STANDARD = "icon_standard"
+        const val COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS = "icon_custom_UUID_most_significant_bits"
+        const val COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS = "icon_custom_UUID_least_significant_bits"
+        const val COLUMN_INDEX_USERNAME = "username"
+        const val COLUMN_INDEX_PASSWORD = "password"
+        const val COLUMN_INDEX_URL = "URL"
+        const val COLUMN_INDEX_NOTES = "notes"
+        const val COLUMN_INDEX_EXPIRY_TIME = "expiry_time"
+        const val COLUMN_INDEX_EXPIRES = "expires"
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.cursor
+
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
+
+class EntryCursorKDB : EntryCursorUUID<EntryKDB>() {
+
+    override fun addEntry(entry: EntryKDB) {
+        addRow(arrayOf(
+                entryId,
+                entry.id.mostSignificantBits,
+                entry.id.leastSignificantBits,
+                entry.title,
+                entry.icon.standard.id,
+                entry.icon.custom.uuid.mostSignificantBits,
+                entry.icon.custom.uuid.leastSignificantBits,
+                entry.username,
+                entry.password,
+                entry.url,
+                entry.notes,
+                entry.expiryTime,
+                entry.expires
+        ))
+        entryId++
+    }
+
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.cursor
+
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import java.util.*
+
+class EntryCursorKDBX : EntryCursorUUID<EntryKDBX>() {
+
+    private val extraFieldCursor: ExtraFieldCursor = ExtraFieldCursor()
+
+    override fun addEntry(entry: EntryKDBX) {
+        addRow(arrayOf(
+                entryId,
+                entry.id.mostSignificantBits,
+                entry.id.leastSignificantBits,
+                entry.title,
+                entry.icon.standard.id,
+                entry.icon.custom.uuid.mostSignificantBits,
+                entry.icon.custom.uuid.leastSignificantBits,
+                entry.username,
+                entry.password,
+                entry.url,
+                entry.notes,
+                entry.expiryTime,
+                entry.expires
+        ))
+
+        for (element in entry.customFields.entries) {
+            extraFieldCursor.addExtraField(entryId, element.key, element.value)
+        }
+
+        entryId++
+    }
+
+    override fun populateEntry(pwEntry: EntryKDBX,
+                               retrieveStandardIcon: (Int) -> IconImageStandard,
+                               retrieveCustomIcon: (UUID) -> IconImageCustom) {
+        super.populateEntry(pwEntry, retrieveStandardIcon, retrieveCustomIcon)
+
+        // Retrieve extra fields
+        if (extraFieldCursor.moveToFirst()) {
+            while (!extraFieldCursor.isAfterLast) {
+                // Add a new extra field only if entryId is the one we want
+                if (extraFieldCursor.getLong(extraFieldCursor
+                                .getColumnIndex(ExtraFieldCursor.FOREIGN_KEY_ENTRY_ID))
+                        == getLong(getColumnIndex(_ID))) {
+                    extraFieldCursor.populateExtraFieldInEntry(pwEntry)
+                }
+                extraFieldCursor.moveToNext()
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateAttributeType.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateAttributeType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
 * This file is part of KeePassDX.
 *
@@ -15,24 +15,20 @@
 *
 *  You should have received a copy of the GNU General Public License
 *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
 */
-package com.kunzisoft.keepass.database.element.template
+package com.kunzisoft.keepass.database.cursor

-enum class TemplateAttributeType(val typeString: String) {
-    TEXT("text"),
-    LIST("list"),
-    DATETIME("datetime"),
-    DIVIDER("divider");
+import com.kunzisoft.keepass.database.element.entry.EntryVersioned
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import java.util.*

-    companion object {
-        fun getFromString(label: String): TemplateAttributeType {
-            return when {
-                label.contains(TEXT.typeString, true) -> TEXT
-                label.contains(LIST.typeString, true) -> LIST
-                label.contains(DATETIME.typeString, true) -> DATETIME
-                label.contains(DIVIDER.typeString, true) -> DIVIDER
-                else -> TEXT
-            }
-        }
+abstract class EntryCursorUUID<EntryV: EntryVersioned<*, UUID, *, *>>: EntryCursor<UUID, EntryV>() {
+
+    override fun getPwNodeId(): NodeId<UUID> {
+        return NodeIdUUID(
+                UUID(getLong(getColumnIndex(COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
+                        getLong(getColumnIndex(COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS))))
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/ExtraFieldCursor.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/ExtraFieldCursor.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.cursor
+
+import android.database.MatrixCursor
+import android.provider.BaseColumns
+
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.security.ProtectedString
+
+class ExtraFieldCursor : MatrixCursor(arrayOf(
+        _ID,
+        FOREIGN_KEY_ENTRY_ID,
+        COLUMN_LABEL,
+        COLUMN_PROTECTION,
+        COLUMN_VALUE
+    )) {
+
+    private var fieldId: Long = 0
+
+    @Synchronized
+    fun addExtraField(entryId: Long, label: String, value: ProtectedString) {
+        addRow(arrayOf(fieldId, entryId, label, if (value.isProtected) 1 else 0, value.toString()))
+        fieldId++
+    }
+
+    fun populateExtraFieldInEntry(pwEntry: EntryKDBX) {
+        pwEntry.putExtraField(getString(getColumnIndex(COLUMN_LABEL)),
+                ProtectedString(getInt(getColumnIndex(COLUMN_PROTECTION)) > 0,
+                        getString(getColumnIndex(COLUMN_VALUE))))
+    }
+
+    companion object {
+        const val _ID = BaseColumns._ID
+        const val FOREIGN_KEY_ENTRY_ID = "entry_id"
+        const val COLUMN_LABEL = "label"
+        const val COLUMN_PROTECTION = "protection"
+        const val COLUMN_VALUE = "value"
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/CustomData.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/CustomData.kt
@@ -1,92 +0,0 @@
-/*
- * Copyright 2020 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.element
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.kunzisoft.keepass.utils.ParcelableUtil
-import java.util.*
-
-class CustomData : Parcelable {
-
-    private val mCustomDataItems = HashMap<String, CustomDataItem>()
-
-    constructor()
-
-    constructor(toCopy: CustomData) {
-        mCustomDataItems.clear()
-        mCustomDataItems.putAll(toCopy.mCustomDataItems)
-    }
-
-    constructor(parcel: Parcel) {
-        mCustomDataItems.clear()
-        mCustomDataItems.putAll(ParcelableUtil
-            .readStringParcelableMap(parcel, CustomDataItem::class.java)
-        )
-    }
-
-    fun get(key: String): CustomDataItem? {
-        return mCustomDataItems[key]
-    }
-
-    fun put(customDataItem: CustomDataItem) {
-        mCustomDataItems[customDataItem.key] = customDataItem
-    }
-
-    fun containsItemWithValue(value: String): Boolean {
-        return mCustomDataItems.any { mapEntry -> mapEntry.value.value.equals(value, true) }
-    }
-
-    fun containsItemWithLastModificationTime(): Boolean {
-        return mCustomDataItems.any { mapEntry -> mapEntry.value.lastModificationTime != null }
-    }
-
-    fun isNotEmpty(): Boolean {
-        return mCustomDataItems.isNotEmpty()
-    }
-
-    fun doForEachItems(action: (CustomDataItem) -> Unit) {
-        for ((_, value) in mCustomDataItems) {
-            action.invoke(value)
-        }
-    }
-
-    override fun toString(): String {
-        return mCustomDataItems.toString()
-    }
-
-    override fun writeToParcel(parcel: Parcel, flags: Int) {
-        ParcelableUtil.writeStringParcelableMap(parcel, flags, mCustomDataItems)
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    companion object CREATOR : Parcelable.Creator<CustomData> {
-        override fun createFromParcel(parcel: Parcel): CustomData {
-            return CustomData(parcel)
-        }
-
-        override fun newArray(size: Int): Array<CustomData?> {
-            return arrayOfNulls(size)
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/CustomDataItem.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/CustomDataItem.kt
@@ -1,47 +0,0 @@
-package com.kunzisoft.keepass.database.element
-
-import android.os.Parcel
-import android.os.Parcelable
-
-class CustomDataItem : Parcelable {
-
-    val key: String
-    var value: String
-    var lastModificationTime: DateInstant? = null
-
-    constructor(parcel: Parcel) {
-        key = parcel.readString() ?: ""
-        value = parcel.readString() ?: ""
-        lastModificationTime = parcel.readParcelable(DateInstant::class.java.classLoader)
-    }
-
-    constructor(key: String, value: String, lastModificationTime: DateInstant? = null) {
-        this.key = key
-        this.value = value
-        this.lastModificationTime = lastModificationTime
-    }
-
-    override fun toString(): String {
-        return value
-    }
-
-    override fun writeToParcel(parcel: Parcel, flags: Int) {
-        parcel.writeString(key)
-        parcel.writeString(value)
-        parcel.writeParcelable(lastModificationTime, flags)
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    companion object CREATOR : Parcelable.Creator<CustomDataItem> {
-        override fun createFromParcel(parcel: Parcel): CustomDataItem {
-            return CustomDataItem(parcel)
-        }
-
-        override fun newArray(size: Int): Array<CustomDataItem?> {
-            return arrayOfNulls(size)
-        }
-    }
-}
--- a/Show More
+++ b/Show More