Merge branch 'release/4.1.4'

4.1.3

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: [J-Jamet] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: Kunzisoft # Replace with a single Liberapay username
+issuehunt: Kunzisoft/KeePassDX # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://www.keepassdx.com/#donation'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -80,6 +80,9 @@ art/screen*.png
 art/logo_512.png
 art/store_screens/
 
+# Release
+releases/*
+
 # Dir linux
 .directory
 */.directory

CHANGELOG

@@ -1,3 +1,124 @@
+KeePassDX(4.1.4)
+ * Fix UnlockManager #2098 #2101
+ * Auto device unlock prompt #2105
+ * Small fixes ##2066
+
+KeePassDX(4.1.3)
+ * Fix Autofill Registration #2089
+ * Fix Biometric errors #2081
+ * Fixed timestamp in copy file #1981 #1983
+ * Fix Template Email #1986
+ * Fix Search #2096
+
+KeePassDX(4.1.2)
+ * Fix URL search #1940 #1946 #2003 #2040 #2044
+ * Fix Autofill popup #2054
+ * Fix Group notes #2053
+ * Fix Dialog background #2005 #2004 (Thx @codokie)
+ * Fix OTP configuration #2042 #2065 (Thx @Dev-ClayP)
+ * Fix small UI elements #1987 #2007 (Thx @ymcx)
+ * RTL layout support #2021 (Thx @codokie)
+ * App Metadata to translation #1823
+
+KeePassDX(4.1.1)
+ * Fix date parser #1933
+ * Fix domain search #1820 #1936
+
+KeePassDX(4.1.0)
+ * Generate keyfile #1290
+ * Hide template group #1894
+ * Group count sum recursively #421
+ * Fix date fields #1695 #1710
+ * Fix distinct domain names #1105 #1820
+ * Resets the advanced unlock expiration #1600
+ * Password entropy #1490 #1355
+ * Upgrade to API 34 (Android 14) #1730
+ * Small fixes #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467 #1870
+
+KeePassDX(4.0.8)
+ * Fix graphical bug that prevented databases from being opened on some versions of Android #1848 #1850
+
+KeePassDX(4.0.7)
+ * Prevent 0 Byte file with cache during a save exception #1620 #1594 #1680
+ * Fix inline suggestions in keyboard #1840
+ * Fix broken links by default #1755
+ * Fix UX by allowing validation in entry edition #1770
+ * Fix small bugs #1709
+
+KeePassDX(4.0.6)
+ * Fix form filled recognition #1508 #1735 #1508 #1790 #1783 #1797 #1801 #1802 #1804 #1665
+ * Fix translations #1707 #1683 #1712
+ * Update APK verifier #1810
+
+KeePassDX(4.0.5)
+ * Fix form filled recognition #1572 #1508
+ * Rollback password color #1686 #1490
+
+KeePassDX(4.0.4)
+ * Fix form filled recognition #1572 #1677
+ * Fix device unlock #1682
+ * Fix password color #1490
+
+KeePassDX(4.0.3)
+ * Fix "Save as" in Read Only mode #1666
+ * Fix username autofill #1665 #530 #1572 #1426 #1523 #1556 #1653 #1658 #1508 #1667
+ * Fix regex OTP recognition #1596
+ * Change password color dynamically #1490
+ * Small fixes #1641 #1656 #1649 #1400 #1674
+
+KeePassDX(4.0.2)
+ * Fix Autofill with API 33
+
+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
+ * New clipboard manager #1343
+ * Keep screen on by default when viewing an entry
+ * Change the order of the search filters
+ * Fix searchable selection
+
+KeePassDX(3.4.4)
+ * Fix crash in New Android 13 #1321
+ * Better backstack management for selection mode
+ * Prevent Tapjacking #1318
+ * Small changes #1298
+
+KeePassDX(3.4.3)
+ * Remove "Select share info" setting for Magikeyboard #1304
+ * Fix quick search and better loadGroup implementation #1302
+ * Fix small bugs
+
+KeePassDX(3.4.2)
+ * Fix service parameter and workflow to remove notification when service is killed
+ * Fix color
+
 KeePassDX(3.4.1)
  * Fix search mode with Magikeyboard #1292
  * Fix select another entry with Magikeyboard #1293

Gemfile

@@ -0,0 +1,10 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+source "https://rubygems.org"
+
+gem 'fastlane'
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -0,0 +1,230 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1146.0)
+    aws-sdk-core (3.229.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.110.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.196.1)
+      aws-sdk-core (~> 3, >= 3.228.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.3.0)
+    bigdecimal (3.2.2)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.112.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.1)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.4.0)
+    fastlane (2.228.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-versioning_android (0.1.1)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    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.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    httpclient (2.9.0)
+      mutex_m
+    jmespath (1.6.2)
+    json (2.13.2)
+    jwt (2.10.2)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.17.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    nkf (0.2.0)
+    optparse (0.6.0)
+    os (1.1.4)
+    plist (3.7.2)
+    public_suffix (6.0.2)
+    rake (13.3.0)
+    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.4.1)
+    rouge (3.28.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.20.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    sysrandom (1.0.5)
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.27.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-versioning_android
+
+BUNDLED WITH
+   2.6.9

README.md

@@ -1,14 +1,14 @@
 # Android KeePassDX
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> **Lightweight password manager for Android**, KeePassDX allows editing encrypted data in a single file in KeePass format and fill in the forms in a secure way.
+<img alt="KeePassDX Icon" src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> **Lightweight password safe and manager for Android**, KeePassDX allows editing encrypted data in a single file in KeePass format and fill in the forms in a secure way.
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen.jpg" width="220">
+<img alt="KeePassDX Screenshot" src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen.jpg" width="220">
 
 ### Features
 
  - 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).
@@ -48,16 +48,40 @@ Optional visual styles are accessible after a contribution (and a congratulatory
 
 ## Download
 
-*[F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/) is the recommended way of installing, a libre software project that verifies that all the libraries and app code is libre software.*
+*[F-Droid](https://f-droid.org/packages/com.kunzisoft.keepass.libre/) is the recommended way of installing, a libre software project that verifies all the libraries and app code is libre software.*
 
-[<img src="https://f-droid.org/badge/get-it-on.png"
+| Source | Status | [Version](https://github.com/Kunzisoft/KeePassDX/wiki/FAQ#why-a-libre-and-free-version) |
-      alt="Get it on F-Droid"
+|--------|--------|---------|
-      height="80">](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/)
+| [Google Play](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free) | ![Google Play Release](https://img.shields.io/endpoint?color=blue&logo=google-play&logoColor=green&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dcom.kunzisoft.keepass.free%26gl%3DUS%26hl%3Den%26l%3DGoogle%2520Play%26m%3D%24version) | Free + [Pro](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro) |
+| [F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/) | ![F-Droid Version](https://img.shields.io/f-droid/v/com.kunzisoft.keepass.libre?logo=F-Droid&label=F-Droid) | Libre |
+| [IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/com.kunzisoft.keepass.free) | ![IzzyOnDroid Version](https://img.shields.io/endpoint?&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAADAFBMVEUA0////wAA0v8A0v8A0////wD//wAFz/QA0/8A0/8A0/8A0/8A0v///wAA0/8A0/8A0/8A0/8A0//8/gEA0/8A0/8B0/4A0/8A0/8A0/+j5QGAwwIA0//C9yEA0/8A0/8A0/8A0/8A0/8A0/+n4SAA0/8A0/8A0/+o6gCw3lKt7QCv5SC+422b3wC19AC36zAA0/+d1yMA0/8A0/+W2gEA0/+w8ACz8gCKzgG7+QC+9CFLfwkA0/8A0////wAA0/8A0/8A0/8A0/+f2xym3iuHxCGq5BoA1P+m2joI0vONyiCz3mLO7oYA0/8M1Piq3Ei78CbB8EPe8LLj9Ly751G77zWQ1AC96UYC0fi37CL//wAA0/8A0////wD//wCp3jcA0/+j3SGj2i/I72Sx4zHE8FLB8zak1kYeycDI6nRl3qEA0/7V7psA0v6WzTa95mGi2RvB5XkPy9zH5YJ3uwGV1yxVihRLiwdxtQ1ZkAf//wD//wD//wD//wD//wCn5gf//wD//wD//wD//wD//wAA0/+h4A3R6p8A0/+X1w565OD6/ARg237n9csz2vPz+gNt37V/vifO8HW68B/L6ZOCwxXY8KRQsWRzhExAtG/E612a1Rd/pTBpmR9qjysduKVhmxF9mTY51aUozK+CsDSA52T//wD//wAA0////wD//wBJ1JRRxFWjzlxDyXRc0pGT1wCG0CWB3VGUzSTh8h6c0TSr5CCJ5FFxvl6s4H3m8xML0/DA5CvK51EX1N+Y2gSt4Dag3ChE3fax2ki68yO57NF10FRZnUPl88eJxhuCxgCz5EOLwEGf1DFutmahzGW98x0W1PGk3R154MHE6bOn69qv3gy92oG90o+Hn07B7rhCmiyMwECv1nO+0pQfwrCo57xF2daXsVhKrEdenQAduaee1Bsjr42z5D9RoCXy+QNovXpy2Z5MtWDO/TiSukaF3UtE1K6j3B4YwLc5wXlzpyIK0u5zy3uJqg4pu5RTpkZmpVKyAP8A0wBHcExHcEyBUSeEAAABAHRSTlP///9F9wjAAxD7FCEGzBjd08QyEL39abMd6///8P/ZWAnipIv/cC6B//7////////L/1Dz/0D///////86/vYnquY3/v///5T//v///17///////////////84S3QNB/8L/////////////7r/////NP////9l/////wPD4yis/x7Ym2lWSP+em////0n////////v///////////////////7//7pdGN3Urr6/+v/6aT////+//H/o2P/1v+7r7jp4PM/3p4g////g///K///481LxO///v////9w////8v/////9/p3J///a+P9v/5KR/+n///+p/xf//8P//wAAe7FyaAAABCZJREFUSMdj+E8iYKBUgwIHnwQ3N7cEHxcH+///VayoAE0Dh41qR7aBnCIQ8MsJKHH9/99czYYMWlA0cIkJGjMgAKfq//9RNYzIgLcBWYOTiCgDMhDn+B9bh6LebiWyH6L5UZQzONoAHWSHoqEpDkkDsyKqelv1//9rG1HUN9YihZK9AKp6BkG+/6xNqA5ajhSsCkrIipmYGGRa//9vQXVQXSySBnkWJOUMfn5Myuz/G3hR1NdEIUUchwiy+bkTsg4dbW/fu6W/e1c3XMMy5JiOZkFxUFZo74mgKTqaKXu0+2HqVwkja3BH9kFu361JwcHTfPJD4mdfe8ULAdVRyGlJAcVFfg+CQOozZ4XrJ85+JgwBsVXIGriQw5Tp4ZScezd8JiWnBupru30qwJZa+ZAjmWlC8fUZM4qB6kPnLNSPLMWqQQ5ZQ5aOzs1HmamBaQHzFs6y+qAmJCTE8f9/QgKSBg4DJPWc6zVDQkIC09JkZSPD38kukpExFpT4z67uYI/QwCOOCCK/izvu5CWl6AcEWMnKWml7LWbKZfH9/99UkknQHhGsynDz+65eWXv3/JmJrq5eXienVlRUfH/z8VvCf45soKQIH1yDEQsszrp6gwq9C73T87xcXadKl5TkFev4A/2tygmSBqYXqAYJmK+ZuoJydDR1vP09DA0NOy2kpdML81+U/heCpH1JU3jig7lJ5nKOT4i/t6ZHkqGzs4lJmIVHfrj+JR4HqLQSD0yDkCNEpGNn5ix9D03/eJdElTZdKV2TpNOhkwt8YUlNUgimgV0dLMBvf1gz1MolPd5FRcVNSkpDQ8owJeBCDyIhrIDnOD5QcuIU+3/2QKSs9laQ+noNLS0zLWdtqyP7mBAFAw88TwsJgMuJYweBGjYngtWbmeuZOW+bvNQToUFOAlFqOBk4Ov3/L7Z60/aN0p1tUhpa5nqWlub7C3p2I9QzyAghlUvczOz/1fhzPT3XSIfpSmmYAdVbmm1gV0dSz8DSilpUQsqCddIWIA3meuZaJqdMJZEzl6gRqgZIWZAxUdoizERXN8yi5MltcZTChzMaRQM3JNUWHS8rL/+yaPGvMmvr5ywoGoxtkDWwQ+Pb89ycBeWfGSJeL/la+RS1eOPnRtbQKgMRjZg+t8x6PkP273nWQAoFOPAgaeAThKXAmXMrK39Kmr5fsuBlBqoXfJGLe3VbmHjG9Mczi9T//3h7vygXtcDlQtJg44iQiIjIBRbGPO7gghPJy0ZIxT2HOLIUgwxQzsgYrUR350HSIMaJLidhgKY+mw+pflBDrX8E7OGBjPCAPc76gQFSTqAIiYrb/8dRP4CyosJ/rmwU5XIxHMilt4QBJwsSkBMClxOQULBlkRRwEONmR2kJcDGjADX2/+xO8r5iqjExqmLyrWpcPFRta1BfAwCtyN3XpuJ4RgAAAABJRU5ErkJggg==&url=https://apt.izzysoft.de/fdroid/api/v1/shield/com.kunzisoft.keepass.free&label=IzzyOnDroid) | Free & [Libre](https://apt.izzysoft.de/fdroid/index/apk/com.kunzisoft.keepass.libre) |
+| [GitHub](https://github.com/Kunzisoft/KeePassDX/releases) / [Obtainium](https://github.com/ImranR98/Obtainium) | ![GitHub Release](https://img.shields.io/github/v/release/Kunzisoft/KeePassDX?include_prereleases&logo=GitHub&label=GitHub) | Free & Libre |
+
+## Package authenticity from GitHub
+- Download the app from [GitHub releases](https://github.com/Kunzisoft/KeePassDX/releases/latest)
+- Install [`apksigner`](https://developer.android.com/tools/apksigner) from [Android Studio](https://developer.android.com/studio)
+- Open the directory where you saved the downloaded file in the Terminal
+- Make sure that you have `apksigner` installed by running:
+```shell
+apksigner --version
+```
+- Depending on the APK file you downloaded, run:
+
+```shell
+apksigner verify --verbose --print-certs -min-sdk-version 24 KeePassDX-*.apk
+```
+
+You should get this output :
+```shell
+Verified using v2 scheme (APK Signature Scheme v2): true
+...
+Number of signers: 1
+Signer #1 certificate SHA-256 digest: 7d55b8af210381aabf960f07e17cf7857b6d2a642ca2da6bf0bdf1b200362f04
+...
+Signer #1 public key SHA-256 digest: 5d261d3176db1e077b80112824d9390167f3be0561827e42112ed6b71192db81
+```
+If it's the case, this means that the APK was well built by the author of KeePassDX.
 
-[<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)
-	
 ## Frequently Asked Questions
 
 Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/wiki/FAQ) 
@@ -72,7 +96,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 © 2025 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
 
   This file is part of KeePassDX.
 

app/build.gradle

@@ -4,16 +4,15 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
+    namespace 'com.kunzisoft.keepass'
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 34
-    ndkVersion "21.4.7075529"
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
-        targetSdkVersion 31
+        targetSdkVersion 34
-        versionCode = 110
+        versionCode = 136
-        versionName = "3.4.1"
+        versionName = "4.1.4"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -33,10 +32,16 @@ android {
     buildTypes {
         release {
             minifyEnabled = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
+
     flavorDimensions "version"
     productFlavors {
         libre {
@@ -50,7 +55,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 +66,16 @@ android {
             buildConfigField "String", "BUILD_VERSION", "\"free\""
             buildConfigField "boolean", "CLOSED_STORE", "true"
             buildConfigField "String[]", "STYLES_DISABLED",
-                            "{\"KeepassDXStyle_Simple\"," +
+                            "{\"KeepassDXStyle_Blue\"," +
-                            "\"KeepassDXStyle_Simple_Night\"," +
-                            "\"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" ]
         }
@@ -84,16 +91,19 @@ android {
     }
 
     compileOptions {
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        buildConfig true
     }
 }
 
-def room_version = "2.4.2"
+def room_version = "2.5.1"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -101,25 +111,25 @@ 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.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+    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.5.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"
     // Autofill
     implementation "androidx.autofill:autofill:1.1.0"
     // Time
-    implementation 'joda-time:joda-time:2.10.13'
+    implementation 'joda-time:joda-time:2.13.0'
     // Color
     implementation 'com.github.Kunzisoft:AndroidClearChroma:2.6'
     // Education
@@ -129,13 +139,11 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.15'
     // Password generator
     implementation 'me.gosimple:nbvcxz:1.5.0'
-    // Encrypt lib
+    
-    implementation project(path: ':crypto')
+    // Modules import
-    // Icon pack
+    implementation project(path: ':database')
-    implementation project(path: ':icon-pack-classic')
+    implementation project(path: ':icon-pack')
-    implementation project(path: ':icon-pack-material')
 
     // Tests
     androidTestImplementation "androidx.test:runner:$android_test_version"
-    androidTestImplementation "androidx.test:rules:$android_test_version"
 }

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')"
+    ]
+  }
+}

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>

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"

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>

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>

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"

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>

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,12 @@
       android:anyDensity="true" />
     <uses-permission
         android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
+    <uses-permission
+        android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission
         android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission
@@ -20,6 +25,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"
@@ -32,6 +43,7 @@
         android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
         android:largeHeap="true"
         android:resizeableActivity="true"
+        android:supportsRtl="true"
         android:theme="@style/KeepassDXStyle.Night"
         tools:targetApi="s">
         <meta-data
@@ -39,7 +51,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"
@@ -112,7 +123,7 @@
             android:name="com.kunzisoft.keepass.activities.GroupActivity"
             android:exported="false"
             android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="com.kunzisoft.keepass.search.SearchResults"
@@ -150,14 +161,21 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.AutofillLauncherActivity"
             android:theme="@style/Theme.Transparent"
-            android:configChanges="keyboardHidden" />
+            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"
+            android:launchMode="singleInstance"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -168,8 +186,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"/>
-                <data android:scheme="otpauth" android:host="hotp" />
+                <data android:host="totp"/>
+                <data android:host="hotp"/>
             </intent-filter>
         </activity>
         <activity
@@ -183,18 +202,27 @@
 
         <service
             android:name="com.kunzisoft.keepass.services.DatabaseTaskNotificationService"
+            android:foregroundServiceType="dataSync"
             android:enabled="true"
             android:exported="false" />
         <service
             android:name="com.kunzisoft.keepass.services.AttachmentFileNotificationService"
+            android:foregroundServiceType="dataSync"
             android:enabled="true"
             android:exported="false" />
         <service
             android:name="com.kunzisoft.keepass.services.ClipboardEntryNotificationService"
+            android:foregroundServiceType="specialUse"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name="com.kunzisoft.keepass.services.KeyboardEntryNotificationService"
+            android:foregroundServiceType="specialUse"
             android:enabled="true"
             android:exported="false" />
         <service
             android:name="com.kunzisoft.keepass.services.AdvancedUnlockNotificationService"
+            android:foregroundServiceType="specialUse"
             android:enabled="true"
             android:exported="false" />
         <!-- Receiver for Autofill -->
@@ -221,10 +249,6 @@
                 <action android:name="android.view.InputMethod" />
             </intent-filter>
         </service>
-        <service
-            android:name="com.kunzisoft.keepass.services.KeyboardEntryNotificationService"
-            android:enabled="true"
-            android:exported="false" />
         <receiver
             android:name="com.kunzisoft.keepass.receivers.DexModeReceiver"
             android:exported="true">

app/src/main/java/com/igreenwood/loupe/Loupe.kt

@@ -38,7 +38,11 @@ import android.graphics.RectF
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import android.util.TypedValue
-import android.view.*
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.ScaleGestureDetector
+import android.view.View
+import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.Interpolator
@@ -172,16 +176,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 scaleFactor = detector.scaleFactor
-                val focalX = detector?.focusX ?: bitmapBounds.centerX()
+                val focalX = detector.focusX
-                val focalY = detector?.focusY ?: bitmapBounds.centerY()
+                val focalY = detector.focusY
 
-                if (detector?.scaleFactor == 1.0f) {
+                if (detector.scaleFactor == 1.0f) {
                     // scale is not changing
                     return true
                 }
@@ -191,22 +195,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?,
+                e1: MotionEvent?,
-                    e2: MotionEvent?,
+                e2: MotionEvent,
-                    distanceX: Float,
+                distanceX: Float,
-                    distanceY: Float
+                distanceY: Float
             ): Boolean {
-                if (e2?.pointerCount != 1) {
+                if (e2.pointerCount != 1) {
                     return true
                 }
 
@@ -219,13 +224,11 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
             }
 
             override fun onFling(
-                    e1: MotionEvent?,
+                e1: MotionEvent?,
-                    e2: MotionEvent?,
+                e2: MotionEvent,
-                    velocityX: Float,
+                velocityX: Float,
-                    velocityY: Float
+                velocityY: Float
             ): Boolean {
-                e1 ?: return true
-
                 if (scale > minScale) {
                     processFlingBitmap(velocityX, velocityY)
                 } else {
@@ -234,9 +237,7 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
                 return true
             }
 
-            override fun onDoubleTap(e: MotionEvent?): Boolean {
+            override fun onDoubleTap(e: MotionEvent): Boolean {
-                e ?: return false
-
                 if (isBitmapScaleAnimationRunninng) {
                     return true
                 }
@@ -376,21 +377,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 +410,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 +481,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 +532,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 +544,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 +586,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 +600,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 +670,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 +697,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 +738,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 +767,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
                     }
                 })

app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt

@@ -20,16 +20,20 @@
 package com.kunzisoft.keepass.activities
 
 import android.content.pm.PackageManager.NameNotFoundException
+import android.os.Build
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.util.Log
 import android.view.MenuItem
+import android.view.View
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
 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.isContributingUser
+import com.kunzisoft.keepass.utils.getPackageInfoCompat
 import org.joda.time.DateTime
 
 class AboutActivity : StylishActivity() {
@@ -45,10 +49,16 @@ class AboutActivity : StylishActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
+        val appName = if (this.isContributingUser())
+            getString(R.string.app_name) + " " + getString(R.string.app_name_part3)
+         else
+            getString(R.string.app_name)
+        findViewById<TextView>(R.id.activity_about_app_name).text = appName
+
         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)
@@ -68,6 +78,15 @@ class AboutActivity : StylishActivity() {
             movementMethod = LinkMovementMethod.getInstance()
             text = HtmlCompat.fromHtml(getString(R.string.html_about_licence, DateTime().year),
                     HtmlCompat.FROM_HTML_MODE_LEGACY)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                textDirection = View.TEXT_DIRECTION_ANY_RTL
+            }
+        }
+
+        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 {

app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt

@@ -25,6 +25,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.RequiresApi
@@ -36,11 +37,13 @@ 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.ContextualDatabase
-import com.kunzisoft.keepass.database.search.SearchHelper
+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.WebDomain
+import com.kunzisoft.keepass.utils.getParcelableCompat
+import com.kunzisoft.keepass.utils.getParcelableExtraCompat
 
 @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 ->
+                        bundle.getParcelableCompat<SearchInfo>(KEY_SEARCH_INFO)?.let { searchInfo ->
-                            SearchInfo.getConcreteWebDomain(
+                            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,89 +118,91 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
         }
     }
 
-    private fun launchSelection(database: Database?,
+    private fun launchSelection(database: ContextualDatabase?,
                                 autofillComponent: AutofillComponent?,
                                 searchInfo: SearchInfo) {
         if (autofillComponent == null) {
             setResult(Activity.RESULT_CANCELED)
             finish()
-        } else if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
+        } else if (KeeAutofillService.autofillAllowedFor(
-                        PreferencesUtil.applicationIdBlocklist(this))
+            applicationId = searchInfo.applicationId,
-                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
+            webDomain = searchInfo.webDomain,
-                        PreferencesUtil.webDomainBlocklist(this))) {
+            context = this
+        )) {
+            // If database is open
+            SearchHelper.checkAutoSearchInfo(this,
+                database,
+                searchInfo,
+                { openedDatabase, items ->
+                    // Items found
+                    AutofillHelper.buildResponseAndSetResult(this, openedDatabase, items)
+                    finish()
+                },
+                { openedDatabase ->
+                    // Show the database UI to select the entry
+                    GroupActivity.launchForAutofillResult(this,
+                        openedDatabase,
+                        mAutofillActivityResultLauncher,
+                        autofillComponent,
+                        searchInfo,
+                        false)
+                },
+                {
+                    // If database not open
+                    FileDatabaseSelectActivity.launchForAutofillResult(this,
+                        mAutofillActivityResultLauncher,
+                        autofillComponent,
+                        searchInfo)
+                }
+            )
+        } else {
             showBlockRestartMessage()
             setResult(Activity.RESULT_CANCELED)
             finish()
-        } else {
-            // If database is open
-            SearchHelper.checkAutoSearchInfo(this,
-                    database,
-                    searchInfo,
-                    { openedDatabase, items ->
-                        // Items found
-                        AutofillHelper.buildResponseAndSetResult(this, openedDatabase, items)
-                        finish()
-                    },
-                    { openedDatabase ->
-                        // Show the database UI to select the entry
-                        GroupActivity.launchForAutofillResult(this,
-                            openedDatabase,
-                            mAutofillActivityResultLauncher,
-                            autofillComponent,
-                            searchInfo,
-                            false)
-                    },
-                    {
-                        // If database not open
-                        FileDatabaseSelectActivity.launchForAutofillResult(this,
-                                mAutofillActivityResultLauncher,
-                                autofillComponent,
-                                searchInfo)
-                    }
-            )
         }
     }
 
-    private fun launchRegistration(database: Database?,
+    private fun launchRegistration(database: ContextualDatabase?,
                                    searchInfo: SearchInfo,
                                    registerInfo: RegisterInfo?) {
-        if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
+        if (KeeAutofillService.autofillAllowedFor(
-                        PreferencesUtil.applicationIdBlocklist(this))
+                applicationId = searchInfo.applicationId,
-                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
+                webDomain = searchInfo.webDomain,
-                        PreferencesUtil.webDomainBlocklist(this))) {
+                context = this
-            showBlockRestartMessage()
+        )) {
-            setResult(Activity.RESULT_CANCELED)
-        } else {
             val readOnly = database?.isReadOnly != false
             SearchHelper.checkAutoSearchInfo(this,
-                    database,
+                database,
-                    searchInfo,
+                searchInfo,
-                    { openedDatabase, _ ->
+                { openedDatabase, _ ->
-                        if (!readOnly) {
+                    if (!readOnly) {
-                            // Show the database UI to select the entry
+                        // Show the database UI to select the entry
-                            GroupActivity.launchForRegistration(this,
+                        GroupActivity.launchForRegistration(this,
-                                openedDatabase,
+                            openedDatabase,
-                                registerInfo)
+                            registerInfo)
-                        } else {
+                    } else {
-                            showReadOnlySaveMessage()
+                        showReadOnlySaveMessage()
-                        }
-                    },
-                    { openedDatabase ->
-                        if (!readOnly) {
-                            // Show the database UI to select the entry
-                            GroupActivity.launchForRegistration(this,
-                                openedDatabase,
-                                registerInfo)
-                        } else {
-                            showReadOnlySaveMessage()
-                        }
-                    },
-                    {
-                        // If database not open
-                        FileDatabaseSelectActivity.launchForRegistration(this,
-                                registerInfo)
                     }
+                },
+                { openedDatabase ->
+                    if (!readOnly) {
+                        // Show the database UI to select the entry
+                        GroupActivity.launchForRegistration(this,
+                            openedDatabase,
+                            registerInfo)
+                    } else {
+                        showReadOnlySaveMessage()
+                    }
+                },
+                {
+                    // If database not open
+                    FileDatabaseSelectActivity.launchForRegistration(this,
+                        registerInfo)
+                }
             )
+        } else {
+            showBlockRestartMessage()
+            setResult(Activity.RESULT_CANCELED)
         }
         finish()
     }
@@ -213,6 +218,8 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
 
     companion object {
 
+        private val TAG = AutofillLauncherActivity::class.java.name
+
         private const val KEY_SELECTION_BUNDLE = "KEY_SELECTION_BUNDLE"
         private const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
         private const val KEY_INLINE_SUGGESTION = "KEY_INLINE_SUGGESTION"
@@ -221,37 +228,51 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
 
         fun getPendingIntentForSelection(context: Context,
                                          searchInfo: SearchInfo? = null,
-                                         compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null): PendingIntent {
+                                         compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null): PendingIntent? {
-            return PendingIntent.getActivity(context, 0,
+            try {
-                // Doesn't work with direct extra Parcelable (don't know why?)
+                return PendingIntent.getActivity(
-                // Wrap into a bundle to bypass the problem
+                    context, 0,
-                Intent(context, AutofillLauncherActivity::class.java).apply {
+                    // Doesn't work with direct extra Parcelable (don't know why?)
-                    putExtra(KEY_SELECTION_BUNDLE, Bundle().apply {
+                    // Wrap into a bundle to bypass the problem
-                        putParcelable(KEY_SEARCH_INFO, searchInfo)
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        putExtra(KEY_SELECTION_BUNDLE, Bundle().apply {
-                            putParcelable(KEY_INLINE_SUGGESTION, compatInlineSuggestionsRequest)
+                            putParcelable(KEY_SEARCH_INFO, searchInfo)
-                        }
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    })
+                                putParcelable(KEY_INLINE_SUGGESTION, compatInlineSuggestionsRequest)
-                },
+                            }
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        })
-                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+                    },
-                } else {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_CANCEL_CURRENT
+                        PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
-                })
+                    } else {
+                        PendingIntent.FLAG_CANCEL_CURRENT
+                    }
+                )
+            } catch (e: RuntimeException) {
+                Log.e(TAG, "Unable to create pending intent for selection", e)
+                return null
+            }
         }
 
         fun getPendingIntentForRegistration(context: Context,
-                                            registerInfo: RegisterInfo): PendingIntent {
+                                            registerInfo: RegisterInfo): PendingIntent? {
-            return PendingIntent.getActivity(context, 0,
+            try {
-                Intent(context, AutofillLauncherActivity::class.java).apply {
+                return PendingIntent.getActivity(
-                    EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
+                    context, 0,
-                    putExtra(KEY_REGISTER_INFO, registerInfo)
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
-                },
+                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        putExtra(KEY_REGISTER_INFO, registerInfo)
-                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+                    },
-                } else {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_CANCEL_CURRENT
+                        PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
-                })
+                    } else {
+                        PendingIntent.FLAG_CANCEL_CURRENT
+                    }
+                )
+            } catch (e: RuntimeException) {
+                Log.e(TAG, "Unable to create pending intent for registration", e)
+                return null
+            }
         }
 
         fun launchForRegistration(context: Context,

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.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
+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 mColorSecondary: Int = 0
-    private var mControlColor: Int = 0
+    private var mColorSurface: Int = 0
-    private var mColorPrimary: 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 taColorSecondary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
-        val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl))
+        val taColorSurface = theme.obtainStyledAttributes(intArrayOf(R.attr.colorSurface))
-        val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary))
+        val taColorOnSurface = theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSurface))
         val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
-        mColorAccent = taColorAccent.getColor(0, Color.BLACK)
+        mColorSecondary = taColorSecondary.getColor(0, Color.BLACK)
-        mControlColor = taControlColor.getColor(0, Color.BLACK)
+        mColorSurface = taColorSurface.getColor(0, Color.BLACK)
-        mColorPrimary = taColorPrimary.getColor(0, Color.BLACK)
+        mColorOnSurface = taColorOnSurface.getColor(0, Color.BLACK)
         mColorBackground = taColorBackground.getColor(0, Color.BLACK)
-        taColorAccent.recycle()
+        taColorSecondary.recycle()
-        taControlColor.recycle()
+        taColorSurface.recycle()
-        taColorPrimary.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?.setBackgroundColor(mBackgroundColor ?: mColorSurface)
-        collapsingToolbarLayout?.contentScrim = ColorDrawable(mBackgroundColor ?: mColorPrimary)
+        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)
+        toolbar?.changeControlColor(mForegroundColor ?: mColorOnSurface)
-        collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mControlColor)
+        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>) {

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,9 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.*
+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 +44,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,13 +61,18 @@ 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
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
 import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.model.AttachmentState
+import com.kunzisoft.keepass.model.DataTime
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
@@ -76,22 +87,30 @@ 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.TimeUtil.datePickerToDataDate
-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.updateLockPaddingStart
 import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel
 import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
-import org.joda.time.DateTime
+import java.util.UUID
-import java.util.*
 
 class EntryEditActivity : DatabaseLockActivity(),
         EntryCustomFieldDialogFragment.EntryCustomFieldListener,
         SetOTPDialogFragment.CreateOtpListener,
-        DatePickerDialog.OnDateSetListener,
-        TimePickerDialog.OnTimeSetListener,
         FileTooBigDialogFragment.ActionChooseListener,
         ReplaceFileDialogFragment.ActionChooseListener {
 
     // Views
+    private var footer: View? = null
+    private var container: View? = null
     private var coordinatorLayout: CoordinatorLayout? = null
     private var scrollView: NestedScrollView? = null
     private var templateSelectorSpinner: Spinner? = null
@@ -144,10 +163,8 @@ class EntryEditActivity : DatabaseLockActivity(),
 
         // Bottom Bar
         entryEditAddToolBar = findViewById(R.id.entry_edit_bottom_bar)
-        setSupportActionBar(entryEditAddToolBar)
+        footer = findViewById(R.id.activity_entry_edit_footer)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        container = findViewById(R.id.activity_entry_edit_container)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
         coordinatorLayout = findViewById(R.id.entry_edit_coordinator_layout)
         scrollView = findViewById(R.id.entry_edit_scroll)
         scrollView?.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
@@ -156,19 +173,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_BOTTOM_IME)
+            footer?.applyWindowInsets(WindowInsetPosition.BOTTOM_IME)
+        }
+
         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 +213,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 +231,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 +249,7 @@ class EntryEditActivity : DatabaseLockActivity(),
                                 this@EntryEditActivity,
                                 templates
                             ).apply {
-                                iconDrawableFactory = mIconDrawableFactory
+                                iconDrawableFactory = mDatabase?.iconDrawableFactory
                             }
                             adapter = mTemplatesSelectorAdapter
                             val selectedTemplate = if (mTemplate != null)
@@ -272,14 +300,20 @@ class EntryEditActivity : DatabaseLockActivity(),
         mEntryEditViewModel.requestDateTimeSelection.observe(this) { dateInstant ->
             if (dateInstant.type == DateInstant.Type.TIME) {
                 // Launch the time picker
-                val dateTime = DateTime(dateInstant.date)
+                MaterialTimePicker.Builder().build().apply {
-                TimePickerFragment.getInstance(dateTime.hourOfDay, dateTime.minuteOfHour)
+                    addOnPositiveButtonClickListener {
-                    .show(supportFragmentManager, "TimePickerFragment")
+                        mEntryEditViewModel.selectTime(DataTime(this.hour, this.minute))
+                    }
+                    show(supportFragmentManager, "TimePickerFragment")
+                }
             } else {
                 // Launch the date picker
-                val dateTime = DateTime(dateInstant.date)
+                MaterialDatePicker.Builder.datePicker().build().apply {
-                DatePickerFragment.getInstance(dateTime.year, dateTime.monthOfYear - 1, dateTime.dayOfMonth)
+                    addOnPositiveButtonClickListener {
-                    .show(supportFragmentManager, "DatePickerFragment")
+                        mEntryEditViewModel.selectDate(datePickerToDataDate(it))
+                    }
+                    show(supportFragmentManager, "DatePickerFragment")
+                }
             }
         }
 
@@ -368,19 +402,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 +467,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 +478,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,
@@ -469,7 +503,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         }
 
         // Padding if lock button visible
-        entryEditAddToolBar?.updateLockPaddingLeft()
+        entryEditAddToolBar?.updateLockPaddingStart()
 
         mAttachmentFileBinderManager?.apply {
             registerProgressTask()
@@ -479,6 +513,11 @@ class EntryEditActivity : DatabaseLockActivity(),
                 }
             }
         }
+
+        // Keep the screen on
+        if (PreferencesUtil.isKeepScreenOnEnabled(this)) {
+            window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
     }
 
     override fun onPause() {
@@ -541,9 +580,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)
     }
@@ -625,14 +664,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()
+                                }
+                        )
+                    }
                 }
             }
         }
@@ -653,28 +707,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) {
+    override fun onDatabaseBackPressed() {
-        // 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() {
         onApprovedBackPressed {
-            super@EntryEditActivity.onBackPressed()
+            super@EntryEditActivity.onDatabaseBackPressed()
         }
     }
 
@@ -729,7 +771,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)
@@ -742,7 +784,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)
@@ -754,7 +796,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) {
@@ -770,7 +812,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) {
@@ -783,7 +825,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         }
 
         fun launchToUpdateForSave(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                   entryId: NodeId<UUID>,
                                   searchInfo: SearchInfo) {
             if (database.loaded && !database.isReadOnly) {
@@ -800,7 +842,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         }
 
         fun launchToCreateForSave(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                   groupId: NodeId<*>,
                                   searchInfo: SearchInfo) {
             if (database.loaded && !database.isReadOnly) {
@@ -820,7 +862,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) {
@@ -841,7 +883,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<*>,
@@ -865,7 +907,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) {
@@ -885,7 +927,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) {

app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt

@@ -26,12 +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.ContextualDatabase
-import com.kunzisoft.keepass.database.search.SearchHelper
+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.settings.PreferencesUtil
+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,
@@ -44,17 +46,17 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
     }
 
     override fun finishActivityIfReloadRequested(): Boolean {
-        return true
+        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)
@@ -74,6 +76,7 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                                 sharedWebDomain = Uri.parse(extra).host
                         }
                     }
+                    launchSelection(database, sharedWebDomain, otpString)
                 }
                 Intent.ACTION_VIEW -> {
                     // Retrieve OTP
@@ -81,28 +84,40 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                         if (OtpEntryFields.isOTPUri(extra))
                             otpString = extra
                     }
+                    launchSelection(database, sharedWebDomain, otpString)
+                }
+                else -> {
+                    if (database != null) {
+                        GroupActivity.launch(this, database)
+                    } else {
+                        FileDatabaseSelectActivity.launch(this)
+                    }
                 }
-                else -> {}
             }
+        }
+        finish()
+    }
 
-            // Build domain search param
+    private fun launchSelection(database: ContextualDatabase?,
-            val searchInfo = SearchInfo().apply {
+                                sharedWebDomain: String?,
-                this.webDomain = sharedWebDomain
+                                otpString: String?) {
-                this.otpString = otpString
+        // Build domain search param
-            }
+        val searchInfo = SearchInfo().apply {
+            this.webDomain = sharedWebDomain
+            this.otpString = otpString
+        }
 
-            SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+        WebDomain.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
-                searchInfo.webDomain = concreteWebDomain
+            searchInfo.webDomain = concreteWebDomain
-                launch(database, searchInfo)
+            launch(database, searchInfo)
-            }
         }
     }
 
-    private fun launch(database: Database?,
+    private fun launch(database: ContextualDatabase?,
                        searchInfo: SearchInfo) {
 
         // Setting to integrate Magikeyboard
-        val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
+        val searchShareForMagikeyboard = isKeyboardActivatedInSettings()
 
         // If database is open
         val readOnly = database?.isReadOnly != false
@@ -162,7 +177,7 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                                     Toast.LENGTH_LONG)
                                     .show()
                         }
-                    } else if (readOnly || searchShareForMagikeyboard) {
+                    } else if (searchShareForMagikeyboard) {
                         GroupActivity.launchForKeyboardSelectionResult(this,
                             openedDatabase,
                             searchInfo,
@@ -188,7 +203,6 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                     }
                 }
         )
-        finish()
     }
 
     companion object {
@@ -205,8 +219,7 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
             }
             // New task needed because don't launch from an Activity context
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or
-                    Intent.FLAG_ACTIVITY_CLEAR_TASK or
+                    Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
             context.startActivity(intent)
         }
     }

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,15 @@ 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.UriUtil.isContributingUser
+import com.kunzisoft.keepass.utils.UriUtil.openUrl
+import com.kunzisoft.keepass.utils.allowCreateDocumentByStorageAccessFramework
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import java.io.FileNotFoundException
 
@@ -155,8 +163,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         mAdapterDatabaseHistory?.setOnFileDatabaseHistoryOpenListener { fileDatabaseHistoryEntityToOpen ->
             fileDatabaseHistoryEntityToOpen.databaseUri?.let { databaseFileUri ->
                 launchPasswordActivity(
-                        databaseFileUri,
+                    databaseFileUri,
-                        fileDatabaseHistoryEntityToOpen.keyFileUri
+                    fileDatabaseHistoryEntityToOpen.keyFileUri,
+                    fileDatabaseHistoryEntityToOpen.hardwareKey
                 )
             }
         }
@@ -170,23 +179,15 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         }
         fileDatabaseHistoryRecyclerView.adapter = mAdapterDatabaseHistory
 
-        // Load default database if not an orientation change
+        // Load default database the first time
-        if (!(savedInstanceState != null
+        databaseFilesViewModel.doForDefaultDatabase { databaseFileUri ->
-                        && savedInstanceState.containsKey(EXTRA_STAY)
+            launchPasswordActivityWithPath(databaseFileUri)
-                        && savedInstanceState.getBoolean(EXTRA_STAY, false))) {
-            val databasePath = PreferencesUtil.getDefaultDatabasePath(this)
-
-            UriUtil.parse(databasePath)?.let { databaseFileUri ->
-                launchPasswordActivityWithPath(databaseFileUri)
-            } ?: run {
-                Log.i(TAG, "No default database to prepare")
-            }
         }
 
         // 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 +226,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         }
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
         super.onDatabaseRetrieved(database)
         if (database != null) {
             launchGroupActivityIfLoaded(database)
@@ -233,7 +234,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     }
 
     override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
         actionTask: String,
         result: ActionRunnable.Result
     ) {
@@ -244,13 +245,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 +270,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 +289,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 +302,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                 mAutofillActivityResultLauncher)
     }
 
-    private fun launchGroupActivityIfLoaded(database: Database) {
+    private fun launchGroupActivityIfLoaded(database: ContextualDatabase) {
         if (database.loaded) {
             GroupActivity.launch(this,
                 database,
@@ -320,19 +313,10 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         }
     }
 
-    override fun onValidateSpecialMode() {
-        super.onValidateSpecialMode()
-        finish()
-    }
-
-    override fun onCancelSpecialMode() {
-        super.onCancelSpecialMode()
-        finish()
-    }
-
     private fun launchPasswordActivityWithPath(databaseUri: Uri) {
-        launchPasswordActivity(databaseUri, null)
+        launchPasswordActivity(databaseUri, null, null)
         // Delete flickering for kitkat <=
+        @Suppress("DEPRECATION")
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
             overridePendingTransition(0, 0)
     }
@@ -341,12 +325,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{
@@ -374,8 +358,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        // only to keep the current activity
-        outState.putBoolean(EXTRA_STAY, true)
         // to retrieve the URI of a created database after an orientation change
         outState.putParcelable(EXTRA_DATABASE_URI, mDatabaseFileUri)
     }
@@ -441,7 +423,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)
@@ -450,7 +432,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     companion object {
 
         private const val TAG = "FileDbSelectActivity"
-        private const val EXTRA_STAY = "EXTRA_STAY"
         private const val EXTRA_DATABASE_URI = "EXTRA_DATABASE_URI"
 
         /*

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,25 @@ 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.DataTime
 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 +96,30 @@ 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.utils.KeyboardUtil.showKeyboard
-import com.kunzisoft.keepass.view.*
+import com.kunzisoft.keepass.utils.TimeUtil.datePickerToDataDate
+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.updateLockPaddingStart
 import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
 import com.kunzisoft.keepass.viewmodels.GroupViewModel
-import org.joda.time.DateTime
+import org.joda.time.LocalDateTime
 
 
 class GroupActivity : DatabaseLockActivity(),
-        DatePickerDialog.OnDateSetListener,
-        TimePickerDialog.OnTimeSetListener,
         GroupFragment.NodeClickListener,
         GroupFragment.NodesActionMenuListener,
         GroupFragment.OnScrollListener,
@@ -99,18 +128,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
@@ -124,8 +154,6 @@ class GroupActivity : DatabaseLockActivity(),
 
     private var mBreadcrumbAdapter: BreadcrumbAdapter? = null
 
-    private var mSearchMenuItem: MenuItem? = null
-
     private var mGroupFragment: GroupFragment? = null
     private var mRecyclingBinEnabled = false
     private var mRecyclingBinIsCurrentGroup = false
@@ -138,6 +166,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
@@ -177,22 +206,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
@@ -202,6 +225,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()
@@ -212,7 +251,6 @@ class GroupActivity : DatabaseLockActivity(),
     }
 
     private fun removeSearch() {
-        finishNodeAction()
         mSearchState = null
         intent.removeExtra(AUTO_SEARCH_KEY)
         if (Intent.ACTION_SEARCH == intent.action) {
@@ -238,23 +276,30 @@ 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(applyToStatusBar = true) {
+            drawerLayout?.applyWindowInsets(WindowInsetPosition.TOP_BOTTOM_IME)
+            footer?.applyWindowInsets(WindowInsetPosition.BOTTOM_IME)
+        }
+
         lockView?.setOnClickListener {
             lockAndExit()
         }
@@ -297,14 +342,15 @@ class GroupActivity : DatabaseLockActivity(),
                     R.id.menu_save_copy_to -> {
                         mExternalFileHelper?.createDocument(
                             getString(R.string.database_file_name_default) +
-                            getString(R.string.database_file_name_copy) +
+                                    "_" +
-                            mDatabase?.defaultFileExtension)
+                                    LocalDateTime.now().toString() +
+                                    mDatabase?.defaultFileExtension)
                     }
                     R.id.menu_lock_all -> {
                         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))
@@ -316,43 +362,6 @@ class GroupActivity : DatabaseLockActivity(),
 
         searchFiltersView?.closeAdvancedFilters()
 
-        mBreadcrumbAdapter = BreadcrumbAdapter(this).apply {
-            // Open group on breadcrumb click
-            onItemClickListener = { node, _ ->
-                // If last item & not a virtual root group
-                val currentGroup = mMainGroup
-                if (currentGroup != null && node == currentGroup
-                    && (currentGroup != mDatabase?.rootGroup
-                            || mDatabase?.rootGroupIsVirtual == false)
-                ) {
-                    finishNodeAction()
-                    launchDialogToShowGroupInfo(currentGroup)
-                } else {
-                    if (mGroupFragment?.nodeActionSelectionMode == true) {
-                        finishNodeAction()
-                    }
-                    mDatabase?.let { database ->
-                        onNodeClick(database, node)
-                    }
-                }
-            }
-            onLongItemClickListener = { node, position ->
-                val currentGroup = mMainGroup
-                if (currentGroup != null && node == currentGroup
-                    && (currentGroup != mDatabase?.rootGroup
-                            || mDatabase?.rootGroupIsVirtual == false)
-                ) {
-                    finishNodeAction()
-                    launchDialogForGroupUpdate(currentGroup)
-                } else {
-                    onItemClickListener?.invoke(node, position)
-                }
-            }
-        }
-        breadcrumbListView?.apply {
-            adapter = mBreadcrumbAdapter
-        }
-
         // Retrieve group if defined at launch
         manageIntent(intent)
 
@@ -363,7 +372,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)
             }
         }
@@ -371,9 +380,8 @@ class GroupActivity : DatabaseLockActivity(),
         // Retrieve previous groups
         if (savedInstanceState != null && savedInstanceState.containsKey(PREVIOUS_GROUPS_IDS_KEY)) {
             try {
-                mPreviousGroupsIds =
+                mPreviousGroupsIds = savedInstanceState.getParcelableList(PREVIOUS_GROUPS_IDS_KEY)
-                    (savedInstanceState.getParcelableArray(PREVIOUS_GROUPS_IDS_KEY)
+                    ?: mutableListOf()
-                        ?.map { it as GroupState })?.toMutableList() ?: mutableListOf()
             } catch (e: Exception) {
                 Log.e(TAG, "Unable to retrieve previous groups", e)
             }
@@ -409,20 +417,14 @@ class GroupActivity : DatabaseLockActivity(),
             val currentGroup = it.group
             mCurrentGroup = currentGroup
             if (currentGroup.isVirtual) {
-                val searchParameters = it.searchParameters
+                mSearchState = SearchState(
-                mSearchState = SearchState(searchParameters, it.showFromPosition)
+                    it.searchParameters,
+                    it.showFromPosition
+                )
             }
             // Main and search groups in activity are managed with another variables
             // to keep values during orientation
 
-            // Expand the search view if defined in settings
-            if (mRequestStartupSearch
-                && PreferencesUtil.automaticallyFocusSearch(this@GroupActivity)) {
-                // To request search only one time
-                mRequestStartupSearch = false
-                mSearchMenuItem?.expandActionView()
-            }
-
             loadingView?.hideByFading()
         }
 
@@ -438,18 +440,20 @@ class GroupActivity : DatabaseLockActivity(),
         mGroupEditViewModel.requestDateTimeSelection.observe(this) { dateInstant ->
             if (dateInstant.type == DateInstant.Type.TIME) {
                 // Launch the time picker
-                val dateTime = DateTime(dateInstant.date)
+                MaterialTimePicker.Builder().build().apply {
-                TimePickerFragment.getInstance(dateTime.hourOfDay, dateTime.minuteOfHour)
+                    addOnPositiveButtonClickListener {
-                    .show(supportFragmentManager, "TimePickerFragment")
+                        mGroupEditViewModel.selectTime(DataTime(this.hour, this.minute))
+                    }
+                    show(supportFragmentManager, "TimePickerFragment")
+                }
             } else {
                 // Launch the date picker
-                val dateTime = DateTime(dateInstant.date)
+                MaterialDatePicker.Builder.datePicker().build().apply {
-                DatePickerFragment.getInstance(
+                    addOnPositiveButtonClickListener {
-                    dateTime.year,
+                        mGroupEditViewModel.selectDate(datePickerToDataDate(it))
-                    dateTime.monthOfYear - 1,
+                    }
-                    dateTime.dayOfMonth
+                    show(supportFragmentManager, "DatePickerFragment")
-                )
+                }
-                    .show(supportFragmentManager, "DatePickerFragment")
             }
         }
 
@@ -483,14 +487,12 @@ class GroupActivity : DatabaseLockActivity(),
                     EntrySelectionHelper.doSpecialAction(intent,
                         {
                             mMainGroup?.nodeId?.let { currentParentGroupId ->
-                                mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
+                                EntryEditActivity.launchToCreate(
-                                    EntryEditActivity.launchToCreate(
+                                    this@GroupActivity,
-                                        this@GroupActivity,
+                                    database,
-                                        database,
+                                    currentParentGroupId,
-                                        currentParentGroupId,
+                                    mEntryActivityResultLauncher
-                                        resultLauncher
+                                )
-                                    )
-                                }
                             }
                         },
                         {
@@ -578,9 +580,46 @@ class GroupActivity : DatabaseLockActivity(),
         }
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
         super.onDatabaseRetrieved(database)
 
+        mBreadcrumbAdapter = BreadcrumbAdapter(this, database).apply {
+            // Open group on breadcrumb click
+            onItemClickListener = { node, _ ->
+                // If last item & not a virtual root group
+                val currentGroup = mMainGroup
+                if (currentGroup != null && node == currentGroup
+                    && (currentGroup != mDatabase?.rootGroup
+                            || mDatabase?.rootGroupIsVirtual == false)
+                ) {
+                    finishNodeAction()
+                    launchDialogToShowGroupInfo(currentGroup)
+                } else {
+                    if (mGroupFragment?.nodeActionSelectionMode == true) {
+                        finishNodeAction()
+                    }
+                    mDatabase?.let { database ->
+                        onNodeClick(database, node)
+                    }
+                }
+            }
+            onLongItemClickListener = { node, position ->
+                val currentGroup = mMainGroup
+                if (currentGroup != null && node == currentGroup
+                    && (currentGroup != mDatabase?.rootGroup
+                            || mDatabase?.rootGroupIsVirtual == false)
+                ) {
+                    finishNodeAction()
+                    launchDialogForGroupUpdate(currentGroup)
+                } else {
+                    onItemClickListener?.invoke(node, position)
+                }
+            }
+        }
+        breadcrumbListView?.apply {
+            adapter = mBreadcrumbAdapter
+        }
+
         mGroupEditViewModel.setGroupNamesNotAllowed(database?.groupNamesNotAllowed)
 
         mRecyclingBinEnabled = !mDatabaseReadOnly
@@ -622,15 +661,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()
+        var entry: Entry? = null
-        result.data?.getBundle(NEW_NODES_KEY)?.let { newNodesBundle ->
+        try {
-            newNodes = getListNodesFromBundle(database, newNodesBundle)
+            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) {
@@ -647,27 +690,15 @@ class GroupActivity : DatabaseLockActivity(),
                             // Save not used
                         },
                         {
-                            try {
+                            // Keyboard selection
-                                val entry = newNodes[0] as Entry
+                            entry?.let {
-                                entrySelectedForKeyboardSelection(database, entry)
+                                entrySelectedForKeyboardSelection(database, it)
-                            } catch (e: Exception) {
-                                Log.e(
-                                    TAG,
-                                    "Unable to perform action for keyboard selection after entry update",
-                                    e
-                                )
                             }
                         },
                         { _, _ ->
-                            try {
+                            // Autofill selection
-                                val entry = newNodes[0] as Entry
+                            entry?.let {
-                                entrySelectedForAutofillSelection(database, entry)
+                                entrySelectedForAutofillSelection(database, it)
-                            } catch (e: Exception) {
-                                Log.e(
-                                    TAG,
-                                    "Unable to perform action for autofill selection after entry update",
-                                    e
-                                )
                             }
                         },
                         {
@@ -676,26 +707,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)
+        coordinatorError?.showActionErrorIfNeeded(result)
-        if (!result.isSuccess) {
+
-            reloadCurrentGroup()
+        // Reload the group
-        }
+        loadGroup()
         finishNodeAction()
     }
 
@@ -716,21 +733,27 @@ 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)
                 mSearchState = SearchState(PreferencesUtil.getDefaultSearchParameters(this).apply {
                     searchQuery = stringQuery
                 }, mSearchState?.firstVisibleItem ?: 0)
+            } else if (mRequestStartupSearch
+                && PreferencesUtil.automaticallyFocusSearch(this@GroupActivity)) {
+                // Expand the search view if defined in settings
+                // To request search only one time
+                mRequestStartupSearch = false
+                addSearch()
             }
-            loadGroup()
         }
     }
 
@@ -742,7 +765,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)
         }
@@ -803,7 +826,7 @@ class GroupActivity : DatabaseLockActivity(),
     }
 
     override fun onNodeClick(
-        database: Database,
+        database: ContextualDatabase,
         node: Node
     ) {
         when (node.type) {
@@ -817,7 +840,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")
             }
@@ -826,22 +848,22 @@ class GroupActivity : DatabaseLockActivity(),
                 val entryVersioned = node as Entry
                 EntrySelectionHelper.doSpecialAction(intent,
                     {
-                        mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
+                        EntryActivity.launch(
-                            EntryActivity.launch(
+                            this@GroupActivity,
-                                this@GroupActivity,
+                            database,
-                                database,
+                            entryVersioned.nodeId,
-                                entryVersioned.nodeId,
+                            mEntryActivityResultLauncher
-                                resultLauncher
+                        )
-                            )
+                        // 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 ->
@@ -852,6 +874,7 @@ class GroupActivity : DatabaseLockActivity(),
                             updateEntryWithSearchInfo(database, entryVersioned, searchInfo)
                         }
                         entrySelectedForKeyboardSelection(database, entryVersioned)
+                        loadGroup()
                     },
                     { searchInfo, _ ->
                         if (!database.isReadOnly
@@ -861,23 +884,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) {
+    private fun entrySelectedForSave(database: ContextualDatabase, entry: Entry, searchInfo: SearchInfo) {
-        reloadCurrentGroup()
+        removeSearch()
         // Save to update the entry
         EntryEditActivity.launchToUpdateForSave(
             this@GroupActivity,
@@ -888,8 +911,8 @@ class GroupActivity : DatabaseLockActivity(),
         onLaunchActivitySpecialMode()
     }
 
-    private fun entrySelectedForKeyboardSelection(database: Database, entry: Entry) {
+    private fun entrySelectedForKeyboardSelection(database: ContextualDatabase, entry: Entry) {
-        reloadCurrentGroup()
+        removeSearch()
         // Populate Magikeyboard with entry
         MagikeyboardService.populateKeyboardAndMoveAppToBackground(
             this,
@@ -898,7 +921,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(
@@ -911,11 +935,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,
@@ -927,7 +951,7 @@ class GroupActivity : DatabaseLockActivity(),
     }
 
     private fun updateEntryWithSearchInfo(
-        database: Database,
+        database: ContextualDatabase,
         entry: Entry,
         searchInfo: SearchInfo
     ) {
@@ -944,30 +968,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()) {
@@ -993,7 +999,7 @@ class GroupActivity : DatabaseLockActivity(),
     }
 
     override fun onOpenMenuClick(
-        database: Database,
+        database: ContextualDatabase,
         node: Node
     ): Boolean {
         finishNodeAction()
@@ -1002,7 +1008,7 @@ class GroupActivity : DatabaseLockActivity(),
     }
 
     override fun onEditMenuClick(
-        database: Database,
+        database: ContextualDatabase,
         node: Node
     ): Boolean {
         finishNodeAction()
@@ -1011,17 +1017,14 @@ class GroupActivity : DatabaseLockActivity(),
                 launchDialogForGroupUpdate(node as Group)
             }
             Type.ENTRY -> {
-                mGroupFragment?.mEntryActivityResultLauncher?.let { resultLauncher ->
+                EntryEditActivity.launchToUpdate(
-                    EntryEditActivity.launchToUpdate(
+                    this@GroupActivity,
-                        this@GroupActivity,
+                    database,
-                        database,
+                    (node as Entry).nodeId,
-                        (node as Entry).nodeId,
+                    mEntryActivityResultLauncher
-                        resultLauncher
+                )
-                    )
-                }
             }
         }
-        reloadGroupIfSearch()
         return true
     }
 
@@ -1050,27 +1053,27 @@ class GroupActivity : DatabaseLockActivity(),
     }
 
     override fun onCopyMenuClick(
-        database: Database,
+        database: ContextualDatabase,
         nodes: List<Node>
     ): Boolean {
         actionNodeMode?.invalidate()
-
+        removeSearch()
-        // Nothing here fragment calls onPasteMenuClick internally
+        loadGroup()
         return true
     }
 
     override fun onMoveMenuClick(
-        database: Database,
+        database: ContextualDatabase,
         nodes: List<Node>
     ): Boolean {
         actionNodeMode?.invalidate()
-
+        removeSearch()
-        // Nothing here fragment calls onPasteMenuClick internally
+        loadGroup()
         return true
     }
 
     override fun onPasteMenuClick(
-        database: Database,
+        database: ContextualDatabase,
         pasteMode: GroupFragment.PasteMode?,
         nodes: List<Node>
     ): Boolean {
@@ -1095,24 +1098,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?,
+    override fun onAskMainCredentialDialogPositiveClick(
-                                                        mainCredential: MainCredential) {
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) {
         databaseUri?.let {
             mergeDatabaseFrom(it, mainCredential)
         }
     }
 
-    override fun onAskMainCredentialDialogNegativeClick(databaseUri: Uri?,
+    override fun onAskMainCredentialDialogNegativeClick(
-                                                        mainCredential: MainCredential) { }
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) { }
 
     override fun onResume() {
         super.onResume()
@@ -1124,7 +1130,9 @@ class GroupActivity : DatabaseLockActivity(),
             View.GONE
         }
         // Padding if lock button visible
-        toolbarAction?.updateLockPaddingLeft()
+        toolbarAction?.updateLockPaddingStart()
+
+        loadGroup()
     }
 
     override fun onPause() {
@@ -1137,8 +1145,9 @@ class GroupActivity : DatabaseLockActivity(),
 
     private fun addSearchQueryInSearchView(searchQuery: String) {
         searchView?.setOnQueryTextListener(null)
+        if (mAutoSearch)
+            searchView?.clearFocus()
         searchView?.setQuery(searchQuery, false)
-        searchView?.clearFocus()
         searchView?.setOnQueryTextListener(mOnSearchQueryTextListener)
     }
 
@@ -1181,10 +1190,10 @@ class GroupActivity : DatabaseLockActivity(),
         // Get the SearchView and set the searchable configuration
         menu.findItem(R.id.menu_search)?.let {
             mLockSearchListeners = true
-            mSearchMenuItem = it
             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)
@@ -1200,13 +1209,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)
@@ -1325,6 +1335,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) {
@@ -1341,12 +1357,7 @@ class GroupActivity : DatabaseLockActivity(),
         }
     }
 
-    private fun reloadCurrentGroup() {
+    override fun onDatabaseBackPressed() {
-        removeSearch()
-        loadGroup()
-    }
-
-    override fun onBackPressed() {
         if (mGroupFragment?.nodeActionSelectionMode == true) {
             finishNodeAction()
         } else {
@@ -1354,8 +1365,8 @@ class GroupActivity : DatabaseLockActivity(),
             if (mRootGroup != null && mRootGroup != mCurrentGroup) {
                 when {
                     Intent.ACTION_SEARCH == intent.action -> {
-                        // Remove the search
+                        removeSearch()
-                        reloadCurrentGroup()
+                        loadGroup()
                     }
                     mPreviousGroupsIds.isEmpty() -> {
                         super.onRegularBackPressed()
@@ -1373,7 +1384,6 @@ class GroupActivity : DatabaseLockActivity(),
                 EntrySelectionHelper.removeInfoFromIntent(intent)
                 if (PreferencesUtil.isLockDatabaseWhenBackButtonOnRootClicked(this)) {
                     lockAndExit()
-                    super.onRegularBackPressed()
                 } else {
                     backToTheAppCaller()
                 }
@@ -1387,8 +1397,7 @@ class GroupActivity : DatabaseLockActivity(),
     ) : Parcelable {
 
         private constructor(parcel: Parcel) : this(
-            parcel.readParcelable<SearchParameters>
+            parcel.readParcelableCompat<SearchParameters>() ?: SearchParameters(),
-                (SearchParameters::class.java.classLoader) ?: SearchParameters(),
             parcel.readInt()
         )
 
@@ -1416,7 +1425,7 @@ class GroupActivity : DatabaseLockActivity(),
     ) : Parcelable {
 
         private constructor(parcel: Parcel) : this(
-            parcel.readParcelable<NodeId<*>>(NodeId::class.java.classLoader),
+            parcel.readParcelableCompat<NodeId<*>>(),
             parcel.readInt()
         )
 
@@ -1481,7 +1490,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launch(context: Context,
-                   database: Database,
+                   database: ContextualDatabase,
                    autoSearch: Boolean = false) {
             if (database.loaded) {
                 checkTimeAndBuildIntent(context, null) { intent ->
@@ -1497,7 +1506,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launchForSearchResult(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                   searchInfo: SearchInfo,
                                   autoSearch: Boolean = false) {
             if (database.loaded) {
@@ -1518,7 +1527,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launchForSaveResult(context: Context,
-                                database: Database,
+                                database: ContextualDatabase,
                                 searchInfo: SearchInfo,
                                 autoSearch: Boolean = false) {
             if (database.loaded && !database.isReadOnly) {
@@ -1539,7 +1548,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launchForKeyboardSelectionResult(context: Context,
-                                             database: Database,
+                                             database: ContextualDatabase,
                                              searchInfo: SearchInfo? = null,
                                              autoSearch: Boolean = false) {
             if (database.loaded) {
@@ -1561,7 +1570,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,
@@ -1586,7 +1595,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launchForRegistration(context: Context,
-                                  database: Database,
+                                  database: ContextualDatabase,
                                   registerInfo: RegisterInfo? = null) {
             if (database.loaded && !database.isReadOnly) {
                 checkTimeAndBuildIntent(context, null) { intent ->
@@ -1606,7 +1615,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launch(activity: AppCompatActivity,
-                   database: Database,
+                   database: ContextualDatabase,
                    onValidateSpecialMode: () -> Unit,
                    onCancelSpecialMode: () -> Unit,
                    onLaunchActivitySpecialMode: () -> Unit,

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.view.updateLockPaddingStart
 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) {
@@ -204,7 +212,7 @@ class IconPickerActivity : DatabaseLockActivity() {
         }
 
         // Padding if lock button visible
-        toolbar.updateLockPaddingLeft()
+        toolbar.updateLockPaddingStart()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -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())
                 }
             }
         }

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
 

app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt

@@ -18,7 +18,7 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.fragments.KeyGeneratorFragment
 import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.updateLockPaddingLeft
+import com.kunzisoft.keepass.view.updateLockPaddingStart
 import com.kunzisoft.keepass.viewmodels.KeyGeneratorViewModel
 
 class KeyGeneratorActivity : DatabaseLockActivity() {
@@ -84,7 +84,7 @@ class KeyGeneratorActivity : DatabaseLockActivity() {
         }
 
         // Padding if lock button visible
-        toolbar.updateLockPaddingLeft()
+        toolbar.updateLockPaddingStart()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -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 {

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
@@ -32,7 +32,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.CompoundButton
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
@@ -43,55 +42,72 @@ import androidx.appcompat.widget.Toolbar
 import androidx.biometric.BiometricManager
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.commit
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity.Companion.UI_VISIBLE_DURING_LOCK
 import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.biometric.AdvancedUnlockFragment
+import com.kunzisoft.keepass.biometric.DeviceUnlockFragment
-import com.kunzisoft.keepass.biometric.AdvancedUnlockManager
+import com.kunzisoft.keepass.biometric.DeviceUnlockManager
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.biometric.deviceUnlockError
+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.model.*
+import com.kunzisoft.keepass.hardware.HardwareKey
+import com.kunzisoft.keepass.model.CipherDecryptDatabase
+import com.kunzisoft.keepass.model.CipherEncryptDatabase
+import com.kunzisoft.keepass.model.CredentialStorage
+import com.kunzisoft.keepass.model.RegisterInfo
+import com.kunzisoft.keepass.model.SearchInfo
 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.viewmodels.AdvancedUnlockViewModel
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
+import com.kunzisoft.keepass.viewmodels.DeviceUnlockState
+import com.kunzisoft.keepass.viewmodels.DeviceUnlockViewModel
+import kotlinx.coroutines.launch
 import java.io.FileNotFoundException
 
 
-class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener {
+class MainCredentialActivity : DatabaseModeActivity() {
 
     // 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
     private var infoContainerView: ViewGroup? = null
     private lateinit var coordinatorLayout: CoordinatorLayout
-    private var advancedUnlockFragment: AdvancedUnlockFragment? = null
+    private var deviceUnlockFragment: DeviceUnlockFragment? = null
 
     private val mDatabaseFileViewModel: DatabaseFileViewModel by viewModels()
-    private val mAdvancedUnlockViewModel: AdvancedUnlockViewModel by viewModels()
+    private val mDeviceUnlockViewModel: DeviceUnlockViewModel by viewModels()
 
     private val mPasswordActivityEducation = PasswordActivityEducation(this)
 
@@ -101,6 +117,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 +139,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 +152,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,29 +169,20 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
         // If is a view intent
         getUriFromIntent(intent)
 
-        // Init Biometric elements
+        // Show appearance
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        logotypeButton?.setOnClickListener {
-            advancedUnlockButton?.setOnClickListener {
+            startActivity(Intent(this, AppearanceSettingsActivity::class.java))
-                startActivity(Intent(this, SettingsAdvancedUnlockActivity::class.java))
-            }
-        }
-        advancedUnlockFragment = supportFragmentManager
-                .findFragmentByTag(UNLOCK_FRAGMENT_TAG) as? AdvancedUnlockFragment?
-        if (advancedUnlockFragment == null) {
-            advancedUnlockFragment = AdvancedUnlockFragment()
-            supportFragmentManager.commit {
-                replace(R.id.fragment_advanced_unlock_container_view,
-                        advancedUnlockFragment!!,
-                        UNLOCK_FRAGMENT_TAG)
-            }
         }
 
         // Listen password checkbox to init advanced unlock and confirmation button
-        mainCredentialView?.onPasswordChecked =
+        mainCredentialView?.onConditionToStoreCredentialChanged = { _, verified ->
-            CompoundButton.OnCheckedChangeListener { _, _ ->
+            mDeviceUnlockViewModel.checkConditionToStoreCredential(
-                mAdvancedUnlockViewModel.checkUnlockAvailability()
+                condition = verified,
-                enableConfirmationButton()
+                databaseFileUri = mDatabaseFileUri
-            }
+            )
+            // TODO Async by ViewModel
+            enableConfirmationButton()
+        }
 
         // Observe if default database
         mDatabaseFileViewModel.isDefaultDatabase.observe(this) { isDefaultDatabase ->
@@ -204,28 +216,83 @@ 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)
+        }
+
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                mDeviceUnlockViewModel.uiState.collect { uiState ->
+                    // New value received
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        uiState.credentialRequiredCipher?.let { cipher ->
+                            mDeviceUnlockViewModel.encryptCredential(
+                                credential = getCredentialForEncryption(),
+                                cipher = cipher
+                            )
+                        }
+                    }
+                    uiState.cipherEncryptDatabase?.let { cipherEncryptDatabase ->
+                        onCredentialEncrypted(cipherEncryptDatabase)
+                        mDeviceUnlockViewModel.consumeCredentialEncrypted()
+                    }
+                    uiState.cipherDecryptDatabase?.let { cipherDecryptDatabase ->
+                        onCredentialDecrypted(cipherDecryptDatabase)
+                        mDeviceUnlockViewModel.consumeCredentialDecrypted()
+                    }
+                    uiState.exception?.let { error ->
+                        Snackbar.make(
+                            coordinatorLayout,
+                            deviceUnlockError(error, this@MainCredentialActivity),
+                            Snackbar.LENGTH_LONG
+                        ).asError().show()
+                        mDeviceUnlockViewModel.exceptionShown()
+                    }
+                }
+            }
         }
     }
 
     override fun onResume() {
         super.onResume()
 
+        // Init Biometric elements only if allowed
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+            && PreferencesUtil.isAdvancedUnlockEnable(this)) {
+            deviceUnlockFragment = supportFragmentManager
+                .findFragmentByTag(UNLOCK_FRAGMENT_TAG) as? DeviceUnlockFragment?
+            if (deviceUnlockFragment == null) {
+                deviceUnlockFragment = DeviceUnlockFragment().also {
+                    supportFragmentManager.commit {
+                        replace(
+                            R.id.fragment_advanced_unlock_container_view,
+                            it,
+                            UNLOCK_FRAGMENT_TAG
+                        )
+                    }
+                }
+            }
+        }
+
         mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this@MainCredentialActivity)
+        mRememberHardwareKey = PreferencesUtil.rememberHardwareKey(this@MainCredentialActivity)
 
         // Back to previous keyboard is setting activated
         if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this@MainCredentialActivity)) {
             sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
         }
 
-        // Don't allow auto open prompt if lock become when UI visible
-        if (DatabaseLockActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true) {
-            mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = false
-        }
-
         mDatabaseFileUri?.let { databaseFileUri ->
             mDatabaseFileViewModel.loadDatabaseFile(databaseFileUri)
         }
@@ -235,7 +302,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,113 +319,105 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
     }
 
     override fun onDatabaseActionFinished(
-        database: Database,
+        database: ContextualDatabase,
         actionTask: String,
         result: ActionRunnable.Result
     ) {
         super.onDatabaseActionFinished(database, actionTask, result)
         when (actionTask) {
             ACTION_DATABASE_LOAD_TASK -> {
-                // Recheck advanced unlock if error
-                mAdvancedUnlockViewModel.initAdvancedUnlockMode()
-
                 if (result.isSuccess) {
                     launchGroupActivityIfLoaded(database)
                 } else {
                     mainCredentialView?.requestPasswordFocus()
+                    // Manage special exceptions
+                    when (result.exception) {
+                        is DuplicateUuidDatabaseException -> {
+                            // Relaunch loading if we need to fix UUID
+                            showLoadDatabaseDuplicateUuidMessage {
 
-                    var resultError = ""
+                                var databaseUri: Uri? = null
-                    val resultException = result.exception
+                                var mainCredential = MainCredential()
-                    val resultMessage = result.message
+                                var readOnly = true
+                                var cipherEncryptDatabase: CipherEncryptDatabase? = null
 
-                    if (resultException != null) {
+                                result.data?.let { resultData ->
-                        resultError = resultException.getLocalizedMessage(resources)
+                                    databaseUri = resultData.getParcelableCompat(DATABASE_URI_KEY)
-
+                                    mainCredential =
-                        when (resultException) {
+                                        resultData.getParcelableCompat(MAIN_CREDENTIAL_KEY)
-                            is DuplicateUuidDatabaseException -> {
+                                            ?: mainCredential
-                                // Relaunch loading if we need to fix UUID
+                                    readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                showLoadDatabaseDuplicateUuidMessage {
+                                    cipherEncryptDatabase =
-
+                                        resultData.getParcelableCompat(CIPHER_DATABASE_KEY)
-                                    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
-                                        )
-                                    }
                                 }
-                            }
+
-                            is FileNotFoundDatabaseException -> {
+                                databaseUri?.let { databaseFileUri ->
-                                // Remove this default database inaccessible
+                                    showProgressDialogAndLoadDatabase(
-                                if (mDefaultDatabase) {
+                                        databaseFileUri,
-                                    mDatabaseFileViewModel.removeDefaultDatabase()
+                                        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
+        if (action == VIEW_INTENT) {
-                && action == VIEW_INTENT) {
+            fillCredentials(
-            mDatabaseFileUri = intent.data
+                intent.data,
-            mainCredentialView?.populateKeyFileTextView(UriUtil.getUriFromIntent(intent, KEY_KEYFILE))
+                intent.getUri(KEY_KEYFILE),
+                HardwareKey.getHardwareKeyFromString(intent.getStringExtra(KEY_HARDWARE_KEY))
+            )
         } else {
-            mDatabaseFileUri = intent?.getParcelableExtra(KEY_FILENAME)
+            fillCredentials(
-            intent?.getParcelableExtra<Uri?>(KEY_KEYFILE)?.let {
+                intent?.getParcelableExtraCompat(KEY_FILENAME),
-                mainCredentialView?.populateKeyFileTextView(it)
+                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)
+            mDeviceUnlockViewModel.allowAutoOpenBiometricPrompt = true
+            clearCredentialsViews(clearKeyFile = true, clearHardwareKey = true)
             GroupActivity.launch(this,
                 database,
                 { onValidateSpecialMode() },
@@ -369,33 +428,6 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
         }
     }
 
-    override fun onValidateSpecialMode() {
-        super.onValidateSpecialMode()
-        finish()
-    }
-
-    override fun onCancelSpecialMode() {
-        super.onCancelSpecialMode()
-        finish()
-    }
-
-    override fun retrieveCredentialForEncryption(): ByteArray {
-        return mainCredentialView?.retrieveCredentialForStorage(credentialStorageListener)
-            ?: byteArrayOf()
-    }
-
-    override fun conditionToStoreCredential(): Boolean {
-        return mainCredentialView?.conditionToStoreCredential() == true
-    }
-
-    override fun onCredentialEncrypted(cipherEncryptDatabase: CipherEncryptDatabase) {
-        // Load the database if password is registered with biometric
-        loadDatabase(mDatabaseFileUri,
-            mainCredentialView?.getMainCredential(),
-            cipherEncryptDatabase
-        )
-    }
-
     private val credentialStorageListener = object: MainCredentialView.CredentialStorageListener {
         override fun passwordToStore(password: String?): ByteArray? {
             return password?.toByteArray()
@@ -412,13 +444,26 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
         }
     }
 
-    override fun onCredentialDecrypted(cipherDecryptDatabase: CipherDecryptDatabase) {
+    private fun getCredentialForEncryption(): ByteArray {
+        return mainCredentialView?.retrieveCredentialForStorage(credentialStorageListener)
+            ?: byteArrayOf()
+    }
+
+    private fun onCredentialEncrypted(cipherEncryptDatabase: CipherEncryptDatabase) {
+        // Load the database if password is registered with biometric
+        loadDatabase(mDatabaseFileUri,
+            mainCredentialView?.getMainCredential(),
+            cipherEncryptDatabase
+        )
+    }
+
+    private fun onCredentialDecrypted(cipherDecryptDatabase: CipherDecryptDatabase) {
         // Load the database if password is retrieve from biometric
         // Retrieve from biometric
         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
@@ -433,14 +478,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
@@ -455,7 +509,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
             loadDatabase()
         } else {
             // Init Biometric elements
-            mAdvancedUnlockViewModel.databaseFileLoaded(databaseFileUri)
+            mDeviceUnlockViewModel.databaseFileLoaded(databaseFileUri)
         }
 
         enableConfirmationButton()
@@ -472,17 +526,20 @@ 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)
         }
     }
 
     override fun onPause() {
         // Reinit locking activity UI variable
-        DatabaseLockActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
+        UI_VISIBLE_DURING_LOCK = false
-
         super.onPause()
     }
 
@@ -611,7 +668,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
             try {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                     && !readOnlyEducationPerformed) {
-                    val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(this)
+                    val biometricCanAuthenticate = DeviceUnlockManager.canAuthenticate(this)
                     if ((biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
                             || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
                             && advancedUnlockButton != null) {
@@ -621,7 +678,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
                                 startActivity(
                                     Intent(
                                         this,
-                                        SettingsAdvancedUnlockActivity::class.java
+                                        AdvancedUnlockSettingsActivity::class.java
                                     )
                                 )
                             },
@@ -666,18 +723,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)
         }
 
@@ -690,8 +753,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
         @Throws(FileNotFoundException::class)
         fun launch(activity: Activity,
                    databaseFile: Uri,
-                   keyFile: Uri?) {
+                   keyFile: Uri?,
-            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                   hardwareKey: HardwareKey?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                 activity.startActivity(intent)
             }
         }
@@ -706,8 +770,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,
@@ -725,8 +790,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,
@@ -744,8 +810,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,
@@ -764,10 +831,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,
@@ -785,8 +853,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,
@@ -802,6 +871,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
         fun launch(activity: AppCompatActivity,
                    databaseUri: Uri,
                    keyFile: Uri?,
+                   hardwareKey: HardwareKey?,
                    fileNoFoundAction: (exception: FileNotFoundException) -> Unit,
                    onCancelSpecialMode: () -> Unit,
                    onLaunchActivitySpecialMode: () -> Unit,
@@ -810,43 +880,67 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
             try {
                 EntrySelectionHelper.doSpecialAction(activity.intent,
                         {
-                            MainCredentialActivity.launch(activity,
+                            launch(
-                                    databaseUri, keyFile)
+                                activity,
+                                databaseUri,
+                                keyFile,
+                                hardwareKey
+                            )
                         },
                         { searchInfo -> // Search Action
-                            MainCredentialActivity.launchForSearchResult(activity,
+                            launchForSearchResult(
-                                    databaseUri, keyFile,
+                                activity,
-                                    searchInfo)
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                searchInfo
+                            )
                             onLaunchActivitySpecialMode()
                         },
                         { searchInfo -> // Save Action
-                            MainCredentialActivity.launchForSaveResult(activity,
+                            launchForSaveResult(
-                                    databaseUri, keyFile,
+                                activity,
-                                    searchInfo)
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                searchInfo
+                            )
                             onLaunchActivitySpecialMode()
                         },
                         { searchInfo -> // Keyboard Selection Action
-                            MainCredentialActivity.launchForKeyboardResult(activity,
+                            launchForKeyboardResult(
-                                    databaseUri, keyFile,
+                                activity,
-                                    searchInfo)
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                searchInfo
+                            )
                             onLaunchActivitySpecialMode()
                         },
                         { searchInfo, autofillComponent -> // Autofill Selection Action
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                MainCredentialActivity.launchForAutofillResult(activity,
+                                launchForAutofillResult(
-                                        databaseUri, keyFile,
+                                    activity,
-                                        autofillActivityResultLauncher,
+                                    databaseUri,
-                                        autofillComponent,
+                                    keyFile,
-                                        searchInfo)
+                                    hardwareKey,
+                                    autofillActivityResultLauncher,
+                                    autofillComponent,
+                                    searchInfo
+                                )
                                 onLaunchActivitySpecialMode()
                             } else {
                                 onCancelSpecialMode()
                             }
                         },
                         { registerInfo -> // Registration Action
-                            MainCredentialActivity.launchForRegistration(activity,
+                            launchForRegistration(
-                                    databaseUri, keyFile,
+                                activity,
-                                    registerInfo)
+                                databaseUri,
+                                keyFile,
+                                hardwareKey,
+                                registerInfo
+                            )
                             onLaunchActivitySpecialMode()
                         }
                 )

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,9 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
 
-            val oldSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelable(OLD_FILE_DATABASE_INFO)
+            val oldSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelableCompat(OLD_FILE_DATABASE_INFO)
-            val newSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelable(NEW_FILE_DATABASE_INFO)
+            val newSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelableCompat(NEW_FILE_DATABASE_INFO)
+            val readOnlyDatabase: Boolean = arguments?.getBoolean(READ_ONLY_DATABASE) ?: true
 
             if (oldSnapFileDatabaseInfo != null && newSnapFileDatabaseInfo != null) {
                 // Use the Builder class for convenient dialog construction
@@ -53,7 +55,13 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
                     stringBuilder.append("\n\n" +oldSnapFileDatabaseInfo.toString(activity)
                             + "\n→\n" +
                             newSnapFileDatabaseInfo.toString(activity) + "\n\n")
-                    stringBuilder.append(getString(R.string.warning_database_info_changed_options))
+                    stringBuilder.append(getString(
+                        if (readOnlyDatabase) {
+                            R.string.warning_database_info_changed_options_read_only
+                        } else {
+                            R.string.warning_database_info_changed_options
+                        }
+                    ))
                 } else {
                     stringBuilder.append(getString(R.string.warning_database_revoked))
                 }
@@ -76,14 +84,18 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
         const val DATABASE_CHANGED_DIALOG_TAG = "databaseChangedDialogFragment"
         private const val OLD_FILE_DATABASE_INFO = "OLD_FILE_DATABASE_INFO"
         private const val NEW_FILE_DATABASE_INFO = "NEW_FILE_DATABASE_INFO"
+        private const val READ_ONLY_DATABASE = "READ_ONLY_DATABASE"
 
         fun getInstance(oldSnapFileDatabaseInfo: SnapFileDatabaseInfo,
-                        newSnapFileDatabaseInfo: SnapFileDatabaseInfo)
+                        newSnapFileDatabaseInfo: SnapFileDatabaseInfo,
+                        readOnly: Boolean
+        )
         : DatabaseChangedDialogFragment {
             val fragment = DatabaseChangedDialogFragment()
             fragment.arguments = Bundle().apply {
                 putParcelable(OLD_FILE_DATABASE_INFO, oldSnapFileDatabaseInfo)
                 putParcelable(NEW_FILE_DATABASE_INFO, newSnapFileDatabaseInfo)
+                putBoolean(READ_ONLY_DATABASE, readOnly)
             }
             return fragment
         }

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt

@@ -1,11 +1,14 @@
 package com.kunzisoft.keepass.activities.dialogs
 
 import android.os.Bundle
+import android.view.View
+import android.view.WindowManager.LayoutParams.FLAG_SECURE
 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.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
@@ -13,7 +16,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)
@@ -29,6 +32,18 @@ abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {
         }
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        // Screenshot mode or hide views
+        context?.let {
+            if (PreferencesUtil.isScreenshotModeEnabled(it)) {
+                dialog?.window?.clearFlags(FLAG_SECURE)
+            } else {
+                dialog?.window?.setFlags(FLAG_SECURE, FLAG_SECURE)
+            }
+        }
+    }
+
     @Suppress("DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
@@ -36,12 +51,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
     ) {

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)
-                }
-            }
-        }
-    }
-}

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

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()
             }
 

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) { _, _ ->

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
                     }
                 }
             }

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt

@@ -24,23 +24,27 @@ 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
 import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
 import com.tokenautocomplete.FilteredArrayAdapter
-import org.joda.time.DateTime
 
 class GroupEditDialogFragment : DatabaseDialogFragment() {
 
@@ -85,29 +89,21 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
             mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
         }
 
-        mGroupEditViewModel.onDateSelected.observe(this) { viewModelDate ->
+        mGroupEditViewModel.onDateSelected.observe(this) { date ->
             // Save the date
-            mGroupInfo.expiryTime = DateInstant(
+            mGroupInfo.expiryTime.setDate(date.year, date.month, date.day)
-                DateTime(mGroupInfo.expiryTime.date)
-                    .withYear(viewModelDate.year)
-                    .withMonthOfYear(viewModelDate.month + 1)
-                    .withDayOfMonth(viewModelDate.day)
-                    .toDate())
             expirationView.dateTime = mGroupInfo.expiryTime
             if (expirationView.dateTime.type == DateInstant.Type.DATE_TIME) {
-                val instantTime = DateInstant(mGroupInfo.expiryTime.date, DateInstant.Type.TIME)
                 // Trick to recall selection with time
-                mGroupEditViewModel.requestDateTimeSelection(instantTime)
+                mGroupEditViewModel.requestDateTimeSelection(
+                    DateInstant(mGroupInfo.expiryTime.instant, DateInstant.Type.TIME)
+                )
             }
         }
 
         mGroupEditViewModel.onTimeSelected.observe(this) { viewModelTime ->
             // Save the time
-            mGroupInfo.expiryTime = DateInstant(
+            mGroupInfo.expiryTime.setTime(viewModelTime.hour, viewModelTime.minute)
-                DateTime(mGroupInfo.expiryTime.date)
-                    .withHourOfDay(viewModelTime.hours)
-                    .withMinuteOfHour(viewModelTime.minutes)
-                    .toDate(), mGroupInfo.expiryTime.type)
             expirationView.dateTime = mGroupInfo.expiryTime
         }
 
@@ -116,7 +112,7 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         }
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
         super.onDatabaseRetrieved(database)
 
         mPopulateIconMethod = { imageView, icon ->
@@ -170,13 +166,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
                     }
                 }
             }
@@ -252,11 +248,7 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
 
     private fun retrieveGroupInfoFromViews() {
         mGroupInfo.title = nameTextView.text.toString()
-        // Only if there
+        mGroupInfo.notes = notesTextView.text?.toString()
-        val newNotes = notesTextView.text.toString()
-        if (newNotes.isNotEmpty()) {
-            mGroupInfo.notes = newNotes
-        }
         mGroupInfo.expires = expirationView.activation
         mGroupInfo.expiryTime = expirationView.dateTime
         mGroupInfo.searchable = searchableView.getValue()

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
                     }
                 }
             }

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.database.MainCredential
-import com.kunzisoft.keepass.utils.UriUtil
+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)

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 databaseUri: Uri? = savedInstanceState?.getParcelableCompat(DATABASE_URI_KEY)
-        val mainCredential: MainCredential = savedInstanceState?.getParcelable(MAIN_CREDENTIAL) ?: MainCredential()
+        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,
+        fun getInstance(
-                        mainCredential: MainCredential): SortDialogFragment {
+            databaseUri: Uri,
+            mainCredential: MainCredential
+        ): SortDialogFragment {
             val fragment = SortDialogFragment()
             fragment.arguments = Bundle().apply {
                 putParcelable(DATABASE_URI_KEY, databaseUri)

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)

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?.getParcelableCompat(KEY_FILE_URI),
-                        arguments?.getParcelable(KEY_ENTRY_ATTACHMENT))
+                        arguments?.getParcelableCompat(KEY_ENTRY_ATTACHMENT))
             }
             builder.setNegativeButton(android.R.string.cancel) { _, _ ->
                 dismiss()

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt

@@ -35,28 +35,41 @@ 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.PasswordEditView
 import com.kunzisoft.keepass.view.applyFontVisibility
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.security.SecureRandom
+
 
 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 passwordEditView: PasswordEditView
+    private lateinit var passwordRepeatTextInputLayout: TextInputLayout
+    private lateinit var passwordRepeatView: TextView
 
-    private var passKeyView: PassKeyView? = null
+    private lateinit var keyFileCheckBox: CompoundButton
-    private var passwordRepeatTextInputLayout: TextInputLayout? = null
+    private lateinit var keyFileGenerateButton: View
-    private var passwordRepeatView: TextView? = null
+    private lateinit var keyFileSelectionView: KeyFileSelectionView
 
-    private var keyFileCheckBox: CompoundButton? = null
+    private lateinit var hardwareKeyCheckBox: CompoundButton
-    private var keyFileSelectionView: KeyFileSelectionView? = null
+    private lateinit var hardwareKeySelectionView: HardwareKeySelectionView
 
     private var mListener: AssignMainCredentialDialogListener? = null
 
@@ -67,13 +80,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 +128,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 +142,73 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                     .setPositiveButton(android.R.string.ok) { _, _ -> }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
-            rootView?.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
+            rootView.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
-                UriUtil.gotoUrl(activity, R.string.credentials_explanation_url)
+                activity.openUrl(R.string.credentials_explanation_url)
             }
 
-            passwordCheckBox = rootView?.findViewById(R.id.password_checkbox)
+            passwordCheckBox = rootView.findViewById(R.id.password_checkbox)
-            passKeyView = rootView?.findViewById(R.id.password_view)
+            passwordEditView = rootView.findViewById(R.id.password_view)
-            passwordRepeatTextInputLayout = rootView?.findViewById(R.id.password_repeat_input_layout)
+            passwordRepeatTextInputLayout = rootView.findViewById(R.id.password_repeat_input_layout)
-            passwordRepeatView = rootView?.findViewById(R.id.password_confirmation)
+            passwordRepeatView = rootView.findViewById(R.id.password_confirmation)
-            passwordRepeatView?.applyFontVisibility()
+            passwordRepeatView.applyFontVisibility()
 
-            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
+            keyFileCheckBox = rootView.findViewById(R.id.keyfile_checkbox)
-            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)
+            keyFileGenerateButton = rootView.findViewById(R.id.keyfile_generate)
+            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?.buildCreateDocument { createdFileUri ->
+                createdFileUri?.let { uri ->
+                    createKeyFile(uri)
+                    keyFileSelectionView.error = null
+                    keyFileCheckBox.isChecked = true
+                    keyFileSelectionView.uri = uri
+                }
+            }
             mExternalFileHelper?.buildOpenDocument { uri ->
                 uri?.let { pathUri ->
-                    UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
+                    pathUri.getDocumentFile(requireContext())?.length()?.let { lengthFile ->
-                        keyFileSelectionView?.error = null
+                        keyFileSelectionView.error = null
-                        keyFileCheckBox?.isChecked = true
+                        keyFileCheckBox.isChecked = true
-                        keyFileSelectionView?.uri = pathUri
+                        keyFileSelectionView.uri = pathUri
-                        if (lengthFile <= 0L) {
+                        showLengthKeyFileConfirmationDialog(lengthFile)
-                            showEmptyKeyFileConfirmationDialog()
-                        }
                     }
                 }
             }
-            keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)
+            keyFileGenerateButton.setOnClickListener {
+                mExternalFileHelper?.createDocument(DEFAULT_KEYFILE_NAME)
+            }
+            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) {
+                    mMasterPassword = ""
-                dialog.setOnShowListener { dialog1 ->
+                    mKeyFileUri = null
-                    val positiveButton = (dialog1 as AlertDialog).getButton(DialogInterface.BUTTON_POSITIVE)
+                    mHardwareKey = null
-                    positiveButton.setOnClickListener {
 
-                        mMasterPassword = ""
+                    approveMainCredential()
-                        mKeyFile = null
+                }
-
+                val negativeButton = dialog1.getButton(DialogInterface.BUTTON_NEGATIVE)
-                        var error = verifyPassword() || verifyKeyFile()
+                negativeButton.setOnClickListener {
-                        if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
+                    mListener?.onAssignKeyDialogNegativeClick(retrieveMainCredential())
-                            error = true
+                    dismiss()
-                            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()
-                    }
                 }
             }
 
@@ -194,67 +218,123 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
         return super.onCreateDialog(savedInstanceState)
     }
 
+    private fun createKeyFile(uri: Uri) {
+        CoroutineScope(Dispatchers.IO).launch {
+            activity?.contentResolver?.openOutputStream(uri)?.use { outputStream ->
+                val randomBytes = ByteArray(DEFAULT_KEYFILE_SIZE)
+                SecureRandom().nextBytes(randomBytes)
+                outputStream.write(randomBytes)
+            }
+        }
+    }
+
+    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 = passwordEditView.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 masterPassword = if (passwordCheckBox.isChecked) mMasterPassword else null
-        val keyFile = if (keyFileCheckBox!!.isChecked) mKeyFile else null
+        val keyFileUri = if (keyFileCheckBox.isChecked) mKeyFileUri else null
-        return MainCredential(masterPassword, keyFile)
+        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)
+        passwordEditView.addTextChangedListener(passwordTextWatcher)
     }
 
     override fun onPause() {
         super.onPause()
 
-        passKeyView?.removeTextChangedListener(passwordTextWatcher)
+        passwordEditView.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
     }
 
     private fun showEmptyPasswordConfirmationDialog() {
@@ -262,10 +342,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())
-                            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
+                        this@SetMainCredentialDialogFragment.dismiss()
-                            this@SetMainCredentialDialogFragment.dismiss()
-                        }
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
             mEmptyPasswordConfirmationDialog = builder.create()
@@ -287,21 +365,31 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
         }
     }
 
-    private fun showEmptyKeyFileConfirmationDialog() {
+    private fun showLengthKeyFileConfirmationDialog(length: Long) {
         activity?.let {
             val builder = AlertDialog.Builder(it)
             builder.setMessage(SpannableStringBuilder().apply {
-                append(getString(R.string.warning_empty_keyfile))
-                append("\n\n")
                 append(getString(R.string.warning_empty_keyfile_explanation))
-                append("\n\n")
+                var warning = false
-                append(getString(R.string.warning_sure_add_file))
+                if (length <= 0L) {
-                })
+                    warning = true
-                    .setPositiveButton(android.R.string.ok) { _, _ -> }
+                    append("\n\n")
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    append(getString(R.string.warning_empty_keyfile))
-                        keyFileCheckBox?.isChecked = false
+                } else if (length > 10485760L) {
-                        keyFileSelectionView?.uri = null
+                    warning = true
-                    }
+                    append("\n\n")
+                    append(getString(R.string.warning_large_keyfile))
+                }
+                if (warning) {
+                    append("\n\n")
+                    append(getString(R.string.warning_sure_add_file))
+                }
+            })
+                .setPositiveButton(android.R.string.ok) { _, _ -> }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    keyFileCheckBox.isChecked = false
+                    keyFileSelectionView.uri = null
+                }
             mEmptyKeyFileConfirmationDialog = builder.create()
             mEmptyKeyFileConfirmationDialog?.show()
         }
@@ -310,6 +398,8 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
     companion object {
 
         private const val ALLOW_NO_MASTER_KEY_ARG = "ALLOW_NO_MASTER_KEY_ARG"
+        private const val DEFAULT_KEYFILE_NAME = "keyfile.bin"
+        private const val DEFAULT_KEYFILE_SIZE = 128
 
         fun getInstance(allowNoMasterKey: Boolean): SetMainCredentialDialogFragment {
             val fragment = SetMainCredentialDialogFragment()

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
@@ -42,10 +41,13 @@ import com.kunzisoft.keepass.otp.OtpElement.Companion.MAX_TOTP_PERIOD
 import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_HOTP_COUNTER
 import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_OTP_DIGITS
 import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_TOTP_PERIOD
+import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_OTP_SECRET
 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 +128,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 +208,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 {
@@ -223,6 +225,9 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
             }
             otpAlgorithmSpinner?.adapter = otpAlgorithmAdapter
 
+            // Ensure that the UX does not prevent user from hiding/unhiding text
+            otpSecretContainer?.errorIconDrawable = null
+
             // Set the default value of OTP element
             upgradeType()
             upgradeTokenType()
@@ -242,7 +247,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()
@@ -309,11 +314,16 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
         otpSecretTextView?.addTextChangedListener(object: TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 s?.toString()?.let { userString ->
-                    try {
+                    if (userString.length >= MIN_OTP_SECRET) {
-                        mOtpElement.setBase32Secret(userString.uppercase(Locale.ENGLISH))
+                        try {
-                        otpSecretContainer?.error = null
+                            mOtpElement.setBase32Secret(userString.uppercase(Locale.ENGLISH))
-                    } catch (exception: Exception) {
+                            otpSecretContainer?.error = null
-                        otpSecretContainer?.error = getString(R.string.error_otp_secret_key)
+                        } catch (exception: Exception) {
+                            otpSecretContainer?.error = getString(R.string.error_otp_secret_key)
+                        }
+                    } else {
+                        otpSecretContainer?.error = getString(R.string.error_otp_secret_length,
+                            MIN_OTP_SECRET)
                     }
                     mSecretWellFormed = otpSecretContainer?.error == null
                 }
@@ -470,4 +480,4 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
             }
         }
     }
-}
+}

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)
-                }
-            }
-        }
-    }
-}

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() {

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()

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.ContextualDatabase
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 
-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
     ) {

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)
+        return inflater.inflate(R.layout.fragment_entry_edit, container, false)
-                .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())
     }
 
     /* -------------

app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt

@@ -14,20 +14,21 @@ 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
 import com.kunzisoft.keepass.view.showByFading
 import com.kunzisoft.keepass.viewmodels.EntryViewModel
-import java.util.*
 
 class EntryFragment: DatabaseFragment() {
 
@@ -58,8 +59,7 @@ class EntryFragment: DatabaseFragment() {
                               savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
 
-        return inflater.cloneInContext(contextThemed)
+        return inflater.inflate(R.layout.fragment_entry, container, false)
-            .inflate(R.layout.fragment_entry, container, false)
     }
     
     override fun onViewCreated(view: View,
@@ -133,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
@@ -158,11 +158,9 @@ class EntryFragment: DatabaseFragment() {
 
             setOnCopyActionClickListener { field ->
                 mClipboardHelper?.timeoutCopyToClipboard(
+                    TemplateField.getLocalizedName(context, field.name),
                     field.protectedValue.stringValue,
-                    getString(
+                    field.protectedValue.isProtected
-                        R.string.copy_field,
-                        TemplateField.getLocalizedName(context, field.name)
-                    )
                 )
             }
         }
@@ -251,8 +249,7 @@ class EntryFragment: DatabaseFragment() {
 
     fun launchEntryCopyEducationAction() {
         val appNameString = getString(R.string.app_name)
-        mClipboardHelper?.timeoutCopyToClipboard(appNameString,
+        mClipboardHelper?.timeoutCopyToClipboard(appNameString, appNameString)
-            getString(R.string.copy_field, appNameString))
     }
 
     companion object {

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)
+        return inflater.inflate(R.layout.fragment_entry_history, container, false)
-            .inflate(R.layout.fragment_entry_history, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

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?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
-        super.onCreate(savedInstanceState)
-
-        setHasOptionsMenu(true)
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
         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) {
+                        override fun onNodeClick(database: ContextualDatabase, node: Node) {
-                            if (mCurrentGroup?.isVirtual == false
+                            if (nodeActionSelectionMode) {
-                                && 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 {
+                        override fun onNodeLongClick(database: ContextualDatabase, node: Node): Boolean {
-                            if (mCurrentGroup?.isVirtual == false
+                            if (nodeActionPasteMode == PasteMode.UNDEFINED) {
-                                && 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)
+        return inflater.inflate(R.layout.fragment_nodes, container, false)
-                .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) {
+    fun actionNodesCallback(database: ContextualDatabase,
-        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,
                             nodes: List<Node>,
                             menuListener: NodesActionMenuListener?,
                             onDestroyActionMode: (mode: ActionMode?) -> Unit) : ActionMode.Callback {
@@ -363,14 +346,12 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                     }
 
                     // Move
-                    if (database.isReadOnly
+                    if (database.isReadOnly) {
-                            || isASearchResult) {
                         menu?.removeItem(R.id.menu_move)
                     }
 
                     // Copy (not allowed for group)
                     if (database.isReadOnly
-                            || isASearchResult
                             || nodes.any { it.type == Type.GROUP }) {
                         menu?.removeItem(R.id.menu_copy)
                     }
@@ -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 onNodeClick(database: ContextualDatabase, node: Node)
-        fun onNodeSelected(database: Database, nodes: List<Node>): Boolean
+        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 onOpenMenuClick(database: ContextualDatabase, node: Node): Boolean
-        fun onEditMenuClick(database: Database, node: Node): Boolean
+        fun onEditMenuClick(database: ContextualDatabase, node: Node): Boolean
-        fun onCopyMenuClick(database: Database, nodes: List<Node>): Boolean
+        fun onCopyMenuClick(database: ContextualDatabase, nodes: List<Node>): Boolean
-        fun onMoveMenuClick(database: Database, nodes: List<Node>): Boolean
+        fun onMoveMenuClick(database: ContextualDatabase, nodes: List<Node>): Boolean
-        fun onDeleteMenuClick(database: Database, nodes: List<Node>): Boolean
+        fun onDeleteMenuClick(database: ContextualDatabase, nodes: List<Node>): Boolean
-        fun onPasteMenuClick(database: Database, pasteMode: PasteMode?, nodes: List<Node>): Boolean
+        fun onPasteMenuClick(database: ContextualDatabase, pasteMode: PasteMode?, nodes: List<Node>): Boolean
     }
 
     enum class PasteMode {

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)
         }

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 {

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

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)
         }

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
     }
 

app/src/main/java/com/kunzisoft/keepass/activities/fragments/PassphraseGeneratorFragment.kt

@@ -30,16 +30,16 @@ 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
-import com.kunzisoft.keepass.view.PassKeyView
+import com.kunzisoft.keepass.view.PasswordEditView
 import com.kunzisoft.keepass.viewmodels.KeyGeneratorViewModel
 
 class PassphraseGeneratorFragment : DatabaseFragment() {
 
-    private lateinit var passKeyView: PassKeyView
+    private lateinit var passwordEditView: PasswordEditView
 
     private lateinit var sliderWordCount: Slider
     private lateinit var wordCountText: EditText
@@ -62,7 +62,7 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        passKeyView = view.findViewById(R.id.passphrase_view)
+        passwordEditView = view.findViewById(R.id.passphrase_view)
         val passphraseCopyView: ImageView? = view.findViewById(R.id.passphrase_copy_button)
         sliderWordCount = view.findViewById(R.id.slider_word_count)
         wordCountText = view.findViewById(R.id.word_count)
@@ -73,14 +73,16 @@ 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)
             passphraseCopyView?.setOnClickListener {
-                clipboardHelper.timeoutCopyToClipboard(passKeyView.passwordString,
+                clipboardHelper.timeoutCopyToClipboard(
-                    getString(R.string.copy_field,
+                    getString(R.string.passphrase),
-                        getString(R.string.entry_password)))
+                    passwordEditView.passwordString,
+                    true
+                )
             }
 
             wordCaseAdapter = ArrayAdapter(context,
@@ -144,7 +146,7 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
         generatePassphrase()
 
         mKeyGeneratorViewModel.passphraseGeneratedValidated.observe(viewLifecycleOwner) {
-            mKeyGeneratorViewModel.setKeyGenerated(passKeyView.passwordString)
+            mKeyGeneratorViewModel.setKeyGenerated(passwordEditView.passwordString)
         }
 
         mKeyGeneratorViewModel.requirePassphraseGeneration.observe(viewLifecycleOwner) {
@@ -217,7 +219,7 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
         } catch (e: Exception) {
             Log.e(TAG, "Unable to generate a passphrase", e)
         }
-        passKeyView.passwordString = passphrase
+        passwordEditView.passwordString = passphrase
         charactersCountText.text = getString(R.string.character_count, passphrase.length)
     }
 
@@ -242,7 +244,7 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
         }
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
         // Nothing here
     }
 

app/src/main/java/com/kunzisoft/keepass/activities/fragments/PasswordGeneratorFragment.kt

@@ -32,16 +32,16 @@ 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
-import com.kunzisoft.keepass.view.PassKeyView
+import com.kunzisoft.keepass.view.PasswordEditView
 import com.kunzisoft.keepass.viewmodels.KeyGeneratorViewModel
 
 class PasswordGeneratorFragment : DatabaseFragment() {
 
-    private lateinit var passKeyView: PassKeyView
+    private lateinit var passwordEditView: PasswordEditView
 
     private lateinit var sliderLength: Slider
     private lateinit var lengthEditView: EditText
@@ -74,7 +74,7 @@ class PasswordGeneratorFragment : DatabaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        passKeyView = view.findViewById(R.id.password_view)
+        passwordEditView = view.findViewById(R.id.password_view)
         val passwordCopyView: ImageView? = view.findViewById(R.id.password_copy_button)
 
         sliderLength = view.findViewById(R.id.slider_length)
@@ -94,14 +94,16 @@ 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)
             passwordCopyView?.setOnClickListener {
-                clipboardHelper.timeoutCopyToClipboard(passKeyView.passwordString,
+                clipboardHelper.timeoutCopyToClipboard(
-                    getString(R.string.copy_field,
+                    getString(R.string.password),
-                        getString(R.string.entry_password)))
+                    passwordEditView.passwordString,
+                    true
+                )
             }
         }
 
@@ -193,7 +195,7 @@ class PasswordGeneratorFragment : DatabaseFragment() {
         generatePassword()
 
         mKeyGeneratorViewModel.passwordGeneratedValidated.observe(viewLifecycleOwner) {
-            mKeyGeneratorViewModel.setKeyGenerated(passKeyView.passwordString)
+            mKeyGeneratorViewModel.setKeyGenerated(passwordEditView.passwordString)
         }
 
         mKeyGeneratorViewModel.requirePasswordGeneration.observe(viewLifecycleOwner) {
@@ -308,7 +310,7 @@ class PasswordGeneratorFragment : DatabaseFragment() {
         } catch (e: Exception) {
             Log.e(TAG, "Unable to generate a password", e)
         }
-        passKeyView.passwordString = password
+        passwordEditView.passwordString = password
     }
 
     override fun onDestroy() {
@@ -316,7 +318,7 @@ class PasswordGeneratorFragment : DatabaseFragment() {
         super.onDestroy()
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
+    override fun onDatabaseRetrieved(database: ContextualDatabase?) {
         // Nothing here
     }
 

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?
+        return intent.getEnumExtra<SpecialMode>(KEY_SPECIAL_MODE) ?: SpecialMode.DEFAULT
-                ?: 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)

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

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.ContextualDatabase
-import com.kunzisoft.keepass.database.element.Database
+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,
+    fun createDatabase(
-                       mainCredential: MainCredential) {
+        databaseUri: Uri,
+        mainCredential: MainCredential
+    ) {
         mDatabaseTaskProvider?.startDatabaseCreate(databaseUri, mainCredential)
     }
 
-    fun loadDatabase(databaseUri: Uri,
+    fun loadDatabase(
-                     mainCredential: MainCredential,
+        databaseUri: Uri,
-                     readOnly: Boolean,
+        mainCredential: MainCredential,
-                     cipherEncryptDatabase: CipherEncryptDatabase?,
+        readOnly: Boolean,
-                     fixDuplicateUuid: 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() {

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt

@@ -24,6 +24,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -35,22 +36,25 @@ 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
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.*
+import com.kunzisoft.keepass.utils.LOCK_ACTION
+import com.kunzisoft.keepass.utils.LockReceiver
+import com.kunzisoft.keepass.utils.closeDatabase
+import com.kunzisoft.keepass.utils.registerLockReceiver
+import com.kunzisoft.keepass.utils.unregisterLockReceiver
 import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import com.kunzisoft.keepass.viewmodels.NodesViewModel
-import java.util.*
+import java.util.UUID
 
 abstract class DatabaseLockActivity : DatabaseModeActivity(),
     PasswordEncodingDialogFragment.Listener {
@@ -66,8 +70,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)
 
@@ -89,8 +91,8 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
             mDatabaseTaskProvider?.startDatabaseSave(save)
         }
 
-        mDatabaseViewModel.mergeDatabase.observe(this) {
+        mDatabaseViewModel.mergeDatabase.observe(this) { save ->
-            mDatabaseTaskProvider?.startDatabaseMerge()
+            mDatabaseTaskProvider?.startDatabaseMerge(save)
         }
 
         mDatabaseViewModel.reloadDatabase.observe(this) { fixDuplicateUuid ->
@@ -166,7 +168,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
@@ -186,8 +188,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
                     mLockReceiver = LockReceiver {
                         mDatabase = null
                         closeDatabase(database)
-                        if (LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == null)
+                        UI_VISIBLE_DURING_LOCK = UI_VISIBLE
-                            LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
                         mExitLock = true
                         closeOptionsMenu()
                         finish()
@@ -206,16 +207,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
     ) {
@@ -226,6 +235,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()
@@ -234,15 +246,19 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
         }
     }
 
-    override fun onPasswordEncodingValidateListener(databaseUri: Uri?,
+    override fun onPasswordEncodingValidateListener(
-                                                    mainCredential: MainCredential) {
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) {
         assignDatabasePassword(databaseUri, mainCredential)
     }
 
-    private fun assignDatabasePassword(databaseUri: Uri?,
+    private fun assignDatabasePassword(
-                                       mainCredential: MainCredential) {
+        databaseUri: Uri?,
+        mainCredential: MainCredential
+    ) {
         if (databaseUri != null) {
-            mDatabaseTaskProvider?.startDatabaseAssignPassword(databaseUri, mainCredential)
+            mDatabaseTaskProvider?.startDatabaseAssignCredential(databaseUri, mainCredential)
         }
     }
 
@@ -250,7 +266,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)
@@ -269,11 +285,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() {
@@ -302,7 +318,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) {
@@ -318,7 +334,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
@@ -401,7 +417,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
 
         invalidateOptionsMenu()
 
-        LOCKING_ACTIVITY_UI_VISIBLE = true
+        UI_VISIBLE = true
     }
 
     protected fun checkTimeAndLockIfTimeoutOrResetTimeout(action: (() -> Unit)? = null) {
@@ -416,7 +432,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
     }
 
     override fun onPause() {
-        LOCKING_ACTIVITY_UI_VISIBLE = false
+        UI_VISIBLE = false
 
         super.onPause()
 
@@ -433,9 +449,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
 
     protected fun lockAndExit() {
         // Ask confirmation if modification not saved
-        if (mDatabase?.isReadOnly == false
+        if (mDatabase?.dataModifiedSinceLastLoading == true) {
-            && mDatabase?.dataModifiedSinceLastLoading == true
-            && !PreferencesUtil.isAutoSaveDatabaseEnabled(this)) {
             AlertDialog.Builder(this)
                 .setMessage(R.string.discard_changes)
                 .setNegativeButton(android.R.string.cancel, null)
@@ -452,14 +466,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()
         }
     }
 
@@ -470,8 +484,8 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
         const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
         const val TIMEOUT_ENABLE_KEY_DEFAULT = true
 
-        private var LOCKING_ACTIVITY_UI_VISIBLE = false
+        var UI_VISIBLE: Boolean = false
-        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
+        var UI_VISIBLE_DURING_LOCK: Boolean = false
     }
 }
 
@@ -480,25 +494,33 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
  */
 @SuppressLint("ClickableViewAccessibility")
 fun View.resetAppTimeoutWhenViewTouchedOrFocused(context: Context, databaseLoaded: Boolean?) {
-    // Log.d(DatabaseLockActivity.TAG, "View prepared to reset app timeout")
+    try {
-    setOnTouchListener { _, event ->
+        // Log.d(DatabaseLockActivity.TAG, "View prepared to reset app timeout")
-        when (event.action) {
+        setOnTouchListener { _, event ->
-            MotionEvent.ACTION_DOWN -> {
+            when (event.action) {
-                // Log.d(DatabaseLockActivity.TAG, "View touched, try to reset app timeout")
+                MotionEvent.ACTION_DOWN -> {
-                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
+                    // Log.d(DatabaseLockActivity.TAG, "View touched, try to reset app timeout")
-                    databaseLoaded ?: false)
+                    TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(
+                        context,
+                        databaseLoaded ?: false
+                    )
+                }
+            }
+            false
+        }
+        setOnFocusChangeListener { _, _ ->
+            // Log.d(DatabaseLockActivity.TAG, "View focused, try to reset app timeout")
+            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(
+                context,
+                databaseLoaded ?: false
+            )
+        }
+        if (this is ViewGroup) {
+            for (i in 0..childCount) {
+                getChildAt(i)?.resetAppTimeoutWhenViewTouchedOrFocused(context, databaseLoaded)
             }
         }
-        false
+    } catch (e: Exception) {
-    }
+        Log.e("AppTimeout", "Unable to reset app timeout", e)
-    setOnFocusChangeListener { _, _ ->
-        // Log.d(DatabaseLockActivity.TAG, "View focused, try to reset app timeout")
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-            databaseLoaded ?: false)
-    }
-    if (this is ViewGroup) {
-        for (i in 0..childCount) {
-            getChildAt(i)?.resetAppTimeoutWhenViewTouchedOrFocused(context, databaseLoaded)
-        }
     }
 }

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt

@@ -1,18 +1,16 @@
 package com.kunzisoft.keepass.activities.legacy
 
-import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 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
 
 
 /**
@@ -23,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()
     }
 
     /**
@@ -75,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)
@@ -88,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()
         }
@@ -96,14 +96,19 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
 
     private fun backToTheMainAppAndFinish() {
         // To move the app in background and return to the main app
-        // Not visible as opened with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
         moveTaskToBack(true)
-        // Not finish() to prevent service kill
+        // Not using FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS or finish() because kills the service
     }
 
     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)
     }
@@ -117,8 +122,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
                 ?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
 
         // To show the selection mode
-        mSpecialModeView = findViewById(R.id.special_mode_view)
+        mToolbarSpecial = findViewById(R.id.special_mode_view)
-        mSpecialModeView?.apply {
+        mToolbarSpecial?.apply {
             // Populate title
             val selectionModeStringId = when (mSpecialMode) {
                 SpecialMode.DEFAULT, // Not important because hidden

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 onDatabaseRetrieved(database: ContextualDatabase?)
-    fun onDatabaseActionFinished(database: Database,
+    fun onDatabaseActionFinished(database: ContextualDatabase,
                                  actionTask: String,
                                  result: ActionRunnable.Result)
 }

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
         }
     }

app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt

@@ -21,14 +21,23 @@ package com.kunzisoft.keepass.activities.stylish
 
 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.os.Build
 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
@@ -69,7 +78,18 @@ abstract class StylishActivity : AppCompatActivity() {
             startActivity(intent)
         }
         finish()
-        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+        @Suppress("DEPRECATION")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+            overrideActivityTransition(
+                OVERRIDE_TRANSITION_OPEN,
+                android.R.anim.fade_in,
+                android.R.anim.fade_out
+            )
+        else
+            overridePendingTransition(
+                android.R.anim.fade_in,
+                android.R.anim.fade_out
+            )
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -77,12 +97,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 +135,7 @@ abstract class StylishActivity : AppCompatActivity() {
             Log.d(this.javaClass.name, "Theme change detected, restarting activity")
             recreateActivity()
         }
+        setScreenshotMode(PreferencesUtil.isScreenshotModeEnabled(this))
     }
 
     private fun recreateActivity() {

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
-    }
-}

app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt

@@ -10,6 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.Type
@@ -17,7 +18,7 @@ import com.kunzisoft.keepass.icons.IconDrawableFactory
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.strikeOut
 
-class BreadcrumbAdapter(val context: Context)
+class BreadcrumbAdapter(val context: Context, val database: Database?)
     : RecyclerView.Adapter<BreadcrumbAdapter.BreadcrumbGroupViewHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
@@ -31,6 +32,8 @@ class BreadcrumbAdapter(val context: Context)
     var onItemClickListener: ((item: Node, position: Int)->Unit)? = null
     var onLongItemClickListener: ((item: Node, position: Int)->Unit)? = null
 
+    private var mNodeFilter: NodeFilter = NodeFilter(context, database)
+
     private var mShowNumberEntries = false
     private var mShowUUID = false
     private var mIconColor: Int = 0
@@ -39,10 +42,10 @@ class BreadcrumbAdapter(val context: Context)
         mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
         mShowUUID = PreferencesUtil.showUUID(context)
 
-        // Retrieve the textColor to tint the icon
+        // Retrieve the color to tint the icon
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        val taIconColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnSurface))
-        mIconColor = taTextColor.getColor(0, Color.WHITE)
+        mIconColor = taIconColor.getColor(0, Color.WHITE)
-        taTextColor.recycle()
+        taIconColor.recycle()
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -71,7 +74,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 +115,10 @@ class BreadcrumbAdapter(val context: Context)
 
                 holder.groupNumbersView?.apply {
                     if (mShowNumberEntries) {
-                        group.refreshNumberOfChildEntries(Group.ChildFilter.getDefaults(context))
+                        text = group.getNumberOfChildEntries(
-                        text = group.numberOfChildEntries.toString()
+                            mNodeFilter.recursiveNumberOfEntries,
+                            mNodeFilter.filter
+                        ).toString()
                         visibility = View.VISIBLE
                     } else {
                         visibility = View.GONE

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)
     }
-}
+}

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>() {
 

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 android.widget.CompoundButton
-import androidx.annotation.ColorInt
+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)

app/src/main/java/com/kunzisoft/keepass/adapters/NodeFilter.kt

@@ -0,0 +1,30 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.Group
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.settings.PreferencesUtil
+
+class NodeFilter(
+    context: Context,
+    var database: Database? = null
+) {
+    var recursiveNumberOfEntries = PreferencesUtil.recursiveNumberEntries(context)
+        private set
+    private var showExpired = PreferencesUtil.showExpiredEntries(context)
+    private var showTemplate = PreferencesUtil.showTemplates(context)
+
+    val filter: (Node) -> Boolean = { node ->
+        when (node) {
+            is Entry -> {
+                node.entryKDB?.isMetaStream() != true
+            }
+            is Group -> {
+                showTemplate || database?.templatesGroup != node
+            }
+            else -> true
+        } && (showExpired || !node.isCurrentlyExpires)
+    }
+}

app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt

@@ -20,21 +20,24 @@
 package com.kunzisoft.keepass.adapters
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Color
+import android.os.Build
+import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.ColorInt
+import androidx.core.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,26 +45,29 @@ 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,
+class NodesAdapter (
-                    private val database: Database)
+    private val context: Context,
-    : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {
+    private val database: ContextualDatabase
+) : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {
 
     private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
     private val mNodeSortedListCallback: NodeSortedListCallback
     private val mNodeSortedList: SortedList<Node>
     private val mInflater: LayoutInflater = LayoutInflater.from(context)
+    private val mNodeFilter: NodeFilter = NodeFilter(context, database)
 
     private var mCalculateViewTypeTextSize = Array(2) { true } // number of view type
     private var mTextSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
@@ -78,7 +84,7 @@ class NodesAdapter (private val context: Context,
     private var mShowNumberEntries: Boolean = true
     private var mShowOTP: Boolean = false
     private var mShowUUID: Boolean = false
-    private var mEntryFilters = arrayOf<Group.ChildFilter>()
+    private var mNodeFilters: NodeFilter? = null
     private var mOldVirtualGroup = false
     private var mVirtualGroup = false
 
@@ -86,6 +92,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 +101,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 +120,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))
+        val taColorSecondary = context.obtainStyledAttributes(intArrayOf(R.attr.colorSecondary))
-        this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY)
+        this.mColorSecondary = taColorSecondary.getColor(0, Color.GRAY)
-        taColorAccentLight.recycle()
+        taColorSecondary.recycle()
         // To get text color for selection
-        val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
+        val taColorOnSecondary = context.obtainStyledAttributes(intArrayOf(R.attr.colorOnSecondary))
-        this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE)
+        this.mColorOnSecondary = taColorOnSecondary.getColor(0, Color.WHITE)
-        taColorOnAccentColor.recycle()
+        taColorOnSecondary.recycle()
     }
 
     private fun assignPreferences() {
@@ -152,7 +163,7 @@ class NodesAdapter (private val context: Context,
         this.mShowOTP = PreferencesUtil.showOTPToken(context)
         this.mShowUUID = PreferencesUtil.showUUID(context)
 
-        this.mEntryFilters = Group.ChildFilter.getDefaults(context)
+        this.mNodeFilters = NodeFilter(context, database)
 
         // Reinit textSize for all view type
         mCalculateViewTypeTextSize.forEachIndexed { index, _ -> mCalculateViewTypeTextSize[index] = true }
@@ -165,7 +176,7 @@ class NodesAdapter (private val context: Context,
         mOldVirtualGroup = mVirtualGroup
         mVirtualGroup = group.isVirtual
         assignPreferences()
-        mNodeSortedList.replaceAll(group.getFilteredChildren(mEntryFilters))
+        mNodeSortedList.replaceAll(group.getChildren(mNodeFilter.filter))
     }
 
     private inner class NodeSortedListCallback: SortedListAdapterCallback<Node>(this) {
@@ -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
@@ -193,6 +205,11 @@ class NodesAdapter (private val context: Context,
                     && oldItem.type == newItem.type
                     && oldItem.title == newItem.title
                     && oldItem.icon == newItem.icon
+                    && oldItem.creationTime == newItem.creationTime
+                    && oldItem.lastModificationTime == newItem.lastModificationTime
+                    && oldItem.lastAccessTime == newItem.lastAccessTime
+                    && oldItem.expiryTime == newItem.expiryTime
+                    && oldItem.expires == newItem.expires
                     && oldItem.isCurrentlyExpires == newItem.isCurrentlyExpires
         }
 
@@ -376,10 +393,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.GROUP -> mTextColor
-            Type.ENTRY -> mTextColor
+            Type.ENTRY -> mColorSecondary
         }
 
         // Specific elements for entry
@@ -424,16 +441,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
+            assignBackgroundColor(holder.container, entry)
-            if (!holder.container.isSelected) {
+            assignBackgroundColor(holder.otpContainer, entry)
-                if (backgroundColor != null) {
-                    holder.container.setBackgroundColor(backgroundColor)
-                } else {
-                    holder.container.setBackgroundColor(Color.TRANSPARENT)
-                }
-            } else {
-                holder.container.setBackgroundColor(mColorAccentLight)
-            }
             val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
             if (!holder.container.isSelected) {
                 if (foregroundColor != null) {
@@ -453,12 +462,12 @@ class NodesAdapter (private val context: Context,
                     holder.meta.setTextColor(mTextColor)
                 }
             } else {
-                holder.text.setTextColor(mColorOnAccentColor)
+                holder.text.setTextColor(mColorOnSecondary)
-                holder.subText?.setTextColor(mColorOnAccentColor)
+                holder.subText?.setTextColor(mColorOnSecondary)
-                holder.otpToken?.setTextColor(mColorOnAccentColor)
+                holder.otpToken?.setTextColor(mColorOnSecondary)
-                holder.otpProgress?.setIndicatorColor(mColorOnAccentColor)
+                holder.otpProgress?.setIndicatorColor(mColorOnSecondary)
-                holder.attachmentIcon?.setColorFilter(mColorOnAccentColor)
+                holder.attachmentIcon?.setColorFilter(mColorOnSecondary)
-                holder.meta.setTextColor(mColorOnAccentColor)
+                holder.meta.setTextColor(mColorOnSecondary)
             }
 
             database.stopManageEntry(entry)
@@ -469,7 +478,10 @@ class NodesAdapter (private val context: Context,
             if (mShowNumberEntries) {
                 holder.numberChildren?.apply {
                     text = (subNode as Group)
-                            .numberOfChildEntries
+                            .getNumberOfChildEntries(
+                                mNodeFilter.recursiveNumberOfEntries,
+                                mNodeFilter.filter
+                            )
                             .toString()
                     setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                     visibility = View.VISIBLE
@@ -518,20 +530,41 @@ class NodesAdapter (private val context: Context,
         holder?.otpToken?.apply {
             text = otpElement?.tokenString
             setTextSize(mTextSizeUnit, mOtpTokenTextDefaultDimension, mPrefSizeMultiplier)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                textDirection = View.TEXT_DIRECTION_LTR
+            }
         }
         holder?.otpContainer?.setOnClickListener {
             otpElement?.token?.let { token ->
-                Toast.makeText(
+                try {
-                        context,
+                    mClipboardHelper.copyToClipboard(
-                        context.getString(R.string.copy_field,
+                        TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN),
-                                TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN)),
+                        token,
-                        Toast.LENGTH_LONG
+                        true
-                ).show()
+                    )
-                mClipboardHelper.copyToClipboard(token)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to copy the OTP token", e)
+                }
             }
         }
     }
 
+    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
@@ -561,8 +594,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 onNodeClick(database: ContextualDatabase, node: Node)
-        fun onNodeLongClick(database: Database, node: Node): Boolean
+        fun onNodeLongClick(database: ContextualDatabase, node: Node): Boolean
     }
 
     class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

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
     }
-}
+}

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

app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt

@@ -19,24 +19,28 @@
  */
 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 androidx.core.content.ContextCompat
+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
+        AppDatabase.getDatabase(applicationContext).cipherDatabaseDao()
-                    .getDatabase(applicationContext)
-                    .cipherDatabaseDao()
 
     // Temp DAO to easily remove content if object no longer in memory
     private var useTempDao = PreferencesUtil.isTempAdvancedUnlockEnable(applicationContext)
@@ -66,9 +70,11 @@ class CipherDatabaseAction(context: Context) {
 
     @Synchronized
     private fun attachService(performedAction: () -> Unit) {
-        applicationContext.registerReceiver(mAdvancedUnlockBroadcastReceiver, IntentFilter().apply {
+        ContextCompat.registerReceiver(applicationContext, mAdvancedUnlockBroadcastReceiver,
-            addAction(AdvancedUnlockNotificationService.REMOVE_ADVANCED_UNLOCK_KEY_ACTION)
+            IntentFilter().apply {
-        })
+                addAction(AdvancedUnlockNotificationService.REMOVE_ADVANCED_UNLOCK_KEY_ACTION)
+            }, ContextCompat.RECEIVER_EXPORTED
+        )
 
         mServiceConnection = object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
@@ -83,7 +89,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()
@@ -94,7 +100,7 @@ class CipherDatabaseAction(context: Context) {
     private fun detachService() {
         try {
             applicationContext.unregisterReceiver(mAdvancedUnlockBroadcastReceiver)
-        } catch (e: Exception) {}
+        } catch (_: Exception) {}
 
         mServiceConnection?.let {
             AdvancedUnlockNotificationService.unbindService(applicationContext, it)
@@ -136,11 +142,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 +154,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,18 +169,30 @@ class CipherDatabaseAction(context: Context) {
                                 )
                             }
                         }
-                    },
+                },
-                    {
+                {
-                        cipherDatabaseResultListener.invoke(it)
+                    cipherDatabaseResultListener.invoke(it)
-                    }
+                }
             ).execute()
         }
     }
 
-    fun containsCipherDatabase(databaseUri: Uri,
+    fun containsCipherDatabase(databaseUri: Uri?,
                                contains: (Boolean) -> Unit) {
-        getCipherDatabase(databaseUri) {
+        if (databaseUri == null) {
-            contains.invoke(it != null)
+            contains.invoke(false)
+        } else {
+            getCipherDatabase(databaseUri) {
+                contains.invoke(it != null)
+            }
+        }
+    }
+
+    fun resetCipherParameters(databaseUri: Uri?) {
+        containsCipherDatabase(databaseUri) { contains ->
+            if (contains) {
+                mBinder?.resetTimer()
+            }
         }
     }
 
@@ -183,8 +202,8 @@ class CipherDatabaseAction(context: Context) {
 
             val cipherDatabaseEntity = CipherDatabaseEntity(
                 databaseUri.toString(),
-                Base64.encodeToString(cipherEncryptDatabase.encryptedValue, Base64.NO_WRAP),
+                Base64.encodeToString(cipherEncryptDatabase.encryptedValue, BASE64_FLAG),
-                Base64.encodeToString(cipherEncryptDatabase.specParameters, Base64.NO_WRAP),
+                Base64.encodeToString(cipherEncryptDatabase.specParameters, BASE64_FLAG),
             )
 
             if (useTempDao) {
@@ -222,12 +241,12 @@ class CipherDatabaseAction(context: Context) {
             }
         } else {
             IOActionTask(
-                    {
+                {
-                        cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
+                    cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
-                    },
+                },
-                    {
+                {
-                        cipherDatabaseResultListener?.invoke()
+                    cipherDatabaseResultListener?.invoke()
-                    }
+                }
             ).execute()
         }
     }
@@ -240,9 +259,9 @@ class CipherDatabaseAction(context: Context) {
         }
         // To erase the residues
         IOActionTask(
-                {
+            {
-                    cipherDatabaseDao.deleteAll()
+                cipherDatabaseDao.deleteAll()
-                }
+            }
         ).execute()
         // Unbind
         removeAllDataAndDetach()
@@ -251,4 +270,4 @@ class CipherDatabaseAction(context: Context) {
     companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction) {
         private val TAG = CipherDatabaseAction::class.java.name
     }
-}
+}

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
+            AppDatabase.getDatabase(applicationContext).fileDatabaseHistoryDao()
-                .getDatabase(applicationContext)
-                .fileDatabaseHistoryDao()
 
     fun getDatabaseFile(databaseUri: Uri,
                         databaseFileResult: (DatabaseFile?) -> Unit) {
         IOActionTask(
-                {
+            {
-                    val fileDatabaseHistoryEntity = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                val fileDatabaseHistoryEntity =
-                    val fileDatabaseInfo = FileDatabaseInfo(applicationContext, databaseUri)
+                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
-                    DatabaseFile(
+                val fileDatabaseInfo = FileDatabaseInfo(
-                            databaseUri,
+                    applicationContext,
-                            UriUtil.parse(fileDatabaseHistoryEntity?.keyFileUri),
+                    databaseUri)
-                            UriUtil.decode(fileDatabaseHistoryEntity?.databaseUri),
+                DatabaseFile(
-                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias ?: ""),
+                    databaseUri,
-                            fileDatabaseInfo.exists,
+                    fileDatabaseHistoryEntity?.keyFileUri?.parseUri(),
-                            fileDatabaseInfo.getLastModificationString(),
+                    HardwareKey.getHardwareKeyFromString(fileDatabaseHistoryEntity?.hardwareKey),
-                            fileDatabaseInfo.getSizeString()
+                    fileDatabaseHistoryEntity?.databaseUri?.decodeUri(),
-                    )
+                    fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias
-                },
+                        ?: ""),
-                {
+                    fileDatabaseInfo.exists,
-                    databaseFileResult.invoke(it)
+                    fileDatabaseInfo.getLastModificationString(),
-                }
+                    fileDatabaseInfo.getSizeString()
+                )
+            },
+            {
+                databaseFileResult.invoke(it)
+            }
         ).execute()
     }
 
     fun getKeyFileUriByDatabaseUri(databaseUri: Uri,
                                    keyFileUriResultListener: (Uri?) -> Unit) {
         IOActionTask(
-                {
+            {
-                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
-                },
+            },
-                {
+            {
-                    it?.let { fileHistoryEntity ->
+                it?.let { fileHistoryEntity ->
-                        fileHistoryEntity.keyFileUri?.let { keyFileUri ->
+                    fileHistoryEntity.keyFileUri?.let { keyFileUri ->
-                            keyFileUriResultListener.invoke(UriUtil.parse(keyFileUri))
+                        keyFileUriResultListener.invoke(keyFileUri.parseUri())
-                        }
+                    }
-                    } ?: keyFileUriResultListener.invoke(null)
+                } ?: keyFileUriResultListener.invoke(null)
-                }
+            }
         ).execute()
     }
 
     fun getDatabaseFileList(databaseFileListResult: (List<DatabaseFile>) -> Unit) {
         IOActionTask(
-                {
+            {
-                    val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(applicationContext)
+                val hideBrokenLocations =
-                    // Show only uri accessible
+                    PreferencesUtil.hideBrokenLocations(
-                    val databaseFileListLoaded = ArrayList<DatabaseFile>()
+                        applicationContext)
-                    databaseFileHistoryDao.getAll().forEach { fileDatabaseHistoryEntity ->
+                // Show only uri accessible
-                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext, fileDatabaseHistoryEntity.databaseUri)
+                val databaseFileListLoaded = ArrayList<DatabaseFile>()
-                        if (hideBrokenLocations && fileDatabaseInfo.exists
+                databaseFileHistoryDao.getAll().forEach { fileDatabaseHistoryEntity ->
-                                || !hideBrokenLocations) {
+                    val fileDatabaseInfo = FileDatabaseInfo(
-                            databaseFileListLoaded.add(
+                        applicationContext,
-                                    DatabaseFile(
+                        fileDatabaseHistoryEntity.databaseUri)
-                                            UriUtil.parse(fileDatabaseHistoryEntity.databaseUri),
+                    if (hideBrokenLocations && fileDatabaseInfo.exists
-                                            UriUtil.parse(fileDatabaseHistoryEntity.keyFileUri),
+                        || !hideBrokenLocations
-                                            UriUtil.decode(fileDatabaseHistoryEntity.databaseUri),
+                    ) {
-                                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias),
+                        databaseFileListLoaded.add(
-                                            fileDatabaseInfo.exists,
+                            DatabaseFile(
-                                            fileDatabaseInfo.getLastModificationString(),
+                                fileDatabaseHistoryEntity.databaseUri.parseUri(),
-                                            fileDatabaseInfo.getSizeString()
+                                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,
+            databaseUri,
-                keyFileUri
+            keyFileUri,
+            hardwareKey
         ), databaseFileAddedOrUpdatedResult)
     }
 
     fun addOrUpdateDatabaseFile(databaseFileToAddOrUpdate: DatabaseFile,
                                 databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
         IOActionTask(
-                {
+            {
-                    databaseFileToAddOrUpdate.databaseUri?.let { databaseUri ->
+                databaseFileToAddOrUpdate.databaseUri?.let { databaseUri ->
-                        // Try to get info in database first
+                    // Try to get info in database first
-                        val fileDatabaseHistoryRetrieve = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                    val fileDatabaseHistoryRetrieve =
+                        databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
 
-                        // Complete alias if not exists
+                    // Complete alias if not exists
-                        val fileDatabaseHistory = FileDatabaseHistoryEntity(
+                    val fileDatabaseHistory =
-                                databaseUri.toString(),
+                        FileDatabaseHistoryEntity(
-                                databaseFileToAddOrUpdate.databaseAlias
+                            databaseUri.toString(),
-                                        ?: fileDatabaseHistoryRetrieve?.databaseAlias
+                            databaseFileToAddOrUpdate.databaseAlias
-                                        ?: "",
+                                ?: fileDatabaseHistoryRetrieve?.databaseAlias
-                                databaseFileToAddOrUpdate.keyFileUri?.toString(),
+                                ?: "",
-                                System.currentTimeMillis()
+                            databaseFileToAddOrUpdate.keyFileUri?.toString(),
+                            databaseFileToAddOrUpdate.hardwareKey?.value,
+                            System.currentTimeMillis()
                         )
 
-                        // Update values if history element not yet in the database
+                    // Update values if history element not yet in the database
-                        try {
+                    try {
-                            if (fileDatabaseHistoryRetrieve == null) {
+                        if (fileDatabaseHistoryRetrieve == null) {
-                                    databaseFileHistoryDao.add(fileDatabaseHistory)
+                            databaseFileHistoryDao.add(fileDatabaseHistory)
-                            } else {
+                        } else {
-                                databaseFileHistoryDao.update(fileDatabaseHistory)
+                            databaseFileHistoryDao.update(fileDatabaseHistory)
-                            }
-                        } catch (e: Exception) {
-                            Log.e(TAG, "Unable to add or update database history", e)
                         }
-
+                    } catch (e: Exception) {
-                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext,
+                        Log.e(TAG, "Unable to add or update database history", e)
-                                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()
-                        )
                     }
-                },
+
-                {
+                    val fileDatabaseInfo =
-                    databaseFileAddedOrUpdatedResult?.invoke(it)
+                        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 ->
+                databaseFileToDelete.databaseUri?.let { databaseUri ->
-                        databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())?.let { fileDatabaseHistory ->
+                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                        ?.let { fileDatabaseHistory ->
                             val returnValue = databaseFileHistoryDao.delete(fileDatabaseHistory)
                             if (returnValue > 0) {
                                 DatabaseFile(
-                                        UriUtil.parse(fileDatabaseHistory.databaseUri),
+                                    fileDatabaseHistory.databaseUri.parseUri(),
-                                        UriUtil.parse(fileDatabaseHistory.keyFileUri),
+                                    fileDatabaseHistory.keyFileUri?.parseUri(),
-                                        UriUtil.decode(fileDatabaseHistory.databaseUri),
+                                    HardwareKey.getHardwareKeyFromString(fileDatabaseHistory.hardwareKey),
-                                        databaseFileToDelete.databaseAlias
+                                    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())
+                databaseFileHistoryDao.deleteKeyFileByDatabaseUri(databaseUri.toString())
-                },
+            },
-                {
+            {
-                    result?.invoke()
+                result?.invoke()
-                }
+            }
         ).execute()
     }
 
     fun deleteAllKeyFiles(result: (() ->Unit)? = null) {
         IOActionTask(
-                {
+            {
-                    databaseFileHistoryDao.deleteAllKeyFiles()
+                databaseFileHistoryDao.deleteAllKeyFiles()
-                },
+            },
-                {
+            {
-                    result?.invoke()
+                result?.invoke()
-                }
+            }
         ).execute()
     }
 
     fun deleteAll(result: (() ->Unit)? = null) {
         IOActionTask(
-                {
+            {
-                    databaseFileHistoryDao.deleteAll()
+                databaseFileHistoryDao.deleteAll()
-                },
+            },
-                {
+            {
-                    result?.invoke()
+                result?.invoke()
-                }
+            }
         ).execute()
     }
 

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
 ) {

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?)

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,8 @@ 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
+import kotlin.math.min
 
 
 @RequiresApi(api = Build.VERSION_CODES.O)
@@ -65,10 +70,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,44 +94,90 @@ 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)
+        val remoteViews = RemoteViews(context.packageName, R.layout.item_autofill_entry)
-        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
+        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,
+    private fun Dataset.Builder.addValueToDatasetBuilder(
-                             database: Database,
+        id: AutofillId,
-                             entryInfo: EntryInfo,
+        autofillValue: AutofillValue?
-                             struct: StructureParser.Result,
+    ): Dataset.Builder {
-                             additionalBuild: ((build: Dataset.Builder) -> Unit)? = null): Dataset? {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        val title = makeEntryTitle(entryInfo)
+            setField(
-        val views = newRemoteViews(context, database, title, entryInfo.icon)
+                id, autofillValue?.let {
-        val builder = Dataset.Builder(views)
+                    Field.Builder()
-        builder.setId(entryInfo.id.toString())
+                        .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) {
-            val year = entryInfo.expiryTime.getYearInt()
+            val year = entryInfo.expiryTime.getYear()
-            val month = entryInfo.expiryTime.getMonthInt()
+            val month = entryInfo.expiryTime.getMonth()
             val monthString = month.toString().padStart(2, '0')
             val day = entryInfo.expiryTime.getDay()
             val dayString = day.toString().padStart(2, '0')
@@ -134,9 +185,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.toMilliseconds())
+                    )
                 }
             }
             struct.creditCardExpirationYearId?.let {
@@ -150,34 +207,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 +266,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)
+                    )
                 }
             }
         }
-
+        val dataset = datasetBuilder.build()
-        additionalBuild?.invoke(builder)
+        Log.d(TAG, "Autofill Dataset $dataset created")
-
+        return dataset
-        return try {
-            builder.build()
-        } catch (e: Exception) {
-            // at least one value must be set
-            null
-        }
     }
 
     /**
      * Method to assign a drawable to a new icon from a database icon
      */
     private fun buildIconFromEntry(context: Context,
-                                   database: Database,
+                                   database: ContextualDatabase,
                                    entryInfo: EntryInfo): Icon? {
         try {
             database.iconDrawableFactory.getBitmapFromIcon(context,
@@ -227,10 +311,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? {
@@ -238,10 +322,11 @@ object AutofillHelper {
             val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
             val maxSuggestion = inlineSuggestionsRequest.maxSuggestionCount
 
-            if (positionItem <= maxSuggestion - 1
+            if (positionItem <= maxSuggestion - 1) {
-                && inlinePresentationSpecs.size > positionItem
+
-            ) {
+                // If positionItem is larger than the number of specs in the list, then
-                val inlinePresentationSpec = inlinePresentationSpecs[positionItem]
+                // the last spec is used for the remainder of the suggestions
+                val inlinePresentationSpec = inlinePresentationSpecs[min(positionItem, inlinePresentationSpecs.size - 1)]
 
                 // Make sure that the IME spec claims support for v1 UI template.
                 val imeStyle = inlinePresentationSpec.style
@@ -302,7 +387,7 @@ object AutofillHelper {
     }
 
     fun buildResponse(context: Context,
-                      database: Database,
+                      database: ContextualDatabase,
                       entriesInfo: List<EntryInfo>,
                       parseResult: StructureParser.Result,
                       compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest?): FillResponse? {
@@ -334,25 +419,33 @@ object AutofillHelper {
                     }
                 }
             }
-
         }
 
         entriesInfo.forEachIndexed { _, entry ->
-            if (numberInlineSuggestions > 0
+            try {
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                // Build inline presentation for compatible keyboard
-                && compatInlineSuggestionsRequest != null) {
+                var inlinePresentation: InlinePresentation? = null
-                responseBuilder.addDataset(buildDataset(context, database, entry, parseResult) { builder ->
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                    buildInlinePresentationForEntry(context, database,
+                    && numberInlineSuggestions > 0
-                        compatInlineSuggestionsRequest, numberInlineSuggestions--, entry
+                    && compatInlineSuggestionsRequest != null) {
-                    )?.let { inlinePresentation ->
+                    inlinePresentation = buildInlinePresentationForEntry(
-                        builder.setInlinePresentation(inlinePresentation)
+                        context,
-                    }
+                        database,
-                })
+                        compatInlineSuggestionsRequest,
-            } else {
+                        numberInlineSuggestions--,
-                responseBuilder.addDataset(buildDataset(context, database, entry, parseResult))
+                        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
@@ -361,25 +454,51 @@ object AutofillHelper {
                 manualSelection = true
             }
             val manualSelectionView = RemoteViews(context.packageName, R.layout.item_autofill_select_entry)
-            val pendingIntent = AutofillLauncherActivity.getPendingIntentForSelection(context,
+            AutofillLauncherActivity.getPendingIntentForSelection(context,
-                    searchInfo, compatInlineSuggestionsRequest)
+                    searchInfo, compatInlineSuggestionsRequest)?.let { pendingIntent ->
 
-            parseResult.allAutofillIds().let { autofillIds ->
+                var inlinePresentation: InlinePresentation? = null
-                autofillIds.forEach { id ->
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    val builder = Dataset.Builder(manualSelectionView)
+                    compatInlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
+                        val inlinePresentationSpec =
+                            inlineSuggestionsRequest.inlinePresentationSpecs[0]
+                        inlinePresentation = buildInlinePresentationForManualSelection(
+                            context,
+                            inlinePresentationSpec,
+                            pendingIntent
+                        )
+                    }
+                }
 
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                val datasetBuilder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                        compatInlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
+                    Dataset.Builder(Presentations.Builder()
-                            val inlinePresentationSpec = inlineSuggestionsRequest.inlinePresentationSpecs[0]
+                        .apply {
-                            val inlinePresentation = buildInlinePresentationForManualSelection(context, inlinePresentationSpec, pendingIntent)
                             inlinePresentation?.let {
-                                builder.setInlinePresentation(it)
+                                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)
                 }
             }
         }
@@ -387,6 +506,7 @@ object AutofillHelper {
         return try {
             responseBuilder.build()
         } catch (e: Exception) {
+            Log.e(TAG, "Unable to create Autofill response", e)
             null
         }
     }
@@ -395,7 +515,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 +524,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 +543,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 +598,6 @@ object AutofillHelper {
         EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
         activityResultLauncher?.launch(intent)
     }
+
+    private val TAG = AutofillHelper::class.java.name
 }

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 =
+            this.inlineSuggestionsRequest = parcel.readParcelableCompat()
-                parcel.readParcelable(FillRequest::class.java.classLoader)
         }
         else {
             this.inlineSuggestionsRequest = null

app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt

@@ -21,43 +21,51 @@ package com.kunzisoft.keepass.autofill
 
 import android.annotation.SuppressLint
 import android.app.PendingIntent
+import android.content.Context
 import android.content.Intent
 import android.graphics.BlendMode
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.os.CancellationSignal
-import android.service.autofill.*
+import android.service.autofill.AutofillService
+import android.service.autofill.FillCallback
+import android.service.autofill.FillRequest
+import android.service.autofill.FillResponse
+import android.service.autofill.InlinePresentation
+import android.service.autofill.Presentations
+import android.service.autofill.SaveCallback
+import android.service.autofill.SaveInfo
+import android.service.autofill.SaveRequest
 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.autofill.StructureParser.Companion.APPLICATION_ID_POPUP_WINDOW
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.search.SearchHelper
+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 +98,47 @@ class KeeAutofillService : AutofillService() {
 
         cancellationSignal.setOnCancelListener { Log.w(TAG, "Cancel autofill.") }
 
-        // Lock
+        if (request.flags and FillRequest.FLAG_COMPATIBILITY_MODE_REQUEST != 0) {
-        if (!mLock.get()) {
+            Log.d(TAG, "Autofill requested in compatibility mode")
-            mLock.set(true)
+        } else {
-            // Check user's settings for authenticating Responses and Datasets.
+            Log.d(TAG, "Autofill requested in native mode")
-            val latestStructure = request.fillContexts.last().structure
+        }
-            StructureParser(latestStructure).parse()?.let { parseResult ->
 
-                // Build search info only if applicationId or webDomain are not blocked
+        // Check user's settings for authenticating Responses and Datasets.
-                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+        val latestStructure = request.fillContexts.last().structure
-                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+        StructureParser(latestStructure).parse()?.let { parseResult ->
-                    val searchInfo = SearchInfo().apply {
+
-                        applicationId = parseResult.applicationId
+            // Build search info only if applicationId or webDomain are not blocked
-                        webDomain = parseResult.webDomain
+            if (autofillAllowedFor(
-                        webScheme = parseResult.webScheme
+                    applicationId = parseResult.applicationId,
-                    }
+                    applicationIdBlocklist = applicationIdBlocklist,
-                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
+                    webDomain = parseResult.webDomain,
-                        searchInfo.webDomain = webDomainWithoutSubDomain
+                    webDomainBlocklist = webDomainBlocklist)
-                        val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                ) {
-                                && autofillInlineSuggestionsEnabled) {
+                val searchInfo = SearchInfo().apply {
-                            CompatInlineSuggestionsRequest(request)
+                    applicationId = parseResult.applicationId
-                        } else {
+                    webDomain = parseResult.webDomain
-                            null
+                    webScheme = parseResult.webScheme
-                        }
+                }
-                        launchSelection(mDatabase,
+                WebDomain.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
-                                searchInfo,
+                    searchInfo.webDomain = webDomainWithoutSubDomain
-                                parseResult,
+                    val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                                inlineSuggestionsRequest,
+                            && autofillInlineSuggestionsEnabled) {
-                                callback)
+                        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,149 +167,207 @@ 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
                 // to generate Response.
-                val intentSender = AutofillLauncherActivity.getPendingIntentForSelection(this,
+                AutofillLauncherActivity.getPendingIntentForSelection(this,
-                        searchInfo, inlineSuggestionsRequest).intentSender
+                        searchInfo, inlineSuggestionsRequest)?.intentSender?.let { intentSender ->
-                val responseBuilder = FillResponse.Builder()
+                    val responseBuilder = FillResponse.Builder()
-                val remoteViewsUnlock: RemoteViews = if (database == null) {
+                    val remoteViewsUnlock: RemoteViews = if (database == null) {
-                    if (!parseResult.webDomain.isNullOrEmpty()) {
+                        if (!parseResult.webDomain.isNullOrEmpty()) {
-                        RemoteViews(
+                            RemoteViews(
-                            packageName,
+                                packageName,
-                            R.layout.item_autofill_unlock_web_domain
+                                R.layout.item_autofill_unlock_web_domain
-                        ).apply {
+                            ).apply {
-                            setTextViewText(
+                                setTextViewText(
-                                R.id.autofill_web_domain_text,
+                                    R.id.autofill_web_domain_text,
-                                parseResult.webDomain
+                                    parseResult.webDomain
-                            )
+                                )
-                        }
+                            }
-                    } else if (!parseResult.applicationId.isNullOrEmpty()) {
+                        } else if (!parseResult.applicationId.isNullOrEmpty()) {
-                        RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
+                            RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
-                            setTextViewText(
+                                setTextViewText(
-                                R.id.autofill_app_id_text,
+                                    R.id.autofill_app_id_text,
-                                parseResult.applicationId
+                                    parseResult.applicationId
-                            )
+                                )
+                            }
+                        } else {
+                            RemoteViews(packageName, R.layout.item_autofill_unlock)
                         }
                     } else {
-                        RemoteViews(packageName, R.layout.item_autofill_unlock)
+                        if (!parseResult.webDomain.isNullOrEmpty()) {
-                    }
+                            RemoteViews(
-                } else {
+                                packageName,
-                    if (!parseResult.webDomain.isNullOrEmpty()) {
+                                R.layout.item_autofill_select_entry_web_domain
-                        RemoteViews(
+                            ).apply {
-                            packageName,
+                                setTextViewText(
-                            R.layout.item_autofill_select_entry_web_domain
+                                    R.id.autofill_web_domain_text,
-                        ).apply {
+                                    parseResult.webDomain
-                            setTextViewText(
+                                )
-                                R.id.autofill_web_domain_text,
+                            }
-                                parseResult.webDomain
+                        } else if (!parseResult.applicationId.isNullOrEmpty()) {
-                            )
+                            RemoteViews(
+                                packageName,
+                                R.layout.item_autofill_select_entry_app_id
+                            ).apply {
+                                setTextViewText(
+                                    R.id.autofill_app_id_text,
+                                    parseResult.applicationId
+                                )
+                            }
+                        } else {
+                            RemoteViews(packageName, R.layout.item_autofill_select_entry)
                         }
-                    } else if (!parseResult.applicationId.isNullOrEmpty()) {
-                        RemoteViews(packageName, R.layout.item_autofill_select_entry_app_id).apply {
-                            setTextViewText(
-                                R.id.autofill_app_id_text,
-                                parseResult.applicationId
-                            )
-                        }
-                    } else {
-                        RemoteViews(packageName, R.layout.item_autofill_select_entry)
                     }
-                }
 
-                // Tell the autofill framework the interest to save credentials
+                    // Tell the autofill framework the interest to save credentials
-                if (askToSaveData) {
+                    if (askToSaveData) {
-                    var types: Int = SaveInfo.SAVE_DATA_TYPE_GENERIC
+                        var types: Int = SaveInfo.SAVE_DATA_TYPE_GENERIC
-                    val requiredIds = ArrayList<AutofillId>()
+                        val requiredIds = ArrayList<AutofillId>()
-                    val optionalIds = ArrayList<AutofillId>()
+                        val optionalIds = ArrayList<AutofillId>()
 
-                    // Only if at least a password
+                        // Only if at least a password
-                    parseResult.passwordId?.let { passwordInfo ->
+                        parseResult.passwordId?.let { passwordInfo ->
-                        parseResult.usernameId?.let { usernameInfo ->
+                            parseResult.usernameId?.let { usernameInfo ->
-                            types = types or SaveInfo.SAVE_DATA_TYPE_USERNAME
+                                types = types or SaveInfo.SAVE_DATA_TYPE_USERNAME
-                            requiredIds.add(usernameInfo)
+                                requiredIds.add(usernameInfo)
+                            }
+                            types = types or SaveInfo.SAVE_DATA_TYPE_PASSWORD
+                            requiredIds.add(passwordInfo)
                         }
-                        types = types or SaveInfo.SAVE_DATA_TYPE_PASSWORD
+                        // or a credit card form
-                        requiredIds.add(passwordInfo)
+                        if (requiredIds.isEmpty()) {
-                    }
+                            parseResult.creditCardNumberId?.let { numberId ->
-                    // or a credit card form
+                                types = types or SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD
-                    if (requiredIds.isEmpty()) {
+                                requiredIds.add(numberId)
-                        parseResult.creditCardNumberId?.let { numberId ->
+                                Log.d(TAG, "Asking to save credit card number")
-                            types = types or SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD
+                            }
-                            requiredIds.add(numberId)
+                            parseResult.creditCardExpirationDateId?.let { id -> optionalIds.add(id) }
-                            Log.d(TAG, "Asking to save credit card number")
+                            parseResult.creditCardExpirationYearId?.let { id -> optionalIds.add(id) }
+                            parseResult.creditCardExpirationMonthId?.let { id -> optionalIds.add(id) }
+                            parseResult.creditCardHolderId?.let { id -> optionalIds.add(id) }
+                            parseResult.cardVerificationValueId?.let { id -> optionalIds.add(id) }
                         }
-                        parseResult.creditCardExpirationDateId?.let { id -> optionalIds.add(id) }
+                        if (requiredIds.isNotEmpty()) {
-                        parseResult.creditCardExpirationYearId?.let { id -> optionalIds.add(id) }
+                            val builder = SaveInfo.Builder(types, requiredIds.toTypedArray())
-                        parseResult.creditCardExpirationMonthId?.let { id -> optionalIds.add(id) }
+                            if (optionalIds.isNotEmpty()) {
-                        parseResult.creditCardHolderId?.let { id -> optionalIds.add(id) }
+                                builder.setOptionalIds(optionalIds.toTypedArray())
-                        parseResult.cardVerificationValueId?.let { id -> optionalIds.add(id) }
+                            }
-                    }
+                            responseBuilder.setSaveInfo(builder.build())
-                    if (requiredIds.isNotEmpty()) {
-                        val builder = SaveInfo.Builder(types, requiredIds.toTypedArray())
-                        if (optionalIds.isNotEmpty()) {
-                            builder.setOptionalIds(optionalIds.toTypedArray())
                         }
-                        responseBuilder.setSaveInfo(builder.build())
                     }
-                }
 
-                // Build inline presentation
+                    // Build inline presentation
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                        && autofillInlineSuggestionsEnabled) {
+                        && autofillInlineSuggestionsEnabled
-                    var inlinePresentation: InlinePresentation? = null
+                    ) {
-                    inlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
+                        var inlinePresentation: InlinePresentation? = null
-                        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
+                        inlineSuggestionsRequest?.inlineSuggestionsRequest?.let { inlineSuggestionsRequest ->
-                        if (inlineSuggestionsRequest.maxSuggestionCount > 0
+                            val inlinePresentationSpecs =
-                                && inlinePresentationSpecs.size > 0) {
+                                inlineSuggestionsRequest.inlinePresentationSpecs
-                            val inlinePresentationSpec = inlinePresentationSpecs[0]
+                            if (inlineSuggestionsRequest.maxSuggestionCount > 0
+                                && inlinePresentationSpecs.isNotEmpty()
+                            ) {
+                                val inlinePresentationSpec = inlinePresentationSpecs[0]
 
-                            // Make sure that the IME spec claims support for v1 UI template.
+                                // Make sure that the IME spec claims support for v1 UI template.
-                            val imeStyle = inlinePresentationSpec.style
+                                val imeStyle = inlinePresentationSpec.style
-                            if (UiVersions.getVersions(imeStyle).contains(UiVersions.INLINE_UI_VERSION_1)) {
+                                if (UiVersions.getVersions(imeStyle)
-                                // Build the content for IME UI
+                                        .contains(UiVersions.INLINE_UI_VERSION_1)
-                                inlinePresentation = InlinePresentation(
+                                ) {
+                                    // Build the content for IME UI
+                                    inlinePresentation = InlinePresentation(
                                         InlineSuggestionUi.newContentBuilder(
-                                                PendingIntent.getActivity(this,
+                                            PendingIntent.getActivity(
-                                                    0,
+                                                this,
-                                                    Intent(this, AutofillSettingsActivity::class.java),
+                                                0,
-                                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                                Intent(this, AutofillSettingsActivity::class.java),
-                                                        PendingIntent.FLAG_IMMUTABLE
+                                                PendingIntent.FLAG_IMMUTABLE
-                                                    } else {
+                                            )
-                                                        0
-                                                    })
                                         ).apply {
                                             setContentDescription(getString(R.string.autofill_sign_in_prompt))
                                             setTitle(getString(R.string.autofill_sign_in_prompt))
-                                            setStartIcon(Icon.createWithResource(this@KeeAutofillService, R.mipmap.ic_launcher_round).apply {
+                                            setStartIcon(
-                                                setTintBlendMode(BlendMode.DST)
+                                                Icon.createWithResource(
-                                            })
+                                                    this@KeeAutofillService,
-                                        }.build().slice, inlinePresentationSpec, false)
+                                                    R.mipmap.ic_launcher_round
+                                                ).apply {
+                                                    setTintBlendMode(BlendMode.DST)
+                                                })
+                                        }.build().slice, inlinePresentationSpec, false
+                                    )
+                                }
                             }
                         }
+
+                        // Build response
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                            try {
+                                // Buggy method on some API 33 devices
+                                responseBuilder.setAuthentication(
+                                    autofillIds,
+                                    intentSender,
+                                    Presentations.Builder().apply {
+                                        inlinePresentation?.let {
+                                            setInlinePresentation(it)
+                                        }
+                                        setDialogPresentation(remoteViewsUnlock)
+                                    }.build()
+                                )
+                            } catch (e: Exception) {
+                                Log.e(TAG, "Unable to use the new setAuthentication method.", e)
+                                @Suppress("DEPRECATION")
+                                responseBuilder.setAuthentication(
+                                    autofillIds,
+                                    intentSender,
+                                    remoteViewsUnlock,
+                                    inlinePresentation
+                                )
+                            }
+                        } else {
+                            @Suppress("DEPRECATION")
+                            responseBuilder.setAuthentication(
+                                autofillIds,
+                                intentSender,
+                                remoteViewsUnlock,
+                                inlinePresentation
+                            )
+                        }
+                    } else {
+                        @Suppress("DEPRECATION")
+                        responseBuilder.setAuthentication(
+                            autofillIds,
+                            intentSender,
+                            remoteViewsUnlock
+                        )
                     }
-                    // Build response
+                    success = true
-                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock, inlinePresentation)
+                    callback.onSuccess(responseBuilder.build())
-                } else {
-                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock)
                 }
-                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 ->
 
-                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                if (autofillAllowedFor(
-                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+                        applicationId = parseResult.applicationId,
+                        applicationIdBlocklist = applicationIdBlocklist,
+                        webDomain = parseResult.webDomain,
+                        webDomainBlocklist = webDomainBlocklist)
+                    ) {
                     Log.d(TAG, "autofill onSaveRequest password")
 
                     // Build expiration from date or from year and month
@@ -332,14 +404,16 @@ class KeeAutofillService : AutofillService() {
                     //    callback.onSuccess(AutofillLauncherActivity.getAuthIntentSenderForRegistration(this,
                     //            registerInfo))
                     //} else {
-                        AutofillLauncherActivity.launchForRegistration(this, registerInfo)
+                    AutofillLauncherActivity.launchForRegistration(this, registerInfo)
-                        callback.onSuccess()
+                    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,13 +422,34 @@ class KeeAutofillService : AutofillService() {
     }
 
     override fun onDisconnected() {
-        mLock.set(false)
         Log.d(TAG, "onDisconnected")
     }
 
     companion object {
         private val TAG = KeeAutofillService::class.java.name
 
+        fun autofillAllowedFor(applicationId: String?,
+                               webDomain: String?,
+                               context: Context
+        ): Boolean {
+            return autofillAllowedFor(
+                applicationId = applicationId,
+                applicationIdBlocklist = PreferencesUtil.applicationIdBlocklist(context),
+                webDomain = webDomain,
+                webDomainBlocklist = PreferencesUtil.webDomainBlocklist(context))
+        }
+
+        fun autofillAllowedFor(applicationId: String?,
+                               applicationIdBlocklist: Set<String>?,
+                               webDomain: String?,
+                               webDomainBlocklist: Set<String>?
+        ): Boolean {
+            return autofillAllowedFor(applicationId, applicationIdBlocklist)
+                    // To prevent unrecognized autofill popup id
+                    && applicationId?.contains(APPLICATION_ID_POPUP_WINDOW) != true
+                    && autofillAllowedFor(webDomain, webDomainBlocklist)
+        }
+
         fun autofillAllowedFor(element: String?, blockList: Set<String>?): Boolean {
             element?.let { elementNotNull ->
                 if (blockList?.any { appIdBlocked ->

app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt

@@ -27,8 +27,7 @@ import android.view.autofill.AutofillId
 import android.view.autofill.AutofillValue
 import androidx.annotation.RequiresApi
 import org.joda.time.DateTime
-import java.util.*
+import java.util.Locale
-import kotlin.collections.ArrayList
 
 
 /**
@@ -37,7 +36,6 @@ import kotlin.collections.ArrayList
 @RequiresApi(api = Build.VERSION_CODES.O)
 class StructureParser(private val structure: AssistStructure) {
     private var result: Result? = null
-    private var usernameNeeded = true
     private var usernameIdCandidate: AutofillId? = null
     private var usernameValueCandidate: AutofillValue? = null
 
@@ -53,7 +51,7 @@ class StructureParser(private val structure: AssistStructure) {
                     applicationId = windowNode.title.toString().split("/")[0]
                     Log.d(TAG, "Autofill applicationId: $applicationId")
 
-                    if (applicationId?.contains("PopupWindow:") == false) {
+                    if (applicationId?.contains(APPLICATION_ID_POPUP_WINDOW) == false) {
                         if (parseViewNode(windowNode.rootViewNode))
                             break@mainLoop
                     }
@@ -105,7 +103,7 @@ class StructureParser(private val structure: AssistStructure) {
             if (node.autofillId != null) {
                 // Parse methods
                 val hints = node.autofillHints
-                if (hints != null && hints.isNotEmpty()) {
+                if (!hints.isNullOrEmpty()) {
                     if (parseNodeByAutofillHint(node))
                         returnValue = true
                 } else if (parseNodeByHtmlAttributes(node))
@@ -134,16 +132,37 @@ class StructureParser(private val structure: AssistStructure) {
                 it.contains(View.AUTOFILL_HINT_USERNAME, true)
                         || it.contains(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
                         || it.contains("email", true)
-                        || it.contains(View.AUTOFILL_HINT_PHONE, true) -> {
+                        || it.contains("login", true) -> {
-                    result?.usernameId = autofillId
+                    // Replace username until we have a password
-                    result?.usernameValue = node.autofillValue
+                    if (result?.passwordId == null) {
-                    Log.d(TAG, "Autofill username hint")
+                        result?.usernameId = autofillId
+                        result?.usernameValue = node.autofillValue
+                        Log.d(TAG, "Autofill username hint if no password")
+                    } else {
+                        usernameIdCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
+                        Log.d(TAG, "Autofill username hint if password")
+                    }
+                }
+                it.contains(View.AUTOFILL_HINT_PHONE, true) -> {
+                    if (usernameIdCandidate == null) {
+                        usernameIdCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
+                        Log.d(TAG, "Autofill phone")
+                    }
                 }
                 it.contains(View.AUTOFILL_HINT_PASSWORD, true) -> {
+                    // Password Id changed if it's the second times we are here,
+                    // So the last username candidate is most appropriate
+                    if (result?.passwordId != null) {
+                        result?.usernameId = usernameIdCandidate
+                        result?.usernameValue = usernameValueCandidate
+                    }
                     result?.passwordId = autofillId
                     result?.passwordValue = node.autofillValue
                     Log.d(TAG, "Autofill password hint")
-                    return true
+                    // Comment "return" to check all the tree
+                    // return true
                 }
                 it.equals("cc-name", true) -> {
                     Log.d(TAG, "Autofill credit card name hint")
@@ -279,14 +298,19 @@ class StructureParser(private val structure: AssistStructure) {
                         "type" -> {
                             when (pairAttribute.second.lowercase(Locale.ENGLISH)) {
                                 "tel", "email" -> {
-                                    result?.usernameId = autofillId
+                                    if (result?.passwordId == null) {
-                                    result?.usernameValue = node.autofillValue
+                                        result?.usernameId = autofillId
-                                    Log.d(TAG, "Autofill username web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
+                                        result?.usernameValue = node.autofillValue
+                                        Log.d(TAG, "Autofill username web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
+                                    }
                                 }
                                 "text" -> {
-                                    usernameIdCandidate = autofillId
+                                    // Assume username is before password
-                                    usernameValueCandidate = node.autofillValue
+                                    if (result?.passwordId == null) {
-                                    Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
+                                        usernameIdCandidate = autofillId
+                                        usernameValueCandidate = node.autofillValue
+                                        Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
+                                    }
                                 }
                                 "password" -> {
                                     result?.passwordId = autofillId
@@ -315,85 +339,128 @@ class StructureParser(private val structure: AssistStructure) {
         return "0x${"%08x".format(inputType)}"
     }
 
+    private fun manageTypeText(
+        node: AssistStructure.ViewNode,
+        autofillId: AutofillId?,
+        inputType: Int
+    ): Boolean {
+        when {
+            inputIsVariationType(inputType,
+                InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
+                InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS) -> {
+                if (result?.passwordId == null) {
+                    result?.usernameId = autofillId
+                    result?.usernameValue = node.autofillValue
+                    Log.d(TAG, "Autofill username android text type: ${showHexInputType(inputType)}")
+                }
+            }
+            inputIsVariationType(inputType,
+                InputType.TYPE_TEXT_VARIATION_NORMAL,
+                InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
+                InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
+                // Assume the username field is before the password field
+                if (result?.passwordId == null) {
+                    usernameIdCandidate = autofillId
+                    usernameValueCandidate = node.autofillValue
+                }
+                Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
+            }
+            inputIsVariationType(inputType,
+                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) -> {
+                // Some forms used visible password as username
+                if (result?.passwordId == null &&
+                    usernameIdCandidate == null && usernameValueCandidate == null) {
+                    usernameIdCandidate = autofillId
+                    usernameValueCandidate = node.autofillValue
+                    Log.d(TAG, "Autofill visible password android text type (as username): ${showHexInputType(inputType)}")
+                } else if (result?.passwordId == null && result?.passwordValue == null) {
+                    result?.passwordId = autofillId
+                    result?.passwordValue = node.autofillValue
+                    Log.d(TAG, "Autofill visible password android text type (as password): ${showHexInputType(inputType)}")
+                }
+            }
+            inputIsVariationType(inputType,
+                InputType.TYPE_TEXT_VARIATION_PASSWORD,
+                InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
+                result?.passwordId = autofillId
+                result?.passwordValue = node.autofillValue
+                Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
+                return true
+            }
+            inputIsVariationType(inputType,
+                InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT,
+                InputType.TYPE_TEXT_VARIATION_FILTER,
+                InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE,
+                InputType.TYPE_TEXT_VARIATION_PHONETIC,
+                InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS,
+                InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE,
+                InputType.TYPE_TEXT_VARIATION_URI) -> {
+                // Type not used
+                Log.d(TAG, "Autofill not used android text type: ${showHexInputType(inputType)}")
+            }
+            else -> {
+                Log.d(TAG, "Autofill unknown android text type: ${showHexInputType(inputType)}")
+            }
+        }
+        return false
+    }
+
+    private fun manageTypeNumber(
+        node: AssistStructure.ViewNode,
+        autofillId: AutofillId?,
+        inputType: Int
+    ): Boolean {
+        when {
+            inputIsVariationType(inputType,
+                InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
+                if (usernameIdCandidate == null) {
+                    usernameIdCandidate = autofillId
+                    usernameValueCandidate = node.autofillValue
+                    Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
+                }
+            }
+            inputIsVariationType(inputType,
+                InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
+                result?.passwordId = autofillId
+                result?.passwordValue = node.autofillValue
+                Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
+                return true
+            }
+            else -> {
+                Log.d(TAG, "Autofill unknown android number type: ${showHexInputType(inputType)}")
+            }
+        }
+        return false
+    }
+
+    private fun manageTypeNull(
+        node: AssistStructure.ViewNode,
+        autofillId: AutofillId?,
+        inputType: Int
+    ): Boolean {
+        if (node.className == "android.widget.EditText") {
+            Log.d(TAG, "Autofill null android input type class: ${showHexInputType(inputType)}" +
+                    ", get the EditText node class name!")
+            if (result?.passwordId == null) {
+                usernameIdCandidate = autofillId
+                usernameValueCandidate = node.autofillValue
+            }
+        }
+        return false
+    }
+
     private fun parseNodeByAndroidInput(node: AssistStructure.ViewNode): Boolean {
         val autofillId = node.autofillId
         val inputType = node.inputType
         when (inputType and InputType.TYPE_MASK_CLASS) {
             InputType.TYPE_CLASS_TEXT -> {
-                when {
+                return manageTypeText(node, autofillId, inputType)
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
-                            InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS) -> {
-                        result?.usernameId = autofillId
-                        result?.usernameValue = node.autofillValue
-                        Log.d(TAG, "Autofill username android text type: ${showHexInputType(inputType)}")
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_NORMAL,
-                            InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
-                            InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
-                        usernameIdCandidate = autofillId
-                        usernameValueCandidate = node.autofillValue
-                        Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) -> {
-                        // Some forms used visible password as username
-                        if (usernameIdCandidate == null && usernameValueCandidate == null) {
-                            usernameIdCandidate = autofillId
-                            usernameValueCandidate = node.autofillValue
-                            Log.d(TAG, "Autofill visible password android text type (as username): ${showHexInputType(inputType)}")
-                        } else if (result?.passwordId == null && result?.passwordValue == null) {
-                            result?.passwordId = autofillId
-                            result?.passwordValue = node.autofillValue
-                            Log.d(TAG, "Autofill visible password android text type (as password): ${showHexInputType(inputType)}")
-                            usernameNeeded = false
-                        }
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_PASSWORD,
-                            InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
-                        result?.passwordId = autofillId
-                        result?.passwordValue = node.autofillValue
-                        Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
-                        return true
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT,
-                            InputType.TYPE_TEXT_VARIATION_FILTER,
-                            InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE,
-                            InputType.TYPE_TEXT_VARIATION_PHONETIC,
-                            InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS,
-                            InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE,
-                            InputType.TYPE_TEXT_VARIATION_URI) -> {
-                        // Type not used
-                    }
-                    else -> {
-                        Log.d(TAG, "Autofill unknown android text type: ${showHexInputType(inputType)}")
-                    }
-                }
             }
             InputType.TYPE_CLASS_NUMBER -> {
-                when {
+                return manageTypeNumber(node, autofillId, inputType)
-                    inputIsVariationType(inputType,
+            }
-                            InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
+            InputType.TYPE_NULL -> {
-                        if (usernameIdCandidate == null) {
+                return manageTypeNull(node, autofillId, inputType)
-                            usernameIdCandidate = autofillId
-                            usernameValueCandidate = node.autofillValue
-                            Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
-                        }
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
-                        result?.passwordId = autofillId
-                        result?.passwordValue = node.autofillValue
-                        Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
-                        return true
-                    }
-                    else -> {
-                        Log.d(TAG, "Autofill unknown android number type: ${showHexInputType(inputType)}")
-                    }
-                }
             }
         }
         return false
@@ -422,58 +489,14 @@ class StructureParser(private val structure: AssistStructure) {
         var creditCardExpirationDayOptions: Array<CharSequence>? = null
 
         var usernameId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var passwordId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var creditCardHolderId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var creditCardNumberId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var creditCardExpirationDateId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var creditCardExpirationYearId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var creditCardExpirationMonthId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var creditCardExpirationDayId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
         var cardVerificationValueId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
 
         fun allAutofillIds(): Array<AutofillId> {
             val all = ArrayList<AutofillId>()
@@ -500,13 +523,13 @@ class StructureParser(private val structure: AssistStructure) {
 
         var usernameValue: AutofillValue? = null
             set(value) {
-                if (allowSaveValues && field == null)
+                if (allowSaveValues)
                     field = value
             }
 
         var passwordValue: AutofillValue? = null
             set(value) {
-                if (allowSaveValues && field == null)
+                if (allowSaveValues)
                     field = value
             }
 
@@ -559,5 +582,7 @@ class StructureParser(private val structure: AssistStructure) {
 
     companion object {
         private val TAG = StructureParser::class.java.name
+
+        const val APPLICATION_ID_POPUP_WINDOW = "PopupWindow:"
     }
 }

app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockCryptoPrompt.kt

@@ -1,10 +0,0 @@
-package com.kunzisoft.keepass.biometric
-
-import androidx.annotation.StringRes
-import javax.crypto.Cipher
-
-data class AdvancedUnlockCryptoPrompt(var cipher: Cipher,
-                                      @StringRes var promptTitleId: Int,
-                                      @StringRes var promptDescriptionId: Int? = null,
-                                      var isDeviceCredentialOperation: Boolean,
-                                      var isBiometricOperation: Boolean)

app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt

@@ -1,671 +0,0 @@
-/*
- * Copyright 2020 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.biometric
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import android.util.Log
-import android.view.*
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
-import com.getkeepsafe.taptargetview.TapTargetView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.stylish.StylishFragment
-import com.kunzisoft.keepass.app.database.CipherDatabaseAction
-import com.kunzisoft.keepass.database.exception.IODatabaseException
-import com.kunzisoft.keepass.education.PasswordActivityEducation
-import com.kunzisoft.keepass.model.CipherDecryptDatabase
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.CredentialStorage
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
-import com.kunzisoft.keepass.view.hideByFading
-import com.kunzisoft.keepass.view.showByFading
-import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedUnlockCallback {
-
-    private var mBuilderListener: BuilderListener? = null
-
-    private var mAdvancedUnlockEnabled = false
-    private var mAutoOpenPromptEnabled = false
-
-    private var advancedUnlockManager: AdvancedUnlockManager? = null
-    private var biometricMode: Mode = Mode.BIOMETRIC_UNAVAILABLE
-    private var mAdvancedUnlockInfoView: AdvancedUnlockInfoView? = null
-
-    var databaseFileUri: Uri? = null
-        private set
-
-    // TODO Retrieve credential storage from app database
-    var credentialDatabaseStorage: CredentialStorage = CredentialStorage.DEFAULT
-
-    /**
-     * Manage setting to auto open biometric prompt
-     */
-    private var mAutoOpenPrompt: Boolean
-        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
-
-    private lateinit var cipherDatabaseAction : CipherDatabaseAction
-
-    private var cipherDatabaseListener: CipherDatabaseAction.CipherDatabaseListener? = null
-
-    private val mAdvancedUnlockViewModel: AdvancedUnlockViewModel by activityViewModels()
-
-    // Only to fix multiple fingerprint menu #332
-    private var mAllowAdvancedUnlockMenu = false
-    private var mAddBiometricMenuInProgress = false
-
-    // Only keep connection when we request a device credential activity
-    private var keepConnection = false
-
-    private var mDeviceCredentialResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        mAdvancedUnlockViewModel.allowAutoOpenBiometricPrompt = false
-        // To wait resume
-        if (keepConnection) {
-            mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded = result.resultCode == Activity.RESULT_OK
-        }
-        keepConnection = false
-    }
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-
-        mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(context)
-        mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(context)
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                mBuilderListener = context as BuilderListener
-            }
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + BuilderListener::class.java.name)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setHasOptionsMenu(true)
-
-        cipherDatabaseAction = CipherDatabaseAction.getInstance(requireContext().applicationContext)
-
-        mAdvancedUnlockViewModel.onInitAdvancedUnlockModeRequested.observe(this) {
-            initAdvancedUnlockMode()
-        }
-
-        mAdvancedUnlockViewModel.onUnlockAvailabilityCheckRequested.observe(this) {
-            checkUnlockAvailability()
-        }
-
-        mAdvancedUnlockViewModel.onDatabaseFileLoaded.observe(this) {
-            onDatabaseLoaded(it)
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        val rootView = inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_advanced_unlock, container, false)
-
-        mAdvancedUnlockInfoView = rootView.findViewById(R.id.advanced_unlock_view)
-
-        return rootView
-    }
-
-    override fun onResume() {
-        super.onResume()
-        context?.let {
-            mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(it)
-            mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(it)
-        }
-        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
-            if (databaseUri != null
-                    && mAdvancedUnlockEnabled) {
-                val deviceCredentialAuthSucceeded = mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded
-                deviceCredentialAuthSucceeded?.let {
-                    if (databaseUri == databaseFileUri) {
-                        if (deviceCredentialAuthSucceeded == true) {
-                            advancedUnlockManager?.advancedUnlockCallback?.onAuthenticationSucceeded()
-                        } else {
-                            advancedUnlockManager?.advancedUnlockCallback?.onAuthenticationFailed()
-                        }
-                    } else {
-                        disconnect()
-                    }
-                } ?: run {
-                    if (databaseUri != databaseFileUri) {
-                        connect(databaseUri)
-                    }
-                }
-            } else {
-                disconnect()
-            }
-            mAdvancedUnlockViewModel.deviceCredentialAuthSucceeded = null
-        }
-    }
-
-    /**
-     * Check unlock availability and change the current mode depending of device's state
-     */
-    private fun checkUnlockAvailability() {
-        context?.let { context ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                allowOpenBiometricPrompt = true
-                if (PreferencesUtil.isBiometricUnlockEnable(context)) {
-                    mAdvancedUnlockInfoView?.setIconResource(R.drawable.fingerprint)
-
-                    // biometric not supported (by API level or hardware) so keep option hidden
-                    // or manually disable
-                    val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(context)
-                    if (!PreferencesUtil.isAdvancedUnlockEnable(context)
-                            || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
-                            || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
-                        toggleMode(Mode.BIOMETRIC_UNAVAILABLE)
-                    } else if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED) {
-                        toggleMode(Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED)
-                    } else {
-                        // biometric is available but not configured, show icon but in disabled state with some information
-                        if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
-                            toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
-                        } else {
-                            selectMode()
-                        }
-                    }
-                } else if (PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
-                    mAdvancedUnlockInfoView?.setIconResource(R.drawable.bolt)
-                    if (AdvancedUnlockManager.isDeviceSecure(context)) {
-                        selectMode()
-                    } else {
-                        toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
-                    }
-                }
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun selectMode() {
-        // Check if fingerprint well init (be called the first time the fingerprint is configured
-        // and the activity still active)
-        if (advancedUnlockManager?.isKeyManagerInitialized != true) {
-            advancedUnlockManager = AdvancedUnlockManager { requireActivity() }
-            // callback for fingerprint findings
-            advancedUnlockManager?.advancedUnlockCallback = this
-        }
-        // Recheck to change the mode
-        if (advancedUnlockManager?.isKeyManagerInitialized != true) {
-            toggleMode(Mode.KEY_MANAGER_UNAVAILABLE)
-        } else {
-            if (mBuilderListener?.conditionToStoreCredential() == true) {
-                // listen for encryption
-                toggleMode(Mode.STORE_CREDENTIAL)
-            } else {
-                databaseFileUri?.let { databaseUri ->
-                    cipherDatabaseAction.containsCipherDatabase(databaseUri) { containsCipher ->
-                        // biometric available but no stored password found yet for this DB so show info don't listen
-                        toggleMode(if (containsCipher) {
-                            // listen for decryption
-                            Mode.EXTRACT_CREDENTIAL
-                        } else {
-                            // wait for typing
-                            Mode.WAIT_CREDENTIAL
-                        })
-                    }
-                }
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun toggleMode(newBiometricMode: Mode) {
-        if (newBiometricMode != biometricMode) {
-            biometricMode = newBiometricMode
-            initAdvancedUnlockMode()
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initNotAvailable() {
-        showViews(false)
-
-        mAdvancedUnlockInfoView?.setIconViewClickListener(false, 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))
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initSecurityUpdateRequired() {
-        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.biometric_security_update_required)
-
-        openBiometricSetting()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initNotConfigured() {
-        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.configure_biometric)
-        setAdvancedUnlockedMessageView("")
-
-        openBiometricSetting()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initKeyManagerNotAvailable() {
-        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.keystore_not_accessible)
-
-        openBiometricSetting()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initWaitData() {
-        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.no_credentials_stored)
-        setAdvancedUnlockedMessageView("")
-
-        context?.let { context ->
-            mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
-                onAuthenticationError(BiometricPrompt.ERROR_UNABLE_TO_PROCESS,
-                        context.getString(R.string.credential_before_click_advanced_unlock_button))
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            if (allowOpenBiometricPrompt) {
-                if (cryptoPrompt.isDeviceCredentialOperation)
-                    keepConnection = true
-                try {
-                    advancedUnlockManager?.openAdvancedUnlockPrompt(cryptoPrompt,
-                        mDeviceCredentialResultLauncher)
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to open advanced unlock prompt", e)
-                    setAdvancedUnlockedTitleView(R.string.advanced_unlock_prompt_not_initialized)
-                }
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initEncryptData() {
-        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.open_advanced_unlock_prompt_store_credential)
-        setAdvancedUnlockedMessageView("")
-
-        advancedUnlockManager?.initEncryptData { cryptoPrompt ->
-            // Set listener to open the biometric dialog and save credential
-            mAdvancedUnlockInfoView?.setIconViewClickListener { _ ->
-                openAdvancedUnlockPrompt(cryptoPrompt)
-            }
-        } ?: throw Exception("AdvancedUnlockManager not initialized")
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun initDecryptData() {
-        showViews(true)
-        setAdvancedUnlockedTitleView(R.string.open_advanced_unlock_prompt_unlock_database)
-        setAdvancedUnlockedMessageView("")
-
-        advancedUnlockManager?.let { unlockHelper ->
-            databaseFileUri?.let { databaseUri ->
-                cipherDatabaseAction.getCipherDatabase(databaseUri) { cipherDatabase ->
-                    cipherDatabase?.let {
-                        unlockHelper.initDecryptData(it.specParameters) { cryptoPrompt ->
-
-                            // Set listener to open the biometric dialog and check credential
-                            mAdvancedUnlockInfoView?.setIconViewClickListener { _ ->
-                                openAdvancedUnlockPrompt(cryptoPrompt)
-                            }
-
-                            // Auto open the biometric prompt
-                            if (mAutoOpenPrompt) {
-                                mAutoOpenPrompt = false
-                                openAdvancedUnlockPrompt(cryptoPrompt)
-                            }
-                        }
-                    } ?: deleteEncryptedDatabaseKey()
-                }
-            } ?: throw IODatabaseException()
-        } ?: throw Exception("AdvancedUnlockManager not initialized")
-    }
-
-    private fun initAdvancedUnlockMode() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            mAllowAdvancedUnlockMenu = false
-            try {
-                when (biometricMode) {
-                    Mode.BIOMETRIC_UNAVAILABLE -> initNotAvailable()
-                    Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> initSecurityUpdateRequired()
-                    Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED -> initNotConfigured()
-                    Mode.KEY_MANAGER_UNAVAILABLE -> initKeyManagerNotAvailable()
-                    Mode.WAIT_CREDENTIAL -> initWaitData()
-                    Mode.STORE_CREDENTIAL -> initEncryptData()
-                    Mode.EXTRACT_CREDENTIAL -> initDecryptData()
-                }
-            } catch (e: Exception) {
-                onGenericException(e)
-            }
-            invalidateBiometricMenu()
-        }
-    }
-
-    private fun invalidateBiometricMenu() {
-        // Show fingerprint key deletion
-        if (!mAddBiometricMenuInProgress) {
-            mAddBiometricMenuInProgress = true
-            databaseFileUri?.let { databaseUri ->
-                cipherDatabaseAction.containsCipherDatabase(databaseUri) { containsCipher ->
-                    mAllowAdvancedUnlockMenu = containsCipher
-                            && (biometricMode != Mode.BIOMETRIC_UNAVAILABLE
-                            && biometricMode != Mode.KEY_MANAGER_UNAVAILABLE)
-                    mAddBiometricMenuInProgress = false
-                    activity?.invalidateOptionsMenu()
-                }
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    fun connect(databaseUri: Uri) {
-        showViews(true)
-        this.databaseFileUri = databaseUri
-        cipherDatabaseListener = object: CipherDatabaseAction.CipherDatabaseListener {
-            override fun onCipherDatabaseCleared() {
-                advancedUnlockManager?.closeBiometricPrompt()
-                checkUnlockAvailability()
-            }
-        }
-        cipherDatabaseAction.apply {
-            reloadPreferences()
-            cipherDatabaseListener?.let {
-                registerDatabaseListener(it)
-            }
-        }
-        checkUnlockAvailability()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    fun disconnect(hideViews: Boolean = true,
-                   closePrompt: Boolean = true) {
-        this.databaseFileUri = null
-        // Close the biometric prompt
-        allowOpenBiometricPrompt = false
-        if (closePrompt)
-            advancedUnlockManager?.closeBiometricPrompt()
-        cipherDatabaseListener?.let {
-            cipherDatabaseAction.unregisterDatabaseListener(it)
-        }
-        biometricMode = Mode.BIOMETRIC_UNAVAILABLE
-        if (hideViews) {
-            showViews(false)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    fun deleteEncryptedDatabaseKey() {
-        mAllowAdvancedUnlockMenu = false
-        advancedUnlockManager?.closeBiometricPrompt()
-        databaseFileUri?.let { databaseUri ->
-            cipherDatabaseAction.deleteByDatabaseUri(databaseUri) {
-                checkUnlockAvailability()
-            }
-        } ?: checkUnlockAvailability()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
-            setAdvancedUnlockedMessageView(errString.toString())
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onAuthenticationFailed() {
-        lifecycleScope.launch(Dispatchers.Main) {
-            Log.e(TAG, "Biometric authentication failed, biometric not recognized")
-            setAdvancedUnlockedMessageView(R.string.advanced_unlock_not_recognized)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onAuthenticationSucceeded() {
-        lifecycleScope.launch(Dispatchers.Main) {
-            when (biometricMode) {
-                Mode.BIOMETRIC_UNAVAILABLE -> {
-                }
-                Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> {
-                }
-                Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED -> {
-                }
-                Mode.KEY_MANAGER_UNAVAILABLE -> {
-                }
-                Mode.WAIT_CREDENTIAL -> {
-                }
-                Mode.STORE_CREDENTIAL -> {
-                    // newly store the entered password in encrypted way
-                    mBuilderListener?.retrieveCredentialForEncryption()?.let { credential ->
-                        advancedUnlockManager?.encryptData(credential)
-                    }
-                }
-                Mode.EXTRACT_CREDENTIAL -> {
-                    // retrieve the encrypted value from preferences
-                    databaseFileUri?.let { databaseUri ->
-                        cipherDatabaseAction.getCipherDatabase(databaseUri) { cipherDatabase ->
-                            cipherDatabase?.encryptedValue?.let { value ->
-                                advancedUnlockManager?.decryptData(value)
-                            } ?: deleteEncryptedDatabaseKey()
-                        }
-                    } ?: run {
-                        onAuthenticationError(-1, getString(R.string.error_database_uri_null))
-                    }
-                }
-            }
-        }
-    }
-
-    override fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray) {
-        databaseFileUri?.let { databaseUri ->
-            mBuilderListener?.onCredentialEncrypted(
-                CipherEncryptDatabase().apply {
-                    this.databaseUri = databaseUri
-                    this.credentialStorage = credentialDatabaseStorage
-                    this.encryptedValue = encryptedValue
-                    this.specParameters = ivSpec
-                }
-            )
-        }
-    }
-
-    override fun handleDecryptedResult(decryptedValue: ByteArray) {
-        // Load database directly with password retrieve
-        databaseFileUri?.let { databaseUri ->
-            mBuilderListener?.onCredentialDecrypted(
-                CipherDecryptDatabase().apply {
-                    this.databaseUri = databaseUri
-                    this.credentialStorage = credentialDatabaseStorage
-                    this.decryptedValue = decryptedValue
-                }
-            )
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onUnrecoverableKeyException(e: Exception) {
-        setAdvancedUnlockedMessageView(R.string.advanced_unlock_invalid_key)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onInvalidKeyException(e: Exception) {
-        setAdvancedUnlockedMessageView(R.string.advanced_unlock_invalid_key)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onGenericException(e: Exception) {
-        val errorMessage = e.cause?.localizedMessage ?: e.localizedMessage ?: ""
-        setAdvancedUnlockedMessageView(errorMessage)
-    }
-
-    private fun showViews(show: Boolean) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            if (show) {
-                if (mAdvancedUnlockInfoView?.visibility != View.VISIBLE)
-                    mAdvancedUnlockInfoView?.showByFading()
-            }
-            else {
-                if (mAdvancedUnlockInfoView?.visibility == View.VISIBLE)
-                    mAdvancedUnlockInfoView?.hideByFading()
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun setAdvancedUnlockedTitleView(textId: Int) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            mAdvancedUnlockInfoView?.setTitle(textId)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun setAdvancedUnlockedMessageView(textId: Int) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            mAdvancedUnlockInfoView?.setMessage(textId)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun setAdvancedUnlockedMessageView(text: CharSequence) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            mAdvancedUnlockInfoView?.message = text
-        }
-    }
-
-    enum class Mode {
-        BIOMETRIC_UNAVAILABLE,
-        BIOMETRIC_SECURITY_UPDATE_REQUIRED,
-        DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED,
-        KEY_MANAGER_UNAVAILABLE,
-        WAIT_CREDENTIAL,
-        STORE_CREDENTIAL,
-        EXTRACT_CREDENTIAL
-    }
-
-    interface BuilderListener {
-        fun retrieveCredentialForEncryption(): ByteArray
-        fun conditionToStoreCredential(): Boolean
-        fun onCredentialEncrypted(cipherEncryptDatabase: CipherEncryptDatabase)
-        fun onCredentialDecrypted(cipherDecryptDatabase: CipherDecryptDatabase)
-    }
-
-    override fun onPause() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (!keepConnection) {
-                // If close prompt, bug "user not authenticated in Android R"
-                disconnect(false)
-                advancedUnlockManager = null
-            }
-        }
-
-        super.onPause()
-    }
-
-    override fun onDestroyView() {
-        mAdvancedUnlockInfoView = null
-
-        super.onDestroyView()
-    }
-
-    override fun onDestroy() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            disconnect()
-            advancedUnlockManager = null
-            mBuilderListener = null
-        }
-
-        super.onDestroy()
-    }
-
-    override fun onDetach() {
-        mBuilderListener = null
-
-        super.onDetach()
-    }
-
-    companion object {
-
-        private val TAG = AdvancedUnlockFragment::class.java.name
-    }
-}

app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt

@@ -1,513 +0,0 @@
-/*
- * Copyright 2020 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.biometric
-
-import android.app.KeyguardManager
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyPermanentlyInvalidatedException
-import android.security.keystore.KeyProperties
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricManager.Authenticators.*
-import androidx.biometric.BiometricPrompt
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.database.CipherDatabaseAction
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import java.security.KeyStore
-import java.security.UnrecoverableKeyException
-import java.util.concurrent.Executors
-import javax.crypto.BadPaddingException
-import javax.crypto.Cipher
-import javax.crypto.KeyGenerator
-import javax.crypto.SecretKey
-import javax.crypto.spec.IvParameterSpec
-
-@RequiresApi(api = Build.VERSION_CODES.M)
-class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity) {
-
-    private var keyStore: KeyStore? = null
-    private var keyGenerator: KeyGenerator? = null
-    private var cipher: Cipher? = null
-
-    private var biometricPrompt: BiometricPrompt? = null
-    private var authenticationCallback = object: BiometricPrompt.AuthenticationCallback() {
-        override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-            advancedUnlockCallback?.onAuthenticationSucceeded()
-        }
-
-        override fun onAuthenticationFailed() {
-            advancedUnlockCallback?.onAuthenticationFailed()
-        }
-
-        override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-            advancedUnlockCallback?.onAuthenticationError(errorCode, errString)
-        }
-    }
-
-    var advancedUnlockCallback: AdvancedUnlockCallback? = null
-
-    private var isKeyManagerInit = false
-
-    private val biometricUnlockEnable = PreferencesUtil.isBiometricUnlockEnable(retrieveContext())
-    private val deviceCredentialUnlockEnable = PreferencesUtil.isDeviceCredentialUnlockEnable(retrieveContext())
-
-    val isKeyManagerInitialized: Boolean
-        get() {
-            if (!isKeyManagerInit) {
-                advancedUnlockCallback?.onGenericException(Exception("Biometric not initialized"))
-            }
-            return isKeyManagerInit
-        }
-
-    private fun isBiometricOperation(): Boolean {
-        return biometricUnlockEnable || isDeviceCredentialBiometricOperation()
-    }
-
-    // Since Android 30, device credential is also a biometric operation
-    private fun isDeviceCredentialOperation(): Boolean {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-                && deviceCredentialUnlockEnable
-    }
-
-    private fun isDeviceCredentialBiometricOperation(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                && deviceCredentialUnlockEnable
-    }
-
-    init {
-        if (isDeviceSecure(retrieveContext())
-                && (biometricUnlockEnable || deviceCredentialUnlockEnable)) {
-            try {
-                this.keyStore = KeyStore.getInstance(ADVANCED_UNLOCK_KEYSTORE)
-                this.keyGenerator = KeyGenerator.getInstance(ADVANCED_UNLOCK_KEY_ALGORITHM, ADVANCED_UNLOCK_KEYSTORE)
-                this.cipher = Cipher.getInstance(
-                        ADVANCED_UNLOCK_KEY_ALGORITHM + "/"
-                                + ADVANCED_UNLOCK_BLOCKS_MODES + "/"
-                                + ADVANCED_UNLOCK_ENCRYPTION_PADDING)
-                isKeyManagerInit = (keyStore != null
-                        && keyGenerator != null
-                        && cipher != null)
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to initialize the keystore", e)
-                isKeyManagerInit = false
-                advancedUnlockCallback?.onGenericException(e)
-            }
-        } else {
-            // really not much to do when no fingerprint support found
-            isKeyManagerInit = false
-        }
-    }
-
-    @Synchronized private fun getSecretKey(): SecretKey? {
-        if (!isKeyManagerInitialized) {
-            return null
-        }
-        try {
-            // Create new key if needed
-            keyStore?.let { keyStore ->
-                keyStore.load(null)
-
-                try {
-                    if (!keyStore.containsAlias(ADVANCED_UNLOCK_KEYSTORE_KEY)) {
-                        // Set the alias of the entry in Android KeyStore where the key will appear
-                        // and the constrains (purposes) in the constructor of the Builder
-                        keyGenerator?.init(
-                                KeyGenParameterSpec.Builder(
-                                    ADVANCED_UNLOCK_KEYSTORE_KEY,
-                                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
-                                    .setBlockModes(ADVANCED_UNLOCK_BLOCKS_MODES)
-                                    .setEncryptionPaddings(ADVANCED_UNLOCK_ENCRYPTION_PADDING)
-                                    .apply {
-                                        // Require the user to authenticate with a fingerprint to authorize every use
-                                        // of the key, don't use it for device credential because it's the user authentication
-                                        if (biometricUnlockEnable) {
-                                            setUserAuthenticationRequired(true)
-                                        }
-                                        // To store in the security chip
-                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
-                                            && retrieveContext().packageManager.hasSystemFeature(
-                                                PackageManager.FEATURE_STRONGBOX_KEYSTORE)) {
-                                            setIsStrongBoxBacked(true)
-                                        }
-                                    }
-                                    .build())
-                        keyGenerator?.generateKey()
-                    }
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to create a key in keystore", e)
-                    advancedUnlockCallback?.onGenericException(e)
-                }
-
-                return keyStore.getKey(ADVANCED_UNLOCK_KEYSTORE_KEY, null) as SecretKey?
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to retrieve the key in keystore", e)
-            advancedUnlockCallback?.onGenericException(e)
-        }
-        return null
-    }
-
-    @Synchronized fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,) {
-        initEncryptData(actionIfCypherInit, true)
-    }
-
-    @Synchronized private fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
-                                firstLaunch: Boolean) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            getSecretKey()?.let { secretKey ->
-                cipher?.let { cipher ->
-                    cipher.init(Cipher.ENCRYPT_MODE, secretKey)
-
-                    actionIfCypherInit.invoke(
-                            AdvancedUnlockCryptoPrompt(
-                                    cipher,
-                                    R.string.advanced_unlock_prompt_store_credential_title,
-                                    R.string.advanced_unlock_prompt_store_credential_message,
-                                    isDeviceCredentialOperation(), isBiometricOperation())
-                    )
-                }
-            }
-        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
-            Log.e(TAG, "Unable to initialize encrypt data", unrecoverableKeyException)
-            advancedUnlockCallback?.onUnrecoverableKeyException(unrecoverableKeyException)
-        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
-            Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
-            if (firstLaunch) {
-                deleteAllEntryKeysInKeystoreForBiometric(retrieveContext())
-                initEncryptData(actionIfCypherInit, false)
-            } else {
-                advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to initialize encrypt data", e)
-            advancedUnlockCallback?.onGenericException(e)
-        }
-    }
-
-    @Synchronized fun encryptData(value: ByteArray) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            val encrypted = cipher?.doFinal(value) ?: byteArrayOf()
-            // passes updated iv spec on to callback so this can be stored for decryption
-            cipher?.parameters?.getParameterSpec(IvParameterSpec::class.java)?.let{ spec ->
-                advancedUnlockCallback?.handleEncryptedResult(encrypted, spec.iv)
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to encrypt data", e)
-            advancedUnlockCallback?.onGenericException(e)
-        }
-    }
-
-    @Synchronized fun initDecryptData(ivSpecValue: ByteArray,
-                        actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
-        initDecryptData(ivSpecValue, actionIfCypherInit, true)
-    }
-
-    @Synchronized private fun initDecryptData(ivSpecValue: ByteArray,
-                        actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
-                        firstLaunch: Boolean = true) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            // important to restore spec here that was used for decryption
-            val spec = IvParameterSpec(ivSpecValue)
-            getSecretKey()?.let { secretKey ->
-                cipher?.let { cipher ->
-                    cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
-
-                    actionIfCypherInit.invoke(
-                            AdvancedUnlockCryptoPrompt(
-                                    cipher,
-                                    R.string.advanced_unlock_prompt_extract_credential_title,
-                                    null,
-                                    isDeviceCredentialOperation(), isBiometricOperation())
-                    )
-                }
-            }
-        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
-            Log.e(TAG, "Unable to initialize decrypt data", unrecoverableKeyException)
-            if (firstLaunch) {
-                deleteKeystoreKey()
-                initDecryptData(ivSpecValue, actionIfCypherInit, firstLaunch)
-            } else {
-                advancedUnlockCallback?.onUnrecoverableKeyException(unrecoverableKeyException)
-            }
-        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
-            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
-            if (firstLaunch) {
-                deleteAllEntryKeysInKeystoreForBiometric(retrieveContext())
-                initDecryptData(ivSpecValue, actionIfCypherInit, firstLaunch)
-            } else {
-                advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to initialize decrypt data", e)
-            advancedUnlockCallback?.onGenericException(e)
-        }
-    }
-
-    @Synchronized fun decryptData(encryptedValue: ByteArray) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            // actual decryption here
-            cipher?.doFinal(encryptedValue)?.let { decrypted ->
-                advancedUnlockCallback?.handleDecryptedResult(decrypted)
-            }
-        } catch (badPaddingException: BadPaddingException) {
-            Log.e(TAG, "Unable to decrypt data", badPaddingException)
-            advancedUnlockCallback?.onInvalidKeyException(badPaddingException)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to decrypt data", e)
-            advancedUnlockCallback?.onGenericException(e)
-        }
-    }
-
-    @Synchronized fun deleteKeystoreKey() {
-        try {
-            keyStore?.load(null)
-            keyStore?.deleteEntry(ADVANCED_UNLOCK_KEYSTORE_KEY)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to delete entry key in keystore", e)
-            advancedUnlockCallback?.onGenericException(e)
-        }
-    }
-
-    @Synchronized fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt,
-                                 deviceCredentialResultLauncher: ActivityResultLauncher<Intent>
-    ) {
-        // Init advanced unlock prompt
-        if (biometricPrompt == null) {
-            biometricPrompt = BiometricPrompt(retrieveContext(),
-                    Executors.newSingleThreadExecutor(),
-                    authenticationCallback)
-        }
-
-        val promptTitle = retrieveContext().getString(cryptoPrompt.promptTitleId)
-        val promptDescription = cryptoPrompt.promptDescriptionId?.let { descriptionId ->
-            retrieveContext().getString(descriptionId)
-        } ?: ""
-
-        if (cryptoPrompt.isBiometricOperation) {
-            val promptInfoExtractCredential = BiometricPrompt.PromptInfo.Builder().apply {
-                setTitle(promptTitle)
-                if (promptDescription.isNotEmpty())
-                    setDescription(promptDescription)
-                setConfirmationRequired(false)
-                if (isDeviceCredentialBiometricOperation()) {
-                    setAllowedAuthenticators(DEVICE_CREDENTIAL)
-                } else {
-                    setNegativeButtonText(retrieveContext().getString(android.R.string.cancel))
-                }
-            }.build()
-            biometricPrompt?.authenticate(
-                    promptInfoExtractCredential,
-                    BiometricPrompt.CryptoObject(cryptoPrompt.cipher))
-        }
-        else if (cryptoPrompt.isDeviceCredentialOperation) {
-            val keyGuardManager = ContextCompat.getSystemService(retrieveContext(), KeyguardManager::class.java)
-            @Suppress("DEPRECATION")
-            deviceCredentialResultLauncher.launch(
-                keyGuardManager?.createConfirmDeviceCredentialIntent(promptTitle, promptDescription)
-            )
-        }
-    }
-
-    @Synchronized fun closeBiometricPrompt() {
-        biometricPrompt?.cancelAuthentication()
-    }
-
-    interface AdvancedUnlockErrorCallback {
-        fun onUnrecoverableKeyException(e: Exception)
-        fun onInvalidKeyException(e: Exception)
-        fun onGenericException(e: Exception)
-    }
-
-    interface AdvancedUnlockCallback : AdvancedUnlockErrorCallback {
-        fun onAuthenticationSucceeded()
-        fun onAuthenticationFailed()
-        fun onAuthenticationError(errorCode: Int, errString: CharSequence)
-        fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray)
-        fun handleDecryptedResult(decryptedValue: ByteArray)
-    }
-
-    companion object {
-
-        private val TAG = AdvancedUnlockManager::class.java.name
-
-        private const val ADVANCED_UNLOCK_KEYSTORE = "AndroidKeyStore"
-        private const val ADVANCED_UNLOCK_KEYSTORE_KEY = "com.kunzisoft.keepass.biometric.key"
-        private const val ADVANCED_UNLOCK_KEY_ALGORITHM = KeyProperties.KEY_ALGORITHM_AES
-        private const val ADVANCED_UNLOCK_BLOCKS_MODES = KeyProperties.BLOCK_MODE_CBC
-        private const val ADVANCED_UNLOCK_ENCRYPTION_PADDING = KeyProperties.ENCRYPTION_PADDING_PKCS7
-
-        @RequiresApi(api = Build.VERSION_CODES.M)
-        fun canAuthenticate(context: Context): Int {
-            return try {
-                BiometricManager.from(context).canAuthenticate(
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                            && PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
-                        BIOMETRIC_STRONG or DEVICE_CREDENTIAL
-                    } else {
-                        BIOMETRIC_STRONG
-                    }
-                )
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to authenticate with strong biometric.", e)
-                try {
-                    BiometricManager.from(context).canAuthenticate(
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                                    && PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
-                                BIOMETRIC_WEAK or DEVICE_CREDENTIAL
-                            } else {
-                                BIOMETRIC_WEAK
-                            }
-                    )
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to authenticate with weak biometric.", e)
-                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE
-                }
-            }
-        }
-
-        @RequiresApi(api = Build.VERSION_CODES.M)
-        fun isDeviceSecure(context: Context): Boolean {
-            val keyguardManager = ContextCompat.getSystemService(context, KeyguardManager::class.java)
-            return keyguardManager?.isDeviceSecure ?: false
-        }
-
-        @RequiresApi(api = Build.VERSION_CODES.M)
-        fun biometricUnlockSupported(context: Context): Boolean {
-            val biometricCanAuthenticate = try {
-                BiometricManager.from(context).canAuthenticate(BIOMETRIC_STRONG)
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to authenticate with strong biometric.", e)
-                try {
-                    BiometricManager.from(context).canAuthenticate(BIOMETRIC_WEAK)
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to authenticate with weak biometric.", e)
-                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE
-                }
-            }
-            return (biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
-                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
-                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
-                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
-                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED
-            )
-        }
-
-        @RequiresApi(api = Build.VERSION_CODES.M)
-        fun deviceCredentialUnlockSupported(context: Context): Boolean {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate(DEVICE_CREDENTIAL)
-                return (biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
-                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
-                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
-                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
-                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED
-                        )
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                ContextCompat.getSystemService(context, KeyguardManager::class.java)?.apply {
-                    return isDeviceSecure
-                }
-            }
-            return false
-        }
-
-        /**
-         * Remove entry key in keystore
-         */
-        @RequiresApi(api = Build.VERSION_CODES.M)
-        fun deleteEntryKeyInKeystoreForBiometric(fragmentActivity: FragmentActivity,
-                                                 advancedCallback: AdvancedUnlockErrorCallback) {
-            AdvancedUnlockManager{ fragmentActivity }.apply {
-                advancedUnlockCallback = object : AdvancedUnlockCallback {
-                    override fun onAuthenticationSucceeded() {}
-
-                    override fun onAuthenticationFailed() {}
-
-                    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {}
-
-                    override fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray) {}
-
-                    override fun handleDecryptedResult(decryptedValue: ByteArray) {}
-
-                    override fun onUnrecoverableKeyException(e: Exception) {
-                        advancedCallback.onUnrecoverableKeyException(e)
-                    }
-
-                    override fun onInvalidKeyException(e: Exception) {
-                        advancedCallback.onInvalidKeyException(e)
-                    }
-
-                    override fun onGenericException(e: Exception) {
-                        advancedCallback.onGenericException(e)
-                    }
-                }
-                deleteKeystoreKey()
-            }
-        }
-
-        fun deleteAllEntryKeysInKeystoreForBiometric(activity: FragmentActivity) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                deleteEntryKeyInKeystoreForBiometric(
-                    activity,
-                    object : AdvancedUnlockErrorCallback {
-                        fun showException(e: Exception) {
-                            Toast.makeText(activity,
-                                activity.getString(R.string.advanced_unlock_scanning_error, e.localizedMessage),
-                                Toast.LENGTH_SHORT).show()
-                        }
-
-                        override fun onUnrecoverableKeyException(e: Exception) {
-                            showException(e)
-                        }
-
-                        override fun onInvalidKeyException(e: Exception) {
-                            showException(e)
-                        }
-
-                        override fun onGenericException(e: Exception) {
-                            showException(e)
-                        }
-                    })
-            }
-            CipherDatabaseAction.getInstance(activity.applicationContext).deleteAll()
-        }
-    }
-
-}

app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockCryptoPrompt.kt

@@ -0,0 +1,17 @@
+package com.kunzisoft.keepass.biometric
+
+import androidx.annotation.StringRes
+import javax.crypto.Cipher
+
+data class DeviceUnlockCryptoPrompt(
+    var type: DeviceUnlockCryptoPromptType,
+    var cipher: Cipher,
+    @StringRes var titleId: Int,
+    @StringRes var descriptionId: Int? = null,
+    var isDeviceCredentialOperation: Boolean,
+    var isBiometricOperation: Boolean
+)
+
+enum class DeviceUnlockCryptoPromptType {
+    CREDENTIAL_ENCRYPTION, CREDENTIAL_DECRYPTION
+}

app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt

@@ -0,0 +1,384 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.biometric
+
+import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
+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.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import androidx.core.view.MenuProvider
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity.Companion.UI_VISIBLE_DURING_LOCK
+import com.kunzisoft.keepass.view.DeviceUnlockView
+import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.view.showByFading
+import com.kunzisoft.keepass.viewmodels.DeviceUnlockPromptMode
+import com.kunzisoft.keepass.viewmodels.DeviceUnlockViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.util.concurrent.Executors
+
+@RequiresApi(Build.VERSION_CODES.M)
+class DeviceUnlockFragment: Fragment() {
+
+    private var mDeviceUnlockView: DeviceUnlockView? = null
+
+    private val mDeviceUnlockViewModel: DeviceUnlockViewModel by activityViewModels()
+
+    private var mBiometricPrompt: BiometricPrompt? = null
+
+    // Only to fix multiple fingerprint menu #332
+    private var mAllowAdvancedUnlockMenu = false
+
+    private var mDeviceCredentialResultLauncher: ActivityResultLauncher<Intent>? = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            mDeviceUnlockViewModel.onAuthenticationSucceeded(result)
+        } else {
+            setAuthenticationFailed()
+        }
+    }
+
+    private var biometricAuthenticationCallback = object: BiometricPrompt.AuthenticationCallback() {
+        override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+            mDeviceUnlockViewModel.onAuthenticationSucceeded(result)
+        }
+
+        override fun onAuthenticationFailed() {
+            setAuthenticationFailed()
+        }
+
+        override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+            setAuthenticationError(errorCode, errString)
+        }
+    }
+
+    private val menuProvider: MenuProvider = object: MenuProvider {
+        override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+            // 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 ->
+                    deleteEncryptedDatabaseKey()
+            }
+            return false
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val rootView = inflater.inflate(R.layout.fragment_advanced_unlock, container, false)
+
+        mDeviceUnlockView = rootView.findViewById(R.id.advanced_unlock_view)
+
+        return rootView
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Init device unlock prompt
+        mBiometricPrompt = BiometricPrompt(
+            this@DeviceUnlockFragment,
+            Executors.newSingleThreadExecutor(),
+            biometricAuthenticationCallback
+        )
+
+        activity?.addMenuProvider(menuProvider, viewLifecycleOwner)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                mDeviceUnlockViewModel.uiState.collect { uiState ->
+                    // Change mode
+                    toggleDeviceCredentialMode(uiState.newDeviceUnlockMode)
+                    // Prompt
+                    manageDeviceCredentialPrompt(uiState.cryptoPromptState)
+                    // Advanced menu
+                    mAllowAdvancedUnlockMenu = uiState.allowAdvancedUnlockMenu
+                    activity?.invalidateOptionsMenu()
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // Don't allow auto open prompt if lock become when UI visible
+        if (UI_VISIBLE_DURING_LOCK) {
+            mDeviceUnlockViewModel.allowAutoOpenBiometricPrompt = false
+        }
+
+        mDeviceUnlockViewModel.checkUnlockAvailability()
+    }
+
+    fun cancelBiometricPrompt() {
+        mBiometricPrompt?.cancelAuthentication()
+    }
+
+    private fun toggleDeviceCredentialMode(deviceUnlockMode: DeviceUnlockMode) {
+        try {
+            when (deviceUnlockMode) {
+                DeviceUnlockMode.BIOMETRIC_UNAVAILABLE -> setNotAvailableMode()
+                DeviceUnlockMode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> setSecurityUpdateRequiredMode()
+                DeviceUnlockMode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED -> setNotConfiguredMode()
+                DeviceUnlockMode.KEY_MANAGER_UNAVAILABLE -> setKeyManagerNotAvailableMode()
+                DeviceUnlockMode.WAIT_CREDENTIAL -> setWaitCredentialMode()
+                DeviceUnlockMode.STORE_CREDENTIAL -> setStoreCredentialMode()
+                DeviceUnlockMode.EXTRACT_CREDENTIAL -> setExtractCredentialMode()
+            }
+        } catch (e: Exception) {
+            mDeviceUnlockViewModel.setException(e)
+        }
+    }
+
+    private fun manageDeviceCredentialPrompt(
+        state: DeviceUnlockPromptMode
+    ) {
+        mDeviceUnlockViewModel.cryptoPrompt?.let { prompt ->
+            when (state) {
+                DeviceUnlockPromptMode.IDLE -> {}
+                DeviceUnlockPromptMode.SHOW -> {
+                    openPrompt(prompt)
+                    mDeviceUnlockViewModel.promptShown()
+                }
+                DeviceUnlockPromptMode.CLOSE -> {
+                    cancelBiometricPrompt()
+                    mDeviceUnlockViewModel.biometricPromptClosed()
+                }
+            }
+        }
+    }
+
+    private fun openPrompt(cryptoPrompt: DeviceUnlockCryptoPrompt) {
+        try {
+            val promptTitle = getString(cryptoPrompt.titleId)
+            val promptDescription = cryptoPrompt.descriptionId?.let { descriptionId ->
+                getString(descriptionId)
+            } ?: ""
+
+            if (cryptoPrompt.isBiometricOperation) {
+                mBiometricPrompt?.authenticate(
+                    BiometricPrompt.PromptInfo.Builder().apply {
+                        setTitle(promptTitle)
+                        if (promptDescription.isNotEmpty())
+                            setDescription(promptDescription)
+                        setConfirmationRequired(false)
+                        if (isDeviceCredentialBiometricOperation(context)) {
+                            setAllowedAuthenticators(DEVICE_CREDENTIAL)
+                        } else {
+                            setNegativeButtonText(getString(android.R.string.cancel))
+                        }
+                    }.build(),
+                    BiometricPrompt.CryptoObject(cryptoPrompt.cipher))
+            } else if (cryptoPrompt.isDeviceCredentialOperation) {
+                context?.let { context ->
+                    @Suppress("DEPRECATION")
+                    mDeviceCredentialResultLauncher?.launch(
+                        ContextCompat.getSystemService(
+                            context,
+                            KeyguardManager::class.java
+                        )?.createConfirmDeviceCredentialIntent(
+                            promptTitle,
+                            promptDescription
+                        )
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to open prompt", e)
+            mDeviceUnlockViewModel.setException(e)
+        }
+    }
+
+    private fun setNotAvailableMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(false)
+            mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener(null)
+        }
+    }
+
+    private fun openBiometricSetting() {
+        mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener {
+            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))
+            }
+        }
+    }
+
+    private fun setSecurityUpdateRequiredMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(true)
+            setAdvancedUnlockedTitleView(R.string.biometric_security_update_required)
+            openBiometricSetting()
+        }
+    }
+
+    private fun setNotConfiguredMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(true)
+            setAdvancedUnlockedTitleView(R.string.configure_biometric)
+            openBiometricSetting()
+        }
+    }
+
+    private fun setKeyManagerNotAvailableMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(true)
+            setAdvancedUnlockedTitleView(R.string.keystore_not_accessible)
+            openBiometricSetting()
+        }
+    }
+
+    private fun setWaitCredentialMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(true)
+            setAdvancedUnlockedTitleView(R.string.unavailable)
+            context?.let { context ->
+                mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener {
+                    mDeviceUnlockViewModel.setException(SecurityException(
+                        context.getString(R.string.credential_before_click_advanced_unlock_button)
+                    ))
+                }
+            }
+        }
+    }
+
+    private fun setStoreCredentialMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(true)
+            setAdvancedUnlockedTitleView(R.string.unlock_and_link_biometric)
+            context?.let { context ->
+                mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener { view ->
+                    mDeviceUnlockViewModel.showPrompt()
+                }
+            }
+        }
+    }
+
+    private fun setExtractCredentialMode() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            showViews(true)
+            setAdvancedUnlockedTitleView(R.string.unlock)
+            context?.let { context ->
+                mDeviceUnlockView?.setDeviceUnlockButtonViewClickListener { view ->
+                    mDeviceUnlockViewModel.showPrompt()
+                }
+            }
+        }
+    }
+
+    fun deleteEncryptedDatabaseKey() {
+        mDeviceUnlockViewModel.deleteEncryptedDatabaseKey()
+    }
+
+    private fun showViews(show: Boolean) {
+        lifecycleScope.launch(Dispatchers.Main) {
+            if (show) {
+                if (mDeviceUnlockView?.visibility != View.VISIBLE)
+                    mDeviceUnlockView?.showByFading()
+            }
+            else {
+                if (mDeviceUnlockView?.visibility == View.VISIBLE)
+                    mDeviceUnlockView?.hideByFading()
+            }
+        }
+    }
+
+    private fun setAdvancedUnlockedTitleView(textId: Int) {
+        lifecycleScope.launch(Dispatchers.Main) {
+            mDeviceUnlockView?.setTitle(textId)
+        }
+    }
+
+    private fun setAuthenticationError(errorCode: Int, errString: CharSequence) {
+        Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
+        when (errorCode) {
+            BiometricPrompt.ERROR_CANCELED,
+            BiometricPrompt.ERROR_NEGATIVE_BUTTON,
+            BiometricPrompt.ERROR_USER_CANCELED -> {
+                // Ignore negative button
+            }
+            else ->
+                mDeviceUnlockViewModel.setException(SecurityException(errString.toString()))
+        }
+    }
+
+    private fun setAuthenticationFailed() {
+        Log.e(TAG, "Biometric authentication failed, biometric not recognized")
+        mDeviceUnlockViewModel.setException(
+            SecurityException(getString(R.string.advanced_unlock_not_recognized))
+        )
+    }
+
+    override fun onDestroyView() {
+        mDeviceUnlockView = null
+        super.onDestroyView()
+    }
+
+    override fun onDestroy() {
+        mDeviceUnlockViewModel.disconnect()
+        super.onDestroy()
+    }
+
+    companion object {
+        private val TAG = DeviceUnlockFragment::class.java.name
+    }
+}

app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockManager.kt

@@ -0,0 +1,430 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.biometric
+
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyPermanentlyInvalidatedException
+import android.security.keystore.KeyProperties
+import android.util.Log
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
+import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
+import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
+import androidx.core.content.ContextCompat
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.app.database.CipherDatabaseAction
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import java.security.KeyStore
+import java.security.UnrecoverableKeyException
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.SecretKey
+import javax.crypto.spec.IvParameterSpec
+
+@RequiresApi(api = Build.VERSION_CODES.M)
+class DeviceUnlockManager(private var appContext: Context) {
+
+    private var keyStore: KeyStore? = null
+    private var keyGenerator: KeyGenerator? = null
+    private var cipher: Cipher? = null
+
+    private var biometricUnlockEnable = isBiometricUnlockEnable(appContext)
+    private var deviceCredentialUnlockEnable = isDeviceCredentialUnlockEnable(appContext)
+
+    init {
+        if (biometricUnlockEnable || deviceCredentialUnlockEnable) {
+            if (isDeviceSecure(appContext)) {
+                try {
+                    this.keyStore = KeyStore.getInstance(ADVANCED_UNLOCK_KEYSTORE)
+                    this.keyGenerator = KeyGenerator.getInstance(
+                        ADVANCED_UNLOCK_KEY_ALGORITHM,
+                        ADVANCED_UNLOCK_KEYSTORE
+                    )
+                    this.cipher = Cipher.getInstance(
+                        ADVANCED_UNLOCK_KEY_ALGORITHM + "/"
+                                + ADVANCED_UNLOCK_BLOCKS_MODES + "/"
+                                + ADVANCED_UNLOCK_ENCRYPTION_PADDING
+                    )
+                    if (keyStore == null) {
+                        throw SecurityException("Unable to initialize the keystore")
+                    }
+                    if (keyGenerator == null) {
+                        throw SecurityException("Unable to initialize the key generator")
+                    }
+                    if (cipher == null) {
+                        throw SecurityException("Unable to initialize the cipher")
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to initialize the device unlock manager", e)
+                    throw e
+                }
+            } else {
+                throw SecurityException("Device not secure enough")
+            }
+        }
+    }
+
+    @Synchronized private fun getSecretKey(): SecretKey? {
+        try {
+            // Create new key if needed
+            keyStore?.let { keyStore ->
+                keyStore.load(null)
+                try {
+                    if (!keyStore.containsAlias(ADVANCED_UNLOCK_KEYSTORE_KEY)) {
+                        // Set the alias of the entry in Android KeyStore where the key will appear
+                        // and the constrains (purposes) in the constructor of the Builder
+                        keyGenerator?.init(
+                                KeyGenParameterSpec.Builder(
+                                    ADVANCED_UNLOCK_KEYSTORE_KEY,
+                                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+                                    .setBlockModes(ADVANCED_UNLOCK_BLOCKS_MODES)
+                                    .setEncryptionPaddings(ADVANCED_UNLOCK_ENCRYPTION_PADDING)
+                                    .apply {
+                                        // Require the user to authenticate with a fingerprint to authorize every use
+                                        // of the key, don't use it for device credential because it's the user authentication
+                                        if (biometricUnlockEnable) {
+                                            setUserAuthenticationRequired(true)
+                                        }
+                                        // To store in the security chip
+                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
+                                            && appContext.packageManager.hasSystemFeature(
+                                                PackageManager.FEATURE_STRONGBOX_KEYSTORE)) {
+                                            setIsStrongBoxBacked(true)
+                                        }
+                                    }
+                                    .build())
+                        keyGenerator?.generateKey()
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to create a key in keystore", e)
+                    throw e
+                }
+                return keyStore.getKey(ADVANCED_UNLOCK_KEYSTORE_KEY, null) as SecretKey?
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to retrieve the key in keystore", e)
+            throw e
+        }
+        return null
+    }
+
+    @Synchronized fun initEncryptData(
+        actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
+    ) {
+        initEncryptData(true, actionIfCypherInit)
+    }
+
+    @Synchronized private fun initEncryptData(
+        firstLaunch: Boolean,
+        actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
+    ) {
+        try {
+            getSecretKey()?.let { secretKey ->
+                cipher?.let { cipher ->
+                    cipher.init(Cipher.ENCRYPT_MODE, secretKey)
+                    actionIfCypherInit.invoke(
+                        DeviceUnlockCryptoPrompt(
+                            type = DeviceUnlockCryptoPromptType.CREDENTIAL_ENCRYPTION,
+                            cipher = cipher,
+                            titleId = R.string.advanced_unlock_prompt_store_credential_title,
+                            descriptionId = R.string.advanced_unlock_prompt_store_credential_message,
+                            isDeviceCredentialOperation = isDeviceCredentialOperation(
+                                deviceCredentialUnlockEnable
+                            ),
+                            isBiometricOperation = isBiometricOperation(
+                                biometricUnlockEnable, deviceCredentialUnlockEnable
+                            )
+                        )
+                    )
+                }
+            }
+        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
+            Log.e(TAG, "Unable to initialize encrypt data", unrecoverableKeyException)
+            throw unrecoverableKeyException
+        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
+            Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
+            if (firstLaunch) {
+                deleteAllEntryKeysInKeystoreForBiometric(appContext)
+                initEncryptData(false, actionIfCypherInit)
+            } else {
+                throw invalidKeyException
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to initialize encrypt data", e)
+            throw e
+        }
+    }
+
+    @Synchronized fun encryptData(
+        value: ByteArray,
+        cipher: Cipher?,
+        handleEncryptedResult: (encryptedValue: ByteArray, ivSpec: ByteArray) -> Unit
+    ) {
+        try {
+            val encrypted = cipher?.doFinal(value) ?: byteArrayOf()
+            // passes updated iv spec on to callback so this can be stored for decryption
+            cipher?.parameters?.getParameterSpec(IvParameterSpec::class.java)?.let{ spec ->
+                handleEncryptedResult.invoke(encrypted, spec.iv)
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to encrypt data", e)
+            throw e
+        }
+    }
+
+    @Synchronized fun initDecryptData(
+        ivSpecValue: ByteArray,
+        actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
+    ) {
+        initDecryptData(ivSpecValue, true, actionIfCypherInit)
+    }
+
+    @Synchronized private fun initDecryptData(
+        ivSpecValue: ByteArray,
+        firstLaunch: Boolean = true,
+        actionIfCypherInit: (cryptoPrompt: DeviceUnlockCryptoPrompt) -> Unit
+    ) {
+        try {
+            // important to restore spec here that was used for decryption
+            val spec = IvParameterSpec(ivSpecValue)
+            getSecretKey()?.let { secretKey ->
+                cipher?.let { cipher ->
+                    cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
+                    actionIfCypherInit.invoke(
+                        DeviceUnlockCryptoPrompt(
+                            type = DeviceUnlockCryptoPromptType.CREDENTIAL_DECRYPTION,
+                            cipher = cipher,
+                            titleId = R.string.advanced_unlock_prompt_extract_credential_title,
+                            descriptionId = null,
+                            isDeviceCredentialOperation = isDeviceCredentialOperation(
+                                deviceCredentialUnlockEnable
+                            ),
+                            isBiometricOperation = isBiometricOperation(
+                                biometricUnlockEnable, deviceCredentialUnlockEnable
+                            )
+                        )
+                    )
+                }
+            }
+        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
+            Log.e(TAG, "Unable to initialize decrypt data", unrecoverableKeyException)
+            if (firstLaunch) {
+                deleteKeystoreKey()
+                initDecryptData(ivSpecValue, false, actionIfCypherInit)
+            } else {
+                throw unrecoverableKeyException
+            }
+        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
+            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
+            if (firstLaunch) {
+                deleteAllEntryKeysInKeystoreForBiometric(appContext)
+                initDecryptData(ivSpecValue, false, actionIfCypherInit)
+            } else {
+                throw invalidKeyException
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to initialize decrypt data", e)
+            throw e
+        }
+    }
+
+    @Synchronized fun decryptData(
+        encryptedValue: ByteArray,
+        cipher: Cipher?,
+        handleDecryptedResult: (decryptedValue: ByteArray) -> Unit
+    ) {
+        try {
+            // actual decryption here
+            cipher?.doFinal(encryptedValue)?.let { decrypted ->
+                handleDecryptedResult.invoke(decrypted)
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to decrypt data", e)
+            throw e
+        }
+    }
+
+    @Synchronized fun deleteKeystoreKey() {
+        try {
+            keyStore?.load(null)
+            keyStore?.deleteEntry(ADVANCED_UNLOCK_KEYSTORE_KEY)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to delete entry key in keystore", e)
+            throw e
+        }
+    }
+
+    companion object {
+
+        private val TAG = DeviceUnlockManager::class.java.name
+
+        private const val ADVANCED_UNLOCK_KEYSTORE = "AndroidKeyStore"
+        private const val ADVANCED_UNLOCK_KEYSTORE_KEY = "com.kunzisoft.keepass.biometric.key"
+        private const val ADVANCED_UNLOCK_KEY_ALGORITHM = KeyProperties.KEY_ALGORITHM_AES
+        private const val ADVANCED_UNLOCK_BLOCKS_MODES = KeyProperties.BLOCK_MODE_CBC
+        private const val ADVANCED_UNLOCK_ENCRYPTION_PADDING = KeyProperties.ENCRYPTION_PADDING_PKCS7
+
+        @RequiresApi(api = Build.VERSION_CODES.M)
+        fun canAuthenticate(context: Context): Int {
+            return try {
+                BiometricManager.from(context).canAuthenticate(
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                            && PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
+                        BIOMETRIC_STRONG or DEVICE_CREDENTIAL
+                    } else {
+                        BIOMETRIC_STRONG
+                    }
+                )
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to authenticate with strong biometric.", e)
+                try {
+                    BiometricManager.from(context).canAuthenticate(
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                                    && PreferencesUtil.isDeviceCredentialUnlockEnable(context)) {
+                                BIOMETRIC_WEAK or DEVICE_CREDENTIAL
+                            } else {
+                                BIOMETRIC_WEAK
+                            }
+                    )
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to authenticate with weak biometric.", e)
+                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE
+                }
+            }
+        }
+
+        fun isDeviceSecure(context: Context): Boolean {
+            return ContextCompat.getSystemService(context, KeyguardManager::class.java)
+                ?.isDeviceSecure ?: false
+        }
+
+        fun biometricUnlockSupported(context: Context): Boolean {
+            val biometricCanAuthenticate = try {
+                BiometricManager.from(context).canAuthenticate(BIOMETRIC_STRONG)
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to authenticate with strong biometric.", e)
+                try {
+                    BiometricManager.from(context).canAuthenticate(BIOMETRIC_WEAK)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to authenticate with weak biometric.", e)
+                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE
+                }
+            }
+            return (biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED
+            )
+        }
+
+        fun deviceCredentialUnlockSupported(context: Context): Boolean {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate(DEVICE_CREDENTIAL)
+                (biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED
+                        )
+            } else {
+                true
+            }
+        }
+
+        /**
+         * Remove entry key in keystore
+         */
+        fun deleteEntryKeyInKeystoreForBiometric(
+            appContext: Context
+        ) {
+            DeviceUnlockManager(appContext).apply {
+                deleteKeystoreKey()
+            }
+        }
+
+        fun deleteAllEntryKeysInKeystoreForBiometric(appContext: Context) {
+            try {
+                deleteEntryKeyInKeystoreForBiometric(appContext)
+            } catch (e: Exception) {
+                Toast.makeText(appContext,
+                    deviceUnlockError(e, appContext),
+                    Toast.LENGTH_SHORT).show()
+            } finally {
+                CipherDatabaseAction.getInstance(appContext).deleteAll()
+            }
+        }
+    }
+}
+
+fun deviceUnlockError(error: Exception, context: Context): String {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+        && (error is UnrecoverableKeyException
+                || error is KeyPermanentlyInvalidatedException)) {
+        context.getString(R.string.advanced_unlock_invalid_key)
+    } else
+        error.cause?.localizedMessage
+            ?: error.localizedMessage
+            ?: error.toString()
+}
+
+fun isBiometricUnlockEnable(appContext: Context) =
+    PreferencesUtil.isBiometricUnlockEnable(appContext)
+
+fun isDeviceCredentialUnlockEnable(appContext: Context) =
+    PreferencesUtil.isDeviceCredentialUnlockEnable(appContext)
+
+private fun isBiometricOperation(
+    biometricUnlockEnable: Boolean,
+    deviceCredentialUnlockEnable: Boolean
+): Boolean {
+    return biometricUnlockEnable
+            || isDeviceCredentialBiometricOperation(deviceCredentialUnlockEnable)
+}
+
+// Since Android 30, device credential is also a biometric operation
+private fun isDeviceCredentialOperation(
+    deviceCredentialUnlockEnable: Boolean
+): Boolean {
+    return Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+            && deviceCredentialUnlockEnable
+}
+
+private fun isDeviceCredentialBiometricOperation(
+    deviceCredentialUnlockEnable: Boolean
+): Boolean {
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+            && deviceCredentialUnlockEnable
+}
+
+fun isDeviceCredentialBiometricOperation(context: Context?): Boolean {
+    if (context == null) {
+        return false
+    }
+    return isDeviceCredentialBiometricOperation(
+        isDeviceCredentialUnlockEnable(context)
+    )
+}

app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockMode.kt

@@ -0,0 +1,11 @@
+package com.kunzisoft.keepass.biometric
+
+enum class DeviceUnlockMode {
+    BIOMETRIC_UNAVAILABLE,
+    BIOMETRIC_SECURITY_UPDATE_REQUIRED,
+    DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED,
+    KEY_MANAGER_UNAVAILABLE,
+    WAIT_CREDENTIAL,
+    STORE_CREDENTIAL,
+    EXTRACT_CREDENTIAL
+}

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()
-    }
-}

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
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt

@@ -17,17 +17,30 @@
  *  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.Manifest
-import android.content.*
+import android.content.BroadcastReceiver
-import android.content.Context.*
+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.core.content.ContextCompat.RECEIVER_NOT_EXPORTED
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import com.kunzisoft.keepass.R
@@ -35,7 +48,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 +55,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 +94,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
+    // To show dialog only if context is an activity
-    private var service: Service? = null
+    private var activity: FragmentActivity? = try { context as? FragmentActivity? }
-    private var context: Context
+    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 +130,49 @@ class DatabaseTaskProvider {
     private var progressTaskDialogFragment: ProgressTaskDialogFragment? = null
     private var databaseChangedDialogFragment: DatabaseChangedDialogFragment? = null
 
-    constructor(activity: FragmentActivity) {
+    fun destroy() {
-        this.activity = activity
+        this.activity = null
-        this.context = activity
+        this.onDatabaseRetrieved = null
-        this.intentDatabaseTask = Intent(activity.applicationContext,
+        this.onActionFinish = null
-            DatabaseTaskNotificationService::class.java)
+        this.databaseTaskBroadcastReceiver = null
-    }
+        this.mBinder = null
-
+        this.serviceConnection = null
-    constructor(service: Service) {
+        this.progressTaskDialogFragment = null
-        this.service = service
+        this.databaseChangedDialogFragment = null
-        this.context = service
-        this.intentDatabaseTask = Intent(service.applicationContext,
-            DatabaseTaskNotificationService::class.java)
     }
 
     private val actionTaskListener = object: DatabaseTaskNotificationService.ActionTaskListener {
-        override fun onStartAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
+        override fun onActionStarted(
-            startDialog(titleId, messageId, warningId)
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        ) {
+            if (showDialog)
+                startDialog(progressMessage)
         }
 
-        override fun onUpdateAction(database: Database, titleId: Int?, messageId: Int?, warningId: Int?) {
+        override fun onActionUpdated(
-            updateDialog(titleId, messageId, warningId)
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        ) {
+            if (showDialog)
+                updateDialog(progressMessage)
         }
 
-        override fun onStopAction(database: Database, actionTask: String, result: ActionRunnable.Result) {
+        override fun onActionStopped(
-            onActionFinish?.invoke(database, actionTask, result)
+            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,9 +181,13 @@ class DatabaseTaskProvider {
         }
     }
 
-    private var databaseInfoListener = object: DatabaseTaskNotificationService.DatabaseInfoListener {
+    private var databaseInfoListener = object:
-        override fun onDatabaseInfoChanged(previousDatabaseInfo: SnapFileDatabaseInfo,
+        DatabaseTaskNotificationService.DatabaseInfoListener {
-                                           newDatabaseInfo: SnapFileDatabaseInfo) {
+        override fun onDatabaseInfoChanged(
+            previousDatabaseInfo: SnapFileDatabaseInfo,
+            newDatabaseInfo: SnapFileDatabaseInfo,
+            readOnlyDatabase: Boolean
+        ) {
             activity?.let { activity ->
                 activity.lifecycleScope.launch {
                     if (databaseChangedDialogFragment == null) {
@@ -161,7 +199,8 @@ class DatabaseTaskProvider {
                     if (progressTaskDialogFragment == null) {
                         databaseChangedDialogFragment = DatabaseChangedDialogFragment.getInstance(
                             previousDatabaseInfo,
-                            newDatabaseInfo
+                            newDatabaseInfo,
+                            readOnlyDatabase
                         )
                         databaseChangedDialogFragment?.actionDatabaseListener =
                             mActionDatabaseListener
@@ -176,14 +215,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,
+    private fun startDialog(progressMessage: ProgressMessage) {
-                            messageId: Int? = null,
-                            warningId: Int? = null) {
         activity?.let { activity ->
             activity.lifecycleScope.launch {
                 if (progressTaskDialogFragment == null) {
@@ -197,22 +234,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(progressMessage.titleId)
-                updateTitle(it)
+            updateMessage(progressMessage.messageId)
-            }
+            updateWarning(progressMessage.warningId)
-            messageId?.let {
+            setCancellable(progressMessage.cancelable)
-                updateMessage(it)
-            }
-            warningId?.let {
-                updateWarning(it)
-            }
         }
     }
 
@@ -224,11 +256,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)
+                        addServiceListeners(this)
-                        addDatabaseFileInfoListener(databaseInfoListener)
-                        addActionTaskListener(actionTaskListener)
                         getService().checkDatabase()
                         getService().checkDatabaseInfo()
                         getService().checkAction()
@@ -236,19 +274,29 @@ class DatabaseTaskProvider {
                 }
 
                 override fun onServiceDisconnected(name: ComponentName?) {
-                    mBinder?.removeActionTaskListener(actionTaskListener)
+                    removeServiceListeners(mBinder)
-                    mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
-                    mBinder?.removeDatabaseListener(databaseListener)
                     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 {
-            context.bindService(intentDatabaseTask, it, BIND_AUTO_CREATE or BIND_NOT_FOREGROUND or BIND_ABOVE_CLIENT)
+            context.bindService(intentDatabaseTask, it, BIND_AUTO_CREATE or BIND_IMPORTANT or BIND_ABOVE_CLIENT)
         }
     }
 
@@ -256,19 +304,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 {
+        try {
-            context.unbindService(it)
+            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 +326,16 @@ class DatabaseTaskProvider {
                     }
                     DATABASE_STOP_TASK_ACTION -> {
                         // Remove the progress task
-                        stopDialog()
                         unBindService()
                     }
                 }
             }
         }
-        context.registerReceiver(databaseTaskBroadcastReceiver,
+        ContextCompat.registerReceiver(context, databaseTaskBroadcastReceiver,
-                IntentFilter().apply {
+            IntentFilter().apply {
-                    addAction(DATABASE_START_TASK_ACTION)
+                addAction(DATABASE_START_TASK_ACTION)
-                    addAction(DATABASE_STOP_TASK_ACTION)
+                addAction(DATABASE_STOP_TASK_ACTION)
-                }
+            }, RECEIVER_NOT_EXPORTED
         )
 
         // Check if a service is currently running else do nothing
@@ -297,11 +343,7 @@ class DatabaseTaskProvider {
     }
 
     fun unregisterProgressTask() {
-        stopDialog()
+        removeServiceListeners(mBinder)
-
-        mBinder?.removeActionTaskListener(actionTaskListener)
-        mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
-        mBinder?.removeDatabaseListener(databaseListener)
         mBinder = null
 
         unBindService()
@@ -313,7 +355,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 +406,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 +417,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 +438,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 +456,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 +472,15 @@ class DatabaseTaskProvider {
         }
     }
 
-    fun startDatabaseAssignPassword(databaseUri: Uri,
+    fun startDatabaseAssignCredential(databaseUri: Uri,
-                                    mainCredential: MainCredential) {
+                                      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 +497,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 +508,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 +519,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 +530,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 +553,13 @@ class DatabaseTaskProvider {
 
         start(Bundle().apply {
             putAll(getBundleFromListNodes(nodesPaste))
-            putParcelableArrayList(DatabaseTaskNotificationService.GROUPS_ID_KEY, groupsIdToCopy)
+            putParcelableList(DatabaseTaskNotificationService.GROUPS_ID_KEY, groupsIdToCopy)
-            putParcelableArrayList(DatabaseTaskNotificationService.ENTRIES_ID_KEY, entriesIdToCopy)
+            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 +593,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 +604,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 +621,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 +632,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 +643,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 +654,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 +665,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 +705,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 +716,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 +733,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 +744,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 +755,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 +766,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 +777,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 +788,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
     }
-}
+}

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
+    }
+}

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
+)

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
-        }
-    }
-}

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.database.ContextualDatabase
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
+import com.kunzisoft.keepass.database.MainCredential
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.hardware.HardwareKey
-import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.utils.getBinaryDir
-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) {
 
+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)
     }
 }

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.database.ContextualDatabase
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
+import com.kunzisoft.keepass.database.MainCredential
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.exception.LoadDatabaseException
+import com.kunzisoft.keepass.database.exception.DatabaseInputException
-import com.kunzisoft.keepass.model.CipherEncryptDatabase
+import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
-import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.hardware.HardwareKey
-import com.kunzisoft.keepass.settings.PreferencesUtil
 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,
+class LoadDatabaseRunnable(
-                           private val mDatabase: Database,
+    private val context: Context,
-                           private val mUri: Uri,
+    private val mDatabase: ContextualDatabase,
-                           private val mMainCredential: MainCredential,
+    private val mDatabaseUri: Uri,
-                           private val mReadonly: Boolean,
+    private val mMainCredential: MainCredential,
-                           private val mCipherEncryptDatabase: CipherEncryptDatabase?,
+    private val mChallengeResponseRetriever: (hardwareKey: HardwareKey, seed: ByteArray?) -> ByteArray,
-                           private val mFixDuplicateUUID: Boolean,
+    private val mReadonly: Boolean,
-                           private val progressTaskUpdater: ProgressTaskUpdater?,
+    private val mFixDuplicateUUID: Boolean,
-                           private val mLoadDatabaseResult: ((Result) -> Unit)?)
+    private val progressTaskUpdater: ProgressTaskUpdater?
-    : ActionRunnable() {
+) : 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,
+            val contentResolver = context.contentResolver
-                    mMainCredential,
+            // Save database URI
-                    mReadonly,
+            mDatabase.fileUri = mDatabaseUri
-                    context.contentResolver,
+            mDatabase.loadData(
-                    UriUtil.getBinaryDir(context),
+                contentResolver.getUriInputStream(mDatabaseUri)
-                    { memoryWanted ->
+                    ?: throw UnknownDatabaseLocationException(),
-                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                mMainCredential.toMasterCredential(contentResolver),
-                    },
+                mChallengeResponseRetriever,
-                    mFixDuplicateUUID,
+                mReadonly,
-                    progressTaskUpdater)
+                binaryDir,
-        }
+                { memoryWanted ->
-        catch (e: LoadDatabaseException) {
+                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                },
+                mFixDuplicateUUID,
+                progressTaskUpdater
+            )
+        } catch (e: DatabaseInputException) {
             setError(e)
         }
 
-        if (result.isSuccess) {
+        if (!result.isSuccess) {
-            // Save keyFile in app database
+            mDatabase.clearAndClose(binaryDir)
-            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)
         }
     }
 
     override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
+        afterLoadDatabase?.invoke(result)
     }
 }

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.database.exception.DatabaseException
-import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
-import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.hardware.HardwareKey
-import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
+import com.kunzisoft.keepass.utils.getUriInputStream
 
-class MergeDatabaseRunnable(private val context: Context,
+class MergeDatabaseRunnable(
-                            private val mDatabase: Database,
+    context: Context,
-                            private val mDatabaseToMergeUri: Uri?,
+    private val mDatabaseToMergeUri: Uri?,
-                            private val mDatabaseToMergeMainCredential: MainCredential?,
+    private val mDatabaseToMergeMainCredential: MainCredential?,
-                            private val progressTaskUpdater: ProgressTaskUpdater?,
+    private val mDatabaseToMergeChallengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray,
-                            private val mLoadDatabaseResult: ((Result) -> Unit)?)
+    database: ContextualDatabase,
-    : ActionRunnable() {
+    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,
+            val contentResolver = context.contentResolver
-                mDatabaseToMergeMainCredential,
+            database.mergeData(
-                context.contentResolver,
+                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) {
+        super.onActionRun()
-            // Register the current time to init the lock timer
-            PreferencesUtil.saveCurrentTime(context)
-        }
-    }
-
-    override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
     }
 }

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.database.exception.DatabaseException
-import com.kunzisoft.keepass.settings.PreferencesUtil
+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,
+class ReloadDatabaseRunnable(
-                             private val mDatabase: Database,
+    private val context: Context,
-                             private val progressTaskUpdater: ProgressTaskUpdater?,
+    private val mDatabase: ContextualDatabase,
-                             private val mLoadDatabaseResult: ((Result) -> Unit)?)
+    private val progressTaskUpdater: ProgressTaskUpdater?
-    : ActionRunnable() {
+) : 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,
+            mDatabase.reloadData(
-                    { memoryWanted ->
+                context.contentResolver.getUriInputStream(mDatabase.fileUri)
-                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                    ?: throw UnknownDatabaseLocationException(),
-                    },
+                { memoryWanted ->
-                    progressTaskUpdater)
+                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
-        } catch (e: LoadDatabaseException) {
+                },
+                progressTaskUpdater)
+        } catch (e: DatabaseException) {
             setError(e)
         }
 
-        if (result.isSuccess) {
+        if (!result.isSuccess) {
-            // Register the current time to init the lock timer
+            mDatabase.clearAndClose(binaryDir)
-            PreferencesUtil.saveCurrentTime(context)
-        } else {
-            mDatabase.clearAndClose(context)
         }
     }
 
     override fun onFinishRun() {
-        mLoadDatabaseResult?.invoke(result)
+        afterReloadDatabase?.invoke(result)
     }
 }

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,
+    context: Context,
-        database: Database,
+    database: ContextualDatabase,
-        saveDatabase: Boolean)
+    saveDatabase: Boolean,
-    : SaveDatabaseRunnable(context, database, saveDatabase) {
+    challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {
 
     override fun onActionRun() {
         try {