Merge branch 'release/4.0.1'

fix: Translation for themes #1631
fix: Lock button in Autofill settings and Magikeyboard settings #1630
2025-12-04 15:49:33 +01:00 · 2023-09-10 11:07:06 +02:00 · 2023-09-10 10:53:43 +02:00 · 2023-09-10 10:26:01 +02:00 · 2023-09-10 09:57:56 +02:00 · 2023-09-10 09:50:26 +02:00
857 changed files with 17061 additions and 12445 deletions
--- a/27
+++ b/27
@@ -1,3 +1,30 @@
+KeePassDX(4.0.1)
+ * Fix back lock #1635 #1629 #1634
+ * Fix lock button in settings #1630
+ * Improve theme translation #1631
+
+KeePassDX(4.0.0)
+ * New UX/UI with Material 3 #1183 #1529 #1428 #1441 #1607
+ * Material You theme (follow system colors) #1469
+ * Refactoring inner code #1371
+ * Migration to API 33
+ * Cut, copy and delete from search #891 #1308 #1263
+ * Fix behaviors #1351 #874 #1327
+ * Fix bugs #1589 #1584 #1545 #1563 #1371 #1609
+
+KeePassDX(3.5.1)
+ * Fix action dialog with YubiKey challenge-response #1506
+
+KeePassDX(3.5.0)
+ * Support YubiKey challenge-response #8 #137
+ * Better exception management during database save #1346
+ * Add "Screenshot mode" setting #459 #1377 #1354 (Thx @GianpaMX)
+ * Hide clipboard sensitive text when copy entry field #1386
+ * Fix attachment download button #1401
+ * Add monochrome icon #1403 #1404 (Thx @Sandelinos)
+ * Fix lock with back button #1412 #1414 (Thx @ryg-git)
+ * Vanadium compatibility #1447 (Thx @flawedworld)
+
 KeePassDX(3.4.5)
 * Fix custom data in group (fix KeeShare) #1335
 * Fix device credential unlocking #1344
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,27 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.577.0)
-    aws-sdk-core (3.130.1)
+    aws-partitions (1.794.0)
+    aws-sdk-core (3.180.0)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.55.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.132.0)
+      aws-sdk-core (~> 3, >= 3.179.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -30,14 +30,14 @@ GEM
    commander (4.6.0)
      highline (~> 2.0.0)
    declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.92.2)
-    faraday (1.10.0)
+    excon (0.100.0)
+    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -56,8 +56,8 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
@@ -65,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.205.1)
+    fastimage (2.2.7)
+    fastlane (2.214.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -90,7 +90,7 @@ GEM
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
      naturally (~> 2.2)
      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
@@ -105,11 +105,11 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-versioning_android (0.1.0)
+    fastlane-plugin-versioning_android (0.1.1)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.19.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-androidpublisher_v3 (0.46.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.1)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -118,27 +118,27 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.13.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.1)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.1.2)
+    googleauth (1.7.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
@@ -146,40 +146,40 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.1)
-    jwt (2.3.0)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.1)
    memoist (0.16.2)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
    mini_mime (1.1.2)
    multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    optparse (0.1.1)
    os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
+    plist (3.7.0)
+    public_suffix (5.0.3)
    rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
    rouge (2.0.7)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.16.1)
+    signet (0.17.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
      CFPropertyList
      naturally
    terminal-notifier (2.0.0)
@@ -193,11 +193,11 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
    word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@

 - Create database files / entries and groups.
 - Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm.
- - **Compatible** with the majority of alternative programs (KeePass, KeePassX, KeePassXC, …).
+ - **Compatible** with the majority of alternative programs (KeePass, KeePassXC, KeeWeb, …).
 - Allows opening and **copying URI / URL fields quickly**.
 - **Biometric recognition** for fast unlocking *(fingerprint / face unlock / …)*.
 - **One-Time Password** management *(HOTP / TOTP)* for Two-factor authentication (2FA).
@@ -53,10 +53,12 @@ Optional visual styles are accessible after a contribution (and a congratulatory
 [<img src="https://f-droid.org/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/)
-
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
      alt="Get it on Google Play"
 	height="80">](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free)
+[<img src="https://raw.githubusercontent.com/Kunzisoft/Github-badge/main/get-it-on-github.png"
+      alt="Get it on Github"
+	height="80">](https://github.com/Kunzisoft/KeePassDX/releases)
 	
 ## Frequently Asked Questions

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

 ## License

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

  This file is part of KeePassDX.

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,16 +4,16 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'

 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
-    ndkVersion "21.4.7075529"
+    namespace 'com.kunzisoft.keepass'
+    compileSdkVersion 33
+    buildToolsVersion "33.0.2"

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
        minSdkVersion 15
-        targetSdkVersion 32
-        versionCode = 114
-        versionName = "3.4.5"
+        targetSdkVersion 33
+        versionCode = 124
+        versionName = "4.0.1"
        multiDexEnabled true

        testApplicationId = "com.kunzisoft.keepass.tests"
@@ -33,7 +33,6 @@ android {
    buildTypes {
        release {
            minifyEnabled = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

@@ -50,7 +49,9 @@ android {
                            "\"KeepassDXStyle_Reply\"," +
                            "\"KeepassDXStyle_Reply_Night\"," +
                            "\"KeepassDXStyle_Purple\"," +
-                            "\"KeepassDXStyle_Purple_Dark\"}"
+                            "\"KeepassDXStyle_Purple_Dark\"," +
+                            "\"KeepassDXStyle_Dynamic_Light\"," +
+                            "\"KeepassDXStyle_Dynamic_Night\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
        }
        free {
@@ -59,16 +60,16 @@ android {
            buildConfigField "String", "BUILD_VERSION", "\"free\""
            buildConfigField "boolean", "CLOSED_STORE", "true"
            buildConfigField "String[]", "STYLES_DISABLED",
-                            "{\"KeepassDXStyle_Simple\"," +
-                            "\"KeepassDXStyle_Simple_Night\"," +
-                            "\"KeepassDXStyle_Blue\"," +
+                            "{\"KeepassDXStyle_Blue\"," +
                            "\"KeepassDXStyle_Blue_Night\"," +
                            "\"KeepassDXStyle_Red\"," +
                            "\"KeepassDXStyle_Red_Night\"," +
                            "\"KeepassDXStyle_Reply\"," +
                            "\"KeepassDXStyle_Reply_Night\"," +
                            "\"KeepassDXStyle_Purple\"," +
-                            "\"KeepassDXStyle_Purple_Dark\"}"
+                            "\"KeepassDXStyle_Purple_Dark\"," +
+                            "\"KeepassDXStyle_Dynamic_Light\"," +
+                            "\"KeepassDXStyle_Dynamic_Night\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
        }
@@ -93,7 +94,7 @@ android {
    }
 }

-def room_version = "2.4.2"
+def room_version = "2.5.1"

 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -101,18 +102,18 @@ dependencies {
    implementation "androidx.appcompat:appcompat:$android_appcompat_version"
    implementation 'androidx.preference:preference-ktx:1.2.0'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
    implementation 'androidx.documentfile:documentfile:1.0.1'
    implementation 'androidx.biometric:biometric:1.1.0'
    implementation 'androidx.media:media:1.6.0'
    // Lifecycle - LiveData - ViewModel - Coroutines
    implementation "androidx.core:core-ktx:$android_core_version"
-    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+    implementation 'androidx.fragment:fragment-ktx:1.6.0'
    implementation "com.google.android.material:material:$android_material_version"
    // Token auto complete
    // From sources until https://github.com/splitwise/TokenAutoComplete/pull/422 fixed
-    // implementation "com.splitwise:tokenautocomplete:4.0.0-beta04"
+    implementation "com.splitwise:tokenautocomplete:4.0.0-beta05"
    // Database
    implementation "androidx.room:room-runtime:$room_version"
    kapt "androidx.room:room-compiler:$room_version"
@@ -129,11 +130,10 @@ dependencies {
    implementation 'commons-codec:commons-codec:1.15'
    // Password generator
    implementation 'me.gosimple:nbvcxz:1.5.0'
-    // Encrypt lib
-    implementation project(path: ':crypto')
-    // Icon pack
-    implementation project(path: ':icon-pack-classic')
-    implementation project(path: ':icon-pack-material')
+    
+    // Modules import
+    implementation project(path: ':database')
+    implementation project(path: ':icon-pack')

    // Tests
    androidTestImplementation "androidx.test:runner:$android_test_version"
--- a/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json
+++ b/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json
@@ -0,0 +1,90 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "f8fb4aed546de19ae7ca0797f49b26a4",
+    "entities": [
+      {
+        "tableName": "file_database_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `database_alias` TEXT NOT NULL, `keyfile_uri` TEXT, `hardware_key` TEXT, `updated` INTEGER NOT NULL, PRIMARY KEY(`database_uri`))",
+        "fields": [
+          {
+            "fieldPath": "databaseUri",
+            "columnName": "database_uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "databaseAlias",
+            "columnName": "database_alias",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyFileUri",
+            "columnName": "keyfile_uri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hardwareKey",
+            "columnName": "hardware_key",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updated",
+            "columnName": "updated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "database_uri"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "cipher_database",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `encrypted_value` TEXT NOT NULL, `specs_parameters` TEXT NOT NULL, PRIMARY KEY(`database_uri`))",
+        "fields": [
+          {
+            "fieldPath": "databaseUri",
+            "columnName": "database_uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedValue",
+            "columnName": "encrypted_value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "specParameters",
+            "columnName": "specs_parameters",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "database_uri"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f8fb4aed546de19ae7ca0797f49b26a4')"
+    ]
+  }
+}
--- a/app/src/free/res/drawable-v24/ic_launcher_monochrome.xml
+++ b/app/src/free/res/drawable-v24/ic_launcher_monochrome.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+</vector>
--- a/app/src/free/res/drawable/ic_app_key_white_24dp.xml
+++ b/app/src/free/res/drawable/ic_app_key_white_24dp.xml
@@ -7,10 +7,6 @@
  <group
      android:translateX="-12"
      android:translateY="-12">
-    <path
-        android:fillColor="#ffa726"
-        android:strokeWidth="1.99999297"
-        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
    <path
        android:fillColor="#ffffff"
        android:strokeWidth="1.99999297"
--- a/app/src/free/res/drawable/ic_app_lock_white_24dp.xml
+++ b/app/src/free/res/drawable/ic_app_lock_white_24dp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+  </group>
+</vector>
--- a/app/src/libre/res/drawable-v24/ic_launcher_monochrome.xml
+++ b/app/src/libre/res/drawable-v24/ic_launcher_monochrome.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group
+        android:translateX="6"
+        android:translateY="6">
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+    </group>
+</vector>
--- a/app/src/libre/res/drawable/ic_app_key_white_24dp.xml
+++ b/app/src/libre/res/drawable/ic_app_key_white_24dp.xml
@@ -7,10 +7,6 @@
  <group
      android:translateX="-12"
      android:translateY="-12">
-    <path
-        android:fillColor="#ffa726"
-        android:strokeWidth="1.99999297"
-        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
    <path
        android:fillColor="#ffffff"
        android:strokeWidth="1.99999297"
--- a/app/src/libre/res/drawable/ic_app_lock_white_24dp.xml
+++ b/app/src/libre/res/drawable/ic_app_lock_white_24dp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+  </group>
+</vector>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    package="com.kunzisoft.keepass"
    android:installLocation="auto">
    <supports-screens
      android:smallScreens="true"
@@ -10,6 +9,8 @@
      android:anyDensity="true" />
    <uses-permission
        android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission
        android:name="android.permission.SCHEDULE_EXACT_ALARM" />
    <uses-permission
@@ -20,6 +21,12 @@
    <uses-permission
        android:name="android.permission.QUERY_ALL_PACKAGES"
        tools:ignore="QueryAllPackagesPermission" />
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.CREATE_DOCUMENT" />
+            <data android:mimeType="application/octet-stream" />
+        </intent>
+    </queries>

    <application
        android:label="@string/app_name"
@@ -39,7 +46,6 @@
            android:value="${googleAndroidBackupAPIKey}" />
        <activity
            android:name="com.kunzisoft.keepass.activities.FileDatabaseSelectActivity"
-            android:theme="@style/KeepassDXStyle.SplashScreen"
            android:launchMode="singleTop"
            android:exported="true"
            android:configChanges="keyboardHidden"
@@ -139,7 +145,7 @@
            android:configChanges="keyboardHidden" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustPan" />
        <!-- About and Settings -->
        <activity
            android:name="com.kunzisoft.keepass.activities.AboutActivity"
@@ -153,9 +159,14 @@
            android:configChanges="keyboardHidden"
            android:excludeFromRecents="true"/>
        <activity
-            android:name="com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity" />
+            android:name="com.kunzisoft.keepass.settings.AdvancedUnlockSettingsActivity" />
        <activity
            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.AppearanceSettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.hardware.HardwareKeyActivity"
+            android:theme="@style/Theme.Transparent" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
            android:theme="@style/Theme.Transparent"
@@ -170,8 +181,9 @@
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="otpauth" android:host="totp" />
-                <data android:scheme="otpauth" android:host="hotp" />
+                <data android:scheme="otpauth"/>
+                <data android:host="totp"/>
+                <data android:host="hotp"/>
            </intent-filter>
        </activity>
        <activity
--- a/app/src/main/java/com/igreenwood/loupe/Loupe.kt
+++ b/app/src/main/java/com/igreenwood/loupe/Loupe.kt
@@ -172,16 +172,16 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
    private val onScaleGestureListener: ScaleGestureDetector.OnScaleGestureListener =
        object : ScaleGestureDetector.OnScaleGestureListener {

-            override fun onScale(detector: ScaleGestureDetector?): Boolean {
+            override fun onScale(detector: ScaleGestureDetector): Boolean {
                if (isDragging() || isBitmapTranslateAnimationRunning || isBitmapScaleAnimationRunninng) {
                    return false
                }

-                val scaleFactor = detector?.scaleFactor ?: 1.0f
-                val focalX = detector?.focusX ?: bitmapBounds.centerX()
-                val focalY = detector?.focusY ?: bitmapBounds.centerY()
+                val scaleFactor = detector.scaleFactor
+                val focalX = detector.focusX
+                val focalY = detector.focusY

-                if (detector?.scaleFactor == 1.0f) {
+                if (detector.scaleFactor == 1.0f) {
                    // scale is not changing
                    return true
                }
@@ -191,22 +191,23 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                return true
            }

-            override fun onScaleBegin(p0: ScaleGestureDetector?): Boolean = true
+            override fun onScaleBegin(p0: ScaleGestureDetector): Boolean = true
+
+            override fun onScaleEnd(p0: ScaleGestureDetector) {}

-            override fun onScaleEnd(p0: ScaleGestureDetector?) {}
        }

    private val onGestureListener: GestureDetector.OnGestureListener =
        object : GestureDetector.SimpleOnGestureListener() {
-            override fun onDown(e: MotionEvent?): Boolean = true
+            override fun onDown(e: MotionEvent): Boolean = true

            override fun onScroll(
-                    e1: MotionEvent?,
-                    e2: MotionEvent?,
-                    distanceX: Float,
-                    distanceY: Float
+                e1: MotionEvent,
+                e2: MotionEvent,
+                distanceX: Float,
+                distanceY: Float
            ): Boolean {
-                if (e2?.pointerCount != 1) {
+                if (e2.pointerCount != 1) {
                    return true
                }

@@ -219,13 +220,11 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
            }

            override fun onFling(
-                    e1: MotionEvent?,
-                    e2: MotionEvent?,
-                    velocityX: Float,
-                    velocityY: Float
+                e1: MotionEvent,
+                e2: MotionEvent,
+                velocityX: Float,
+                velocityY: Float
            ): Boolean {
-                e1 ?: return true
-
                if (scale > minScale) {
                    processFlingBitmap(velocityX, velocityY)
                } else {
@@ -234,9 +233,7 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                return true
            }

-            override fun onDoubleTap(e: MotionEvent?): Boolean {
-                e ?: return false
-
+            override fun onDoubleTap(e: MotionEvent): Boolean {
                if (isBitmapScaleAnimationRunninng) {
                    return true
                }
@@ -376,21 +373,21 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                            onViewTranslateListener?.onViewTranslate(imageView, amount)
                        }
                        .setListener(object : Animator.AnimatorListener {
-                            override fun onAnimationStart(p0: Animator?) {
+                            override fun onAnimationStart(p0: Animator) {

                            }

-                            override fun onAnimationEnd(p0: Animator?) {
+                            override fun onAnimationEnd(p0: Animator) {
                                isViewTranslateAnimationRunning = false
                                onViewTranslateListener?.onDismiss(imageView)
                                cleanup()
                            }

-                            override fun onAnimationCancel(p0: Animator?) {
+                            override fun onAnimationCancel(p0: Animator) {
                                isViewTranslateAnimationRunning = false
                            }

-                            override fun onAnimationRepeat(p0: Animator?) {
+                            override fun onAnimationRepeat(p0: Animator) {
                                // no op
                            }
                        })
@@ -409,21 +406,21 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                    onViewTranslateListener?.onViewTranslate(imageView, amount)
                }
                addListener(object : Animator.AnimatorListener {
-                    override fun onAnimationStart(p0: Animator?) {
+                    override fun onAnimationStart(p0: Animator) {
                        // no op
                    }

-                    override fun onAnimationEnd(p0: Animator?) {
+                    override fun onAnimationEnd(p0: Animator) {
                        isViewTranslateAnimationRunning = false
                        onViewTranslateListener?.onDismiss(imageView)
                        cleanup()
                    }

-                    override fun onAnimationCancel(p0: Animator?) {
+                    override fun onAnimationCancel(p0: Animator) {
                        isViewTranslateAnimationRunning = false
                    }

-                    override fun onAnimationRepeat(p0: Animator?) {
+                    override fun onAnimationRepeat(p0: Animator) {
                        // no op
                    }
                })
@@ -480,20 +477,20 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                setTransform()
            }
            addListener(object : Animator.AnimatorListener {
-                override fun onAnimationStart(p0: Animator?) {
+                override fun onAnimationStart(p0: Animator) {
                    isBitmapTranslateAnimationRunning = true
                }

-                override fun onAnimationEnd(p0: Animator?) {
+                override fun onAnimationEnd(p0: Animator) {
                    isBitmapTranslateAnimationRunning = false
                    constrainBitmapBounds()
                }

-                override fun onAnimationCancel(p0: Animator?) {
+                override fun onAnimationCancel(p0: Animator) {
                    isBitmapTranslateAnimationRunning = false
                }

-                override fun onAnimationRepeat(p0: Animator?) {
+                override fun onAnimationRepeat(p0: Animator) {
                    // no op
                }
            })
@@ -531,11 +528,11 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                setTransform()
            }
            addListener(object : Animator.AnimatorListener {
-                override fun onAnimationStart(p0: Animator?) {
+                override fun onAnimationStart(p0: Animator) {
                    isBitmapScaleAnimationRunninng = true
                }

-                override fun onAnimationEnd(p0: Animator?) {
+                override fun onAnimationEnd(p0: Animator) {
                    isBitmapScaleAnimationRunninng = false
                    if (endScale == minScale) {
                        zoomToTargetScale(minScale, focalX, focalY)
@@ -543,11 +540,11 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                    }
                }

-                override fun onAnimationCancel(p0: Animator?) {
+                override fun onAnimationCancel(p0: Animator) {
                    isBitmapScaleAnimationRunninng = false
                }

-                override fun onAnimationRepeat(p0: Animator?) {
+                override fun onAnimationRepeat(p0: Animator) {
                    // no op
                }
            })
@@ -585,11 +582,11 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                setTransform()
            }
            addListener(object : Animator.AnimatorListener {
-                override fun onAnimationStart(p0: Animator?) {
+                override fun onAnimationStart(p0: Animator) {
                    isBitmapScaleAnimationRunninng = true
                }

-                override fun onAnimationEnd(p0: Animator?) {
+                override fun onAnimationEnd(p0: Animator) {
                    isBitmapScaleAnimationRunninng = false
                    if (endScale == minScale) {
                        scale = minScale
@@ -599,11 +596,11 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                    }
                }

-                override fun onAnimationCancel(p0: Animator?) {
+                override fun onAnimationCancel(p0: Animator) {
                    isBitmapScaleAnimationRunninng = false
                }

-                override fun onAnimationRepeat(p0: Animator?) {
+                override fun onAnimationRepeat(p0: Animator) {
                    // no op
                }
            })
@@ -669,19 +666,19 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                            onViewTranslateListener?.onViewTranslate(this, amount)
                        }
                        .setListener(object : Animator.AnimatorListener {
-                            override fun onAnimationStart(p0: Animator?) {
+                            override fun onAnimationStart(p0: Animator) {
                                // no op
                            }

-                            override fun onAnimationEnd(p0: Animator?) {
+                            override fun onAnimationEnd(p0: Animator) {
                                onViewTranslateListener?.onRestore(imageView)
                            }

-                            override fun onAnimationCancel(p0: Animator?) {
+                            override fun onAnimationCancel(p0: Animator) {
                                // no op
                            }

-                            override fun onAnimationRepeat(p0: Animator?) {
+                            override fun onAnimationRepeat(p0: Animator) {
                                // no op
                            }
                        })
@@ -696,19 +693,19 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                    onViewTranslateListener?.onViewTranslate(imageView, amount)
                }
                addListener(object : Animator.AnimatorListener {
-                    override fun onAnimationStart(p0: Animator?) {
+                    override fun onAnimationStart(p0: Animator) {
                        // no op
                    }

-                    override fun onAnimationEnd(p0: Animator?) {
+                    override fun onAnimationEnd(p0: Animator) {
                        onViewTranslateListener?.onRestore(imageView)
                    }

-                    override fun onAnimationCancel(p0: Animator?) {
+                    override fun onAnimationCancel(p0: Animator) {
                        // no op
                    }

-                    override fun onAnimationRepeat(p0: Animator?) {
+                    override fun onAnimationRepeat(p0: Animator) {
                        // no op
                    }
                })
@@ -737,27 +734,27 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                            onViewTranslateListener?.onViewTranslate(this, amount)
                        }
                        .setListener(object : Animator.AnimatorListener {
-                            override fun onAnimationStart(p0: Animator?) {
+                            override fun onAnimationStart(p0: Animator) {
                                isViewTranslateAnimationRunning = true
                            }

-                            override fun onAnimationEnd(p0: Animator?) {
+                            override fun onAnimationEnd(p0: Animator) {
                                isViewTranslateAnimationRunning = false
                                onViewTranslateListener?.onDismiss(imageView)
                                cleanup()
                            }

-                            override fun onAnimationCancel(p0: Animator?) {
+                            override fun onAnimationCancel(p0: Animator) {
                                isViewTranslateAnimationRunning = false
                            }

-                            override fun onAnimationRepeat(p0: Animator?) {
+                            override fun onAnimationRepeat(p0: Animator) {
                                // no op
                            }
                        })
            }
        } else {
-            ObjectAnimator.ofFloat(imageView, View.TRANSLATION_Y, imageView.translationY.toFloat()).apply {
+            ObjectAnimator.ofFloat(imageView, View.TRANSLATION_Y, imageView.translationY).apply {
                duration = dismissAnimationDuration
                interpolator = AccelerateDecelerateInterpolator()
                addUpdateListener {
@@ -766,21 +763,21 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                    onViewTranslateListener?.onViewTranslate(imageView, amount)
                }
                addListener(object : Animator.AnimatorListener {
-                    override fun onAnimationStart(p0: Animator?) {
+                    override fun onAnimationStart(p0: Animator) {
                        isViewTranslateAnimationRunning = true
                    }

-                    override fun onAnimationEnd(p0: Animator?) {
+                    override fun onAnimationEnd(p0: Animator) {
                        isViewTranslateAnimationRunning = false
                        onViewTranslateListener?.onDismiss(imageView)
                        cleanup()
                    }

-                    override fun onAnimationCancel(p0: Animator?) {
+                    override fun onAnimationCancel(p0: Animator) {
                        isViewTranslateAnimationRunning = false
                    }

-                    override fun onAnimationRepeat(p0: Animator?) {
+                    override fun onAnimationRepeat(p0: Animator) {
                        // no op
                    }
                })
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
@@ -30,7 +30,8 @@ import androidx.core.text.HtmlCompat
 import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.UriUtil.isContributingUser
+import com.kunzisoft.keepass.utils.getPackageInfoCompat
 import org.joda.time.DateTime

 class AboutActivity : StylishActivity() {
@@ -46,7 +47,7 @@ class AboutActivity : StylishActivity() {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        val appName = if (UriUtil.contributingUser(this))
+        val appName = if (this.isContributingUser())
            getString(R.string.app_name) + " " + getString(R.string.app_name_part3)
         else
            getString(R.string.app_name)
@@ -55,7 +56,7 @@ class AboutActivity : StylishActivity() {
        var version: String
        var build: String
        try {
-            version = packageManager.getPackageInfo(packageName, 0).versionName
+            version = packageManager.getPackageInfoCompat(packageName).versionName
            build = BuildConfig.BUILD_VERSION
        } catch (e: NameNotFoundException) {
            Log.w(javaClass.simpleName, "Unable to get the app or the build version", e)
@@ -77,6 +78,12 @@ class AboutActivity : StylishActivity() {
                    HtmlCompat.FROM_HTML_MODE_LEGACY)
        }

+        findViewById<TextView>(R.id.activity_about_privacy_text).apply {
+            movementMethod = LinkMovementMethod.getInstance()
+            text = HtmlCompat.fromHtml(getString(R.string.html_about_privacy),
+                HtmlCompat.FROM_HTML_MODE_LEGACY)
+        }
+
        findViewById<TextView>(R.id.activity_about_contribution_text).apply {
            movementMethod = LinkMovementMethod.getInstance()
            text = HtmlCompat.fromHtml(getString(R.string.html_about_contribution),
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
@@ -36,11 +36,14 @@ import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 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.database.ContextualDatabase
+import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
+import com.kunzisoft.keepass.utils.WebDomain

@RequiresApi(api = Build.VERSION_CODES.O)
 class AutofillLauncherActivity : DatabaseModeActivity() {
@@ -58,7 +61,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
        return true
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        // Retrieve selection mode
@@ -69,11 +72,11 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                        // To pass extra inline request
                        var compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null
                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            compatInlineSuggestionsRequest = bundle.getParcelable(KEY_INLINE_SUGGESTION)
+                            compatInlineSuggestionsRequest = bundle.getParcelableCompat(KEY_INLINE_SUGGESTION)
                        }
                        // Build search param
-                        bundle.getParcelable<SearchInfo>(KEY_SEARCH_INFO)?.let { searchInfo ->
-                            SearchInfo.getConcreteWebDomain(
+                        bundle.getParcelableCompat<SearchInfo>(KEY_SEARCH_INFO)?.let { searchInfo ->
+                            WebDomain.getConcreteWebDomain(
                                this,
                                searchInfo.webDomain
                            ) { concreteWebDomain ->
@@ -99,9 +102,9 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                }
                SpecialMode.REGISTRATION -> {
                    // To register info
-                    val registerInfo = intent.getParcelableExtra<RegisterInfo>(KEY_REGISTER_INFO)
+                    val registerInfo = intent.getParcelableExtraCompat<RegisterInfo>(KEY_REGISTER_INFO)
                    val searchInfo = SearchInfo(registerInfo?.searchInfo)
-                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                    WebDomain.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
                        searchInfo.webDomain = concreteWebDomain
                        launchRegistration(database, searchInfo, registerInfo)
                    }
@@ -115,7 +118,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
        }
    }

-    private fun launchSelection(database: Database?,
+    private fun launchSelection(database: ContextualDatabase?,
                                autofillComponent: AutofillComponent?,
                                searchInfo: SearchInfo) {
        if (autofillComponent == null) {
@@ -158,7 +161,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
        }
    }

-    private fun launchRegistration(database: Database?,
+    private fun launchRegistration(database: ContextualDatabase?,
                                   searchInfo: SearchInfo,
                                   registerInfo: RegisterInfo?) {
        if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -23,6 +23,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -30,17 +31,22 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.ProgressBar
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.progressindicator.LinearProgressIndicator
@@ -51,8 +57,8 @@ import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.adapters.TagsAdapter
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
@@ -67,17 +73,21 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.utils.UuidUtil
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
+import com.kunzisoft.keepass.view.WindowInsetPosition
+import com.kunzisoft.keepass.view.applyWindowInsets
 import com.kunzisoft.keepass.view.changeControlColor
 import com.kunzisoft.keepass.view.changeTitleColor
 import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.view.setTransparentNavigationBar
 import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.EntryViewModel
-import java.util.*
+import java.util.UUID

 class EntryActivity : DatabaseLockActivity() {

+    private var footer: ViewGroup? = null
    private var coordinatorLayout: CoordinatorLayout? = null
    private var collapsingToolbarLayout: CollapsingToolbarLayout? = null
    private var appBarLayout: AppBarLayout? = null
@@ -98,7 +108,6 @@ class EntryActivity : DatabaseLockActivity() {
    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
@@ -111,9 +120,9 @@ class EntryActivity : DatabaseLockActivity() {
    }

    private var mIcon: IconImage? = null
-    private var mColorAccent: Int = 0
-    private var mControlColor: Int = 0
-    private var mColorPrimary: Int = 0
+    private var mColorSecondary: Int = 0
+    private var mColorSurface: Int = 0
+    private var mColorOnSurface: Int = 0
    private var mColorBackground: Int = 0
    private var mBackgroundColor: Int? = null
    private var mForegroundColor: Int? = null
@@ -129,6 +138,7 @@ class EntryActivity : DatabaseLockActivity() {
        supportActionBar?.setDisplayShowHomeEnabled(true)

        // Get views
+        footer = findViewById(R.id.activity_entry_footer)
        coordinatorLayout = findViewById(R.id.toolbar_coordinator)
        collapsingToolbarLayout = findViewById(R.id.toolbar_layout)
        appBarLayout = findViewById(R.id.app_bar)
@@ -140,22 +150,30 @@ class EntryActivity : DatabaseLockActivity() {
        lockView = findViewById(R.id.lock_button)
        loadingView = findViewById(R.id.loading)

+        // To apply fit window with transparency
+        setTransparentNavigationBar {
+            // To fix margin with API 27
+            ViewCompat.setOnApplyWindowInsetsListener(collapsingToolbarLayout!!, null)
+            coordinatorLayout?.applyWindowInsets(WindowInsetPosition.TOP)
+            footer?.applyWindowInsets(WindowInsetPosition.BOTTOM)
+        }
+
        // 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 taColorSecondary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
+        val taColorSurface = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSurface))
+        val taColorOnSurface = theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSurface))
        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)
+        mColorSecondary = taColorSecondary.getColor(0, Color.BLACK)
+        mColorSurface = taColorSurface.getColor(0, Color.BLACK)
+        mColorOnSurface = taColorOnSurface.getColor(0, Color.BLACK)
        mColorBackground = taColorBackground.getColor(0, Color.BLACK)
-        taColorAccent.recycle()
-        taControlColor.recycle()
-        taColorPrimary.recycle()
+        taColorSecondary.recycle()
+        taColorSurface.recycle()
+        taColorOnSurface.recycle()
        taColorBackground.recycle()

        // Init Tags adapter
@@ -180,7 +198,7 @@ class EntryActivity : DatabaseLockActivity() {

        // Get Entry from UUID
        try {
-            intent.getParcelableExtra<NodeId<UUID>?>(KEY_ENTRY)?.let { mainEntryId ->
+            intent.getParcelableExtraCompat<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)
@@ -224,16 +242,16 @@ class EntryActivity : DatabaseLockActivity() {
                this.mEntryIsHistory = entryIsHistory
                // Assign history dedicated view
                historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE
+                // TODO History badge
+                /*
                if (entryIsHistory) {
-                    collapsingToolbarLayout?.contentScrim =
-                        ColorDrawable(mColorAccent)
-                }
+                }*/

                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)
+                    ClipboardEntryNotificationService.checkAndLaunchNotification(this, entryInfo)
                    // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
                    if (PreferencesUtil.isKeyboardEntrySelectionEnable(this)) {
                        MagikeyboardService.addEntryAndLaunchNotificationIfAllowed(this, entryInfo)
@@ -246,7 +264,6 @@ class EntryActivity : DatabaseLockActivity() {
                    if (entryInfo.title.isNotEmpty()) entryInfo.title else UuidUtil.toHexString(entryInfo.id)
                collapsingToolbarLayout?.title = entryTitle
                toolbar?.title = entryTitle
-                mUrl = entryInfo.url
                // Assign tags
                val tags = entryInfo.tags
                tagsListView?.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
@@ -310,14 +327,14 @@ class EntryActivity : DatabaseLockActivity() {
        return coordinatorLayout
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        mEntryViewModel.loadDatabase(database)
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -365,8 +382,8 @@ class EntryActivity : DatabaseLockActivity() {
    }

    private fun applyToolbarColors() {
-        appBarLayout?.setBackgroundColor(mBackgroundColor ?: mColorPrimary)
-        collapsingToolbarLayout?.contentScrim = ColorDrawable(mBackgroundColor ?: mColorPrimary)
+        collapsingToolbarLayout?.setBackgroundColor(mBackgroundColor ?: mColorSurface)
+        collapsingToolbarLayout?.contentScrim = ColorDrawable(mBackgroundColor ?: mColorSurface)
        val backgroundDarker = if (mBackgroundColor != null) {
            ColorUtils.blendARGB(mBackgroundColor!!, Color.WHITE, 0.1f)
        } else {
@@ -376,15 +393,15 @@ class EntryActivity : DatabaseLockActivity() {
            .createBlendModeColorFilterCompat(backgroundDarker, BlendModeCompat.SRC_IN)
        mIcon?.let { icon ->
            titleIconView?.let { iconView ->
-                mIconDrawableFactory?.assignDatabaseIcon(
+                mDatabase?.iconDrawableFactory?.assignDatabaseIcon(
                    iconView,
                    icon,
-                    mForegroundColor ?: mColorAccent
+                    mForegroundColor ?: mColorSecondary
                )
            }
        }
-        toolbar?.changeControlColor(mForegroundColor ?: mControlColor)
-        collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mControlColor)
+        toolbar?.changeControlColor(mForegroundColor ?: mColorOnSurface)
+        collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mColorOnSurface)
    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -408,9 +425,6 @@ class EntryActivity : DatabaseLockActivity() {
    }

    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        if (mUrl?.isEmpty() != false) {
-            menu?.findItem(R.id.menu_goto_url)?.isVisible = false
-        }
        if (mEntryIsHistory || mDatabaseReadOnly) {
            menu?.findItem(R.id.menu_save_database)?.isVisible = false
            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
@@ -471,12 +485,6 @@ class EntryActivity : DatabaseLockActivity() {
                }
                return true
            }
-            R.id.menu_goto_url -> {
-                mUrl?.let { url ->
-                    UriUtil.gotoUrl(this, url)
-                }
-                return true
-            }
            R.id.menu_restore_entry_history -> {
                mMainEntryId?.let { mainEntryId ->
                    restoreEntryHistory(
@@ -526,7 +534,7 @@ class EntryActivity : DatabaseLockActivity() {
         * Open standard Entry activity
         */
        fun launch(activity: Activity,
-                   database: Database,
+                   database: ContextualDatabase,
                   entryId: NodeId<UUID>,
                   activityResultLauncher: ActivityResultLauncher<Intent>) {
            if (database.loaded) {
@@ -542,7 +550,7 @@ class EntryActivity : DatabaseLockActivity() {
         * Open history Entry activity
         */
        fun launch(activity: Activity,
-                   database: Database,
+                   database: ContextualDatabase,
                   entryId: NodeId<UUID>,
                   historyPosition: Int,
                   activityResultLauncher: ActivityResultLauncher<Intent>) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -19,8 +19,6 @@
 package com.kunzisoft.keepass.activities

 import android.app.Activity
-import android.app.DatePickerDialog
-import android.app.TimePickerDialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -32,7 +30,10 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.*
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ProgressBar
+import android.widget.Spinner
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -44,10 +45,16 @@ import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.timepicker.MaterialTimePicker
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.*
+import com.kunzisoft.keepass.activities.dialogs.ColorPickerDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.EntryCustomFieldDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.FileTooBigDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.FileTooBigDialogFragment.Companion.MAX_WARNING_BINARY_FILE
+import com.kunzisoft.keepass.activities.dialogs.ReplaceFileDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
 import com.kunzisoft.keepass.activities.fragments.EntryEditFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
@@ -55,7 +62,11 @@ import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.adapters.TemplatesSelectorAdapter
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.template.Template
@@ -76,22 +87,29 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.view.*
+import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
+import com.kunzisoft.keepass.view.ToolbarAction
+import com.kunzisoft.keepass.view.WindowInsetPosition
+import com.kunzisoft.keepass.view.applyWindowInsets
+import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.view.setTransparentNavigationBar
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
+import com.kunzisoft.keepass.view.updateLockPaddingLeft
 import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel
 import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
-import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID

 class EntryEditActivity : DatabaseLockActivity(),
        EntryCustomFieldDialogFragment.EntryCustomFieldListener,
        SetOTPDialogFragment.CreateOtpListener,
-        DatePickerDialog.OnDateSetListener,
-        TimePickerDialog.OnTimeSetListener,
        FileTooBigDialogFragment.ActionChooseListener,
        ReplaceFileDialogFragment.ActionChooseListener {

    // Views
+    private var footer: ViewGroup? = null
+    private var container: ViewGroup? = null
    private var coordinatorLayout: CoordinatorLayout? = null
    private var scrollView: NestedScrollView? = null
    private var templateSelectorSpinner: Spinner? = null
@@ -144,10 +162,8 @@ class EntryEditActivity : DatabaseLockActivity(),

        // Bottom Bar
        entryEditAddToolBar = findViewById(R.id.entry_edit_bottom_bar)
-        setSupportActionBar(entryEditAddToolBar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
+        footer = findViewById(R.id.activity_entry_edit_footer)
+        container = findViewById(R.id.activity_entry_edit_container)
        coordinatorLayout = findViewById(R.id.entry_edit_coordinator_layout)
        scrollView = findViewById(R.id.entry_edit_scroll)
        scrollView?.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
@@ -156,19 +172,30 @@ class EntryEditActivity : DatabaseLockActivity(),
        validateButton = findViewById(R.id.entry_edit_validate)
        loadingView = findViewById(R.id.loading)

+        setSupportActionBar(entryEditAddToolBar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+
+        // To apply fit window with transparency
+        setTransparentNavigationBar(applyToStatusBar = true) {
+            container?.applyWindowInsets(WindowInsetPosition.TOP)
+            footer?.applyWindowInsets(WindowInsetPosition.BOTTOM)
+        }
+
        stopService(Intent(this, ClipboardEntryNotificationService::class.java))
        stopService(Intent(this, KeyboardEntryNotificationService::class.java))

        // Entry is retrieve, it's an entry to update
        var entryId: NodeId<UUID>? = null
-        intent.getParcelableExtra<NodeId<UUID>>(KEY_ENTRY)?.let { entryToUpdate ->
+        intent.getParcelableExtraCompat<NodeId<UUID>>(KEY_ENTRY)?.let { entryToUpdate ->
            intent.removeExtra(KEY_ENTRY)
            entryId = entryToUpdate
        }

        // Parent is retrieve, it's a new entry to create
        var parentId: NodeId<*>? = null
-        intent.getParcelableExtra<NodeId<*>>(KEY_PARENT)?.let { parent ->
+        intent.getParcelableExtraCompat<NodeId<*>>(KEY_PARENT)?.let { parent ->
            intent.removeExtra(KEY_PARENT)
            parentId = parent
        }
@@ -185,7 +212,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        mExternalFileHelper = ExternalFileHelper(this)
        mExternalFileHelper?.buildOpenDocument { uri ->
            uri?.let { attachmentToUploadUri ->
-                UriUtil.getFileData(this, attachmentToUploadUri)?.also { documentFile ->
+                attachmentToUploadUri.getDocumentFile(this)?.also { documentFile ->
                    documentFile.name?.let { fileName ->
                        if (documentFile.length() > MAX_WARNING_BINARY_FILE) {
                            FileTooBigDialogFragment.build(attachmentToUploadUri, fileName)
@@ -203,7 +230,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        // Lock button
        lockView?.setOnClickListener { lockAndExit() }
        // Save button
-        validateButton?.setOnClickListener { saveEntry() }
+        validateButton?.setOnClickListener { validateEntry() }

        mEntryEditViewModel.onTemplateChanged.observe(this) { template ->
            this.mTemplate = template
@@ -221,7 +248,7 @@ class EntryEditActivity : DatabaseLockActivity(),
                                this@EntryEditActivity,
                                templates
                            ).apply {
-                                iconDrawableFactory = mIconDrawableFactory
+                                iconDrawableFactory = mDatabase?.iconDrawableFactory
                            }
                            adapter = mTemplatesSelectorAdapter
                            val selectedTemplate = if (mTemplate != null)
@@ -272,14 +299,20 @@ class EntryEditActivity : DatabaseLockActivity(),
        mEntryEditViewModel.requestDateTimeSelection.observe(this) { dateInstant ->
            if (dateInstant.type == DateInstant.Type.TIME) {
                // Launch the time picker
-                val dateTime = DateTime(dateInstant.date)
-                TimePickerFragment.getInstance(dateTime.hourOfDay, dateTime.minuteOfHour)
-                    .show(supportFragmentManager, "TimePickerFragment")
+                MaterialTimePicker.Builder().build().apply {
+                    addOnPositiveButtonClickListener {
+                        mEntryEditViewModel.selectTime(this.hour, this.minute)
+                    }
+                    show(supportFragmentManager, "TimePickerFragment")
+                }
            } else {
                // Launch the date picker
-                val dateTime = DateTime(dateInstant.date)
-                DatePickerFragment.getInstance(dateTime.year, dateTime.monthOfYear - 1, dateTime.dayOfMonth)
-                    .show(supportFragmentManager, "DatePickerFragment")
+                MaterialDatePicker.Builder.datePicker().build().apply {
+                    addOnPositiveButtonClickListener {
+                        mEntryEditViewModel.selectDate(it)
+                    }
+                    show(supportFragmentManager, "DatePickerFragment")
+                }
            }
        }

@@ -368,19 +401,19 @@ class EntryEditActivity : DatabaseLockActivity(),
        return true
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)
        mAllowCustomFields = database?.allowEntryCustomFields() == true
        mAllowOTP = database?.allowOTP == true
        mEntryEditViewModel.loadDatabase(database)
        mTemplatesSelectorAdapter?.apply {
-            iconDrawableFactory = mIconDrawableFactory
+            iconDrawableFactory = mDatabase?.iconDrawableFactory
            notifyDataSetChanged()
        }
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -433,7 +466,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        finishForEntryResult(entry)
    }

-    private fun entryValidatedForKeyboardSelection(database: Database, entry: Entry) {
+    private fun entryValidatedForKeyboardSelection(database: ContextualDatabase, entry: Entry) {
        // Populate Magikeyboard with entry
        MagikeyboardService.populateKeyboardAndMoveAppToBackground(
            this,
@@ -444,7 +477,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        finishForEntryResult(entry)
    }

-    private fun entryValidatedForAutofillSelection(database: Database, entry: Entry) {
+    private fun entryValidatedForAutofillSelection(database: ContextualDatabase, entry: Entry) {
        // Build Autofill response with the entry selected
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            AutofillHelper.buildResponseAndSetResult(this@EntryEditActivity,
@@ -546,9 +579,9 @@ class EntryEditActivity : DatabaseLockActivity(),
    }

    /**
-     * Saves the new entry or update an existing entry in the database
+     * Validate the new entry or update an existing entry in the database
     */
-    private fun saveEntry() {
+    private fun validateEntry() {
        mAttachmentFileBinderManager?.stopUploadAllAttachments()
        mEntryEditViewModel.requestEntryInfoUpdate(mDatabase)
    }
@@ -630,14 +663,29 @@ class EntryEditActivity : DatabaseLockActivity(),
                )
                if (!addAttachmentEducationPerformed) {
                    val setupOtpView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_otp)
-                    setupOtpView != null
+                    val validateEntryEducationPerformed = setupOtpView != null
                            && setupOtpView.isVisible
                            && mEntryEditActivityEducation.checkAndPerformedSetUpOTPEducation(
                            setupOtpView,
                            {
                                setupOtp()
+                            },
+                            {
+                                performedNextEducation()
                            }
                    )
+                    if (!validateEntryEducationPerformed) {
+                        val entryValidateView = validateButton
+                        mAllowCustomFields
+                                && entryValidateView != null
+                                && entryValidateView.isVisible
+                                && mEntryEditActivityEducation.checkAndPerformedValidateEntryEducation(
+                                entryValidateView,
+                                {
+                                    validateEntry()
+                                }
+                        )
+                    }
                }
            }
        }
@@ -658,28 +706,16 @@ class EntryEditActivity : DatabaseLockActivity(),
                return true
            }
            android.R.id.home -> {
-                onBackPressed()
+                onDatabaseBackPressed()
            }
        }

        return super.onOptionsItemSelected(item)
    }

-    override fun onDateSet(datePicker: DatePicker?, year: Int, month: Int, day: Int) {
-        // To fix android 4.4 issue
-        // https://stackoverflow.com/questions/12436073/datepicker-ondatechangedlistener-called-twice
-        if (datePicker?.isShown == true) {
-            mEntryEditViewModel.selectDate(year, month, day)
-        }
-    }
-
-    override fun onTimeSet(timePicker: TimePicker?, hours: Int, minutes: Int) {
-        mEntryEditViewModel.selectTime(hours, minutes)
-    }
-
-    override fun onBackPressed() {
+    override fun onDatabaseBackPressed() {
        onApprovedBackPressed {
-            super@EntryEditActivity.onBackPressed()
+            super@EntryEditActivity.onDatabaseBackPressed()
        }
    }

@@ -734,7 +770,7 @@ class EntryEditActivity : DatabaseLockActivity(),
            return fragment.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                if (result.resultCode == Activity.RESULT_OK) {
                    entryAddedOrUpdatedListener.invoke(
-                        result.data?.getParcelableExtra(ADD_OR_UPDATE_ENTRY_KEY)
+                        result.data?.getParcelableExtraCompat(ADD_OR_UPDATE_ENTRY_KEY)
                    )
                } else {
                    entryAddedOrUpdatedListener.invoke(null)
@@ -747,7 +783,7 @@ class EntryEditActivity : DatabaseLockActivity(),
            return activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                if (result.resultCode == Activity.RESULT_OK) {
                    entryAddedOrUpdatedListener.invoke(
-                        result.data?.getParcelableExtra(ADD_OR_UPDATE_ENTRY_KEY)
+                        result.data?.getParcelableExtraCompat(ADD_OR_UPDATE_ENTRY_KEY)
                    )
                } else {
                    entryAddedOrUpdatedListener.invoke(null)
@@ -759,7 +795,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to update an existing entry by his [entryId]
         */
        fun launchToUpdate(activity: Activity,
-                           database: Database,
+                           database: ContextualDatabase,
                           entryId: NodeId<UUID>,
                           activityResultLauncher: ActivityResultLauncher<Intent>) {
            if (database.loaded && !database.isReadOnly) {
@@ -775,7 +811,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to add a new entry in an existent group
         */
        fun launchToCreate(activity: Activity,
-                           database: Database,
+                           database: ContextualDatabase,
                           groupId: NodeId<*>,
                           activityResultLauncher: ActivityResultLauncher<Intent>) {
            if (database.loaded && !database.isReadOnly) {
@@ -788,7 +824,7 @@ class EntryEditActivity : DatabaseLockActivity(),
        }

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

        fun launchToCreateForSave(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  groupId: NodeId<*>,
                                  searchInfo: SearchInfo) {
            if (database.loaded && !database.isReadOnly) {
@@ -825,7 +861,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to add a new entry in keyboard selection
         */
        fun launchForKeyboardSelectionResult(context: Context,
-                                             database: Database,
+                                             database: ContextualDatabase,
                                             groupId: NodeId<*>,
                                             searchInfo: SearchInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
@@ -846,7 +882,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         */
        @RequiresApi(api = Build.VERSION_CODES.O)
        fun launchForAutofillResult(activity: AppCompatActivity,
-                                    database: Database,
+                                    database: ContextualDatabase,
                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
                                    autofillComponent: AutofillComponent,
                                    groupId: NodeId<*>,
@@ -870,7 +906,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to register an updated entry (from autofill)
         */
        fun launchToUpdateForRegistration(context: Context,
-                                          database: Database,
+                                          database: ContextualDatabase,
                                          entryId: NodeId<UUID>,
                                          registerInfo: RegisterInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
@@ -890,7 +926,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         * Launch EntryEditActivity to register a new entry (from autofill)
         */
        fun launchToCreateForRegistration(context: Context,
-                                          database: Database,
+                                          database: ContextualDatabase,
                                          groupId: NodeId<*>,
                                          registerInfo: RegisterInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
@@ -26,11 +26,14 @@ import android.os.Bundle
 import android.widget.Toast
 import com.kunzisoft.keepass.R
 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.database.ContextualDatabase
+import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.utils.KeyboardUtil.isKeyboardActivatedInSettings
+import com.kunzisoft.keepass.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.WebDomain

 /**
 * Activity to search or select entry in database,
@@ -46,14 +49,14 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
        return false
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        val keySelectionBundle = intent.getBundleExtra(KEY_SELECTION_BUNDLE)
        if (keySelectionBundle != null) {
            // To manage package name
            var searchInfo = SearchInfo()
-            keySelectionBundle.getParcelable<SearchInfo>(KEY_SEARCH_INFO)?.let { mSearchInfo ->
+            keySelectionBundle.getParcelableCompat<SearchInfo>(KEY_SEARCH_INFO)?.let { mSearchInfo ->
                searchInfo = mSearchInfo
            }
            launch(database, searchInfo)
@@ -95,7 +98,7 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
        finish()
    }

-    private fun launchSelection(database: Database?,
+    private fun launchSelection(database: ContextualDatabase?,
                                sharedWebDomain: String?,
                                otpString: String?) {
        // Build domain search param
@@ -104,17 +107,17 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
            this.otpString = otpString
        }

-        SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+        WebDomain.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
            searchInfo.webDomain = concreteWebDomain
            launch(database, searchInfo)
        }
    }

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

        // Setting to integrate Magikeyboard
-        val searchShareForMagikeyboard = MagikeyboardService.activatedInSettings(this)
+        val searchShareForMagikeyboard = isKeyboardActivatedInSettings()

        // If database is open
        val readOnly = database?.isReadOnly != false
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -53,9 +53,10 @@ 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.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
-import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
@@ -64,8 +65,16 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 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.utils.DexUtil
+import com.kunzisoft.keepass.utils.MagikeyboardUtil
+import com.kunzisoft.keepass.utils.MenuUtil
+import com.kunzisoft.keepass.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.parseUri
+import com.kunzisoft.keepass.utils.UriUtil.isContributingUser
+import com.kunzisoft.keepass.utils.UriUtil.openUrl
+import com.kunzisoft.keepass.utils.allowCreateDocumentByStorageAccessFramework
 import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import java.io.FileNotFoundException

@@ -155,8 +164,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        mAdapterDatabaseHistory?.setOnFileDatabaseHistoryOpenListener { fileDatabaseHistoryEntityToOpen ->
            fileDatabaseHistoryEntityToOpen.databaseUri?.let { databaseFileUri ->
                launchPasswordActivity(
-                        databaseFileUri,
-                        fileDatabaseHistoryEntityToOpen.keyFileUri
+                    databaseFileUri,
+                    fileDatabaseHistoryEntityToOpen.keyFileUri,
+                    fileDatabaseHistoryEntityToOpen.hardwareKey
                )
            }
        }
@@ -176,7 +186,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                        && savedInstanceState.getBoolean(EXTRA_STAY, false))) {
            val databasePath = PreferencesUtil.getDefaultDatabasePath(this)

-            UriUtil.parse(databasePath)?.let { databaseFileUri ->
+            databasePath?.parseUri()?.let { databaseFileUri ->
                launchPasswordActivityWithPath(databaseFileUri)
            } ?: run {
                Log.i(TAG, "No default database to prepare")
@@ -186,7 +196,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        // Retrieve the database URI provided by file manager after an orientation change
        if (savedInstanceState != null
                && savedInstanceState.containsKey(EXTRA_DATABASE_URI)) {
-            mDatabaseFileUri = savedInstanceState.getParcelable(EXTRA_DATABASE_URI)
+            mDatabaseFileUri = savedInstanceState.getParcelableCompat(EXTRA_DATABASE_URI)
        }

        // Observe list of databases
@@ -225,7 +235,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)
        if (database != null) {
            launchGroupActivityIfLoaded(database)
@@ -233,7 +243,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -244,13 +254,14 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
            when (actionTask) {
                ACTION_DATABASE_CREATE_TASK,
                ACTION_DATABASE_LOAD_TASK -> {
-                    result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
+                    result.data?.getParcelableCompat<Uri>(DATABASE_URI_KEY)?.let { databaseUri ->
                        val mainCredential =
-                            result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
+                            result.data?.getParcelableCompat(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
                                ?: MainCredential()
                        databaseFilesViewModel.addDatabaseFile(
                            databaseUri,
-                            mainCredential.keyFileUri
+                            mainCredential.keyFileUri,
+                            mainCredential.hardwareKey
                        )
                    }
                }
@@ -268,18 +279,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                    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()
        }
+        coordinatorLayout.showActionErrorIfNeeded(result)
    }

    /**
@@ -297,10 +298,11 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
    }

-    private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
+    private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?, hardwareKey: HardwareKey?) {
        MainCredentialActivity.launch(this,
                databaseUri,
                keyFile,
+                hardwareKey,
                { exception ->
                    fileNoFoundAction(exception)
                },
@@ -309,7 +311,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                mAutofillActivityResultLauncher)
    }

-    private fun launchGroupActivityIfLoaded(database: Database) {
+    private fun launchGroupActivityIfLoaded(database: ContextualDatabase) {
        if (database.loaded) {
            GroupActivity.launch(this,
                database,
@@ -321,7 +323,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
    }

    private fun launchPasswordActivityWithPath(databaseUri: Uri) {
-        launchPasswordActivity(databaseUri, null)
+        launchPasswordActivity(databaseUri, null, null)
        // Delete flickering for kitkat <=
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
            overridePendingTransition(0, 0)
@@ -331,12 +333,12 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
        super.onResume()

        // Define special title
-        specialTitle?.isVisible = UriUtil.contributingUser(this)
+        specialTitle?.isVisible = this.isContributingUser()

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

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
-            android.R.id.home -> UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
+            android.R.id.home -> this.openUrl(R.string.file_manager_explanation_url)
        }
        MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
        return super.onOptionsItemSelected(item)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -19,21 +19,27 @@
 package com.kunzisoft.keepass.activities

 import android.app.Activity
-import android.app.DatePickerDialog
 import android.app.SearchManager
-import android.app.TimePickerDialog
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.graphics.PorterDuff
 import android.net.Uri
-import android.os.*
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.Parcel
+import android.os.Parcelable
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
@@ -49,8 +55,13 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.timepicker.MaterialTimePicker
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.*
+import com.kunzisoft.keepass.activities.dialogs.GroupDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.MainCredentialDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.fragments.GroupFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
@@ -59,21 +70,24 @@ import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.adapters.BreadcrumbAdapter
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.Entry
+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.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.database.search.SearchParameters
 import com.kunzisoft.keepass.education.GroupActivityEducation
 import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.NEW_NODES_KEY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
 import com.kunzisoft.keepass.settings.PreferencesUtil
@@ -81,16 +95,28 @@ import com.kunzisoft.keepass.settings.SettingsActivity
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.BACK_PREVIOUS_KEYBOARD_ACTION
-import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.view.*
+import com.kunzisoft.keepass.utils.KeyboardUtil.showKeyboard
+import com.kunzisoft.keepass.utils.UriUtil.openUrl
+import com.kunzisoft.keepass.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
+import com.kunzisoft.keepass.utils.getParcelableList
+import com.kunzisoft.keepass.utils.putParcelableList
+import com.kunzisoft.keepass.utils.readParcelableCompat
+import com.kunzisoft.keepass.view.AddNodeButtonView
+import com.kunzisoft.keepass.view.NavigationDatabaseView
+import com.kunzisoft.keepass.view.SearchFiltersView
+import com.kunzisoft.keepass.view.ToolbarAction
+import com.kunzisoft.keepass.view.WindowInsetPosition
+import com.kunzisoft.keepass.view.applyWindowInsets
+import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.view.setTransparentNavigationBar
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
+import com.kunzisoft.keepass.view.updateLockPaddingLeft
 import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
 import com.kunzisoft.keepass.viewmodels.GroupViewModel
-import org.joda.time.DateTime


 class GroupActivity : DatabaseLockActivity(),
-        DatePickerDialog.OnDateSetListener,
-        TimePickerDialog.OnTimeSetListener,
        GroupFragment.NodeClickListener,
        GroupFragment.NodesActionMenuListener,
        GroupFragment.OnScrollListener,
@@ -99,18 +125,19 @@ class GroupActivity : DatabaseLockActivity(),
        MainCredentialDialogFragment.AskMainCredentialDialogListener {

    // Views
+    private var header: ViewGroup? = null
+    private var footer: ViewGroup? = null
    private var drawerLayout: DrawerLayout? = null
    private var databaseNavView: NavigationDatabaseView? = null
    private var coordinatorLayout: CoordinatorLayout? = null
+    private var coordinatorError: CoordinatorLayout? = null
    private var lockView: View? = null
    private var toolbar: Toolbar? = null
-    private var databaseNameContainer: ViewGroup? = null
    private var databaseModifiedView: ImageView? = null
    private var databaseColorView: ImageView? = null
    private var databaseNameView: TextView? = null
    private var searchView: SearchView? = null
    private var searchFiltersView: SearchFiltersView? = null
-    private var toolbarBreadcrumb: Toolbar? = null
    private var toolbarAction: ToolbarAction? = null
    private var numberChildrenView: TextView? = null
    private var addNodeButtonView: AddNodeButtonView? = null
@@ -136,6 +163,7 @@ class GroupActivity : DatabaseLockActivity(),

    // Manage group
    private var mSearchState: SearchState? = null
+    private var mAutoSearch: Boolean = false // To mainly manage keyboard
    private var mMainGroupState: GroupState? = null // Group state, not a search
    private var mRootGroup: Group? = null // Root group in the tree
    private var mMainGroup: Group? = null // Main group currently in memory
@@ -175,22 +203,16 @@ class GroupActivity : DatabaseLockActivity(),
        }
    }
    private val mOnSearchActionExpandListener = object : MenuItem.OnActionExpandListener {
-        override fun onMenuItemActionExpand(p0: MenuItem?): Boolean {
+        override fun onMenuItemActionExpand(p0: MenuItem): Boolean {
            searchFiltersView?.visibility = View.VISIBLE
            searchView?.setOnQueryTextListener(mOnSearchQueryTextListener)
            searchFiltersView?.onParametersChangeListener = mOnSearchFiltersChangeListener

            addSearch()
-            //loadGroup()
-
-            // Back to previous keyboard
-            if (PreferencesUtil.isKeyboardPreviousSearchEnable(this@GroupActivity)) {
-                sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
-            }
            return true
        }

-        override fun onMenuItemActionCollapse(p0: MenuItem?): Boolean {
+        override fun onMenuItemActionCollapse(p0: MenuItem): Boolean {
            searchFiltersView?.onParametersChangeListener = null
            searchView?.setOnQueryTextListener(null)
            searchFiltersView?.visibility = View.GONE
@@ -200,6 +222,22 @@ class GroupActivity : DatabaseLockActivity(),
            return true
        }
    }
+    private val mOnSearchTextFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
+        if (!mAutoSearch
+            && hasFocus
+            && PreferencesUtil.isKeyboardPreviousSearchEnable(this@GroupActivity)) {
+            // Change to the previous keyboard and show it
+            sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
+            view.showKeyboard()
+        }
+    }
+
+    private val mEntryActivityResultLauncher = EntryEditActivity.registerForEntryResult(this) { entryId ->
+        entryId?.let {
+            // Simply refresh the list when entry is updated
+            loadGroup()
+        } ?: Log.e(this.javaClass.name, "Entry cannot be retrieved in Activity Result")
+    }

    private fun addSearch() {
        finishNodeAction()
@@ -210,7 +248,6 @@ class GroupActivity : DatabaseLockActivity(),
    }

    private fun removeSearch() {
-        finishNodeAction()
        mSearchState = null
        intent.removeExtra(AUTO_SEARCH_KEY)
        if (Intent.ACTION_SEARCH == intent.action) {
@@ -236,23 +273,31 @@ class GroupActivity : DatabaseLockActivity(),
        setContentView(layoutInflater.inflate(R.layout.activity_group, null))

        // Initialize views
+        header = findViewById(R.id.activity_group_header)
+        footer = findViewById(R.id.activity_group_footer)
        drawerLayout = findViewById(R.id.drawer_layout)
        databaseNavView = findViewById(R.id.database_nav_view)
        coordinatorLayout = findViewById(R.id.group_coordinator)
+        coordinatorError = findViewById(R.id.error_coordinator)
        numberChildrenView = findViewById(R.id.group_numbers)
        addNodeButtonView = findViewById(R.id.add_node_button)
        toolbar = findViewById(R.id.toolbar)
-        databaseNameContainer = findViewById(R.id.database_name_container)
        databaseModifiedView = findViewById(R.id.database_modified)
        databaseColorView = findViewById(R.id.database_color)
        databaseNameView = findViewById(R.id.database_name)
        searchFiltersView = findViewById(R.id.search_filters)
-        toolbarBreadcrumb = findViewById(R.id.toolbar_breadcrumb)
        breadcrumbListView = findViewById(R.id.breadcrumb_list)
        toolbarAction = findViewById(R.id.toolbar_action)
        lockView = findViewById(R.id.lock_button)
        loadingView = findViewById(R.id.loading)

+        // To apply fit window with transparency
+        setTransparentNavigationBar {
+            header?.applyWindowInsets(WindowInsetPosition.TOP)
+            coordinatorLayout?.applyWindowInsets(WindowInsetPosition.LEGIT_TOP)
+            footer?.applyWindowInsets(WindowInsetPosition.BOTTOM)
+        }
+
        lockView?.setOnClickListener {
            lockAndExit()
        }
@@ -302,7 +347,7 @@ class GroupActivity : DatabaseLockActivity(),
                        lockAndExit()
                    }
                    R.id.menu_contribute -> {
-                        UriUtil.gotoUrl(this@GroupActivity, R.string.contribution_url)
+                        this@GroupActivity.openUrl(R.string.contribution_url)
                    }
                    R.id.menu_about -> {
                        startActivity(Intent(this@GroupActivity, AboutActivity::class.java))
@@ -361,7 +406,7 @@ class GroupActivity : DatabaseLockActivity(),
                savedInstanceState.remove(REQUEST_STARTUP_SEARCH_KEY)
            }
            if (savedInstanceState.containsKey(OLD_GROUP_TO_UPDATE_KEY)) {
-                mOldGroupToUpdate = savedInstanceState.getParcelable(OLD_GROUP_TO_UPDATE_KEY)
+                mOldGroupToUpdate = savedInstanceState.getParcelableCompat(OLD_GROUP_TO_UPDATE_KEY)
                savedInstanceState.remove(OLD_GROUP_TO_UPDATE_KEY)
            }
        }
@@ -369,9 +414,8 @@ class GroupActivity : DatabaseLockActivity(),
        // Retrieve previous groups
        if (savedInstanceState != null && savedInstanceState.containsKey(PREVIOUS_GROUPS_IDS_KEY)) {
            try {
-                mPreviousGroupsIds =
-                    (savedInstanceState.getParcelableArray(PREVIOUS_GROUPS_IDS_KEY)
-                        ?.map { it as GroupState })?.toMutableList() ?: mutableListOf()
+                mPreviousGroupsIds = savedInstanceState.getParcelableList(PREVIOUS_GROUPS_IDS_KEY)
+                    ?: mutableListOf()
            } catch (e: Exception) {
                Log.e(TAG, "Unable to retrieve previous groups", e)
            }
@@ -430,18 +474,20 @@ class GroupActivity : DatabaseLockActivity(),
        mGroupEditViewModel.requestDateTimeSelection.observe(this) { dateInstant ->
            if (dateInstant.type == DateInstant.Type.TIME) {
                // Launch the time picker
-                val dateTime = DateTime(dateInstant.date)
-                TimePickerFragment.getInstance(dateTime.hourOfDay, dateTime.minuteOfHour)
-                    .show(supportFragmentManager, "TimePickerFragment")
+                MaterialTimePicker.Builder().build().apply {
+                    addOnPositiveButtonClickListener {
+                        mGroupEditViewModel.selectTime(this.hour, this.minute)
+                    }
+                    show(supportFragmentManager, "TimePickerFragment")
+                }
            } else {
                // Launch the date picker
-                val dateTime = DateTime(dateInstant.date)
-                DatePickerFragment.getInstance(
-                    dateTime.year,
-                    dateTime.monthOfYear - 1,
-                    dateTime.dayOfMonth
-                )
-                    .show(supportFragmentManager, "DatePickerFragment")
+                MaterialDatePicker.Builder.datePicker().build().apply {
+                    addOnPositiveButtonClickListener {
+                        mGroupEditViewModel.selectDate(it)
+                    }
+                    show(supportFragmentManager, "DatePickerFragment")
+                }
            }
        }

@@ -475,14 +521,12 @@ class GroupActivity : DatabaseLockActivity(),
                    EntrySelectionHelper.doSpecialAction(intent,
                        {
                            mMainGroup?.nodeId?.let { currentParentGroupId ->
-                                mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
-                                    EntryEditActivity.launchToCreate(
-                                        this@GroupActivity,
-                                        database,
-                                        currentParentGroupId,
-                                        resultLauncher
-                                    )
-                                }
+                                EntryEditActivity.launchToCreate(
+                                    this@GroupActivity,
+                                    database,
+                                    currentParentGroupId,
+                                    mEntryActivityResultLauncher
+                                )
                            }
                        },
                        {
@@ -570,7 +614,7 @@ class GroupActivity : DatabaseLockActivity(),
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        mGroupEditViewModel.setGroupNamesNotAllowed(database?.groupNamesNotAllowed)
@@ -614,15 +658,19 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
        super.onDatabaseActionFinished(database, actionTask, result)

-        var newNodes: List<Node> = ArrayList()
-        result.data?.getBundle(NEW_NODES_KEY)?.let { newNodesBundle ->
-            newNodes = getListNodesFromBundle(database, newNodesBundle)
+        var entry: Entry? = null
+        try {
+            result.data?.getBundle(NEW_NODES_KEY)?.let { newNodesBundle ->
+                entry = getListNodesFromBundle(database, newNodesBundle)[0] as Entry
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to retrieve entry action for selection", e)
        }

        when (actionTask) {
@@ -639,27 +687,15 @@ class GroupActivity : DatabaseLockActivity(),
                            // Save not used
                        },
                        {
-                            try {
-                                val entry = newNodes[0] as Entry
-                                entrySelectedForKeyboardSelection(database, entry)
-                            } catch (e: Exception) {
-                                Log.e(
-                                    TAG,
-                                    "Unable to perform action for keyboard selection after entry update",
-                                    e
-                                )
+                            // Keyboard selection
+                            entry?.let {
+                                entrySelectedForKeyboardSelection(database, it)
                            }
                        },
                        { _, _ ->
-                            try {
-                                val entry = newNodes[0] as Entry
-                                entrySelectedForAutofillSelection(database, entry)
-                            } catch (e: Exception) {
-                                Log.e(
-                                    TAG,
-                                    "Unable to perform action for autofill selection after entry update",
-                                    e
-                                )
+                            // Autofill selection
+                            entry?.let {
+                                entrySelectedForAutofillSelection(database, it)
                            }
                        },
                        {
@@ -668,26 +704,12 @@ class GroupActivity : DatabaseLockActivity(),
                    )
                }
            }
-            ACTION_DATABASE_UPDATE_GROUP_TASK -> {
-                if (result.isSuccess) {
-                    try {
-                        if (mMainGroup == newNodes[0] as Group)
-                            reloadCurrentGroup()
-                    } catch (e: Exception) {
-                        Log.e(
-                            TAG,
-                            "Unable to perform action after group update",
-                            e
-                        )
-                    }
-                }
-            }
        }

-        coordinatorLayout?.showActionErrorIfNeeded(result)
-        if (!result.isSuccess) {
-            reloadCurrentGroup()
-        }
+        coordinatorError?.showActionErrorIfNeeded(result)
+
+        // Reload the group
+        loadGroup()
        finishNodeAction()
    }

@@ -708,13 +730,14 @@ class GroupActivity : DatabaseLockActivity(),
    private fun manageIntent(intent: Intent?) {
        intent?.let {
            if (intent.extras?.containsKey(GROUP_STATE_KEY) == true) {
-                mMainGroupState = intent.getParcelableExtra(GROUP_STATE_KEY)
+                mMainGroupState = intent.getParcelableExtraCompat(GROUP_STATE_KEY)
                intent.removeExtra(GROUP_STATE_KEY)
            }
            // To transform KEY_SEARCH_INFO in ACTION_SEARCH
            transformSearchInfoIntent(intent)
            // Get search query
            if (intent.action == Intent.ACTION_SEARCH) {
+                mAutoSearch = true
                val stringQuery = intent.getStringExtra(SearchManager.QUERY)?.trim { it <= ' ' } ?: ""
                intent.action = Intent.ACTION_DEFAULT
                intent.removeExtra(SearchManager.QUERY)
@@ -739,7 +762,7 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putParcelableArray(PREVIOUS_GROUPS_IDS_KEY, mPreviousGroupsIds.toTypedArray())
+        outState.putParcelableList(PREVIOUS_GROUPS_IDS_KEY, mPreviousGroupsIds)
        mOldGroupToUpdate?.let {
            outState.putParcelable(OLD_GROUP_TO_UPDATE_KEY, it)
        }
@@ -800,7 +823,7 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onNodeClick(
-        database: Database,
+        database: ContextualDatabase,
        node: Node
    ) {
        when (node.type) {
@@ -814,7 +837,6 @@ class GroupActivity : DatabaseLockActivity(),
                }
                // Open child group
                loadMainGroup(GroupState(group.nodeId, 0))
-
            } catch (e: ClassCastException) {
                Log.e(TAG, "Node can't be cast in Group")
            }
@@ -823,22 +845,22 @@ class GroupActivity : DatabaseLockActivity(),
                val entryVersioned = node as Entry
                EntrySelectionHelper.doSpecialAction(intent,
                    {
-                        mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
-                            EntryActivity.launch(
-                                this@GroupActivity,
-                                database,
-                                entryVersioned.nodeId,
-                                resultLauncher
-                            )
-                        }
+                        EntryActivity.launch(
+                            this@GroupActivity,
+                            database,
+                            entryVersioned.nodeId,
+                            mEntryActivityResultLauncher
+                        )
+                        // Do not reload group here
                    },
                    {
                        // Nothing here, a search is simply performed
                    },
                    { searchInfo ->
-                        if (!database.isReadOnly)
+                        if (!database.isReadOnly) {
                            entrySelectedForSave(database, entryVersioned, searchInfo)
-                        else
+                            loadGroup()
+                        } else
                            finish()
                    },
                    { searchInfo ->
@@ -849,6 +871,7 @@ class GroupActivity : DatabaseLockActivity(),
                            updateEntryWithSearchInfo(database, entryVersioned, searchInfo)
                        }
                        entrySelectedForKeyboardSelection(database, entryVersioned)
+                        loadGroup()
                    },
                    { searchInfo, _ ->
                        if (!database.isReadOnly
@@ -858,23 +881,23 @@ class GroupActivity : DatabaseLockActivity(),
                            updateEntryWithSearchInfo(database, entryVersioned, searchInfo)
                        }
                        entrySelectedForAutofillSelection(database, entryVersioned)
+                        loadGroup()
                    },
                    { registerInfo ->
-                        if (!database.isReadOnly)
+                        if (!database.isReadOnly) {
                            entrySelectedForRegistration(database, entryVersioned, registerInfo)
-                        else
+                            loadGroup()
+                        } else
                            finish()
                    })
            } catch (e: ClassCastException) {
                Log.e(TAG, "Node can't be cast in Entry")
            }
        }
-
-        reloadGroupIfSearch()
    }

-    private fun entrySelectedForSave(database: Database, entry: Entry, searchInfo: SearchInfo) {
-        reloadCurrentGroup()
+    private fun entrySelectedForSave(database: ContextualDatabase, entry: Entry, searchInfo: SearchInfo) {
+        removeSearch()
        // Save to update the entry
        EntryEditActivity.launchToUpdateForSave(
            this@GroupActivity,
@@ -885,8 +908,8 @@ class GroupActivity : DatabaseLockActivity(),
        onLaunchActivitySpecialMode()
    }

-    private fun entrySelectedForKeyboardSelection(database: Database, entry: Entry) {
-        reloadCurrentGroup()
+    private fun entrySelectedForKeyboardSelection(database: ContextualDatabase, entry: Entry) {
+        removeSearch()
        // Populate Magikeyboard with entry
        MagikeyboardService.populateKeyboardAndMoveAppToBackground(
            this,
@@ -895,7 +918,8 @@ class GroupActivity : DatabaseLockActivity(),
        onValidateSpecialMode()
    }

-    private fun entrySelectedForAutofillSelection(database: Database, entry: Entry) {
+    private fun entrySelectedForAutofillSelection(database: ContextualDatabase, entry: Entry) {
+        removeSearch()
        // Build response with the entry selected
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            AutofillHelper.buildResponseAndSetResult(
@@ -908,11 +932,11 @@ class GroupActivity : DatabaseLockActivity(),
    }

    private fun entrySelectedForRegistration(
-        database: Database,
+        database: ContextualDatabase,
        entry: Entry,
        registerInfo: RegisterInfo?
    ) {
-        reloadCurrentGroup()
+        removeSearch()
        // Registration to update the entry
        EntryEditActivity.launchToUpdateForRegistration(
            this@GroupActivity,
@@ -924,7 +948,7 @@ class GroupActivity : DatabaseLockActivity(),
    }

    private fun updateEntryWithSearchInfo(
-        database: Database,
+        database: ContextualDatabase,
        entry: Entry,
        searchInfo: SearchInfo
    ) {
@@ -941,30 +965,12 @@ class GroupActivity : DatabaseLockActivity(),
        }
    }

-    override fun onDateSet(datePicker: DatePicker?, year: Int, month: Int, day: Int) {
-        // To fix android 4.4 issue
-        // https://stackoverflow.com/questions/12436073/datepicker-ondatechangedlistener-called-twice
-        if (datePicker?.isShown == true) {
-            mGroupEditViewModel.selectDate(year, month, day)
-        }
-    }
-
-    override fun onTimeSet(view: TimePicker?, hours: Int, minutes: Int) {
-        mGroupEditViewModel.selectTime(hours, minutes)
-    }
-
    private fun finishNodeAction() {
        actionNodeMode?.finish()
    }

-    private fun reloadGroupIfSearch() {
-        if (Intent.ACTION_SEARCH == intent.action) {
-            reloadCurrentGroup()
-        }
-    }
-
    override fun onNodeSelected(
-        database: Database,
+        database: ContextualDatabase,
        nodes: List<Node>
    ): Boolean {
        if (nodes.isNotEmpty()) {
@@ -990,7 +996,7 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onOpenMenuClick(
-        database: Database,
+        database: ContextualDatabase,
        node: Node
    ): Boolean {
        finishNodeAction()
@@ -999,7 +1005,7 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onEditMenuClick(
-        database: Database,
+        database: ContextualDatabase,
        node: Node
    ): Boolean {
        finishNodeAction()
@@ -1008,17 +1014,14 @@ class GroupActivity : DatabaseLockActivity(),
                launchDialogForGroupUpdate(node as Group)
            }
            Type.ENTRY -> {
-                mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
-                    EntryEditActivity.launchToUpdate(
-                        this@GroupActivity,
-                        database,
-                        (node as Entry).nodeId,
-                        resultLauncher
-                    )
-                }
+                EntryEditActivity.launchToUpdate(
+                    this@GroupActivity,
+                    database,
+                    (node as Entry).nodeId,
+                    mEntryActivityResultLauncher
+                )
            }
        }
-        reloadGroupIfSearch()
        return true
    }

@@ -1047,27 +1050,27 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onCopyMenuClick(
-        database: Database,
+        database: ContextualDatabase,
        nodes: List<Node>
    ): Boolean {
        actionNodeMode?.invalidate()
-
-        // Nothing here fragment calls onPasteMenuClick internally
+        removeSearch()
+        loadGroup()
        return true
    }

    override fun onMoveMenuClick(
-        database: Database,
+        database: ContextualDatabase,
        nodes: List<Node>
    ): Boolean {
        actionNodeMode?.invalidate()
-
-        // Nothing here fragment calls onPasteMenuClick internally
+        removeSearch()
+        loadGroup()
        return true
    }

    override fun onPasteMenuClick(
-        database: Database,
+        database: ContextualDatabase,
        pasteMode: GroupFragment.PasteMode?,
        nodes: List<Node>
    ): Boolean {
@@ -1092,24 +1095,27 @@ class GroupActivity : DatabaseLockActivity(),
    }

    override fun onDeleteMenuClick(
-        database: Database,
+        database: ContextualDatabase,
        nodes: List<Node>
    ): Boolean {
        deleteNodes(nodes)
        finishNodeAction()
-        reloadGroupIfSearch()
        return true
    }

-    override fun onAskMainCredentialDialogPositiveClick(databaseUri: Uri?,
-                                                        mainCredential: MainCredential) {
+    override fun onAskMainCredentialDialogPositiveClick(
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) {
        databaseUri?.let {
            mergeDatabaseFrom(it, mainCredential)
        }
    }

-    override fun onAskMainCredentialDialogNegativeClick(databaseUri: Uri?,
-                                                        mainCredential: MainCredential) { }
+    override fun onAskMainCredentialDialogNegativeClick(
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) { }

    override fun onResume() {
        super.onResume()
@@ -1122,6 +1128,8 @@ class GroupActivity : DatabaseLockActivity(),
        }
        // Padding if lock button visible
        toolbarAction?.updateLockPaddingLeft()
+
+        loadGroup()
    }

    override fun onPause() {
@@ -1134,6 +1142,8 @@ class GroupActivity : DatabaseLockActivity(),

    private fun addSearchQueryInSearchView(searchQuery: String) {
        searchView?.setOnQueryTextListener(null)
+        if (mAutoSearch)
+            searchView?.clearFocus()
        searchView?.setQuery(searchQuery, false)
        searchView?.setOnQueryTextListener(mOnSearchQueryTextListener)
    }
@@ -1180,6 +1190,7 @@ class GroupActivity : DatabaseLockActivity(),
            it.setOnActionExpandListener(mOnSearchActionExpandListener)
            searchView = it.actionView as SearchView?
            searchView?.apply {
+                setOnQueryTextFocusChangeListener(mOnSearchTextFocusChangeListener)
                val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager?
                (searchManager?.getSearchableInfo(
                    ComponentName(this@GroupActivity, GroupActivity::class.java)
@@ -1195,13 +1206,14 @@ class GroupActivity : DatabaseLockActivity(),
                }
            }
            if (it.isActionViewExpanded) {
-                toolbarBreadcrumb?.visibility = View.GONE
+                breadcrumbListView?.visibility = View.GONE
                searchFiltersView?.visibility = View.VISIBLE
            } else {
                searchFiltersView?.visibility = View.GONE
-                toolbarBreadcrumb?.visibility = View.VISIBLE
+                breadcrumbListView?.visibility = View.VISIBLE
            }
            mLockSearchListeners = false
+            mAutoSearch = false
        }

        super.onCreateOptionsMenu(menu)
@@ -1320,6 +1332,12 @@ class GroupActivity : DatabaseLockActivity(),
        mGroupFragment?.onSortSelected(sortNodeEnum, sortNodeParameters)
    }

+    override fun onCancelSpecialMode() {
+        super.onCancelSpecialMode()
+        removeSearch()
+        loadGroup()
+    }
+
    override fun startActivity(intent: Intent) {
        // Get the intent, verify the action and get the query
        if (Intent.ACTION_SEARCH == intent.action) {
@@ -1336,12 +1354,7 @@ class GroupActivity : DatabaseLockActivity(),
        }
    }

-    private fun reloadCurrentGroup() {
-        removeSearch()
-        loadGroup()
-    }
-
-    override fun onBackPressed() {
+    override fun onDatabaseBackPressed() {
        if (mGroupFragment?.nodeActionSelectionMode == true) {
            finishNodeAction()
        } else {
@@ -1349,8 +1362,8 @@ class GroupActivity : DatabaseLockActivity(),
            if (mRootGroup != null && mRootGroup != mCurrentGroup) {
                when {
                    Intent.ACTION_SEARCH == intent.action -> {
-                        // Remove the search
-                        reloadCurrentGroup()
+                        removeSearch()
+                        loadGroup()
                    }
                    mPreviousGroupsIds.isEmpty() -> {
                        super.onRegularBackPressed()
@@ -1368,7 +1381,6 @@ class GroupActivity : DatabaseLockActivity(),
                EntrySelectionHelper.removeInfoFromIntent(intent)
                if (PreferencesUtil.isLockDatabaseWhenBackButtonOnRootClicked(this)) {
                    lockAndExit()
-                    super.onRegularBackPressed()
                } else {
                    backToTheAppCaller()
                }
@@ -1382,8 +1394,7 @@ class GroupActivity : DatabaseLockActivity(),
    ) : Parcelable {

        private constructor(parcel: Parcel) : this(
-            parcel.readParcelable<SearchParameters>
-                (SearchParameters::class.java.classLoader) ?: SearchParameters(),
+            parcel.readParcelableCompat<SearchParameters>() ?: SearchParameters(),
            parcel.readInt()
        )

@@ -1411,7 +1422,7 @@ class GroupActivity : DatabaseLockActivity(),
    ) : Parcelable {

        private constructor(parcel: Parcel) : this(
-            parcel.readParcelable<NodeId<*>>(NodeId::class.java.classLoader),
+            parcel.readParcelableCompat<NodeId<*>>(),
            parcel.readInt()
        )

@@ -1476,7 +1487,7 @@ class GroupActivity : DatabaseLockActivity(),
         * -------------------------
         */
        fun launch(context: Context,
-                   database: Database,
+                   database: ContextualDatabase,
                   autoSearch: Boolean = false) {
            if (database.loaded) {
                checkTimeAndBuildIntent(context, null) { intent ->
@@ -1492,7 +1503,7 @@ class GroupActivity : DatabaseLockActivity(),
         * -------------------------
         */
        fun launchForSearchResult(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  searchInfo: SearchInfo,
                                  autoSearch: Boolean = false) {
            if (database.loaded) {
@@ -1513,7 +1524,7 @@ class GroupActivity : DatabaseLockActivity(),
         * -------------------------
         */
        fun launchForSaveResult(context: Context,
-                                database: Database,
+                                database: ContextualDatabase,
                                searchInfo: SearchInfo,
                                autoSearch: Boolean = false) {
            if (database.loaded && !database.isReadOnly) {
@@ -1534,7 +1545,7 @@ class GroupActivity : DatabaseLockActivity(),
         * -------------------------
         */
        fun launchForKeyboardSelectionResult(context: Context,
-                                             database: Database,
+                                             database: ContextualDatabase,
                                             searchInfo: SearchInfo? = null,
                                             autoSearch: Boolean = false) {
            if (database.loaded) {
@@ -1556,7 +1567,7 @@ class GroupActivity : DatabaseLockActivity(),
         */
        @RequiresApi(api = Build.VERSION_CODES.O)
        fun launchForAutofillResult(activity: AppCompatActivity,
-                                    database: Database,
+                                    database: ContextualDatabase,
                                    activityResultLaunch: ActivityResultLauncher<Intent>?,
                                    autofillComponent: AutofillComponent,
                                    searchInfo: SearchInfo? = null,
@@ -1581,7 +1592,7 @@ class GroupActivity : DatabaseLockActivity(),
         * -------------------------
         */
        fun launchForRegistration(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  registerInfo: RegisterInfo? = null) {
            if (database.loaded && !database.isReadOnly) {
                checkTimeAndBuildIntent(context, null) { intent ->
@@ -1601,7 +1612,7 @@ class GroupActivity : DatabaseLockActivity(),
         * -------------------------
         */
        fun launch(activity: AppCompatActivity,
-                   database: Database,
+                   database: ContextualDatabase,
                   onValidateSpecialMode: () -> Unit,
                   onCancelSpecialMode: () -> Unit,
                   onLaunchActivitySpecialMode: () -> Unit,
--- a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
@@ -41,16 +41,24 @@ 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.ContextualDatabase
 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.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
+import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
+import com.kunzisoft.keepass.utils.UriUtil.openUrl
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.view.updateLockPaddingLeft
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext


 class IconPickerActivity : DatabaseLockActivity() {
@@ -96,7 +104,7 @@ class IconPickerActivity : DatabaseLockActivity() {
            lockAndExit()
        }

-        intent?.getParcelableExtra<IconImage>(EXTRA_ICON)?.let {
+        intent?.getParcelableExtraCompat<IconImage>(EXTRA_ICON)?.let {
            mIconImage = it
        }

@@ -112,7 +120,7 @@ class IconPickerActivity : DatabaseLockActivity() {
                ), ICON_PICKER_FRAGMENT_TAG)
            }
        } else {
-            mIconImage = savedInstanceState.getParcelable(EXTRA_ICON) ?: mIconImage
+            mIconImage = savedInstanceState.getParcelableCompat(EXTRA_ICON) ?: mIconImage
        }

        iconPickerViewModel.standardIconPicked.observe(this) { iconStandard ->
@@ -166,7 +174,7 @@ class IconPickerActivity : DatabaseLockActivity() {
        return true
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        if (database?.allowCustomIcons == true) {
@@ -231,7 +239,7 @@ class IconPickerActivity : DatabaseLockActivity() {
                if (mCustomIconsSelectionMode) {
                    iconPickerViewModel.deselectAllCustomIcons()
                } else {
-                    onBackPressed()
+                    onDatabaseBackPressed()
                }
            }
            R.id.menu_edit -> {
@@ -243,7 +251,7 @@ class IconPickerActivity : DatabaseLockActivity() {
                }
            }
            R.id.menu_external_icon -> {
-                UriUtil.gotoUrl(this, R.string.external_icon_url)
+                this.openUrl(R.string.external_icon_url)
            }
        }

@@ -257,7 +265,7 @@ class IconPickerActivity : DatabaseLockActivity() {
                // 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 ->
+                    iconToUploadUri?.getDocumentFile(this@IconPickerActivity)?.also { documentFile ->
                        if (documentFile.length() > MAX_ICON_SIZE) {
                            iconCustomState.errorStringId = R.string.error_file_to_big
                        } else {
@@ -321,9 +329,9 @@ class IconPickerActivity : DatabaseLockActivity() {
        })
    }

-    override fun onBackPressed() {
+    override fun onDatabaseBackPressed() {
        setResult()
-        super.onBackPressed()
+        super.onDatabaseBackPressed()
    }

    companion object {
@@ -336,7 +344,7 @@ class IconPickerActivity : DatabaseLockActivity() {
                                           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())
+                    listener.invoke(result.data?.getParcelableExtraCompat(EXTRA_ICON) ?: IconImage())
                }
            }
        }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
@@ -33,9 +33,10 @@ import androidx.appcompat.widget.Toolbar
 import com.igreenwood.loupe.Loupe
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
 import kotlin.math.max

 class ImageViewerActivity : DatabaseLockActivity() {
@@ -100,12 +101,12 @@ class ImageViewerActivity : DatabaseLockActivity() {
        return true
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        try {
            progressView.visibility = View.VISIBLE
-            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
+            intent.getParcelableExtraCompat<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->

                supportActionBar?.title = attachment.name

--- a/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt
@@ -96,7 +96,7 @@ class KeyGeneratorActivity : DatabaseLockActivity() {
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            android.R.id.home -> {
-                onBackPressed()
+                onDatabaseBackPressed()
            }
            R.id.menu_generate -> {
                keyGeneratorViewModel.requireKeyGeneration()
@@ -106,9 +106,9 @@ class KeyGeneratorActivity : DatabaseLockActivity() {
        return super.onOptionsItemSelected(item)
    }

-    override fun onBackPressed() {
+    override fun onDatabaseBackPressed() {
        setResult(Activity.RESULT_CANCELED, Intent())
-        super.onBackPressed()
+        super.onDatabaseBackPressed()
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt
@@ -1,6 +1,6 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
+ *
 * This file is part of KeePassDX.
 *
 *  KeePassDX is free software: you can redistribute it and/or modify
@@ -55,24 +55,30 @@ import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.biometric.AdvancedUnlockFragment
 import com.kunzisoft.keepass.biometric.AdvancedUnlockManager
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.model.*
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.CIPHER_DATABASE_KEY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 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.AdvancedUnlockSettingsActivity
+import com.kunzisoft.keepass.settings.AppearanceSettingsActivity
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity
 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.utils.UriUtil.getUri
+import com.kunzisoft.keepass.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
 import com.kunzisoft.keepass.view.MainCredentialView
 import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
 import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
 import java.io.FileNotFoundException
@@ -83,6 +89,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
    // Views
    private var toolbar: Toolbar? = null
    private var filenameView: TextView? = null
+    private var logotypeButton: View? = null
    private var advancedUnlockButton: View? = null
    private var mainCredentialView: MainCredentialView? = null
    private var confirmButtonView: Button? = null
@@ -101,6 +108,8 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
    private var mRememberKeyFile: Boolean = false
    private var mExternalFileHelper: ExternalFileHelper? = null

+    private var mRememberHardwareKey: Boolean = false
+
    private var mReadOnly: Boolean = false
    private var mForceReadOnly: Boolean = false

@@ -121,7 +130,8 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        supportActionBar?.setDisplayShowHomeEnabled(true)

        filenameView = findViewById(R.id.filename)
-        advancedUnlockButton = findViewById(R.id.activity_password_advanced_unlock_button)
+        logotypeButton = findViewById(R.id.activity_password_logotype)
+        advancedUnlockButton = findViewById(R.id.fragment_advanced_unlock_container_view)
        mainCredentialView = findViewById(R.id.activity_password_credentials)
        confirmButtonView = findViewById(R.id.activity_password_open_button)
        infoContainerView = findViewById(R.id.activity_password_info_container)
@@ -133,11 +143,13 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
            PreferencesUtil.enableReadOnlyDatabase(this)
        }
        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
+        mRememberHardwareKey = PreferencesUtil.rememberHardwareKey(this)

-        mExternalFileHelper = ExternalFileHelper(this@MainCredentialActivity)
+        // Build elements to manage keyfile selection
+        mExternalFileHelper = ExternalFileHelper(this)
        mExternalFileHelper?.buildOpenDocument { uri ->
            if (uri != null) {
-                mainCredentialView?.populateKeyFileTextView(uri)
+                mainCredentialView?.populateKeyFileView(uri)
            }
        }
        mainCredentialView?.setOpenKeyfileClickListener(mExternalFileHelper)
@@ -148,12 +160,12 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        // If is a view intent
        getUriFromIntent(intent)

-        // Init Biometric elements
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            advancedUnlockButton?.setOnClickListener {
-                startActivity(Intent(this, SettingsAdvancedUnlockActivity::class.java))
-            }
+        // Show appearance
+        logotypeButton?.setOnClickListener {
+            startActivity(Intent(this, AppearanceSettingsActivity::class.java))
        }
+
+        // Init Biometric elements
        advancedUnlockFragment = supportFragmentManager
                .findFragmentByTag(UNLOCK_FRAGMENT_TAG) as? AdvancedUnlockFragment?
        if (advancedUnlockFragment == null) {
@@ -171,6 +183,16 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
                mAdvancedUnlockViewModel.checkUnlockAvailability()
                enableConfirmationButton()
            }
+        mainCredentialView?.onKeyFileChecked =
+            CompoundButton.OnCheckedChangeListener { _, _ ->
+                // TODO mAdvancedUnlockViewModel.checkUnlockAvailability()
+                enableConfirmationButton()
+            }
+        mainCredentialView?.onHardwareKeyChecked =
+            CompoundButton.OnCheckedChangeListener { _, _ ->
+                // TODO mAdvancedUnlockViewModel.checkUnlockAvailability()
+                enableConfirmationButton()
+            }

        // Observe if default database
        mDatabaseFileViewModel.isDefaultDatabase.observe(this) { isDefaultDatabase ->
@@ -204,10 +226,19 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
                        databaseKeyFileUri
                    }

+            val databaseHardwareKey = mainCredentialView?.getMainCredential()?.hardwareKey
+            val hardwareKey =
+                if (mRememberHardwareKey
+                    && databaseHardwareKey == null) {
+                    databaseFile?.hardwareKey
+                } else {
+                    databaseHardwareKey
+                }
+
            // Define title
            filenameView?.text = databaseFile?.databaseAlias ?: ""

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

@@ -215,6 +246,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        super.onResume()

        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this@MainCredentialActivity)
+        mRememberHardwareKey = PreferencesUtil.rememberHardwareKey(this@MainCredentialActivity)

        // Back to previous keyboard is setting activated
        if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this@MainCredentialActivity)) {
@@ -235,7 +267,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)
        if (database != null) {
            // Trying to load another database
@@ -252,7 +284,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -266,99 +298,93 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
                    launchGroupActivityIfLoaded(database)
                } else {
                    mainCredentialView?.requestPasswordFocus()
+                    // Manage special exceptions
+                    when (result.exception) {
+                        is DuplicateUuidDatabaseException -> {
+                            // Relaunch loading if we need to fix UUID
+                            showLoadDatabaseDuplicateUuidMessage {

-                    var resultError = ""
-                    val resultException = result.exception
-                    val resultMessage = result.message
+                                var databaseUri: Uri? = null
+                                var mainCredential = MainCredential()
+                                var readOnly = true
+                                var cipherEncryptDatabase: CipherEncryptDatabase? = null

-                    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 cipherEncryptDatabase: CipherEncryptDatabase? = null
-
-                                    result.data?.let { resultData ->
-                                        databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
-                                        mainCredential =
-                                            resultData.getParcelable(MAIN_CREDENTIAL_KEY)
-                                                ?: mainCredential
-                                        readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                        cipherEncryptDatabase =
-                                            resultData.getParcelable(CIPHER_DATABASE_KEY)
-                                    }
-
-                                    databaseUri?.let { databaseFileUri ->
-                                        showProgressDialogAndLoadDatabase(
-                                            databaseFileUri,
-                                            mainCredential,
-                                            readOnly,
-                                            cipherEncryptDatabase,
-                                            true
-                                        )
-                                    }
+                                result.data?.let { resultData ->
+                                    databaseUri = resultData.getParcelableCompat(DATABASE_URI_KEY)
+                                    mainCredential =
+                                        resultData.getParcelableCompat(MAIN_CREDENTIAL_KEY)
+                                            ?: mainCredential
+                                    readOnly = resultData.getBoolean(READ_ONLY_KEY)
+                                    cipherEncryptDatabase =
+                                        resultData.getParcelableCompat(CIPHER_DATABASE_KEY)
                                }
-                            }
-                            is FileNotFoundDatabaseException -> {
-                                // Remove this default database inaccessible
-                                if (mDefaultDatabase) {
-                                    mDatabaseFileViewModel.removeDefaultDatabase()
+
+                                databaseUri?.let { databaseFileUri ->
+                                    showProgressDialogAndLoadDatabase(
+                                        databaseFileUri,
+                                        mainCredential,
+                                        readOnly,
+                                        cipherEncryptDatabase,
+                                        true
+                                    )
                                }
                            }
                        }
+                        is FileNotFoundDatabaseException -> {
+                            // Remove this default database inaccessible
+                            if (mDefaultDatabase) {
+                                mDatabaseFileViewModel.removeDefaultDatabase()
+                            }
+                        }
                    }
-
-                    // Show error message
-                    if (resultMessage != null && resultMessage.isNotEmpty()) {
-                        resultError = "$resultError $resultMessage"
-                    }
-                    Log.e(TAG, resultError)
-                    Snackbar.make(
-                        coordinatorLayout,
-                        resultError,
-                        Snackbar.LENGTH_LONG
-                    ).asError().show()
                }
            }
        }
+        coordinatorLayout.showActionErrorIfNeeded(result)
    }

    private fun getUriFromIntent(intent: Intent?) {
        // If is a view intent
        val action = intent?.action
-        if (action != null
-                && action == VIEW_INTENT) {
-            mDatabaseFileUri = intent.data
-            mainCredentialView?.populateKeyFileTextView(UriUtil.getUriFromIntent(intent, KEY_KEYFILE))
+        if (action == VIEW_INTENT) {
+            fillCredentials(
+                intent.data,
+                intent.getUri(KEY_KEYFILE),
+                HardwareKey.getHardwareKeyFromString(intent.getStringExtra(KEY_HARDWARE_KEY))
+            )
        } else {
-            mDatabaseFileUri = intent?.getParcelableExtra(KEY_FILENAME)
-            intent?.getParcelableExtra<Uri?>(KEY_KEYFILE)?.let {
-                mainCredentialView?.populateKeyFileTextView(it)
-            }
+            fillCredentials(
+                intent?.getParcelableExtraCompat(KEY_FILENAME),
+                intent?.getParcelableExtraCompat(KEY_KEYFILE),
+                HardwareKey.getHardwareKeyFromString(intent?.getStringExtra(KEY_HARDWARE_KEY))
+            )
        }
        try {
            intent?.removeExtra(KEY_KEYFILE)
-        } catch (e: Exception) {}
+            intent?.removeExtra(KEY_HARDWARE_KEY)
+        } catch (_: Exception) {}
        mDatabaseFileUri?.let {
            mDatabaseFileViewModel.checkIfIsDefaultDatabase(it)
        }
    }

+    private fun fillCredentials(databaseUri: Uri?,
+                                keyFileUri: Uri?,
+                                hardwareKey: HardwareKey?) {
+        mDatabaseFileUri = databaseUri
+        mainCredentialView?.populateKeyFileView(keyFileUri)
+        mainCredentialView?.populateHardwareKeyView(hardwareKey)
+    }
+
    override fun onNewIntent(intent: Intent?) {
        super.onNewIntent(intent)
        getUriFromIntent(intent)
    }

-    private fun launchGroupActivityIfLoaded(database: Database) {
+    private fun launchGroupActivityIfLoaded(database: ContextualDatabase) {
        // Check if database really loaded
        if (database.loaded) {
-            clearCredentialsViews(true)
+            clearCredentialsViews(clearKeyFile = true, clearHardwareKey = true)
            GroupActivity.launch(this,
                database,
                { onValidateSpecialMode() },
@@ -408,7 +434,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        val mainCredential = mainCredentialView?.getMainCredential() ?: MainCredential()
        when (cipherDecryptDatabase.credentialStorage) {
            CredentialStorage.PASSWORD -> {
-                mainCredential.masterPassword = String(cipherDecryptDatabase.decryptedValue)
+                mainCredential.password = String(cipherDecryptDatabase.decryptedValue)
            }
            CredentialStorage.KEY_FILE -> {
                // TODO advanced unlock key file
@@ -423,14 +449,23 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        )
    }

-    private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
+    private fun onDatabaseFileLoaded(databaseFileUri: Uri?,
+                                     keyFileUri: Uri?,
+                                     hardwareKey: HardwareKey?) {
        // Define Key File text
        if (mRememberKeyFile) {
-            mainCredentialView?.populateKeyFileTextView(keyFileUri)
+            mainCredentialView?.populateKeyFileView(keyFileUri)
+        }
+
+        // Define hardware key
+        if (mRememberHardwareKey) {
+            mainCredentialView?.populateHardwareKeyView(hardwareKey)
        }

        // Define listener for validate button
-        confirmButtonView?.setOnClickListener { loadDatabase() }
+        confirmButtonView?.setOnClickListener {
+            mainCredentialView?.validateCredential()
+        }

        // If Activity is launch with a password and want to open directly
        val intent = intent
@@ -462,10 +497,14 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        }
    }

-    private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile) {
+    private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile,
+                                      clearHardwareKey: Boolean = !mRememberHardwareKey) {
        mainCredentialView?.populatePasswordTextView(null)
        if (clearKeyFile) {
-            mainCredentialView?.populateKeyFileTextView(null)
+            mainCredentialView?.populateKeyFileView(null)
+        }
+        if (clearHardwareKey) {
+            mainCredentialView?.populateHardwareKeyView(null)
        }
    }

@@ -611,7 +650,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
                                startActivity(
                                    Intent(
                                        this,
-                                        SettingsAdvancedUnlockActivity::class.java
+                                        AdvancedUnlockSettingsActivity::class.java
                                    )
                                )
                            },
@@ -656,18 +695,24 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu

        private const val KEY_FILENAME = "fileName"
        private const val KEY_KEYFILE = "keyFile"
+        private const val KEY_HARDWARE_KEY = "hardwareKey"
        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 fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?,
+        private fun buildAndLaunchIntent(activity: Activity,
+                                         databaseFile: Uri,
+                                         keyFile: Uri?,
+                                         hardwareKey: HardwareKey?,
                                         intentBuildLauncher: (Intent) -> Unit) {
            val intent = Intent(activity, MainCredentialActivity::class.java)
            intent.putExtra(KEY_FILENAME, databaseFile)
            if (keyFile != null)
                intent.putExtra(KEY_KEYFILE, keyFile)
+            if (hardwareKey != null)
+                intent.putExtra(KEY_HARDWARE_KEY, hardwareKey.toString())
            intentBuildLauncher.invoke(intent)
        }

@@ -680,8 +725,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        @Throws(FileNotFoundException::class)
        fun launch(activity: Activity,
                   databaseFile: Uri,
-                   keyFile: Uri?) {
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                   keyFile: Uri?,
+                   hardwareKey: HardwareKey?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                activity.startActivity(intent)
            }
        }
@@ -696,8 +742,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        fun launchForSearchResult(activity: Activity,
                                  databaseFile: Uri,
                                  keyFile: Uri?,
+                                  hardwareKey: HardwareKey?,
                                  searchInfo: SearchInfo) {
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                EntrySelectionHelper.startActivityForSearchModeResult(
                        activity,
                        intent,
@@ -715,8 +762,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        fun launchForSaveResult(activity: Activity,
                                databaseFile: Uri,
                                keyFile: Uri?,
+                                hardwareKey: HardwareKey?,
                                searchInfo: SearchInfo) {
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                EntrySelectionHelper.startActivityForSaveModeResult(
                        activity,
                        intent,
@@ -734,8 +782,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        fun launchForKeyboardResult(activity: Activity,
                                    databaseFile: Uri,
                                    keyFile: Uri?,
+                                    hardwareKey: HardwareKey?,
                                    searchInfo: SearchInfo?) {
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(
                        activity,
                        intent,
@@ -754,10 +803,11 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        fun launchForAutofillResult(activity: AppCompatActivity,
                                    databaseFile: Uri,
                                    keyFile: Uri?,
+                                    hardwareKey: HardwareKey?,
                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
                                    autofillComponent: AutofillComponent,
                                    searchInfo: SearchInfo?) {
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                AutofillHelper.startActivityForAutofillResult(
                        activity,
                        intent,
@@ -775,8 +825,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        fun launchForRegistration(activity: Activity,
                                  databaseFile: Uri,
                                  keyFile: Uri?,
+                                  hardwareKey: HardwareKey?,
                                  registerInfo: RegisterInfo?) {
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                EntrySelectionHelper.startActivityForRegistrationModeResult(
                        activity,
                        intent,
@@ -792,6 +843,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
        fun launch(activity: AppCompatActivity,
                   databaseUri: Uri,
                   keyFile: Uri?,
+                   hardwareKey: HardwareKey?,
                   fileNoFoundAction: (exception: FileNotFoundException) -> Unit,
                   onCancelSpecialMode: () -> Unit,
                   onLaunchActivitySpecialMode: () -> Unit,
@@ -800,43 +852,67 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
            try {
                EntrySelectionHelper.doSpecialAction(activity.intent,
                        {
-                            MainCredentialActivity.launch(activity,
-                                    databaseUri, keyFile)
+                            launch(
+                                activity,
+                                databaseUri,
+                                keyFile,
+                                hardwareKey
+                            )
                        },
                        { searchInfo -> // Search Action
-                            MainCredentialActivity.launchForSearchResult(activity,
-                                    databaseUri, keyFile,
-                                    searchInfo)
+                            launchForSearchResult(
+                                activity,
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                searchInfo
+                            )
                            onLaunchActivitySpecialMode()
                        },
                        { searchInfo -> // Save Action
-                            MainCredentialActivity.launchForSaveResult(activity,
-                                    databaseUri, keyFile,
-                                    searchInfo)
+                            launchForSaveResult(
+                                activity,
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                searchInfo
+                            )
                            onLaunchActivitySpecialMode()
                        },
                        { searchInfo -> // Keyboard Selection Action
-                            MainCredentialActivity.launchForKeyboardResult(activity,
-                                    databaseUri, keyFile,
-                                    searchInfo)
+                            launchForKeyboardResult(
+                                activity,
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                searchInfo
+                            )
                            onLaunchActivitySpecialMode()
                        },
                        { searchInfo, autofillComponent -> // Autofill Selection Action
                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                MainCredentialActivity.launchForAutofillResult(activity,
-                                        databaseUri, keyFile,
-                                        autofillActivityResultLauncher,
-                                        autofillComponent,
-                                        searchInfo)
+                                launchForAutofillResult(
+                                    activity,
+                                    databaseUri,
+                                    keyFile,
+                                    hardwareKey,
+                                    autofillActivityResultLauncher,
+                                    autofillComponent,
+                                    searchInfo
+                                )
                                onLaunchActivitySpecialMode()
                            } else {
                                onCancelSpecialMode()
                            }
                        },
                        { registerInfo -> // Registration Action
-                            MainCredentialActivity.launchForRegistration(activity,
-                                    databaseUri, keyFile,
-                                    registerInfo)
+                            launchForRegistration(
+                                activity,
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                registerInfo
+                            )
                            onLaunchActivitySpecialMode()
                        }
                )
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
@@ -25,6 +25,7 @@ import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
+import com.kunzisoft.keepass.utils.getParcelableCompat


 class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
@@ -40,8 +41,8 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->

-            val oldSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelable(OLD_FILE_DATABASE_INFO)
-            val newSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelable(NEW_FILE_DATABASE_INFO)
+            val oldSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelableCompat(OLD_FILE_DATABASE_INFO)
+            val newSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelableCompat(NEW_FILE_DATABASE_INFO)

            if (oldSnapFileDatabaseInfo != null && newSnapFileDatabaseInfo != null) {
                // Use the Builder class for convenient dialog construction
@@ -78,7 +79,8 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
        private const val NEW_FILE_DATABASE_INFO = "NEW_FILE_DATABASE_INFO"

        fun getInstance(oldSnapFileDatabaseInfo: SnapFileDatabaseInfo,
-                        newSnapFileDatabaseInfo: SnapFileDatabaseInfo)
+                        newSnapFileDatabaseInfo: SnapFileDatabaseInfo
+        )
        : DatabaseChangedDialogFragment {
            val fragment = DatabaseChangedDialogFragment()
            fragment.arguments = Bundle().apply {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
@@ -5,7 +5,7 @@ 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.database.ContextualDatabase
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
@@ -13,7 +13,7 @@ import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {

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

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -36,12 +36,12 @@ abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {
        resetAppTimeoutOnTouchOrFocus()
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        // Can be overridden by a subclass
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
@@ -1,67 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.DatePickerDialog
-import android.app.Dialog
-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
-    private var mDefaultMonth: Int = 1
-    private var mDefaultDay: Int = 1
-
-    private var mListener: DatePickerDialog.OnDateSetListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            mListener = context as DatePickerDialog.OnDateSetListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + DatePickerDialog.OnDateSetListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        // Create a new instance of DatePickerDialog and return it
-        return context?.let {
-            arguments?.apply {
-                if (containsKey(DEFAULT_YEAR_BUNDLE_KEY))
-                    mDefaultYear = getInt(DEFAULT_YEAR_BUNDLE_KEY)
-                if (containsKey(DEFAULT_MONTH_BUNDLE_KEY))
-                    mDefaultMonth = getInt(DEFAULT_MONTH_BUNDLE_KEY)
-                if (containsKey(DEFAULT_DAY_BUNDLE_KEY))
-                    mDefaultDay = getInt(DEFAULT_DAY_BUNDLE_KEY)
-            }
-
-            DatePickerDialog(it, mListener, mDefaultYear, mDefaultMonth, mDefaultDay)
-        } ?: super.onCreateDialog(savedInstanceState)
-    }
-
-    companion object {
-
-        private const val DEFAULT_YEAR_BUNDLE_KEY = "DEFAULT_YEAR_BUNDLE_KEY"
-        private const val DEFAULT_MONTH_BUNDLE_KEY = "DEFAULT_MONTH_BUNDLE_KEY"
-        private const val DEFAULT_DAY_BUNDLE_KEY = "DEFAULT_DAY_BUNDLE_KEY"
-
-        fun getInstance(defaultYear: Int,
-                        defaultMonth: Int,
-                        defaultDay: Int): DatePickerFragment {
-            return DatePickerFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(DEFAULT_YEAR_BUNDLE_KEY, defaultYear)
-                    putInt(DEFAULT_MONTH_BUNDLE_KEY, defaultMonth)
-                    putInt(DEFAULT_DAY_BUNDLE_KEY, defaultDay)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
@@ -35,6 +35,7 @@ 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.utils.getParcelableCompat


 class EntryCustomFieldDialogFragment: DatabaseDialogFragment() {
@@ -72,7 +73,7 @@ class EntryCustomFieldDialogFragment: DatabaseDialogFragment() {
            customFieldDeleteButton = root?.findViewById(R.id.entry_custom_field_delete)
            customFieldProtectionButton = root?.findViewById(R.id.entry_custom_field_protection)

-            oldField = arguments?.getParcelable(KEY_FIELD)
+            oldField = arguments?.getParcelableCompat(KEY_FIELD)
            oldField?.let { oldCustomField ->
                customFieldLabel?.text = oldCustomField.name
                customFieldProtectionButton?.isChecked = oldCustomField.protectedValue.isProtected
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
@@ -21,12 +21,12 @@ package com.kunzisoft.keepass.activities.dialogs

 import android.app.Dialog
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.widget.Button
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.UriUtil.openUrl

 class FileManagerDialogFragment : DialogFragment() {

@@ -42,7 +42,7 @@ class FileManagerDialogFragment : DialogFragment() {
            textDescription.text = getString(R.string.file_manager_install_description)

            root.findViewById<Button>(R.id.file_manager_button).setOnClickListener {
-                UriUtil.gotoUrl(requireContext(), R.string.file_manager_explanation_url)
+                context?.openUrl(R.string.file_manager_explanation_url)
                dismiss()
            }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
@@ -27,6 +27,7 @@ import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.utils.getParcelableCompat

 /**
 * Custom Dialog to confirm big file to upload
@@ -62,7 +63,7 @@ class FileTooBigDialogFragment : DialogFragment() {
            })
            builder.setPositiveButton(android.R.string.ok) { _, _ ->
                mActionChooseListener?.onValidateUploadFileTooBig(
-                        arguments?.getParcelable(KEY_FILE_URI),
+                        arguments?.getParcelableCompat(KEY_FILE_URI),
                        arguments?.getString(KEY_FILE_NAME))
            }
            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
@@ -31,11 +31,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.adapters.TagsAdapter
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 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.TimeUtil.getDateTimeString
 import com.kunzisoft.keepass.utils.UuidUtil
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.view.DateTimeFieldView

 class GroupDialogFragment : DatabaseDialogFragment() {
@@ -60,7 +62,7 @@ class GroupDialogFragment : DatabaseDialogFragment() {
    private lateinit var uuidContainerView: ViewGroup
    private lateinit var uuidReferenceView: TextView

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)
        mPopulateIconMethod = { imageView, icon ->
            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
@@ -106,17 +108,17 @@ class GroupDialogFragment : DatabaseDialogFragment() {
            uuidReferenceView = root.findViewById(R.id.group_UUID_reference)

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

            if (savedInstanceState != null
                    && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
-                mGroupInfo = savedInstanceState.getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
+                mGroupInfo = savedInstanceState.getParcelableCompat(KEY_GROUP_INFO) ?: mGroupInfo
            } else {
                arguments?.apply {
                    if (containsKey(KEY_GROUP_INFO)) {
-                        mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
+                        mGroupInfo = getParcelableCompat(KEY_GROUP_INFO) ?: mGroupInfo
                    }
                }
            }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
@@ -24,17 +24,22 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.*
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.NONE
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.adapters.TagsProposalAdapter
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.view.DateTimeEditFieldView
 import com.kunzisoft.keepass.view.InheritedCompletionView
 import com.kunzisoft.keepass.view.TagsCompletionView
@@ -85,13 +90,11 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
            mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
        }

-        mGroupEditViewModel.onDateSelected.observe(this) { viewModelDate ->
+        mGroupEditViewModel.onDateSelected.observe(this) { dateMilliseconds ->
            // Save the date
            mGroupInfo.expiryTime = DateInstant(
                DateTime(mGroupInfo.expiryTime.date)
-                    .withYear(viewModelDate.year)
-                    .withMonthOfYear(viewModelDate.month + 1)
-                    .withDayOfMonth(viewModelDate.day)
+                    .withMillis(dateMilliseconds)
                    .toDate())
            expirationView.dateTime = mGroupInfo.expiryTime
            if (expirationView.dateTime.type == DateInstant.Type.DATE_TIME) {
@@ -116,7 +119,7 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        mPopulateIconMethod = { imageView, icon ->
@@ -170,13 +173,13 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
                    && savedInstanceState.containsKey(KEY_ACTION_ID)
                    && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
                mEditGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(savedInstanceState.getInt(KEY_ACTION_ID))
-                mGroupInfo = savedInstanceState.getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
+                mGroupInfo = savedInstanceState.getParcelableCompat(KEY_GROUP_INFO) ?: mGroupInfo
            } else {
                arguments?.apply {
                    if (containsKey(KEY_ACTION_ID))
                        mEditGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(getInt(KEY_ACTION_ID))
                    if (containsKey(KEY_GROUP_INFO)) {
-                        mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
+                        mGroupInfo = getParcelableCompat(KEY_GROUP_INFO) ?: mGroupInfo
                    }
                }
            }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
@@ -27,10 +27,11 @@ 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.ContextualDatabase
 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.utils.getParcelableCompat
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel

 class IconEditDialogFragment : DatabaseDialogFragment() {
@@ -44,7 +45,7 @@ class IconEditDialogFragment : DatabaseDialogFragment() {

    private var mCustomIcon: IconImageCustom? = null

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)
        mPopulateIconMethod = { imageView, icon ->
            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon)
@@ -63,11 +64,11 @@ class IconEditDialogFragment : DatabaseDialogFragment() {

            if (savedInstanceState != null
                    && savedInstanceState.containsKey(KEY_CUSTOM_ICON_ID)) {
-                mCustomIcon = savedInstanceState.getParcelable(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
+                mCustomIcon = savedInstanceState.getParcelableCompat(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
            } else {
                arguments?.apply {
                    if (containsKey(KEY_CUSTOM_ICON_ID)) {
-                        mCustomIcon = getParcelable(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
+                        mCustomIcon = getParcelableCompat(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
                    }
                }
            }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt
@@ -27,8 +27,9 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.view.MainCredentialView

 class MainCredentialDialogFragment : DatabaseDialogFragment() {
@@ -65,7 +66,7 @@ class MainCredentialDialogFragment : DatabaseDialogFragment() {
            var databaseUri: Uri? = null
            arguments?.apply {
                if (containsKey(KEY_ASK_CREDENTIAL_URI))
-                    databaseUri = getParcelable(KEY_ASK_CREDENTIAL_URI)
+                    databaseUri = getParcelableCompat(KEY_ASK_CREDENTIAL_URI)
            }

            val builder = AlertDialog.Builder(activity)
@@ -74,7 +75,7 @@ class MainCredentialDialogFragment : DatabaseDialogFragment() {
            mainCredentialView = root.findViewById(R.id.main_credential_view)
            databaseUri?.let {
                root.findViewById<TextView>(R.id.title_database)?.text =
-                    UriUtil.getFileData(requireContext(), it)?.name
+                    it.getDocumentFile(requireContext())?.name
            }
            builder.setView(root)
                    // Add action buttons
@@ -95,7 +96,7 @@ class MainCredentialDialogFragment : DatabaseDialogFragment() {
            mExternalFileHelper = ExternalFileHelper(this)
            mExternalFileHelper?.buildOpenDocument { uri ->
                if (uri != null) {
-                    mainCredentialView?.populateKeyFileTextView(uri)
+                    mainCredentialView?.populateKeyFileView(uri)
                }
            }
            mainCredentialView?.setOpenKeyfileClickListener(mExternalFileHelper)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
@@ -26,7 +26,8 @@ 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
+import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.utils.getParcelableCompat

 class PasswordEncodingDialogFragment : DialogFragment() {

@@ -49,8 +50,8 @@ class PasswordEncodingDialogFragment : DialogFragment() {

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

-        val databaseUri: Uri? = savedInstanceState?.getParcelable(DATABASE_URI_KEY)
-        val mainCredential: MainCredential = savedInstanceState?.getParcelable(MAIN_CREDENTIAL) ?: MainCredential()
+        val databaseUri: Uri? = savedInstanceState?.getParcelableCompat(DATABASE_URI_KEY)
+        val mainCredential: MainCredential = savedInstanceState?.getParcelableCompat(MAIN_CREDENTIAL) ?: MainCredential()

        activity?.let { activity ->
            val builder = AlertDialog.Builder(activity)
@@ -78,8 +79,10 @@ class PasswordEncodingDialogFragment : DialogFragment() {
        private const val DATABASE_URI_KEY = "DATABASE_URI_KEY"
        private const val MAIN_CREDENTIAL = "MAIN_CREDENTIAL"

-        fun getInstance(databaseUri: Uri,
-                        mainCredential: MainCredential): SortDialogFragment {
+        fun getInstance(
+            databaseUri: Uri,
+            mainCredential: MainCredential
+        ): SortDialogFragment {
            val fragment = SortDialogFragment()
            fragment.arguments = Bundle().apply {
                putParcelable(DATABASE_URI_KEY, databaseUri)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt
@@ -28,7 +28,7 @@ import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.UriUtil.openUrl

 /**
 * Custom Dialog that asks the user to download the pro version or make a donation.
@@ -45,13 +45,16 @@ class ProFeatureDialogFragment : DialogFragment() {
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_ad_free), FROM_HTML_MODE_LEGACY)).append("\n\n")
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_buy_pro), FROM_HTML_MODE_LEGACY))
                builder.setPositiveButton(R.string.download) { _, _ ->
-                    UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
+                    activity.openUrl(
+                        activity.getString(R.string.play_store_url,
+                            activity.getString(R.string.keepro_app_id))
+                    )
                }
            } else {
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_feature_generosity), FROM_HTML_MODE_LEGACY)).append("\n\n")
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_donation), FROM_HTML_MODE_LEGACY))
                builder.setPositiveButton(R.string.contribute) { _, _ ->
-                    UriUtil.gotoUrl(requireContext(), R.string.contribution_url)
+                    activity.openUrl(R.string.contribution_url)
                }
            }
            builder.setMessage(stringBuilder)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
@@ -27,6 +27,7 @@ import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.utils.getParcelableCompat

 /**
 * Custom Dialog to confirm big file to upload
@@ -62,8 +63,8 @@ class ReplaceFileDialogFragment : DatabaseDialogFragment() {
            })
            builder.setPositiveButton(android.R.string.ok) { _, _ ->
                mActionChooseListener?.onValidateReplaceFile(
-                        arguments?.getParcelable(KEY_FILE_URI),
-                        arguments?.getParcelable(KEY_ENTRY_ATTACHMENT))
+                        arguments?.getParcelableCompat(KEY_FILE_URI),
+                        arguments?.getParcelableCompat(KEY_ENTRY_ATTACHMENT))
            }
            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
                dismiss()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt
@@ -35,9 +35,13 @@ import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
-import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.hardware.HardwareKey
+import com.kunzisoft.keepass.hardware.HardwareKeyActivity
 import com.kunzisoft.keepass.password.PasswordEntropy
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
+import com.kunzisoft.keepass.utils.UriUtil.openUrl
+import com.kunzisoft.keepass.view.HardwareKeySelectionView
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 import com.kunzisoft.keepass.view.PassKeyView
 import com.kunzisoft.keepass.view.applyFontVisibility
@@ -45,18 +49,21 @@ import com.kunzisoft.keepass.view.applyFontVisibility
 class SetMainCredentialDialogFragment : DatabaseDialogFragment() {

    private var mMasterPassword: String? = null
-    private var mKeyFile: Uri? = null
+    private var mKeyFileUri: Uri? = null
+    private var mHardwareKey: HardwareKey? = null

-    private var rootView: View? = null
+    private lateinit var rootView: View

-    private var passwordCheckBox: CompoundButton? = null
+    private lateinit var passwordCheckBox: CompoundButton
+    private lateinit var passwordView: PassKeyView
+    private lateinit var passwordRepeatTextInputLayout: TextInputLayout
+    private lateinit var passwordRepeatView: TextView

-    private var passKeyView: PassKeyView? = null
-    private var passwordRepeatTextInputLayout: TextInputLayout? = null
-    private var passwordRepeatView: TextView? = null
+    private lateinit var keyFileCheckBox: CompoundButton
+    private lateinit var keyFileSelectionView: KeyFileSelectionView

-    private var keyFileCheckBox: CompoundButton? = null
-    private var keyFileSelectionView: KeyFileSelectionView? = null
+    private lateinit var hardwareKeyCheckBox: CompoundButton
+    private lateinit var hardwareKeySelectionView: HardwareKeySelectionView

    private var mListener: AssignMainCredentialDialogListener? = null

@@ -67,13 +74,15 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
    private var mNoKeyConfirmationDialog: AlertDialog? = null
    private var mEmptyKeyFileConfirmationDialog: AlertDialog? = null

+    private var mAllowNoMasterKey: Boolean  = false
+
    private val passwordTextWatcher = object : TextWatcher {
        override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}

        override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}

        override fun afterTextChanged(editable: Editable) {
-            passwordCheckBox?.isChecked = true
+            passwordCheckBox.isChecked = true
        }
    }

@@ -113,10 +122,9 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->

-            var allowNoMasterKey = false
            arguments?.apply {
                if (containsKey(ALLOW_NO_MASTER_KEY_ARG))
-                    allowNoMasterKey = getBoolean(ALLOW_NO_MASTER_KEY_ARG, false)
+                    mAllowNoMasterKey = getBoolean(ALLOW_NO_MASTER_KEY_ARG, false)
            }

            val builder = AlertDialog.Builder(activity)
@@ -128,63 +136,63 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                    .setPositiveButton(android.R.string.ok) { _, _ -> }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }

-            rootView?.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
-                UriUtil.gotoUrl(activity, R.string.credentials_explanation_url)
+            rootView.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
+                activity.openUrl(R.string.credentials_explanation_url)
            }

-            passwordCheckBox = rootView?.findViewById(R.id.password_checkbox)
-            passKeyView = rootView?.findViewById(R.id.password_view)
-            passwordRepeatTextInputLayout = rootView?.findViewById(R.id.password_repeat_input_layout)
-            passwordRepeatView = rootView?.findViewById(R.id.password_confirmation)
-            passwordRepeatView?.applyFontVisibility()
+            passwordCheckBox = rootView.findViewById(R.id.password_checkbox)
+            passwordView = rootView.findViewById(R.id.password_view)
+            passwordRepeatTextInputLayout = rootView.findViewById(R.id.password_repeat_input_layout)
+            passwordRepeatView = rootView.findViewById(R.id.password_confirmation)
+            passwordRepeatView.applyFontVisibility()

-            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
-            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)
+            keyFileCheckBox = rootView.findViewById(R.id.keyfile_checkbox)
+            keyFileSelectionView = rootView.findViewById(R.id.keyfile_selection)
+
+            hardwareKeyCheckBox = rootView.findViewById(R.id.hardware_key_checkbox)
+            hardwareKeySelectionView = rootView.findViewById(R.id.hardware_key_selection)

            mExternalFileHelper = ExternalFileHelper(this)
            mExternalFileHelper?.buildOpenDocument { uri ->
                uri?.let { pathUri ->
-                    UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
-                        keyFileSelectionView?.error = null
-                        keyFileCheckBox?.isChecked = true
-                        keyFileSelectionView?.uri = pathUri
+                    pathUri.getDocumentFile(requireContext())?.length()?.let { lengthFile ->
+                        keyFileSelectionView.error = null
+                        keyFileCheckBox.isChecked = true
+                        keyFileSelectionView.uri = pathUri
                        if (lengthFile <= 0L) {
                            showEmptyKeyFileConfirmationDialog()
                        }
                    }
                }
            }
-            keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)
+            keyFileSelectionView.setOpenDocumentClickListener(mExternalFileHelper)
+
+            hardwareKeySelectionView.selectionListener = { hardwareKey ->
+                hardwareKeyCheckBox.isChecked = true
+                hardwareKeySelectionView.error =
+                    if (!HardwareKeyActivity.isHardwareKeyAvailable(requireActivity(), hardwareKey)) {
+                        // show hardware driver dialog if required
+                        getString(R.string.error_driver_required, hardwareKey.toString())
+                    } else {
+                        null
+                    }
+            }

            val dialog = builder.create()
+            dialog.setOnShowListener { dialog1 ->
+                val positiveButton = (dialog1 as AlertDialog).getButton(DialogInterface.BUTTON_POSITIVE)
+                positiveButton.setOnClickListener {

-            if (passwordCheckBox != null && keyFileCheckBox!= null) {
-                dialog.setOnShowListener { dialog1 ->
-                    val positiveButton = (dialog1 as AlertDialog).getButton(DialogInterface.BUTTON_POSITIVE)
-                    positiveButton.setOnClickListener {
+                    mMasterPassword = ""
+                    mKeyFileUri = null
+                    mHardwareKey = null

-                        mMasterPassword = ""
-                        mKeyFile = null
-
-                        var error = verifyPassword() || verifyKeyFile()
-                        if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
-                            error = true
-                            if (allowNoMasterKey)
-                                showNoKeyConfirmationDialog()
-                            else {
-                                passwordRepeatTextInputLayout?.error = getString(R.string.error_disallow_no_credentials)
-                            }
-                        }
-                        if (!error) {
-                            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                            dismiss()
-                        }
-                    }
-                    val negativeButton = dialog1.getButton(DialogInterface.BUTTON_NEGATIVE)
-                    negativeButton.setOnClickListener {
-                        mListener?.onAssignKeyDialogNegativeClick(retrieveMainCredential())
-                        dismiss()
-                    }
+                    approveMainCredential()
+                }
+                val negativeButton = dialog1.getButton(DialogInterface.BUTTON_NEGATIVE)
+                negativeButton.setOnClickListener {
+                    mListener?.onAssignKeyDialogNegativeClick(retrieveMainCredential())
+                    dismiss()
                }
            }

@@ -194,67 +202,113 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
        return super.onCreateDialog(savedInstanceState)
    }

+    private fun approveMainCredential() {
+        val errorPassword = verifyPassword()
+        val errorKeyFile = verifyKeyFile()
+        val errorHardwareKey = verifyHardwareKey()
+        // Check all to fill error
+        var error = errorPassword || errorKeyFile || errorHardwareKey
+        val hardwareKey = hardwareKeySelectionView.hardwareKey
+        if (!error
+            && (!passwordCheckBox.isChecked)
+            && (!keyFileCheckBox.isChecked)
+            && (!hardwareKeyCheckBox.isChecked)
+        ) {
+            error = true
+            if (mAllowNoMasterKey) {
+                // show no key dialog if required
+                showNoKeyConfirmationDialog()
+            } else {
+                passwordRepeatTextInputLayout.error =
+                    getString(R.string.error_disallow_no_credentials)
+            }
+        } else if (!error
+            && mMasterPassword.isNullOrEmpty()
+            && !keyFileCheckBox.isChecked
+            && !hardwareKeyCheckBox.isChecked
+        ) {
+            // show empty password dialog if required
+            error = true
+            showEmptyPasswordConfirmationDialog()
+        } else if (!error
+            && hardwareKey != null
+            && !HardwareKeyActivity.isHardwareKeyAvailable(
+                requireActivity(), hardwareKey, false)
+        ) {
+            // show hardware driver dialog if required
+            error = true
+            hardwareKeySelectionView.error =
+                getString(R.string.error_driver_required, hardwareKey.toString())
+        }
+        if (!error) {
+            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
+            dismiss()
+        }
+    }
+
+    private fun verifyPassword(): Boolean {
+        var error = false
+        passwordRepeatTextInputLayout.error = null
+        if (passwordCheckBox.isChecked) {
+            mMasterPassword = passwordView.passwordString
+            val confPassword = passwordRepeatView.text.toString()
+
+            // Verify that passwords match
+            if (mMasterPassword != confPassword) {
+                error = true
+                // Passwords do not match
+                passwordRepeatTextInputLayout.error = getString(R.string.error_pass_match)
+            }
+        }
+        return error
+    }
+
+    private fun verifyKeyFile(): Boolean {
+        var error = false
+        keyFileSelectionView.error = null
+        if (keyFileCheckBox.isChecked) {
+            keyFileSelectionView.uri?.let { uri ->
+                mKeyFileUri = uri
+            } ?: run {
+                error = true
+                keyFileSelectionView.error = getString(R.string.error_nokeyfile)
+            }
+        }
+        return error
+    }
+
+    private fun verifyHardwareKey(): Boolean {
+        var error = false
+        hardwareKeySelectionView.error = null
+        if (hardwareKeyCheckBox.isChecked) {
+            hardwareKeySelectionView.hardwareKey?.let { hardwareKey ->
+                mHardwareKey = hardwareKey
+            } ?: run {
+                error = true
+                hardwareKeySelectionView.error = getString(R.string.error_no_hardware_key)
+            }
+        }
+        return error
+    }
+
    private fun retrieveMainCredential(): MainCredential {
-        val masterPassword = if (passwordCheckBox!!.isChecked) mMasterPassword else null
-        val keyFile = if (keyFileCheckBox!!.isChecked) mKeyFile else null
-        return MainCredential(masterPassword, keyFile)
+        val masterPassword = if (passwordCheckBox.isChecked) mMasterPassword else null
+        val keyFileUri = if (keyFileCheckBox.isChecked) mKeyFileUri else null
+        val hardwareKey = if (hardwareKeyCheckBox.isChecked) mHardwareKey else null
+        return MainCredential(masterPassword, keyFileUri, hardwareKey)
    }

    override fun onResume() {
        super.onResume()

        // To check checkboxes if a text is present
-        passKeyView?.addTextChangedListener(passwordTextWatcher)
+        passwordView.addTextChangedListener(passwordTextWatcher)
    }

    override fun onPause() {
        super.onPause()

-        passKeyView?.removeTextChangedListener(passwordTextWatcher)
-    }
-
-    private fun verifyPassword(): Boolean {
-        var error = false
-        if (passwordCheckBox != null
-                && passwordCheckBox!!.isChecked
-                && passKeyView != null
-                && passwordRepeatView != null) {
-            mMasterPassword = passKeyView!!.passwordString
-            val confPassword = passwordRepeatView!!.text.toString()
-
-            // Verify that passwords match
-            if (mMasterPassword != confPassword) {
-                error = true
-                // Passwords do not match
-                passwordRepeatTextInputLayout?.error = getString(R.string.error_pass_match)
-            }
-
-            if ((mMasterPassword == null
-                        || mMasterPassword!!.isEmpty())
-                && (keyFileCheckBox == null
-                        || !keyFileCheckBox!!.isChecked
-                        || keyFileSelectionView?.uri == null)) {
-                error = true
-                showEmptyPasswordConfirmationDialog()
-            }
-        }
-
-        return error
-    }
-
-    private fun verifyKeyFile(): Boolean {
-        var error = false
-        if (keyFileCheckBox != null
-                && keyFileCheckBox!!.isChecked) {
-
-            keyFileSelectionView?.uri?.let { uri ->
-                mKeyFile = uri
-            } ?: run {
-                error = true
-                keyFileSelectionView?.error = getString(R.string.error_nokeyfile)
-            }
-        }
-        return error
+        passwordView.removeTextChangedListener(passwordTextWatcher)
    }

    private fun showEmptyPasswordConfirmationDialog() {
@@ -262,10 +316,8 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
            val builder = AlertDialog.Builder(it)
            builder.setMessage(R.string.warning_empty_password)
                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        if (!verifyKeyFile()) {
-                            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                            this@SetMainCredentialDialogFragment.dismiss()
-                        }
+                        mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
+                        this@SetMainCredentialDialogFragment.dismiss()
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
            mEmptyPasswordConfirmationDialog = builder.create()
@@ -299,8 +351,8 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                })
                    .setPositiveButton(android.R.string.ok) { _, _ -> }
                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        keyFileCheckBox?.isChecked = false
-                        keyFileSelectionView?.uri = null
+                        keyFileCheckBox.isChecked = false
+                        keyFileSelectionView.uri = null
                    }
            mEmptyKeyFileConfirmationDialog = builder.create()
            mEmptyKeyFileConfirmationDialog?.show()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
@@ -32,7 +32,6 @@ import android.view.inputmethod.EditorInfo
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.textfield.TextInputLayout
-import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.OtpModel
 import com.kunzisoft.keepass.otp.OtpElement
@@ -45,7 +44,9 @@ 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 com.kunzisoft.keepass.utils.UriUtil.isContributingUser
+import com.kunzisoft.keepass.utils.UriUtil.openUrl
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import java.util.*

 class SetOTPDialogFragment : DatabaseDialogFragment() {
@@ -126,14 +127,14 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
        // Retrieve OTP model from instance state
        if (savedInstanceState != null) {
            if (savedInstanceState.containsKey(KEY_OTP)) {
-                savedInstanceState.getParcelable<OtpModel>(KEY_OTP)?.let { otpModel ->
+                savedInstanceState.getParcelableCompat<OtpModel>(KEY_OTP)?.let { otpModel ->
                    mOtpElement = OtpElement(otpModel)
                }
            }
        } else {
            arguments?.apply {
                if (containsKey(KEY_OTP)) {
-                    getParcelable<OtpModel?>(KEY_OTP)?.let { otpModel ->
+                    getParcelableCompat<OtpModel>(KEY_OTP)?.let { otpModel ->
                        mOtpElement = OtpElement(otpModel)
                    }
                }
@@ -206,7 +207,7 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
            }
            // Proprietary only on full version
            mTotpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
-                UriUtil.contributingUser(activity)
+                activity.isContributingUser()
            )
            totpTokenTypeAdapter = ArrayAdapter(activity,
                    android.R.layout.simple_spinner_item, mTotpTokenTypeArray!!).apply {
@@ -242,7 +243,7 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
            }

            root?.findViewById<View>(R.id.otp_information)?.setOnClickListener {
-                UriUtil.gotoUrl(activity, R.string.otp_explanation_url)
+                activity.openUrl(R.string.otp_explanation_url)
            }

            return builder.create()
@@ -470,4 +471,4 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
            }
        }
    }
-}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
@@ -1,63 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.DatePickerDialog
-import android.app.Dialog
-import android.app.TimePickerDialog
-import android.content.Context
-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
-    private var defaultMinute: Int = 0
-
-    private var mListener: TimePickerDialog.OnTimeSetListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            mListener = context as TimePickerDialog.OnTimeSetListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + DatePickerDialog.OnDateSetListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        // Create a new instance of DatePickerDialog and return it
-        return context?.let {
-            arguments?.apply {
-                if (containsKey(DEFAULT_HOUR_BUNDLE_KEY))
-                    defaultHour = getInt(DEFAULT_HOUR_BUNDLE_KEY)
-                if (containsKey(DEFAULT_MINUTE_BUNDLE_KEY))
-                    defaultMinute = getInt(DEFAULT_MINUTE_BUNDLE_KEY)
-            }
-
-            TimePickerDialog(it, mListener, defaultHour, defaultMinute, DateFormat.is24HourFormat(activity))
-        } ?: super.onCreateDialog(savedInstanceState)
-    }
-
-    companion object {
-
-        private const val DEFAULT_HOUR_BUNDLE_KEY = "DEFAULT_HOUR_BUNDLE_KEY"
-        private const val DEFAULT_MINUTE_BUNDLE_KEY = "DEFAULT_MINUTE_BUNDLE_KEY"
-
-        fun getInstance(defaultHour: Int,
-                        defaultMinute: Int): TimePickerFragment {
-            return TimePickerFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(DEFAULT_HOUR_BUNDLE_KEY, defaultHour)
-                    putInt(DEFAULT_MINUTE_BUNDLE_KEY, defaultMinute)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
@@ -22,12 +22,12 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.text.SpannableStringBuilder
 import android.text.method.LinkMovementMethod
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R

 class UnavailableFeatureDialogFragment : DialogFragment() {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
@@ -26,7 +26,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.UriUtil.openUrl

 /**
 * Custom Dialog that asks the user to download the pro version or make a donation.
@@ -39,21 +39,22 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
            val builder = AlertDialog.Builder(activity)

            val stringBuilder = SpannableStringBuilder()
-            if (UriUtil.contributingUser(activity)) {
+            /*
+            if (activity.isContributingUser()) {
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_thanks), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                        .append(HtmlCompat.fromHtml(getString(R.string.html_rose), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_work_hard), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_upgrade), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
                builder.setPositiveButton(android.R.string.ok) { _, _ -> dismiss() }
            } else {
+             */
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
                builder.setPositiveButton(R.string.contribute) { _, _ ->
-                    UriUtil.gotoUrl(requireContext(), R.string.contribution_url)
+                    context?.openUrl(R.string.contribution_url)
                }
-                builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
-            }
+            //}
            builder.setMessage(stringBuilder)
            // Create the AlertDialog object and return it
            return builder.create()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/DatabaseFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/DatabaseFragment.kt
@@ -2,19 +2,19 @@ package com.kunzisoft.keepass.activities.fragments

 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.Fragment
 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.ContextualDatabase
 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 {
+abstract class DatabaseFragment : Fragment(), DatabaseRetrieval {

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

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
@@ -38,7 +38,7 @@ abstract class DatabaseFragment : StylishFragment(), DatabaseRetrieval {
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
@@ -35,14 +35,20 @@ import com.kunzisoft.keepass.activities.dialogs.ReplaceFileDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
 import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
 import com.kunzisoft.keepass.adapters.TagsProposalAdapter
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.template.Template
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.StreamDirection
-import com.kunzisoft.keepass.view.*
+import com.kunzisoft.keepass.utils.getParcelableList
+import com.kunzisoft.keepass.utils.putParcelableList
+import com.kunzisoft.keepass.view.TagsCompletionView
+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
 import com.tokenautocomplete.FilteredArrayAdapter

@@ -71,12 +77,11 @@ class EntryEditFragment: DatabaseFragment() {
        super.onCreateView(inflater, container, savedInstanceState)

        // Retrieve the textColor to tint the icon
-        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        val taIconColor = context?.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)
+        return inflater.inflate(R.layout.fragment_entry_edit, container, false)
    }

    override fun onViewCreated(view: View,
@@ -124,7 +129,7 @@ class EntryEditFragment: DatabaseFragment() {

        if (savedInstanceState != null) {
            val attachments: List<Attachment> =
-                savedInstanceState.getParcelableArrayList(ATTACHMENTS_TAG) ?: listOf()
+                savedInstanceState.getParcelableList(ATTACHMENTS_TAG) ?: listOf()
            setAttachments(attachments)
        }

@@ -268,7 +273,7 @@ class EntryEditFragment: DatabaseFragment() {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {

        templateView.populateIconMethod = { imageView, icon ->
            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
@@ -379,7 +384,7 @@ class EntryEditFragment: DatabaseFragment() {

    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
-        outState.putParcelableArrayList(ATTACHMENTS_TAG, ArrayList(getAttachments()))
+        outState.putParcelableList(ATTACHMENTS_TAG, getAttachments())
    }

    /* -------------
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
@@ -14,14 +14,16 @@ 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.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.helper.getLocalizedName
 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.TimeUtil.getDateTimeString
 import com.kunzisoft.keepass.utils.UuidUtil
 import com.kunzisoft.keepass.view.TemplateView
 import com.kunzisoft.keepass.view.hideByFading
@@ -57,8 +59,7 @@ class EntryFragment: DatabaseFragment() {
                              savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)

-        return inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry, container, false)
+        return inflater.inflate(R.layout.fragment_entry, container, false)
    }
    
    override fun onViewCreated(view: View,
@@ -132,7 +133,7 @@ class EntryFragment: DatabaseFragment() {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        context?.let { context ->
            attachmentsAdapter = EntryAttachmentsItemsAdapter(context)
            attachmentsAdapter?.database = database
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryHistoryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryHistoryFragment.kt
@@ -4,16 +4,16 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 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() {
+class EntryHistoryFragment: Fragment() {

    private lateinit var historyContainerView: View
    private lateinit var historyListView: RecyclerView
@@ -28,8 +28,7 @@ class EntryHistoryFragment: StylishFragment() {
    ): View? {
        super.onCreateView(inflater, container, savedInstanceState)

-        return inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry_history, container, false)
+        return inflater.inflate(R.layout.fragment_entry_history, container, false)
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt
@@ -22,27 +22,33 @@ package com.kunzisoft.keepass.activities.fragments
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.view.ActionMode
+import androidx.core.view.MenuProvider
 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.SpecialMode
 import com.kunzisoft.keepass.adapters.NodesAdapter
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 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.utils.KeyboardUtil.hideKeyboard
 import com.kunzisoft.keepass.viewmodels.GroupViewModel
-import java.util.*
+import java.util.LinkedList

 class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListener {

@@ -73,19 +79,6 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
    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)
@@ -99,6 +92,40 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        }
    }

+    private val menuProvider: MenuProvider = object: MenuProvider {
+        override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+            menuInflater.inflate(R.menu.tree, menu)
+        }
+
+        override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+            return when (menuItem.itemId) {
+                R.id.menu_sort -> {
+                    context?.let { context ->
+                        val sortDialogFragment: SortDialogFragment =
+                            if (mRecycleBinEnable) {
+                                SortDialogFragment.getInstance(
+                                    PreferencesUtil.getListSort(context),
+                                    PreferencesUtil.getAscendingSort(context),
+                                    PreferencesUtil.getGroupsBeforeSort(context),
+                                    PreferencesUtil.getRecycleBinBottomSort(context)
+                                )
+                            } else {
+                                SortDialogFragment.getInstance(
+                                    PreferencesUtil.getListSort(context),
+                                    PreferencesUtil.getAscendingSort(context),
+                                    PreferencesUtil.getGroupsBeforeSort(context)
+                                )
+                            }
+
+                        sortDialogFragment.show(childFragmentManager, "sortDialog")
+                    }
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+
    override fun onAttach(context: Context) {
        super.onAttach(context)

@@ -137,23 +164,16 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        super.onDetach()
    }

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setHasOptionsMenu(true)
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        mRecycleBinEnable = database?.isRecycleBinEnabled == true
        mRecycleBin = database?.recycleBin

-        contextThemed?.let { context ->
+        context?.let { context ->
            database?.let { database ->
                mAdapter = NodesAdapter(context, database).apply {
                    setOnNodeClickListener(object : NodesAdapter.NodeClickCallback {
-                        override fun onNodeClick(database: Database, node: Node) {
-                            if (mCurrentGroup?.isVirtual == false
-                                && nodeActionSelectionMode) {
+                        override fun onNodeClick(database: ContextualDatabase, node: Node) {
+                            if (nodeActionSelectionMode) {
                                if (listActionNodes.contains(node)) {
                                    // Remove selected item if already selected
                                    listActionNodes.remove(node)
@@ -169,9 +189,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                            }
                        }

-                        override fun onNodeLongClick(database: Database, node: Node): Boolean {
-                            if (mCurrentGroup?.isVirtual == false
-                                && nodeActionPasteMode == PasteMode.UNDEFINED) {
+                        override fun onNodeLongClick(database: ContextualDatabase, node: Node): Boolean {
+                            if (nodeActionPasteMode == PasteMode.UNDEFINED) {
                                // Select the first item after a long click
                                if (!listActionNodes.contains(node))
                                    listActionNodes.add(node)
@@ -180,6 +199,7 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen

                                setActionNodes(listActionNodes)
                                notifyNodeChanged(node)
+                                activity?.hideKeyboard()
                            }
                            return true
                        }
@@ -191,7 +211,7 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -207,13 +227,14 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)
        // To apply theme
-        return inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_nodes, container, false)
+        return inflater.inflate(R.layout.fragment_nodes, container, false)
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)

+        activity?.addMenuProvider(menuProvider, viewLifecycleOwner)
+
        mNodesRecyclerView = view.findViewById(R.id.nodes_list)
        notFoundView = view.findViewById(R.id.not_found_container)

@@ -242,8 +263,6 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        activity?.intent?.let {
            specialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(it)
        }
-
-        rebuildList()
    }

    override fun onPause() {
@@ -293,43 +312,7 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
        }
    }

-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.tree, menu)
-
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-
-            R.id.menu_sort -> {
-                context?.let { context ->
-                    val sortDialogFragment: SortDialogFragment =
-                            if (mRecycleBinEnable) {
-                                SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(context),
-                                    PreferencesUtil.getAscendingSort(context),
-                                    PreferencesUtil.getGroupsBeforeSort(context),
-                                    PreferencesUtil.getRecycleBinBottomSort(context)
-                                )
-                            } else {
-                                SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(context),
-                                    PreferencesUtil.getAscendingSort(context),
-                                    PreferencesUtil.getGroupsBeforeSort(context)
-                                )
-                            }
-
-                    sortDialogFragment.show(childFragmentManager, "sortDialog")
-                }
-                return true
-            }
-
-            else -> return super.onOptionsItemSelected(item)
-        }
-    }
-
-    fun actionNodesCallback(database: Database,
+    fun actionNodesCallback(database: ContextualDatabase,
                            nodes: List<Node>,
                            menuListener: NodesActionMenuListener?,
                            onDestroyActionMode: (mode: ActionMode?) -> Unit) : ActionMode.Callback {
@@ -363,14 +346,12 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                    }

                    // Move
-                    if (database.isReadOnly
-                            || isASearchResult) {
+                    if (database.isReadOnly) {
                        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)
                    }
@@ -433,20 +414,20 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickListener {
-        fun onNodeClick(database: Database, node: Node)
-        fun onNodeSelected(database: Database, nodes: List<Node>): Boolean
+        fun onNodeClick(database: ContextualDatabase, node: Node)
+        fun onNodeSelected(database: ContextualDatabase, nodes: List<Node>): Boolean
    }

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

    enum class PasteMode {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
@@ -22,7 +22,7 @@ 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.ContextualDatabase
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom


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

-    override fun defineIconList(database: Database?) {
+    override fun defineIconList(database: ContextualDatabase?) {
        database?.doForEachCustomIcons { customIcon, _ ->
            iconPickerAdapter.addIcon(customIcon, false)
        }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
@@ -28,7 +28,7 @@ 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.ContextualDatabase
 import com.kunzisoft.keepass.database.element.icon.IconImageDraw
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
 import kotlinx.coroutines.CoroutineScope
@@ -47,7 +47,7 @@ abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),

    abstract fun retrieveMainLayoutId(): Int

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

    override fun onCreateView(inflater: LayoutInflater,
                              container: ViewGroup?,
@@ -59,7 +59,7 @@ abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
        super.onViewCreated(view, savedInstanceState)

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

@@ -71,7 +71,7 @@ abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
        resetAppTimeoutWhenViewFocusedOrChanged(view)
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        iconPickerAdapter.iconDrawableFactory = database?.iconDrawableFactory

        CoroutineScope(Dispatchers.IO).launch {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt
@@ -10,7 +10,7 @@ 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.database.ContextualDatabase
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel

 class IconPickerFragment : DatabaseFragment() {
@@ -48,7 +48,7 @@ class IconPickerFragment : DatabaseFragment() {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
            if (database?.allowCustomIcons == true) 2 else 1)
        viewPager.adapter = iconPickerPagerAdapter
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
@@ -20,7 +20,7 @@
 package com.kunzisoft.keepass.activities.fragments

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


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

-    override fun defineIconList(database: Database?) {
+    override fun defineIconList(database: ContextualDatabase?) {
        database?.doForEachStandardIcons { standardIcon ->
            iconPickerAdapter.addIcon(standardIcon, false)
        }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/KeyGeneratorFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/KeyGeneratorFragment.kt
@@ -30,7 +30,7 @@ import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.adapters.KeyGeneratorPagerAdapter
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.viewmodels.KeyGeneratorViewModel

 class KeyGeneratorFragment : DatabaseFragment() {
@@ -107,7 +107,7 @@ class KeyGeneratorFragment : DatabaseFragment() {
        super.onDestroyView()
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        // Nothing here
    }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PassphraseGeneratorFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PassphraseGeneratorFragment.kt
@@ -30,7 +30,7 @@ import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.slider.Slider
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.password.PassphraseGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
@@ -73,7 +73,7 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
        minSliderWordCount = resources.getInteger(R.integer.passphrase_generator_word_count_min)
        maxSliderWordCount = resources.getInteger(R.integer.passphrase_generator_word_count_max)

-        contextThemed?.let { context ->
+        context?.let { context ->
            passphraseCopyView?.visibility = if(PreferencesUtil.allowCopyProtectedFields(context))
                View.VISIBLE else View.GONE
            val clipboardHelper = ClipboardHelper(context)
@@ -244,7 +244,7 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        // Nothing here
    }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PasswordGeneratorFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PasswordGeneratorFragment.kt
@@ -32,7 +32,7 @@ import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.slider.Slider
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
@@ -94,7 +94,7 @@ class PasswordGeneratorFragment : DatabaseFragment() {
        atLeastOneCompound = view.findViewById(R.id.atLeastOne_filter)
        excludeAmbiguousCompound = view.findViewById(R.id.excludeAmbiguous_filter)

-        contextThemed?.let { context ->
+        context?.let { context ->
            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyProtectedFields(context))
                View.VISIBLE else View.GONE
            val clipboardHelper = ClipboardHelper(context)
@@ -318,7 +318,7 @@ class PasswordGeneratorFragment : DatabaseFragment() {
        super.onDestroy()
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        // Nothing here
    }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
@@ -26,7 +26,9 @@ import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import java.io.Serializable
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
+import com.kunzisoft.keepass.utils.getEnumExtra
+import com.kunzisoft.keepass.utils.putEnumExtra

 object EntrySelectionHelper {

@@ -82,7 +84,7 @@ object EntrySelectionHelper {
    }

    fun retrieveSearchInfoFromIntent(intent: Intent): SearchInfo? {
-        return intent.getParcelableExtra(KEY_SEARCH_INFO)
+        return intent.getParcelableExtraCompat(KEY_SEARCH_INFO)
    }

    private fun addRegisterInfoInIntent(intent: Intent, registerInfo: RegisterInfo?) {
@@ -92,7 +94,7 @@ object EntrySelectionHelper {
    }

    fun retrieveRegisterInfoFromIntent(intent: Intent): RegisterInfo? {
-        return intent.getParcelableExtra(KEY_REGISTER_INFO)
+        return intent.getParcelableExtraCompat(KEY_REGISTER_INFO)
    }

    fun removeInfoFromIntent(intent: Intent) {
@@ -101,7 +103,7 @@ object EntrySelectionHelper {
    }

    fun addSpecialModeInIntent(intent: Intent, specialMode: SpecialMode) {
-        intent.putExtra(KEY_SPECIAL_MODE, specialMode as Serializable)
+        intent.putEnumExtra(KEY_SPECIAL_MODE, specialMode)
    }

    fun retrieveSpecialModeFromIntent(intent: Intent): SpecialMode {
@@ -109,12 +111,11 @@ object EntrySelectionHelper {
            if (AutofillHelper.retrieveAutofillComponent(intent) != null)
                return SpecialMode.SELECTION
        }
-        return intent.getSerializableExtra(KEY_SPECIAL_MODE) as SpecialMode?
-                ?: SpecialMode.DEFAULT
+        return intent.getEnumExtra<SpecialMode>(KEY_SPECIAL_MODE) ?: SpecialMode.DEFAULT
    }

    private fun addTypeModeInIntent(intent: Intent, typeMode: TypeMode) {
-        intent.putExtra(KEY_TYPE_MODE, typeMode as Serializable)
+        intent.putEnumExtra(KEY_TYPE_MODE, typeMode)
    }

    fun retrieveTypeModeFromIntent(intent: Intent): TypeMode {
@@ -122,7 +123,7 @@ object EntrySelectionHelper {
            if (AutofillHelper.retrieveAutofillComponent(intent) != null)
                return TypeMode.AUTOFILL
        }
-        return intent.getSerializableExtra(KEY_TYPE_MODE) as TypeMode? ?: TypeMode.DEFAULT
+        return intent.getEnumExtra<TypeMode>(KEY_TYPE_MODE) ?: TypeMode.DEFAULT
    }

    fun removeModesFromIntent(intent: Intent) {
@@ -175,7 +176,7 @@ object EntrySelectionHelper {
                    }
                }
                if (!autofillComponentInit) {
-                    if (intent.getSerializableExtra(KEY_SPECIAL_MODE) != null) {
+                    if (intent.getEnumExtra<SpecialMode>(KEY_SPECIAL_MODE) != null) {
                        when (retrieveTypeModeFromIntent(intent)) {
                            TypeMode.DEFAULT -> {
                                removeModesFromIntent(intent)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
@@ -22,7 +22,6 @@ 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
@@ -33,7 +32,7 @@ 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
+import com.kunzisoft.keepass.utils.UriUtil.takeUriPermission

 class ExternalFileHelper {

@@ -56,11 +55,9 @@ class ExternalFileHelper {

    fun buildOpenDocument(onFileSelected: ((uri: Uri?) -> Unit)?) {

-        val resultCallback = ActivityResultCallback<Uri> { result ->
-            result?.let { uri ->
-                UriUtil.takeUriPermission(activity?.contentResolver, uri)
-                onFileSelected?.invoke(uri)
-            }
+        val resultCallback = ActivityResultCallback<Uri?> { result ->
+            activity?.contentResolver?.takeUriPermission(result)
+            onFileSelected?.invoke(result)
        }

        getContentResultLauncher = if (fragment != null) {
@@ -91,7 +88,7 @@ class ExternalFileHelper {
    fun buildCreateDocument(typeString: String = "application/octet-stream",
                            onFileCreated: (fileCreated: Uri?)->Unit) {

-        val resultCallback = ActivityResultCallback<Uri> { result ->
+        val resultCallback = ActivityResultCallback<Uri?> { result ->
            onFileCreated.invoke(result)
        }

@@ -150,7 +147,7 @@ class ExternalFileHelper {

    class OpenDocument : ActivityResultContracts.OpenDocument() {
        @SuppressLint("InlinedApi")
-        override fun createIntent(context: Context, input: Array<out String>): Intent {
+        override fun createIntent(context: Context, input: Array<String>): Intent {
            return super.createIntent(context, input).apply {
                addCategory(Intent.CATEGORY_OPENABLE)
                addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
@@ -178,34 +175,17 @@ class ExternalFileHelper {
        }
    }

-    class CreateDocument(private val typeString: String) : ActivityResultContracts.CreateDocument() {
+    class CreateDocument(typeString: String) : ActivityResultContracts.CreateDocument(typeString) {
        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
-            }
-        }
    }
 }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
@@ -4,23 +4,24 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.viewModels
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.database.DatabaseTaskProvider
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.tasks.ActionRunnable
+import com.kunzisoft.keepass.utils.getBinaryDir
 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
+    protected var mDatabase: ContextualDatabase? = null

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

-        mDatabaseTaskProvider = DatabaseTaskProvider(this)
+        mDatabaseTaskProvider = DatabaseTaskProvider(this, showDatabaseDialog())

        mDatabaseTaskProvider?.onDatabaseRetrieved = { database ->
            val databaseWasReloaded = database?.wasReloaded == true
@@ -36,14 +37,25 @@ abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval {
        }
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    protected open fun showDatabaseDialog(): Boolean {
+        return true
+    }
+
+    override fun onDestroy() {
+        mDatabaseTaskProvider?.destroy()
+        mDatabaseTaskProvider = null
+        mDatabase = null
+        super.onDestroy()
+    }
+
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        mDatabase = database
        mDatabaseViewModel.defineDatabase(database)
        // optional method implementation
    }

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -51,21 +63,25 @@ abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval {
        // optional method implementation
    }

-    fun createDatabase(databaseUri: Uri,
-                       mainCredential: MainCredential) {
+    fun createDatabase(
+        databaseUri: Uri,
+        mainCredential: MainCredential
+    ) {
        mDatabaseTaskProvider?.startDatabaseCreate(databaseUri, mainCredential)
    }

-    fun loadDatabase(databaseUri: Uri,
-                     mainCredential: MainCredential,
-                     readOnly: Boolean,
-                     cipherEncryptDatabase: CipherEncryptDatabase?,
-                     fixDuplicateUuid: Boolean) {
+    fun loadDatabase(
+        databaseUri: Uri,
+        mainCredential: MainCredential,
+        readOnly: Boolean,
+        cipherEncryptDatabase: CipherEncryptDatabase?,
+        fixDuplicateUuid: Boolean
+    ) {
        mDatabaseTaskProvider?.startDatabaseLoad(databaseUri, mainCredential, readOnly, cipherEncryptDatabase, fixDuplicateUuid)
    }

    protected fun closeDatabase() {
-        mDatabase?.clearAndClose(this)
+        mDatabase?.clearAndClose(this.getBinaryDir())
    }

    override fun onResume() {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
@@ -32,19 +32,17 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.DatabaseDialogFragment
 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.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
 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
@@ -68,8 +66,6 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
    protected var mMergeDataAllowed: Boolean = false
    private var mAutoSaveEnable: Boolean = true

-    protected var mIconDrawableFactory: IconDrawableFactory? = null
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -91,8 +87,8 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
            mDatabaseTaskProvider?.startDatabaseSave(save)
        }

-        mDatabaseViewModel.mergeDatabase.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseMerge()
+        mDatabaseViewModel.mergeDatabase.observe(this) { save ->
+            mDatabaseTaskProvider?.startDatabaseMerge(save)
        }

        mDatabaseViewModel.reloadDatabase.observe(this) { fixDuplicateUuid ->
@@ -168,7 +164,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
        return true
    }

-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
        super.onDatabaseRetrieved(database)

        // End activity if database not loaded
@@ -208,16 +204,24 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),

            mDatabaseReadOnly = database.isReadOnly
            mMergeDataAllowed = database.isMergeDataAllowed()
-            mIconDrawableFactory = database.iconDrawableFactory

            checkRegister()
        }
    }

+    override fun finish() {
+        // To fix weird crash
+        try {
+            super.finish()
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to finish the activity", e)
+        }
+    }
+
    abstract fun viewToInvalidateTimeout(): View?

    override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
        actionTask: String,
        result: ActionRunnable.Result
    ) {
@@ -228,6 +232,9 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
                // Reload the current activity
                if (result.isSuccess) {
                    reloadActivity()
+                    if (actionTask == DatabaseTaskNotificationService.ACTION_DATABASE_MERGE_TASK) {
+                        Toast.makeText(this, R.string.merge_success, Toast.LENGTH_LONG).show()
+                    }
                } else {
                    this.showActionErrorIfNeeded(result)
                    finish()
@@ -236,15 +243,19 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
        }
    }

-    override fun onPasswordEncodingValidateListener(databaseUri: Uri?,
-                                                    mainCredential: MainCredential) {
+    override fun onPasswordEncodingValidateListener(
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) {
        assignDatabasePassword(databaseUri, mainCredential)
    }

-    private fun assignDatabasePassword(databaseUri: Uri?,
-                                       mainCredential: MainCredential) {
+    private fun assignDatabasePassword(
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) {
        if (databaseUri != null) {
-            mDatabaseTaskProvider?.startDatabaseAssignPassword(databaseUri, mainCredential)
+            mDatabaseTaskProvider?.startDatabaseAssignCredential(databaseUri, mainCredential)
        }
    }

@@ -252,7 +263,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
        mDatabase?.let { database ->
            database.fileUri?.let { databaseUri ->
                // Show the progress dialog now or after dialog confirmation
-                if (database.validatePasswordEncoding(mainCredential)) {
+                if (database.isValidCredential(mainCredential.toMasterCredential(contentResolver))) {
                    assignDatabasePassword(databaseUri, mainCredential)
                } else {
                    PasswordEncodingDialogFragment.getInstance(databaseUri, mainCredential)
@@ -271,11 +282,11 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
    }

    fun mergeDatabase() {
-        mDatabaseTaskProvider?.startDatabaseMerge()
+        mDatabaseTaskProvider?.startDatabaseMerge(mAutoSaveEnable)
    }

    fun mergeDatabaseFrom(uri: Uri, mainCredential: MainCredential) {
-        mDatabaseTaskProvider?.startDatabaseMerge(uri, mainCredential)
+        mDatabaseTaskProvider?.startDatabaseMerge(mAutoSaveEnable, uri, mainCredential)
    }

    fun reloadDatabase() {
@@ -304,7 +315,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
        mDatabaseTaskProvider?.startDatabaseMoveNodes(nodesToMove, newParent, mAutoSaveEnable)
    }

-    private fun eachNodeRecyclable(database: Database, nodes: List<Node>): Boolean {
+    private fun eachNodeRecyclable(database: ContextualDatabase, nodes: List<Node>): Boolean {
        return nodes.find { node ->
            var cannotRecycle = true
            if (node is Entry) {
@@ -320,7 +331,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
        mDatabase?.let { database ->
            // If recycle bin enabled, ensure it exists
            if (database.isRecycleBinEnabled) {
-                database.ensureRecycleBinExists(resources)
+                database.ensureRecycleBinExists(resources.getString(R.string.recycle_bin))
            }

            // If recycle bin enabled and not in recycle bin, move in recycle bin
@@ -452,14 +463,14 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
            mDatabase?.loaded ?: false)
    }

-    override fun onBackPressed() {
+    override fun onDatabaseBackPressed() {
        if (mTimeoutEnable) {
            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
                mDatabase?.loaded == true) {
-                super.onBackPressed()
+                super.onDatabaseBackPressed()
            }
        } else {
-            super.onBackPressed()
+            super.onDatabaseBackPressed()
        }
    }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt
@@ -3,13 +3,14 @@ package com.kunzisoft.keepass.activities.legacy
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
 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.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.SpecialModeView
+import com.kunzisoft.keepass.view.ToolbarSpecial


 /**
@@ -20,20 +21,22 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
    protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
    private var mTypeMode: TypeMode = TypeMode.DEFAULT

-    private var mSpecialModeView: SpecialModeView? = null
+    private var mToolbarSpecial: ToolbarSpecial? = null

-    override fun onBackPressed() {
+    open fun onDatabaseBackPressed() {
        if (mSpecialMode != SpecialMode.DEFAULT)
            onCancelSpecialMode()
        else
-            super.onBackPressed()
+            onRegularBackPressed()
    }

    /**
     * To call the regular onBackPressed() method in special mode
     */
    protected fun onRegularBackPressed() {
-        super.onBackPressed()
+        // Do not call onBackPressedDispatcher.onBackPressed() to avoid loop
+        // Calling onBackPressed() is now deprecated, directly finish the activity
+        finish()
    }

    /**
@@ -72,7 +75,7 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
    open fun onCancelSpecialMode() {
        if (isIntentSender()) {
            // To get the app caller, only for IntentSender
-            super.onBackPressed()
+            onRegularBackPressed()
        } else {
            EntrySelectionHelper.removeModesFromIntent(intent)
            EntrySelectionHelper.removeInfoFromIntent(intent)
@@ -85,7 +88,7 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
    protected fun backToTheAppCaller() {
        if (isIntentSender()) {
            // To get the app caller, only for IntentSender
-            super.onBackPressed()
+            onRegularBackPressed()
        } else {
            backToTheMainAppAndFinish()
        }
@@ -100,6 +103,12 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                onDatabaseBackPressed()
+            }
+        })
+
        mSpecialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(intent)
        mTypeMode = EntrySelectionHelper.retrieveTypeModeFromIntent(intent)
    }
@@ -113,8 +122,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
                ?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)

        // To show the selection mode
-        mSpecialModeView = findViewById(R.id.special_mode_view)
-        mSpecialModeView?.apply {
+        mToolbarSpecial = findViewById(R.id.special_mode_view)
+        mToolbarSpecial?.apply {
            // Populate title
            val selectionModeStringId = when (mSpecialMode) {
                SpecialMode.DEFAULT, // Not important because hidden
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseRetrieval.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseRetrieval.kt
@@ -1,11 +1,11 @@
 package com.kunzisoft.keepass.activities.legacy

-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.tasks.ActionRunnable

 interface DatabaseRetrieval {
-    fun onDatabaseRetrieved(database: Database?)
-    fun onDatabaseActionFinished(database: Database,
+    fun onDatabaseRetrieved(database: ContextualDatabase?)
+    fun onDatabaseActionFinished(database: ContextualDatabase,
                                 actionTask: String,
                                 result: ActionRunnable.Result)
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
@@ -23,6 +23,7 @@ import android.content.Context
 import android.content.res.Configuration
 import android.util.Log
 import androidx.annotation.StyleRes
+import com.google.android.material.color.DynamicColors
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.settings.PreferencesUtil

@@ -38,7 +39,7 @@ object Stylish {
     * @param context Context to retrieve the theme preference
     */
    fun load(context: Context) {
-        Log.d(Stylish::class.java.name, "Attatching to " + context.packageName)
+        Log.d(Stylish::class.java.name, "Attaching to " + context.packageName)
        try {
            themeString = PreferencesUtil.getStyle(context)
        } catch (e: Exception) {
@@ -46,7 +47,7 @@ object Stylish {
        }
    }

-    fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
+    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
@@ -58,14 +59,21 @@ object Stylish {
            }
        }
        return if (systemNightMode) {
-            retrieveEquivalentNightStyle(context, styleString)
+            retrieveEquivalentNightStyle(
+                context,
+                styleString ?: context.getString(R.string.list_style_name_night)
+            )
        } else {
-            retrieveEquivalentLightStyle(context, styleString)
+            retrieveEquivalentLightStyle(
+                context,
+                styleString ?: context.getString(R.string.list_style_name_light)
+            )
        }
    }

    fun retrieveEquivalentLightStyle(context: Context, styleString: String): String {
        return when (styleString) {
+            context.getString(R.string.list_style_name_dynamic_night) -> context.getString(R.string.list_style_name_dynamic_light)
            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)
@@ -80,6 +88,7 @@ object Stylish {

    private fun retrieveEquivalentNightStyle(context: Context, styleString: String): String {
        return when (styleString) {
+            context.getString(R.string.list_style_name_dynamic_light) -> context.getString(R.string.list_style_name_dynamic_night)
            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)
@@ -104,6 +113,13 @@ object Stylish {
        PreferencesUtil.setStyle(context, styleString)
    }

+    fun isDynamic(context: Context): Boolean {
+        return DynamicColors.isDynamicColorAvailable() && (
+                themeString == context.getString(R.string.list_style_name_dynamic_night)
+                        || themeString == context.getString(R.string.list_style_name_dynamic_light)
+                )
+    }
+
    /**
     * Function that returns the current id of the style selected in the preference
     * @param context Context to retrieve the id
@@ -111,7 +127,7 @@ object Stylish {
     */
    @StyleRes
    fun getThemeId(context: Context): Int {
-        return when (retrieveEquivalentSystemStyle(context, themeString ?: context.getString(R.string.list_style_name_light))) {
+        return when (retrieveEquivalentSystemStyle(context, themeString)) {
            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
@@ -127,6 +143,8 @@ object Stylish {
            context.getString(R.string.list_style_name_reply_night) -> R.style.KeepassDXStyle_Reply_Night
            context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple
            context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark
+            context.getString(R.string.list_style_name_dynamic_light) -> R.style.KeepassDXStyle_Light_Dynamic
+            context.getString(R.string.list_style_name_dynamic_night) -> R.style.KeepassDXStyle_Night_Dynamic
            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
@@ -21,14 +21,22 @@ package com.kunzisoft.keepass.activities.stylish

 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.WindowManager
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.WindowManager.LayoutParams.FLAG_SECURE
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.preference.PreferenceManager
+import com.google.android.material.color.DynamicColors
+import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.settings.NestedAppSettingsFragment.Companion.DATABASE_PREFERENCE_CHANGED
+import com.kunzisoft.keepass.settings.PreferencesUtil

 /**
 * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from
@@ -77,12 +85,33 @@ abstract class StylishActivity : AppCompatActivity() {

        customStyle = applyCustomStyle()
        if (customStyle) {
+            // Preconfigured themes
            this.themeId = Stylish.getThemeId(this)
            setTheme(themeId)
+            if (Stylish.isDynamic(this)) {
+                // Material You theme
+                DynamicColors.applyToActivityIfAvailable(this)
+            }
        }

+        PreferenceManager.getDefaultSharedPreferences(this)
+            .registerOnSharedPreferenceChangeListener(onScreenshotModePrefListener)
+    }
+    private val onScreenshotModePrefListener = OnSharedPreferenceChangeListener { _, key ->
+        if (key != getString(R.string.enable_screenshot_mode_key)) return@OnSharedPreferenceChangeListener
+
+        setScreenshotMode(PreferencesUtil.isScreenshotModeEnabled(this))
+    }
+
+    private fun setScreenshotMode(isEnabled: Boolean) {
+        findViewById<View>(R.id.screenshot_mode_banner)?.visibility = if (isEnabled) VISIBLE else GONE
+
        // Several gingerbread devices have problems with FLAG_SECURE
-        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+        if (isEnabled) {
+            window.clearFlags(FLAG_SECURE)
+        } else {
+            window.setFlags(FLAG_SECURE, FLAG_SECURE)
+        }
    }

    override fun onResume() {
@@ -94,6 +123,7 @@ abstract class StylishActivity : AppCompatActivity() {
            Log.d(this.javaClass.name, "Theme change detected, restarting activity")
            recreateActivity()
        }
+        setScreenshotMode(PreferencesUtil.isScreenshotModeEnabled(this))
    }

    private fun recreateActivity() {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
@@ -1,99 +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.stylish
-
-import android.content.Context
-import android.graphics.Color
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.StyleRes
-import androidx.appcompat.view.ContextThemeWrapper
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.fragment.app.Fragment
-
-abstract class StylishFragment : Fragment() {
-
-    @StyleRes
-    protected var themeId: Int = 0
-    protected var contextThemed: Context? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        this.themeId = Stylish.getThemeId(context)
-        contextThemed = ContextThemeWrapper(context, themeId)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        // To fix status bar color
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val window = requireActivity().window
-            val defaultColor = Color.BLACK
-            val windowInset = WindowInsetsControllerCompat(window, window.decorView)
-            try {
-                val taStatusBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
-                window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
-                taStatusBarColor?.recycle()
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to retrieve theme : status bar color", e)
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                try {
-                    val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
-                    windowInset.isAppearanceLightStatusBars = taWindowStatusLight
-                            ?.getBoolean(0, false) == true
-                    taWindowStatusLight?.recycle()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to retrieve theme : window light status bar", e)
-                }
-            }
-            try {
-                val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
-                window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
-                taNavigationBarColor?.recycle()
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to retrieve theme : navigation bar color", e)
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                try {
-                    val taWindowLightNavigationBar = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightNavigationBar))
-                    windowInset.isAppearanceLightNavigationBars = taWindowLightNavigationBar
-                        ?.getBoolean(0, false) == true
-                    taWindowLightNavigationBar?.recycle()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to retrieve theme : navigation light navigation bar", e)
-                }
-            }
-        }
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onDetach() {
-        contextThemed = null
-        super.onDetach()
-    }
-
-    companion object {
-        private val TAG = StylishFragment::class.java.simpleName
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -39,10 +39,10 @@ class BreadcrumbAdapter(val context: Context)
        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()
+        // Retrieve the color to tint the icon
+        val taIconColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSurface))
+        mIconColor = taIconColor.getColor(0, Color.WHITE)
+        taIconColor.recycle()
    }

    @SuppressLint("NotifyDataSetChanged")
@@ -71,7 +71,7 @@ class BreadcrumbAdapter(val context: Context)
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BreadcrumbGroupViewHolder {
        return BreadcrumbGroupViewHolder(inflater.inflate(
            when (viewType) {
-                0 -> R.layout.item_group
+                0 -> R.layout.item_breadcrumb_important
                else -> R.layout.item_breadcrumb
            }, parent, false)
        )
@@ -112,8 +112,12 @@ class BreadcrumbAdapter(val context: Context)

                holder.groupNumbersView?.apply {
                    if (mShowNumberEntries) {
-                        group.refreshNumberOfChildEntries(Group.ChildFilter.getDefaults(context))
-                        text = group.numberOfChildEntries.toString()
+                        group.refreshNumberOfChildEntries(
+                            Group.ChildFilter.getDefaults(
+                                PreferencesUtil.showExpiredEntries(context)
+                            )
+                        )
+                        text = group.recursiveNumberOfChildEntries.toString()
                        visibility = View.VISIBLE
                    } else {
                        visibility = View.GONE
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -27,16 +27,18 @@ import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.ImageViewerActivity
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.helper.getLocalizedName
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.services.AttachmentFileNotificationService.Companion.FILE_PROGRESSION_MAX
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import com.kunzisoft.keepass.view.expand
 import kotlin.math.max
@@ -45,7 +47,7 @@ import kotlin.math.max
 class EntryAttachmentsItemsAdapter(context: Context)
    : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {

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

@@ -130,13 +132,14 @@ class EntryAttachmentsItemsAdapter(context: Context)
        holder.binaryFileSize.text = Formatter.formatFileSize(context, size)
        holder.binaryFileCompression.apply {
            if (entryAttachmentState.attachment.binaryData.isCompressed) {
-                text = CompressionAlgorithm.GZip.getName(context.resources)
+                text = CompressionAlgorithm.GZIP.getLocalizedName(context.resources)
                visibility = View.VISIBLE
            } else {
                text = ""
                visibility = View.GONE
            }
        }
+        holder.binaryFileProgress.max = FILE_PROGRESSION_MAX
        when (entryAttachmentState.streamDirection) {
            StreamDirection.UPLOAD -> {
                holder.binaryFileProgressIcon.isActivated = true
@@ -181,7 +184,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
                        AttachmentState.START,
                        AttachmentState.IN_PROGRESS -> View.VISIBLE
                    }
-                    progress = entryAttachmentState.downloadProgression
+                    setProgressCompat(entryAttachmentState.downloadProgression, true)
                }
                holder.binaryFileInfo.setOnClickListener {
                    onItemClickListener?.invoke(entryAttachmentState)
@@ -200,7 +203,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
        var binaryFileCompression: TextView = itemView.findViewById(R.id.item_attachment_compression)
        var binaryFileProgressContainer: View = itemView.findViewById(R.id.item_attachment_progress_container)
        var binaryFileProgressIcon: ImageView = itemView.findViewById(R.id.item_attachment_icon)
-        var binaryFileProgress: ProgressBar = itemView.findViewById(R.id.item_attachment_progress)
+        var binaryFileProgress: CircularProgressIndicator = itemView.findViewById(R.id.item_attachment_progress)
        var binaryFileDeleteButton: View = itemView.findViewById(R.id.item_attachment_delete_button)
    }
-}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
@@ -27,6 +27,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.utils.TimeUtil.getDateTimeString

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

--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -23,12 +23,14 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.PorterDuff
 import android.net.Uri
-import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
-import androidx.annotation.ColorInt
+import android.widget.CompoundButton
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.ViewSwitcher
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -84,20 +86,6 @@ class FileDatabaseHistoryAdapter(context: Context)
        }
    )

-    @ColorInt
-    private val defaultColor: Int
-    @ColorInt
-    private val warningColor: Int
-
-    init {
-        val typedValue = TypedValue()
-        val theme = context.theme
-        theme.resolveAttribute(R.attr.colorAccent, typedValue, true)
-        warningColor = typedValue.data
-        theme.resolveAttribute(android.R.attr.textColorHintInverse, typedValue, true)
-        defaultColor = typedValue.data
-    }
-
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FileDatabaseHistoryViewHolder {
        val view = inflater.inflate(R.layout.item_file_info, parent, false)
        return FileDatabaseHistoryViewHolder(view)
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.adapters

 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Color
 import android.util.Log
 import android.util.TypedValue
@@ -29,12 +30,13 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
+import androidx.core.view.ViewCompat
 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.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.SortNodeEnum
@@ -42,21 +44,23 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.helper.getLocalizedName
 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.*
+import java.util.LinkedList

 /**
 * Create node list adapter with contextMenu or not
 * @param context Context to use
 */
-class NodesAdapter (private val context: Context,
-                    private val database: Database)
-    : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {
+class NodesAdapter (
+    private val context: Context,
+    private val database: ContextualDatabase
+) : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {

    private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
    private val mNodeSortedListCallback: NodeSortedListCallback
@@ -86,6 +90,8 @@ class NodesAdapter (private val context: Context,
    private var mNodeClickCallback: NodeClickCallback? = null
    private var mClipboardHelper = ClipboardHelper(context)

+    @ColorInt
+    private val mColorSurfaceContainer: Int
    @ColorInt
    private val mTextColorPrimary: Int
    @ColorInt
@@ -93,9 +99,9 @@ class NodesAdapter (private val context: Context,
    @ColorInt
    private val mTextColorSecondary: Int
    @ColorInt
-    private val mColorAccentLight: Int
+    private val mColorSecondary: Int
    @ColorInt
-    private val mColorOnAccentColor: Int
+    private val mColorOnSecondary: Int

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

+        val taColorSurfaceContainer = context.obtainStyledAttributes(intArrayOf(R.attr.colorSurfaceContainer))
+        this.mColorSurfaceContainer = taColorSurfaceContainer.getColor(0, Color.BLACK)
+        taColorSurfaceContainer.recycle()
        // Retrieve the color to tint the icon
-        val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
+        val taTextColorPrimary = context.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
        this.mTextColorPrimary = taTextColorPrimary.getColor(0, Color.BLACK)
        taTextColorPrimary.recycle()
        // To get text color
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        val taTextColor = context.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
        this.mTextColor = taTextColor.getColor(0, Color.BLACK)
        taTextColor.recycle()
        // To get text color secondary
-        val taTextColorSecondary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorSecondary))
+        val taTextColorSecondary = context.obtainStyledAttributes(intArrayOf(android.R.attr.textColorSecondary))
        this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK)
        taTextColorSecondary.recycle()
        // To get background color for selection
-        val taColorAccentLight = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight))
-        this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY)
-        taColorAccentLight.recycle()
+        val taColorSecondary = context.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
+        this.mColorSecondary = taColorSecondary.getColor(0, Color.GRAY)
+        taColorSecondary.recycle()
        // To get text color for selection
-        val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
-        this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE)
-        taColorOnAccentColor.recycle()
+        val taColorOnSecondary = context.obtainStyledAttributes(intArrayOf(R.attr.colorOnSecondary))
+        this.mColorOnSecondary = taColorOnSecondary.getColor(0, Color.WHITE)
+        taColorOnSecondary.recycle()
    }

    private fun assignPreferences() {
@@ -152,7 +161,9 @@ class NodesAdapter (private val context: Context,
        this.mShowOTP = PreferencesUtil.showOTPToken(context)
        this.mShowUUID = PreferencesUtil.showUUID(context)

-        this.mEntryFilters = Group.ChildFilter.getDefaults(context)
+        this.mEntryFilters = Group.ChildFilter.getDefaults(
+            PreferencesUtil.showExpiredEntries(context)
+        )

        // Reinit textSize for all view type
        mCalculateViewTypeTextSize.forEachIndexed { index, _ -> mCalculateViewTypeTextSize[index] = true }
@@ -186,6 +197,7 @@ class NodesAdapter (private val context: Context,
                        && oldItem.containsAttachment() == newItem.containsAttachment()
            } else if (oldItem is Group && newItem is Group) {
                typeContentTheSame = oldItem.numberOfChildEntries == newItem.numberOfChildEntries
+                        && oldItem.recursiveNumberOfChildEntries == newItem.recursiveNumberOfChildEntries
                        && oldItem.notes == newItem.notes
            }
            return typeContentTheSame
@@ -376,10 +388,10 @@ class NodesAdapter (private val context: Context,

        // Assign icon colors
        var iconColor = if (holder.container.isSelected)
-            mColorOnAccentColor
+            mColorOnSecondary
        else when (subNode.type) {
-            Type.GROUP -> mTextColorPrimary
-            Type.ENTRY -> mTextColor
+            Type.GROUP -> mTextColor
+            Type.ENTRY -> mColorSecondary
        }

        // Specific elements for entry
@@ -424,16 +436,8 @@ class NodesAdapter (private val context: Context,
                    if (entry.containsAttachment()) View.VISIBLE else View.GONE

            // Assign colors
-            val backgroundColor = if (mShowEntryColors) entry.backgroundColor else null
-            if (!holder.container.isSelected) {
-                if (backgroundColor != null) {
-                    holder.container.setBackgroundColor(backgroundColor)
-                } else {
-                    holder.container.setBackgroundColor(Color.TRANSPARENT)
-                }
-            } else {
-                holder.container.setBackgroundColor(mColorAccentLight)
-            }
+            assignBackgroundColor(holder.container, entry)
+            assignBackgroundColor(holder.otpContainer, entry)
            val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
            if (!holder.container.isSelected) {
                if (foregroundColor != null) {
@@ -453,12 +457,12 @@ class NodesAdapter (private val context: Context,
                    holder.meta.setTextColor(mTextColor)
                }
            } else {
-                holder.text.setTextColor(mColorOnAccentColor)
-                holder.subText?.setTextColor(mColorOnAccentColor)
-                holder.otpToken?.setTextColor(mColorOnAccentColor)
-                holder.otpProgress?.setIndicatorColor(mColorOnAccentColor)
-                holder.attachmentIcon?.setColorFilter(mColorOnAccentColor)
-                holder.meta.setTextColor(mColorOnAccentColor)
+                holder.text.setTextColor(mColorOnSecondary)
+                holder.subText?.setTextColor(mColorOnSecondary)
+                holder.otpToken?.setTextColor(mColorOnSecondary)
+                holder.otpProgress?.setIndicatorColor(mColorOnSecondary)
+                holder.attachmentIcon?.setColorFilter(mColorOnSecondary)
+                holder.meta.setTextColor(mColorOnSecondary)
            }

            database.stopManageEntry(entry)
@@ -469,7 +473,7 @@ class NodesAdapter (private val context: Context,
            if (mShowNumberEntries) {
                holder.numberChildren?.apply {
                    text = (subNode as Group)
-                            .numberOfChildEntries
+                            .recursiveNumberOfChildEntries
                            .toString()
                    setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                    visibility = View.VISIBLE
@@ -524,7 +528,8 @@ class NodesAdapter (private val context: Context,
                try {
                    mClipboardHelper.copyToClipboard(
                        TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN),
-                        token
+                        token,
+                        true
                    )
                } catch (e: Exception) {
                    Log.e(TAG, "Unable to copy the OTP token", e)
@@ -533,6 +538,22 @@ class NodesAdapter (private val context: Context,
        }
    }

+    private fun assignBackgroundColor(view: View?, entry: Entry) {
+        view?.let {
+            ViewCompat.setBackgroundTintList(
+                view,
+                ColorStateList.valueOf(
+                    if (!view.isSelected) {
+                        (if (mShowEntryColors) entry.backgroundColor else null)
+                            ?: mColorSurfaceContainer
+                    } else {
+                        mColorSecondary
+                    }
+                )
+            )
+        }
+    }
+
    class OtpRunnable(val view: View?): Runnable {

        var action: (() -> Unit)? = null
@@ -562,8 +583,8 @@ class NodesAdapter (private val context: Context,
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickCallback {
-        fun onNodeClick(database: Database, node: Node)
-        fun onNodeLongClick(database: Database, node: Node): Boolean
+        fun onNodeClick(database: ContextualDatabase, node: Node)
+        fun onNodeLongClick(database: ContextualDatabase, node: Node): Boolean
    }

    class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/TemplatesSelectorAdapter.kt
@@ -11,11 +11,12 @@ import android.widget.TextView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.template.Template
 import com.kunzisoft.keepass.database.element.template.TemplateField
+import com.kunzisoft.keepass.database.helper.getLocalizedName
 import com.kunzisoft.keepass.icons.IconDrawableFactory


 class TemplatesSelectorAdapter(
-    context: Context,
+    private val context: Context,
    private var templates: List<Template>): BaseAdapter() {

    var iconDrawableFactory: IconDrawableFactory? = null
@@ -35,7 +36,9 @@ class TemplatesSelectorAdapter(
        var templateView = convertView
        if (templateView == null) {
            holder = TemplateSelectorViewHolder()
-            templateView = inflater.inflate(R.layout.item_template, parent, false)
+            templateView = inflater
+                .cloneInContext(context)
+                .inflate(R.layout.item_template, parent, false)
            holder.background = templateView?.findViewById(R.id.template_background)
            holder.icon = templateView?.findViewById(R.id.template_image)
            holder.name = templateView?.findViewById(R.id.template_name)
@@ -74,4 +77,4 @@ class TemplatesSelectorAdapter(
        var icon: ImageView? = null
        var name: TextView? = null
    }
-}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt
@@ -23,8 +23,15 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import android.content.Context
+import androidx.room.AutoMigration

-@Database(version = 1, entities = [FileDatabaseHistoryEntity::class, CipherDatabaseEntity::class])
+@Database(
+    version = 2,
+    entities = [FileDatabaseHistoryEntity::class, CipherDatabaseEntity::class],
+    autoMigrations = [
+        AutoMigration (from = 1, to = 2)
+    ]
+)
 abstract class AppDatabase : RoomDatabase() {

    abstract fun fileDatabaseHistoryDao(): FileDatabaseHistoryDao
--- 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,24 +19,27 @@
 */
 package com.kunzisoft.keepass.app.database

-import android.content.*
+import android.content.ComponentName
+import android.content.Context
+import android.content.IntentFilter
+import android.content.ServiceConnection
 import android.net.Uri
 import android.os.IBinder
 import android.util.Base64
 import android.util.Log
+import com.kunzisoft.keepass.database.element.binary.BinaryData.Companion.BASE64_FLAG
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.IOActionTask
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
-import java.util.*
+import java.util.LinkedList

 class CipherDatabaseAction(context: Context) {

    private val applicationContext = context.applicationContext
    private val cipherDatabaseDao =
-            AppDatabase
-                    .getDatabase(applicationContext)
-                    .cipherDatabaseDao()
+        AppDatabase.getDatabase(applicationContext).cipherDatabaseDao()

    // Temp DAO to easily remove content if object no longer in memory
    private var useTempDao = PreferencesUtil.isTempAdvancedUnlockEnable(applicationContext)
@@ -83,7 +86,7 @@ class CipherDatabaseAction(context: Context) {
        try {
            AdvancedUnlockNotificationService.bindService(applicationContext,
                    mServiceConnection!!,
-                    Context.BIND_AUTO_CREATE)
+                Context.BIND_AUTO_CREATE)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to start cipher action", e)
            performedAction.invoke()
@@ -136,11 +139,11 @@ class CipherDatabaseAction(context: Context) {
                        this.databaseUri = Uri.parse(cipherDatabaseEntity.databaseUri)
                        this.encryptedValue = Base64.decode(
                            cipherDatabaseEntity.encryptedValue,
-                            Base64.NO_WRAP
+                            BASE64_FLAG
                        )
                        this.specParameters = Base64.decode(
                            cipherDatabaseEntity.specParameters,
-                            Base64.NO_WRAP
+                            BASE64_FLAG
                        )
                    }
                }
@@ -148,8 +151,9 @@ class CipherDatabaseAction(context: Context) {
            }
        } else {
            IOActionTask(
-                    {
-                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())?.let { cipherDatabaseEntity ->
+                {
+                    cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
+                        ?.let { cipherDatabaseEntity ->
                            CipherEncryptDatabase().apply {
                                this.databaseUri = Uri.parse(cipherDatabaseEntity.databaseUri)
                                this.encryptedValue = Base64.decode(
@@ -162,10 +166,10 @@ class CipherDatabaseAction(context: Context) {
                                )
                            }
                        }
-                    },
-                    {
-                        cipherDatabaseResultListener.invoke(it)
-                    }
+                },
+                {
+                    cipherDatabaseResultListener.invoke(it)
+                }
            ).execute()
        }
    }
@@ -183,8 +187,8 @@ class CipherDatabaseAction(context: Context) {

            val cipherDatabaseEntity = CipherDatabaseEntity(
                databaseUri.toString(),
-                Base64.encodeToString(cipherEncryptDatabase.encryptedValue, Base64.NO_WRAP),
-                Base64.encodeToString(cipherEncryptDatabase.specParameters, Base64.NO_WRAP),
+                Base64.encodeToString(cipherEncryptDatabase.encryptedValue, BASE64_FLAG),
+                Base64.encodeToString(cipherEncryptDatabase.specParameters, BASE64_FLAG),
            )

            if (useTempDao) {
@@ -222,12 +226,12 @@ class CipherDatabaseAction(context: Context) {
            }
        } else {
            IOActionTask(
-                    {
-                        cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
-                    },
-                    {
-                        cipherDatabaseResultListener?.invoke()
-                    }
+                {
+                    cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
+                },
+                {
+                    cipherDatabaseResultListener?.invoke()
+                }
            ).execute()
        }
    }
@@ -240,9 +244,9 @@ class CipherDatabaseAction(context: Context) {
        }
        // To erase the residues
        IOActionTask(
-                {
-                    cipherDatabaseDao.deleteAll()
-                }
+            {
+                cipherDatabaseDao.deleteAll()
+            }
        ).execute()
        // Unbind
        removeAllDataAndDetach()
@@ -251,4 +255,4 @@ class CipherDatabaseAction(context: Context) {
    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
@@ -1,6 +1,6 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
+ *
 * This file is part of KeePassDX.
 *
 *  KeePassDX is free software: you can redistribute it and/or modify
@@ -22,204 +22,225 @@ package com.kunzisoft.keepass.app.database
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.model.DatabaseFile
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.IOActionTask
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.decodeUri
+import com.kunzisoft.keepass.utils.parseUri
 import com.kunzisoft.keepass.viewmodels.FileDatabaseInfo

 class FileDatabaseHistoryAction(private val applicationContext: Context) {

    private val databaseFileHistoryDao =
-            AppDatabase
-                .getDatabase(applicationContext)
-                .fileDatabaseHistoryDao()
+            AppDatabase.getDatabase(applicationContext).fileDatabaseHistoryDao()

    fun getDatabaseFile(databaseUri: Uri,
                        databaseFileResult: (DatabaseFile?) -> Unit) {
        IOActionTask(
-                {
-                    val fileDatabaseHistoryEntity = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
-                    val fileDatabaseInfo = FileDatabaseInfo(applicationContext, databaseUri)
-                    DatabaseFile(
-                            databaseUri,
-                            UriUtil.parse(fileDatabaseHistoryEntity?.keyFileUri),
-                            UriUtil.decode(fileDatabaseHistoryEntity?.databaseUri),
-                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias ?: ""),
-                            fileDatabaseInfo.exists,
-                            fileDatabaseInfo.getLastModificationString(),
-                            fileDatabaseInfo.getSizeString()
-                    )
-                },
-                {
-                    databaseFileResult.invoke(it)
-                }
+            {
+                val fileDatabaseHistoryEntity =
+                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                val fileDatabaseInfo = FileDatabaseInfo(
+                    applicationContext,
+                    databaseUri)
+                DatabaseFile(
+                    databaseUri,
+                    fileDatabaseHistoryEntity?.keyFileUri?.parseUri(),
+                    HardwareKey.getHardwareKeyFromString(fileDatabaseHistoryEntity?.hardwareKey),
+                    fileDatabaseHistoryEntity?.databaseUri?.decodeUri(),
+                    fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias
+                        ?: ""),
+                    fileDatabaseInfo.exists,
+                    fileDatabaseInfo.getLastModificationString(),
+                    fileDatabaseInfo.getSizeString()
+                )
+            },
+            {
+                databaseFileResult.invoke(it)
+            }
        ).execute()
    }

    fun getKeyFileUriByDatabaseUri(databaseUri: Uri,
                                   keyFileUriResultListener: (Uri?) -> Unit) {
        IOActionTask(
-                {
-                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
-                },
-                {
-                    it?.let { fileHistoryEntity ->
-                        fileHistoryEntity.keyFileUri?.let { keyFileUri ->
-                            keyFileUriResultListener.invoke(UriUtil.parse(keyFileUri))
-                        }
-                    } ?: keyFileUriResultListener.invoke(null)
-                }
+            {
+                databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+            },
+            {
+                it?.let { fileHistoryEntity ->
+                    fileHistoryEntity.keyFileUri?.let { keyFileUri ->
+                        keyFileUriResultListener.invoke(keyFileUri.parseUri())
+                    }
+                } ?: keyFileUriResultListener.invoke(null)
+            }
        ).execute()
    }

    fun getDatabaseFileList(databaseFileListResult: (List<DatabaseFile>) -> Unit) {
        IOActionTask(
-                {
-                    val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(applicationContext)
-                    // Show only uri accessible
-                    val databaseFileListLoaded = ArrayList<DatabaseFile>()
-                    databaseFileHistoryDao.getAll().forEach { fileDatabaseHistoryEntity ->
-                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext, fileDatabaseHistoryEntity.databaseUri)
-                        if (hideBrokenLocations && fileDatabaseInfo.exists
-                                || !hideBrokenLocations) {
-                            databaseFileListLoaded.add(
-                                    DatabaseFile(
-                                            UriUtil.parse(fileDatabaseHistoryEntity.databaseUri),
-                                            UriUtil.parse(fileDatabaseHistoryEntity.keyFileUri),
-                                            UriUtil.decode(fileDatabaseHistoryEntity.databaseUri),
-                                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias),
-                                            fileDatabaseInfo.exists,
-                                            fileDatabaseInfo.getLastModificationString(),
-                                            fileDatabaseInfo.getSizeString()
-                                    )
+            {
+                val hideBrokenLocations =
+                    PreferencesUtil.hideBrokenLocations(
+                        applicationContext)
+                // Show only uri accessible
+                val databaseFileListLoaded = ArrayList<DatabaseFile>()
+                databaseFileHistoryDao.getAll().forEach { fileDatabaseHistoryEntity ->
+                    val fileDatabaseInfo = FileDatabaseInfo(
+                        applicationContext,
+                        fileDatabaseHistoryEntity.databaseUri)
+                    if (hideBrokenLocations && fileDatabaseInfo.exists
+                        || !hideBrokenLocations
+                    ) {
+                        databaseFileListLoaded.add(
+                            DatabaseFile(
+                                fileDatabaseHistoryEntity.databaseUri.parseUri(),
+                                fileDatabaseHistoryEntity.keyFileUri?.parseUri(),
+                                HardwareKey.getHardwareKeyFromString(fileDatabaseHistoryEntity.hardwareKey),
+                                fileDatabaseHistoryEntity.databaseUri.decodeUri(),
+                                fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias),
+                                fileDatabaseInfo.exists,
+                                fileDatabaseInfo.getLastModificationString(),
+                                fileDatabaseInfo.getSizeString()
                            )
-                        }
-                    }
-                    databaseFileListLoaded
-                },
-                {
-                    databaseFileList ->
-                    databaseFileList?.let {
-                        databaseFileListResult.invoke(it)
+                        )
                    }
                }
+                databaseFileListLoaded
+            },
+            { databaseFileList ->
+                databaseFileList?.let {
+                    databaseFileListResult.invoke(it)
+                }
+            }
        ).execute()
    }

-    fun addOrUpdateDatabaseUri(databaseUri: Uri, keyFileUri: Uri? = null,
+    fun addOrUpdateDatabaseUri(databaseUri: Uri,
+                               keyFileUri: Uri? = null,
+                               hardwareKey: HardwareKey? = null,
                               databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
        addOrUpdateDatabaseFile(DatabaseFile(
-                databaseUri,
-                keyFileUri
+            databaseUri,
+            keyFileUri,
+            hardwareKey
        ), databaseFileAddedOrUpdatedResult)
    }

    fun addOrUpdateDatabaseFile(databaseFileToAddOrUpdate: DatabaseFile,
                                databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
        IOActionTask(
-                {
-                    databaseFileToAddOrUpdate.databaseUri?.let { databaseUri ->
-                        // Try to get info in database first
-                        val fileDatabaseHistoryRetrieve = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+            {
+                databaseFileToAddOrUpdate.databaseUri?.let { databaseUri ->
+                    // Try to get info in database first
+                    val fileDatabaseHistoryRetrieve =
+                        databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())

-                        // Complete alias if not exists
-                        val fileDatabaseHistory = FileDatabaseHistoryEntity(
-                                databaseUri.toString(),
-                                databaseFileToAddOrUpdate.databaseAlias
-                                        ?: fileDatabaseHistoryRetrieve?.databaseAlias
-                                        ?: "",
-                                databaseFileToAddOrUpdate.keyFileUri?.toString(),
-                                System.currentTimeMillis()
+                    // Complete alias if not exists
+                    val fileDatabaseHistory =
+                        FileDatabaseHistoryEntity(
+                            databaseUri.toString(),
+                            databaseFileToAddOrUpdate.databaseAlias
+                                ?: fileDatabaseHistoryRetrieve?.databaseAlias
+                                ?: "",
+                            databaseFileToAddOrUpdate.keyFileUri?.toString(),
+                            databaseFileToAddOrUpdate.hardwareKey?.value,
+                            System.currentTimeMillis()
                        )

-                        // Update values if history element not yet in the database
-                        try {
-                            if (fileDatabaseHistoryRetrieve == null) {
-                                    databaseFileHistoryDao.add(fileDatabaseHistory)
-                            } else {
-                                databaseFileHistoryDao.update(fileDatabaseHistory)
-                            }
-                        } catch (e: Exception) {
-                            Log.e(TAG, "Unable to add or update database history", e)
+                    // Update values if history element not yet in the database
+                    try {
+                        if (fileDatabaseHistoryRetrieve == null) {
+                            databaseFileHistoryDao.add(fileDatabaseHistory)
+                        } else {
+                            databaseFileHistoryDao.update(fileDatabaseHistory)
                        }
-
-                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext,
-                                fileDatabaseHistory.databaseUri)
-                        DatabaseFile(
-                                UriUtil.parse(fileDatabaseHistory.databaseUri),
-                                UriUtil.parse(fileDatabaseHistory.keyFileUri),
-                                UriUtil.decode(fileDatabaseHistory.databaseUri),
-                                fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias),
-                                fileDatabaseInfo.exists,
-                                fileDatabaseInfo.getLastModificationString(),
-                                fileDatabaseInfo.getSizeString()
-                        )
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Unable to add or update database history", e)
                    }
-                },
-                {
-                    databaseFileAddedOrUpdatedResult?.invoke(it)
+
+                    val fileDatabaseInfo =
+                        FileDatabaseInfo(applicationContext,
+                            fileDatabaseHistory.databaseUri)
+                    DatabaseFile(
+                        fileDatabaseHistory.databaseUri.parseUri(),
+                        fileDatabaseHistory.keyFileUri?.parseUri(),
+                        HardwareKey.getHardwareKeyFromString(fileDatabaseHistory.hardwareKey),
+                        fileDatabaseHistory.databaseUri.decodeUri(),
+                        fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias),
+                        fileDatabaseInfo.exists,
+                        fileDatabaseInfo.getLastModificationString(),
+                        fileDatabaseInfo.getSizeString()
+                    )
                }
+            },
+            {
+                databaseFileAddedOrUpdatedResult?.invoke(it)
+            }
        ).execute()
    }

    fun deleteDatabaseFile(databaseFileToDelete: DatabaseFile,
                           databaseFileDeletedResult: (DatabaseFile?) -> Unit) {
        IOActionTask(
-                {
-                    databaseFileToDelete.databaseUri?.let { databaseUri ->
-                        databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())?.let { fileDatabaseHistory ->
+            {
+                databaseFileToDelete.databaseUri?.let { databaseUri ->
+                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                        ?.let { fileDatabaseHistory ->
                            val returnValue = databaseFileHistoryDao.delete(fileDatabaseHistory)
                            if (returnValue > 0) {
                                DatabaseFile(
-                                        UriUtil.parse(fileDatabaseHistory.databaseUri),
-                                        UriUtil.parse(fileDatabaseHistory.keyFileUri),
-                                        UriUtil.decode(fileDatabaseHistory.databaseUri),
-                                        databaseFileToDelete.databaseAlias
+                                    fileDatabaseHistory.databaseUri.parseUri(),
+                                    fileDatabaseHistory.keyFileUri?.parseUri(),
+                                    HardwareKey.getHardwareKeyFromString(fileDatabaseHistory.hardwareKey),
+                                    fileDatabaseHistory.databaseUri.decodeUri(),
+                                    databaseFileToDelete.databaseAlias
                                )
                            } else {
                                null
                            }
                        }
-                    }
-                },
-                {
-                    databaseFileDeletedResult.invoke(it)
                }
+            },
+            {
+                databaseFileDeletedResult.invoke(it)
+            }
        ).execute()
    }

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

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

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

--- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt
@@ -35,6 +35,9 @@ data class FileDatabaseHistoryEntity(
        @ColumnInfo(name = "keyfile_uri")
            var keyFileUri: String?,

+        @ColumnInfo(name = "hardware_key")
+            var hardwareKey: String?,
+
        @ColumnInfo(name = "updated")
            val updated: Long
 ) {
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillComponent.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillComponent.kt
@@ -1,7 +1,6 @@
 package com.kunzisoft.keepass.autofill

 import android.app.assist.AssistStructure
-import android.view.inputmethod.InlineSuggestionsRequest

 data class AutofillComponent(val assistStructure: AssistStructure,
                             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
@@ -29,9 +29,12 @@ import android.graphics.BlendMode
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.service.autofill.Dataset
+import android.service.autofill.Field
 import android.service.autofill.FillResponse
 import android.service.autofill.InlinePresentation
+import android.service.autofill.Presentations
 import android.util.Log
+import android.view.autofill.AutofillId
 import android.view.autofill.AutofillManager
 import android.view.autofill.AutofillValue
 import android.widget.RemoteViews
@@ -48,7 +51,7 @@ 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.ContextualDatabase
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.template.TemplateField
 import com.kunzisoft.keepass.model.EntryInfo
@@ -56,6 +59,7 @@ 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
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat


@RequiresApi(api = Build.VERSION_CODES.O)
@@ -65,10 +69,10 @@ object AutofillHelper {
    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 ->
+        intent?.getParcelableExtraCompat<AssistStructure>(EXTRA_ASSIST_STRUCTURE)?.let { assistStructure ->
            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                AutofillComponent(assistStructure,
-                        intent.getParcelableExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST))
+                        intent.getParcelableExtraCompat(EXTRA_INLINE_SUGGESTIONS_REQUEST))
            } else {
                AutofillComponent(assistStructure, null)
            }
@@ -89,39 +93,85 @@ object AutofillHelper {
    }

    private fun newRemoteViews(context: Context,
-                               database: Database,
+                               database: ContextualDatabase,
                               remoteViewsText: String,
                               remoteViewsIcon: IconImage? = null): RemoteViews {
-        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
-        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
+        val remoteViews = RemoteViews(context.packageName, R.layout.item_autofill_entry)
+        remoteViews.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)
+                    remoteViews.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
+        return remoteViews
    }

-    private fun buildDataset(context: Context,
-                             database: Database,
-                             entryInfo: EntryInfo,
-                             struct: StructureParser.Result,
-                             additionalBuild: ((build: Dataset.Builder) -> Unit)? = null): Dataset? {
-        val title = makeEntryTitle(entryInfo)
-        val views = newRemoteViews(context, database, title, entryInfo.icon)
-        val builder = Dataset.Builder(views)
-        builder.setId(entryInfo.id.toString())
+    private fun Dataset.Builder.addValueToDatasetBuilder(
+        id: AutofillId,
+        autofillValue: AutofillValue?
+    ): Dataset.Builder {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            setField(
+                id, autofillValue?.let {
+                    Field.Builder()
+                        .setValue(it)
+                        .build()
+                }
+            )
+        } else {
+            @Suppress("DEPRECATION")
+            setValue(id, autofillValue)
+        }
+        Log.d(TAG, "Set Autofill value $autofillValue for id $id")
+        return this
+    }
+
+    private fun buildDatasetForEntry(context: Context,
+                                     database: ContextualDatabase,
+                                     entryInfo: EntryInfo,
+                                     struct: StructureParser.Result,
+                                     inlinePresentation: InlinePresentation?): Dataset {
+        val remoteViews: RemoteViews = newRemoteViews(context, database, makeEntryTitle(entryInfo), entryInfo.icon)
+
+        val datasetBuilder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Dataset.Builder(Presentations.Builder()
+                .apply {
+                    inlinePresentation?.let {
+                        setInlinePresentation(inlinePresentation)
+                    }
+                }
+                .setDialogPresentation(remoteViews)
+                .setMenuPresentation(remoteViews)
+                .build())
+        } else {
+            @Suppress("DEPRECATION")
+            Dataset.Builder(remoteViews).apply {
+                inlinePresentation?.let {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        setInlinePresentation(inlinePresentation)
+                    }
+                }
+            }
+        }
+
+        datasetBuilder.setId(entryInfo.id.toString())

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

        if (entryInfo.expires) {
@@ -134,9 +184,15 @@ object AutofillHelper {
            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"))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        it,
+                        AutofillValue.forText("$year\u002D$monthString")
+                    )
                } else {
-                    builder.setValue(it, AutofillValue.forDate(entryInfo.expiryTime.date.time))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        it,
+                        AutofillValue.forDate(entryInfo.expiryTime.date.time)
+                    )
                }
            }
            struct.creditCardExpirationYearId?.let {
@@ -150,34 +206,58 @@ object AutofillHelper {
                    }
                    if (yearIndex != -1) {
                        autofillValue = AutofillValue.forList(yearIndex)
-                        builder.setValue(it, autofillValue)
+                        datasetBuilder.addValueToDatasetBuilder(
+                            it,
+                            autofillValue
+                        )
                    }
                }

                if (autofillValue == null) {
-                    builder.setValue(it, AutofillValue.forText(year.toString()))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        it,
+                        AutofillValue.forText(year.toString())
+                    )
                }
            }
            struct.creditCardExpirationMonthId?.let {
                if (struct.isWebView) {
-                    builder.setValue(it, AutofillValue.forText(monthString))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        it,
+                        AutofillValue.forText(monthString)
+                    )
                } else {
                    if (struct.creditCardExpirationMonthOptions != null) {
                        // index starts at 0
-                        builder.setValue(it, AutofillValue.forList(month - 1))
+                        datasetBuilder.addValueToDatasetBuilder(
+                            it,
+                            AutofillValue.forList(month - 1)
+                        )
                    } else {
-                        builder.setValue(it, AutofillValue.forText(monthString))
+                        datasetBuilder.addValueToDatasetBuilder(
+                            it,
+                            AutofillValue.forText(monthString)
+                        )
                    }
                }
            }
            struct.creditCardExpirationDayId?.let {
                if (struct.isWebView) {
-                    builder.setValue(it, AutofillValue.forText(dayString))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        it,
+                        AutofillValue.forText(dayString)
+                    )
                } else {
                    if (struct.creditCardExpirationDayOptions != null) {
-                        builder.setValue(it, AutofillValue.forList(day - 1))
+                        datasetBuilder.addValueToDatasetBuilder(
+                            it,
+                            AutofillValue.forList(day - 1)
+                        )
                    } else {
-                        builder.setValue(it, AutofillValue.forText(dayString))
+                        datasetBuilder.addValueToDatasetBuilder(
+                            it,
+                            AutofillValue.forText(dayString)
+                        )
                    }
                }
            }
@@ -185,36 +265,39 @@ object AutofillHelper {
        for (field in entryInfo.customFields) {
            if (field.name == TemplateField.LABEL_HOLDER) {
                struct.creditCardHolderId?.let { ccNameId ->
-                    builder.setValue(ccNameId, AutofillValue.forText(field.protectedValue.stringValue))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        ccNameId,
+                        AutofillValue.forText(field.protectedValue.stringValue)
+                    )
                }
            }
            if (field.name == TemplateField.LABEL_NUMBER) {
                struct.creditCardNumberId?.let { ccnId ->
-                    builder.setValue(ccnId, AutofillValue.forText(field.protectedValue.stringValue))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        ccnId,
+                        AutofillValue.forText(field.protectedValue.stringValue)
+                    )
                }
            }
            if (field.name == TemplateField.LABEL_CVV) {
                struct.cardVerificationValueId?.let { cvvId ->
-                    builder.setValue(cvvId, AutofillValue.forText(field.protectedValue.stringValue))
+                    datasetBuilder.addValueToDatasetBuilder(
+                        cvvId,
+                        AutofillValue.forText(field.protectedValue.stringValue)
+                    )
                }
            }
        }
-
-        additionalBuild?.invoke(builder)
-
-        return try {
-            builder.build()
-        } catch (e: Exception) {
-            // at least one value must be set
-            null
-        }
+        val dataset = datasetBuilder.build()
+        Log.d(TAG, "Autofill Dataset $dataset created")
+        return dataset
    }

    /**
     * Method to assign a drawable to a new icon from a database icon
     */
    private fun buildIconFromEntry(context: Context,
-                                   database: Database,
+                                   database: ContextualDatabase,
                                   entryInfo: EntryInfo): Icon? {
        try {
            database.iconDrawableFactory.getBitmapFromIcon(context,
@@ -227,10 +310,10 @@ object AutofillHelper {
        return null
    }

-    @RequiresApi(Build.VERSION_CODES.R)
    @SuppressLint("RestrictedApi")
+    @RequiresApi(Build.VERSION_CODES.R)
    private fun buildInlinePresentationForEntry(context: Context,
-                                                database: Database,
+                                                database: ContextualDatabase,
                                                compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest,
                                                positionItem: Int,
                                                entryInfo: EntryInfo): InlinePresentation? {
@@ -302,7 +385,7 @@ object AutofillHelper {
    }

    fun buildResponse(context: Context,
-                      database: Database,
+                      database: ContextualDatabase,
                      entriesInfo: List<EntryInfo>,
                      parseResult: StructureParser.Result,
                      compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest?): FillResponse? {
@@ -334,25 +417,33 @@ object AutofillHelper {
                    }
                }
            }
-
        }

        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))
+            try {
+                // Build inline presentation for compatible keyboard
+                var inlinePresentation: InlinePresentation? = null
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                    && numberInlineSuggestions > 0
+                    && compatInlineSuggestionsRequest != null) {
+                    inlinePresentation = buildInlinePresentationForEntry(
+                        context,
+                        database,
+                        compatInlineSuggestionsRequest,
+                        numberInlineSuggestions--,
+                        entry
+                    )
+                }
+                // Create dataset for each entry
+                responseBuilder.addDataset(
+                    buildDatasetForEntry(context, database, entry, parseResult, inlinePresentation)
+                )
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to add dataset")
            }
        }

+        // Add a new dataset for manual selection
        if (PreferencesUtil.isAutofillManualSelectionEnable(context)) {
            val searchInfo = SearchInfo().apply {
                applicationId = parseResult.applicationId
@@ -364,29 +455,50 @@ object AutofillHelper {
            val pendingIntent = AutofillLauncherActivity.getPendingIntentForSelection(context,
                    searchInfo, compatInlineSuggestionsRequest)

-            parseResult.allAutofillIds().let { autofillIds ->
-                autofillIds.forEach { id ->
-                    val builder = Dataset.Builder(manualSelectionView)
+            var inlinePresentation: InlinePresentation? = null
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                compatInlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
+                    val inlinePresentationSpec = inlineSuggestionsRequest.inlinePresentationSpecs[0]
+                    inlinePresentation = buildInlinePresentationForManualSelection(context, inlinePresentationSpec, pendingIntent)
+                }
+            }

-                    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)
-                            }
+            val datasetBuilder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Dataset.Builder(Presentations.Builder()
+                    .apply {
+                        inlinePresentation?.let {
+                            setInlinePresentation(it)
+                        }
+                    }
+                    .setDialogPresentation(manualSelectionView)
+                    .setMenuPresentation(manualSelectionView)
+                    .build())
+            } else {
+                @Suppress("DEPRECATION")
+                Dataset.Builder(manualSelectionView).apply {
+                    inlinePresentation?.let {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                            setInlinePresentation(it)
                        }
                    }
-                    builder.setValue(id, null)
-                    builder.setAuthentication(pendingIntent.intentSender)
-                    responseBuilder.addDataset(builder.build())
                }
            }
+
+            parseResult.allAutofillIds().let { autofillIds ->
+                autofillIds.forEach { id ->
+                    datasetBuilder.addValueToDatasetBuilder(id, null)
+                    datasetBuilder.setAuthentication(pendingIntent.intentSender)
+                }
+                val dataset = datasetBuilder.build()
+                Log.d(TAG, "Autofill Dataset for manual selection $dataset created")
+                responseBuilder.addDataset(dataset)
+            }
        }

        return try {
            responseBuilder.build()
        } catch (e: Exception) {
+            Log.e(TAG, "Unable to create Autofill response", e)
            null
        }
    }
@@ -395,7 +507,7 @@ object AutofillHelper {
     * Build the Autofill response for one entry
     */
    fun buildResponseAndSetResult(activity: Activity,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  entryInfo: EntryInfo) {
        buildResponseAndSetResult(activity, database, ArrayList<EntryInfo>().apply { add(entryInfo) })
    }
@@ -404,17 +516,17 @@ object AutofillHelper {
     * Build the Autofill response for many entry
     */
    fun buildResponseAndSetResult(activity: Activity,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                  entriesInfo: List<EntryInfo>) {
        if (entriesInfo.isEmpty()) {
            activity.setResult(Activity.RESULT_CANCELED)
        } else {
            var setResultOk = false
-            activity.intent?.getParcelableExtra<AssistStructure>(EXTRA_ASSIST_STRUCTURE)?.let { structure ->
+            activity.intent?.getParcelableExtraCompat<AssistStructure>(EXTRA_ASSIST_STRUCTURE)?.let { structure ->
                StructureParser(structure).parse()?.let { result ->
                    // New Response
                    val response = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                        val compatInlineSuggestionsRequest = activity.intent?.getParcelableExtra<CompatInlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
+                        val compatInlineSuggestionsRequest = activity.intent?.getParcelableExtraCompat<CompatInlineSuggestionsRequest>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
                        if (compatInlineSuggestionsRequest != null) {
                            Toast.makeText(activity.applicationContext, R.string.autofill_inline_suggestions_keyboard, Toast.LENGTH_SHORT).show()
                        }
@@ -423,7 +535,7 @@ object AutofillHelper {
                        buildResponse(activity, database, entriesInfo, result, null)
                    }
                    val mReplyIntent = Intent()
-                    Log.d(activity.javaClass.name, "Successed Autofill auth.")
+                    Log.d(activity.javaClass.name, "Success Autofill auth.")
                    mReplyIntent.putExtra(
                            AutofillManager.EXTRA_AUTHENTICATION_RESULT,
                            response)
@@ -478,4 +590,6 @@ object AutofillHelper {
        EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
        activityResultLauncher?.launch(intent)
    }
+
+    private val TAG = AutofillHelper::class.java.name
 }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/CompatInlineSuggestionsRequest.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/CompatInlineSuggestionsRequest.kt
@@ -26,6 +26,7 @@ import android.os.Parcelable
 import android.service.autofill.FillRequest
 import android.view.inputmethod.InlineSuggestionsRequest
 import androidx.annotation.RequiresApi
+import com.kunzisoft.keepass.utils.readParcelableCompat

 /**
 * Utility class only to prevent java.lang.NoClassDefFoundError for old Android version and new lib compilation
@@ -52,8 +53,7 @@ class CompatInlineSuggestionsRequest : Parcelable {

    constructor(parcel: Parcel) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            this.inlineSuggestionsRequest =
-                parcel.readParcelable(FillRequest::class.java.classLoader)
+            this.inlineSuggestionsRequest = parcel.readParcelableCompat()
        }
        else {
            this.inlineSuggestionsRequest = null
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -29,35 +29,33 @@ import android.os.CancellationSignal
 import android.service.autofill.*
 import android.util.Log
 import android.view.autofill.AutofillId
-import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.RemoteViews
 import androidx.annotation.RequiresApi
 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.database.ContextualDatabase
+import com.kunzisoft.keepass.database.DatabaseTaskProvider
+import com.kunzisoft.keepass.database.helper.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 com.kunzisoft.keepass.utils.WebDomain
 import org.joda.time.DateTime
-import java.util.concurrent.atomic.AtomicBoolean


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

    private var mDatabaseTaskProvider: DatabaseTaskProvider? = null
-    private var mDatabase: Database? = null
+    private var mDatabase: ContextualDatabase? = 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()
@@ -90,41 +88,43 @@ class KeeAutofillService : AutofillService() {

        cancellationSignal.setOnCancelListener { Log.w(TAG, "Cancel autofill.") }

-        // Lock
-        if (!mLock.get()) {
-            mLock.set(true)
-            // Check user's settings for authenticating Responses and Datasets.
-            val latestStructure = request.fillContexts.last().structure
-            StructureParser(latestStructure).parse()?.let { parseResult ->
+        if (request.flags and FillRequest.FLAG_COMPATIBILITY_MODE_REQUEST != 0) {
+            Log.d(TAG, "Autofill requested in compatibility mode")
+        } else {
+            Log.d(TAG, "Autofill requested in native mode")
+        }

-                // Build search info only if applicationId or webDomain are not blocked
-                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
-                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
-                    val searchInfo = SearchInfo().apply {
-                        applicationId = parseResult.applicationId
-                        webDomain = parseResult.webDomain
-                        webScheme = parseResult.webScheme
-                    }
-                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
-                        searchInfo.webDomain = webDomainWithoutSubDomain
-                        val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                                && autofillInlineSuggestionsEnabled) {
-                            CompatInlineSuggestionsRequest(request)
-                        } else {
-                            null
-                        }
-                        launchSelection(mDatabase,
-                                searchInfo,
-                                parseResult,
-                                inlineSuggestionsRequest,
-                                callback)
+        // Check user's settings for authenticating Responses and Datasets.
+        val latestStructure = request.fillContexts.last().structure
+        StructureParser(latestStructure).parse()?.let { parseResult ->
+
+            // Build search info only if applicationId or webDomain are not blocked
+            if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                    && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+                val searchInfo = SearchInfo().apply {
+                    applicationId = parseResult.applicationId
+                    webDomain = parseResult.webDomain
+                    webScheme = parseResult.webScheme
+                }
+                WebDomain.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
+                    searchInfo.webDomain = webDomainWithoutSubDomain
+                    val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                            && autofillInlineSuggestionsEnabled) {
+                        CompatInlineSuggestionsRequest(request)
+                    } else {
+                        null
                    }
+                    launchSelection(mDatabase,
+                            searchInfo,
+                            parseResult,
+                            inlineSuggestionsRequest,
+                            callback)
                }
            }
        }
    }

-    private fun launchSelection(database: Database?,
+    private fun launchSelection(database: ContextualDatabase?,
                                searchInfo: SearchInfo,
                                parseResult: StructureParser.Result,
                                inlineSuggestionsRequest: CompatInlineSuggestionsRequest?,
@@ -153,10 +153,11 @@ class KeeAutofillService : AutofillService() {

    @SuppressLint("RestrictedApi")
    private fun showUIForEntrySelection(parseResult: StructureParser.Result,
-                                        database: Database?,
+                                        database: ContextualDatabase?,
                                        searchInfo: SearchInfo,
                                        inlineSuggestionsRequest: CompatInlineSuggestionsRequest?,
                                        callback: FillCallback) {
+        var success = false
        parseResult.allAutofillIds().let { autofillIds ->
            if (autofillIds.isNotEmpty()) {
                // If the entire Autofill Response is authenticated, AuthActivity is used
@@ -279,17 +280,36 @@ class KeeAutofillService : AutofillService() {
                            }
                        }
                    }
+
                    // Build response
-                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock, inlinePresentation)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        responseBuilder.setAuthentication(
+                            autofillIds,
+                            intentSender,
+                            Presentations.Builder().apply {
+                                inlinePresentation?.let {
+                                    setInlinePresentation(it)
+                                }
+                            }.setDialogPresentation(remoteViewsUnlock).build()
+                        )
+                    } else {
+                        @Suppress("DEPRECATION")
+                        responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock, inlinePresentation)
+                    }
                } else {
+                    @Suppress("DEPRECATION")
                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock)
                }
+                success = true
                callback.onSuccess(responseBuilder.build())
            }
        }
+        if (!success)
+            callback.onFailure("Unable to get Autofill ids for UI selection")
    }

    override fun onSaveRequest(request: SaveRequest, callback: SaveCallback) {
+        var success = false
        if (askToSaveData) {
            val latestStructure = request.fillContexts.last().structure
            StructureParser(latestStructure).parse(true)?.let { parseResult ->
@@ -332,14 +352,16 @@ class KeeAutofillService : AutofillService() {
                    //    callback.onSuccess(AutofillLauncherActivity.getAuthIntentSenderForRegistration(this,
                    //            registerInfo))
                    //} else {
-                        AutofillLauncherActivity.launchForRegistration(this, registerInfo)
-                        callback.onSuccess()
+                    AutofillLauncherActivity.launchForRegistration(this, registerInfo)
+                    success = true
+                    callback.onSuccess()
                    //}
-                    return
                }
            }
        }
-        callback.onFailure("Saving form values is not allowed")
+        if (!success) {
+            callback.onFailure("Saving form values is not allowed")
+        }
    }

    override fun onConnected() {
@@ -348,7 +370,6 @@ class KeeAutofillService : AutofillService() {
    }

    override fun onDisconnected() {
-        mLock.set(false)
        Log.d(TAG, "onDisconnected")
    }

--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
@@ -32,14 +32,13 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
+import androidx.core.view.MenuProvider
+import androidx.fragment.app.Fragment
 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.database.exception.UnknownDatabaseLocationException
 import com.kunzisoft.keepass.model.CipherDecryptDatabase
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.CredentialStorage
@@ -51,7 +50,7 @@ import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

-class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedUnlockCallback {
+class AdvancedUnlockFragment: Fragment(), AdvancedUnlockManager.AdvancedUnlockCallback {

    private var mBuilderListener: BuilderListener? = null

@@ -68,17 +67,6 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    // TODO Retrieve credential storage from app database
    var credentialDatabaseStorage: CredentialStorage = CredentialStorage.DEFAULT

-    /**
-     * Manage setting to auto open biometric prompt
-     */
-    private var mAutoOpenPrompt: Boolean
-        get() {
-            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)
    // checkBiometricAvailability() allows open biometric prompt and onDestroy() removes the authorization
    private var allowOpenBiometricPrompt = false
@@ -96,15 +84,37 @@ 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 ->
+    private var mDeviceCredentialResultLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
        mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = false
        // To wait resume
        if (keepConnection) {
-            mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded = result.resultCode == Activity.RESULT_OK
+            mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded =
+                result.resultCode == Activity.RESULT_OK
        }
        keepConnection = false
    }

+    private val menuProvider: MenuProvider = object: MenuProvider {
+        override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // biometric menu
+                if (mAllowAdvancedUnlockMenu)
+                    menuInflater.inflate(R.menu.advanced_unlock, menu)
+            }
+        }
+
+        override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+            when (menuItem.itemId) {
+                R.id.menu_keystore_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    deleteEncryptedDatabaseKey()
+                }
+            }
+            return false
+        }
+    }
+
    override fun onAttach(context: Context) {
        super.onAttach(context)

@@ -123,8 +133,6 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        setHasOptionsMenu(true)
-
        cipherDatabaseAction = CipherDatabaseAction.getInstance(requireContext().applicationContext)

        mAdvancedUnlockViewModel.onInitAdvancedUnlockModeRequested.observe(this) {
@@ -143,14 +151,19 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)

-        val rootView = inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_advanced_unlock, container, false)
+        val rootView = inflater.inflate(R.layout.fragment_advanced_unlock, container, false)

        mAdvancedUnlockInfoView = rootView.findViewById(R.id.advanced_unlock_view)

        return rootView
    }

+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        activity?.addMenuProvider(menuProvider, viewLifecycleOwner)
+    }
+
    override fun onResume() {
        super.onResume()
        context?.let {
@@ -160,26 +173,6 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
        keepConnection = false
    }

-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // biometric menu
-            if (mAllowAdvancedUnlockMenu)
-                inflater.inflate(R.menu.advanced_unlock, menu)
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_keystore_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                deleteEncryptedDatabaseKey()
-            }
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
    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
@@ -216,8 +209,6 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
            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(context)
@@ -236,7 +227,6 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
                        }
                    }
                } else if (PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
-                    mAdvancedUnlockInfoView?.setIconResource(R.drawable.bolt)
                    if (AdvancedUnlockManager.isDeviceSecure(context)) {
                        selectMode()
                    } else {
@@ -292,14 +282,29 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    private fun initNotAvailable() {
        showViews(false)

-        mAdvancedUnlockInfoView?.setIconViewClickListener(false, null)
+        mAdvancedUnlockInfoView?.setIconViewClickListener(null)
    }

    @RequiresApi(Build.VERSION_CODES.M)
    private fun openBiometricSetting() {
-        mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
-            // ACTION_SECURITY_SETTINGS does not contain fingerprint enrollment on some devices...
-            context?.startActivity(Intent(Settings.ACTION_SETTINGS))
+        mAdvancedUnlockInfoView?.setIconViewClickListener {
+            try {
+                when {
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
+                        context?.startActivity(Intent(Settings.ACTION_BIOMETRIC_ENROLL))
+                    }
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.P -> {
+                        @Suppress("DEPRECATION") context
+                            ?.startActivity(Intent(Settings.ACTION_FINGERPRINT_ENROLL))
+                    }
+                    else -> {
+                        context?.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
+                    }
+                }
+            } catch (e: Exception) {
+                // ACTION_SECURITY_SETTINGS does not contain fingerprint enrollment on some devices...
+                context?.startActivity(Intent(Settings.ACTION_SETTINGS))
+            }
        }
    }

@@ -331,11 +336,11 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    @RequiresApi(Build.VERSION_CODES.M)
    private fun initWaitData() {
        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.no_credentials_stored)
+        setAdvancedUnlockedTitleView(R.string.unavailable)
        setAdvancedUnlockedMessageView("")

        context?.let { context ->
-            mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
+            mAdvancedUnlockInfoView?.setIconViewClickListener {
                onAuthenticationError(BiometricPrompt.ERROR_UNABLE_TO_PROCESS,
                        context.getString(R.string.credential_before_click_advanced_unlock_button))
            }
@@ -362,7 +367,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    @RequiresApi(Build.VERSION_CODES.M)
    private fun initEncryptData() {
        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.open_advanced_unlock_prompt_store_credential)
+        setAdvancedUnlockedTitleView(R.string.unlock_and_link_biometric)
        setAdvancedUnlockedMessageView("")

        advancedUnlockManager?.initEncryptData { cryptoPrompt ->
@@ -376,7 +381,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    @RequiresApi(Build.VERSION_CODES.M)
    private fun initDecryptData() {
        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.open_advanced_unlock_prompt_unlock_database)
+        setAdvancedUnlockedTitleView(R.string.unlock)
        setAdvancedUnlockedMessageView("")

        advancedUnlockManager?.let { unlockHelper ->
@@ -391,14 +396,15 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
                            }

                            // Auto open the biometric prompt
-                            if (mAutoOpenPrompt) {
-                                mAutoOpenPrompt = false
+                            if (mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt
+                                && mAutoOpenPromptEnabled) {
+                                mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = false
                                openAdvancedUnlockPrompt(cryptoPrompt)
                            }
                        }
                    } ?: deleteEncryptedDatabaseKey()
                }
-            } ?: throw IODatabaseException()
+            } ?: throw UnknownDatabaseLocationException()
        } ?: throw Exception("AdvancedUnlockManager not initialized")
    }

@@ -609,7 +615,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
    @RequiresApi(Build.VERSION_CODES.M)
    private fun setAdvancedUnlockedMessageView(text: CharSequence) {
        lifecycleScope.launch(Dispatchers.Main) {
-            mAdvancedUnlockInfoView?.message = text
+            mAdvancedUnlockInfoView?.setMessage(text)
        }
    }

--- a/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
@@ -1,63 +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.biometric
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.os.Build
-import androidx.annotation.RequiresApi
-import android.widget.ImageView
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-
-import com.kunzisoft.keepass.R
-
-@RequiresApi(api = Build.VERSION_CODES.M)
-class FingerPrintAnimatedVector(context: Context, imageView: ImageView) {
-
-    private val scanFingerprint: AnimatedVectorDrawableCompat? =
-            AnimatedVectorDrawableCompat.create(context, R.drawable.scan_fingerprint)
-
-    init {
-        imageView.setImageDrawable(scanFingerprint)
-    }
-
-    private var animationCallback = object : Animatable2Compat.AnimationCallback() {
-        override fun onAnimationEnd(drawable: Drawable) {
-            imageView.post {
-                scanFingerprint?.start()
-            }
-        }
-    }
-
-    fun startScan() {
-        scanFingerprint?.registerAnimationCallback(animationCallback)
-
-        if (scanFingerprint?.isRunning != true)
-            scanFingerprint?.start()
-    }
-
-    fun stopScan() {
-        scanFingerprint?.unregisterAnimationCallback(animationCallback)
-
-        if (scanFingerprint?.isRunning == true)
-            scanFingerprint.stop()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/database/ContextualDatabase.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/ContextualDatabase.kt
@@ -0,0 +1,37 @@
+package com.kunzisoft.keepass.database
+
+import android.net.Uri
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+import com.kunzisoft.keepass.utils.SingletonHolder
+import java.io.File
+
+class ContextualDatabase: Database() {
+
+    var fileUri: Uri? = null
+
+    val iconDrawableFactory = IconDrawableFactory(
+        retrieveBinaryCache = { binaryCache },
+        retrieveCustomIconBinary = { iconId -> getBinaryForCustomIcon(iconId) }
+    )
+
+    override fun removeCustomIcon(customIcon: IconImageCustom) {
+        iconDrawableFactory.clearFromCache(customIcon)
+        super.removeCustomIcon(customIcon)
+    }
+
+    override fun clearIndexesAndBinaries(filesDirectory: File?) {
+        iconDrawableFactory.clearCache()
+        super.clearIndexesAndBinaries(filesDirectory)
+    }
+
+    override fun clearAndClose(filesDirectory: File?) {
+        super.clearAndClose(filesDirectory)
+        this.fileUri = null
+    }
+
+    companion object : SingletonHolder<ContextualDatabase>(::ContextualDatabase) {
+        private val TAG = ContextualDatabase::class.java.name
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/DatabaseTaskProvider.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/DatabaseTaskProvider.kt
@@ -17,17 +17,29 @@
 *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.kunzisoft.keepass.database.action
+package com.kunzisoft.keepass.database

-import android.app.Service
-import android.content.*
-import android.content.Context.*
+import android.Manifest
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Context.BIND_ABOVE_CLIENT
+import android.content.Context.BIND_AUTO_CREATE
+import android.content.Context.BIND_IMPORTANT
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.ServiceConnection
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
+import androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import com.kunzisoft.keepass.R
@@ -35,7 +47,6 @@ import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
 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
@@ -43,10 +54,10 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_PASSWORD_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_CHALLENGE_RESPONDED
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_CREDENTIAL_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK
@@ -82,26 +93,33 @@ 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 com.kunzisoft.keepass.utils.putParcelableList
 import kotlinx.coroutines.launch
-import java.util.*
+import java.util.UUID

 /**
 * Utility class to connect an activity or a service to the DatabaseTaskNotificationService,
 * Useful to retrieve a database instance and sending tasks commands
 */
-class DatabaseTaskProvider {
+class DatabaseTaskProvider(
+    private var context: Context,
+    private var showDialog: Boolean = true
+) {

-    private var activity: FragmentActivity? = null
-    private var service: Service? = null
-    private var context: Context
+    // To show dialog only if context is an activity
+    private var activity: FragmentActivity? = try { context as? FragmentActivity? }
+    catch (_: Exception) { null }

-    var onDatabaseRetrieved: ((database: Database?) -> Unit)? = null
+    var onDatabaseRetrieved: ((database: ContextualDatabase?) -> Unit)? = null

-    var onActionFinish: ((database: Database,
+    var onActionFinish: ((database: ContextualDatabase,
                          actionTask: String,
                          result: ActionRunnable.Result) -> Unit)? = null

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

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

-    constructor(activity: FragmentActivity) {
-        this.activity = activity
-        this.context = activity
-        this.intentDatabaseTask = Intent(activity.applicationContext,
-            DatabaseTaskNotificationService::class.java)
-    }
-
-    constructor(service: Service) {
-        this.service = service
-        this.context = service
-        this.intentDatabaseTask = Intent(service.applicationContext,
-            DatabaseTaskNotificationService::class.java)
+    fun destroy() {
+        this.activity = null
+        this.onDatabaseRetrieved = null
+        this.onActionFinish = null
+        this.databaseTaskBroadcastReceiver = null
+        this.mBinder = null
+        this.serviceConnection = null
+        this.progressTaskDialogFragment = null
+        this.databaseChangedDialogFragment = null
    }

    private val actionTaskListener = object: DatabaseTaskNotificationService.ActionTaskListener {
-        override fun onStartAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
-            startDialog(titleId, messageId, warningId)
+        override fun onActionStarted(
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        ) {
+            if (showDialog)
+                startDialog(progressMessage)
        }

-        override fun onUpdateAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
-            updateDialog(titleId, messageId, warningId)
+        override fun onActionUpdated(
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        ) {
+            if (showDialog)
+                updateDialog(progressMessage)
        }

-        override fun onStopAction(database: Database, actionTask: String, result: ActionRunnable.Result) {
-            onActionFinish?.invoke(database, actionTask, result)
+        override fun onActionStopped(
+            database: ContextualDatabase
+        ) {
            // Remove the progress task
            stopDialog()
        }
+
+        override fun onActionFinished(
+            database: ContextualDatabase,
+            actionTask: String,
+            result: ActionRunnable.Result
+        ) {
+            onActionFinish?.invoke(database, actionTask, result)
+            onActionStopped(database)
+        }
    }

    private val mActionDatabaseListener = object: DatabaseChangedDialogFragment.ActionDatabaseChangedListener {
@@ -147,7 +180,8 @@ class DatabaseTaskProvider {
        }
    }

-    private var databaseInfoListener = object: DatabaseTaskNotificationService.DatabaseInfoListener {
+    private var databaseInfoListener = object:
+        DatabaseTaskNotificationService.DatabaseInfoListener {
        override fun onDatabaseInfoChanged(previousDatabaseInfo: SnapFileDatabaseInfo,
                                           newDatabaseInfo: SnapFileDatabaseInfo) {
            activity?.let { activity ->
@@ -176,14 +210,12 @@ class DatabaseTaskProvider {
    }

    private var databaseListener = object: DatabaseTaskNotificationService.DatabaseListener {
-        override fun onDatabaseRetrieved(database: Database?) {
+        override fun onDatabaseRetrieved(database: ContextualDatabase?) {
            onDatabaseRetrieved?.invoke(database)
        }
    }

-    private fun startDialog(titleId: Int? = null,
-                            messageId: Int? = null,
-                            warningId: Int? = null) {
+    private fun startDialog(progressMessage: ProgressMessage) {
        activity?.let { activity ->
            activity.lifecycleScope.launch {
                if (progressTaskDialogFragment == null) {
@@ -197,22 +229,17 @@ class DatabaseTaskProvider {
                        PROGRESS_TASK_DIALOG_TAG
                    )
                }
-                updateDialog(titleId, messageId, warningId)
+                updateDialog(progressMessage)
            }
        }
    }

-    private fun updateDialog(titleId: Int?, messageId: Int?, warningId: Int?) {
+    private fun updateDialog(progressMessage: ProgressMessage) {
        progressTaskDialogFragment?.apply {
-            titleId?.let {
-                updateTitle(it)
-            }
-            messageId?.let {
-                updateMessage(it)
-            }
-            warningId?.let {
-                updateWarning(it)
-            }
+            updateTitle(progressMessage.titleId)
+            updateMessage(progressMessage.messageId)
+            updateWarning(progressMessage.warningId)
+            setCancellable(progressMessage.cancelable)
        }
    }

@@ -224,11 +251,17 @@ class DatabaseTaskProvider {
    private fun initServiceConnection() {
        if (serviceConnection == null) {
            serviceConnection = object : ServiceConnection {
+                override fun onBindingDied(name: ComponentName?) {
+                    stopDialog()
+                }
+
+                override fun onNullBinding(name: ComponentName?) {
+                    stopDialog()
+                }
+
                override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
                    mBinder = (serviceBinder as DatabaseTaskNotificationService.ActionTaskBinder?)?.apply {
-                        addDatabaseListener(databaseListener)
-                        addDatabaseFileInfoListener(databaseInfoListener)
-                        addActionTaskListener(actionTaskListener)
+                        addServiceListeners(this)
                        getService().checkDatabase()
                        getService().checkDatabaseInfo()
                        getService().checkAction()
@@ -236,15 +269,25 @@ class DatabaseTaskProvider {
                }

                override fun onServiceDisconnected(name: ComponentName?) {
-                    mBinder?.removeActionTaskListener(actionTaskListener)
-                    mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
-                    mBinder?.removeDatabaseListener(databaseListener)
+                    removeServiceListeners(mBinder)
                    mBinder = null
                }
            }
        }
    }

+    private fun addServiceListeners(service: DatabaseTaskNotificationService.ActionTaskBinder?) {
+        service?.addDatabaseListener(databaseListener)
+        service?.addDatabaseFileInfoListener(databaseInfoListener)
+        service?.addActionTaskListener(actionTaskListener)
+    }
+
+    private fun removeServiceListeners(service: DatabaseTaskNotificationService.ActionTaskBinder?) {
+        service?.removeActionTaskListener(actionTaskListener)
+        service?.removeDatabaseFileInfoListener(databaseInfoListener)
+        service?.removeDatabaseListener(databaseListener)
+    }
+
    private fun bindService() {
        initServiceConnection()
        serviceConnection?.let {
@@ -256,19 +299,18 @@ class DatabaseTaskProvider {
     * Unbind the service and assign null to the service connection to check if already unbind or not
     */
    private fun unBindService() {
-        serviceConnection?.let {
-            context.unbindService(it)
+        try {
+            serviceConnection?.let {
+                context.unbindService(it)
+            }
+        } catch (e: java.lang.Exception) {
+            Log.e(TAG, "Unable to unbind the database task service", e)
+        } finally {
+            serviceConnection = null
        }
-        serviceConnection = null
-    }
-
-    fun isBinded(): Boolean {
-        return mBinder != null
    }

    fun registerProgressTask() {
-        stopDialog()
-
        // Register a database task receiver to stop loading dialog when service finish the task
        databaseTaskBroadcastReceiver = object : BroadcastReceiver() {
            override fun onReceive(context: Context?, intent: Intent?) {
@@ -279,17 +321,16 @@ class DatabaseTaskProvider {
                    }
                    DATABASE_STOP_TASK_ACTION -> {
                        // Remove the progress task
-                        stopDialog()
                        unBindService()
                    }
                }
            }
        }
        context.registerReceiver(databaseTaskBroadcastReceiver,
-                IntentFilter().apply {
-                    addAction(DATABASE_START_TASK_ACTION)
-                    addAction(DATABASE_STOP_TASK_ACTION)
-                }
+            IntentFilter().apply {
+                addAction(DATABASE_START_TASK_ACTION)
+                addAction(DATABASE_STOP_TASK_ACTION)
+            }
        )

        // Check if a service is currently running else do nothing
@@ -297,11 +338,7 @@ class DatabaseTaskProvider {
    }

    fun unregisterProgressTask() {
-        stopDialog()
-
-        mBinder?.removeActionTaskListener(actionTaskListener)
-        mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
-        mBinder?.removeDatabaseListener(databaseListener)
+        removeServiceListeners(mBinder)
        mBinder = null

        unBindService()
@@ -313,7 +350,50 @@ class DatabaseTaskProvider {
        }
    }

+    private val tempServiceParameters = mutableListOf<Pair<Bundle?, String>>()
+    private val requestPermissionLauncher = activity?.registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { _ ->
+        // Whether or not the user has accepted, the service can be started,
+        // There just won't be any notification if it's not allowed.
+        tempServiceParameters.removeFirstOrNull()?.let {
+            startService(it.first, it.second)
+        }
+    }
+
    private fun start(bundle: Bundle? = null, actionTask: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val contextActivity = activity
+            if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS)
+                == PackageManager.PERMISSION_GRANTED
+            ) {
+                startService(bundle, actionTask)
+            } else if (contextActivity != null && shouldShowRequestPermissionRationale(
+                    contextActivity,
+                    Manifest.permission.POST_NOTIFICATIONS
+                )
+            ) {
+                // it's not the first time, so the user deliberately chooses not to display the notification
+                startService(bundle, actionTask)
+            } else {
+                AlertDialog.Builder(context)
+                    .setMessage(R.string.warning_database_notification_permission)
+                    .setNegativeButton(R.string.later) { _, _ ->
+                        // Refuses the notification, so start the service
+                        startService(bundle, actionTask)
+                    }
+                    .setPositiveButton(R.string.ask) { _, _ ->
+                        // Save the temp parameters to ask the permission
+                        tempServiceParameters.add(Pair(bundle, actionTask))
+                        requestPermissionLauncher?.launch(Manifest.permission.POST_NOTIFICATIONS)
+                    }.create().show()
+            }
+        } else {
+            startService(bundle, actionTask)
+        }
+    }
+
+    private fun startService(bundle: Bundle? = null, actionTask: String) {
        try {
            if (bundle != null)
                intentDatabaseTask.putExtras(bundle)
@@ -321,7 +401,7 @@ class DatabaseTaskProvider {
            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()
+            Toast.makeText(context, R.string.error_start_database_action, Toast.LENGTH_LONG).show()
        }
    }

@@ -332,12 +412,13 @@ class DatabaseTaskProvider {
    */

    fun startDatabaseCreate(databaseUri: Uri,
-                            mainCredential: MainCredential) {
+                            mainCredential: MainCredential
+    ) {
        start(Bundle().apply {
            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
        }
-                , ACTION_DATABASE_CREATE_TASK)
+            , ACTION_DATABASE_CREATE_TASK)
    }

    fun startDatabaseLoad(databaseUri: Uri,
@@ -352,12 +433,14 @@ class DatabaseTaskProvider {
            putParcelable(DatabaseTaskNotificationService.CIPHER_DATABASE_KEY, cipherEncryptDatabase)
            putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
        }
-                , ACTION_DATABASE_LOAD_TASK)
+            , ACTION_DATABASE_LOAD_TASK)
    }

-    fun startDatabaseMerge(fromDatabaseUri: Uri? = null,
+    fun startDatabaseMerge(save: Boolean,
+                           fromDatabaseUri: Uri? = null,
                           mainCredential: MainCredential? = null) {
        start(Bundle().apply {
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, fromDatabaseUri)
            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
        }
@@ -368,7 +451,7 @@ class DatabaseTaskProvider {
        start(Bundle().apply {
            putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
        }
-                , ACTION_DATABASE_RELOAD_TASK)
+            , ACTION_DATABASE_RELOAD_TASK)
    }

    fun askToStartDatabaseReload(conditionToAsk: Boolean, approved: () -> Unit) {
@@ -384,14 +467,15 @@ class DatabaseTaskProvider {
        }
    }

-    fun startDatabaseAssignPassword(databaseUri: Uri,
-                                    mainCredential: MainCredential) {
+    fun startDatabaseAssignCredential(databaseUri: Uri,
+                                      mainCredential: MainCredential
+    ) {

        start(Bundle().apply {
            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
        }
-                , ACTION_DATABASE_ASSIGN_PASSWORD_TASK)
+            , ACTION_DATABASE_ASSIGN_CREDENTIAL_TASK)
    }

    /*
@@ -408,7 +492,7 @@ class DatabaseTaskProvider {
            putParcelable(DatabaseTaskNotificationService.PARENT_ID_KEY, parent.nodeId)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_CREATE_GROUP_TASK)
+            , ACTION_DATABASE_CREATE_GROUP_TASK)
    }

    fun startDatabaseUpdateGroup(oldGroup: Group,
@@ -419,7 +503,7 @@ class DatabaseTaskProvider {
            putParcelable(DatabaseTaskNotificationService.GROUP_KEY, groupToUpdate)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_GROUP_TASK)
+            , ACTION_DATABASE_UPDATE_GROUP_TASK)
    }

    fun startDatabaseCreateEntry(newEntry: Entry,
@@ -430,7 +514,7 @@ class DatabaseTaskProvider {
            putParcelable(DatabaseTaskNotificationService.PARENT_ID_KEY, parent.nodeId)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_CREATE_ENTRY_TASK)
+            , ACTION_DATABASE_CREATE_ENTRY_TASK)
    }

    fun startDatabaseUpdateEntry(oldEntry: Entry,
@@ -441,7 +525,7 @@ class DatabaseTaskProvider {
            putParcelable(DatabaseTaskNotificationService.ENTRY_KEY, entryToUpdate)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_ENTRY_TASK)
+            , ACTION_DATABASE_UPDATE_ENTRY_TASK)
    }

    private fun startDatabaseActionListNodes(actionTask: String,
@@ -464,13 +548,13 @@ class DatabaseTaskProvider {

        start(Bundle().apply {
            putAll(getBundleFromListNodes(nodesPaste))
-            putParcelableArrayList(DatabaseTaskNotificationService.GROUPS_ID_KEY, groupsIdToCopy)
-            putParcelableArrayList(DatabaseTaskNotificationService.ENTRIES_ID_KEY, entriesIdToCopy)
+            putParcelableList(DatabaseTaskNotificationService.GROUPS_ID_KEY, groupsIdToCopy)
+            putParcelableList(DatabaseTaskNotificationService.ENTRIES_ID_KEY, entriesIdToCopy)
            if (newParentId != null)
                putParcelable(DatabaseTaskNotificationService.PARENT_ID_KEY, newParentId)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-        , actionTask)
+            , actionTask)
    }

    fun startDatabaseCopyNodes(nodesToCopy: List<Node>,
@@ -504,7 +588,7 @@ class DatabaseTaskProvider {
            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_RESTORE_ENTRY_HISTORY)
+            , ACTION_DATABASE_RESTORE_ENTRY_HISTORY)
    }

    fun startDatabaseDeleteEntryHistory(mainEntryId: NodeId<UUID>,
@@ -515,7 +599,7 @@ class DatabaseTaskProvider {
            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_DELETE_ENTRY_HISTORY)
+            , ACTION_DATABASE_DELETE_ENTRY_HISTORY)
    }

    /*
@@ -532,7 +616,7 @@ class DatabaseTaskProvider {
            putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newName)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_NAME_TASK)
+            , ACTION_DATABASE_UPDATE_NAME_TASK)
    }

    fun startDatabaseSaveDescription(oldDescription: String,
@@ -543,7 +627,7 @@ class DatabaseTaskProvider {
            putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newDescription)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_DESCRIPTION_TASK)
+            , ACTION_DATABASE_UPDATE_DESCRIPTION_TASK)
    }

    fun startDatabaseSaveDefaultUsername(oldDefaultUsername: String,
@@ -554,7 +638,7 @@ class DatabaseTaskProvider {
            putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newDefaultUsername)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK)
+            , ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK)
    }

    fun startDatabaseSaveColor(oldColor: String,
@@ -565,7 +649,7 @@ class DatabaseTaskProvider {
            putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newColor)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_COLOR_TASK)
+            , ACTION_DATABASE_UPDATE_COLOR_TASK)
    }

    fun startDatabaseSaveCompression(oldCompression: CompressionAlgorithm,
@@ -576,14 +660,14 @@ class DatabaseTaskProvider {
            putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newCompression)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_COMPRESSION_TASK)
+            , ACTION_DATABASE_UPDATE_COMPRESSION_TASK)
    }

    fun startDatabaseRemoveUnlinkedData(save: Boolean) {
        start(Bundle().apply {
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK)
+            , ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK)
    }

    fun startDatabaseSaveRecycleBin(oldRecycleBin: Group?,
@@ -616,7 +700,7 @@ class DatabaseTaskProvider {
            putInt(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMaxHistoryItems)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK)
+            , ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK)
    }

    fun startDatabaseSaveMaxHistorySize(oldMaxHistorySize: Long,
@@ -627,7 +711,7 @@ class DatabaseTaskProvider {
            putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMaxHistorySize)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK)
+            , ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK)
    }

    /*
@@ -644,7 +728,7 @@ class DatabaseTaskProvider {
            putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newEncryption)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_ENCRYPTION_TASK)
+            , ACTION_DATABASE_UPDATE_ENCRYPTION_TASK)
    }

    fun startDatabaseSaveKeyDerivation(oldKeyDerivation: KdfEngine,
@@ -655,7 +739,7 @@ class DatabaseTaskProvider {
            putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newKeyDerivation)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK)
+            , ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK)
    }

    fun startDatabaseSaveIterations(oldIterations: Long,
@@ -666,7 +750,7 @@ class DatabaseTaskProvider {
            putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newIterations)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_ITERATIONS_TASK)
+            , ACTION_DATABASE_UPDATE_ITERATIONS_TASK)
    }

    fun startDatabaseSaveMemoryUsage(oldMemoryUsage: Long,
@@ -677,7 +761,7 @@ class DatabaseTaskProvider {
            putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMemoryUsage)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK)
+            , ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK)
    }

    fun startDatabaseSaveParallelism(oldParallelism: Long,
@@ -688,7 +772,7 @@ class DatabaseTaskProvider {
            putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newParallelism)
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
        }
-                , ACTION_DATABASE_UPDATE_PARALLELISM_TASK)
+            , ACTION_DATABASE_UPDATE_PARALLELISM_TASK)
    }

    /**
@@ -699,10 +783,17 @@ class DatabaseTaskProvider {
            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, saveToUri)
        }
-                , ACTION_DATABASE_SAVE)
+            , ACTION_DATABASE_SAVE)
+    }
+
+    fun startChallengeResponded(response: ByteArray?) {
+        start(Bundle().apply {
+            putByteArray(DatabaseTaskNotificationService.DATA_BYTES, response)
+        }
+            , ACTION_CHALLENGE_RESPONDED)
    }

    companion object {
        private val TAG = DatabaseTaskProvider::class.java.name
    }
-}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/MainCredential.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/MainCredential.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2022 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.kunzisoft.keepass.database
+
+import android.content.ContentResolver
+import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.MasterCredential
+import com.kunzisoft.keepass.hardware.HardwareKey
+import com.kunzisoft.keepass.utils.readParcelableCompat
+import com.kunzisoft.keepass.utils.getUriInputStream
+import com.kunzisoft.keepass.utils.readEnum
+import com.kunzisoft.keepass.utils.writeEnum
+
+data class MainCredential(var password: String? = null,
+                          var keyFileUri: Uri? = null,
+                          var hardwareKey: HardwareKey? = null): Parcelable {
+
+    constructor(parcel: Parcel) : this() {
+        password = parcel.readString()
+        keyFileUri = parcel.readParcelableCompat()
+        hardwareKey = parcel.readEnum<HardwareKey>()
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(password)
+        parcel.writeParcelable(keyFileUri, flags)
+        parcel.writeEnum(hardwareKey)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MainCredential
+
+        if (password != other.password) return false
+        if (keyFileUri != other.keyFileUri) return false
+        if (hardwareKey != other.hardwareKey) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = password?.hashCode() ?: 0
+        result = 31 * result + (keyFileUri?.hashCode() ?: 0)
+        result = 31 * result + (hardwareKey?.hashCode() ?: 0)
+        return result
+    }
+
+    fun toMasterCredential(contentResolver: ContentResolver): MasterCredential {
+        return MasterCredential(
+            this.password,
+            this.keyFileUri?.let {
+                getKeyFileData(contentResolver, it)
+            },
+            this.hardwareKey
+        )
+    }
+
+    private fun getKeyFileData(contentResolver: ContentResolver,
+                               keyFileUri: Uri): ByteArray? {
+        contentResolver.getUriInputStream(keyFileUri)?.use { keyFileInputStream ->
+            return keyFileInputStream.readBytes()
+        }
+        return null
+    }
+
+    companion object CREATOR : Parcelable.Creator<MainCredential> {
+        override fun createFromParcel(parcel: Parcel): MainCredential {
+            return MainCredential(parcel)
+        }
+
+        override fun newArray(size: Int): Array<MainCredential?> {
+            return arrayOfNulls(size)
+        }
+
+        private val TAG = MainCredential::class.java.simpleName
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/database/ProgressMessage.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/ProgressMessage.kt
@@ -0,0 +1,13 @@
+package com.kunzisoft.keepass.database
+
+import androidx.annotation.StringRes
+
+data class ProgressMessage(
+    @StringRes
+    var titleId: Int,
+    @StringRes
+    var messageId: Int? = null,
+    @StringRes
+    var warningId: Int? = null,
+    var cancelable: (() -> Unit)? = null
+)
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/AssignMainCredentialInDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/AssignMainCredentialInDatabaseRunnable.kt
@@ -1,83 +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.database.action
-
-import android.content.Context
-import android.net.Uri
-import com.kunzisoft.keepass.app.database.CipherDatabaseAction
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.utils.UriUtil
-
-open class AssignMainCredentialInDatabaseRunnable (
-        context: Context,
-        database: Database,
-        protected val mDatabaseUri: Uri,
-        protected val mMainCredential: MainCredential)
-    : SaveDatabaseRunnable(context, database, true) {
-
-    private var mBackupKey: ByteArray? = null
-
-    override fun onStartRun() {
-        // Set key
-        try {
-            mBackupKey = ByteArray(database.masterKey.size)
-            System.arraycopy(database.masterKey, 0, mBackupKey!!, 0, mBackupKey!!.size)
-
-            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mMainCredential.keyFileUri)
-            database.assignMasterKey(mMainCredential.masterPassword, uriInputStream)
-        } catch (e: Exception) {
-            erase(mBackupKey)
-            setError(e)
-        }
-
-        super.onStartRun()
-    }
-
-    override fun onFinishRun() {
-        super.onFinishRun()
-
-        // Erase the biometric
-        CipherDatabaseAction.getInstance(context)
-                .deleteByDatabaseUri(mDatabaseUri)
-        // Erase the register keyfile
-        FileDatabaseHistoryAction.getInstance(context)
-                .deleteKeyFileByDatabaseUri(mDatabaseUri)
-
-        if (!result.isSuccess) {
-            // Erase the current master key
-            erase(database.masterKey)
-            mBackupKey?.let {
-                database.masterKey = it
-            }
-        }
-    }
-
-    /**
-     * Overwrite the array as soon as we don't need it to avoid keeping the extra data in memory
-     */
-    private fun erase(array: ByteArray?) {
-        if (array == null) return
-        for (i in array.indices) {
-            array[i] = 0
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
@@ -21,57 +21,46 @@ package com.kunzisoft.keepass.database.action

 import android.content.Context
 import android.net.Uri
-import android.util.Log
-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
-
-class CreateDatabaseRunnable(context: Context,
-                             private val mDatabase: Database,
-                             databaseUri: Uri,
-                             private val databaseName: String,
-                             private val rootName: String,
-                             private val templateGroupName: String?,
-                             mainCredential: MainCredential,
-                             private val createDatabaseResult: ((Result) -> Unit)?)
-    : AssignMainCredentialInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.hardware.HardwareKey
+import com.kunzisoft.keepass.utils.getBinaryDir

+class CreateDatabaseRunnable(
+    context: Context,
+    private val mDatabase: ContextualDatabase,
+    private val databaseUri: Uri,
+    private val databaseName: String,
+    private val rootName: String,
+    private val templateGroupName: String?,
+    val mainCredential: MainCredential,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : SaveDatabaseRunnable(
+    context,
+    mDatabase,
+    true,
+    mainCredential,
+    challengeResponseRetriever
+) {
    override fun onStartRun() {
        try {
            // Create new database record
            mDatabase.apply {
-                createData(mDatabaseUri, databaseName, rootName, templateGroupName)
+                this.fileUri = databaseUri
+                createData(databaseName, rootName, templateGroupName)
            }
        } catch (e: Exception) {
-            mDatabase.clearAndClose(context)
+            mDatabase.clearAndClose(context.getBinaryDir())
            setError(e)
        }

        super.onStartRun()
    }

-    override fun onActionRun() {
-        super.onActionRun()
-
-        if (result.isSuccess) {
-            // Add database to recent files
-            if (PreferencesUtil.rememberDatabaseLocations(context)) {
-                FileDatabaseHistoryAction.getInstance(context.applicationContext)
-                        .addOrUpdateDatabaseUri(mDatabaseUri,
-                                if (PreferencesUtil.rememberKeyFileLocations(context)) mMainCredential.keyFileUri else null)
-            }
-
-            // Register the current time to init the lock timer
-            PreferencesUtil.saveCurrentTime(context)
-        } else {
-            Log.e("CreateDatabaseRunnable", "Unable to create the database")
-        }
-    }
-
    override fun onFinishRun() {
+        if (result.isSuccess) {
+            mDatabase.loaded = true
+        }
        super.onFinishRun()
-
-        createDatabaseResult?.invoke(result)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt
@@ -21,73 +21,65 @@ package com.kunzisoft.keepass.database.action

 import android.content.Context
 import android.net.Uri
-import com.kunzisoft.keepass.app.database.CipherDatabaseAction
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.database.exception.DatabaseInputException
+import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.getBinaryDir
+import com.kunzisoft.keepass.utils.getUriInputStream

-class LoadDatabaseRunnable(private val context: Context,
-                           private val mDatabase: Database,
-                           private val mUri: Uri,
-                           private val mMainCredential: MainCredential,
-                           private val mReadonly: Boolean,
-                           private val mCipherEncryptDatabase: CipherEncryptDatabase?,
-                           private val mFixDuplicateUUID: Boolean,
-                           private val progressTaskUpdater: ProgressTaskUpdater?,
-                           private val mLoadDatabaseResult: ((Result) -> Unit)?)
-    : ActionRunnable() {
+class LoadDatabaseRunnable(
+    private val context: Context,
+    private val mDatabase: ContextualDatabase,
+    private val mDatabaseUri: Uri,
+    private val mMainCredential: MainCredential,
+    private val mChallengeResponseRetriever: (hardwareKey: HardwareKey, seed: ByteArray?) -> ByteArray,
+    private val mReadonly: Boolean,
+    private val mFixDuplicateUUID: Boolean,
+    private val progressTaskUpdater: ProgressTaskUpdater?
+) : ActionRunnable() {
+
+    var afterLoadDatabase : ((Result) -> Unit)? = null
+
+    private val binaryDir = context.getBinaryDir()

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

    override fun onActionRun() {
        try {
-            mDatabase.loadData(mUri,
-                    mMainCredential,
-                    mReadonly,
-                    context.contentResolver,
-                    UriUtil.getBinaryDir(context),
-                    { memoryWanted ->
-                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
-                    },
-                    mFixDuplicateUUID,
-                    progressTaskUpdater)
-        }
-        catch (e: LoadDatabaseException) {
+            val contentResolver = context.contentResolver
+            // Save database URI
+            mDatabase.fileUri = mDatabaseUri
+            mDatabase.loadData(
+                contentResolver.getUriInputStream(mDatabaseUri)
+                    ?: throw UnknownDatabaseLocationException(),
+                mMainCredential.toMasterCredential(contentResolver),
+                mChallengeResponseRetriever,
+                mReadonly,
+                binaryDir,
+                { memoryWanted ->
+                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                },
+                mFixDuplicateUUID,
+                progressTaskUpdater
+            )
+        } catch (e: DatabaseInputException) {
            setError(e)
        }

-        if (result.isSuccess) {
-            // Save keyFile in app database
-            if (PreferencesUtil.rememberDatabaseLocations(context)) {
-                FileDatabaseHistoryAction.getInstance(context)
-                        .addOrUpdateDatabaseUri(mUri,
-                                if (PreferencesUtil.rememberKeyFileLocations(context)) mMainCredential.keyFileUri else null)
-            }
-
-            // Register the biometric
-            mCipherEncryptDatabase?.let { cipherDatabase ->
-                CipherDatabaseAction.getInstance(context)
-                        .addOrUpdateCipherDatabase(cipherDatabase) // return value not called
-            }
-
-            // Register the current time to init the lock timer
-            PreferencesUtil.saveCurrentTime(context)
-        } else {
-            mDatabase.clearAndClose(context)
+        if (!result.isSuccess) {
+            mDatabase.clearAndClose(binaryDir)
        }
    }

    override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
+        afterLoadDatabase?.invoke(result)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/MergeDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/MergeDatabaseRunnable.kt
@@ -21,47 +21,54 @@ package com.kunzisoft.keepass.database.action

 import android.content.Context
 import android.net.Uri
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
+import com.kunzisoft.keepass.database.exception.DatabaseException
+import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
+import com.kunzisoft.keepass.utils.getUriInputStream

-class MergeDatabaseRunnable(private val context: Context,
-                            private val mDatabase: Database,
-                            private val mDatabaseToMergeUri: Uri?,
-                            private val mDatabaseToMergeMainCredential: MainCredential?,
-                            private val progressTaskUpdater: ProgressTaskUpdater?,
-                            private val mLoadDatabaseResult: ((Result) -> Unit)?)
-    : ActionRunnable() {
-
+class MergeDatabaseRunnable(
+    context: Context,
+    private val mDatabaseToMergeUri: Uri?,
+    private val mDatabaseToMergeMainCredential: MainCredential?,
+    private val mDatabaseToMergeChallengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray,
+    database: ContextualDatabase,
+    saveDatabase: Boolean,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray,
+    private val progressTaskUpdater: ProgressTaskUpdater?,
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {
    override fun onStartRun() {
-        mDatabase.wasReloaded = true
+        database.wasReloaded = true
+        super.onStartRun()
    }

    override fun onActionRun() {
        try {
-            mDatabase.mergeData(mDatabaseToMergeUri,
-                mDatabaseToMergeMainCredential,
-                context.contentResolver,
+            val contentResolver = context.contentResolver
+            database.mergeData(
+                context.contentResolver.getUriInputStream(
+                    mDatabaseToMergeUri ?: database.fileUri
+                ) ?: throw UnknownDatabaseLocationException(),
+                mDatabaseToMergeMainCredential?.toMasterCredential(contentResolver),
+                mDatabaseToMergeChallengeResponseRetriever,
                { memoryWanted ->
                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
                },
                progressTaskUpdater
            )
-        } catch (e: LoadDatabaseException) {
+        } catch (e: DatabaseException) {
            setError(e)
        }

-        if (result.isSuccess) {
-            // Register the current time to init the lock timer
-            PreferencesUtil.saveCurrentTime(context)
-        }
-    }
-
-    override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
+        super.onActionRun()
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt
@@ -20,46 +20,50 @@
 package com.kunzisoft.keepass.database.action

 import android.content.Context
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.database.exception.DatabaseException
+import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.getBinaryDir
+import com.kunzisoft.keepass.utils.getUriInputStream

-class ReloadDatabaseRunnable(private val context: Context,
-                             private val mDatabase: Database,
-                             private val progressTaskUpdater: ProgressTaskUpdater?,
-                             private val mLoadDatabaseResult: ((Result) -> Unit)?)
-    : ActionRunnable() {
+class ReloadDatabaseRunnable(
+    private val context: Context,
+    private val mDatabase: ContextualDatabase,
+    private val progressTaskUpdater: ProgressTaskUpdater?
+) : ActionRunnable() {
+
+    var afterReloadDatabase : ((Result) -> Unit)? = null
+
+    private val binaryDir = context.getBinaryDir()

    override fun onStartRun() {
        // Clear before we load
-        mDatabase.clearIndexesAndBinaries(UriUtil.getBinaryDir(context))
+        mDatabase.clearIndexesAndBinaries(binaryDir)
        mDatabase.wasReloaded = true
    }

    override fun onActionRun() {
        try {
-            mDatabase.reloadData(context.contentResolver,
-                    { memoryWanted ->
-                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
-                    },
-                    progressTaskUpdater)
-        } catch (e: LoadDatabaseException) {
+            mDatabase.reloadData(
+                context.contentResolver.getUriInputStream(mDatabase.fileUri)
+                    ?: throw UnknownDatabaseLocationException(),
+                { memoryWanted ->
+                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                },
+                progressTaskUpdater)
+        } catch (e: DatabaseException) {
            setError(e)
        }

-        if (result.isSuccess) {
-            // Register the current time to init the lock timer
-            PreferencesUtil.saveCurrentTime(context)
-        } else {
-            mDatabase.clearAndClose(context)
+        if (!result.isSuccess) {
+            mDatabase.clearAndClose(binaryDir)
        }
    }

    override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
+        afterReloadDatabase?.invoke(result)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/RemoveUnlinkedDataDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/RemoveUnlinkedDataDatabaseRunnable.kt
@@ -20,13 +20,21 @@
 package com.kunzisoft.keepass.database.action

 import android.content.Context
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.hardware.HardwareKey

 class RemoveUnlinkedDataDatabaseRunnable (
-        context: Context,
-        database: Database,
-        saveDatabase: Boolean)
-    : SaveDatabaseRunnable(context, database, saveDatabase) {
+    context: Context,
+    database: ContextualDatabase,
+    saveDatabase: Boolean,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {

    override fun onActionRun() {
        try {
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
@@ -21,17 +21,24 @@ package com.kunzisoft.keepass.database.action

 import android.content.Context
 import android.net.Uri
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.database.exception.DatabaseException
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ActionRunnable
+import com.kunzisoft.keepass.utils.getUriOutputStream
+import java.io.File

-open class SaveDatabaseRunnable(protected var context: Context,
-                                protected var database: Database,
-                                private var saveDatabase: Boolean,
-                                private var databaseCopyUri: Uri? = null)
-    : ActionRunnable() {
+open class SaveDatabaseRunnable(
+    protected var context: Context,
+    protected var database: ContextualDatabase,
+    private var saveDatabase: Boolean,
+    private var mainCredential: MainCredential?, // If null, uses composite Key
+    private var challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray,
+    private var databaseCopyUri: Uri? = null
+) : ActionRunnable() {

-    var mAfterSaveDatabase: ((Result) -> Unit)? = null
+    var afterSaveDatabase: ((Result) -> Unit)? = null

    override fun onStartRun() {}

@@ -39,7 +46,15 @@ open class SaveDatabaseRunnable(protected var context: Context,
        database.checkVersion()
        if (saveDatabase && result.isSuccess) {
            try {
-                database.saveData(databaseCopyUri, context.contentResolver)
+                val contentResolver = context.contentResolver
+                // Build temp database file to avoid file corruption if error
+                database.saveData(
+                    cacheFile = File(context.cacheDir, databaseCopyUri.hashCode().toString()),
+                    databaseOutputStream = contentResolver
+                        .getUriOutputStream(databaseCopyUri ?: database.fileUri),
+                    isNewLocation = databaseCopyUri == null,
+                    mainCredential?.toMasterCredential(contentResolver),
+                    challengeResponseRetriever)
            } catch (e: DatabaseException) {
                setError(e)
            }
@@ -48,6 +63,6 @@ open class SaveDatabaseRunnable(protected var context: Context,

    override fun onFinishRun() {
        // Need to call super.onFinishRun() in child class
-        mAfterSaveDatabase?.invoke(result)
+        afterSaveDatabase?.invoke(result)
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt
@@ -20,16 +20,24 @@
 package com.kunzisoft.keepass.database.action

 import android.content.Context
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.hardware.HardwareKey

 class UpdateCompressionBinariesDatabaseRunnable (
-        context: Context,
-        database: Database,
-        private val oldCompressionAlgorithm: CompressionAlgorithm,
-        private val newCompressionAlgorithm: CompressionAlgorithm,
-        saveDatabase: Boolean)
-    : SaveDatabaseRunnable(context, database, saveDatabase) {
+    context: Context,
+    database: ContextualDatabase,
+    private val oldCompressionAlgorithm: CompressionAlgorithm,
+    private val newCompressionAlgorithm: CompressionAlgorithm,
+    saveDatabase: Boolean,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {

    override fun onStartRun() {
        // Set new compression
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/history/DeleteEntryHistoryDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/history/DeleteEntryHistoryDatabaseRunnable.kt
@@ -20,17 +20,19 @@
 package com.kunzisoft.keepass.database.action.history

 import android.content.Context
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.action.SaveDatabaseRunnable
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.hardware.HardwareKey

 class DeleteEntryHistoryDatabaseRunnable (
-        context: Context,
-        database: Database,
-        private val mainEntry: Entry,
-        private val entryHistoryPosition: Int,
-        saveDatabase: Boolean)
-    : SaveDatabaseRunnable(context, database, saveDatabase) {
+    context: Context,
+    database: ContextualDatabase,
+    private val mainEntry: Entry,
+    private val entryHistoryPosition: Int,
+    saveDatabase: Boolean,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : SaveDatabaseRunnable(context, database, saveDatabase, null, challengeResponseRetriever) {

    override fun onStartRun() {
        try {
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/history/RestoreEntryHistoryDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/history/RestoreEntryHistoryDatabaseRunnable.kt
@@ -20,18 +20,20 @@
 package com.kunzisoft.keepass.database.action.history

 import android.content.Context
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.action.node.UpdateEntryRunnable
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ActionRunnable

 class RestoreEntryHistoryDatabaseRunnable (
-        private val context: Context,
-        private val database: Database,
-        private val mainEntry: Entry,
-        private val entryHistoryPosition: Int,
-        private val saveDatabase: Boolean)
-    : ActionRunnable() {
+    private val context: Context,
+    private val database: ContextualDatabase,
+    private val mainEntry: Entry,
+    private val entryHistoryPosition: Int,
+    private val saveDatabase: Boolean,
+    private val challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionRunnable() {

    private var updateEntryRunnable: UpdateEntryRunnable? = null

@@ -43,12 +45,15 @@ class RestoreEntryHistoryDatabaseRunnable (
                historyToRestore.addEntryToHistory(it)
            }
            // Update the entry with the fresh formatted entry to restore
-            updateEntryRunnable = UpdateEntryRunnable(context,
-                    database,
-                    mainEntry,
-                    historyToRestore,
-                    saveDatabase,
-                    null)
+            updateEntryRunnable = UpdateEntryRunnable(
+                context,
+                database,
+                mainEntry,
+                historyToRestore,
+                saveDatabase,
+                null,
+                challengeResponseRetriever
+            )

            updateEntryRunnable?.onStartRun()

--- 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
@@ -20,15 +20,17 @@
 package com.kunzisoft.keepass.database.action.node

 import android.content.Context
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.action.SaveDatabaseRunnable
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.hardware.HardwareKey

 abstract class ActionNodeDatabaseRunnable(
-        context: Context,
-        database: Database,
-        private val afterActionNodesFinish: AfterActionNodesFinish?,
-        save: Boolean)
-    : SaveDatabaseRunnable(context, database, save) {
+    context: Context,
+    database: ContextualDatabase,
+    private val afterActionNodesFinish: AfterActionNodesFinish?,
+    save: Boolean,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : SaveDatabaseRunnable(context, database, save, null, challengeResponseRetriever) {

    /**
     * Function do to a node action
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/AddEntryRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/AddEntryRunnable.kt
@@ -20,19 +20,21 @@
 package com.kunzisoft.keepass.database.action.node

 import android.content.Context
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 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.hardware.HardwareKey

 class AddEntryRunnable constructor(
-        context: Context,
-        database: Database,
-        private val mNewEntry: Entry,
-        private val mParent: Group,
-        save: Boolean,
-        afterActionNodesFinish: AfterActionNodesFinish?)
-    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
+    context: Context,
+    database: ContextualDatabase,
+    private val mNewEntry: Entry,
+    private val mParent: Group,
+    save: Boolean,
+    afterActionNodesFinish: AfterActionNodesFinish?,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save, challengeResponseRetriever) {

    override fun nodeAction() {
        mNewEntry.touch(modified = true, touchParents = true)
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/node/AddGroupRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/node/AddGroupRunnable.kt
@@ -20,18 +20,20 @@
 package com.kunzisoft.keepass.database.action.node

 import android.content.Context
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.hardware.HardwareKey

 class AddGroupRunnable constructor(
-        context: Context,
-        database: Database,
-        private val mNewGroup: Group,
-        private val mParent: Group,
-        save: Boolean,
-        afterActionNodesFinish: AfterActionNodesFinish?)
-    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
+    context: Context,
+    database: ContextualDatabase,
+    private val mNewGroup: Group,
+    private val mParent: Group,
+    save: Boolean,
+    afterActionNodesFinish: AfterActionNodesFinish?,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save, challengeResponseRetriever) {

    override fun nodeAction() {
        mNewGroup.touch(modified = true, touchParents = true)
--- 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
@@ -21,20 +21,24 @@ package com.kunzisoft.keepass.database.action.node

 import android.content.Context
 import android.util.Log
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.ContextualDatabase
+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.Type
 import com.kunzisoft.keepass.database.exception.CopyEntryDatabaseException
 import com.kunzisoft.keepass.database.exception.CopyGroupDatabaseException
+import com.kunzisoft.keepass.hardware.HardwareKey

 class CopyNodesRunnable constructor(
-        context: Context,
-        database: Database,
-        private val mNodesToCopy: List<Node>,
-        private val mNewParent: Group,
-        save: Boolean,
-        afterActionNodesFinish: AfterActionNodesFinish?)
-    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
+    context: Context,
+    database: ContextualDatabase,
+    private val mNodesToCopy: List<Node>,
+    private val mNewParent: Group,
+    save: Boolean,
+    afterActionNodesFinish: AfterActionNodesFinish?,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save, challengeResponseRetriever) {

    private var mEntriesCopied = ArrayList<Entry>()

--- 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
@@ -20,16 +20,22 @@
 package com.kunzisoft.keepass.database.action.node

 import android.content.Context
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.ContextualDatabase
+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.Type
+import com.kunzisoft.keepass.hardware.HardwareKey

-class DeleteNodesRunnable(context: Context,
-                          database: Database,
-                          private val mNodesToDelete: List<Node>,
-                          save: Boolean,
-                          afterActionNodesFinish: AfterActionNodesFinish)
-    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
+class DeleteNodesRunnable(
+    context: Context,
+    database: ContextualDatabase,
+    private val mNodesToDelete: List<Node>,
+    private val recyclerBinTitle: String,
+    save: Boolean,
+    afterActionNodesFinish: AfterActionNodesFinish,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save, challengeResponseRetriever) {

    private var mOldParent: Group? = null
    private var mCanRecycle: Boolean = false
@@ -50,7 +56,7 @@ class DeleteNodesRunnable(context: Context,
                    // Remove Node from parent
                    mCanRecycle = database.canRecycle(groupToDelete)
                    if (mCanRecycle) {
-                        database.recycle(groupToDelete, context.resources)
+                        database.recycle(groupToDelete, recyclerBinTitle)
                        groupToDelete.setPreviousParentGroup(mOldParent)
                        groupToDelete.touch(modified = true, touchParents = true)
                    } else {
@@ -64,7 +70,7 @@ class DeleteNodesRunnable(context: Context,
                    // Remove Node from parent
                    mCanRecycle = database.canRecycle(entryToDelete)
                    if (mCanRecycle) {
-                        database.recycle(entryToDelete, context.resources)
+                        database.recycle(entryToDelete, recyclerBinTitle)
                        entryToDelete.setPreviousParentGroup(mOldParent)
                        entryToDelete.touch(modified = true, touchParents = true)
                    } else {
--- 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
@@ -21,20 +21,24 @@ package com.kunzisoft.keepass.database.action.node

 import android.content.Context
 import android.util.Log
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.ContextualDatabase
+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.Type
 import com.kunzisoft.keepass.database.exception.MoveEntryDatabaseException
 import com.kunzisoft.keepass.database.exception.MoveGroupDatabaseException
+import com.kunzisoft.keepass.hardware.HardwareKey

 class MoveNodesRunnable constructor(
-        context: Context,
-        database: Database,
-        private val mNodesToMove: List<Node>,
-        private val mNewParent: Group,
-        save: Boolean,
-        afterActionNodesFinish: AfterActionNodesFinish?)
-    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
+    context: Context,
+    database: ContextualDatabase,
+    private val mNodesToMove: List<Node>,
+    private val mNewParent: Group,
+    save: Boolean,
+    afterActionNodesFinish: AfterActionNodesFinish?,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save, challengeResponseRetriever) {

    private var mOldParent: Group? = null

--- 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
@@ -20,19 +20,21 @@
 package com.kunzisoft.keepass.database.action.node

 import android.content.Context
+import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.hardware.HardwareKey

 class UpdateEntryRunnable constructor(
-        context: Context,
-        database: Database,
-        private val mOldEntry: Entry,
-        private val mNewEntry: Entry,
-        save: Boolean,
-        afterActionNodesFinish: AfterActionNodesFinish?)
-    : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
+    context: Context,
+    database: ContextualDatabase,
+    private val mOldEntry: Entry,
+    private val mNewEntry: Entry,
+    save: Boolean,
+    afterActionNodesFinish: AfterActionNodesFinish?,
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save, challengeResponseRetriever) {

    override fun nodeAction() {
        if (mOldEntry.nodeId == mNewEntry.nodeId) {
--- a/Show More
+++ b/Show More