Merge branch 'release/3.1'

Merge branch 'master' into release/3.1
/bin/bash: q: command not found
2025-12-04 15:49:33 +01:00 · 2022-01-18 12:44:44 +01:00 · 2022-01-18 12:44:30 +01:00 · 2022-01-18 12:13:03 +01:00 · 2022-01-18 12:08:48 +01:00 · 2022-01-18 12:02:33 +01:00
647 changed files with 42464 additions and 28028 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,6 +24,7 @@ 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/108
+++ b/108
@@ -1,3 +1,111 @@
+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
+ * Decrease default clipboard time #934
+ * Better opening performance #929 #933
+ * Fix memory usage setting #941
+
+KeePassDX(2.9.14)
+ * Add custom icons #96
+ * Dark Themes #532 #714
+ * Fix binary deduplication #715
+ * Fix IconId #901
+ * Resize image stream dynamically to prevent slowdown #919
+ * Small changes #795 #900 #903 #909 #914
+
 KeePassDX(2.9.13)
 * Binary image viewer #473 #749
 * Fix TOTP plugin settings #878
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
 - 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)*.
@@ -71,7 +72,7 @@ Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/w

 ## License

-  Copyright © 2020 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
+  Copyright © 2022 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-android-extensions'
 apply plugin: 'kotlin-kapt'

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

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
-        minSdkVersion 14
-        targetSdkVersion 30
-        versionCode = 57
-        versionName = "2.9.13"
+        minSdkVersion 15
+        targetSdkVersion 31
+        versionCode = 92
+        versionName = "3.1.0"
        multiDexEnabled true

        testApplicationId = "com.kunzisoft.keepass.tests"
@@ -30,12 +29,6 @@ android {
        }
    }

-    externalNativeBuild {
-        cmake {
-            path "src/main/jni/CMakeLists.txt"
-        }
-    }
-
    buildTypes {
        release {
            minifyEnabled = false
@@ -51,7 +44,11 @@ android {
            buildConfigField "String", "BUILD_VERSION", "\"libre\""
            buildConfigField "boolean", "FULL_VERSION", "true"
            buildConfigField "boolean", "CLOSED_STORE", "false"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
        }
        pro {
@@ -70,7 +67,13 @@ android {
            buildConfigField "String", "BUILD_VERSION", "\"free\""
            buildConfigField "boolean", "FULL_VERSION", "false"
            buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Blue\"," +
+                            "\"KeepassDXStyle_Blue_Night\"," +
+                            "\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
        }
@@ -96,43 +99,43 @@ android {
    }
 }

-def room_version = "2.2.6"
+def room_version = "2.4.1"

 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.appcompat:appcompat:$android_appcompat_version"
    implementation 'androidx.preference:preference-ktx:1.1.1'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.1.0-rc01'
+    implementation 'androidx.biometric:biometric:1.1.0'
+    implementation 'androidx.media:media:1.4.3'
    // Lifecycle - LiveData - ViewModel - Coroutines
-    implementation "androidx.core:core-ktx:1.3.2"
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
-    // WARNING: To upgrade with style, bug in edit text
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation "androidx.core:core-ktx:$android_core_version"
+    implementation 'androidx.fragment:fragment-ktx:1.4.0'
+    implementation "com.google.android.material:material:$android_material_version"
    // Database
    implementation "androidx.room:room-runtime:$room_version"
    kapt "androidx.room:room-compiler:$room_version"
    // Autofill
-    implementation "androidx.autofill:autofill:1.1.0-rc01"
-    // Crypto
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.65.01'
+    implementation "androidx.autofill:autofill:1.1.0"
    // Time
-    implementation 'joda-time:joda-time:2.10.6'
+    implementation 'joda-time:joda-time:2.10.13'
    // Color
-    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.4'
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.6'
    // Education
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
    // Apache Commons
-    implementation 'commons-collections:commons-collections:3.2.2'
    implementation 'commons-io:commons-io:2.8.0'
    implementation 'commons-codec:commons-codec:1.15'
+    // Encrypt lib
+    implementation project(path: ':crypto')
    // Icon pack
    implementation project(path: ':icon-pack-classic')
    implementation project(path: ':icon-pack-material')

    // Tests
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation "androidx.test:runner:$android_test_version"
+    androidTestImplementation "androidx.test:rules:$android_test_version"
 }
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESKeyTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESKeyTest.kt
@@ -1,67 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.tests.crypto
-
-import org.junit.Assert.assertArrayEquals
-
-import java.io.IOException
-import java.util.Random
-
-import junit.framework.TestCase
-
-import com.kunzisoft.keepass.crypto.finalkey.AndroidAESKeyTransformer
-import com.kunzisoft.keepass.crypto.finalkey.NativeAESKeyTransformer
-
-class AESKeyTest : TestCase() {
-    private lateinit var mRand: Random
-
-    @Throws(Exception::class)
-    override fun setUp() {
-        super.setUp()
-
-        mRand = Random()
-    }
-
-    @Throws(IOException::class)
-    fun testAES() {
-        // Test both an old and an even number to test my flip variable
-        testAESFinalKey(5)
-        testAESFinalKey(6)
-    }
-
-    @Throws(IOException::class)
-    private fun testAESFinalKey(rounds: Long) {
-        val seed = ByteArray(32)
-        val key = ByteArray(32)
-        val nativeKey: ByteArray?
-        val androidKey: ByteArray?
-
-        mRand.nextBytes(seed)
-        mRand.nextBytes(key)
-
-        val androidAESKey = AndroidAESKeyTransformer()
-        androidKey = androidAESKey.transformMasterKey(seed, key, rounds)
-
-        val nativeAESKey = NativeAESKeyTransformer()
-        nativeKey = nativeAESKey.transformMasterKey(seed, key, rounds)
-
-        assertArrayEquals("Does not match", androidKey, nativeKey)
-    }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
@@ -1,83 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.tests.crypto
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-
-import junit.framework.TestCase
-
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.Random
-
-import javax.crypto.BadPaddingException
-import javax.crypto.Cipher
-import javax.crypto.IllegalBlockSizeException
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-import org.junit.Assert.assertArrayEquals
-
-class AESTest : TestCase() {
-
-    private val mRand = Random()
-
-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidAlgorithmParameterException::class)
-    fun testEncrypt() {
-        // Test above below and at the blocksize
-        testFinal(15)
-        testFinal(16)
-        testFinal(17)
-
-        // Test random larger sizes
-        val size = mRand.nextInt(494) + 18
-        testFinal(size)
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    private fun testFinal(dataSize: Int) {
-
-        // Generate some input
-        val input = ByteArray(dataSize)
-        mRand.nextBytes(input)
-
-        // Generate key
-        val keyArray = ByteArray(32)
-        mRand.nextBytes(keyArray)
-        val key = SecretKeySpec(keyArray, "AES")
-
-        // Generate IV
-        val ivArray = ByteArray(16)
-        mRand.nextBytes(ivArray)
-        val iv = IvParameterSpec(ivArray)
-
-        val android = CipherFactory.getInstance("AES/CBC/PKCS5Padding", true)
-        android.init(Cipher.ENCRYPT_MODE, key, iv)
-        val outAndroid = android.doFinal(input, 0, dataSize)
-
-        val nat = CipherFactory.getInstance("AES/CBC/PKCS5Padding")
-        nat.init(Cipher.ENCRYPT_MODE, key, iv)
-        val outNative = nat.doFinal(input, 0, dataSize)
-
-        assertArrayEquals("Arrays differ on size: $dataSize", outAndroid, outNative)
-    }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/EncryptionTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/EncryptionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
 *
 * This file is part of KeePassDX.
 *
@@ -19,44 +19,32 @@
 */
 package com.kunzisoft.keepass.tests.crypto

+import com.kunzisoft.keepass.utils.readBytesLength
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import org.junit.Assert.assertArrayEquals
-
+import org.junit.Test
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.Random
-
-import javax.crypto.BadPaddingException
+import java.util.*
 import javax.crypto.Cipher
+import javax.crypto.CipherInputStream
 import javax.crypto.CipherOutputStream
-import javax.crypto.IllegalBlockSizeException
-import javax.crypto.NoSuchPaddingException

-import junit.framework.TestCase
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.stream.BetterCipherInputStream
-import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
-
-class CipherTest : TestCase() {
+class EncryptionTest {
    private val rand = Random()

-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidAlgorithmParameterException::class, IllegalBlockSizeException::class, BadPaddingException::class)
+    @Test
    fun testCipherFactory() {
        val key = ByteArray(32)
+        rand.nextBytes(key)
+
        val iv = ByteArray(16)
+        rand.nextBytes(iv)

        val plaintext = ByteArray(1024)
-
-        rand.nextBytes(key)
-        rand.nextBytes(iv)
        rand.nextBytes(plaintext)

-        val aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID)
+        val aes = EncryptionAlgorithm.AESRijndael.cipherEngine
        val encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv)
        val decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv)

@@ -66,20 +54,20 @@ class CipherTest : TestCase() {
        assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext)
    }

-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidAlgorithmParameterException::class, IllegalBlockSizeException::class, BadPaddingException::class, IOException::class)
+    @Test
    fun testCipherStreams() {
-        val MESSAGE_LENGTH = 1024
+        val length = 1024

        val key = ByteArray(32)
-        val iv = ByteArray(16)
-
-        val plaintext = ByteArray(MESSAGE_LENGTH)
-
        rand.nextBytes(key)
+
+        val iv = ByteArray(16)
        rand.nextBytes(iv)
+
+        val plaintext = ByteArray(length)
        rand.nextBytes(plaintext)

-        val aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID)
+        val aes = EncryptionAlgorithm.AESRijndael.cipherEngine
        val encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv)
        val decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv)

@@ -91,10 +79,9 @@ class CipherTest : TestCase() {
        val secrettext = bos.toByteArray()

        val bis = ByteArrayInputStream(secrettext)
-        val cis = BetterCipherInputStream(bis, decrypt)
-        val lis = LittleEndianDataInputStream(cis)
+        val cis = CipherInputStream(bis, decrypt)

-        val decrypttext = lis.readBytes(MESSAGE_LENGTH)
+        val decrypttext = cis.readBytesLength(length)

        assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext)
    }
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/BinaryAttachmentTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/BinaryAttachmentTest.kt
@@ -1,156 +0,0 @@
-package com.kunzisoft.keepass.tests.stream
-
-import android.content.Context
-import androidx.test.platform.app.InstrumentationRegistry
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.database.BinaryAttachment
-import com.kunzisoft.keepass.stream.readAllBytes
-import com.kunzisoft.keepass.utils.UriUtil
-import junit.framework.TestCase.assertEquals
-import org.junit.Test
-import java.io.DataInputStream
-import java.io.File
-import java.io.InputStream
-import java.lang.Exception
-import java.security.MessageDigest
-
-class BinaryAttachmentTest {
-
-    private val context: Context by lazy {
-        InstrumentationRegistry.getInstrumentation().context
-    }
-
-    private val cacheDirectory = UriUtil.getBinaryDir(InstrumentationRegistry.getInstrumentation().targetContext)
-    private val fileA = File(cacheDirectory, TEST_FILE_CACHE_A)
-    private val fileB = File(cacheDirectory, TEST_FILE_CACHE_B)
-    private val fileC = File(cacheDirectory, TEST_FILE_CACHE_C)
-
-    private val loadedKey = Database.LoadedKey.generateNewCipherKey()
-
-    private fun saveBinary(asset: String, binaryAttachment: BinaryAttachment) {
-        context.assets.open(asset).use { assetInputStream ->
-            binaryAttachment.getOutputDataStream(loadedKey).use { binaryOutputStream ->
-                assetInputStream.readAllBytes(DEFAULT_BUFFER_SIZE) { buffer ->
-                    binaryOutputStream.write(buffer)
-                }
-            }
-        }
-    }
-
-    @Test
-    fun testSaveTextInCache() {
-        val binaryA = BinaryAttachment(fileA)
-        val binaryB = BinaryAttachment(fileB)
-        saveBinary(TEST_TEXT_ASSET, binaryA)
-        saveBinary(TEST_TEXT_ASSET, binaryB)
-        assertEquals("Save text binary length failed.", binaryA.length, binaryB.length)
-        assertEquals("Save text binary MD5 failed.", binaryA.md5(), binaryB.md5())
-    }
-
-    @Test
-    fun testSaveImageInCache() {
-        val binaryA = BinaryAttachment(fileA)
-        val binaryB = BinaryAttachment(fileB)
-        saveBinary(TEST_IMAGE_ASSET, binaryA)
-        saveBinary(TEST_IMAGE_ASSET, binaryB)
-        assertEquals("Save image binary length failed.", binaryA.length, binaryB.length)
-        assertEquals("Save image binary failed.", binaryA.md5(), binaryB.md5())
-    }
-
-    @Test
-    fun testCompressText() {
-        val binaryA = BinaryAttachment(fileA)
-        val binaryB = BinaryAttachment(fileB)
-        val binaryC = BinaryAttachment(fileC)
-        saveBinary(TEST_TEXT_ASSET, binaryA)
-        saveBinary(TEST_TEXT_ASSET, binaryB)
-        saveBinary(TEST_TEXT_ASSET, binaryC)
-        binaryA.compress(loadedKey)
-        binaryB.compress(loadedKey)
-        assertEquals("Compress text length failed.", binaryA.length, binaryB.length)
-        assertEquals("Compress text MD5 failed.", binaryA.md5(), binaryB.md5())
-        binaryB.decompress(loadedKey)
-        assertEquals("Decompress text length failed.", binaryB.length, binaryC.length)
-        assertEquals("Decompress text MD5 failed.", binaryB.md5(), binaryC.md5())
-    }
-
-    @Test
-    fun testCompressImage() {
-        val binaryA = BinaryAttachment(fileA)
-        var binaryB = BinaryAttachment(fileB)
-        val binaryC = BinaryAttachment(fileC)
-        saveBinary(TEST_IMAGE_ASSET, binaryA)
-        saveBinary(TEST_IMAGE_ASSET, binaryB)
-        saveBinary(TEST_IMAGE_ASSET, binaryC)
-        binaryA.compress(loadedKey)
-        binaryB.compress(loadedKey)
-        assertEquals("Compress image length failed.", binaryA.length, binaryA.length)
-        assertEquals("Compress image failed.", binaryA.md5(), binaryA.md5())
-        binaryB = BinaryAttachment(fileB, true)
-        binaryB.decompress(loadedKey)
-        assertEquals("Decompress image length failed.", binaryB.length, binaryC.length)
-        assertEquals("Decompress image failed.", binaryB.md5(), binaryC.md5())
-    }
-
-    @Test
-    fun testReadText() {
-        val binaryA = BinaryAttachment(fileA)
-        saveBinary(TEST_TEXT_ASSET, binaryA)
-        assert(streamAreEquals(context.assets.open(TEST_TEXT_ASSET),
-                binaryA.getInputDataStream(loadedKey)))
-    }
-
-    @Test
-    fun testReadImage() {
-        val binaryA = BinaryAttachment(fileA)
-        saveBinary(TEST_IMAGE_ASSET, binaryA)
-        assert(streamAreEquals(context.assets.open(TEST_IMAGE_ASSET),
-                binaryA.getInputDataStream(loadedKey)))
-    }
-
-    private fun streamAreEquals(inputStreamA: InputStream,
-                                inputStreamB: InputStream): Boolean {
-        val bufferA = ByteArray(DEFAULT_BUFFER_SIZE)
-        val bufferB = ByteArray(DEFAULT_BUFFER_SIZE)
-        val dataInputStreamB = DataInputStream(inputStreamB)
-        try {
-            var len: Int
-            while (inputStreamA.read(bufferA).also { len = it } > 0) {
-                dataInputStreamB.readFully(bufferB, 0, len)
-                for (i in 0 until len) {
-                    if (bufferA[i] != bufferB[i])
-                        return false
-                }
-            }
-            return inputStreamB.read() < 0 // is the end of the second file also.
-        } catch (e: Exception) {
-            return false
-        }
-        finally {
-            inputStreamA.close()
-            inputStreamB.close()
-        }
-    }
-
-    private fun BinaryAttachment.md5(): String {
-        val md = MessageDigest.getInstance("MD5")
-        return this.getInputDataStream(loadedKey).use { fis ->
-            val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
-            generateSequence {
-                when (val bytesRead = fis.read(buffer)) {
-                    -1 -> null
-                    else -> bytesRead
-                }
-            }.forEach { bytesRead -> md.update(buffer, 0, bytesRead) }
-            md.digest().joinToString("") { "%02x".format(it) }
-        }
-    }
-
-    companion object {
-        private const val TEST_FILE_CACHE_A = "testA"
-        private const val TEST_FILE_CACHE_B = "testB"
-        private const val TEST_FILE_CACHE_C = "testC"
-        private const val TEST_IMAGE_ASSET = "test_image.png"
-        private const val TEST_TEXT_ASSET = "test_text.txt"
-    }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/BinaryDataTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/BinaryDataTest.kt
@@ -0,0 +1,176 @@
+package com.kunzisoft.keepass.tests.stream
+
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
+import com.kunzisoft.keepass.utils.readAllBytes
+import com.kunzisoft.keepass.database.element.binary.BinaryCache
+import com.kunzisoft.keepass.database.element.binary.BinaryFile
+import com.kunzisoft.keepass.utils.UriUtil
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import java.io.DataInputStream
+import java.io.File
+import java.io.InputStream
+import kotlin.random.Random
+
+class BinaryDataTest {
+
+    private val context: Context by lazy {
+        InstrumentationRegistry.getInstrumentation().context
+    }
+
+    private val cacheDirectory = UriUtil.getBinaryDir(InstrumentationRegistry.getInstrumentation().targetContext)
+    private val fileA = File(cacheDirectory, TEST_FILE_CACHE_A)
+    private val fileB = File(cacheDirectory, TEST_FILE_CACHE_B)
+    private val fileC = File(cacheDirectory, TEST_FILE_CACHE_C)
+
+    private val binaryCache = BinaryCache()
+
+    private fun saveBinary(asset: String, binaryData: BinaryFile) {
+        context.assets.open(asset).use { assetInputStream ->
+            binaryData.getOutputDataStream(binaryCache).use { binaryOutputStream ->
+                assetInputStream.readAllBytes(DEFAULT_BUFFER_SIZE) { buffer ->
+                    binaryOutputStream.write(buffer)
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testSaveTextInCache() {
+        val binaryA = BinaryFile(fileA)
+        val binaryB = BinaryFile(fileB)
+        saveBinary(TEST_TEXT_ASSET, binaryA)
+        saveBinary(TEST_TEXT_ASSET, binaryB)
+        assertEquals("Save text binary length failed.", binaryA.getSize(), binaryB.getSize())
+        assertEquals("Save text binary MD5 failed.", binaryA.binaryHash(), binaryB.binaryHash())
+    }
+
+    @Test
+    fun testSaveImageInCache() {
+        val binaryA = BinaryFile(fileA)
+        val binaryB = BinaryFile(fileB)
+        saveBinary(TEST_IMAGE_ASSET, binaryA)
+        saveBinary(TEST_IMAGE_ASSET, binaryB)
+        assertEquals("Save image binary length failed.", binaryA.getSize(), binaryB.getSize())
+        assertEquals("Save image binary failed.", binaryA.binaryHash(), binaryB.binaryHash())
+    }
+
+    @Test
+    fun testCompressText() {
+        val binaryA = BinaryFile(fileA)
+        val binaryB = BinaryFile(fileB)
+        val binaryC = BinaryFile(fileC)
+        saveBinary(TEST_TEXT_ASSET, binaryA)
+        saveBinary(TEST_TEXT_ASSET, binaryB)
+        saveBinary(TEST_TEXT_ASSET, binaryC)
+        binaryA.compress(binaryCache)
+        binaryB.compress(binaryCache)
+        assertEquals("Compress text length failed.", binaryA.getSize(), binaryB.getSize())
+        assertEquals("Compress text MD5 failed.", binaryA.binaryHash(), binaryB.binaryHash())
+        binaryB.decompress(binaryCache)
+        assertEquals("Decompress text length failed.", binaryB.getSize(), binaryC.getSize())
+        assertEquals("Decompress text MD5 failed.", binaryB.binaryHash(), binaryC.binaryHash())
+    }
+
+    @Test
+    fun testCompressImage() {
+        val binaryA = BinaryFile(fileA)
+        var binaryB = BinaryFile(fileB)
+        val binaryC = BinaryFile(fileC)
+        saveBinary(TEST_IMAGE_ASSET, binaryA)
+        saveBinary(TEST_IMAGE_ASSET, binaryB)
+        saveBinary(TEST_IMAGE_ASSET, binaryC)
+        binaryA.compress(binaryCache)
+        binaryB.compress(binaryCache)
+        assertEquals("Compress image length failed.", binaryA.getSize(), binaryA.getSize())
+        assertEquals("Compress image failed.", binaryA.binaryHash(), binaryA.binaryHash())
+        binaryB = BinaryFile(fileB, true)
+        binaryB.decompress(binaryCache)
+        assertEquals("Decompress image length failed.", binaryB.getSize(), binaryC.getSize())
+        assertEquals("Decompress image failed.", binaryB.binaryHash(), binaryC.binaryHash())
+    }
+
+    @Test
+    fun testCompressBytes() {
+        // Test random byte array
+        val byteArray = ByteArray(50)
+        Random.nextBytes(byteArray)
+        testCompressBytes(byteArray)
+
+        // Test empty byte array
+        testCompressBytes(ByteArray(0))
+    }
+
+    private fun testCompressBytes(byteArray: ByteArray) {
+        val binaryA = binaryCache.getBinaryData("0", true)
+        binaryA.getOutputDataStream(binaryCache).use { outputStream ->
+            outputStream.write(byteArray)
+        }
+        val binaryB = binaryCache.getBinaryData("1", true)
+        binaryB.getOutputDataStream(binaryCache).use { outputStream ->
+            outputStream.write(byteArray)
+        }
+        val binaryC = binaryCache.getBinaryData("2", true)
+        binaryC.getOutputDataStream(binaryCache).use { outputStream ->
+            outputStream.write(byteArray)
+        }
+        binaryA.compress(binaryCache)
+        binaryB.compress(binaryCache)
+        assertEquals("Compress bytes decompressed failed.", binaryA.isCompressed, true)
+        assertEquals("Compress bytes length failed.", binaryA.getSize(), binaryA.getSize())
+        assertEquals("Compress bytes failed.", binaryA.binaryHash(), binaryA.binaryHash())
+        binaryB.decompress(binaryCache)
+        assertEquals("Decompress bytes decompressed failed.", binaryB.isCompressed, false)
+        assertEquals("Decompress bytes length failed.", binaryB.getSize(), binaryC.getSize())
+        assertEquals("Decompress bytes failed.", binaryB.binaryHash(), binaryC.binaryHash())
+    }
+
+    @Test
+    fun testReadText() {
+        val binaryA = BinaryFile(fileA)
+        saveBinary(TEST_TEXT_ASSET, binaryA)
+        assert(streamAreEquals(context.assets.open(TEST_TEXT_ASSET),
+                binaryA.getInputDataStream(binaryCache)))
+    }
+
+    @Test
+    fun testReadImage() {
+        val binaryA = BinaryFile(fileA)
+        saveBinary(TEST_IMAGE_ASSET, binaryA)
+        assert(streamAreEquals(context.assets.open(TEST_IMAGE_ASSET),
+                binaryA.getInputDataStream(binaryCache)))
+    }
+
+    private fun streamAreEquals(inputStreamA: InputStream,
+                                inputStreamB: InputStream): Boolean {
+        val bufferA = ByteArray(DEFAULT_BUFFER_SIZE)
+        val bufferB = ByteArray(DEFAULT_BUFFER_SIZE)
+        val dataInputStreamB = DataInputStream(inputStreamB)
+        try {
+            var len: Int
+            while (inputStreamA.read(bufferA).also { len = it } > 0) {
+                dataInputStreamB.readFully(bufferB, 0, len)
+                for (i in 0 until len) {
+                    if (bufferA[i] != bufferB[i])
+                        return false
+                }
+            }
+            return inputStreamB.read() < 0 // is the end of the second file also.
+        } catch (e: Exception) {
+            return false
+        }
+        finally {
+            inputStreamA.close()
+            inputStreamB.close()
+        }
+    }
+
+    companion object {
+        private const val TEST_FILE_CACHE_A = "testA"
+        private const val TEST_FILE_CACHE_B = "testB"
+        private const val TEST_FILE_CACHE_C = "testC"
+        private const val TEST_IMAGE_ASSET = "test_image.png"
+        private const val TEST_TEXT_ASSET = "test_text.txt"
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
@@ -0,0 +1,24 @@
+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
@@ -0,0 +1,15 @@
+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/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
@@ -20,9 +20,7 @@
 package com.kunzisoft.keepass.tests.utils

 import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.stream.*
-import com.kunzisoft.keepass.utils.UnsignedInt
-import com.kunzisoft.keepass.utils.UnsignedLong
+import com.kunzisoft.keepass.utils.*
 import junit.framework.TestCase
 import org.junit.Assert.assertArrayEquals
 import java.io.ByteArrayOutputStream
@@ -54,7 +52,7 @@ class ValuesTest : TestCase() {
        val orig = ByteArray(8)
        setArray(orig, value, 8)

-        assertArrayEquals(orig, longTo8Bytes(bytes64ToLong(orig)))
+        assertArrayEquals(orig, uLongTo8Bytes(bytes64ToULong(orig)))
    }

    fun testReadWriteIntZero() {
@@ -133,7 +131,7 @@ class ValuesTest : TestCase() {
    }

    private fun testReadWriteByte(value: Byte) {
-        val dest: Byte = UnsignedInt(UnsignedInt.fromKotlinByte(value)).toKotlinByte()
+        val dest: Byte = UnsignedInt(value.toInt() and 0xFF).toKotlinByte()
        assert(value == dest)
    }

@@ -144,13 +142,11 @@ class ValuesTest : TestCase() {
        expected.set(2008, 1, 2, 3, 4, 5)

        val actual = Calendar.getInstance()
-        dateTo5Bytes(expected.time, cal)?.let { buf ->
-            actual.time = bytes5ToDate(buf, cal).date
-        }
+        actual.time = DateInstant(bytes5ToDate(dateTo5Bytes(expected.time, cal), cal)).date

        val jDate = DateInstant(System.currentTimeMillis())
        val intermediate = DateInstant(jDate)
-        val cDate = bytes5ToDate(dateTo5Bytes(intermediate.date)!!)
+        val cDate = DateInstant(bytes5ToDate(dateTo5Bytes(intermediate.date)))

        assertEquals("Year mismatch: ", 2008, actual.get(Calendar.YEAR))
        assertEquals("Month mismatch: ", 1, actual.get(Calendar.MONTH))
@@ -183,12 +179,10 @@ class ValuesTest : TestCase() {
            ulongBytes[i] = -1
        }

-        val bos = ByteArrayOutputStream()
-        val leos = LittleEndianDataOutputStream(bos)
-        leos.writeLong(UnsignedLong.MAX_VALUE)
-        leos.close()
-
-        val uLongMax = bos.toByteArray()
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        byteArrayOutputStream.write(UnsignedLong.MAX_BYTES)
+        byteArrayOutputStream.close()
+        val uLongMax = byteArrayOutputStream.toByteArray()

        assertArrayEquals(ulongBytes, uLongMax)
    }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,15 +10,12 @@
      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"
@@ -30,12 +27,13 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:name="com.kunzisoft.keepass.app.App"
        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
+        android:fullBackupContent="@xml/old_backup_rules"
+        android:dataExtractionRules="@xml/backup_rules"
        android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
        android:largeHeap="true"
        android:resizeableActivity="true"
        android:theme="@style/KeepassDXStyle.Night"
-        tools:targetApi="n">
+        tools:targetApi="s">
        <meta-data
            android:name="com.google.android.backup.api_key"
            android:value="${googleAndroidBackupAPIKey}" />
@@ -44,8 +42,9 @@
            android:theme="@style/KeepassDXStyle.SplashScreen"
            android:label="@string/app_name"
            android:launchMode="singleTop"
+            android:exported="true"
            android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
@@ -53,6 +52,7 @@
        </activity>
        <activity
            android:name="com.kunzisoft.keepass.activities.PasswordActivity"
+            android:exported="true"
            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="adjustResize|stateUnchanged">
            <intent-filter>
@@ -111,9 +111,9 @@
        <!-- Main Activity -->
        <activity
            android:name="com.kunzisoft.keepass.activities.GroupActivity"
+            android:exported="false"
            android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustPan"
-            android:launchMode="singleTask">
+            android:windowSoftInputMode="adjustPan">
            <meta-data
                android:name="android.app.default_searchable"
                android:value="com.kunzisoft.keepass.search.SearchResults"
@@ -129,6 +129,9 @@
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryActivity"
            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.IconPickerActivity"
+            android:configChanges="keyboardHidden" />
        <activity
            android:name="com.kunzisoft.keepass.activities.ImageViewerActivity"
            android:configChanges="keyboardHidden" />
@@ -152,7 +155,8 @@
            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
-            android:theme="@style/Theme.Transparent">
+            android:theme="@style/Theme.Transparent"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.SEND" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -171,7 +175,8 @@
            android:theme="@style/Theme.Transparent" />
        <activity
            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
-            android:label="@string/keyboard_setting_label">
+            android:label="@string/keyboard_setting_label"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
            </intent-filter>
@@ -197,6 +202,7 @@
        <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"
@@ -206,8 +212,9 @@
            </intent-filter>
        </service>
        <service
-            android:name="com.kunzisoft.keepass.magikeyboard.MagikIME"
+            android:name="com.kunzisoft.keepass.magikeyboard.MagikeyboardService"
            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"/>
@@ -219,6 +226,14 @@
            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,6 +30,7 @@ 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
@@ -108,6 +109,8 @@ 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
@@ -272,7 +275,10 @@ 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,45 +23,79 @@ 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.AutofillHelper.EXTRA_INLINE_SUGGESTIONS_REQUEST
+import com.kunzisoft.keepass.autofill.CompatInlineSuggestionsRequest
 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 : AppCompatActivity() {
+class AutofillLauncherActivity : DatabaseModeActivity() {

-    override fun onCreate(savedInstanceState: Bundle?) {
+    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)

        // Retrieve selection mode
        EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode ->
            when (specialMode) {
                SpecialMode.SELECTION -> {
-                    // 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)
+                    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)
+                            }
+                        }
                    }
+                    // Remove bundle
+                    intent.removeExtra(KEY_SELECTION_BUNDLE)
                }
                SpecialMode.REGISTRATION -> {
                    // To register info
@@ -69,7 +103,7 @@ class AutofillLauncherActivity : AppCompatActivity() {
                    val searchInfo = SearchInfo(registerInfo?.searchInfo)
                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
                        searchInfo.webDomain = concreteWebDomain
-                        launchRegistration(searchInfo, registerInfo)
+                        launchRegistration(database, searchInfo, registerInfo)
                    }
                }
                else -> {
@@ -79,14 +113,11 @@ class AutofillLauncherActivity : AppCompatActivity() {
                }
            }
        }
-
-        super.onCreate(savedInstanceState)
    }

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

-    private fun launchRegistration(searchInfo: SearchInfo, registerInfo: RegisterInfo?) {
+    private fun launchRegistration(database: Database?,
+                                   searchInfo: SearchInfo,
+                                   registerInfo: RegisterInfo?) {
        if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
                        PreferencesUtil.applicationIdBlocklist(this))
                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
@@ -135,25 +168,26 @@ class AutofillLauncherActivity : AppCompatActivity() {
            showBlockRestartMessage()
            setResult(Activity.RESULT_CANCELED)
        } else {
-            val database = Database.getInstance()
-            val readOnly = database.isReadOnly
+            val readOnly = database?.isReadOnly != false
            SearchHelper.checkAutoSearchInfo(this,
                    database,
                    searchInfo,
-                    { _ ->
+                    { openedDatabase, _ ->
                        if (!readOnly) {
                            // Show the database UI to select the entry
                            GroupActivity.launchForRegistration(this,
-                                    registerInfo)
+                                openedDatabase,
+                                registerInfo)
                        } else {
                            showReadOnlySaveMessage()
                        }
                    },
-                    {
+                    { openedDatabase ->
                        if (!readOnly) {
                            // Show the database UI to select the entry
                            GroupActivity.launchForRegistration(this,
-                                    registerInfo)
+                                openedDatabase,
+                                registerInfo)
                        } else {
                            showReadOnlySaveMessage()
                        }
@@ -177,53 +211,47 @@ class AutofillLauncherActivity : AppCompatActivity() {
        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_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_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_REGISTER_INFO = "KEY_REGISTER_INFO"

-        fun getAuthIntentSenderForSelection(context: Context,
-                                            searchInfo: SearchInfo? = null,
-                                            inlineSuggestionsRequest: InlineSuggestionsRequest? = null): IntentSender {
+        fun getPendingIntentForSelection(context: Context,
+                                         searchInfo: SearchInfo? = null,
+                                         compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null): PendingIntent {
            return PendingIntent.getActivity(context, 0,
-                    // 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)
-                        }
+                // 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) {
-                            inlineSuggestionsRequest?.let {
-                                putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
-                            }
+                            putParcelable(KEY_INLINE_SUGGESTION, compatInlineSuggestionsRequest)
                        }
-                    },
-                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
+                    })
+                },
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+                } else {
+                    PendingIntent.FLAG_CANCEL_CURRENT
+                })
        }

-        fun getAuthIntentSenderForRegistration(context: Context,
-                                               registerInfo: RegisterInfo): IntentSender {
+        fun getPendingIntentForRegistration(context: Context,
+                                            registerInfo: RegisterInfo): PendingIntent {
            return PendingIntent.getActivity(context, 0,
-                    Intent(context, AutofillLauncherActivity::class.java).apply {
-                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
-                        putExtra(KEY_REGISTER_INFO, registerInfo)
-                    },
-                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
+                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
+                })
        }

        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,69 +32,83 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+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.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.fragments.EntryFragment
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
-import com.kunzisoft.keepass.magikeyboard.MagikIME
+import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.model.EntryAttachmentState
-import com.kunzisoft.keepass.model.StreamDirection
-import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.otp.OtpType
 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.*
-import com.kunzisoft.keepass.view.EntryContentsView
+import com.kunzisoft.keepass.utils.MenuUtil
+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.view.showActionErrorIfNeeded
+import com.kunzisoft.keepass.viewmodels.EntryViewModel
 import java.util.*
-import kotlin.collections.HashMap

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

    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 entryContentsView: EntryContentsView? = null
-    private var entryProgress: ProgressBar? = null
+    private var entryProgress: LinearProgressIndicator? = null
    private var lockView: View? = null
    private var toolbar: Toolbar? = null
+    private var loadingView: ProgressBar? = null

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

-    private var mEntry: Entry? = null
-
-    private var mIsHistory: Boolean = false
-    private var mEntryLastVersion: Entry? = null
-    private var mEntryHistoryPosition: Int = -1
-
-    private var mShowPassword: Boolean = false
+    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 mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
-    private var mAttachmentsToDownload: HashMap<Int, Attachment> = HashMap()
+    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mAttachmentSelected: Attachment? = null

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

-    private var iconColor: Int = 0
+    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

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -106,60 +120,178 @@ class EntryActivity : LockingActivity() {
        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)
-        entryContentsView = findViewById(R.id.entry_contents)
-        entryContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
-        entryContentsView?.setAttachmentCipherKey(mDatabase?.loadedCipherKey)
        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()
+
+        // 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()
        }

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

-        // 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()
+                // 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)
                }
-                ACTION_DATABASE_RELOAD_TASK -> {
-                    // Close the current activity
-                    this.showActionErrorIfNeeded(result)
-                    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 colors
+                mBackgroundColor = entryInfo.backgroundColor
+                mForegroundColor = entryInfo.foregroundColor
+
+                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
+                    }
                }
            }
-            coordinatorLayout?.showActionErrorIfNeeded(result)
        }
+
+        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)
+                    finish()
+            }
+        }
+        coordinatorLayout?.showActionErrorIfNeeded(result)
    }

    override fun onResume() {
@@ -172,63 +304,14 @@ class EntryActivity : LockingActivity() {
            View.GONE
        }

-        // 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)
-                }
-            }
-        }
-
        mAttachmentFileBinderManager?.apply {
            registerProgressTask()
            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
-                    if (entryAttachmentState.streamDirection != StreamDirection.UPLOAD) {
-                        entryContentsView?.putAttachment(entryAttachmentState)
-                    }
+                    mEntryViewModel.onAttachmentAction(entryAttachmentState)
                }
            }
        }
-
-        mFirstLaunchOfActivity = false
    }

    override fun onPause() {
@@ -237,210 +320,83 @@ class EntryActivity : LockingActivity() {
        super.onPause()
    }

-    private fun fillEntryDataInContentsView(entry: Entry) {
-
-        val entryInfo = entry.getEntryInfo(mDatabase)
-
-        // Assign title icon
-        titleIconView?.assignDatabaseIcon(mDatabase!!.drawFactory, entryInfo.icon, iconColor)
-
-        // 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)))
-            }
+    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 {
-            // If dialog not already shown
-            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
-                showWarningClipboardDialogOnClickListener
-            } else {
-                null
-            }
+            mColorBackground
        }
-        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))
+        titleIconView?.background?.colorFilter = BlendModeColorFilterCompat
+            .createBlendModeColorFilterCompat(backgroundDarker, BlendModeCompat.SRC_IN)
+        mIcon?.let { icon ->
+            titleIconView?.let { iconView ->
+                mIconDrawableFactory?.assignDatabaseIcon(
+                    iconView,
+                    icon,
+                    mForegroundColor ?: mColorAccent
                )
            }
        }
-
-        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)
-                }
-            }
-        }
+        toolbar?.changeControlColor(mForegroundColor ?: mControlColor)
+        collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mControlColor)
    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)
+        if (mEntryLoaded) {
+            val inflater = menuInflater
+            MenuUtil.contributionMenuInflater(inflater, 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
-        }
+            inflater.inflate(R.menu.entry, menu)
+            inflater.inflate(R.menu.database, 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
-                }
+            if (mEntryIsHistory && !mDatabaseReadOnly) {
+                inflater.inflate(R.menu.entry_history, menu)
+            }
+
+            // Show education views
+            Handler(Looper.getMainLooper()).post {
+                performedNextEducation(
+                    EntryActivityEducation(
+                        this
+                    ), menu
+                )
            }
        }
-
-        // 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_edit)?.isVisible = false
+        }
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            menu?.findItem(R.id.menu_reload_database)?.isVisible = false
+        }
+        applyToolbarColors()
+        return super.onPrepareOptionsMenu(menu)
+    }
+
    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
                                       menu: Menu) {
-        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
+        val entryFragment = supportFragmentManager.findFragmentByTag(ENTRY_FRAGMENT_TAG)
+                as? EntryFragment?
+        val entryFieldCopyView: View? = entryFragment?.firstEntryFieldCopyView()
        val entryCopyEducationPerformed = entryFieldCopyView != null
                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
-                        entryFieldCopyView,
-                        {
-                            val appNameString = getString(R.string.app_name)
-                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
-                                    getString(R.string.copy_field, appNameString))
-                        },
-                        {
-                            performedNextEducation(entryActivityEducation, menu)
-                        })
+                entryFieldCopyView,
+                {
+                    entryFragment.launchEntryCopyEducationAction()
+                },
+                {
+                    performedNextEducation(entryActivityEducation, menu)
+                })

        if (!entryCopyEducationPerformed) {
            val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
@@ -464,60 +420,54 @@ class EntryActivity : LockingActivity() {
                return true
            }
            R.id.menu_edit -> {
-                mEntry?.let {
-                    EntryEditActivity.launch(this@EntryActivity, it)
+                mDatabase?.let { database ->
+                    mMainEntryId?.let { entryId ->
+                        EntryEditActivity.launchToUpdate(
+                            this,
+                            database,
+                            entryId,
+                            mEntryActivityResultLauncher
+                        )
+                    }
                }
                return true
            }
            R.id.menu_goto_url -> {
-                var url: String = mEntry?.url ?: ""
-
-                // Default http:// if no protocol specified
-                if (!url.contains("://")) {
-                    url = "http://$url"
+                mUrl?.let { url ->
+                    UriUtil.gotoUrl(this, url)
                }
-
-                UriUtil.gotoUrl(this, url)
                return true
            }
            R.id.menu_restore_entry_history -> {
-                mEntryLastVersion?.let { mainEntry ->
-                    mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory(
-                            mainEntry,
-                            mEntryHistoryPosition,
-                            !mReadOnly && mAutoSaveEnable)
+                mMainEntryId?.let { mainEntryId ->
+                    restoreEntryHistory(
+                        mainEntryId,
+                        mHistoryPosition)
                }
            }
            R.id.menu_delete_entry_history -> {
-                mEntryLastVersion?.let { mainEntry ->
-                    mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(
-                            mainEntry,
-                            mEntryHistoryPosition,
-                            !mReadOnly && mAutoSaveEnable)
+                mMainEntryId?.let { mainEntryId ->
+                    deleteEntryHistory(
+                        mainEntryId,
+                        mHistoryPosition)
                }
            }
            R.id.menu_save_database -> {
-                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
+                saveDatabase()
            }
            R.id.menu_reload_database -> {
-                mProgressDatabaseTaskProvider?.startDatabaseReload(false)
+                reloadDatabase()
            }
            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, mEntry)
-            setResult(EntryEditActivity.UPDATE_ENTRY_RESULT_CODE, this)
+            putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mMainEntryId)
+            setResult(Activity.RESULT_OK, this)
        }
        super.finish()
    }
@@ -525,19 +475,42 @@ class EntryActivity : LockingActivity() {
    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"

-        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)
+        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)
                    intent.putExtra(KEY_ENTRY_HISTORY_POSITION, historyPosition)
-                activity.startActivityForResult(intent, EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
+                    activityResultLauncher.launch(intent)
+                }
            }
        }
    }
--- 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/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
@@ -1,528 +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
-
-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 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.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.database.element.Attachment
-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.education.EntryEditActivityEducation
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
-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() {
-
-    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 lateinit var attachmentsAdapter: EntryAttachmentsItemsAdapter
-
-    private var fontInVisibility: Boolean = false
-    private var iconColor: Int = 0
-
-    var drawFactory: IconDrawableFactory? = null
-    var setOnDateClickListener: (() -> Unit)? = null
-    var setOnPasswordGeneratorClickListener: View.OnClickListener? = null
-    var setOnIconViewClickListener: View.OnClickListener? = null
-    var setOnEditCustomField: ((Field) -> Unit)? = null
-    var setOnRemoveAttachment: ((Attachment) -> Unit)? = null
-
-    // Elements to modify the current entry
-    private var mEntryInfo = EntryInfo()
-    private var mBinaryCipherKey: Database.LoadedKey? = null
-    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)
-
-        val rootView = inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry_edit_contents, container, false)
-
-        fontInVisibility = PreferencesUtil.fieldFontIsInVisibility(requireContext())
-
-        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?.onClick(it)
-        }
-
-        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())
-        attachmentsAdapter.binaryCipherKey = arguments?.getSerializable(KEY_BINARY_CIPHER_KEY) as? Database.LoadedKey?
-        attachmentsAdapter.onListSizeChangedListener = { previousSize, newSize ->
-            if (previousSize > 0 && newSize == 0) {
-                attachmentsContainerView.collapse(true)
-            } else if (previousSize == 0 && newSize == 1) {
-                attachmentsContainerView.expand(true)
-            }
-        }
-        attachmentsListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            adapter = attachmentsAdapter
-            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-        }
-
-        // 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
-    }
-
-    override fun onDetach() {
-        super.onDetach()
-
-        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?.let { drawFactory ->
-                entryIconView.assignDatabaseIcon(drawFactory, 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()
-            }
-        }
-
-    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?.isPasswordVisibilityToggleEnabled = extraField.protectedValue.isProtected
-        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
-    }
-
-    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)
-                }
-            }
-        }
-    }
-
-    /* -------------
-     * Attachments
-     * -------------
-     */
-
-    fun getAttachments(): List<Attachment> {
-        return attachmentsAdapter.itemsList.map { it.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) })
-        attachmentsAdapter.onDeleteButtonClickListener = { item ->
-            onDeleteItem.invoke(item.attachment)
-        }
-    }
-
-    fun containsAttachment(): Boolean {
-        return !attachmentsAdapter.isEmpty()
-    }
-
-    fun containsAttachment(attachment: EntryAttachmentState): Boolean {
-        return attachmentsAdapter.contains(attachment)
-    }
-
-    fun putAttachment(attachment: EntryAttachmentState,
-                      onPreviewLoaded: (()-> Unit)? = null) {
-        attachmentsContainerView.visibility = View.VISIBLE
-        attachmentsAdapter.putItem(attachment)
-        attachmentsAdapter.onBinaryPreviewLoaded = {
-            onPreviewLoaded?.invoke()
-        }
-    }
-
-    fun removeAttachment(attachment: EntryAttachmentState) {
-        attachmentsAdapter.removeItem(attachment)
-    }
-
-    fun clearAttachments() {
-        attachmentsAdapter.clear()
-    }
-
-    fun getAttachmentViewPosition(attachment: EntryAttachmentState, position: (Float) -> Unit) {
-        attachmentsListView.postDelayed({
-            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.putSerializable(KEY_BINARY_CIPHER_KEY, mBinaryCipherKey)
-        outState.putParcelable(KEY_LAST_FOCUSED_FIELD, mLastFocusedEditField)
-
-        super.onSaveInstanceState(outState)
-    }
-
-    companion object {
-        const val KEY_TEMP_ENTRY_INFO = "KEY_TEMP_ENTRY_INFO"
-        const val KEY_BINARY_CIPHER_KEY = "KEY_BINARY_CIPHER_KEY"
-        const val KEY_LAST_FOCUSED_FIELD = "KEY_LAST_FOCUSED_FIELD"
-
-        fun getInstance(entryInfo: EntryInfo?,
-                        loadedKey: Database.LoadedKey?): EntryEditFragment {
-            return EntryEditFragment().apply {
-                arguments = Bundle().apply {
-                    putParcelable(KEY_TEMP_ENTRY_INFO, entryInfo)
-                    putSerializable(KEY_BINARY_CIPHER_KEY, loadedKey)
-                }
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
@@ -22,14 +22,13 @@ 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.MagikIME
+import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.otp.OtpEntryFields
@@ -39,10 +38,18 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 * Activity to search or select entry in database,
 * Commonly used with Magikeyboard
 */
-class EntrySelectionLauncherActivity : AppCompatActivity() {
+class EntrySelectionLauncherActivity : DatabaseModeActivity() {

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

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

@@ -68,39 +75,39 @@ class EntrySelectionLauncherActivity : AppCompatActivity() {
            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(searchInfo)
+            launch(database, searchInfo)
        }
-
-        super.onCreate(savedInstanceState)
    }

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

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

            // If database is open
-            val database = Database.getInstance()
-            val readOnly = database.isReadOnly
+            val readOnly = database?.isReadOnly != false
            SearchHelper.checkAutoSearchInfo(this,
                    database,
                    searchInfo,
-                    { items ->
+                    { openedDatabase, items ->
                        // Items found
                        if (searchInfo.otpString != null) {
                            if (!readOnly) {
-                                GroupActivity.launchForSaveResult(this,
-                                        searchInfo,
-                                        false)
+                                GroupActivity.launchForSaveResult(
+                                    this,
+                                    openedDatabase,
+                                    searchInfo,
+                                    false)
                            } else {
                                Toast.makeText(applicationContext,
                                        R.string.autofill_read_only_save,
@@ -111,30 +118,32 @@ class EntrySelectionLauncherActivity : AppCompatActivity() {
                            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,
-                                        readOnly,
-                                        searchInfo,
-                                        true)
+                                    openedDatabase,
+                                    searchInfo,
+                                    true)
                            }
                        } else {
                            GroupActivity.launchForSearchResult(this,
-                                    readOnly,
-                                    searchInfo,
-                                    true)
+                                openedDatabase,
+                                searchInfo,
+                                true)
                        }
                    },
-                    {
+                    { openedDatabase ->
                        // Show the database UI to select the entry
                        if (searchInfo.otpString != null) {
                            if (!readOnly) {
                                GroupActivity.launchForSaveResult(this,
-                                        searchInfo,
-                                        false)
+                                    openedDatabase,
+                                    searchInfo,
+                                    false)
                            } else {
                                Toast.makeText(applicationContext,
                                        R.string.autofill_read_only_save,
@@ -143,13 +152,14 @@ class EntrySelectionLauncherActivity : AppCompatActivity() {
                            }
                        } else if (readOnly || searchShareForMagikeyboard) {
                            GroupActivity.launchForKeyboardSelectionResult(this,
-                                    readOnly,
-                                    searchInfo,
-                                    false)
+                                openedDatabase,
+                                searchInfo,
+                                false)
                        } else {
                            GroupActivity.launchForSaveResult(this,
-                                    searchInfo,
-                                    false)
+                                openedDatabase,
+                                searchInfo,
+                                false)
                        }
                    },
                    {
@@ -183,7 +193,7 @@ fun populateKeyboardAndMoveAppToBackground(activity: Activity,
                                           intent: Intent,
                                           toast: Boolean = true) {
    // Populate Magikeyboard with entry
-    MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
+    MagikeyboardService.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,8 +31,10 @@ 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,14 +44,14 @@ import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
+import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
+import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 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
@@ -60,17 +62,17 @@ 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 kotlinx.android.synthetic.main.activity_file_selection.*
 import java.io.FileNotFoundException

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

    // Views
-    private var coordinatorLayout: CoordinatorLayout? = null
+    private lateinit var coordinatorLayout: CoordinatorLayout
    private var createDatabaseButtonView: View? = null
    private var openDatabaseButtonView: View? = null

@@ -83,13 +85,22 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),

    private var mDatabaseFileUri: Uri? = null

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

-    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
+    private var mAutofillActivityResultLauncher: ActivityResultLauncher<Intent>? =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            AutofillHelper.buildActivityResultLauncher(this)
+        else 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)
@@ -104,14 +115,25 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        createDatabaseButtonView?.setOnClickListener { createNewFile() }

        // Open database button
-        mSelectFileHelper = SelectFileHelper(this)
-        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
-        openDatabaseButtonView?.apply {
-            mSelectFileHelper?.selectFileOnClickViewListener?.let {
-                setOnClickListener(it)
-                setOnLongClickListener(it)
+        mExternalFileHelper = ExternalFileHelper(this)
+        mExternalFileHelper?.buildOpenDocument { uri ->
+            uri?.let {
+                launchPasswordActivityWithPath(uri)
            }
        }
+        mExternalFileHelper?.buildCreateDocument("application/x-keepass") { 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)
+            }
+        }
+        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
+        openDatabaseButtonView?.setOpenDocumentClickListener(mExternalFileHelper)

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

        // Observe list of databases
        databaseFilesViewModel.databaseFilesLoaded.observe(this) { databaseFiles ->
-            when (databaseFiles.databaseFileAction) {
-                DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
-                    mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
-                }
-                DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
-                        mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
+            try {
+                when (databaseFiles.databaseFileAction) {
+                    DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
+                        mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
                    }
-                    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.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)
+                        }
                    }
                }
+                databaseFilesViewModel.consumeAction()
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to observe database action", e)
            }
-            databaseFilesViewModel.consumeAction()
        }

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

-        // 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(activity_file_selection_coordinator_layout,
-                                    resultError,
-                                    Snackbar.LENGTH_LONG).asError().show()
-                        }
+    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
+                        )
                    }
                }
            }
+            // 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()
        }
    }

@@ -231,16 +279,15 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     * Create a new file by calling the content provider
     */
    private fun createNewFile() {
-        createDocument(this, getString(R.string.database_file_name_default) +
-                getString(R.string.database_file_extension_default), "application/x-keepass")
+        mExternalFileHelper?.createDocument(
+            getString(R.string.database_file_name_default) +
+                getString(R.string.database_file_extension_default))
    }

    private fun fileNoFoundAction(e: FileNotFoundException) {
        val error = getString(R.string.file_not_found_content)
        Log.e(TAG, error, e)
-        coordinatorLayout?.let {
-            Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-        }
+        Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
    }

    private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
@@ -251,15 +298,19 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                    fileNoFoundAction(exception)
                },
                { onCancelSpecialMode() },
-                { onLaunchActivitySpecialMode() })
+                { onLaunchActivitySpecialMode() },
+                mAutofillActivityResultLauncher)
    }

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

    override fun onValidateSpecialMode() {
@@ -285,7 +336,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        // Show open and create button or special mode
        when (mSpecialMode) {
            SpecialMode.DEFAULT -> {
-                if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
+                if (ExternalFileHelper.allowCreateDocumentByStorageAccessFramework(packageManager)) {
                    // There is an activity which can handle this intent.
                    createDatabaseButtonView?.visibility = View.VISIBLE
                } else{
@@ -299,28 +350,16 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            }
        }

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

-    override fun onPause() {
-        // Unregister progress task
-        mProgressDatabaseTaskProvider?.unregisterProgressTask()
-
-        super.onPause()
+        // Show recent files if allowed
+        if (PreferencesUtil.showRecentFiles(this@FileDatabaseSelectActivity)) {
+            databaseFilesViewModel.loadListOfDatabases()
+        } else {
+            mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+        }
    }

    override fun onSaveInstanceState(outState: Bundle) {
@@ -332,54 +371,20 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
    }

    override fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential) {
-
        try {
            mDatabaseFileUri?.let { databaseUri ->
-
                // Create the new database
-                mProgressDatabaseTaskProvider?.startDatabaseCreate(
-                        databaseUri,
-                        mainCredential
-                )
+                createDatabase(databaseUri, mainCredential)
            }
        } catch (e: Exception) {
            val error = getString(R.string.error_create_database_file)
-            Snackbar.make(activity_file_selection_coordinator_layout, error, Snackbar.LENGTH_LONG).asError().show()
+            Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
            Log.e(TAG, error, e)
        }
    }

    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)
-                coordinatorLayout?.let {
-                    Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-                }
-                Log.e(TAG, error)
-            }
-        }
-    }
-
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)

@@ -395,9 +400,10 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
        // If no recent files
        val createDatabaseEducationPerformed =
-                createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
+                createDatabaseButtonView != null
+                && createDatabaseButtonView!!.visibility == View.VISIBLE
                && mAdapterDatabaseHistory != null
-                && mAdapterDatabaseHistory!!.itemCount > 0
+                && mAdapterDatabaseHistory!!.itemCount == 0
                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
                        createDatabaseButtonView!!,
                {
@@ -412,9 +418,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            openDatabaseButtonView != null
                    && fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
                    openDatabaseButtonView!!,
-                    {tapTargetView ->
+                    { tapTargetView ->
                        tapTargetView?.let {
-                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+                            mExternalFileHelper?.openDocument()
                        }
                    },
                    {}
@@ -492,11 +498,13 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         */

        @RequiresApi(api = Build.VERSION_CODES.O)
-        fun launchForAutofillResult(activity: Activity,
+        fun launchForAutofillResult(activity: AppCompatActivity,
+                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
                                    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
@@ -0,0 +1,356 @@
+/*
+ * 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
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+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.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.updateLockPaddingLeft
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+import kotlinx.coroutines.*
+
+
+class IconPickerActivity : DatabaseLockActivity() {
+
+    private lateinit var toolbar: Toolbar
+    private lateinit var coordinatorLayout: CoordinatorLayout
+    private lateinit var uploadButton: View
+    private var lockView: View? = null
+
+    private var mIconImage: IconImage = IconImage()
+
+    private val mainScope = CoroutineScope(Dispatchers.Main)
+
+    private val iconPickerViewModel: IconPickerViewModel by viewModels()
+    private var mCustomIconsSelectionMode = false
+    private var mIconsSelected: List<IconImageCustom> = ArrayList()
+
+    private var mExternalFileHelper: ExternalFileHelper? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_icon_picker)
+
+        toolbar = findViewById(R.id.toolbar)
+        toolbar.title = " "
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        updateIconsSelectedViews()
+
+        coordinatorLayout = findViewById(R.id.icon_picker_coordinator)
+
+        mExternalFileHelper = ExternalFileHelper(this)
+        mExternalFileHelper?.buildOpenDocument { uri ->
+            addCustomIcon(uri)
+        }
+
+        uploadButton = findViewById(R.id.icon_picker_upload)
+
+        lockView = findViewById(R.id.lock_button)
+        lockView?.setOnClickListener {
+            lockAndExit()
+        }
+
+        intent?.getParcelableExtra<IconImage>(EXTRA_ICON)?.let {
+            mIconImage = it
+        }
+
+        if (savedInstanceState == null) {
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                add(R.id.icon_picker_fragment, IconPickerFragment.getInstance(
+                        // Default selection tab
+                        if (mIconImage.custom.isUnknown)
+                            IconPickerFragment.IconTab.STANDARD
+                        else
+                            IconPickerFragment.IconTab.CUSTOM
+                ), ICON_PICKER_FRAGMENT_TAG)
+            }
+        } else {
+            mIconImage = savedInstanceState.getParcelable(EXTRA_ICON) ?: mIconImage
+        }
+
+        iconPickerViewModel.standardIconPicked.observe(this) { iconStandard ->
+            mIconImage.standard = iconStandard
+            // Remove the custom icon if a standard one is selected
+            mIconImage.custom = IconImageCustom()
+            setResult()
+            finish()
+        }
+        iconPickerViewModel.customIconPicked.observe(this) { iconCustom ->
+            // Keep the standard icon if a custom one is selected
+            mIconImage.custom = iconCustom
+            setResult()
+            finish()
+        }
+        iconPickerViewModel.customIconsSelected.observe(this) { iconsSelected ->
+            mIconsSelected = iconsSelected
+            updateIconsSelectedViews()
+        }
+        iconPickerViewModel.customIconAdded.observe(this) { iconCustomAdded ->
+            if (iconCustomAdded.error && !iconCustomAdded.errorConsumed) {
+                Snackbar.make(coordinatorLayout, iconCustomAdded.errorStringId, Snackbar.LENGTH_LONG).asError().show()
+                iconCustomAdded.errorConsumed = true
+            }
+            uploadButton.isEnabled = true
+        }
+        iconPickerViewModel.customIconRemoved.observe(this) { iconCustomRemoved ->
+            if (iconCustomRemoved.error && !iconCustomRemoved.errorConsumed) {
+                Snackbar.make(coordinatorLayout, iconCustomRemoved.errorStringId, Snackbar.LENGTH_LONG).asError().show()
+                iconCustomRemoved.errorConsumed = true
+            }
+            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() {
+        if (mIconsSelected.isEmpty()) {
+            mCustomIconsSelectionMode = false
+            toolbar.title = " "
+        } else {
+            mCustomIconsSelectionMode = true
+            toolbar.title = mIconsSelected.size.toString()
+        }
+        invalidateOptionsMenu()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putParcelable(EXTRA_ICON, mIconImage)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // Show the lock button
+        lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+
+        // Padding if lock button visible
+        toolbar.updateLockPaddingLeft()
+    }
+
+    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
+        }
+        menu?.findItem(R.id.menu_delete)?.apply {
+            isEnabled = mCustomIconsSelectionMode
+            isVisible = isEnabled
+        }
+        return super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                if (mCustomIconsSelectionMode) {
+                    iconPickerViewModel.deselectAllCustomIcons()
+                } else {
+                    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)
+    }
+
+    private fun addCustomIcon(iconToUploadUri: Uri?) {
+        uploadButton.isEnabled = false
+        mainScope.launch {
+            withContext(Dispatchers.IO) {
+                // on Progress with thread
+                val asyncResult: Deferred<IconPickerViewModel.IconCustomState?> = async {
+                    val iconCustomState = IconPickerViewModel.IconCustomState(null, true, R.string.error_upload_file)
+                    UriUtil.getFileData(this@IconPickerActivity, iconToUploadUri)?.also { documentFile ->
+                        if (documentFile.length() > MAX_ICON_SIZE) {
+                            iconCustomState.errorStringId = R.string.error_file_to_big
+                        } else {
+                            mDatabase?.buildNewCustomIcon { customIcon, binary ->
+                                if (customIcon != null) {
+                                    iconCustomState.iconCustom = customIcon
+                                    mDatabase?.let { database ->
+                                        BinaryDatabaseManager.resizeBitmapAndStoreDataInBinaryFile(
+                                                contentResolver,
+                                                database,
+                                                iconToUploadUri,
+                                                binary)
+                                        when {
+                                            binary == null -> {
+                                            }
+                                            binary.getSize() <= 0 -> {
+                                            }
+                                            database.isCustomIconBinaryDuplicate(binary) -> {
+                                                iconCustomState.errorStringId = R.string.error_duplicate_file
+                                            }
+                                            else -> {
+                                                iconCustomState.error = false
+                                            }
+                                        }
+                                    }
+                                    if (iconCustomState.error) {
+                                        mDatabase?.removeCustomIcon(customIcon)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    iconCustomState
+                }
+                withContext(Dispatchers.Main) {
+                    asyncResult.await()?.let { customIcon ->
+                        iconPickerViewModel.addCustomIcon(customIcon)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun updateCustomIcon(iconImageCustom: IconImageCustom) {
+        IconEditDialogFragment.update(iconImageCustom)
+            .show(supportFragmentManager, IconEditDialogFragment.TAG_UPDATE_ICON)
+    }
+
+    private fun removeCustomIcon(iconImageCustom: IconImageCustom) {
+        uploadButton.isEnabled = false
+        iconPickerViewModel.deselectAllCustomIcons()
+        mDatabase?.removeCustomIcon(iconImageCustom)
+        iconPickerViewModel.removeCustomIcon(
+                IconPickerViewModel.IconCustomState(iconImageCustom, false, R.string.error_remove_file)
+        )
+    }
+
+    private fun setResult() {
+        setResult(Activity.RESULT_OK, Intent().apply {
+            putExtra(EXTRA_ICON, mIconImage)
+        })
+    }
+
+    override fun onBackPressed() {
+        setResult()
+        super.onBackPressed()
+    }
+
+    companion object {
+
+        private const val ICON_PICKER_FRAGMENT_TAG = "ICON_PICKER_FRAGMENT_TAG"
+        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 launch(context: FragmentActivity,
+                   previousIcon: IconImage?,
+                   resultLauncher: ActivityResultLauncher<Intent>) {
+            // Create an instance to return the picker icon
+            resultLauncher.launch(
+                Intent(context, IconPickerActivity::class.java).apply {
+                        if (previousIcon != null)
+                            putExtra(EXTRA_ICON, previousIcon)
+                    }
+            )
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
@@ -19,6 +19,7 @@
 */
 package com.kunzisoft.keepass.activities

+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -26,17 +27,24 @@ import android.text.format.Formatter
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.igreenwood.loupe.Loupe
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import kotlinx.android.synthetic.main.activity_image_viewer.*
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import kotlin.math.max

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

+    private var imageContainerView: ViewGroup? = null
+    private lateinit var imageView: ImageView
+    private lateinit var progressView: View
+
+    @SuppressLint("ClickableViewAccessibility")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -46,32 +54,21 @@ class ImageViewerActivity : LockingActivity() {
        setSupportActionBar(toolbar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)
-
-        val imageView: ImageView = findViewById(R.id.image_viewer_image)
-        val progressView: View = findViewById(R.id.image_viewer_progress)
-
-        try {
-            progressView.visibility = View.VISIBLE
-            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
-
-                supportActionBar?.title = attachment.name
-                supportActionBar?.subtitle = Formatter.formatFileSize(this, attachment.binaryAttachment.length)
-
-                Attachment.loadBitmap(attachment, Database.getInstance().loadedCipherKey) { 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()
+        toolbar.setOnTouchListener { _, _ ->
+            resetAppTimeout()
+            false
        }

-        Loupe.create(imageView, image_viewer_container) {
+        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
+            }
            onViewTranslateListener = object : Loupe.OnViewTranslateListener {

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

+    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,36 +19,41 @@
 */
 package com.kunzisoft.keepass.activities

-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 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 : AppCompatActivity() {
+class MagikeyboardLauncherActivity : DatabaseModeActivity() {

-    override fun onCreate(savedInstanceState: Bundle?) {
-        val database = Database.getInstance()
-        val readOnly = database.isReadOnly
+    override fun applyCustomStyle(): Boolean {
+        return false
+    }
+
+    override fun finishActivityIfReloadRequested(): Boolean {
+        return true
+    }
+
+    override fun onDatabaseRetrieved(database: Database?) {
+        super.onDatabaseRetrieved(database)
        SearchHelper.checkAutoSearchInfo(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)
-                }
+            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)
+            }
        )
        finish()
-        super.onCreate(savedInstanceState)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -21,7 +21,6 @@ package com.kunzisoft.keepass.activities

 import android.app.Activity
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -31,27 +30,27 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
 import android.view.*
+import android.view.KeyEvent.KEYCODE_ENTER
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+import android.view.inputmethod.InputMethodManager
 import android.widget.*
+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.core.app.ActivityCompat
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.commit
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
-import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
-import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
+import com.kunzisoft.keepass.activities.helpers.*
+import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.biometric.AdvancedUnlockFragment
-import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException
@@ -65,16 +64,18 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.MAIN_CREDENTIAL_KEY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.READ_ONLY_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.BACK_PREVIOUS_KEYBOARD_ACTION
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
 import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
-import kotlinx.android.synthetic.main.activity_password.*
 import java.io.FileNotFoundException

-open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.BuilderListener {
+
+class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener {

    // Views
    private var toolbar: Toolbar? = null
@@ -84,34 +85,27 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
    private var confirmButtonView: Button? = null
    private var checkboxPasswordView: CompoundButton? = null
    private var checkboxKeyFileView: CompoundButton? = null
-    private var advancedUnlockFragment: AdvancedUnlockFragment? = null
    private var infoContainerView: ViewGroup? = null
+    private lateinit var coordinatorLayout: CoordinatorLayout
+    private var advancedUnlockFragment: AdvancedUnlockFragment? = null

-    private val databaseFileViewModel: DatabaseFileViewModel by viewModels()
+    private val mDatabaseFileViewModel: DatabaseFileViewModel by viewModels()
+    private val mAdvancedUnlockViewModel: AdvancedUnlockViewModel by viewModels()

    private var mDefaultDatabase: Boolean = false
    private var mDatabaseFileUri: Uri? = null
    private var mDatabaseKeyFileUri: Uri? = null

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

-    private var mPermissionAsked = false
-    private var readOnly: Boolean = false
+    private var mReadOnly: Boolean = false
    private var mForceReadOnly: Boolean = false
-        set(value) {
-            infoContainerView?.visibility = if (value) {
-                readOnly = true
-                View.VISIBLE
-            } else {
-                View.GONE
-            }
-            field = value
-        }

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

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -131,18 +125,23 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        checkboxPasswordView = findViewById(R.id.password_checkbox)
        checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
        infoContainerView = findViewById(R.id.activity_password_info_container)
+        coordinatorLayout = findViewById(R.id.activity_password_coordinator_layout)

-        mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
-        readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrPreference(this, savedInstanceState)
+        mReadOnly = if (savedInstanceState != null && savedInstanceState.containsKey(KEY_READ_ONLY)) {
+            savedInstanceState.getBoolean(KEY_READ_ONLY)
+        } else {
+            PreferencesUtil.enableReadOnlyDatabase(this)
+        }
        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)

-        mSelectFileHelper = SelectFileHelper(this@PasswordActivity)
-        keyFileSelectionView?.apply {
-            mSelectFileHelper?.selectFileOnClickViewListener?.let {
-                setOnClickListener(it)
-                setOnLongClickListener(it)
+        mExternalFileHelper = ExternalFileHelper(this@PasswordActivity)
+        mExternalFileHelper?.buildOpenDocument { uri ->
+            if (uri != null) {
+                mDatabaseKeyFileUri = uri
+                populateKeyFileTextView(uri)
            }
        }
+        keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)

        passwordView?.setOnEditorActionListener(onEditorActionListener)
        passwordView?.addTextChangedListener(object : TextWatcher {
@@ -155,15 +154,21 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
                    checkboxPasswordView?.isChecked = true
            }
        })
+        passwordView?.setOnKeyListener { _, _, keyEvent ->
+            var handled = false
+            if (keyEvent.action == KeyEvent.ACTION_DOWN
+                && keyEvent?.keyCode == KEYCODE_ENTER) {
+                verifyCheckboxesAndLoadDatabase()
+                handled = true
+            }
+            handled
+        }

        // If is a view intent
        getUriFromIntent(intent)
        if (savedInstanceState?.containsKey(KEY_KEYFILE) == true) {
            mDatabaseKeyFileUri = UriUtil.parse(savedInstanceState.getString(KEY_KEYFILE))
        }
-        if (savedInstanceState?.containsKey(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT) == true) {
-            mAllowAutoOpenBiometricPrompt = savedInstanceState.getBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT)
-        }

        // Init Biometric elements
        advancedUnlockFragment = supportFragmentManager
@@ -179,21 +184,30 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil

        // Listen password checkbox to init advanced unlock and confirmation button
        checkboxPasswordView?.setOnCheckedChangeListener { _, _ ->
-            advancedUnlockFragment?.checkUnlockAvailability()
+            mAdvancedUnlockViewModel.checkUnlockAvailability()
            enableOrNotTheConfirmationButton()
        }

        // Observe if default database
-        databaseFileViewModel.isDefaultDatabase.observe(this) { isDefaultDatabase ->
+        mDatabaseFileViewModel.isDefaultDatabase.observe(this) { isDefaultDatabase ->
            mDefaultDatabase = isDefaultDatabase
        }

        // Observe database file change
-        databaseFileViewModel.databaseFileLoaded.observe(this) { databaseFile ->
+        mDatabaseFileViewModel.databaseFileLoaded.observe(this) { databaseFile ->
+
            // Force read only if the file does not exists
-            mForceReadOnly = databaseFile?.let {
+            val databaseFileNotExists = databaseFile?.let {
                !it.databaseFileExists
            } ?: true
+            infoContainerView?.visibility = if (databaseFileNotExists) {
+                mReadOnly = true
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+            mForceReadOnly = databaseFileNotExists
+
            invalidateOptionsMenu()

            // Post init uri with KeyFile only if needed
@@ -210,72 +224,112 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil

            onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri)
        }
+    }

-        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
-            onActionFinish = { actionTask, result ->
-                when (actionTask) {
-                    ACTION_DATABASE_LOAD_TASK -> {
-                        // Recheck advanced unlock if error
-                        advancedUnlockFragment?.initAdvancedUnlockMode()
+    override fun onResume() {
+        super.onResume()

-                        if (result.isSuccess) {
-                            mDatabaseKeyFileUri = null
-                            clearCredentialsViews(true)
-                            launchGroupActivity()
-                        } else {
-                            var resultError = ""
-                            val resultException = result.exception
-                            val resultMessage = result.message
+        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this@PasswordActivity)

-                            if (resultException != null) {
-                                resultError = resultException.getLocalizedMessage(resources)
+        // Back to previous keyboard is setting activated
+        if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this@PasswordActivity)) {
+            sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
+        }

-                                when (resultException) {
-                                    is DuplicateUuidDatabaseException -> {
-                                        // Relaunch loading if we need to fix UUID
-                                        showLoadDatabaseDuplicateUuidMessage {
+        // Don't allow auto open prompt if lock become when UI visible
+        if (DatabaseLockActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true) {
+            mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = false
+        }

-                                            var databaseUri: Uri? = null
-                                            var mainCredential: MainCredential = MainCredential()
-                                            var readOnly = true
-                                            var cipherEntity: CipherDatabaseEntity? = null
+        mDatabaseFileUri?.let { databaseFileUri ->
+            mDatabaseFileViewModel.loadDatabaseFile(databaseFileUri)
+        }

-                                            result.data?.let { resultData ->
-                                                databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
-                                                mainCredential = resultData.getParcelable(MAIN_CREDENTIAL_KEY) ?: mainCredential
-                                                readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                                cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
-                                            }
+        mDatabase?.let { database ->
+            launchGroupActivityIfLoaded(database)
+        }
+    }

-                                            databaseUri?.let { databaseFileUri ->
-                                                showProgressDialogAndLoadDatabase(
-                                                        databaseFileUri,
-                                                        mainCredential,
-                                                        readOnly,
-                                                        cipherEntity,
-                                                        true)
-                                            }
-                                        }
+    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)
+        when (actionTask) {
+            ACTION_DATABASE_LOAD_TASK -> {
+                // Recheck advanced unlock if error
+                mAdvancedUnlockViewModel.initAdvancedUnlockMode()
+
+                if (result.isSuccess) {
+                    launchGroupActivityIfLoaded(database)
+                } else {
+                    passwordView?.requestFocusFromTouch()
+
+                    var resultError = ""
+                    val resultException = result.exception
+                    val resultMessage = result.message
+
+                    if (resultException != null) {
+                        resultError = resultException.getLocalizedMessage(resources)
+
+                        when (resultException) {
+                            is DuplicateUuidDatabaseException -> {
+                                // Relaunch loading if we need to fix UUID
+                                showLoadDatabaseDuplicateUuidMessage {
+
+                                    var databaseUri: Uri? = null
+                                    var mainCredential = MainCredential()
+                                    var readOnly = true
+                                    var cipherEntity: CipherDatabaseEntity? = null
+
+                                    result.data?.let { resultData ->
+                                        databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
+                                        mainCredential =
+                                            resultData.getParcelable(MAIN_CREDENTIAL_KEY)
+                                                ?: mainCredential
+                                        readOnly = resultData.getBoolean(READ_ONLY_KEY)
+                                        cipherEntity =
+                                            resultData.getParcelable(CIPHER_ENTITY_KEY)
                                    }
-                                    is FileNotFoundDatabaseException -> {
-                                        // Remove this default database inaccessible
-                                        if (mDefaultDatabase) {
-                                            databaseFileViewModel.removeDefaultDatabase()
-                                        }
+
+                                    databaseUri?.let { databaseFileUri ->
+                                        showProgressDialogAndLoadDatabase(
+                                            databaseFileUri,
+                                            mainCredential,
+                                            readOnly,
+                                            cipherEntity,
+                                            true
+                                        )
                                    }
                                }
                            }
-
-                            // Show error message
-                            if (resultMessage != null && resultMessage.isNotEmpty()) {
-                                resultError = "$resultError $resultMessage"
+                            is FileNotFoundDatabaseException -> {
+                                // Remove this default database inaccessible
+                                if (mDefaultDatabase) {
+                                    mDatabaseFileViewModel.removeDefaultDatabase()
+                                }
                            }
-                            Log.e(TAG, resultError)
-                            Snackbar.make(activity_password_coordinator_layout,
-                                    resultError,
-                                    Snackbar.LENGTH_LONG).asError().show()
                        }
                    }
+
+                    // Show error message
+                    if (resultMessage != null && resultMessage.isNotEmpty()) {
+                        resultError = "$resultError $resultMessage"
+                    }
+                    Log.e(TAG, resultError)
+                    Snackbar.make(
+                        coordinatorLayout,
+                        resultError,
+                        Snackbar.LENGTH_LONG
+                    ).asError().show()
                }
            }
        }
@@ -293,7 +347,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
            mDatabaseKeyFileUri = intent?.getParcelableExtra(KEY_KEYFILE)
        }
        mDatabaseFileUri?.let {
-            databaseFileViewModel.checkIfIsDefaultDatabase(it)
+            mDatabaseFileViewModel.checkIfIsDefaultDatabase(it)
        }
    }

@@ -302,13 +356,18 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        getUriFromIntent(intent)
    }

-    private fun launchGroupActivity() {
-        GroupActivity.launch(this,
-                readOnly,
+    private fun launchGroupActivityIfLoaded(database: Database) {
+        // Check if database really loaded
+        if (database.loaded) {
+            clearCredentialsViews(true)
+            GroupActivity.launch(this,
+                database,
                { onValidateSpecialMode() },
                { onCancelSpecialMode() },
-                { onLaunchActivitySpecialMode() }
-        )
+                { onLaunchActivitySpecialMode() },
+                mAutofillActivityResultLauncher
+            )
+        }
    }

    override fun onValidateSpecialMode() {
@@ -358,40 +417,6 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        }
    }

-    override fun onResume() {
-        super.onResume()
-
-        if (Database.getInstance().loaded) {
-            launchGroupActivity()
-        } else {
-            mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
-
-            // If the database isn't accessible make sure to clear the password field, if it
-            // was saved in the instance state
-            if (Database.getInstance().loaded) {
-                clearCredentialsViews()
-            }
-
-            mProgressDatabaseTaskProvider?.registerProgressTask()
-
-            // Back to previous keyboard is setting activated
-            if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this)) {
-                sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
-            }
-
-            // Don't allow auto open prompt if lock become when UI visible
-            mAllowAutoOpenBiometricPrompt = if (LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true)
-                false
-            else
-                mAllowAutoOpenBiometricPrompt
-            mDatabaseFileUri?.let { databaseFileUri ->
-                databaseFileViewModel.loadDatabaseFile(databaseFileUri)
-            }
-
-            checkPermission()
-        }
-    }
-
    private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
        // Define Key File text
        if (mRememberKeyFile) {
@@ -414,12 +439,17 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
            verifyCheckboxesAndLoadDatabase(password, keyFileUri)
        } else {
            // Init Biometric elements
-            advancedUnlockFragment?.loadDatabase(databaseFileUri,
-                    mAllowAutoOpenBiometricPrompt
-                                        && mProgressDatabaseTaskProvider?.isBinded() != true)
+            mAdvancedUnlockViewModel.databaseFileLoaded(databaseFileUri)
        }

        enableOrNotTheConfirmationButton()
+
+        // Auto select the password field and open keyboard
+        passwordView?.postDelayed({
+            passwordView?.requestFocusFromTouch()
+            val inputMethodManager = getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager?
+            inputMethodManager?.showSoftInput(passwordView, InputMethodManager.SHOW_IMPLICIT)
+        }, 100)
    }

    private fun enableOrNotTheConfirmationButton() {
@@ -437,6 +467,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
    private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile) {
        populatePasswordTextView(null)
        if (clearKeyFile) {
+            mDatabaseKeyFileUri = null
            populateKeyFileTextView(null)
        }
    }
@@ -466,22 +497,17 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
    }

    override fun onPause() {
-        mProgressDatabaseTaskProvider?.unregisterProgressTask()
-
        // Reinit locking activity UI variable
-        LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
-        mAllowAutoOpenBiometricPrompt = true
+        DatabaseLockActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null

        super.onPause()
    }

    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(KEY_PERMISSION_ASKED, mPermissionAsked)
        mDatabaseKeyFileUri?.let {
            outState.putString(KEY_KEYFILE, it.toString())
        }
-        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
-        outState.putBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT, false)
+        outState.putBoolean(KEY_READ_ONLY, mReadOnly)
        super.onSaveInstanceState(outState)
    }

@@ -518,12 +544,12 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
            clearCredentialsViews()
        }

-        if (readOnly && (
+        if (mReadOnly && (
                mSpecialMode == SpecialMode.SAVE
                || mSpecialMode == SpecialMode.REGISTRATION)
        ) {
            Log.e(TAG, getString(R.string.autofill_read_only_save))
-            Snackbar.make(activity_password_coordinator_layout,
+            Snackbar.make(coordinatorLayout,
                    R.string.autofill_read_only_save,
                    Snackbar.LENGTH_LONG).asError().show()
        } else {
@@ -532,7 +558,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
                showProgressDialogAndLoadDatabase(
                        databaseUri,
                        MainCredential(password, keyFileUri),
-                        readOnly,
+                        mReadOnly,
                        cipherDatabaseEntity,
                        false)
            }
@@ -544,7 +570,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
                                                  readOnly: Boolean,
                                                  cipherDatabaseEntity: CipherDatabaseEntity?,
                                                  fixDuplicateUUID: Boolean) {
-        mProgressDatabaseTaskProvider?.startDatabaseLoad(
+        loadDatabase(
                databaseUri,
                mainCredential,
                readOnly,
@@ -580,35 +606,6 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        return true
    }

-    // Check permission
-    private fun checkPermission() {
-        if (Build.VERSION.SDK_INT in 23..28
-                && !readOnly
-                && !mPermissionAsked) {
-            mPermissionAsked = true
-            // Check self permission to show or not the dialog
-            val writePermission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-            val permissions = arrayOf(writePermission)
-            if (toolbar != null
-                    && ActivityCompat.checkSelfPermission(this, writePermission) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this, permissions, WRITE_EXTERNAL_STORAGE_REQUEST)
-            }
-        }
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        when (requestCode) {
-            WRITE_EXTERNAL_STORAGE_REQUEST -> {
-                if (grantResults.isEmpty() || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                    if (ActivityCompat.shouldShowRequestPermissionRationale(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE))
-                        Toast.makeText(this, R.string.read_only_warning, Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
    // To fix multiple view education
    private var performedEductionInProgress = false
    private fun launchEducation(menu: Menu) {
@@ -660,7 +657,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
    }

    private fun changeOpenFileReadIcon(togglePassword: MenuItem) {
-        if (readOnly) {
+        if (mReadOnly) {
            togglePassword.setTitle(R.string.menu_file_selection_read_only)
            togglePassword.setIcon(R.drawable.ic_read_only_white_24dp)
        } else {
@@ -674,7 +671,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        when (item.itemId) {
            android.R.id.home -> finish()
            R.id.menu_open_file_read_mode_key -> {
-                readOnly = !readOnly
+                mReadOnly = !mReadOnly
                changeOpenFileReadIcon(item)
            }
            else -> MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
@@ -683,46 +680,6 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        return super.onOptionsItemSelected(item)
    }

-    override fun onActivityResult(
-            requestCode: Int,
-            resultCode: Int,
-            data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        mAllowAutoOpenBiometricPrompt = false
-
-        // To get device credential unlock result
-        advancedUnlockFragment?.onActivityResult(requestCode, resultCode, data)
-
-        // To get entry in result
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
-        }
-
-        var keyFileResult = false
-        mSelectFileHelper?.let {
-            keyFileResult = it.onActivityResultCallback(requestCode, resultCode, data
-            ) { uri ->
-                if (uri != null) {
-                    mDatabaseKeyFileUri = uri
-                    populateKeyFileTextView(uri)
-                }
-            }
-        }
-        if (!keyFileResult) {
-            // this block if not a key file response
-            when (resultCode) {
-                LockingActivity.RESULT_EXIT_LOCK -> {
-                    clearCredentialsViews()
-                    Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this))
-                }
-                Activity.RESULT_CANCELED -> {
-                    clearCredentialsViews()
-                }
-            }
-        }
-    }
-
    companion object {

        private val TAG = PasswordActivity::class.java.name
@@ -733,12 +690,9 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
        private const val KEY_KEYFILE = "keyFile"
        private const val VIEW_INTENT = "android.intent.action.VIEW"

+        private const val KEY_READ_ONLY = "KEY_READ_ONLY"
        private const val KEY_PASSWORD = "password"
        private const val KEY_LAUNCH_IMMEDIATELY = "launchImmediately"
-        private const val KEY_PERMISSION_ASKED = "KEY_PERMISSION_ASKED"
-        private const val WRITE_EXTERNAL_STORAGE_REQUEST = 647
-
-        private const val ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT = "ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT"

        private fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?,
                                         intentBuildLauncher: (Intent) -> Unit) {
@@ -829,15 +783,17 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil

        @RequiresApi(api = Build.VERSION_CODES.O)
        @Throws(FileNotFoundException::class)
-        fun launchForAutofillResult(activity: Activity,
+        fun launchForAutofillResult(activity: AppCompatActivity,
                                    databaseFile: Uri,
                                    keyFile: Uri?,
+                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
                                    autofillComponent: AutofillComponent,
                                    searchInfo: SearchInfo?) {
            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
                AutofillHelper.startActivityForAutofillResult(
                        activity,
                        intent,
+                        activityResultLauncher,
                        autofillComponent,
                        searchInfo)
            }
@@ -865,12 +821,13 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
         * 		Global Launch
         * -------------------------
         */
-        fun launch(activity: Activity,
+        fun launch(activity: AppCompatActivity,
                   databaseUri: Uri,
                   keyFile: Uri?,
                   fileNoFoundAction: (exception: FileNotFoundException) -> Unit,
                   onCancelSpecialMode: () -> Unit,
-                   onLaunchActivitySpecialMode: () -> Unit) {
+                   onLaunchActivitySpecialMode: () -> Unit,
+                   autofillActivityResultLauncher: ActivityResultLauncher<Intent>?) {

            try {
                EntrySelectionHelper.doSpecialAction(activity.intent,
@@ -900,6 +857,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                PasswordActivity.launchForAutofillResult(activity,
                                        databaseUri, keyFile,
+                                        autofillActivityResultLauncher,
                                        autofillComponent,
                                        searchInfo)
                                onLaunchActivitySpecialMode()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
@@ -22,7 +22,6 @@ 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
@@ -30,18 +29,17 @@ 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.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView

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

    private var mMasterPassword: String? = null
    private var mKeyFile: Uri? = null
@@ -60,7 +58,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {

    private var mListener: AssignPasswordDialogListener? = null

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

    private var mEmptyPasswordConfirmationDialog: AlertDialog? = null
    private var mNoKeyConfirmationDialog: AlertDialog? = null
@@ -120,8 +118,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                    .setPositiveButton(android.R.string.ok) { _, _ -> }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }

-            val credentialsInfo: ImageView? = rootView?.findViewById(R.id.credentials_information)
-            credentialsInfo?.setOnClickListener {
+            rootView?.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
                UriUtil.gotoUrl(activity, R.string.credentials_explanation_url)
            }

@@ -134,11 +131,20 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)

-            mSelectFileHelper = SelectFileHelper(this)
-            keyFileSelectionView?.apply {
-                setOnClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
-                setOnLongClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
+            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()
+                        }
+                    }
+                }
            }
+            keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)

            val dialog = builder.create()

@@ -213,7 +219,11 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                passwordRepeatTextInputLayout?.error = getString(R.string.error_pass_match)
            }

-            if (mMasterPassword == null || mMasterPassword!!.isEmpty()) {
+            if ((mMasterPassword == null
+                        || mMasterPassword!!.isEmpty())
+                && (keyFileCheckBox == null
+                        || !keyFileCheckBox!!.isChecked
+                        || keyFileSelectionView?.uri == null)) {
                error = true
                showEmptyPasswordConfirmationDialog()
            }
@@ -287,23 +297,6 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
        }
    }

-    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"
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt
@@ -0,0 +1,95 @@
+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,12 +23,11 @@ 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 : DialogFragment() {
+class DatabaseChangedDialogFragment : DatabaseDialogFragment() {

    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
@@ -0,0 +1,72 @@
+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,6 +6,7 @@ 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,61 +20,38 @@
 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.DialogFragment
+import androidx.fragment.app.activityViewModels
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
+import com.kunzisoft.keepass.viewmodels.NodesViewModel

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

-    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)
-    }
+    private var mNodesToDelete: List<Node> = listOf()
+    private val mNodesViewModel: NodesViewModel by activityViewModels()

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
+        mNodesViewModel.nodesToDelete.observe(this) { nodes ->
+            this.mNodesToDelete = nodes
+        }
+        var recycleBin = false
        arguments?.apply {
-            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)
+            if (containsKey(RECYCLE_BIN_TAG)) {
+                recycleBin = this.getBoolean(RECYCLE_BIN_TAG)
            }
        }
        activity?.let { activity ->
            // Use the Builder class for convenient dialog construction
            val builder = AlertDialog.Builder(activity)

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

-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putAll(getBundleFromListNodes(mNodesToDelete))
-    }
-
-    interface DeleteNodeListener {
-        fun permanentlyDeleteNodes(nodes: List<Node>)
-    }
-
    companion object {
-        fun getInstance(nodesToDelete: List<Node>): DeleteNodesDialogFragment {
+        private const val RECYCLE_BIN_TAG = "RECYCLE_BIN_TAG"
+
+        fun getInstance(recycleBin: Boolean): DeleteNodesDialogFragment {
            return DeleteNodesDialogFragment().apply {
-                arguments = getBundleFromListNodes(nodesToDelete)
+                arguments = Bundle().apply {
+                    putBoolean(RECYCLE_BIN_TAG, recycleBin)
+                }
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.activities.dialogs

 import android.app.Dialog
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R

@@ -31,7 +32,7 @@ class DuplicateUuidDialog : DialogFragment() {
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            // Use the Builder class for convenient dialog construction
-            val builder = androidx.appcompat.app.AlertDialog.Builder(activity).apply {
+            val builder = AlertDialog.Builder(activity).apply {
                val message = getString(R.string.contains_duplicate_uuid) +
                        "\n\n" + getString(R.string.contains_duplicate_uuid_procedure)
                setMessage(message)
--- 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,14 +31,13 @@ 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: DialogFragment() {
+class EntryCustomFieldDialogFragment: DatabaseDialogFragment() {

    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 : DialogFragment() {
+class GeneratePasswordDialogFragment : DatabaseDialogFragment() {

    private var mListener: GeneratePasswordListener? = null

@@ -42,6 +42,8 @@ class GeneratePasswordDialogFragment : DialogFragment() {
    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
@@ -77,7 +79,7 @@ class GeneratePasswordDialogFragment : DialogFragment() {
            passwordView = root?.findViewById(R.id.password)
            passwordView?.applyFontVisibility()
            val passwordCopyView: ImageView? = root?.findViewById(R.id.password_copy_button)
-            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyPasswordAndProtectedFields(activity))
+            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyProtectedFields(activity))
                View.VISIBLE else View.GONE
            val clipboardHelper = ClipboardHelper(activity)
            passwordCopyView?.setOnClickListener {
@@ -98,6 +100,8 @@ class GeneratePasswordDialogFragment : DialogFragment() {
            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)
@@ -120,16 +124,18 @@ class GeneratePasswordDialogFragment : DialogFragment() {

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

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

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

    companion object {
-        const val KEY_PASSWORD_ID = "KEY_PASSWORD_ID"
+        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)
+                }
+            }
+        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
@@ -0,0 +1,151 @@
+/*
+ * 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 com.kunzisoft.keepass.R
+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 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 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)
+    }
+
+    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)
+            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)
+            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
+            }
+            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)
+            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)
+    }
+
+    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,7 +20,6 @@
 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
@@ -28,34 +27,34 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.activityViewModels
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.*
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.view.ExpirationView
+import com.kunzisoft.keepass.view.DateTimeEditFieldView
+import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
 import org.joda.time.DateTime

-class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {
+class GroupEditDialogFragment : DatabaseDialogFragment() {

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

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

    private lateinit var iconButtonView: ImageView
-    private var iconColor: Int = 0
+    private var mIconColor: 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: ExpirationView
+    private lateinit var expirationView: DateTimeEditFieldView

    enum class EditGroupDialogAction {
        CREATION, UPDATE, NONE;
@@ -67,22 +66,51 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
        }
    }

-    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 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 onDetach() {
-        mEditGroupListener = null
-        super.onDetach()
+    override fun onDatabaseRetrieved(database: Database?) {
+        super.onDatabaseRetrieved(database)
+        mPopulateIconMethod = { imageView, icon ->
+            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
+        }
+        mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
    }

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -97,12 +125,9 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP

            // Retrieve the textColor to tint the icon
            val ta = activity.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-            iconColor = ta.getColor(0, Color.WHITE)
+            mIconColor = 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)) {
@@ -112,8 +137,6 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
                arguments?.apply {
                    if (containsKey(KEY_ACTION_ID))
                        mEditGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(getInt(KEY_ACTION_ID))
-                    if (mEditGroupDialogAction === CREATION)
-                        mGroupInfo.notes = ""
                    if (containsKey(KEY_GROUP_INFO)) {
                        mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
                    }
@@ -121,32 +144,22 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
            }

            // populate info in views
-            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")
-                }
+            populateInfoToViews(mGroupInfo)
+
+            iconButtonView.setOnClickListener { _ ->
+                mGroupEditViewModel.requestIconSelection(mGroupInfo.icon)
+            }
+            expirationView.setOnDateClickListener = { dateInstant ->
+                mGroupEditViewModel.requestDateTimeSelection(dateInstant)
            }

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

-            iconButtonView.setOnClickListener { _ ->
-                IconPickerDialogFragment().show(parentFragmentManager, "IconPickerDialogFragment")
-            }
-
            return builder.create()
        }
        return super.onCreateDialog(savedInstanceState)
@@ -156,40 +169,34 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
        super.onResume()

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

-    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 {
+    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 {
            notesTextView.text = it
        }
-        expirationView.expires = mGroupInfo.expires
-        expirationView.expiryTime = mGroupInfo.expiryTime
+        expirationView.activation = groupInfo.expires
+        expirationView.dateTime = groupInfo.expiryTime
    }

    private fun retrieveGroupInfoFromViews() {
@@ -199,19 +206,8 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
        if (newNotes.isNotEmpty()) {
            mGroupInfo.notes = newNotes
        }
-        mGroupInfo.expires = expirationView.expires
-        mGroupInfo.expiryTime = expirationView.expiryTime
-    }
-
-    private fun assignIconView() {
-        if (mDatabase?.drawFactory != null) {
-            iconButtonView.assignDatabaseIcon(mDatabase?.drawFactory!!, mGroupInfo.icon, iconColor)
-        }
-    }
-
-    override fun iconPicked(bundle: Bundle) {
-        mGroupInfo.icon = IconPickerDialogFragment.getIconStandardFromBundle(bundle) ?: mGroupInfo.icon
-        assignIconView()
+        mGroupInfo.expires = expirationView.activation
+        mGroupInfo.expiryTime = expirationView.dateTime
    }

    override fun onSaveInstanceState(outState: Bundle) {
@@ -222,35 +218,47 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
    }

    private fun isValid(): Boolean {
-        if (nameTextView.text.toString().isEmpty()) {
-            nameTextLayoutView.error = getString(R.string.error_no_name)
-            return false
+        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)
+            }
        }
-        return true
+        error.messageId?.let { messageId ->
+            nameTextLayoutView.error = getString(messageId)
+        } ?: kotlin.run {
+            nameTextLayoutView.error = null
+        }
+        return !error.isError
    }

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

    companion object {

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

-        fun build(): GroupEditDialogFragment {
+        fun create(groupInfo: GroupInfo): GroupEditDialogFragment {
            val bundle = Bundle()
            bundle.putInt(KEY_ACTION_ID, CREATION.ordinal)
+            bundle.putParcelable(KEY_GROUP_INFO, groupInfo)
            val fragment = GroupEditDialogFragment()
            fragment.arguments = bundle
            return fragment
        }

-        fun build(groupInfo: GroupInfo): GroupEditDialogFragment {
+        fun update(groupInfo: GroupInfo): GroupEditDialogFragment {
            val bundle = Bundle()
            bundle.putInt(KEY_ACTION_ID, UPDATE.ordinal)
            bundle.putParcelable(KEY_GROUP_INFO, groupInfo)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
@@ -0,0 +1,126 @@
+/*
+ * 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/IconPickerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
@@ -1,147 +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.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.GridView
-import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.widget.ImageViewCompat
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
-import com.kunzisoft.keepass.icons.IconPack
-import com.kunzisoft.keepass.icons.IconPackChooser
-
-
-class IconPickerDialogFragment : DialogFragment() {
-
-    private var iconPickerListener: IconPickerListener? = null
-    private var iconPack: IconPack? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            iconPickerListener = context as IconPickerListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + IconPickerListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        iconPickerListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val builder = AlertDialog.Builder(activity)
-
-            iconPack = IconPackChooser.getSelectedIconPack(requireContext())
-
-            // Inflate and set the layout for the dialog
-            // Pass null as the parent view because its going in the dialog layout
-            val root = activity.layoutInflater.inflate(R.layout.fragment_icon_picker, null)
-            builder.setView(root)
-
-            val currIconGridView = root.findViewById<GridView>(R.id.IconGridView)
-            currIconGridView.adapter = ImageAdapter(activity)
-
-            currIconGridView.setOnItemClickListener { _, _, position, _ ->
-                val bundle = Bundle()
-                bundle.putParcelable(KEY_ICON_STANDARD, IconImageStandard(position))
-                iconPickerListener?.iconPicked(bundle)
-                dismiss()
-            }
-
-            builder.setNegativeButton(android.R.string.cancel) { _, _ -> this@IconPickerDialogFragment.dialog?.cancel() }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    inner class ImageAdapter internal constructor(private val context: Context) : BaseAdapter() {
-
-        override fun getCount(): Int {
-            return iconPack?.numberOfIcons() ?: 0
-        }
-
-        override fun getItem(position: Int): Any? {
-            return null
-        }
-
-        override fun getItemId(position: Int): Long {
-            return 0
-        }
-
-        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-            val currentView: View = convertView
-                    ?: (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater)
-                        .inflate(R.layout.item_icon, parent, false)
-
-            iconPack?.let { iconPack ->
-                val iconImageView = currentView.findViewById<ImageView>(R.id.icon_image)
-                iconImageView.setImageResource(iconPack.iconToResId(position))
-
-                // Assign color if icons are tintable
-                if (iconPack.tintable()) {
-                    // Retrieve the textColor to tint the icon
-                    val ta = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-                    ImageViewCompat.setImageTintList(iconImageView, ColorStateList.valueOf(ta.getColor(0, Color.BLACK)))
-                    ta.recycle()
-                }
-            }
-
-            return currentView
-        }
-    }
-
-    interface IconPickerListener {
-        fun iconPicked(bundle: Bundle)
-    }
-
-    companion object {
-
-        private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD"
-
-        fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? {
-            return bundle.getParcelable(KEY_ICON_STANDARD)
-        }
-
-        fun launch(activity: FragmentActivity) {
-            // Create an instance of the dialog fragment and show it
-            val dialog = IconPickerDialogFragment()
-            dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")
-        }
-    }
-}
--- 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,14 +25,13 @@ 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 : DialogFragment() {
+class ReplaceFileDialogFragment : DatabaseDialogFragment() {

    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,7 +31,6 @@ 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
@@ -46,9 +45,10 @@ import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_TOTP_PERIOD
 import com.kunzisoft.keepass.otp.OtpTokenType
 import com.kunzisoft.keepass.otp.OtpType
 import com.kunzisoft.keepass.otp.TokenCalculator
+import com.kunzisoft.keepass.utils.UriUtil
 import java.util.*

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

    private var mCreateOTPElementListener: CreateOtpListener? = null

@@ -79,11 +79,15 @@ class SetOTPDialogFragment : DialogFragment() {
    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
@@ -94,6 +98,10 @@ class SetOTPDialogFragment : DialogFragment() {
    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
@@ -223,11 +231,17 @@ class SetOTPDialogFragment : DialogFragment() {

            val builder = AlertDialog.Builder(activity)
            builder.apply {
-                setTitle(R.string.entry_setup_otp)
                setView(root)
-                        .setPositiveButton(android.R.string.ok) {_, _ -> }
-                        .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        .setPositiveButton(android.R.string.ok) { _, _ ->
+                            resetAppTimeout()
                        }
+                        .setNegativeButton(android.R.string.cancel) { _, _ ->
+                            resetAppTimeout()
+                        }
+            }
+
+            root?.findViewById<View>(R.id.otp_information)?.setOnClickListener {
+                UriUtil.gotoUrl(activity, R.string.otp_explanation_url)
            }

            return builder.create()
@@ -295,7 +309,7 @@ class SetOTPDialogFragment : DialogFragment() {
            override fun afterTextChanged(s: Editable?) {
                s?.toString()?.let { userString ->
                    try {
-                        mOtpElement.setBase32Secret(userString.toUpperCase(Locale.ENGLISH))
+                        mOtpElement.setBase32Secret(userString.uppercase(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,16 +22,15 @@ 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 : DialogFragment() {
+class SortDialogFragment : DatabaseDialogFragment() {

    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,6 +8,7 @@ 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
@@ -0,0 +1,51 @@
+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
@@ -0,0 +1,381 @@
+/*
+ * 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.fragments
+
+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 androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SimpleItemAnimator
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.dialogs.ReplaceFileDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
+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.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.TemplateEditView
+import com.kunzisoft.keepass.view.collapse
+import com.kunzisoft.keepass.view.expand
+import com.kunzisoft.keepass.view.showByFading
+import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
+
+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 attachmentsListView: RecyclerView
+    private var attachmentsAdapter: EntryAttachmentsItemsAdapter? = null
+
+    private var mTemplate: Template? = null
+    private var mAllowMultipleAttachments: Boolean = false
+
+    private var mIconColor: Int = 0
+
+    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()
+
+        return inflater.cloneInContext(contextThemed)
+                .inflate(R.layout.fragment_entry_edit, container, false)
+    }
+
+    override fun onViewCreated(view: View,
+                               savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        rootView = view
+        // Hide only the first time
+        if (savedInstanceState == null) {
+            view.isVisible = false
+        }
+        templateView = view.findViewById(R.id.template_view)
+        attachmentsContainerView = view.findViewById(R.id.entry_attachments_container)
+        attachmentsListView = view.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) {
+            mEntryEditViewModel.saveEntryInfo(it.database, it.entry, it.parent, retrieveEntryInfo())
+        }
+
+        mEntryEditViewModel.onIconSelected.observe(viewLifecycleOwner) { iconImage ->
+            templateView.setIcon(iconImage)
+        }
+
+        mEntryEditViewModel.onBackgroundColorSelected.observe(this) { color ->
+            templateView.setBackgroundColor(color)
+        }
+
+        mEntryEditViewModel.onForegroundColorSelected.observe(this) { 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 ->
+            if (previousSize > 0 && newSize == 0) {
+                attachmentsContainerView.collapse(true)
+            } else if (previousSize == 0 && newSize == 1) {
+                attachmentsContainerView.expand(true)
+            }
+        }
+    }
+
+    private fun assignEntryInfo(entryInfo: EntryInfo?) {
+        // Populate entry views
+        templateView.setEntryInfo(entryInfo)
+
+        // Manage attachments
+        setAttachments(entryInfo?.attachments ?: listOf())
+    }
+
+    private fun retrieveEntryInfo(): EntryInfo {
+        val entryInfo = templateView.getEntryInfo()
+        entryInfo.attachments = getAttachments().toMutableList()
+        return entryInfo
+    }
+
+    /* -------------
+     * Attachments
+     * -------------
+     */
+
+    private fun getAttachments(): List<Attachment> {
+        return attachmentsAdapter?.itemsList?.map { it.attachment } ?: listOf()
+    }
+
+    private fun setAttachments(attachments: List<Attachment>) {
+        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)
+        }
+    }
+
+    private fun containsAttachment(): Boolean {
+        return attachmentsAdapter?.isEmpty() != true
+    }
+
+    private fun containsAttachment(attachment: EntryAttachmentState): Boolean {
+        return attachmentsAdapter?.contains(attachment) ?: false
+    }
+
+    private fun putAttachment(attachment: EntryAttachmentState,
+                              onPreviewLoaded: ((attachment: EntryAttachmentState) -> Unit)? = null) {
+        // When only one attachment is allowed
+        if (!mAllowMultipleAttachments
+            && attachment.downloadState == AttachmentState.START) {
+            attachmentsAdapter?.clear()
+        }
+        attachmentsContainerView.visibility = View.VISIBLE
+        attachmentsAdapter?.putItem(attachment)
+        attachmentsAdapter?.onBinaryPreviewLoaded = {
+            onPreviewLoaded?.invoke(attachment)
+        }
+    }
+
+    private fun removeAttachment(attachment: EntryAttachmentState) {
+        attachmentsAdapter?.removeItem(attachment)
+    }
+
+    private fun getAttachmentViewPosition(attachment: EntryAttachmentState,
+                                          position: (attachment: EntryAttachmentState, Float) -> Unit) {
+        attachmentsListView.postDelayed({
+            attachmentsAdapter?.indexOf(attachment)?.let { index ->
+                position.invoke(attachment,
+                    attachmentsContainerView.y
+                        + attachmentsListView.y
+                        + (attachmentsListView.getChildAt(index)?.y
+                        ?: 0F)
+                )
+            }
+        }, 250)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        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
+
+        private const val ATTACHMENTS_TAG = "ATTACHMENTS_TAG"
+    }
+
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
@@ -0,0 +1,250 @@
+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 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)
+
+        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
+        assignCreationDate(entryInfo?.creationTime)
+        assignModificationDate(entryInfo?.lastModificationTime)
+
+        // Assign special data
+        assignUUID(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()
+    }
+
+    private fun assignCreationDate(date: DateInstant?) {
+        creationDateView.text = date?.getDateTimeString(resources)
+    }
+
+    private fun assignModificationDate(date: DateInstant?) {
+        modificationDateView.text = date?.getDateTimeString(resources)
+    }
+
+    private fun assignUUID(uuid: UUID?) {
+        uuidReferenceView.text = UuidUtil.toHexString(uuid)
+    }
+
+    /* -------------
+     * 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
@@ -0,0 +1,72 @@
+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/GroupFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt
@@ -17,40 +17,46 @@
 *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.kunzisoft.keepass.activities
+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.activities.stylish.StylishFragment
-import com.kunzisoft.keepass.adapters.NodeAdapter
+import com.kunzisoft.keepass.adapters.NodesAdapter
 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 ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
+class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListener {

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

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

    var nodeActionSelectionMode = false
        private set
@@ -62,21 +68,47 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
    private var notFoundView: View? = null
    private var isASearchResult: Boolean = false

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

-    val isEmpty: Boolean
-        get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0
+    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)
+        }
+    }

    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 " + NodeAdapter.NodeClickCallback::class.java.name)
+                    + " must implement " + NodesAdapter.NodeClickCallback::class.java.name)
        }

        try {
@@ -84,14 +116,24 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        } 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()
    }

@@ -99,129 +141,138 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        super.onCreate(savedInstanceState)

        setHasOptionsMenu(true)
+    }

-        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)
-            }
-        }
+    override fun onDatabaseRetrieved(database: Database?) {
+        mRecycleBinEnable = database?.isRecycleBinEnabled == true
+        mRecycleBin = database?.recycleBin

        contextThemed?.let { context ->
-            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)
+            database?.let { database ->
+                mAdapter = NodesAdapter(context, database).apply {
+                    setOnNodeClickListener(object : NodesAdapter.NodeClickCallback {
+                        override fun onNodeClick(database: Database, node: Node) {
+                            if (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)
                            } else {
-                                // Add selected item if not already selected
-                                listActionNodes.add(node)
+                                nodeClickListener?.onNodeClick(database, node)
                            }
-                            nodeClickListener?.onNodeSelected(listActionNodes)
-                            setActionNodes(listActionNodes)
-                            notifyNodeChanged(node)
-                        } else {
-                            nodeClickListener?.onNodeClick(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)
+                        override fun onNodeLongClick(database: Database, node: Node): Boolean {
+                            if (nodeActionPasteMode == PasteMode.UNDEFINED) {
+                                // Select the first item after a long click
+                                if (!listActionNodes.contains(node))
+                                    listActionNodes.add(node)

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

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

-    override fun onSaveInstanceState(outState: Bundle) {
-        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
-        super.onSaveInstanceState(outState)
+    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 onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)
-
        // To apply theme
-        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)
+        return inflater.cloneInContext(contextThemed)
+                .inflate(R.layout.fragment_nodes, container, false)
+    }

+    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 = LinearLayoutManager(context)
+            layoutManager = mLayoutManager
            adapter = mAdapter
        }
+        resetAppTimeoutWhenViewFocusedOrChanged(view)

-        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)
-                }
-            })
+        mGroupViewModel.group.observe(viewLifecycleOwner) {
+            mCurrentGroup = it.group
+            isASearchResult = it.group.isVirtual
+            rebuildList()
+            it.showFromPosition?.let { position ->
+                mNodesRecyclerView?.scrollToPosition(position)
+            }
        }
-
-        return rootView
    }

    override fun onResume() {
        super.onResume()

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

-        // Refresh data
-        try {
-            rebuildList()
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to rebuild the list during resume")
-            e.printStackTrace()
-        }
-
-        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
-        }
+        rebuildList()
    }

-    @Throws(IllegalArgumentException::class)
-    fun rebuildList() {
-        // Add elements to the list
-        mainGroup?.let { mainGroup ->
-            mAdapter?.apply {
+    override fun onPause() {
+
+        mNodesRecyclerView?.removeOnScrollListener(mRecycleViewScrollListener)
+        super.onPause()
+    }
+
+    fun getFirstVisiblePosition(): Int {
+        return mLayoutManager?.findFirstVisibleItemPosition() ?: 0
+    }
+
+    private fun rebuildList() {
+        try {
+            // Add elements to the list
+            mCurrentGroup?.let { mainGroup ->
                // Thrown an exception when sort cannot be performed
-                rebuildList(mainGroup)
-                // To visually change the elements
-                if (PreferencesUtil.APPEARANCE_CHANGED) {
-                    notifyDataSetChanged()
-                    PreferencesUtil.APPEARANCE_CHANGED = false
-                }
+                mAdapter?.rebuildList(mainGroup)
            }
+        } catch (e:Exception) {
+            Log.e(TAG, "Unable to rebuild the list", e)
        }
+
+        if (isASearchResult && mAdapter != null && mAdapter!!.isEmpty) {
+            // To show the " no search entry found "
+            notFoundView?.visibility = View.VISIBLE
+        } else {
+            notFoundView?.visibility = View.GONE
+        }
+
+        groupRefreshed?.onGroupRefreshed()
    }

    override fun onSortSelected(sortNodeEnum: SortNodeEnum,
@@ -236,8 +287,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
            mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
            rebuildList()
        } catch (e:Exception) {
-            Log.e(TAG, "Unable to rebuild the list with the sort")
-            e.printStackTrace()
+            Log.e(TAG, "Unable to sort the list", e)
        }
    }

@@ -253,17 +303,19 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
            R.id.menu_sort -> {
                context?.let { context ->
                    val sortDialogFragment: SortDialogFragment =
-                            if (Database.getInstance().isRecycleBinEnabled) {
+                            if (mRecycleBinEnable) {
                                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")
@@ -275,34 +327,32 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }
    }

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

        return object : ActionMode.Callback {

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

            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 (readOnly
-                                || (database.isRecycleBinEnabled && nodes[0] == database.recycleBin)) {
+                        if (database.isReadOnly
+                                || (mRecycleBinEnable && nodes[0] == mRecycleBin)) {
                            menu?.removeItem(R.id.menu_edit)
                        }
                    } else {
@@ -310,56 +360,59 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                        menu?.removeItem(R.id.menu_edit)
                    }

-                    // 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)
+                    // Move
+                    if (database.isReadOnly
+                            || isASearchResult) {
                        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 (readOnly
-                            || (database.isRecycleBinEnabled && nodes.any { it == database.recycleBin })) {
+                    if (database.isReadOnly
+                            || (mRecycleBinEnable && nodes.any { it == mRecycleBin })) {
                        menu?.removeItem(R.id.menu_delete)
                    }
                }

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

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

@@ -369,83 +422,29 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                mAdapter?.unselectActionNodes()
                nodeActionPasteMode = PasteMode.UNDEFINED
                nodeActionSelectionMode = false
-                actionModeCallback.onDestroyActionMode(mode)
+                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(node: Node)
-        fun onNodeSelected(nodes: List<Node>): Boolean
+        fun onNodeClick(database: Database, node: Node)
+        fun onNodeSelected(database: Database, nodes: List<Node>): Boolean
    }

    /**
     * Menu listener to redefine to do an action in menu
     */
    interface NodesActionMenuListener {
-        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
+        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
    }

    enum class PasteMode {
@@ -463,23 +462,11 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        fun onScrolled(dy: Int)
    }

+    interface GroupRefreshedListener {
+        fun onGroupRefreshed()
+    }
+
    companion object {
-
-        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
-        }
+        private val TAG = GroupFragment::class.java.name
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
@@ -0,0 +1,98 @@
+/*
+ * 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.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
+
+
+class IconCustomFragment : IconFragment<IconImageCustom>() {
+
+    override fun retrieveMainLayoutId(): Int {
+        return R.layout.fragment_icon_grid
+    }
+
+    override fun defineIconList(database: Database?) {
+        database?.doForEachCustomIcons { customIcon, _ ->
+            iconPickerAdapter.addIcon(customIcon, false)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerViewModel.customIconsSelected.observe(viewLifecycleOwner) { customIconsSelected ->
+            if (customIconsSelected.isEmpty()) {
+                iconActionSelectionMode = false
+                iconPickerAdapter.deselectAllIcons()
+            } else {
+                iconActionSelectionMode = true
+                iconPickerAdapter.updateIconSelectedState(customIconsSelected)
+            }
+        }
+        iconPickerViewModel.customIconAdded.observe(viewLifecycleOwner) { iconCustomAdded ->
+            if (!iconCustomAdded.error) {
+                iconCustomAdded?.iconCustom?.let { icon ->
+                    iconPickerAdapter.addIcon(icon)
+                    iconCustomAdded.iconCustom = null
+                    try {
+                        iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
+                    } catch (ignore: Exception) {}
+                }
+            }
+        }
+        iconPickerViewModel.customIconRemoved.observe(viewLifecycleOwner) { iconCustomRemoved ->
+            if (!iconCustomRemoved.error) {
+                iconCustomRemoved?.iconCustom?.let { icon ->
+                    iconPickerAdapter.removeIcon(icon)
+                    iconCustomRemoved.iconCustom = null
+                }
+            }
+        }
+        iconPickerViewModel.customIconUpdated.observe(viewLifecycleOwner) { iconCustomUpdated ->
+            if (!iconCustomUpdated.error) {
+                iconCustomUpdated?.iconCustom?.let { icon ->
+                    iconPickerAdapter.updateIcon(icon)
+                    iconCustomUpdated.iconCustom = null
+                }
+            }
+        }
+    }
+
+    override fun onIconClickListener(icon: IconImageCustom) {
+        if (iconActionSelectionMode) {
+            // Same long click behavior after each single click
+            onIconLongClickListener(icon)
+        } else {
+            iconPickerViewModel.pickCustomIcon(icon)
+        }
+    }
+
+    override fun onIconLongClickListener(icon: IconImageCustom) {
+        // Select or deselect item if already selected
+        icon.selected = !icon.selected
+        iconPickerAdapter.updateIcon(icon)
+        iconActionSelectionMode = iconPickerAdapter.containsAnySelectedIcon()
+        iconPickerViewModel.selectCustomIcons(iconPickerAdapter.getSelectedIcons())
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.fragments
+
+import android.graphics.Color
+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.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.adapters.IconPickerAdapter
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImageDraw
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
+        IconPickerAdapter.IconPickerListener<T> {
+
+    protected lateinit var iconsGridView: RecyclerView
+    protected lateinit var iconPickerAdapter: IconPickerAdapter<T>
+    protected var iconActionSelectionMode = false
+
+    protected val iconPickerViewModel: IconPickerViewModel by activityViewModels()
+
+    abstract fun retrieveMainLayoutId(): Int
+
+    abstract fun defineIconList(database: Database?)
+
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        return inflater.inflate(retrieveMainLayoutId(), container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // 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
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val populateList = launch {
+                iconPickerAdapter.clear()
+                defineIconList(database)
+            }
+            withContext(Dispatchers.Main) {
+                populateList.join()
+                iconPickerAdapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    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
@@ -0,0 +1,79 @@
+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.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.adapters.IconPickerPagerAdapter
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+
+class IconPickerFragment : DatabaseFragment() {
+
+    private var iconPickerPagerAdapter: IconPickerPagerAdapter? = null
+    private lateinit var viewPager: ViewPager2
+    private lateinit var tabLayout: TabLayout
+
+    private val iconPickerViewModel: IconPickerViewModel by activityViewModels()
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_icon_picker, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewPager = view.findViewById(R.id.icon_picker_pager)
+        tabLayout = view.findViewById(R.id.icon_picker_tabs)
+        resetAppTimeoutWhenViewFocusedOrChanged(view)
+
+        arguments?.apply {
+            if (containsKey(ICON_TAB_ARG)) {
+                viewPager.currentItem = getInt(ICON_TAB_ARG)
+            }
+            remove(ICON_TAB_ARG)
+        }
+
+        iconPickerViewModel.customIconAdded.observe(viewLifecycleOwner) { _ ->
+            viewPager.currentItem = 1
+        }
+    }
+
+    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
+    }
+
+    companion object {
+
+        private const val ICON_TAB_ARG = "ICON_TAB_ARG"
+
+        fun getInstance(iconTab: IconTab): IconPickerFragment {
+            val fragment = IconPickerFragment()
+            fragment.arguments = Bundle().apply {
+                putInt(ICON_TAB_ARG, iconTab.ordinal)
+            }
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
@@ -0,0 +1,44 @@
+/*
+ * 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.fragments
+
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+
+
+class IconStandardFragment : IconFragment<IconImageStandard>() {
+
+    override fun retrieveMainLayoutId(): Int {
+        return R.layout.fragment_icon_grid
+    }
+
+    override fun defineIconList(database: Database?) {
+        database?.doForEachStandardIcons { standardIcon ->
+            iconPickerAdapter.addIcon(standardIcon, false)
+        }
+    }
+
+    override fun onIconClickListener(icon: IconImageStandard) {
+        iconPickerViewModel.pickStandardIcon(icon)
+    }
+
+    override fun onIconLongClickListener(icon: IconImageStandard) {}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
@@ -0,0 +1,225 @@
+/*
+ * 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
@@ -1,78 +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.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
@@ -1,244 +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.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
@@ -0,0 +1,80 @@
+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.app.database.CipherDatabaseEntity
+import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
+import com.kunzisoft.keepass.database.element.Database
+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,
+                     cipherEntity: CipherDatabaseEntity?,
+                     fixDuplicateUuid: Boolean) {
+        mDatabaseTaskProvider?.startDatabaseLoad(databaseUri, mainCredential, readOnly, cipherEntity, 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
@@ -0,0 +1,468 @@
+/*
+ * 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
+    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.reloadDatabase.observe(this) { fixDuplicateUuid ->
+            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
+            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_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 reloadDatabase() {
+        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/selection/SpecialModeActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
@@ -1,4 +1,4 @@
-package com.kunzisoft.keepass.activities.selection
+package com.kunzisoft.keepass.activities.legacy

 import android.os.Bundle
 import android.view.View
@@ -7,15 +7,14 @@ 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 special mode (ie: selection mode)
+ * Activity to manage database special mode (ie: selection mode)
 */
-abstract class SpecialModeActivity : StylishActivity() {
+abstract class DatabaseModeActivity : DatabaseActivity() {

    protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
    private var mTypeMode: TypeMode = TypeMode.DEFAULT
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseRetrieval.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseRetrieval.kt
@@ -0,0 +1,11 @@
+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
@@ -1,215 +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.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/stylish/Stylish.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
@@ -20,11 +20,11 @@
 package com.kunzisoft.keepass.activities.stylish

 import android.content.Context
-import androidx.annotation.StyleRes
-import androidx.preference.PreferenceManager
+import android.content.res.Configuration
 import android.util.Log
-
+import androidx.annotation.StyleRes
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.settings.PreferencesUtil

 /**
 * Class that provides functions to retrieve and assign a theme to a module
@@ -37,18 +37,67 @@ object Stylish {
     * Initialize the class with a theme preference
     * @param context Context to retrieve the theme preference
     */
-    fun init(context: Context) {
-        val stylishPrefKey = context.getString(R.string.setting_style_key)
+    fun load(context: Context) {
        Log.d(Stylish::class.java.name, "Attatching to " + context.packageName)
-        themeString = PreferenceManager.getDefaultSharedPreferences(context).getString(stylishPrefKey, context.getString(R.string.list_style_name_light))
+        try {
+            themeString = PreferencesUtil.getStyle(context)
+        } catch (e: Exception) {
+            Log.e("Stylish", "Unable to get preference style", e)
+        }
+    }
+
+    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
+            else -> {
+                when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
+                    Configuration.UI_MODE_NIGHT_YES -> true
+                    else -> false
+                }
+            }
+        }
+        return if (systemNightMode) {
+            retrieveEquivalentNightStyle(context, styleString)
+        } else {
+            retrieveEquivalentLightStyle(context, styleString)
+        }
+    }
+
+    fun retrieveEquivalentLightStyle(context: Context, styleString: String): String {
+        return when (styleString) {
+            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_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_purple_dark) -> context.getString(R.string.list_style_name_purple)
+            else -> styleString
+        }
+    }
+
+    private fun retrieveEquivalentNightStyle(context: Context, styleString: String): String {
+        return when (styleString) {
+            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_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_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(styleString: String) {
-        themeString = styleString
+    fun assignStyle(context: Context, styleString: String) {
+        PreferencesUtil.setStyle(context, styleString)
    }

    /**
@@ -58,13 +107,16 @@ object Stylish {
     */
    @StyleRes
    fun getThemeId(context: Context): Int {
-
-        return when (themeString) {
+        return when (retrieveEquivalentSystemStyle(context, themeString ?: context.getString(R.string.list_style_name_light))) {
            context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night
+            context.getString(R.string.list_style_name_white) -> R.style.KeepassDXStyle_White
            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_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_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,10 +22,13 @@ package com.kunzisoft.keepass.activities.stylish
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
-import androidx.annotation.StyleRes
-import androidx.appcompat.app.AppCompatActivity
+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

 /**
 * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from
@@ -35,6 +38,7 @@ 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)
@@ -52,10 +56,30 @@ 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)
-        this.themeId = Stylish.getThemeId(this)
-        setTheme(themeId)
+
+        customStyle = applyCustomStyle()
+        if (customStyle) {
+            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)
@@ -63,9 +87,17 @@ abstract class StylishActivity : AppCompatActivity() {

    override fun onResume() {
        super.onResume()
-        if (Stylish.getThemeId(this) != this.themeId) {
+
+        if ((customStyle && Stylish.getThemeId(this) != this.themeId)
+            || DATABASE_PREFERENCE_CHANGED) {
+            DATABASE_PREFERENCE_CHANGED = false
            Log.d(this.javaClass.name, "Theme change detected, restarting activity")
-            this.recreate()
+            recreateActivity()
        }
    }
+
+    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,12 +23,12 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-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.fragment.app.Fragment

 abstract class StylishFragment : Fragment() {

@@ -53,14 +53,22 @@ abstract class StylishFragment : Fragment() {
                window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
                taStatusBarColor?.recycle()
            } catch (e: Exception) {}
-
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                try {
+                    val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
+                    if (taWindowStatusLight?.getBoolean(0, false) == true) {
+                        @Suppress("DEPRECATION")
+                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    }
+                    taWindowStatusLight?.recycle()
+                } 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) {}
        }
-
        return super.onCreateView(inflater, container, savedInstanceState)
    }

--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -0,0 +1,150 @@
+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/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -32,22 +32,28 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.ImageViewerActivity
-import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import com.kunzisoft.keepass.view.expand
+import kotlin.math.max


 class EntryAttachmentsItemsAdapter(context: Context)
    : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {

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

+    // Approximately
+    private val mImagePreviewMaxWidth = max(
+            context.resources.displayMetrics.widthPixels,
+            context.resources.getDimensionPixelSize(R.dimen.item_file_info_height)
+    )
    private var mTitleColor: Int

    init {
@@ -76,17 +82,23 @@ class EntryAttachmentsItemsAdapter(context: Context)
                if (entryAttachmentState.previewState == AttachmentState.NULL) {
                    entryAttachmentState.previewState = AttachmentState.IN_PROGRESS
                    // Load the bitmap image
-                    Attachment.loadBitmap(entryAttachmentState.attachment, binaryCipherKey) { imageLoaded ->
-                        if (imageLoaded == null) {
-                            entryAttachmentState.previewState = AttachmentState.ERROR
-                            visibility = View.GONE
-                            onBinaryPreviewLoaded?.invoke(entryAttachmentState)
-                        } else {
-                            entryAttachmentState.previewState = AttachmentState.COMPLETE
-                            setImageBitmap(imageLoaded)
-                            if (visibility != View.VISIBLE) {
-                                expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height)) {
-                                    onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                    database?.let { database ->
+                        BinaryDatabaseManager.loadBitmap(
+                                database,
+                                entryAttachmentState.attachment.binaryData,
+                                mImagePreviewMaxWidth
+                        ) { imageLoaded ->
+                            if (imageLoaded == null) {
+                                entryAttachmentState.previewState = AttachmentState.ERROR
+                                visibility = View.GONE
+                                onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                            } else {
+                                entryAttachmentState.previewState = AttachmentState.COMPLETE
+                                setImageBitmap(imageLoaded)
+                                if (visibility != View.VISIBLE) {
+                                    expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height)) {
+                                        onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                                    }
                                }
                            }
                        }
@@ -101,22 +113,23 @@ class EntryAttachmentsItemsAdapter(context: Context)
        }
        holder.binaryFileBroken.apply {
            setColorFilter(Color.RED)
-            visibility = if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+            visibility = if (entryAttachmentState.attachment.binaryData.isCorrupted) {
                View.VISIBLE
            } else {
                View.GONE
            }
        }
        holder.binaryFileTitle.text = entryAttachmentState.attachment.name
-        if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+        if (entryAttachmentState.attachment.binaryData.isCorrupted) {
            holder.binaryFileTitle.setTextColor(Color.RED)
        } else {
            holder.binaryFileTitle.setTextColor(mTitleColor)
        }
-        holder.binaryFileSize.text = Formatter.formatFileSize(context,
-                entryAttachmentState.attachment.binaryAttachment.length)
+
+        val size = entryAttachmentState.attachment.binaryData.getSize()
+        holder.binaryFileSize.text = Formatter.formatFileSize(context, size)
        holder.binaryFileCompression.apply {
-            if (entryAttachmentState.attachment.binaryAttachment.isCompressed) {
+            if (entryAttachmentState.attachment.binaryData.isCompressed) {
                text = CompressionAlgorithm.GZip.getName(context.resources)
                visibility = View.VISIBLE
            } else {
--- 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.database.element.Entry
+import com.kunzisoft.keepass.model.EntryInfo

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

    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryHistoryList: MutableList<Entry> = ArrayList()
-    var onItemClickListener: ((item: Entry, position: Int)->Unit)? = null
+    var entryHistoryList: MutableList<EntryInfo> = ArrayList()
+    var onItemClickListener: ((item: EntryInfo, 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,7 +44,6 @@ 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)
@@ -64,6 +63,5 @@ 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.model.Field
+import com.kunzisoft.keepass.database.element.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,6 +30,8 @@ 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
@@ -44,11 +46,43 @@ class FileDatabaseHistoryAdapter(context: Context)
    private var fileSelectClearListener: ((DatabaseFile)->Boolean)? = null
    private var saveAliasListener: ((DatabaseFile)->Unit)? = null

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

-    private var mDefaultDatabaseFile: DatabaseFile? = null
-    private var mExpandedDatabaseFile: DatabaseFile? = null
-    private var mPreviousExpandedDatabaseFile: DatabaseFile? = null
+    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
+            }
+        }
+    )

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

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

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

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

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

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

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

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

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

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

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

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

    fun setDefaultDatabase(databaseUri: Uri?) {
-        val defaultDatabaseFile = listDatabaseFiles.firstOrNull { it.databaseUri == databaseUri }
-        mDefaultDatabaseFile = defaultDatabaseFile
-        notifyDataSetChanged()
+        // 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)
+        }
    }

    fun setOnDefaultDatabaseListener(listener: ((DatabaseFile?) -> Unit)?) {
@@ -234,6 +286,30 @@ 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
@@ -0,0 +1,129 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+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
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+
+class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tintIcon: Int)
+    : RecyclerView.Adapter<IconPickerAdapter<I>.CustomIconViewHolder>() {
+
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+
+    private val iconList = ArrayList<I>()
+
+    var iconDrawableFactory: IconDrawableFactory? = null
+    var iconPickerListener: IconPickerListener<I>? = null
+
+    val lastPosition: Int
+        get() = iconList.lastIndex
+
+    fun addIcon(icon: I, notify: Boolean = true) {
+        if (!iconList.contains(icon)) {
+            iconList.add(icon)
+            if (notify) {
+                notifyItemInserted(iconList.indexOf(icon))
+            }
+        }
+    }
+
+    fun updateIcon(icon: I) {
+        val index = iconList.indexOf(icon)
+        if (index != -1) {
+            iconList[index] = icon
+            notifyItemChanged(index)
+        }
+    }
+
+    fun updateIconSelectedState(icons: List<I>) {
+        icons.forEach { icon ->
+            val index = iconList.indexOf(icon)
+            if (index != -1
+                    && iconList[index].selected != icon.selected) {
+                iconList[index] = icon
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun removeIcon(icon: I) {
+        if (iconList.contains(icon)) {
+            val position = iconList.indexOf(icon)
+            iconList.remove(icon)
+            notifyItemRemoved(position)
+        }
+    }
+
+    fun containsAnySelectedIcon(): Boolean {
+        return iconList.firstOrNull { it.selected } != null
+    }
+
+    fun deselectAllIcons() {
+        iconList.forEachIndexed { index, icon ->
+            if (icon.selected) {
+                icon.selected = false
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun getSelectedIcons(): List<I> {
+        return iconList.filter { it.selected }
+    }
+
+    fun clear() {
+        iconList.clear()
+    }
+
+    fun setList(icons: List<I>) {
+        iconList.clear()
+        icons.forEach { iconImage ->
+            iconList.add(iconImage)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomIconViewHolder {
+        val view = inflater.inflate(R.layout.item_icon, parent, false)
+        return CustomIconViewHolder(view)
+    }
+
+    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)
+        }
+        holder.itemView.setOnLongClickListener {
+            iconPickerListener?.onIconLongClickListener(icon)
+            true
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return iconList.size
+    }
+
+    interface IconPickerListener<I: IconImageDraw> {
+        fun onIconClickListener(icon: I)
+        fun onIconLongClickListener(icon: I)
+    }
+
+    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/IconPickerPagerAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerPagerAdapter.kt
@@ -0,0 +1,24 @@
+package com.kunzisoft.keepass.adapters
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.kunzisoft.keepass.activities.fragments.IconCustomFragment
+import com.kunzisoft.keepass.activities.fragments.IconStandardFragment
+
+class IconPickerPagerAdapter(fragment: Fragment, val size: Int)
+    : FragmentStateAdapter(fragment) {
+
+    private val iconStandardFragment = IconStandardFragment()
+    private val iconCustomFragment = IconCustomFragment()
+
+    override fun getItemCount(): Int {
+        return size
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return when (position) {
+            1 -> iconCustomFragment
+            else -> iconStandardFragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -26,11 +26,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.ProgressBar
 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
@@ -39,8 +43,11 @@ 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.icons.assignDatabaseIcon
+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.*
@@ -49,8 +56,9 @@ import java.util.*
 * Create node list adapter with contextMenu or not
 * @param context Context to use
 */
-class NodeAdapter (private val context: Context)
-    : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {
+class NodesAdapter (private val context: Context,
+                    private val database: Database)
+    : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {

    private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
    private val mNodeSortedListCallback: NodeSortedListCallback
@@ -60,26 +68,37 @@ class NodeAdapter (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 mSubtextDefaultDimension: Float = 0F
-    private var mInfoTextDefaultDimension: Float = 0F
+    private var mTextDefaultDimension: Float = 0F
+    private var mSubTextDefaultDimension: Float = 0F
+    private var mMetaTextDefaultDimension: Float = 0F
+    private var mOtpTokenTextDefaultDimension: Float = 0F
    private var mNumberChildrenTextDefaultDimension: Float = 0F
    private var mIconDefaultDimension: Float = 0F

    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 val mDatabase: Database
+    private var mClipboardHelper = ClipboardHelper(context)

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

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

-        // Database
-        this.mDatabase = Database.getInstance()
-
        // Color of content selection
-        val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
-        taContentSelectionColor.recycle()
+        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.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
+        this.mTextColorPrimary = taTextColorPrimary.getColor(0, Color.BLACK)
        taTextColorPrimary.recycle()
-        // In two times to fix bug compilation
+        // To get text color
        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        this.mIconEntryColor = taTextColor.getColor(0, Color.BLACK)
+        this.mTextColor = 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 taSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight))
+        this.mColorAccentLight = taSelectionColor.getColor(0, Color.GRAY)
+        taSelectionColor.recycle()
+        // To get text color for selection
+        val taSelectionTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        this.mTextColorInverse = taSelectionTextColor.getColor(0, Color.WHITE)
+        taSelectionTextColor.recycle()
    }

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

        notifyChangeSort(
@@ -127,6 +153,8 @@ class NodeAdapter (private val context: 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)

@@ -138,6 +166,8 @@ class NodeAdapter (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))
    }
@@ -148,9 +178,26 @@ class NodeAdapter (private val context: Context)
        }

        override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
-            return oldItem.type == newItem.type
+            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
                    && oldItem.title == newItem.title
                    && oldItem.icon == newItem.icon
+                    && oldItem.isCurrentlyExpires == newItem.isCurrentlyExpires
        }

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

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

    override fun getItemViewType(position: Int): Int {
@@ -282,8 +333,10 @@ class NodeAdapter (private val context: Context)
            mInflater.inflate(R.layout.item_list_nodes_entry, parent, false)
        }
        val nodeViewHolder = NodeViewHolder(view)
-        mInfoTextDefaultDimension = nodeViewHolder.text.textSize
-        mSubtextDefaultDimension = nodeViewHolder.subText.textSize
+        mTextDefaultDimension = nodeViewHolder.text.textSize
+        mSubTextDefaultDimension = nodeViewHolder.subText?.textSize ?: mSubTextDefaultDimension
+        mMetaTextDefaultDimension = nodeViewHolder.meta.textSize
+        mOtpTokenTextDefaultDimension = nodeViewHolder.otpToken?.textSize ?: mOtpTokenTextDefaultDimension
        nodeViewHolder.numberChildren?.let {
            mNumberChildrenTextDefaultDimension = it.textSize
        }
@@ -294,18 +347,20 @@ class NodeAdapter (private val context: Context)
        val subNode = mNodeSortedList.get(position)

        // Node selection
-        holder.container.isSelected = mActionNodesList.contains(subNode)
+        holder.container.apply {
+            isSelected = mActionNodesList.contains(subNode)
+        }

        // Assign image
        val iconColor = if (holder.container.isSelected)
            mContentSelectionColor
        else when (subNode.type) {
-            Type.GROUP -> mIconGroupColor
-            Type.ENTRY -> mIconEntryColor
+            Type.GROUP -> mTextColorPrimary
+            Type.ENTRY -> mTextColor
        }
        holder.imageIdentifier?.setColorFilter(iconColor)
        holder.icon.apply {
-            assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor)
+            database.iconDrawableFactory.assignDatabaseIcon(this, subNode.icon, iconColor)
            // Relative size of the icon
            layoutParams?.apply {
                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
@@ -316,35 +371,116 @@ class NodeAdapter (private val context: Context)
        // Assign text
        holder.text.apply {
            text = subNode.title
-            setTextSize(mTextSizeUnit, mInfoTextDefaultDimension, mPrefSizeMultiplier)
+            setTextSize(mTextSizeUnit, mTextDefaultDimension, mPrefSizeMultiplier)
            strikeOut(subNode.isCurrentlyExpires)
        }
-        // Add subText with username
-        holder.subText.apply {
-            text = ""
-            strikeOut(subNode.isCurrentlyExpires)
-            visibility = View.GONE
+        // 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
        }

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

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

+            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

-            mDatabase.stopManageEntry(entry)
+            // Assign colors
+            val backgroundColor = entry.backgroundColor
+            if (!holder.container.isSelected) {
+                if (backgroundColor != null) {
+                    holder.container.setBackgroundColor(backgroundColor)
+                } else {
+                    holder.container.setBackgroundColor(Color.TRANSPARENT)
+                }
+            } else {
+                holder.container.setBackgroundColor(mColorAccentLight)
+            }
+            val foregroundColor = entry.foregroundColor
+            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)
+                    holder.icon.apply {
+                        database.iconDrawableFactory.assignDatabaseIcon(
+                            this,
+                            subNode.icon,
+                            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(mTextColorInverse)
+                holder.subText?.setTextColor(mTextColorInverse)
+                holder.otpToken?.setTextColor(mTextColorInverse)
+                holder.otpProgress?.setIndicatorColor(mTextColorInverse)
+                holder.attachmentIcon?.setColorFilter(mTextColorInverse)
+                holder.meta.setTextColor(mTextColorInverse)
+            }
+
+            database.stopManageEntry(entry)
        }

        // Add number of entries in groups
@@ -352,7 +488,7 @@ class NodeAdapter (private val context: Context)
            if (mShowNumberEntries) {
                holder.numberChildren?.apply {
                    text = (subNode as Group)
-                            .getNumberOfChildEntries(mEntryFilters)
+                            .numberOfChildEntries
                            .toString()
                    setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                    visibility = View.VISIBLE
@@ -364,13 +500,60 @@ class NodeAdapter (private val context: Context)

        // Assign click
        holder.container.setOnClickListener {
-            mNodeClickCallback?.onNodeClick(subNode)
+            mNodeClickCallback?.onNodeClick(database, subNode)
        }
        holder.container.setOnLongClickListener {
-            mNodeClickCallback?.onNodeLongClick(subNode) ?: false
+            mNodeClickCallback?.onNodeLongClick(database, 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()
    }
@@ -386,8 +569,8 @@ class NodeAdapter (private val context: Context)
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickCallback {
-        fun onNodeClick(node: Node)
-        fun onNodeLongClick(node: Node): Boolean
+        fun onNodeClick(database: Database, node: Node)
+        fun onNodeLongClick(database: Database, node: Node): Boolean
    }

    class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -395,12 +578,18 @@ class NodeAdapter (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 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 numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
        var attachmentIcon: ImageView? = itemView.findViewById(R.id.node_attachment_icon)
    }

    companion object {
-        private val TAG = NodeAdapter::class.java.name
+        private val TAG = NodesAdapter::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
@@ -36,7 +36,6 @@ 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.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.strikeOut

@@ -81,10 +80,9 @@ class SearchEntryCursorAdapter(private val context: Context,
            val viewHolder = view.tag as ViewHolder

            // Assign image
-            viewHolder.imageViewIcon?.assignDatabaseIcon(
-                    database.drawFactory,
-                    currentEntry.icon,
-                    iconColor)
+            viewHolder.imageViewIcon?.let { iconView ->
+                database.iconDrawableFactory.assignDatabaseIcon(iconView, currentEntry.icon, iconColor)
+            }

            // Assign title
            viewHolder.textViewTitle?.apply {
@@ -108,14 +106,26 @@ class SearchEntryCursorAdapter(private val context: Context,

    private fun getEntryFrom(cursor: Cursor): Entry? {
        return database.createEntry()?.apply {
-            database.startManageEntry(this)
            entryKDB?.let { entryKDB ->
-                (cursor as EntryCursorKDB).populateEntry(entryKDB, database.iconFactory)
+                (cursor as EntryCursorKDB).populateEntry(entryKDB,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
            }
            entryKDBX?.let { entryKDBX ->
-                (cursor as EntryCursorKDBX).populateEntry(entryKDBX, database.iconFactory)
+                (cursor as EntryCursorKDBX).populateEntry(entryKDBX,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
            }
-            database.stopManageEntry(this)
        }
    }

@@ -138,12 +148,14 @@ class SearchEntryCursorAdapter(private val context: Context,
        if (searchGroup != null) {
            // Search in hide entries but not meta-stream
            for (entry in searchGroup.getFilteredChildEntries(Group.ChildFilter.getDefaults(context))) {
+                database.startManageEntry(entry)
                entry.entryKDB?.let {
                    cursorKDB?.addEntry(it)
                }
                entry.entryKDBX?.let {
                    cursorKDBX?.addEntry(it)
                }
+                database.stopManageEntry(entry)
            }
        }

--- a/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
@@ -0,0 +1,70 @@
+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.Database
+import com.kunzisoft.keepass.database.element.template.Template
+import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+
+
+class TemplatesSelectorAdapter(private val context: Context,
+                               private var templates: List<Template>): BaseAdapter() {
+
+    var iconDrawableFactory: IconDrawableFactory? = null
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private var mIconColor = Color.BLACK
+
+    init {
+        val taIconColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        mIconColor = taIconColor.getColor(0, Color.BLACK)
+        taIconColor.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.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.icon?.let { icon ->
+            iconDrawableFactory?.assignDatabaseIcon(icon, template.icon, mIconColor)
+        }
+        holder.name?.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 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,20 +21,13 @@ 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.init(this)
+        Stylish.load(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,10 @@
 */
 package com.kunzisoft.keepass.app.database

-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
+import android.content.*
 import android.net.Uri
 import android.os.IBinder
+import android.util.Log
 import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
@@ -41,62 +39,95 @@ 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<DatabaseListener>()
+    private var mDatabaseListeners = LinkedList<CipherDatabaseListener>()
+    private var mAdvancedUnlockBroadcastReceiver = AdvancedUnlockNotificationService.AdvancedUnlockReceiver {
+        deleteAll()
+        removeAllDataAndDetach()
+    }

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

    @Synchronized
-    private fun attachService(performedAction: () -> Unit) {
-        // Check if a service is currently running else do nothing
-        if (mBinder != null) {
+    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()
-        } 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)
-            }
        }
    }

-    fun registerDatabaseListener(listener: DatabaseListener) {
-        mDatabaseListeners.add(listener)
+    @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)
+            performedAction.invoke()
+        }
    }

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

-    interface DatabaseListener {
-        fun onDatabaseCleared()
+    private fun removeAllDataAndDetach() {
+        detachService()
+        onClear()
+    }
+
+    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()
    }

    fun getCipherDatabase(databaseUri: Uri,
                          cipherDatabaseResultListener: (CipherDatabaseEntity?) -> Unit) {
        if (useTempDao) {
-            attachService {
+            serviceActionTask {
                cipherDatabaseResultListener.invoke(mBinder?.getCipherDatabase(databaseUri))
            }
        } else {
@@ -121,7 +152,8 @@ class CipherDatabaseAction(context: Context) {
    fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
                                  cipherDatabaseResultListener: (() -> Unit)? = null) {
        if (useTempDao) {
-            attachService {
+            // The only case to create service (not needed to get an info)
+            serviceActionTask(true) {
                mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
                cipherDatabaseResultListener?.invoke()
            }
@@ -146,7 +178,7 @@ class CipherDatabaseAction(context: Context) {
    fun deleteByDatabaseUri(databaseUri: Uri,
                            cipherDatabaseResultListener: (() -> Unit)? = null) {
        if (useTempDao) {
-            attachService {
+            serviceActionTask {
                mBinder?.deleteByDatabaseUri(databaseUri)
                cipherDatabaseResultListener?.invoke()
            }
@@ -163,15 +195,22 @@ class CipherDatabaseAction(context: Context) {
    }

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

-    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction)
+    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction) {
+        private val TAG = CipherDatabaseAction::class.java.name
+    }
 }
--- 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,26 +189,36 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
        ).execute()
    }

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

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

-    fun deleteAll() {
+    fun deleteAll(result: (() ->Unit)? = null) {
        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 inlineSuggestionsRequest: InlineSuggestionsRequest?)
+                             val compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest?)
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
@@ -34,33 +34,35 @@ 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.icons.assignDatabaseIcon
-import com.kunzisoft.keepass.icons.createIconFromDatabaseIcon
+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
-    const val EXTRA_INLINE_SUGGESTIONS_REQUEST = "com.kunzisoft.keepass.autofill.INLINE_SUGGESTIONS_REQUEST"
+    private 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 ->
@@ -86,81 +88,224 @@ object AutofillHelper {
        return ""
    }

+    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,
+                        remoteViewsIcon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
+                    presentation.setImageViewBitmap(R.id.autofill_entry_icon, bitmap)
+                }
+            } catch (e: Exception) {
+                Log.e(RemoteViews::class.java.name, "Unable to assign icon in remote view", e)
+            }
+        }
+        return presentation
+    }
+
    private fun buildDataset(context: Context,
-                              entryInfo: EntryInfo,
-                              struct: StructureParser.Result,
-                              inlinePresentation: InlinePresentation?): Dataset? {
+                             database: Database,
+                             entryInfo: EntryInfo,
+                             struct: StructureParser.Result,
+                             additionalBuild: ((build: Dataset.Builder) -> Unit)? = null): Dataset? {
        val title = makeEntryTitle(entryInfo)
-        val views = newRemoteViews(context, title, entryInfo.icon)
+        val views = newRemoteViews(context, database, title, entryInfo.icon)
        val builder = Dataset.Builder(views)
-        builder.setId(entryInfo.id)
+        builder.setId(entryInfo.id.toString())

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

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            inlinePresentation?.let {
-                builder.setInlinePresentation(it)
+        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))
+                    }
+                }
+            }
+        }
+        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: IllegalArgumentException) {
-            // if not value be set
+        } catch (e: Exception) {
+            // at least one value must be set
            null
        }
    }

+    /**
+     * Method to assign a drawable to a new icon from a database icon
+     */
+    private fun buildIconFromEntry(context: Context,
+                                   database: Database,
+                                   entryInfo: EntryInfo): Icon? {
+        try {
+            database.iconDrawableFactory.getBitmapFromIcon(context,
+                    entryInfo.icon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
+                return Icon.createWithBitmap(bitmap)
+            }
+        } catch (e: Exception) {
+            Log.e(RemoteViews::class.java.name, "Unable to assign icon in remote view", e)
+        }
+        return null
+    }
+
    @RequiresApi(Build.VERSION_CODES.R)
    @SuppressLint("RestrictedApi")
    private fun buildInlinePresentationForEntry(context: Context,
-                                                inlineSuggestionsRequest: InlineSuggestionsRequest,
+                                                database: Database,
+                                                compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest,
                                                positionItem: Int,
                                                entryInfo: EntryInfo): InlinePresentation? {
-        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
-        val maxSuggestion = inlineSuggestionsRequest.maxSuggestionCount
+        compatInlineSuggestionsRequest.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
+            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),
-                    0)
-            return InlinePresentation(
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        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, entryInfo)?.let { icon ->
+                        setStartIcon(
+                            Icon.createWithResource(context, R.mipmap.ic_launcher_round).apply {
+                                setTintBlendMode(BlendMode.DST)
+                            })
+                        buildIconFromEntry(context, database, 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,
-                      inlineSuggestionsRequest: InlineSuggestionsRequest?): FillResponse {
+                      compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest?): FillResponse? {
        val responseBuilder = FillResponse.Builder()
        // Add Header
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@@ -177,31 +322,90 @@ object AutofillHelper {
                }
            }
        }
+
        // Add inline suggestion for new IME and dataset
-        entriesInfo.forEachIndexed { index, entryInfo ->
-            val inlinePresentation = inlineSuggestionsRequest?.let {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    buildInlinePresentationForEntry(context, inlineSuggestionsRequest, index, entryInfo)
-                } else {
-                    null
+        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
+                    }
                }
            }
-            responseBuilder.addDataset(buildDataset(context, entryInfo, parseResult, inlinePresentation))
+
+        }
+
+        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
        }
-        return responseBuilder.build()
    }

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

    /**
     * Build the Autofill response for many entry
     */
-    fun buildResponseAndSetResult(activity: Activity, entriesInfo: List<EntryInfo>) {
+    fun buildResponseAndSetResult(activity: Activity,
+                                  database: Database,
+                                  entriesInfo: List<EntryInfo>) {
        if (entriesInfo.isEmpty()) {
            activity.setResult(Activity.RESULT_CANCELED)
        } else {
@@ -210,13 +414,13 @@ object AutofillHelper {
                StructureParser(structure).parse()?.let { result ->
                    // New Response
                    val response = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                        val inlineSuggestionsRequest = activity.intent?.getParcelableExtra<InlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
-                        if (inlineSuggestionsRequest != null) {
+                        val compatInlineSuggestionsRequest = activity.intent?.getParcelableExtra<CompatInlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
+                        if (compatInlineSuggestionsRequest != null) {
                            Toast.makeText(activity.applicationContext, R.string.autofill_inline_suggestions_keyboard, Toast.LENGTH_SHORT).show()
                        }
-                        buildResponse(activity, entriesInfo, result, inlineSuggestionsRequest)
+                        buildResponse(activity, database, entriesInfo, result, compatInlineSuggestionsRequest)
                    } else {
-                        buildResponse(activity, entriesInfo, result, null)
+                        buildResponse(activity, database, entriesInfo, result, null)
                    }
                    val mReplyIntent = Intent()
                    Log.d(activity.javaClass.name, "Successed Autofill auth.")
@@ -234,59 +438,44 @@ 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: Activity,
+    fun startActivityForAutofillResult(activity: AppCompatActivity,
                                       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.inlineSuggestionsRequest?.let {
+            autofillComponent.compatInlineSuggestionsRequest?.let {
                intent.putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
            }
        }
        EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
-        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()
-        }
-    }
-
-    private fun newRemoteViews(context: Context,
-                               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) {
-            presentation.assignDatabaseIcon(context,
-                    R.id.autofill_entry_icon,
-                    Database.getInstance().drawFactory,
-                    remoteViewsIcon,
-                    ContextCompat.getColor(context, R.color.green))
-        }
-        return presentation
-    }
-
-    private fun buildIconFromEntry(context: Context, entryInfo: EntryInfo): Icon? {
-        return createIconFromDatabaseIcon(context,
-                Database.getInstance().drawFactory,
-                entryInfo.icon,
-                ContextCompat.getColor(context, R.color.green))
+        activityResultLauncher?.launch(intent)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/CompatInlineSuggestionsRequest.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/CompatInlineSuggestionsRequest.kt
@@ -0,0 +1,83 @@
+/*
+ * 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
@@ -19,6 +19,7 @@
 */
 package com.kunzisoft.keepass.autofill

+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.graphics.BlendMode
@@ -35,29 +36,47 @@ 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() {

-    var applicationIdBlocklist: Set<String>? = null
-    var webDomainBlocklist: Set<String>? = null
-    var askToSaveData: Boolean = false
-    var autofillInlineSuggestionsEnabled: Boolean = false
+    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
    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)
@@ -90,11 +109,12 @@ class KeeAutofillService : AutofillService() {
                        searchInfo.webDomain = webDomainWithoutSubDomain
                        val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                                && autofillInlineSuggestionsEnabled) {
-                            request.inlineSuggestionsRequest
+                            CompatInlineSuggestionsRequest(request)
                        } else {
                            null
                        }
-                        launchSelection(searchInfo,
+                        launchSelection(mDatabase,
+                                searchInfo,
                                parseResult,
                                inlineSuggestionsRequest,
                                callback)
@@ -104,72 +124,124 @@ class KeeAutofillService : AutofillService() {
        }
    }

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

+    @SuppressLint("RestrictedApi")
    private fun showUIForEntrySelection(parseResult: StructureParser.Result,
+                                        database: Database?,
                                        searchInfo: SearchInfo,
-                                        inlineSuggestionsRequest: InlineSuggestionsRequest?,
+                                        inlineSuggestionsRequest: CompatInlineSuggestionsRequest?,
                                        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.getAuthIntentSenderForSelection(this,
-                        searchInfo, inlineSuggestionsRequest)
+                val intentSender = AutofillLauncherActivity.getPendingIntentForSelection(this,
+                        searchInfo, inlineSuggestionsRequest).intentSender
                val responseBuilder = FillResponse.Builder()
-                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)
+                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)
                    }
                } else {
-                    RemoteViews(packageName, R.layout.item_autofill_unlock)
+                    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)
+                    }
                }

-                // Tell to service the interest to save credentials
+                // Tell the autofill framework the interest to save credentials
                if (askToSaveData) {
                    var types: Int = SaveInfo.SAVE_DATA_TYPE_GENERIC
-                    val info = ArrayList<AutofillId>()
+                    val requiredIds = ArrayList<AutofillId>()
+                    val optionalIds = ArrayList<AutofillId>()
+
                    // Only if at least a password
                    parseResult.passwordId?.let { passwordInfo ->
                        parseResult.usernameId?.let { usernameInfo ->
                            types = types or SaveInfo.SAVE_DATA_TYPE_USERNAME
-                            info.add(usernameInfo)
+                            requiredIds.add(usernameInfo)
                        }
                        types = types or SaveInfo.SAVE_DATA_TYPE_PASSWORD
-                        info.add(passwordInfo)
+                        requiredIds.add(passwordInfo)
                    }
-                    if (info.isNotEmpty()) {
-                        responseBuilder.setSaveInfo(
-                                SaveInfo.Builder(types, info.toTypedArray()).build()
-                        )
+                    // 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())
                    }
                }

@@ -177,7 +249,7 @@ class KeeAutofillService : AutofillService() {
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                        && autofillInlineSuggestionsEnabled) {
                    var inlinePresentation: InlinePresentation? = null
-                    inlineSuggestionsRequest?.let {
+                    inlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
                        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
                        if (inlineSuggestionsRequest.maxSuggestionCount > 0
                                && inlinePresentationSpecs.size > 0) {
@@ -190,9 +262,13 @@ class KeeAutofillService : AutofillService() {
                                inlinePresentation = InlinePresentation(
                                        InlineSuggestionUi.newContentBuilder(
                                                PendingIntent.getActivity(this,
-                                                        0,
-                                                        Intent(this, AutofillSettingsActivity::class.java),
-                                                        0)
+                                                    0,
+                                                    Intent(this, AutofillSettingsActivity::class.java),
+                                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                                        PendingIntent.FLAG_IMMUTABLE
+                                                    } else {
+                                                        0
+                                                    })
                                        ).apply {
                                            setContentDescription(getString(R.string.autofill_sign_in_prompt))
                                            setTitle(getString(R.string.autofill_sign_in_prompt))
@@ -205,8 +281,9 @@ 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())
            }
        }
@@ -221,14 +298,35 @@ 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())
+                            parseResult.passwordValue?.textValue?.toString(),
+                            CreditCard(
+                                parseResult.creditCardHolder,
+                                parseResult.creditCardNumber,
+                                expiration,
+                                parseResult.cardVerificationValue
+                            ))
+
                    // 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,12 +21,14 @@ 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


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

    fun parse(saveValue: Boolean = false): Result? {
@@ -46,37 +46,42 @@ class StructureParser(private val structure: AssistStructure) {
            result = Result()
            result?.apply {
                allowSaveValues = saveValue
-                usernameCandidate = null
+                usernameIdCandidate = 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 (parseViewNode(windowNode.rootViewNode))
-                        break@mainLoop
+                    if (applicationId?.contains("PopupWindow:") == false) {
+                        if (parseViewNode(windowNode.rootViewNode))
+                            break@mainLoop
+                    }
                }
                // If not explicit username field found, add the field just before password field.
-                if (usernameId == null && passwordId != null && usernameCandidate != null) {
-                    usernameId = usernameCandidate
+                if (usernameId == null && passwordId != null && usernameIdCandidate != null) {
+                    usernameId = usernameIdCandidate
                    if (allowSaveValues) {
                        usernameValue = usernameValueCandidate
                    }
                }
            }

-            // Return the result only if password field is retrieved
-            return if ((!usernameNeeded || result?.usernameId != null)
-                    && result?.passwordId != null)
-                result
-            else
-                null
+            return if (result?.passwordId != null || result?.creditCardNumberId != 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()) {
@@ -97,8 +102,7 @@ class StructureParser(private val structure: AssistStructure) {
        var returnValue = false
        // Only parse visible nodes
        if (node.visibility == View.VISIBLE) {
-            if (node.autofillId != null
-                    && node.autofillType == View.AUTOFILL_TYPE_TEXT) {
+            if (node.autofillId != null) {
                // Parse methods
                val hints = node.autofillHints
                if (hints != null && hints.isNotEmpty()) {
@@ -130,7 +134,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")
@@ -139,14 +143,123 @@ 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)
                }
@@ -159,19 +272,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?.toLowerCase(Locale.ENGLISH)) {
+        when (nodHtml?.tag?.lowercase(Locale.ENGLISH)) {
            "input" -> {
                nodHtml.attributes?.forEach { pairAttribute ->
-                    when (pairAttribute.first.toLowerCase(Locale.ENGLISH)) {
+                    when (pairAttribute.first.lowercase(Locale.ENGLISH)) {
                        "type" -> {
-                            when (pairAttribute.second.toLowerCase(Locale.ENGLISH)) {
+                            when (pairAttribute.second.lowercase(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" -> {
-                                    usernameCandidate = autofillId
+                                    usernameIdCandidate = autofillId
                                    usernameValueCandidate = node.autofillValue
                                    Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                }
@@ -219,18 +332,30 @@ class StructureParser(private val structure: AssistStructure) {
                            InputType.TYPE_TEXT_VARIATION_NORMAL,
                            InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
                            InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
-                        usernameCandidate = autofillId
+                        usernameIdCandidate = 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,
@@ -252,16 +377,15 @@ class StructureParser(private val structure: AssistStructure) {
                when {
                    inputIsVariationType(inputType,
                            InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
-                        usernameCandidate = autofillId
+                        usernameIdCandidate = autofillId
                        usernameValueCandidate = node.autofillValue
-                        Log.d(TAG, "Autofill usernale candidate android number type: ${showHexInputType(inputType)}")
+                        Log.d(TAG, "Autofill username 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 -> {
@@ -275,8 +399,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)
@@ -289,6 +413,12 @@ 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)
@@ -301,6 +431,48 @@ 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 {
@@ -309,6 +481,15 @@ 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()
        }

@@ -326,6 +507,52 @@ 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,6 +19,7 @@
 */
 package com.kunzisoft.keepass.biometric

+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -27,18 +28,23 @@ 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.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 {

@@ -57,9 +63,12 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    /**
     * Manage setting to auto open biometric prompt
     */
-    private var mAutoOpenPrompt: Boolean = false
+    private var mAutoOpenPrompt: Boolean
        get() {
-            return field && mAutoOpenPromptEnabled
+            return mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt && mAutoOpenPromptEnabled
+        }
+        set(value) {
+            mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = value
        }

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

    private lateinit var cipherDatabaseAction : CipherDatabaseAction

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

    // Only to fix multiple fingerprint menu #332
    private var mAllowAdvancedUnlockMenu = false
@@ -77,6 +88,15 @@ 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)

@@ -95,10 +115,21 @@ 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? {
@@ -112,21 +143,12 @@ 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()
-        mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(requireContext())
-        mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(requireContext())
+        context?.let {
+            mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(it)
+            mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(it)
+        }
        keepConnection = false
    }

@@ -150,60 +172,68 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        return super.onOptionsItemSelected(item)
    }

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

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

-                // 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)
+                    // 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 {
-                        selectMode()
+                        // 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 {
+                        toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
                    }
-                }
-            } else if (PreferencesUtil.isDeviceCredentialUnlockEnable(requireContext())) {
-                mAdvancedUnlockInfoView?.setIconResource(R.drawable.bolt)
-                if (AdvancedUnlockManager.isDeviceSecure(requireContext())) {
-                    selectMode()
-                } else {
-                    toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
                }
            }
        }
@@ -261,7 +291,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    private fun openBiometricSetting() {
        mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
            // ACTION_SECURITY_SETTINGS does not contain fingerprint enrollment on some devices...
-            requireContext().startActivity(Intent(Settings.ACTION_SETTINGS))
+            context?.startActivity(Intent(Settings.ACTION_SETTINGS))
        }
    }

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

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

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

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

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

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

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

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

+    @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)
@@ -521,7 +557,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    }

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

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

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

    private fun setAdvancedUnlockedMessageView(text: CharSequence) {
-        activity?.runOnUiThread {
+        lifecycleScope.launch(Dispatchers.Main) {
            mAdvancedUnlockInfoView?.message = text
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
@@ -19,15 +19,18 @@
 */
 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.*
@@ -35,6 +38,7 @@ 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
@@ -136,18 +140,24 @@ 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)
+                                    ADVANCED_UNLOCK_KEYSTORE_KEY,
+                                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+                                    .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                                    .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
+                                    .apply {
                                        // 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
-                                        .apply {
-                                            if (biometricUnlockEnable) {
-                                                setUserAuthenticationRequired(true)
-                                            }
+                                        if (biometricUnlockEnable) {
+                                            setUserAuthenticationRequired(true)
                                        }
-                                        .build())
+                                        // 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())
                        keyGenerator?.generateKey()
                    }
                } catch (e: Exception) {
@@ -164,8 +174,12 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        return null
    }

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

-    fun initDecryptData(ivSpecValue: String, actionIfCypherInit
-                        : (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
+    fun initDecryptData(ivSpecValue: String,
+                        actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
+        initDecryptData(ivSpecValue, actionIfCypherInit, true)
+    }
+
+    private fun initDecryptData(ivSpecValue: String,
+                        actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
+                        firstLaunch: Boolean = true) {
        if (!isKeyManagerInitialized) {
            return
        }
@@ -239,10 +264,20 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
            }
        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
            Log.e(TAG, "Unable to initialize decrypt data", unrecoverableKeyException)
-            deleteKeystoreKey()
+            if (firstLaunch) {
+                deleteKeystoreKey()
+                initDecryptData(ivSpecValue, actionIfCypherInit, firstLaunch)
+            } else {
+                advancedUnlockCallback?.onUnrecoverableKeyException(unrecoverableKeyException)
+            }
        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
-            advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
+            if (firstLaunch) {
+                deleteAllEntryKeysInKeystoreForBiometric(retrieveContext())
+                initDecryptData(ivSpecValue, actionIfCypherInit, firstLaunch)
+            } else {
+                advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
+            }
        } catch (e: Exception) {
            Log.e(TAG, "Unable to initialize decrypt data", e)
            advancedUnlockCallback?.onGenericException(e)
@@ -278,9 +313,9 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        }
    }

-    @Suppress("DEPRECATION")
-    @Synchronized
-    fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt) {
+    fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt,
+                                 deviceCredentialResultLauncher: ActivityResultLauncher<Intent>
+    ) {
        // Init advanced unlock prompt
        if (biometricPrompt == null) {
            biometricPrompt = BiometricPrompt(retrieveContext(),
@@ -311,20 +346,10 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
        }
        else if (cryptoPrompt.isDeviceCredentialOperation) {
            val keyGuardManager = ContextCompat.getSystemService(retrieveContext(), KeyguardManager::class.java)
-            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()
-            }
+            @Suppress("DEPRECATION")
+            deviceCredentialResultLauncher.launch(
+                keyGuardManager?.createConfirmDeviceCredentialIntent(promptTitle, promptDescription)
+            )
        }
    }

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

    interface AdvancedUnlockErrorCallback {
+        fun onUnrecoverableKeyException(e: Exception)
        fun onInvalidKeyException(e: Exception)
        fun onGenericException(e: Exception)
    }
@@ -355,8 +381,6 @@ 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 {
@@ -449,6 +473,10 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)

                    override fun handleDecryptedResult(decryptedValue: String) {}

+                    override fun onUnrecoverableKeyException(e: Exception) {
+                        advancedCallback.onUnrecoverableKeyException(e)
+                    }
+
                    override fun onInvalidKeyException(e: Exception) {
                        advancedCallback.onInvalidKeyException(e)
                    }
@@ -460,6 +488,33 @@ 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/crypto/CipherFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.kt
@@ -1,79 +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.crypto
-
-import android.os.Build
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.crypto.engine.ChaCha20Engine
-import com.kunzisoft.keepass.crypto.engine.CipherEngine
-import com.kunzisoft.keepass.crypto.engine.TwofishEngine
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.NoSuchAlgorithmException
-import java.security.Security
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-
-object CipherFactory {
-
-    private var blacklistInit = false
-    private var blacklisted: Boolean = false
-
-    init {
-        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME)
-        Security.addProvider(BouncyCastleProvider())
-    }
-
-    fun deviceBlacklisted(): Boolean {
-        if (!blacklistInit) {
-            blacklistInit = true
-            // The Acer Iconia A500 is special and seems to always crash in the native crypto libraries
-            blacklisted = Build.MODEL == "A500"
-        }
-        return blacklisted
-    }
-
-    private fun hasNativeImplementation(transformation: String): Boolean {
-        return transformation == "AES/CBC/PKCS5Padding"
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
-    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
-        // Return the native AES if it is possible
-        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
-            Cipher.getInstance(transformation, AESProvider())
-        } else {
-            Cipher.getInstance(transformation)
-        }
-    }
-
-    /**
-     * Generate appropriate cipher based on KeePass 2.x UUID's
-     */
-    @Throws(NoSuchAlgorithmException::class)
-    fun getInstance(uuid: UUID): CipherEngine {
-        return when (uuid) {
-            AesEngine.CIPHER_UUID -> AesEngine()
-            TwofishEngine.CIPHER_UUID -> TwofishEngine()
-            ChaCha20Engine.CIPHER_UUID -> ChaCha20Engine()
-            else -> throw NoSuchAlgorithmException("UUID unrecognized.")
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt
@@ -1,105 +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.crypto
-
-import com.kunzisoft.keepass.stream.NullOutputStream
-import com.kunzisoft.keepass.stream.longTo8Bytes
-import java.io.IOException
-import java.security.DigestOutputStream
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Mac
-import kotlin.math.min
-
-object CryptoUtil {
-
-    fun resizeKey(inBytes: ByteArray, inOffset: Int, cbIn: Int, cbOut: Int): ByteArray {
-        if (cbOut == 0) return ByteArray(0)
-
-        val hash: ByteArray = if (cbOut <= 32) {
-            hashSha256(inBytes, inOffset, cbIn)
-        } else {
-            hashSha512(inBytes, inOffset, cbIn)
-        }
-
-        if (cbOut == hash.size) {
-            return hash
-        }
-
-        val ret = ByteArray(cbOut)
-        if (cbOut < hash.size) {
-            System.arraycopy(hash, 0, ret, 0, cbOut)
-        } else {
-            var pos = 0
-            var r: Long = 0
-            while (pos < cbOut) {
-                val hmac: Mac
-                try {
-                    hmac = Mac.getInstance("HmacSHA256")
-                } catch (e: NoSuchAlgorithmException) {
-                    throw RuntimeException(e)
-                }
-
-                val pbR = longTo8Bytes(r)
-                val part = hmac.doFinal(pbR)
-
-                val copy = min(cbOut - pos, part.size)
-                System.arraycopy(part, 0, ret, pos, copy)
-                pos += copy
-                r++
-
-                Arrays.fill(part, 0.toByte())
-            }
-        }
-
-        Arrays.fill(hash, 0.toByte())
-        return ret
-    }
-
-    fun hashSha256(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
-        return hashGen("SHA-256", data, offset, count)
-    }
-
-    fun hashSha512(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
-        return hashGen("SHA-512", data, offset, count)
-    }
-
-    private fun hashGen(transform: String, data: ByteArray, offset: Int, count: Int): ByteArray {
-        val hash: MessageDigest
-        try {
-            hash = MessageDigest.getInstance(transform)
-        } catch (e: NoSuchAlgorithmException) {
-            throw RuntimeException(e)
-        }
-
-        val nos = NullOutputStream()
-        val dos = DigestOutputStream(nos, hash)
-
-        try {
-            dos.write(data, offset, count)
-            dos.close()
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-
-        return hash.digest()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt
@@ -1,71 +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.crypto
-
-import org.bouncycastle.crypto.StreamCipher
-import org.bouncycastle.crypto.engines.ChaCha7539Engine
-import org.bouncycastle.crypto.engines.Salsa20Engine
-import org.bouncycastle.crypto.params.KeyParameter
-import org.bouncycastle.crypto.params.ParametersWithIV
-
-object StreamCipherFactory {
-
-    private val SALSA_IV = byteArrayOf(0xE8.toByte(), 0x30, 0x09, 0x4B, 0x97.toByte(), 0x20, 0x5D, 0x2A)
-
-    @Throws(Exception::class)
-    fun getInstance(alg: CrsAlgorithm?, key: ByteArray): StreamCipher {
-        return when {
-            alg === CrsAlgorithm.Salsa20 -> getSalsa20(key)
-            alg === CrsAlgorithm.ChaCha20 -> getChaCha20(key)
-            else -> throw Exception("Invalid random cipher")
-        }
-    }
-
-    private fun getSalsa20(key: ByteArray): StreamCipher {
-        // Build stream cipher key
-        val key32 = CryptoUtil.hashSha256(key)
-
-        val keyParam = KeyParameter(key32)
-        val ivParam = ParametersWithIV(keyParam, SALSA_IV)
-
-        val cipher = Salsa20Engine()
-        cipher.init(true, ivParam)
-
-        return cipher
-    }
-
-    private fun getChaCha20(key: ByteArray): StreamCipher {
-        // Build stream cipher key
-        val hash = CryptoUtil.hashSha512(key)
-        val key32 = ByteArray(32)
-        val iv = ByteArray(12)
-
-        System.arraycopy(hash, 0, key32, 0, 32)
-        System.arraycopy(hash, 32, iv, 0, 12)
-
-        val keyParam = KeyParameter(key32)
-        val ivParam = ParametersWithIV(keyParam, iv)
-
-        val cipher = ChaCha7539Engine()
-        cipher.init(true, ivParam)
-
-        return cipher
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt
@@ -1,68 +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.crypto.engine
-
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class AesEngine : CipherEngine() {
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
-        val cipher = CipherFactory.getInstance("AES/CBC/PKCS5Padding", androidOverride)
-        cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
-        return cipher
-    }
-
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.AESRijndael
-    }
-
-    companion object {
-
-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0x31.toByte(),
-                        0xC1.toByte(),
-                        0xF2.toByte(),
-                        0xE6.toByte(),
-                        0xBF.toByte(),
-                        0x71.toByte(),
-                        0x43.toByte(),
-                        0x50.toByte(),
-                        0xBE.toByte(),
-                        0x58.toByte(),
-                        0x05.toByte(),
-                        0x21.toByte(),
-                        0x6A.toByte(),
-                        0xFC.toByte(),
-                        0x5A.toByte(),
-                        0xFF.toByte()))
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt
@@ -1,72 +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.crypto.engine
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class TwofishEngine : CipherEngine() {
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
-        val cipher: Cipher = if (opmode == Cipher.ENCRYPT_MODE) {
-            CipherFactory.getInstance("Twofish/CBC/ZeroBytePadding", androidOverride)
-        } else {
-            CipherFactory.getInstance("Twofish/CBC/NoPadding", androidOverride)
-        }
-        cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
-
-        return cipher
-    }
-
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.Twofish
-    }
-
-    companion object {
-
-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0xAD.toByte(),
-                        0x68.toByte(),
-                        0xF2.toByte(),
-                        0x9F.toByte(),
-                        0x57.toByte(),
-                        0x6F.toByte(),
-                        0x4B.toByte(),
-                        0xB9.toByte(),
-                        0xA3.toByte(),
-                        0x6A.toByte(),
-                        0xD4.toByte(),
-                        0x7A.toByte(),
-                        0xF9.toByte(),
-                        0x65.toByte(),
-                        0x34.toByte(),
-                        0x6C.toByte()))
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AESKeyTransformerFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AESKeyTransformerFactory.kt
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.crypto.finalkey
-
-import com.kunzisoft.keepass.crypto.CipherFactory.deviceBlacklisted
-
-object AESKeyTransformerFactory : KeyTransformer() {
-    override fun transformMasterKey(seed: ByteArray?, key: ByteArray?, rounds: Long?): ByteArray? {
-        // Prefer the native final key implementation
-        val keyTransformer = if (!deviceBlacklisted()
-                && NativeAESKeyTransformer.available()) {
-            NativeAESKeyTransformer()
-        } else {
-            // Fall back on the android crypto implementation
-            AndroidAESKeyTransformer()
-        }
-        return keyTransformer.transformMasterKey(seed, key, rounds)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.crypto.keyDerivation;
-
-import com.kunzisoft.keepass.crypto.NativeLib;
-import com.kunzisoft.keepass.utils.UnsignedInt;
-
-import java.io.IOException;
-
-public class Argon2Native {
-
-    enum CType {
-        ARGON2_D(0),
-        ARGON2_I(1),
-        ARGON2_ID(2);
-
-        int cValue = 0;
-
-        CType(int i) {
-            cValue = i;
-        }
-    }
-
-    public static byte[] transformKey(Argon2Kdf.Type type, byte[] password, byte[] salt, UnsignedInt parallelism,
-                                      UnsignedInt memory, UnsignedInt iterations, byte[] secretKey,
-                                      byte[] associatedData, UnsignedInt version) throws IOException {
-        NativeLib.INSTANCE.init();
-
-        CType cType = CType.ARGON2_D;
-        if (type.equals(Argon2Kdf.Type.ARGON2_ID))
-            cType = CType.ARGON2_ID;
-
-        return nTransformMasterKey(
-                cType.cValue,
-                password,
-                salt,
-                parallelism.toKotlinInt(),
-                memory.toKotlinInt(),
-                iterations.toKotlinInt(),
-                secretKey,
-                associatedData,
-                version.toKotlinInt());
-    }
-
-    private static native byte[] nTransformMasterKey(int type, byte[] password, byte[] salt, int parallelism,
-                                              int memory, int iterations, byte[] secretKey,
-                                              byte[] associatedData, int version) throws IOException;
-}
--- 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,13 +26,13 @@ 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)?)
    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {
@@ -41,10 +41,10 @@ class CreateDatabaseRunnable(context: Context,
        try {
            // Create new database record
            mDatabase.apply {
-                createData(mDatabaseUri, databaseName, rootName)
+                createData(mDatabaseUri, databaseName, rootName, templateGroupName)
            }
        } catch (e: Exception) {
-            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
+            mDatabase.clearAndClose(context)
            setError(e)
        }

--- 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,24 +19,29 @@
 */
 package com.kunzisoft.keepass.database.action

+import android.app.Service
 import android.content.*
-import android.content.Context.BIND_ABOVE_CLIENT
-import android.content.Context.BIND_NOT_FOREGROUND
+import android.content.Context.*
 import android.net.Uri
 import android.os.Bundle
 import android.os.IBinder
+import android.util.Log
+import android.widget.Toast
 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.crypto.keyDerivation.KdfEngine
+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.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
@@ -48,8 +53,8 @@ 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_RELOAD_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
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE
@@ -67,21 +72,35 @@ 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

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

-    var onActionFinish: ((actionTask: String,
+    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,
                          result: ActionRunnable.Result) -> Unit)? = null

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

    private var databaseTaskBroadcastReceiver: BroadcastReceiver? = null
    private var mBinder: DatabaseTaskNotificationService.ActionTaskBinder? = null
@@ -91,17 +110,31 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
    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(titleId: Int?, messageId: Int?, warningId: Int?) {
+        override fun onStartAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
            startDialog(titleId, messageId, warningId)
        }

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

-        override fun onStopAction(actionTask: String, result: ActionRunnable.Result) {
-            onActionFinish?.invoke(actionTask, result)
+        override fun onStopAction(database: Database, actionTask: String, result: ActionRunnable.Result) {
+            onActionFinish?.invoke(database, actionTask, result)
            // Remove the progress task
            stopDialog()
        }
@@ -116,31 +149,56 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
    private var databaseInfoListener = object: DatabaseTaskNotificationService.DatabaseInfoListener {
        override fun onDatabaseInfoChanged(previousDatabaseInfo: SnapFileDatabaseInfo,
                                           newDatabaseInfo: SnapFileDatabaseInfo) {
-            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)
+            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
+                        )
+                    }
+                }
            }
        }
    }

+    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) {
-        if (progressTaskDialogFragment == null) {
-            progressTaskDialogFragment = activity.supportFragmentManager
-                    .findFragmentByTag(PROGRESS_TASK_DIALOG_TAG) as ProgressTaskDialogFragment?
+        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 = ProgressTaskDialogFragment()
-            progressTaskDialogFragment?.show(activity.supportFragmentManager, PROGRESS_TASK_DIALOG_TAG)
-        }
-        updateDialog(titleId, messageId, warningId)
    }

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

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

@@ -195,7 +256,7 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
     */
    private fun unBindService() {
        serviceConnection?.let {
-            activity.unbindService(it)
+            context.unbindService(it)
        }
        serviceConnection = null
    }
@@ -223,7 +284,7 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
                }
            }
        }
-        activity.registerReceiver(databaseTaskBroadcastReceiver,
+        context.registerReceiver(databaseTaskBroadcastReceiver,
                IntentFilter().apply {
                    addAction(DATABASE_START_TASK_ACTION)
                    addAction(DATABASE_STOP_TASK_ACTION)
@@ -237,25 +298,30 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
    fun unregisterProgressTask() {
        stopDialog()

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

        unBindService()

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

    private fun start(bundle: Bundle? = null, actionTask: String) {
-        activity.stopService(intentDatabaseTask)
-        if (bundle != null)
-            intentDatabaseTask.putExtras(bundle)
-        intentDatabaseTask.action = actionTask
-        activity.startService(intentDatabaseTask)
+        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()
+        }
    }

    /*
@@ -364,9 +430,7 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
        nodesPaste.forEach { nodeVersioned ->
            when (nodeVersioned.type) {
                Type.GROUP -> {
-                    (nodeVersioned as Group).nodeId?.let { groupId ->
-                        groupsIdToCopy.add(groupId)
-                    }
+                    groupsIdToCopy.add((nodeVersioned as Group).nodeId)
                }
                Type.ENTRY -> {
                    entriesIdToCopy.add((nodeVersioned as Entry).nodeId)
@@ -409,22 +473,22 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
      -----------------
    */

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

-    fun startDatabaseDeleteEntryHistory(mainEntry: Entry,
+    fun startDatabaseDeleteEntryHistory(mainEntryId: NodeId<UUID>,
                                        entryHistoryPosition: Int,
                                        save: Boolean) {
        start(Bundle().apply {
-            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntry.nodeId)
+            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntryId)
            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
@@ -499,6 +563,28 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
                , 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) {
@@ -591,4 +677,8 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
        }
                , ACTION_DATABASE_SAVE)
    }
+
+    companion object {
+        private val TAG = DatabaseTaskProvider::class.java.name
+    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
@@ -25,6 +25,8 @@ 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.BinaryData
+import com.kunzisoft.keepass.database.element.binary.LoadedKey
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
@@ -45,7 +47,7 @@ class LoadDatabaseRunnable(private val context: Context,

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

    override fun onActionRun() {
@@ -55,7 +57,10 @@ class LoadDatabaseRunnable(private val context: Context,
                    mReadonly,
                    context.contentResolver,
                    UriUtil.getBinaryDir(context),
-                    Database.LoadedKey.generateNewCipherKey(),
+                    { memoryWanted ->
+                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                    },
+                    LoadedKey.generateNewCipherKey(),
                    mFixDuplicateUUID,
                    progressTaskUpdater)
        }
@@ -80,7 +85,7 @@ class LoadDatabaseRunnable(private val context: Context,
            // Register the current time to init the lock timer
            PreferencesUtil.saveCurrentTime(context)
        } else {
-            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
+            mDatabase.clearAndClose(context)
        }
    }

--- 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,8 @@ package com.kunzisoft.keepass.database.action

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

-    private var tempCipherKey: Database.LoadedKey? = null
+    private var tempCipherKey: LoadedKey? = null

    override fun onStartRun() {
-        tempCipherKey = mDatabase.loadedCipherKey
+        tempCipherKey = mDatabase.binaryCache.loadedCipherKey
        // Clear before we load
        mDatabase.clear(UriUtil.getBinaryDir(context))
+        mDatabase.wasReloaded = true
    }

    override fun onActionRun() {
        try {
            mDatabase.reloadData(context.contentResolver,
                    UriUtil.getBinaryDir(context),
-                    tempCipherKey ?: Database.LoadedKey.generateNewCipherKey(),
+                    { memoryWanted ->
+                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                    },
+                    tempCipherKey ?: LoadedKey.generateNewCipherKey(),
                    progressTaskUpdater)
        } catch (e: LoadDatabaseException) {
            setError(e)
@@ -56,7 +62,7 @@ class ReloadDatabaseRunnable(private val context: Context,
            PreferencesUtil.saveCurrentTime(context)
        } else {
            tempCipherKey = null
-            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
+            mDatabase.clearAndClose(context)
        }
    }

--- 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,7 +36,11 @@ abstract class ActionNodeDatabaseRunnable(
    abstract fun nodeAction()

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

--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/CopyNodesRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/CopyNodesRunnable.kt
@@ -52,16 +52,9 @@ class CopyNodesRunnable constructor(
                    if (mNewParent != database.rootGroup || database.rootCanContainsEntry()) {
                        // Update entry with new values
                        mNewParent.touch(modified = false, touchParents = true)
-
                        val entryCopied = database.copyEntryTo(currentNode as Entry, mNewParent)
-                        if (entryCopied != null) {
-                            entryCopied.touch(modified = true, touchParents = true)
-                            mEntriesCopied.add(entryCopied)
-                        } else {
-                            Log.e(TAG, "Unable to create a copy of the entry")
-                            setError(CopyEntryDatabaseException())
-                            break@foreachNode
-                        }
+                        entryCopied.touch(modified = true, touchParents = true)
+                        mEntriesCopied.add(entryCopied)
                    } else {
                        // Only finish thread
                        setError(CopyEntryDatabaseException())
--- 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,41 +31,47 @@ class DeleteNodesRunnable(context: Context,
                          afterActionNodesFinish: AfterActionNodesFinish)
    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {

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

    private var mNodesToDeleteBackup = ArrayList<Node>()

    override fun nodeAction() {

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

-            when (currentNode.type) {
+            when (nodeToDelete.type) {
                Type.GROUP -> {
+                    val groupToDelete = nodeToDelete as Group
                    // Create a copy to keep the old ref and remove it visually
-                    mNodesToDeleteBackup.add(Group(currentNode as Group))
+                    mNodesToDeleteBackup.add(Group(groupToDelete))
                    // Remove Node from parent
-                    mCanRecycle = database.canRecycle(currentNode)
+                    mCanRecycle = database.canRecycle(groupToDelete)
                    if (mCanRecycle) {
-                        database.recycle(currentNode, context.resources)
+                        groupToDelete.touch(modified = false, touchParents = true)
+                        database.recycle(groupToDelete, context.resources)
+                        groupToDelete.setPreviousParentGroup(mOldParent)
                    } else {
-                        database.deleteGroup(currentNode)
+                        database.deleteGroup(groupToDelete)
                    }
                }
                Type.ENTRY -> {
+                    val entryToDelete = nodeToDelete as Entry
                    // Create a copy to keep the old ref and remove it visually
-                    mNodesToDeleteBackup.add(Entry(currentNode as Entry))
+                    mNodesToDeleteBackup.add(Entry(entryToDelete))
                    // Remove Node from parent
-                    mCanRecycle = database.canRecycle(currentNode)
+                    mCanRecycle = database.canRecycle(entryToDelete)
                    if (mCanRecycle) {
-                        database.recycle(currentNode, context.resources)
+                        entryToDelete.touch(modified = false, touchParents = true)
+                        database.recycle(entryToDelete, context.resources)
+                        entryToDelete.setPreviousParentGroup(mOldParent)
                    } else {
-                        database.deleteEntry(currentNode)
+                        database.deleteEntry(entryToDelete)
                    }
                    // Remove the oldest attachments
-                    currentNode.getAttachments(database.binaryPool).forEach {
+                    entryToDelete.getAttachments(database.attachmentPool).forEach {
                        database.removeAttachmentIfNotUsed(it)
                    }
                }
@@ -76,7 +82,7 @@ class DeleteNodesRunnable(context: Context,
    override fun nodeFinish(): ActionNodesValues {
        if (!result.isSuccess) {
            if (mCanRecycle) {
-                mParent?.let {
+                mOldParent?.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.EntryDatabaseException
+import com.kunzisoft.keepass.database.exception.MoveEntryDatabaseException
 import com.kunzisoft.keepass.database.exception.MoveGroupDatabaseException

 class MoveNodesRunnable constructor(
@@ -47,11 +47,14 @@ class MoveNodesRunnable constructor(
            when (nodeToMove.type) {
                Type.GROUP -> {
                    val groupToMove = nodeToMove as Group
-                    // Move group in new parent if not in the current group
-                    if (groupToMove != mNewParent
+                    // Move group if the parent change
+                    if (mOldParent != mNewParent
+                            // and if not in the current group
+                            && groupToMove != mNewParent
                            && !mNewParent.isContainedIn(groupToMove)) {
-                        nodeToMove.touch(modified = true, touchParents = true)
+                        groupToMove.touch(modified = true, touchParents = true)
                        database.moveGroupTo(groupToMove, mNewParent)
+                        groupToMove.setPreviousParentGroup(mOldParent)
                    } else {
                        // Only finish thread
                        setError(MoveGroupDatabaseException())
@@ -64,11 +67,12 @@ class MoveNodesRunnable constructor(
                    if (mOldParent != mNewParent
                            // and root can contains entry
                            && (mNewParent != database.rootGroup || database.rootCanContainsEntry())) {
-                        nodeToMove.touch(modified = true, touchParents = true)
+                        entryToMove.touch(modified = true, touchParents = true)
                        database.moveEntryTo(entryToMove, mNewParent)
+                        entryToMove.setPreviousParentGroup(mOldParent)
                    } else {
                        // Only finish thread
-                        setError(EntryDatabaseException())
+                        setError(MoveEntryDatabaseException())
                        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,54 +34,52 @@ 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() {
-        // WARNING : Re attribute parent removed in entry edit activity to save memory
-        mNewEntry.addParentFrom(mOldEntry)
+        if (mOldEntry.nodeId == mNewEntry.nodeId) {
+            // WARNING : Re attribute parent removed in entry edit activity to save memory
+            mNewEntry.addParentFrom(mOldEntry)

-        // Build oldest attachments
-        val oldEntryAttachments = mOldEntry.getAttachments(database.binaryPool, true)
-        val newEntryAttachments = mNewEntry.getAttachments(database.binaryPool, 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.binaryAttachment == newAttachment.binaryAttachment)
-                    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
-        mOldEntry.updateWith(mNewEntry)
-        mNewEntry.touch(modified = true, touchParents = true)
+            // Update entry with new values
+            mNewEntry.touch(modified = true, touchParents = true)

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

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

-        // 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(mBackupEntryHistory)
+        oldNodesReturn.add(mOldEntry)
        val newNodesReturn = ArrayList<Node>()
-        newNodesReturn.add(mOldEntry)
+        newNodesReturn.add(mNewEntry)
        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,33 +33,36 @@ 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() {
-        // WARNING : Re attribute parent and children removed in group activity to save memory
-        mNewGroup.addParentFrom(mOldGroup)
-        mNewGroup.addChildrenFrom(mOldGroup)
+        if (mOldGroup.nodeId == mNewGroup.nodeId) {
+            // WARNING : Re attribute parent and children removed in group activity to save memory
+            mNewGroup.addParentFrom(mOldGroup)
+            mNewGroup.addChildrenFrom(mOldGroup)

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

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

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

        val oldNodesReturn = ArrayList<Node>()
-        oldNodesReturn.add(mBackupGroup)
+        oldNodesReturn.add(mOldGroup)
        val newNodesReturn = ArrayList<Node>()
-        newNodesReturn.add(mOldGroup)
+        newNodesReturn.add(mNewGroup)
        return ActionNodesValues(oldNodesReturn, newNodesReturn)
    }
 }
--- a/Show More
+++ b/Show More