Merge branch 'release/2.9.18'

Merge branch 'develop' of https://hosted.weblate.org/git/keepass-dx/strings into translations
Change Pro description
2025-12-04 15:49:33 +01:00 · 2021-04-20 20:11:05 +02:00 · 2021-04-20 11:57:48 +02:00 · 2021-04-20 11:46:55 +02:00 · 2021-04-20 11:36:52 +02:00 · 2021-04-20 11:35:14 +02:00
669 changed files with 44508 additions and 27352 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -20,7 +20,7 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.

-** Keepass Database **
+**KeePass Database**
 - Created with: [e.g Windows KeePass 2.42]
 - Version: [e.g. 2]
 - Location: [e.g. Remote file retrieved with GDrive app]
--- a/172
+++ b/172
@@ -1,3 +1,175 @@
+KeePassDX(2.9.18)
+ * Move groups #658
+ * Improve autofill recognition #960
+ * Remove diacritical marks in search string #945
+ * Fix search in references #962
+ * Fix themes in Libre version
+
+KeePassDX(2.9.17)
+ * Import / Export app properties #839
+ * Force twofish padding compatibility #955
+ * Better timeout preference #579
+
+KeePassDX(2.9.16)
+ * Fix small bugs #948
+
+KeePassDX(2.9.15)
+ * Fix themes #935 #926
+ * Decrease default clipboard time #934
+ * Better opening performance #929 #933
+ * Fix memory usage setting #941
+
+KeePassDX(2.9.14)
+ * Add custom icons #96
+ * Dark Themes #532 #714
+ * Fix binary deduplication #715
+ * Fix IconId #901
+ * Resize image stream dynamically to prevent slowdown #919
+ * Small changes #795 #900 #903 #909 #914
+
+KeePassDX(2.9.13)
+ * Binary image viewer #473 #749
+ * Fix TOTP plugin settings #878
+ * Allow Emoji #796
+ * Scroll and better UI in entry edition screen #876
+ * Better UI #876
+ * Fix themes and add Purple Dark #889
+ * Allow OTP with many padding #585
+ * Add notes in groups #734
+
+KeePassDX(2.9.12)
+ * Fix OTP token type #863
+ * Fix auto open biometric prompt #862
+ * Fix back appearance setting #865
+ * Fix orientation change in settings #872
+ * Change memory unit to MiB #851
+ * Small changes #642
+
+KeePassDX(2.9.11)
+ * Add Keyfile XML version 2 (fix hex) #844
+ * Fix hex Keyfile #861
+
+KeePassDX(2.9.10)
+ * Try to fix autofill #852
+ * Fix database change dialog displayed too often #853
+
+KeePassDX(2.9.9)
+ * Detect file changes and reload database #794
+ * Inline suggestions autofill with compatible keyboard (Android R) #827
+ * Add Keyfile XML version 2 #844
+ * Fix binaries of 64 bytes #835
+ * Special search in title fields #830
+ * Priority to OTP button in notifications #845
+ * Fix OTP generation for long secret key #848
+ * Fix small bugs #849
+
+KeePassDX(2.9.8)
+ * Fix specific attachments with kdbx3.1 databases #828
+ * Fix small bugs
+
+KeePassDX(2.9.7)
+ * Remove write permission since Android 10 #823
+ * Fix small bugs
+
+KeePassDX(2.9.6)
+ * Fix KeyFile bug #820
+
+KeePassDX(2.9.5)
+ * Unlock database by device credentials (PIN/Password/Pattern) with Android M+ #102 #152 #811
+ * Prevent auto switch back to previous keyboard if otp field exists #814
+ * Fix timeout reset #817
+
+KeePassDX(2.9.4)
+ * Fix small bugs #812
+ * Argon2ID implementation #791
+
+KeePassDX(2.9.3)
+ * Unlock database by device credentials (PIN/Password/Pattern) #779 #102
+ * Advanced unlock with timeout #102 #437 #566
+ * Remove default database parameter when the file is no longer accessible #803
+ * Move OTP button to the first view level in Magikeyboard #587
+ * Tooltips for Magikeyboard #586
+ * Fix small bugs #805
+
+KeePassDX(2.9.2)
+ * Managing OTP links from QR applications #556
+ * Prevent manual creation of existing field name #718
+ * Harmonization of field names #789
+ * Different channels for each type of notification #688
+ * Fix OTP #780 #781
+ * Fix same save shared info #783
+ * Fix switch back to previous keyboard #782
+ * Fix read only #792
+ * Better UI #719 #534 #617 #793
+
+KeePassDX(2.9.1)
+ * Copy password from generator #697
+ * Fix Magikeyboard not fully visible #772
+ * Fix change font size #770
+ * Fix crash #774
+ * Small fixes #771
+
+KeePassDX(2.9)
+ * Upgrade to Android API 30 #723
+ * Save new credentials with Autofill #524
+ * Setting to close database after Autofill selection #755
+ * Setting to switch keyboard when database is locked #625
+ * Fix biometric issues #724 #740 #731
+ * Fix autofill #725 #551
+ * Fix subdomain search #728
+ * Fix backup search #759
+ * Small fixes and translations #732 #736 #737 #738 #742 #767
+
+KeePassDX(2.8.7)
+ * Downgrade to Android API 29 (crash on startup with API 30 on some devices)
+ Sorry for the inconvenience
+
+KeePassDX(2.8.6)
+ * Fix Autofill recognition #712
+ * Keep value after renaming custom field #709
+ * Prevent random binary bug #713
+ * Fix dialog background #717
+ * Better domain recognition for autofill #702
+ * Write custom data #651
+ * Fix autolink #720
+
+KeePassDX(2.8.5)
+ * Fix Base 64 #708
+
+KeePassDX(2.8.4)
+ * Fix incomplete attachment deletion #684
+ * Fix opening database v1 without backup folder #692
+ * Fix ANR during first entry education #685
+ * Entry edition as fragment and manual views to fix focus #686
+ * Fix opening database with corrupted attachment #691
+ * Manage empty keyfile #679
+
+KeePassDX(2.8.3)
+ * Upload attachments
+ * Visibility button for each hidden field
+ * Fix read header file
+ * Fix deletion in KDB database
+ * Fix minor issues
+
+KeePassDX(2.8.2)
+ * Fix themes / new UI
+ * Fix multiples notifications
+ * Fix entry in Magikeyboard memory
+ * Fix biometric view visibility
+ * Fix fields order
+ * Upgrade code with ViewModel and LiveData
+
+KeePassDX(2.8.1)
+ * Capture exceptions in coroutines
+
+KeePassDX(2.8)
+ * Fix TOTP period (> 60s)
+ * Fix searching in recycle bin
+ * Settings to back to the previous keyboard during database credentials and after form filling
+ * Improve action tasks
+ * Improve recognition to reset app timeout
+ * Fix minor issues
+
 KeePassDX(2.7)
 * Add blocklists for autofill
 * Add autofill compatibility mode (usefull for Browser not compatible)
--- a/1015
+++ b/1015
--- a/LICENSES/LICENSE_APACHE
+++ b/LICENSES/LICENSE_APACHE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/LICENSES/LICENSE_BOUNCY_CASTLE
+++ b/LICENSES/LICENSE_BOUNCY_CASTLE
@@ -0,0 +1,7 @@
+Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/LICENSES/LICENSE_FONT_FIRA_MONO_REGULAR.txt
+++ b/LICENSES/LICENSE_FONT_FIRA_MONO_REGULAR.txt
--- a/LICENSES/LICENSE_ICON_PACK_CLASSIC
+++ b/LICENSES/LICENSE_ICON_PACK_CLASSIC
@@ -0,0 +1,111 @@
+Files ic00.png to ic61.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+TITLE:    NUVOLA ICON THEME for KDE 3.x
+AUTHOR:    David Vignoni | ICON KING
+SITE:    http://www.icon-king.com
+MAILING LIST: http://mail.icon-king.com/mailman/listinfo/nuvola_icon-king.com
+
+Copyright (c)  2003-2004  David Vignoni.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation,
+version 2.1 of the License.
+This library 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
+Lesser General Public License for more details.
+You should have received a copy of the GNU Lesser General Public
+License along with this library (see the the license.txt file); if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#######**** NOTE THIS ADD-ON ****#######
+The GNU Lesser General Public License or LGPL is written for software libraries
+in the first place. The LGPL has to be considered valid for this artwork
+library too.
+Nuvola icon theme for KDE 3.x is a special kind of software library, it is an
+artwork library, it's elements can be used in a Graphical User Interface, or
+GUI.
+Source code, for this library means:
+ - raster png image* .
+The LGPL in some sections obliges you to make the files carry
+notices. With images this is in some cases impossible or hardly usefull.
+With this library a notice is placed at a prominent place in the directory
+containing the elements. You may follow this practice.
+The exception in section 6 of the GNU Lesser General Public License covers
+the use of elements of this art library in a GUI.
+dave [at] icon-king.com
+
+Date:        15 october 2004
+Version:    1.0
+
+DESCRIPTION:
+
+Icon theme for KDE 3.x.
+Icons where designed using Adobe Illustrator, and then exported to PNG format.
+Icons shadows and minor corrections were done using Adobe Photoshop.
+Kiconedit was used to correct some 16x16 and 22x22 icons.
+
+LICENSE
+
+Released under GNU Lesser General Public License (LGPL)
+Look at the license.txt file.
+
+CONTACT
+
+David Vignoni
+e-mail :        david [at] icon-king.com
+ICQ :            117761009
+http:               http://www.icon-king.com
+
+---
+
+Files ic62.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Based on http://de.wikipedia.org/w/index.php?title=Datei:Tux.svg&filetimestamp=20090927073505
+
+The copyright holder of this file allows anyone to use it for any purpose, 
+provided that the copyright holders Larry Ewing, Simon Budig and
+Anja Gerwinski are mentioned.
+
+---
+
+Files ic63.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Based on http://en.wikipedia.org/wiki/File:ASF-logo.svg
+
+Apache logo
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may
+obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+
+---
+
+Files ic64.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Created by Jeremy JAMET and licensed under the terms of the GPLv3.
+
+---
+
+Files ic65.png, ic67.png and ic68.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Created by Tobias Selig and licensed under the terms of the GPLv2 or GPLv3.
+
+---
+
+File ic66.png under under res/drawable, res/drawable-hdpi and res/drawable-ldpi
+
+Based on http://commons.wikimedia.org/wiki/File:Dollar_symbol_gold.svg
+
+Author: Rugby471
+
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU Free Documentation License, Version 1.2 or any later
+version published by the Free Software Foundation; with no Invariant Sections,
+no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is
+included in the section entitled "GNU Free Documentation License".
+
+---
--- a/LICENSES/LICENSE_ICON_PACK_MATERIAL_FONT_AWESOME
+++ b/LICENSES/LICENSE_ICON_PACK_MATERIAL_FONT_AWESOME
--- a/LICENSES/LICENSE_MOZILLA_COMPONENTS
+++ b/LICENSES/LICENSE_MOZILLA_COMPONENTS
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Android KeepassDX
+# Android KeePassDX

-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> KeepassDX is a **multi-format KeePass manager for Android devices**. The app allows creating keys and passwords in a secure way by integrating with the Android design standards.
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> KeePassDX is a **multi-format KeePass manager for Android devices**. The app allows creating keys and passwords in a secure way by integrating with the Android design standards.

 <img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen.jpg" width="220">

@@ -19,7 +19,7 @@
 - Precise management of **settings**.
 - Code written in **native languages** *(Kotlin / Java / JNI / C)*.

-KeepassDX is **open source** and **ad-free**.
+KeePassDX is **open source** and **ad-free**.

 ## What is KeePassDX?

@@ -88,4 +88,4 @@ Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/w
  You should have received a copy of the GNU General Public License
  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  
-  *This project is a fork of [KeepassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*
+  *This project is a fork of [KeePassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*
--- a/_config.yml
+++ b/_config.yml
@@ -1 +0,0 @@
-theme: jekyll-theme-cayman
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,25 +1,25 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'

 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+    ndkVersion "21.4.7075529"

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
-        minSdkVersion 14
-        targetSdkVersion 29
-        versionCode = 35
-        versionName = "2.7"
+        minSdkVersion 15
+        targetSdkVersion 30
+        versionCode = 72
+        versionName = "2.9.18"
        multiDexEnabled true

        testApplicationId = "com.kunzisoft.keepass.tests"
-        testInstrumentationRunner = "android.test.InstrumentationTestRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

        buildConfigField "String[]", "ICON_PACKS", "{\"classic\",\"material\"}"
-        manifestPlaceholders = [ googleAndroidBackupAPIKey:"" ]
+        manifestPlaceholders = [ googleAndroidBackupAPIKey:"unused" ]

        kapt {
            arguments {
@@ -29,12 +29,6 @@ android {
        }
    }

-    externalNativeBuild {
-        cmake {
-            path "src/main/jni/CMakeLists.txt"
-        }
-    }
-
    buildTypes {
        release {
            minifyEnabled = false
@@ -50,7 +44,11 @@ android {
            buildConfigField "String", "BUILD_VERSION", "\"libre\""
            buildConfigField "boolean", "FULL_VERSION", "true"
            buildConfigField "boolean", "CLOSED_STORE", "false"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
        }
        pro {
@@ -69,7 +67,13 @@ android {
            buildConfigField "String", "BUILD_VERSION", "\"free\""
            buildConfigField "boolean", "FULL_VERSION", "false"
            buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{}"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Blue\"," +
+                            "\"KeepassDXStyle_Blue_Night\"," +
+                            "\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
        }
@@ -81,6 +85,10 @@ android {
        free.res.srcDir 'src/free/res'
    }

+    testOptions {
+        unitTests.includeAndroidResources = true
+    }
+
    compileOptions {
        targetCompatibility JavaVersion.VERSION_1_8
        sourceCompatibility JavaVersion.VERSION_1_8
@@ -91,38 +99,43 @@ android {
    }
 }

-def room_version = "2.2.5"
+def room_version = "2.2.6"

 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.0.1'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    // To upgrade with style
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.biometric:biometric:1.1.0'
+    // Lifecycle - LiveData - ViewModel - Coroutines
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    // WARNING: Don't upgrade because slowdown https://github.com/Kunzisoft/KeePassDX/issues/923
+    implementation 'com.google.android.material:material:1.1.0'
    // Database
    implementation "androidx.room:room-runtime:$room_version"
    kapt "androidx.room:room-compiler:$room_version"
-    // Crypto
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.65.01'
+    // Autofill
+    implementation "androidx.autofill:autofill:1.1.0"
    // Time
    implementation 'joda-time:joda-time:2.10.6'
    // Color
-    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.3'
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.4'
    // Education
    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
-    // Apache Commons Collections
-    implementation 'commons-collections:commons-collections:3.2.2'
-    // Apache Commons Codec
-    implementation 'commons-codec:commons-codec:1.14'
+    // Apache Commons
+    implementation 'commons-io:commons-io:2.8.0'
+    implementation 'commons-codec:commons-codec:1.15'
+    // Encrypt lib
+    implementation project(path: ':crypto')
    // Icon pack
    implementation project(path: ':icon-pack-classic')
    implementation project(path: ':icon-pack-material')

    // Tests
-    androidTestImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
 }
--- a/app/src/androidTest/assets/test_image.png
+++ b/app/src/androidTest/assets/test_image.png
--- a/app/src/androidTest/assets/test_text.txt
+++ b/app/src/androidTest/assets/test_text.txt
@@ -0,0 +1,133 @@
+Basic Latin
+    ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ 
+Latin-1 Supplement
+      ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬  ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ 
+Latin Extended-A
+    Ā ā Ă ă Ą ą Ć ć Ĉ ĉ Ċ ċ Č č Ď ď Đ đ Ē ē Ĕ ĕ Ė ė Ę ę Ě ě Ĝ ĝ Ğ ğ Ġ ġ Ģ ģ Ĥ ĥ Ħ ħ Ĩ ĩ Ī ī Ĭ ĭ Į į İ ı Ĳ ĳ Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Ł ł Ń ń Ņ ņ Ň ň ŉ Ŋ ŋ Ō ō Ŏ ŏ Ő ő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ ŝ Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ Ÿ Ź ź Ż ż Ž ž ſ 
+Latin Extended-B
+    ƀ Ɓ Ƃ ƃ Ƅ ƅ Ɔ Ƈ ƈ Ɖ Ɗ Ƌ ƌ ƍ Ǝ Ə Ɛ Ƒ ƒ Ɠ Ɣ ƕ Ɩ Ɨ Ƙ ƙ ƚ ƛ Ɯ Ɲ ƞ Ɵ Ơ ơ Ƣ ƣ Ƥ ƥ Ʀ Ƨ ƨ Ʃ ƪ ƫ Ƭ ƭ Ʈ Ư ư Ʊ Ʋ Ƴ ƴ Ƶ ƶ Ʒ Ƹ ƹ ƺ ƻ Ƽ ƽ ƾ ƿ ǀ ǁ ǂ ǃ Ǆ ǅ ǆ Ǉ ǈ ǉ Ǌ ǋ ǌ Ǎ ǎ Ǐ ǐ Ǒ ǒ Ǔ ǔ Ǖ ǖ Ǘ ǘ Ǚ ǚ Ǜ ǜ ǝ Ǟ ǟ Ǡ ǡ Ǣ ǣ Ǥ ǥ Ǧ ǧ Ǩ ǩ Ǫ ǫ Ǭ ǭ Ǯ ǯ ǰ Ǳ ǲ ǳ Ǵ ǵ Ǻ ǻ Ǽ ǽ Ǿ ǿ Ȁ ȁ Ȃ ȃ ... 
+IPA Extensions
+    ɐ ɑ ɒ ɓ ɔ ɕ ɖ ɗ ɘ ə ɚ ɛ ɜ ɝ ɞ ɟ ɠ ɡ ɢ ɣ ɤ ɥ ɦ ɧ ɨ ɩ ɪ ɫ ɬ ɭ ɮ ɯ ɰ ɱ ɲ ɳ ɴ ɵ ɶ ɷ ɸ ɹ ɺ ɻ ɼ ɽ ɾ ɿ ʀ ʁ ʂ ʃ ʄ ʅ ʆ ʇ ʈ ʉ ʊ ʋ ʌ ʍ ʎ ʏ ʐ ʑ ʒ ʓ ʔ ʕ ʖ ʗ ʘ ʙ ʚ ʛ ʜ ʝ ʞ ʟ ʠ ʡ ʢ ʣ ʤ ʥ ʦ ʧ ʨ 
+Spacing Modifier Letters
+    ʰ ʱ ʲ ʳ ʴ ʵ ʶ ʷ ʸ ʹ ʺ ʻ ʼ ʽ ʾ ʿ ˀ ˁ ˂ ˃ ˄ ˅ ˆ ˇ ˈ ˉ ˊ ˋ ˌ ˍ ˎ ˏ ː ˑ ˒ ˓ ˔ ˕ ˖ ˗ ˘ ˙ ˚ ˛ ˜ ˝ ˞ ˠ ˡ ˢ ˣ ˤ ˥ ˦ ˧ ˨ ˩ 
+Combining Diacritical Marks
+    ̀ ́ ̂ ̃ ̄ ̅ ̆ ̇ ̈ ̉ ̊ ̋ ̌ ̍ ̎ ̏ ̐ ̑ ̒ ̓ ̔ ̕ ̖ ̗ ̘ ̙ ̚ ̛ ̜ ̝ ̞ ̟ ̠ ̡ ̢ ̣ ̤ ̥ ̦ ̧ ̨ ̩ ̪ ̫ ̬ ̭ ̮ ̯ ̰ ̱ ̲ ̳ ̴ ̵ ̶ ̷ ̸ ̹ ̺ ̻ ̼ ̽ ̾ ̿ ̀ ́ ͂ ̓ ̈́ ͅ ͠ ͡ 
+Greek
+    ʹ ͵ ͺ ; ΄ ΅ Ά · Έ Ή Ί Ό Ύ Ώ ΐ Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ ς σ τ υ φ χ ψ ω ϊ ϋ ό ύ ώ ϐ ϑ ϒ ϓ ϔ ϕ ϖ Ϛ Ϝ Ϟ Ϡ Ϣ ϣ Ϥ ϥ Ϧ ϧ Ϩ ϩ Ϫ ϫ Ϭ ϭ Ϯ ϯ ϰ ϱ ϲ ϳ 
+Cyrillic
+    Ё Ђ Ѓ Є Ѕ І Ї Ј Љ Њ Ћ Ќ Ў Џ А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ђ ѓ є ѕ і ї ј љ њ ћ ќ ў џ Ѡ ѡ Ѣ ѣ Ѥ ѥ Ѧ ѧ Ѩ ѩ Ѫ ѫ Ѭ ѭ Ѯ ѯ Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ Ѹ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ Ҁ ҁ ҂ ҃ ... 
+Armenian
+    Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ ՙ ՚ ՛ ՜ ՝ ՞ ՟ ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք օ ֆ և ։ 
+Hebrew
+    ֑ ֒ ֓ ֔ ֕ ֖ ֗ ֘ ֙ ֚ ֛ ֜ ֝ ֞ ֟ ֠ ֡ ֣ ֤ ֥ ֦ ֧ ֨ ֩ ֪ ֫ ֬ ֭ ֮ ֯ ְ ֱ ֲ ֳ ִ ֵ ֶ ַ ָ ֹ ֻ ּ ֽ ־ ֿ ׀ ׁ ׂ ׃ ׄ א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן נ ס ע ף פ ץ צ ק ר ש ת װ ױ ײ ׳ ״ 
+Arabic
+    ، ؛ ؟ ء آ أ ؤ إ ئ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ـ ف ق ك ل م ن ه و ى ي ً ٌ ٍ َ ُ ِ ّ ْ ٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩ ٪ ٫ ٬ ٭ ٰ ٱ ٲ ٳ ٴ ٵ ٶ ٷ ٸ ٹ ٺ ٻ ټ ٽ پ ٿ ڀ ځ ڂ ڃ ڄ څ چ ڇ ڈ ډ ڊ ڋ ڌ ڍ ڎ ڏ ڐ ڑ ڒ ړ ڔ ڕ ږ ڗ ژ ڙ ښ ڛ ڜ ڝ ڞ ڟ ڠ ڡ ڢ ڣ ڤ ڥ ڦ ڧ ڨ ک ڪ ګ ڬ ڭ ڮ گ ڰ ڱ ... 
+Devanagari
+    ँ ं ः अ आ इ ई उ ऊ ऋ ऌ ऍ ऎ ए ऐ ऑ ऒ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न ऩ प फ ब भ म य र ऱ ल ळ ऴ व श ष स ह ़ ऽ ा ि ी ु ू ृ ॄ ॅ ॆ े ै ॉ ॊ ो ौ ् ॐ ॑ ॒ ॓ ॔ क़ ख़ ग़ ज़ ड़ ढ़ फ़ य़ ॠ ॡ ॢ ॣ । ॥ ० १ २ ३ ४ ५ ६ ७ ८ ९ ॰ 
+Bengali
+    ঁ ং ঃ অ আ ই ঈ উ ঊ ঋ ঌ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ ় া ি ী ু ূ ৃ ৄ ে ৈ ো ৌ ্ ৗ ড় ঢ় য় ৠ ৡ ৢ ৣ ০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯ ৰ ৱ ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৺ 
+Gurmukhi
+    ਂ ਅ ਆ ਇ ਈ ਉ ਊ ਏ ਐ ਓ ਔ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਲ਼ ਵ ਸ਼ ਸ ਹ ਼ ਾ ਿ ੀ ੁ ੂ ੇ ੈ ੋ ੌ ੍ ਖ਼ ਗ਼ ਜ਼ ੜ ਫ਼ ੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ ੰ ੱ ੲ ੳ ੴ 
+Gujarati
+    ઁ ં ઃ અ આ ઇ ઈ ઉ ઊ ઋ ઍ એ ઐ ઑ ઓ ઔ ક ખ ગ ઘ ઙ ચ છ જ ઝ ઞ ટ ઠ ડ ઢ ણ ત થ દ ધ ન પ ફ બ ભ મ ય ર લ ળ વ શ ષ સ હ ઼ ઽ ા િ ી ુ ૂ ૃ ૄ ૅ ે ૈ ૉ ો ૌ ્ ૐ ૠ ૦ ૧ ૨ ૩ ૪ ૫ ૬ ૭ ૮ ૯ 
+Oriya
+    ଁ ଂ ଃ ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଌ ଏ ଐ ଓ ଔ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ ଢ ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯ ର ଲ ଳ ଶ ଷ ସ ହ ଼ ଽ ା ି ୀ ୁ ୂ ୃ େ ୈ ୋ ୌ ୍ ୖ ୗ ଡ଼ ଢ଼ ୟ ୠ ୡ ୦ ୧ ୨ ୩ ୪ ୫ ୬ ୭ ୮ ୯ ୰ 
+Tamil
+    ஂ ஃ அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஜ ஞ ட ண த ந ன ப ம ய ர ற ல ள ழ வ ஷ ஸ ஹ ா ி ீ ு ூ ெ ே ை ொ ோ ௌ ் ௗ ௧ ௨ ௩ ௪ ௫ ௬ ௭ ௮ ௯ ௰ ௱ ௲ 
+Telugu
+    ఁ ం ః అ ఆ ఇ ఈ ఉ ఊ ఋ ఌ ఎ ఏ ఐ ఒ ఓ ఔ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల ళ వ శ ష స హ ా ి ీ ు ూ ృ ౄ ె ే ై ొ ో ౌ ్ ౕ ౖ ౠ ౡ ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯ 
+Kannada
+    ಂ ಃ ಅ ಆ ಇ ಈ ಉ ಊ ಋ ಌ ಎ ಏ ಐ ಒ ಓ ಔ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ಳ ವ ಶ ಷ ಸ ಹ ಾ ಿ ೀ ು ೂ ೃ ೄ ೆ ೇ ೈ ೊ ೋ ೌ ್ ೕ ೖ ೞ ೠ ೡ ೦ ೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯ 
+Malayalam
+    ം ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ഌ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര റ ല ള ഴ വ ശ ഷ സ ഹ ാ ി ീ ു ൂ ൃ െ േ ൈ ൊ ോ ൌ ് ൗ ൠ ൡ ൦ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ 
+Thai
+    ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ ฯ ะ ั า ำ ิ ี ึ ื ุ ู ฺ ฿ เ แ โ ใ ไ ๅ ๆ ็ ่ ้ ๊ ๋ ์ ํ ๎ ๏ ๐ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ ๚ ๛ 
+Lao
+    ກ ຂ ຄ ງ ຈ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ສ ຫ ອ ຮ ຯ ະ ັ າ ຳ ິ ີ ຶ ື ຸ ູ ົ ຼ ຽ ເ ແ ໂ ໃ ໄ ໆ ່ ້ ໊ ໋ ໌ ໍ ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙ ໜ ໝ 
+Tibetan
+    ༀ ༁ ༂ ༃ ༄ ༅ ༆ ༇ ༈ ༉ ༊ ་ ༌ ། ༎ ༏ ༐ ༑ ༒ ༓ ༔ ༕ ༖ ༗ ༘ ༙ ༚ ༛ ༜ ༝ ༞ ༟ ༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩ ༪ ༫ ༬ ༭ ༮ ༯ ༰ ༱ ༲ ༳ ༴ ༵ ༶ ༷ ༸ ༹ ༺ ༻ ༼ ༽ ༾ ༿ ཀ ཁ ག གྷ ང ཅ ཆ ཇ ཉ ཊ ཋ ཌ ཌྷ ཎ ཏ ཐ ད དྷ ན པ ཕ བ བྷ མ ཙ ཚ ཛ ཛྷ ཝ ཞ ཟ འ ཡ ར ལ ཤ ཥ ས ཧ ཨ ཀྵ ཱ ི ཱི ུ ཱུ ྲྀ ཷ ླྀ ཹ ེ ཻ ོ ཽ ཾ ཿ ྀ ཱྀ ྂ ྃ ྄ ྅ ྆ ྇ ... 
+Georgian
+    Ⴀ Ⴁ Ⴂ Ⴃ Ⴄ Ⴅ Ⴆ Ⴇ Ⴈ Ⴉ Ⴊ Ⴋ Ⴌ Ⴍ Ⴎ Ⴏ Ⴐ Ⴑ Ⴒ Ⴓ Ⴔ Ⴕ Ⴖ Ⴗ Ⴘ Ⴙ Ⴚ Ⴛ Ⴜ Ⴝ Ⴞ Ⴟ Ⴠ Ⴡ Ⴢ Ⴣ Ⴤ Ⴥ ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ ჱ ჲ ჳ ჴ ჵ ჶ ჻ 
+Hangul Jamo
+    ᄀ ᄁ ᄂ ᄃ ᄄ ᄅ ᄆ ᄇ ᄈ ᄉ ᄊ ᄋ ᄌ ᄍ ᄎ ᄏ ᄐ ᄑ ᄒ ᄓ ᄔ ᄕ ᄖ ᄗ ᄘ ᄙ ᄚ ᄛ ᄜ ᄝ ᄞ ᄟ ᄠ ᄡ ᄢ ᄣ ᄤ ᄥ ᄦ ᄧ ᄨ ᄩ ᄪ ᄫ ᄬ ᄭ ᄮ ᄯ ᄰ ᄱ ᄲ ᄳ ᄴ ᄵ ᄶ ᄷ ᄸ ᄹ ᄺ ᄻ ᄼ ᄽ ᄾ ᄿ ᅀ ᅁ ᅂ ᅃ ᅄ ᅅ ᅆ ᅇ ᅈ ᅉ ᅊ ᅋ ᅌ ᅍ ᅎ ᅏ ᅐ ᅑ ᅒ ᅓ ᅔ ᅕ ᅖ ᅗ ᅘ ᅙ ᅟ ᅠ ᅡ ᅢ ᅣ ᅤ ᅥ ᅦ ᅧ ᅨ ᅩ ᅪ ᅫ ᅬ ᅭ ᅮ ᅯ ᅰ ᅱ ᅲ ᅳ ᅴ ᅵ ᅶ ᅷ ᅸ ᅹ ᅺ ᅻ ᅼ ᅽ ᅾ ᅿ ᆀ ᆁ ᆂ ᆃ ᆄ ... 
+Latin Extended Additional
+    Ḁ ḁ Ḃ ḃ Ḅ ḅ Ḇ ḇ Ḉ ḉ Ḋ ḋ Ḍ ḍ Ḏ ḏ Ḑ ḑ Ḓ ḓ Ḕ ḕ Ḗ ḗ Ḙ ḙ Ḛ ḛ Ḝ ḝ Ḟ ḟ Ḡ ḡ Ḣ ḣ Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ Ḭ ḭ Ḯ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḹ ḹ Ḻ ḻ Ḽ ḽ Ḿ ḿ Ṁ ṁ Ṃ ṃ Ṅ ṅ Ṇ ṇ Ṉ ṉ Ṋ ṋ Ṍ ṍ Ṏ ṏ Ṑ ṑ Ṓ ṓ Ṕ ṕ Ṗ ṗ Ṙ ṙ Ṛ ṛ Ṝ ṝ Ṟ ṟ Ṡ ṡ Ṣ ṣ Ṥ ṥ Ṧ ṧ Ṩ ṩ Ṫ ṫ Ṭ ṭ Ṯ ṯ Ṱ ṱ Ṳ ṳ Ṵ ṵ Ṷ ṷ Ṹ ṹ Ṻ ṻ Ṽ ṽ Ṿ ṿ ... 
+Greek Extended
+    ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ... 
+General Punctuation
+                           ‌ ‍ ‎ ‏ ‐ ‑ ‒ – — ― ‖ ‗ ‘ ’ ‚ ‛ “ ” „ ‟ † ‡ • ‣ ․ ‥ … ‧     ‪ ‫ ‬ ‭ ‮ ‰ ‱ ′ ″ ‴ ‵ ‶ ‷ ‸ ‹ › ※ ‼ ‽ ‾ ‿ ⁀ ⁁ ⁂ ⁃ ⁄ ⁅ ⁆ ⁪ ⁫ ⁬ ⁭ ⁮ ⁯ 
+Superscripts and Subscripts
+    ⁰ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹ ⁺ ⁻ ⁼ ⁽ ⁾ ⁿ ₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ₊ ₋ ₌ ₍ ₎ 
+Currency Symbols
+    ₠ ₡ ₢ ₣ ₤ ₥ ₦ ₧ ₨ ₩ ₪ ₫ 
+Combining Marks for Symbols
+    ⃐ ⃑ ⃒ ⃓ ⃔ ⃕ ⃖ ⃗ ⃘ ⃙ ⃚ ⃛ ⃜ ⃝ ⃞ ⃟ ⃠ ⃡ 
+Letterlike Symbols
+    ℀ ℁ ℂ ℃ ℄ ℅ ℆ ℇ ℈ ℉ ℊ ℋ ℌ ℍ ℎ ℏ ℐ ℑ ℒ ℓ ℔ ℕ № ℗ ℘ ℙ ℚ ℛ ℜ ℝ ℞ ℟ ℠ ℡ ™ ℣ ℤ ℥ Ω ℧ ℨ ℩ K Å ℬ ℭ ℮ ℯ ℰ ℱ Ⅎ ℳ ℴ ℵ ℶ ℷ ℸ 
+Number Forms
+    ⅓ ⅔ ⅕ ⅖ ⅗ ⅘ ⅙ ⅚ ⅛ ⅜ ⅝ ⅞ ⅟ Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ Ⅸ Ⅹ Ⅺ Ⅻ Ⅼ Ⅽ Ⅾ Ⅿ ⅰ ⅱ ⅲ ⅳ ⅴ ⅵ ⅶ ⅷ ⅸ ⅹ ⅺ ⅻ ⅼ ⅽ ⅾ ⅿ ↀ ↁ ↂ 
+Arrows
+    ← ↑ → ↓ ↔ ↕ ↖ ↗ ↘ ↙ ↚ ↛ ↜ ↝ ↞ ↟ ↠ ↡ ↢ ↣ ↤ ↥ ↦ ↧ ↨ ↩ ↪ ↫ ↬ ↭ ↮ ↯ ↰ ↱ ↲ ↳ ↴ ↵ ↶ ↷ ↸ ↹ ↺ ↻ ↼ ↽ ↾ ↿ ⇀ ⇁ ⇂ ⇃ ⇄ ⇅ ⇆ ⇇ ⇈ ⇉ ⇊ ⇋ ⇌ ⇍ ⇎ ⇏ ⇐ ⇑ ⇒ ⇓ ⇔ ⇕ ⇖ ⇗ ⇘ ⇙ ⇚ ⇛ ⇜ ⇝ ⇞ ⇟ ⇠ ⇡ ⇢ ⇣ ⇤ ⇥ ⇦ ⇧ ⇨ ⇩ ⇪ 
+Mathematical Operators
+    ∀ ∁ ∂ ∃ ∄ ∅ ∆ ∇ ∈ ∉ ∊ ∋ ∌ ∍ ∎ ∏ ∐ ∑ − ∓ ∔ ∕ ∖ ∗ ∘ ∙ √ ∛ ∜ ∝ ∞ ∟ ∠ ∡ ∢ ∣ ∤ ∥ ∦ ∧ ∨ ∩ ∪ ∫ ∬ ∭ ∮ ∯ ∰ ∱ ∲ ∳ ∴ ∵ ∶ ∷ ∸ ∹ ∺ ∻ ∼ ∽ ∾ ∿ ≀ ≁ ≂ ≃ ≄ ≅ ≆ ≇ ≈ ≉ ≊ ≋ ≌ ≍ ≎ ≏ ≐ ≑ ≒ ≓ ≔ ≕ ≖ ≗ ≘ ≙ ≚ ≛ ≜ ≝ ≞ ≟ ≠ ≡ ≢ ≣ ≤ ≥ ≦ ≧ ≨ ≩ ≪ ≫ ≬ ≭ ≮ ≯ ≰ ≱ ≲ ≳ ≴ ≵ ≶ ≷ ≸ ≹ ≺ ≻ ≼ ≽ ≾ ≿ ... 
+Miscellaneous Technical
+    ⌀ ⌂ ⌃ ⌄ ⌅ ⌆ ⌇ ⌈ ⌉ ⌊ ⌋ ⌌ ⌍ ⌎ ⌏ ⌐ ⌑ ⌒ ⌓ ⌔ ⌕ ⌖ ⌗ ⌘ ⌙ ⌚ ⌛ ⌜ ⌝ ⌞ ⌟ ⌠ ⌡ ⌢ ⌣ ⌤ ⌥ ⌦ ⌧ ⌨ 〈 〉 ⌫ ⌬ ⌭ ⌮ ⌯ ⌰ ⌱ ⌲ ⌳ ⌴ ⌵ ⌶ ⌷ ⌸ ⌹ ⌺ ⌻ ⌼ ⌽ ⌾ ⌿ ⍀ ⍁ ⍂ ⍃ ⍄ ⍅ ⍆ ⍇ ⍈ ⍉ ⍊ ⍋ ⍌ ⍍ ⍎ ⍏ ⍐ ⍑ ⍒ ⍓ ⍔ ⍕ ⍖ ⍗ ⍘ ⍙ ⍚ ⍛ ⍜ ⍝ ⍞ ⍟ ⍠ ⍡ ⍢ ⍣ ⍤ ⍥ ⍦ ⍧ ⍨ ⍩ ⍪ ⍫ ⍬ ⍭ ⍮ ⍯ ⍰ ⍱ ⍲ ⍳ ⍴ ⍵ ⍶ ⍷ ⍸ ⍹ ⍺ 
+Control Pictures
+    ␀ ␁ ␂ ␃ ␄ ␅ ␆ ␇ ␈ ␉ ␊ ␋ ␌ ␍ ␎ ␏ ␐ ␑ ␒ ␓ ␔ ␕ ␖ ␗ ␘ ␙ ␚ ␛ ␜ ␝ ␞ ␟ ␠ ␡ ␢ ␣ ␤ 
+Optical Character Recognition
+    ⑀ ⑁ ⑂ ⑃ ⑄ ⑅ ⑆ ⑇ ⑈ ⑉ ⑊ 
+Enclosed Alphanumerics
+    ① ② ③ ④ ⑤ ⑥ ⑦ ⑧ ⑨ ⑩ ⑪ ⑫ ⑬ ⑭ ⑮ ⑯ ⑰ ⑱ ⑲ ⑳ ⑴ ⑵ ⑶ ⑷ ⑸ ⑹ ⑺ ⑻ ⑼ ⑽ ⑾ ⑿ ⒀ ⒁ ⒂ ⒃ ⒄ ⒅ ⒆ ⒇ ⒈ ⒉ ⒊ ⒋ ⒌ ⒍ ⒎ ⒏ ⒐ ⒑ ⒒ ⒓ ⒔ ⒕ ⒖ ⒗ ⒘ ⒙ ⒚ ⒛ ⒜ ⒝ ⒞ ⒟ ⒠ ⒡ ⒢ ⒣ ⒤ ⒥ ⒦ ⒧ ⒨ ⒩ ⒪ ⒫ ⒬ ⒭ ⒮ ⒯ ⒰ ⒱ ⒲ ⒳ ⒴ ⒵ Ⓐ Ⓑ Ⓒ Ⓓ Ⓔ Ⓕ Ⓖ Ⓗ Ⓘ Ⓙ Ⓚ Ⓛ Ⓜ Ⓝ Ⓞ Ⓟ Ⓠ Ⓡ Ⓢ Ⓣ Ⓤ Ⓥ Ⓦ Ⓧ Ⓨ Ⓩ ⓐ ⓑ ⓒ ⓓ ⓔ ⓕ ⓖ ⓗ ⓘ ⓙ ⓚ ⓛ ⓜ ⓝ ⓞ ⓟ ... 
+Box Drawing
+    ─ ━ │ ┃ ┄ ┅ ┆ ┇ ┈ ┉ ┊ ┋ ┌ ┍ ┎ ┏ ┐ ┑ ┒ ┓ └ ┕ ┖ ┗ ┘ ┙ ┚ ┛ ├ ┝ ┞ ┟ ┠ ┡ ┢ ┣ ┤ ┥ ┦ ┧ ┨ ┩ ┪ ┫ ┬ ┭ ┮ ┯ ┰ ┱ ┲ ┳ ┴ ┵ ┶ ┷ ┸ ┹ ┺ ┻ ┼ ┽ ┾ ┿ ╀ ╁ ╂ ╃ ╄ ╅ ╆ ╇ ╈ ╉ ╊ ╋ ╌ ╍ ╎ ╏ ═ ║ ╒ ╓ ╔ ╕ ╖ ╗ ╘ ╙ ╚ ╛ ╜ ╝ ╞ ╟ ╠ ╡ ╢ ╣ ╤ ╥ ╦ ╧ ╨ ╩ ╪ ╫ ╬ ╭ ╮ ╯ ╰ ╱ ╲ ╳ ╴ ╵ ╶ ╷ ╸ ╹ ╺ ╻ ╼ ╽ ╾ ╿ 
+Block Elements
+    ▀ ▁ ▂ ▃ ▄ ▅ ▆ ▇ █ ▉ ▊ ▋ ▌ ▍ ▎ ▏ ▐ ░ ▒ ▓ ▔ ▕ 
+Geometric Shapes
+    ■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ ▩ ▪ ▫ ▬ ▭ ▮ ▯ ▰ ▱ ▲ △ ▴ ▵ ▶ ▷ ▸ ▹ ► ▻ ▼ ▽ ▾ ▿ ◀ ◁ ◂ ◃ ◄ ◅ ◆ ◇ ◈ ◉ ◊ ○ ◌ ◍ ◎ ● ◐ ◑ ◒ ◓ ◔ ◕ ◖ ◗ ◘ ◙ ◚ ◛ ◜ ◝ ◞ ◟ ◠ ◡ ◢ ◣ ◤ ◥ ◦ ◧ ◨ ◩ ◪ ◫ ◬ ◭ ◮ ◯ 
+Miscellaneous Symbols
+    ☀ ☁ ☂ ☃ ☄ ★ ☆ ☇ ☈ ☉ ☊ ☋ ☌ ☍ ☎ ☏ ☐ ☑ ☒ ☓ ☚ ☛ ☜ ☝ ☞ ☟ ☠ ☡ ☢ ☣ ☤ ☥ ☦ ☧ ☨ ☩ ☪ ☫ ☬ ☭ ☮ ☯ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷ ☸ ☹ ☺ ☻ ☼ ☽ ☾ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇ ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓ ♔ ♕ ♖ ♗ ♘ ♙ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♡ ♢ ♣ ♤ ♥ ♦ ♧ ♨ ♩ ♪ ♫ ♬ ♭ ♮ ♯ 
+Dingbats
+    ✁ ✂ ✃ ✄ ✆ ✇ ✈ ✉ ✌ ✍ ✎ ✏ ✐ ✑ ✒ ✓ ✔ ✕ ✖ ✗ ✘ ✙ ✚ ✛ ✜ ✝ ✞ ✟ ✠ ✡ ✢ ✣ ✤ ✥ ✦ ✧ ✩ ✪ ✫ ✬ ✭ ✮ ✯ ✰ ✱ ✲ ✳ ✴ ✵ ✶ ✷ ✸ ✹ ✺ ✻ ✼ ✽ ✾ ✿ ❀ ❁ ❂ ❃ ❄ ❅ ❆ ❇ ❈ ❉ ❊ ❋ ❍ ❏ ❐ ❑ ❒ ❖ ❘ ❙ ❚ ❛ ❜ ❝ ❞ ❡ ❢ ❣ ❤ ❥ ❦ ❧ ❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿ ➀ ➁ ➂ ➃ ➄ ➅ ➆ ➇ ➈ ➉ ➊ ➋ ➌ ➍ ➎ ➏ ➐ ➑ ➒ ➓ ➔ ➘ ➙ ➚ ➛ ➜ ➝ ... 
+CJK Symbols and Punctuation
+    　 、 。 〃 〄 々 〆 〇 〈 〉 《 》 「 」 『 』 【 】 〒 〓 〔 〕 〖 〗 〘 〙 〚 〛 〜 〝 〞 〟 〠 〡 〢 〣 〤 〥 〦 〧 〨 〩 〪 〫 〬 〭 〮 〯 〰 〱 〲 〳 〴 〵 〶 〷 〿 
+Hiragana
+    ぁ あ ぃ い ぅ う ぇ え ぉ お か が き ぎ く ぐ け げ こ ご さ ざ し じ す ず せ ぜ そ ぞ た だ ち ぢ っ つ づ て で と ど な に ぬ ね の は ば ぱ ひ び ぴ ふ ぶ ぷ へ べ ぺ ほ ぼ ぽ ま み む め も ゃ や ゅ ゆ ょ よ ら り る れ ろ ゎ わ ゐ ゑ を ん ゔ ゙ ゚ ゛ ゜ ゝ ゞ 
+Katakana
+    ァ ア ィ イ ゥ ウ ェ エ ォ オ カ ガ キ ギ ク グ ケ ゲ コ ゴ サ ザ シ ジ ス ズ セ ゼ ソ ゾ タ ダ チ ヂ ッ ツ ヅ テ デ ト ド ナ ニ ヌ ネ ノ ハ バ パ ヒ ビ ピ フ ブ プ ヘ ベ ペ ホ ボ ポ マ ミ ム メ モ ャ ヤ ュ ユ ョ ヨ ラ リ ル レ ロ ヮ ワ ヰ ヱ ヲ ン ヴ ヵ ヶ ヷ ヸ ヹ ヺ ・ ー ヽ ヾ 
+Bopomofo
+    ㄅ ㄆ ㄇ ㄈ ㄉ ㄊ ㄋ ㄌ ㄍ ㄎ ㄏ ㄐ ㄑ ㄒ ㄓ ㄔ ㄕ ㄖ ㄗ ㄘ ㄙ ㄚ ㄛ ㄜ ㄝ ㄞ ㄟ ㄠ ㄡ ㄢ ㄣ ㄤ ㄥ ㄦ ㄧ ㄨ ㄩ ㄪ ㄫ ㄬ 
+Hangul Compatibility Jamo
+    ㄱ ㄲ ㄳ ㄴ ㄵ ㄶ ㄷ ㄸ ㄹ ㄺ ㄻ ㄼ ㄽ ㄾ ㄿ ㅀ ㅁ ㅂ ㅃ ㅄ ㅅ ㅆ ㅇ ㅈ ㅉ ㅊ ㅋ ㅌ ㅍ ㅎ ㅏ ㅐ ㅑ ㅒ ㅓ ㅔ ㅕ ㅖ ㅗ ㅘ ㅙ ㅚ ㅛ ㅜ ㅝ ㅞ ㅟ ㅠ ㅡ ㅢ ㅣ ㅤ ㅥ ㅦ ㅧ ㅨ ㅩ ㅪ ㅫ ㅬ ㅭ ㅮ ㅯ ㅰ ㅱ ㅲ ㅳ ㅴ ㅵ ㅶ ㅷ ㅸ ㅹ ㅺ ㅻ ㅼ ㅽ ㅾ ㅿ ㆀ ㆁ ㆂ ㆃ ㆄ ㆅ ㆆ ㆇ ㆈ ㆉ ㆊ ㆋ ㆌ ㆍ ㆎ 
+Kanbun
+    ㆐ ㆑ ㆒ ㆓ ㆔ ㆕ ㆖ ㆗ ㆘ ㆙ ㆚ ㆛ ㆜ ㆝ ㆞ ㆟ 
+Enclosed CJK Letters and Months
+    ㈀ ㈁ ㈂ ㈃ ㈄ ㈅ ㈆ ㈇ ㈈ ㈉ ㈊ ㈋ ㈌ ㈍ ㈎ ㈏ ㈐ ㈑ ㈒ ㈓ ㈔ ㈕ ㈖ ㈗ ㈘ ㈙ ㈚ ㈛ ㈜ ㈠ ㈡ ㈢ ㈣ ㈤ ㈥ ㈦ ㈧ ㈨ ㈩ ㈪ ㈫ ㈬ ㈭ ㈮ ㈯ ㈰ ㈱ ㈲ ㈳ ㈴ ㈵ ㈶ ㈷ ㈸ ㈹ ㈺ ㈻ ㈼ ㈽ ㈾ ㈿ ㉀ ㉁ ㉂ ㉃ ㉠ ㉡ ㉢ ㉣ ㉤ ㉥ ㉦ ㉧ ㉨ ㉩ ㉪ ㉫ ㉬ ㉭ ㉮ ㉯ ㉰ ㉱ ㉲ ㉳ ㉴ ㉵ ㉶ ㉷ ㉸ ㉹ ㉺ ㉻ ㉿ ㊀ ㊁ ㊂ ㊃ ㊄ ㊅ ㊆ ㊇ ㊈ ㊉ ㊊ ㊋ ㊌ ㊍ ㊎ ㊏ ㊐ ㊑ ㊒ ㊓ ㊔ ㊕ ㊖ ㊗ ㊘ ㊙ ㊚ ㊛ ㊜ ㊝ ㊞ ㊟ ㊠ ㊡ ... 
+CJK Compatibility
+    ㌀ ㌁ ㌂ ㌃ ㌄ ㌅ ㌆ ㌇ ㌈ ㌉ ㌊ ㌋ ㌌ ㌍ ㌎ ㌏ ㌐ ㌑ ㌒ ㌓ ㌔ ㌕ ㌖ ㌗ ㌘ ㌙ ㌚ ㌛ ㌜ ㌝ ㌞ ㌟ ㌠ ㌡ ㌢ ㌣ ㌤ ㌥ ㌦ ㌧ ㌨ ㌩ ㌪ ㌫ ㌬ ㌭ ㌮ ㌯ ㌰ ㌱ ㌲ ㌳ ㌴ ㌵ ㌶ ㌷ ㌸ ㌹ ㌺ ㌻ ㌼ ㌽ ㌾ ㌿ ㍀ ㍁ ㍂ ㍃ ㍄ ㍅ ㍆ ㍇ ㍈ ㍉ ㍊ ㍋ ㍌ ㍍ ㍎ ㍏ ㍐ ㍑ ㍒ ㍓ ㍔ ㍕ ㍖ ㍗ ㍘ ㍙ ㍚ ㍛ ㍜ ㍝ ㍞ ㍟ ㍠ ㍡ ㍢ ㍣ ㍤ ㍥ ㍦ ㍧ ㍨ ㍩ ㍪ ㍫ ㍬ ㍭ ㍮ ㍯ ㍰ ㍱ ㍲ ㍳ ㍴ ㍵ ㍶ ㍻ ㍼ ㍽ ㍾ ㍿ ㎀ ㎁ ㎂ ㎃ ... 
+CJK Unified Ideographs
+    一 丁 丂 七 丄 丅 丆 万 丈 三 上 下 丌 不 与 丏 丐 丑 丒 专 且 丕 世 丗 丘 丙 业 丛 东 丝 丞 丟 丠 両 丢 丣 两 严 並 丧 丨 丩 个 丫 丬 中 丮 丯 丰 丱 串 丳 临 丵 丶 丷 丸 丹 为 主 丼 丽 举 丿 乀 乁 乂 乃 乄 久 乆 乇 么 义 乊 之 乌 乍 乎 乏 乐 乑 乒 乓 乔 乕 乖 乗 乘 乙 乚 乛 乜 九 乞 也 习 乡 乢 乣 乤 乥 书 乧 乨 乩 乪 乫 乬 乭 乮 乯 买 乱 乲 乳 乴 乵 乶 乷 乸 乹 乺 乻 乼 乽 乾 乿 ... 
+Hangul Syllables
+    가 각 갂 갃 간 갅 갆 갇 갈 갉 갊 갋 갌 갍 갎 갏 감 갑 값 갓 갔 강 갖 갗 갘 같 갚 갛 개 객 갞 갟 갠 갡 갢 갣 갤 갥 갦 갧 갨 갩 갪 갫 갬 갭 갮 갯 갰 갱 갲 갳 갴 갵 갶 갷 갸 갹 갺 갻 갼 갽 갾 갿 걀 걁 걂 걃 걄 걅 걆 걇 걈 걉 걊 걋 걌 걍 걎 걏 걐 걑 걒 걓 걔 걕 걖 걗 걘 걙 걚 걛 걜 걝 걞 걟 걠 걡 걢 걣 걤 걥 걦 걧 걨 걩 걪 걫 걬 걭 걮 걯 거 걱 걲 걳 건 걵 걶 걷 걸 걹 걺 걻 걼 걽 걾 걿 ... 
+Private Use
+                                                                                                                                    ... 
+CJK Compatibility Ideographs
+    豈 更 車 賈 滑 串 句 龜 龜 契 金 喇 奈 懶 癩 羅 蘿 螺 裸 邏 樂 洛 烙 珞 落 酪 駱 亂 卵 欄 爛 蘭 鸞 嵐 濫 藍 襤 拉 臘 蠟 廊 朗 浪 狼 郎 來 冷 勞 擄 櫓 爐 盧 老 蘆 虜 路 露 魯 鷺 碌 祿 綠 菉 錄 鹿 論 壟 弄 籠 聾 牢 磊 賂 雷 壘 屢 樓 淚 漏 累 縷 陋 勒 肋 凜 凌 稜 綾 菱 陵 讀 拏 樂 諾 丹 寧 怒 率 異 北 磻 便 復 不 泌 數 索 參 塞 省 葉 說 殺 辰 沈 拾 若 掠 略 亮 兩 凉 梁 糧 良 諒 量 勵 ... 
+Alphabetic Presentation Forms
+    ﬀ ﬁ ﬂ ﬃ ﬄ ﬅ ﬆ ﬓ ﬔ ﬕ ﬖ ﬗ ﬞ ײַ ﬠ ﬡ ﬢ ﬣ ﬤ ﬥ ﬦ ﬧ ﬨ ﬩ שׁ שׂ שּׁ שּׂ אַ אָ אּ בּ גּ דּ הּ וּ זּ טּ יּ ךּ כּ לּ מּ נּ סּ ףּ פּ צּ קּ רּ שּ תּ וֹ בֿ כֿ פֿ ﭏ 
+Arabic Presentation Forms-A
+    ﭐ ﭑ ﭒ ﭓ ﭔ ﭕ ﭖ ﭗ ﭘ ﭙ ﭚ ﭛ ﭜ ﭝ ﭞ ﭟ ﭠ ﭡ ﭢ ﭣ ﭤ ﭥ ﭦ ﭧ ﭨ ﭩ ﭪ ﭫ ﭬ ﭭ ﭮ ﭯ ﭰ ﭱ ﭲ ﭳ ﭴ ﭵ ﭶ ﭷ ﭸ ﭹ ﭺ ﭻ ﭼ ﭽ ﭾ ﭿ ﮀ ﮁ ﮂ ﮃ ﮄ ﮅ ﮆ ﮇ ﮈ ﮉ ﮊ ﮋ ﮌ ﮍ ﮎ ﮏ ﮐ ﮑ ﮒ ﮓ ﮔ ﮕ ﮖ ﮗ ﮘ ﮙ ﮚ ﮛ ﮜ ﮝ ﮞ ﮟ ﮠ ﮡ ﮢ ﮣ ﮤ ﮥ ﮦ ﮧ ﮨ ﮩ ﮪ ﮫ ﮬ ﮭ ﮮ ﮯ ﮰ ﮱ ﯓ ﯔ ﯕ ﯖ ﯗ ﯘ ﯙ ﯚ ﯛ ﯜ ﯝ ﯞ ﯟ ﯠ ﯡ ﯢ ﯣ ﯤ ﯥ ﯦ ﯧ ﯨ ﯩ ﯪ ﯫ ﯬ ﯭ ﯮ ﯯ ﯰ ... 
+Combining Half Marks
+    ︠ ︡ ︢ ︣ 
+CJK Compatibility Forms
+    ︰ ︱ ︲ ︳ ︴ ︵ ︶ ︷ ︸ ︹ ︺ ︻ ︼ ︽ ︾ ︿ ﹀ ﹁ ﹂ ﹃ ﹄ ﹉ ﹊ ﹋ ﹌ ﹍ ﹎ ﹏ 
+Small Form Variants
+    ﹐ ﹑ ﹒ ﹔ ﹕ ﹖ ﹗ ﹘ ﹙ ﹚ ﹛ ﹜ ﹝ ﹞ ﹟ ﹠ ﹡ ﹢ ﹣ ﹤ ﹥ ﹦ ﹨ ﹩ ﹪ ﹫ 
+Arabic Presentation Forms-B
+    ﹰ ﹱ ﹲ ﹴ ﹶ ﹷ ﹸ ﹹ ﹺ ﹻ ﹼ ﹽ ﹾ ﹿ ﺀ ﺁ ﺂ ﺃ ﺄ ﺅ ﺆ ﺇ ﺈ ﺉ ﺊ ﺋ ﺌ ﺍ ﺎ ﺏ ﺐ ﺑ ﺒ ﺓ ﺔ ﺕ ﺖ ﺗ ﺘ ﺙ ﺚ ﺛ ﺜ ﺝ ﺞ ﺟ ﺠ ﺡ ﺢ ﺣ ﺤ ﺥ ﺦ ﺧ ﺨ ﺩ ﺪ ﺫ ﺬ ﺭ ﺮ ﺯ ﺰ ﺱ ﺲ ﺳ ﺴ ﺵ ﺶ ﺷ ﺸ ﺹ ﺺ ﺻ ﺼ ﺽ ﺾ ﺿ ﻀ ﻁ ﻂ ﻃ ﻄ ﻅ ﻆ ﻇ ﻈ ﻉ ﻊ ﻋ ﻌ ﻍ ﻎ ﻏ ﻐ ﻑ ﻒ ﻓ ﻔ ﻕ ﻖ ﻗ ﻘ ﻙ ﻚ ﻛ ﻜ ﻝ ﻞ ﻟ ﻠ ﻡ ﻢ ﻣ ﻤ ﻥ ﻦ ﻧ ﻨ ﻩ ﻪ ﻫ ﻬ ﻭ ﻮ ﻯ ﻰ ﻱ ... 
+Halfwidth and Fullwidth Forms
+    ！ ＂ ＃ ＄ ％ ＆ ＇ （ ） ＊ ＋ ， － ． ／ ０ １ ２ ３ ４ ５ ６ ７ ８ ９ ： ； ＜ ＝ ＞ ？ ＠ Ａ Ｂ Ｃ Ｄ Ｅ Ｆ Ｇ Ｈ Ｉ Ｊ Ｋ Ｌ Ｍ Ｎ Ｏ Ｐ Ｑ Ｒ Ｓ Ｔ Ｕ Ｖ Ｗ Ｘ Ｙ Ｚ ［ ＼ ］ ＾ ＿ ｀ ａ ｂ ｃ ｄ ｅ ｆ ｇ ｈ ｉ ｊ ｋ ｌ ｍ ｎ ｏ ｐ ｑ ｒ ｓ ｔ ｕ ｖ ｗ ｘ ｙ ｚ ｛ ｜ ｝ ～ ｡ ｢ ｣ ､ ･ ｦ ｧ ｨ ｩ ｪ ｫ ｬ ｭ ｮ ｯ ｰ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ... 
+Specials
+     
+Specials
+    <20> 
+
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESKeyTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESKeyTest.kt
@@ -1,67 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- * KeePassDX is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * KeePassDX is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.tests.crypto
-
-import org.junit.Assert.assertArrayEquals
-
-import java.io.IOException
-import java.util.Random
-
-import junit.framework.TestCase
-
-import com.kunzisoft.keepass.crypto.finalkey.AndroidAESKeyTransformer
-import com.kunzisoft.keepass.crypto.finalkey.NativeAESKeyTransformer
-
-class AESKeyTest : TestCase() {
-    private lateinit var mRand: Random
-
-    @Throws(Exception::class)
-    override fun setUp() {
-        super.setUp()
-
-        mRand = Random()
-    }
-
-    @Throws(IOException::class)
-    fun testAES() {
-        // Test both an old and an even number to test my flip variable
-        testAESFinalKey(5)
-        testAESFinalKey(6)
-    }
-
-    @Throws(IOException::class)
-    private fun testAESFinalKey(rounds: Long) {
-        val seed = ByteArray(32)
-        val key = ByteArray(32)
-        val nativeKey: ByteArray?
-        val androidKey: ByteArray?
-
-        mRand.nextBytes(seed)
-        mRand.nextBytes(key)
-
-        val androidAESKey = AndroidAESKeyTransformer()
-        androidKey = androidAESKey.transformMasterKey(seed, key, rounds)
-
-        val nativeAESKey = NativeAESKeyTransformer()
-        nativeKey = nativeAESKey.transformMasterKey(seed, key, rounds)
-
-        assertArrayEquals("Does not match", androidKey, nativeKey)
-    }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
@@ -1,83 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- * KeePassDX is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * KeePassDX is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.tests.crypto
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-
-import junit.framework.TestCase
-
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.Random
-
-import javax.crypto.BadPaddingException
-import javax.crypto.Cipher
-import javax.crypto.IllegalBlockSizeException
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-import org.junit.Assert.assertArrayEquals
-
-class AESTest : TestCase() {
-
-    private val mRand = Random()
-
-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidAlgorithmParameterException::class)
-    fun testEncrypt() {
-        // Test above below and at the blocksize
-        testFinal(15)
-        testFinal(16)
-        testFinal(17)
-
-        // Test random larger sizes
-        val size = mRand.nextInt(494) + 18
-        testFinal(size)
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    private fun testFinal(dataSize: Int) {
-
-        // Generate some input
-        val input = ByteArray(dataSize)
-        mRand.nextBytes(input)
-
-        // Generate key
-        val keyArray = ByteArray(32)
-        mRand.nextBytes(keyArray)
-        val key = SecretKeySpec(keyArray, "AES")
-
-        // Generate IV
-        val ivArray = ByteArray(16)
-        mRand.nextBytes(ivArray)
-        val iv = IvParameterSpec(ivArray)
-
-        val android = CipherFactory.getInstance("AES/CBC/PKCS5Padding", true)
-        android.init(Cipher.ENCRYPT_MODE, key, iv)
-        val outAndroid = android.doFinal(input, 0, dataSize)
-
-        val nat = CipherFactory.getInstance("AES/CBC/PKCS5Padding")
-        nat.init(Cipher.ENCRYPT_MODE, key, iv)
-        val outNative = nat.doFinal(input, 0, dataSize)
-
-        assertArrayEquals("Arrays differ on size: $dataSize", outAndroid, outNative)
-    }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/EncryptionTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/EncryptionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
 *
 * This file is part of KeePassDX.
 *
@@ -19,44 +19,32 @@
 */
 package com.kunzisoft.keepass.tests.crypto

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

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

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

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

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

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

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

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

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

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

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

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

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

    fun testUInt() {
-        val standardInt = UnsignedInt(15).toInt()
+        val standardInt = UnsignedInt(15).toKotlinInt()
        assertEquals(15, standardInt)
-        val unsignedInt = UnsignedInt(-1).toLong()
+        val unsignedInt = UnsignedInt(-1).toKotlinLong()
        assertEquals(4294967295L, unsignedInt)
    }

    fun testMaxValue() {
-        val maxValue = UnsignedInt.MAX_VALUE.toLong()
+        val maxValue = UnsignedInt.MAX_VALUE.toKotlinLong()
        assertEquals(4294967295L, maxValue)
-        val longValue = UnsignedInt.fromLong(4294967295L).toLong()
+        val longValue = UnsignedInt.fromKotlinLong(4294967295L).toKotlinLong()
        assertEquals(longValue, maxValue)
    }

    fun testLong() {
-        val longValue = UnsignedInt.fromLong(50L).toInt()
+        val longValue = UnsignedInt.fromKotlinLong(50L).toKotlinInt()
        assertEquals(50, longValue)
-        val uIntLongValue = UnsignedInt.fromLong(4294967290).toLong()
+        val uIntLongValue = UnsignedInt.fromKotlinLong(4294967290).toKotlinLong()
        assertEquals(4294967290, uIntLongValue)
    }
 }
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
@@ -20,9 +20,7 @@
 package com.kunzisoft.keepass.tests.utils

 import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.stream.*
-import com.kunzisoft.keepass.utils.UnsignedInt
-import com.kunzisoft.keepass.utils.UnsignedLong
+import com.kunzisoft.keepass.utils.*
 import junit.framework.TestCase
 import org.junit.Assert.assertArrayEquals
 import java.io.ByteArrayOutputStream
@@ -35,11 +33,11 @@ class ValuesTest : TestCase() {
    }

    fun testReadWriteLongMax() {
-        testReadWriteLong(java.lang.Byte.MAX_VALUE)
+        testReadWriteLong(Byte.MAX_VALUE)
    }

    fun testReadWriteLongMin() {
-        testReadWriteLong(java.lang.Byte.MIN_VALUE)
+        testReadWriteLong(Byte.MIN_VALUE)
    }

    fun testReadWriteLongRnd() {
@@ -54,7 +52,7 @@ class ValuesTest : TestCase() {
        val orig = ByteArray(8)
        setArray(orig, value, 8)

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

    fun testReadWriteIntZero() {
@@ -62,11 +60,11 @@ class ValuesTest : TestCase() {
    }

    fun testReadWriteIntMin() {
-        testReadWriteInt(java.lang.Byte.MIN_VALUE)
+        testReadWriteInt(Byte.MIN_VALUE)
    }

    fun testReadWriteIntMax() {
-        testReadWriteInt(java.lang.Byte.MAX_VALUE)
+        testReadWriteInt(Byte.MAX_VALUE)
    }

    private fun testReadWriteInt(value: Byte) {
@@ -103,11 +101,11 @@ class ValuesTest : TestCase() {
    }

    fun testReadWriteShortMin() {
-        testReadWriteShort(java.lang.Byte.MIN_VALUE)
+        testReadWriteShort(Byte.MIN_VALUE)
    }

    fun testReadWriteShortMax() {
-        testReadWriteShort(java.lang.Byte.MAX_VALUE)
+        testReadWriteShort(Byte.MAX_VALUE)
    }

    private fun testReadWriteShort(value: Byte) {
@@ -125,15 +123,15 @@ class ValuesTest : TestCase() {
    }

    fun testReadWriteByteMin() {
-        testReadWriteByte(java.lang.Byte.MIN_VALUE)
+        testReadWriteByte(Byte.MIN_VALUE)
    }

    fun testReadWriteByteMax() {
-        testReadWriteShort(java.lang.Byte.MAX_VALUE)
+        testReadWriteShort(Byte.MAX_VALUE)
    }

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

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

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

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

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

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

        assertArrayEquals(ulongBytes, uLongMax)
    }
--- a/app/src/free/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/free/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:viewportWidth="108"
-android:viewportHeight="108"
-android:width="108dp"
-android:height="108dp">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:width="108dp"
+    android:height="108dp">
    <group
        android:translateY="-332">
        <group
            android:translateY="332">
            <path
                android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
-                android:fillColor="@color/long_shadow"
                android:strokeLineJoin="round"
                android:strokeLineCap="round"
-                android:strokeMiterLimit="4" />
+                android:strokeMiterLimit="4" >
+                <aapt:attr name="android:fillColor">
+                    <gradient
+                        android:endColor="#0000"
+                        android:endX="80"
+                        android:endY="80"
+                        android:startColor="#4e000000"
+                        android:startX="0"
+                        android:startY="0"
+                        android:type="linear"/>
+                </aapt:attr>
+            </path>
        </group>
        <group
            android:scaleX="0.3939503"
--- a/app/src/free/res/drawable/ic_launcher_foreground.png
+++ b/app/src/free/res/drawable/ic_launcher_foreground.png
--- a/app/src/libre/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/libre/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:viewportWidth="108"
-android:viewportHeight="108"
-android:width="108dp"
-android:height="108dp">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:width="108dp"
+    android:height="108dp">
    <group
        android:translateY="-332">
        <group
            android:translateY="332">
            <path
                android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
-                android:fillColor="@color/long_shadow"
                android:strokeLineJoin="round"
                android:strokeLineCap="round"
-                android:strokeMiterLimit="4" />
+                android:strokeMiterLimit="4" >
+                <aapt:attr name="android:fillColor">
+                    <gradient
+                        android:endColor="#0000"
+                        android:endX="80"
+                        android:endY="80"
+                        android:startColor="#4e000000"
+                        android:startX="0"
+                        android:startY="0"
+                        android:type="linear"/>
+                </aapt:attr>
+            </path>
        </group>
        <group
            android:scaleX="0.3939503"
--- a/app/src/libre/res/drawable/ic_launcher_foreground.png
+++ b/app/src/libre/res/drawable/ic_launcher_foreground.png
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,15 @@
        android:name="android.permission.USE_BIOMETRIC" />
    <uses-permission
        android:name="android.permission.VIBRATE"/>
+    <!-- Write permission until Android 10 -->
    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
+    <!-- Open apps from links -->
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />

    <application
        android:label="@string/app_name"
@@ -47,7 +54,7 @@
        <activity
            android:name="com.kunzisoft.keepass.activities.PasswordActivity"
            android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize|stateUnchanged">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -122,9 +129,14 @@
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryActivity"
            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.IconPickerActivity"
+            android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.ImageViewerActivity"
+            android:configChanges="keyboardHidden" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="adjustResize" />
        <!-- About and Settings -->
        <activity
@@ -149,6 +161,13 @@
                <category android:name="android.intent.category.DEFAULT" />
                <data android:mimeType="text/plain" />
            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="otpauth" android:host="totp" />
+                <data android:scheme="otpauth" android:host="hotp" />
+            </intent-filter>
        </activity>
        <activity
            android:name="com.kunzisoft.keepass.activities.MagikeyboardLauncherActivity"
@@ -162,19 +181,19 @@
        </activity>

        <service
-            android:name="com.kunzisoft.keepass.notifications.DatabaseOpenNotificationService"
+            android:name="com.kunzisoft.keepass.services.DatabaseTaskNotificationService"
            android:enabled="true"
            android:exported="false" />
        <service
-            android:name="com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService"
+            android:name="com.kunzisoft.keepass.services.AttachmentFileNotificationService"
            android:enabled="true"
            android:exported="false" />
        <service
-            android:name=".notifications.AttachmentFileNotificationService"
+            android:name="com.kunzisoft.keepass.services.ClipboardEntryNotificationService"
            android:enabled="true"
            android:exported="false" />
        <service
-            android:name="com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService"
+            android:name="com.kunzisoft.keepass.services.AdvancedUnlockNotificationService"
            android:enabled="true"
            android:exported="false" />
        <!-- Receiver for Autofill -->
@@ -200,7 +219,7 @@
            </intent-filter>
        </service>
        <service
-            android:name="com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService"
+            android:name="com.kunzisoft.keepass.services.KeyboardEntryNotificationService"
            android:enabled="true"
            android:exported="false" />

--- a/app/src/main/assets/publicsuffixes
+++ b/app/src/main/assets/publicsuffixes
--- a/app/src/main/java/com/igreenwood/loupe/Loupe.kt
+++ b/app/src/main/java/com/igreenwood/loupe/Loupe.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
@@ -26,73 +26,165 @@ import android.content.Intent
 import android.content.IntentSender
 import android.os.Build
 import android.os.Bundle
+import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.autofill.AutofillHelper.EXTRA_INLINE_SUGGESTIONS_REQUEST
 import com.kunzisoft.keepass.autofill.KeeAutofillService
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.LOCK_ACTION

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

    override fun onCreate(savedInstanceState: Bundle?) {

-        // Build search param
-        val searchInfo = SearchInfo().apply {
-            applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
-            webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+        // Retrieve selection mode
+        EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode ->
+            when (specialMode) {
+                SpecialMode.SELECTION -> {
+                    // Build search param
+                    val searchInfo = SearchInfo().apply {
+                        applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
+                        webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+                        webScheme = intent.getStringExtra(KEY_SEARCH_SCHEME)
+                    }
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                        searchInfo.webDomain = concreteWebDomain
+                        launchSelection(searchInfo)
+                    }
+                }
+                SpecialMode.REGISTRATION -> {
+                    // To register info
+                    val registerInfo = intent.getParcelableExtra<RegisterInfo>(KEY_REGISTER_INFO)
+                    val searchInfo = SearchInfo(registerInfo?.searchInfo)
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                        searchInfo.webDomain = concreteWebDomain
+                        launchRegistration(searchInfo, registerInfo)
+                    }
+                }
+                else -> {
+                    // Not an autofill call
+                    setResult(Activity.RESULT_CANCELED)
+                    finish()
+                }
+            }
        }

-        // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
-        val assistStructure = AutofillHelper.retrieveAssistStructure(intent)
+        super.onCreate(savedInstanceState)
+    }

-        if (assistStructure == null) {
+    private fun launchSelection(searchInfo: SearchInfo) {
+        // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
+        val autofillComponent = AutofillHelper.retrieveAutofillComponent(intent)
+
+        if (autofillComponent == null) {
            setResult(Activity.RESULT_CANCELED)
            finish()
-        } else if (!KeeAutofillService.searchAllowedFor(searchInfo.applicationId,
+        } else if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
                        PreferencesUtil.applicationIdBlocklist(this))
-                || !KeeAutofillService.searchAllowedFor(searchInfo.webDomain,
+                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
                        PreferencesUtil.webDomainBlocklist(this))) {
-            // If item not allowed, show a toast
-            Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
+            showBlockRestartMessage()
            setResult(Activity.RESULT_CANCELED)
            finish()
        } else {
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
            // If database is open
            SearchHelper.checkAutoSearchInfo(this,
                    Database.getInstance(),
                    searchInfo,
                    { items ->
                        // Items found
-                        AutofillHelper.buildResponse(this, items)
+                        AutofillHelper.buildResponseAndSetResult(this, items)
                        finish()
                    },
                    {
                        // Show the database UI to select the entry
                        GroupActivity.launchForAutofillResult(this,
-                                assistStructure,
-                                false,
-                                searchInfo)
+                                readOnly,
+                                autofillComponent,
+                                searchInfo,
+                                false)
                    },
                    {
                        // If database not open
                        FileDatabaseSelectActivity.launchForAutofillResult(this,
-                                assistStructure,
+                                autofillComponent,
                                searchInfo)
                    }
            )
        }
+    }

-        super.onCreate(savedInstanceState)
+    private fun launchRegistration(searchInfo: SearchInfo, registerInfo: RegisterInfo?) {
+        if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
+                        PreferencesUtil.applicationIdBlocklist(this))
+                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
+                        PreferencesUtil.webDomainBlocklist(this))) {
+            showBlockRestartMessage()
+            setResult(Activity.RESULT_CANCELED)
+        } else {
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
+            SearchHelper.checkAutoSearchInfo(this,
+                    database,
+                    searchInfo,
+                    { _ ->
+                        if (!readOnly) {
+                            // Show the database UI to select the entry
+                            GroupActivity.launchForRegistration(this,
+                                    registerInfo)
+                        } else {
+                            showReadOnlySaveMessage()
+                        }
+                    },
+                    {
+                        if (!readOnly) {
+                            // Show the database UI to select the entry
+                            GroupActivity.launchForRegistration(this,
+                                    registerInfo)
+                        } else {
+                            showReadOnlySaveMessage()
+                        }
+                    },
+                    {
+                        // If database not open
+                        FileDatabaseSelectActivity.launchForRegistration(this,
+                                registerInfo)
+                    }
+            )
+        }
+        finish()
+    }
+
+    private fun showBlockRestartMessage() {
+        // If item not allowed, show a toast
+        Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
+    }
+
+    private fun showReadOnlySaveMessage() {
+        Toast.makeText(this.applicationContext, R.string.autofill_read_only_save, Toast.LENGTH_LONG).show()
    }

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

@@ -100,18 +192,47 @@ class AutofillLauncherActivity : AppCompatActivity() {

        private const val KEY_SEARCH_APPLICATION_ID = "KEY_SEARCH_APPLICATION_ID"
        private const val KEY_SEARCH_DOMAIN = "KEY_SEARCH_DOMAIN"
+        private const val KEY_SEARCH_SCHEME = "KEY_SEARCH_SCHEME"

-        fun getAuthIntentSenderForResponse(context: Context,
-                                           searchInfo: SearchInfo? = null): IntentSender {
+        private const val KEY_REGISTER_INFO = "KEY_REGISTER_INFO"
+
+        fun getAuthIntentSenderForSelection(context: Context,
+                                            searchInfo: SearchInfo? = null,
+                                            inlineSuggestionsRequest: InlineSuggestionsRequest? = null): IntentSender {
            return PendingIntent.getActivity(context, 0,
                    // Doesn't work with Parcelable (don't know why?)
                    Intent(context, AutofillLauncherActivity::class.java).apply {
                        searchInfo?.let {
                            putExtra(KEY_SEARCH_APPLICATION_ID, it.applicationId)
                            putExtra(KEY_SEARCH_DOMAIN, it.webDomain)
+                            putExtra(KEY_SEARCH_SCHEME, it.webScheme)
+                        }
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                            inlineSuggestionsRequest?.let {
+                                putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+                            }
                        }
                    },
                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
        }
+
+        fun getAuthIntentSenderForRegistration(context: Context,
+                                               registerInfo: RegisterInfo): IntentSender {
+            return PendingIntent.getActivity(context, 0,
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
+                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
+                        putExtra(KEY_REGISTER_INFO, registerInfo)
+                    },
+                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
+        }
+
+        fun launchForRegistration(context: Context,
+                                  registerInfo: RegisterInfo) {
+            val intent = Intent(context, AutofillLauncherActivity::class.java)
+            EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.REGISTRATION)
+            intent.putExtra(KEY_REGISTER_INFO, registerInfo)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -25,6 +25,7 @@ import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
@@ -38,29 +39,31 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME
-import com.kunzisoft.keepass.model.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachment
-import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService
-import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
+import com.kunzisoft.keepass.model.EntryAttachmentState
+import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.services.AttachmentFileNotificationService
+import com.kunzisoft.keepass.services.ClipboardEntryNotificationService
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.MenuUtil
-import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.utils.createDocument
-import com.kunzisoft.keepass.utils.onCreateDocumentResult
+import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.EntryContentsView
-import com.kunzisoft.keepass.view.showActionError
+import com.kunzisoft.keepass.view.showActionErrorIfNeeded
 import java.util.*
 import kotlin.collections.HashMap

@@ -86,10 +89,12 @@ class EntryActivity : LockingActivity() {
    private var mShowPassword: Boolean = false

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

    private var clipboardHelper: ClipboardHelper? = null
-    private var firstLaunchOfActivity: Boolean = false
+    private var mFirstLaunchOfActivity: Boolean = false
+
+    private var mExternalFileHelper: ExternalFileHelper? = null

    private var iconColor: Int = 0

@@ -123,6 +128,7 @@ class EntryActivity : LockingActivity() {
        historyView = findViewById(R.id.history_container)
        entryContentsView = findViewById(R.id.entry_contents)
        entryContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
+        entryContentsView?.setAttachmentCipherKey(mDatabase)
        entryProgress = findViewById(R.id.entry_progress)
        lockView = findViewById(R.id.lock_button)

@@ -130,14 +136,20 @@ class EntryActivity : LockingActivity() {
            lockAndExit()
        }

+        // Focus view to reinitialize timeout
+        coordinatorLayout?.resetAppTimeoutWhenViewFocusedOrChanged(this)
+
        // Init the clipboard helper
        clipboardHelper = ClipboardHelper(this)
-        firstLaunchOfActivity = true
+        mFirstLaunchOfActivity = savedInstanceState?.getBoolean(KEY_FIRST_LAUNCH_ACTIVITY) ?: true
+
+        // Init SAF manager
+        mExternalFileHelper = ExternalFileHelper(this)

        // Init attachment service binder manager
        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)

-        mProgressDialogThread?.onActionFinish = { actionTask, result ->
+        mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
            when (actionTask) {
                ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
                ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
@@ -145,8 +157,13 @@ class EntryActivity : LockingActivity() {
                    if (result.isSuccess)
                        finish()
                }
+                ACTION_DATABASE_RELOAD_TASK -> {
+                    // Close the current activity
+                    this.showActionErrorIfNeeded(result)
+                    finish()
+                }
            }
-            coordinatorLayout?.showActionError(result)
+            coordinatorLayout?.showActionErrorIfNeeded(result)
        }
    }

@@ -193,10 +210,9 @@ class EntryActivity : LockingActivity() {
            // Refresh Menu
            invalidateOptionsMenu()

-            val entryInfo = entry.getEntryInfo(Database.getInstance())
-
+            val entryInfo = entry.getEntryInfo(mDatabase)
            // Manage entry copy to start notification if allowed
-            if (firstLaunchOfActivity) {
+            if (mFirstLaunchOfActivity) {
                // Manage entry to launch copying notification if allowed
                ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
                // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
@@ -209,13 +225,15 @@ class EntryActivity : LockingActivity() {
        mAttachmentFileBinderManager?.apply {
            registerProgressTask()
            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
-                override fun onAttachmentProgress(fileUri: Uri, attachment: EntryAttachment) {
-                    entryContentsView?.updateAttachmentDownloadProgress(attachment)
+                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
+                    if (entryAttachmentState.streamDirection != StreamDirection.UPLOAD) {
+                        entryContentsView?.putAttachment(entryAttachmentState)
+                    }
                }
            }
        }

-        firstLaunchOfActivity = false
+        mFirstLaunchOfActivity = false
    }

    override fun onPause() {
@@ -226,25 +244,24 @@ class EntryActivity : LockingActivity() {

    private fun fillEntryDataInContentsView(entry: Entry) {

-        val database = Database.getInstance()
-        database.startManageEntry(entry)
+        val entryInfo = entry.getEntryInfo(mDatabase)
+
        // Assign title icon
-        titleIconView?.assignDatabaseIcon(database.drawFactory, entry.icon, iconColor)
+        titleIconView?.let { iconView ->
+            mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconView, entryInfo.icon, iconColor)
+        }

        // Assign title text
-        val entryTitle = entry.title
+        val entryTitle = entryInfo.title
        collapsingToolbarLayout?.title = entryTitle
        toolbar?.title = entryTitle

        // Assign basic fields
-        entryContentsView?.assignUserName(entry.username)
-        entryContentsView?.assignUserNameCopyListener(View.OnClickListener {
-            database.startManageEntry(entry)
-            clipboardHelper?.timeoutCopyToClipboard(entry.username,
-                            getString(R.string.copy_field,
+        entryContentsView?.assignUserName(entryInfo.username) {
+            clipboardHelper?.timeoutCopyToClipboard(entryInfo.username,
+                    getString(R.string.copy_field,
                            getString(R.string.entry_user_name)))
-            database.stopManageEntry(entry)
-        })
+        }

        val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
                PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)
@@ -271,97 +288,77 @@ class EntryActivity : LockingActivity() {
                    }
        }

-        entryContentsView?.assignPassword(entry.password, allowCopyPasswordAndProtectedFields)
-        if (allowCopyPasswordAndProtectedFields) {
-            entryContentsView?.assignPasswordCopyListener(View.OnClickListener {
-                database.startManageEntry(entry)
-                clipboardHelper?.timeoutCopyToClipboard(entry.password,
-                                getString(R.string.copy_field,
+        val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
+            View.OnClickListener {
+                clipboardHelper?.timeoutCopyToClipboard(entryInfo.password,
+                        getString(R.string.copy_field,
                                getString(R.string.entry_password)))
-                database.stopManageEntry(entry)
-            })
+            }
        } else {
            // If dialog not already shown
            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
-                entryContentsView?.assignPasswordCopyListener(showWarningClipboardDialogOnClickListener)
+                showWarningClipboardDialogOnClickListener
            } else {
-                entryContentsView?.assignPasswordCopyListener(null)
+                null
            }
        }
+        entryContentsView?.assignPassword(entryInfo.password,
+                allowCopyPasswordAndProtectedFields,
+                onPasswordCopyClickListener)

        //Assign OTP field
-        entryContentsView?.assignOtp(entry.getOtpElement(), entryProgress,
-                View.OnClickListener {
-                    entry.getOtpElement()?.let { otpElement ->
-                        clipboardHelper?.timeoutCopyToClipboard(
-                                otpElement.token,
-                                getString(R.string.copy_field, getString(R.string.entry_otp))
-                        )
-                    }
-        })
+        entry.getOtpElement()?.let { otpElement ->
+            entryContentsView?.assignOtp(otpElement, entryProgress) {
+                clipboardHelper?.timeoutCopyToClipboard(
+                        otpElement.token,
+                        getString(R.string.copy_field, getString(R.string.entry_otp))
+                )
+            }
+        }

-        entryContentsView?.assignURL(entry.url)
-        entryContentsView?.assignComment(entry.notes)
+        entryContentsView?.assignURL(entryInfo.url)
+        entryContentsView?.assignNotes(entryInfo.notes)

        // Assign custom fields
-        if (entry.allowCustomFields()) {
+        if (mDatabase?.allowEntryCustomFields() == true) {
            entryContentsView?.clearExtraFields()
-
-            for (element in entry.customFields.entries) {
-                val label = element.key
-                val value = element.value
-
-                val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
-                if (allowCopyProtectedField) {
-                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField, View.OnClickListener {
-                        clipboardHelper?.timeoutCopyToClipboard(
-                                value.toString(),
-                                getString(R.string.copy_field, label)
-                        )
-                    })
-                } else {
-                    // If dialog not already shown
-                    if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
-                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+            entryInfo.customFields.forEach { field ->
+                val label = field.name
+                // OTP field is already managed in dedicated view
+                if (label != OtpEntryFields.OTP_TOKEN_FIELD) {
+                    val value = field.protectedValue
+                    val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
+                    if (allowCopyProtectedField) {
+                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
+                            clipboardHelper?.timeoutCopyToClipboard(
+                                    value.toString(),
+                                    getString(R.string.copy_field, label)
+                            )
+                        }
                    } else {
-                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
-                    }
-                }
-            }
-        }
-        entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
-
-        // Manage attachments
-        val attachments = entry.getAttachments()
-        val showAttachmentsView = attachments.isNotEmpty()
-        entryContentsView?.showAttachments(showAttachmentsView)
-        if (showAttachmentsView) {
-            entryContentsView?.assignAttachments(attachments)
-            entryContentsView?.onAttachmentClick { attachmentItem, _ ->
-                when (attachmentItem.downloadState) {
-                    AttachmentState.NULL, AttachmentState.ERROR, AttachmentState.COMPLETE -> {
-                        createDocument(this, attachmentItem.name)?.let { requestCode ->
-                            mAttachmentsToDownload[requestCode] = attachmentItem
+                        // If dialog not already shown
+                        if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+                        } else {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
                        }
                    }
-                    else -> {
-                        // TODO Stop download
-                    }
                }
            }
        }
-        entryContentsView?.refreshAttachments()
+        entryContentsView?.setHiddenProtectedValue(!mShowPassword)
+
+        // Manage attachments
+        entryContentsView?.assignAttachments(entryInfo.attachments.toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
+            mExternalFileHelper?.createDocument(attachmentItem.name)?.let { requestCode ->
+                mAttachmentsToDownload[requestCode] = attachmentItem
+            }
+        }

        // Assign dates
-        entryContentsView?.assignCreationDate(entry.creationTime)
-        entryContentsView?.assignModificationDate(entry.lastModificationTime)
-        entryContentsView?.assignLastAccessDate(entry.lastAccessTime)
-        entryContentsView?.setExpires(entry.isCurrentlyExpires)
-        if (entry.expires) {
-            entryContentsView?.assignExpiresDate(entry.expiryTime)
-        } else {
-            entryContentsView?.assignExpiresDate(getString(R.string.never))
-        }
+        entryContentsView?.assignCreationDate(entryInfo.creationTime)
+        entryContentsView?.assignModificationDate(entryInfo.lastModificationTime)
+        entryContentsView?.setExpires(entryInfo.expires, entryInfo.expiryTime)

        // Manage history
        historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
@@ -370,21 +367,12 @@ class EntryActivity : LockingActivity() {
            collapsingToolbarLayout?.contentScrim = ColorDrawable(taColorAccent.getColor(0, Color.BLACK))
            taColorAccent.recycle()
        }
-        val entryHistory = entry.getHistory()
-        val showHistoryView = entryHistory.isNotEmpty()
-        entryContentsView?.showHistory(showHistoryView)
-        if (showHistoryView) {
-            entryContentsView?.assignHistory(entryHistory)
-            entryContentsView?.onHistoryClick { historyItem, position ->
-                launch(this, historyItem, mReadOnly, position)
-            }
+        entryContentsView?.assignHistory(entry.getHistory()) { historyItem, position ->
+            launch(this, historyItem, mReadOnly, position)
        }
-        entryContentsView?.refreshHistory()

        // Assign special data
        entryContentsView?.assignUUID(entry.nodeId.id)
-
-        database.stopManageEntry(entry)
    }

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -398,7 +386,7 @@ class EntryActivity : LockingActivity() {
                }
        }

-        onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
+        mExternalFileHelper?.onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
            if (createdFileUri != null) {
                mAttachmentsToDownload[requestCode]?.let { attachmentToDownload ->
                    mAttachmentFileBinderManager
@@ -408,16 +396,6 @@ class EntryActivity : LockingActivity() {
        }
    }

-    private fun changeShowPasswordIcon(togglePassword: MenuItem?) {
-        if (mShowPassword) {
-            togglePassword?.setTitle(R.string.menu_hide_password)
-            togglePassword?.setIcon(R.drawable.ic_visibility_off_white_24dp)
-        } else {
-            togglePassword?.setTitle(R.string.menu_showpass)
-            togglePassword?.setIcon(R.drawable.ic_visibility_white_24dp)
-        }
-    }
-
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)

@@ -432,14 +410,8 @@ class EntryActivity : LockingActivity() {
            menu.findItem(R.id.menu_save_database)?.isVisible = false
            menu.findItem(R.id.menu_edit)?.isVisible = false
        }
-
-        val togglePassword = menu.findItem(R.id.menu_toggle_pass)
-        entryContentsView?.let {
-            if (it.isPasswordPresent || it.atLeastOneFieldProtectedPresent()) {
-                changeShowPasswordIcon(togglePassword)
-            } else {
-                togglePassword?.isVisible = false
-            }
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            menu.findItem(R.id.menu_reload_database)?.isVisible = false
        }

        val gotoUrl = menu.findItem(R.id.menu_goto_url)
@@ -457,35 +429,38 @@ class EntryActivity : LockingActivity() {
        }

        // Show education views
-        Handler().post { performedNextEducation(EntryActivityEducation(this), menu) }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(EntryActivityEducation(this), menu) }

        return true
    }

    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
                                       menu: Menu) {
-        val entryCopyEducationPerformed = entryContentsView?.isUserNamePresent == true
+        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
+        val entryCopyEducationPerformed = entryFieldCopyView != null
                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
-                        findViewById(R.id.entry_user_name_action_image),
+                        entryFieldCopyView,
                        {
-                            clipboardHelper?.timeoutCopyToClipboard(mEntry!!.username,
-                                    getString(R.string.copy_field,
-                                            getString(R.string.entry_user_name)))
+                            val appNameString = getString(R.string.app_name)
+                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
+                                    getString(R.string.copy_field, appNameString))
                        },
                        {
                            performedNextEducation(entryActivityEducation, menu)
                        })

        if (!entryCopyEducationPerformed) {
+            val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
            // entryEditEducationPerformed
-            toolbar?.findViewById<View>(R.id.menu_edit) != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
-                            toolbar!!.findViewById(R.id.menu_edit),
-                            {
-                                onOptionsItemSelected(menu.findItem(R.id.menu_edit))
-                            },
-                            {
-                                performedNextEducation(entryActivityEducation, menu)
-                            })
+            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
+                    menuEditView,
+                    {
+                        onOptionsItemSelected(menu.findItem(R.id.menu_edit))
+                    },
+                    {
+                        performedNextEducation(entryActivityEducation, menu)
+                    }
+            )
        }
    }

@@ -495,12 +470,6 @@ class EntryActivity : LockingActivity() {
                MenuUtil.onContributionItemSelected(this)
                return true
            }
-            R.id.menu_toggle_pass -> {
-                mShowPassword = !mShowPassword
-                changeShowPasswordIcon(item)
-                entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
-                return true
-            }
            R.id.menu_edit -> {
                mEntry?.let {
                    EntryEditActivity.launch(this@EntryActivity, it)
@@ -520,7 +489,7 @@ class EntryActivity : LockingActivity() {
            }
            R.id.menu_restore_entry_history -> {
                mEntryLastVersion?.let { mainEntry ->
-                    mProgressDialogThread?.startDatabaseRestoreEntryHistory(
+                    mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory(
                            mainEntry,
                            mEntryHistoryPosition,
                            !mReadOnly && mAutoSaveEnable)
@@ -528,20 +497,28 @@ class EntryActivity : LockingActivity() {
            }
            R.id.menu_delete_entry_history -> {
                mEntryLastVersion?.let { mainEntry ->
-                    mProgressDialogThread?.startDatabaseDeleteEntryHistory(
+                    mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(
                            mainEntry,
                            mEntryHistoryPosition,
                            !mReadOnly && mAutoSaveEnable)
                }
            }
            R.id.menu_save_database -> {
-                mProgressDialogThread?.startDatabaseSave(!mReadOnly)
+                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
+            }
+            R.id.menu_reload_database -> {
+                mProgressDatabaseTaskProvider?.startDatabaseReload(false)
            }
            android.R.id.home -> finish() // close this activity and return to preview activity (if there is any)
        }
        return super.onOptionsItemSelected(item)
    }

+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putBoolean(KEY_FIRST_LAUNCH_ACTIVITY, mFirstLaunchOfActivity)
+    }

    override fun finish() {
        // Transit data in previous Activity after an update
@@ -555,6 +532,8 @@ class EntryActivity : LockingActivity() {
    companion object {
        private val TAG = EntryActivity::class.java.name

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

--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
@@ -23,6 +23,7 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
@@ -31,6 +32,7 @@ import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.settings.PreferencesUtil

 /**
@@ -42,79 +44,137 @@ class EntrySelectionLauncherActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {

        var sharedWebDomain: String? = null
+        var otpString: String? = null

        when (intent?.action) {
            Intent.ACTION_SEND -> {
                if ("text/plain" == intent.type) {
-                    // Retrieve web domain
-                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-                        sharedWebDomain = Uri.parse(it).host
+                    // Retrieve web domain or OTP
+                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let { extra ->
+                        if (OtpEntryFields.isOTPUri(extra))
+                            otpString = extra
+                        else
+                            sharedWebDomain = Uri.parse(extra).host
                    }
                }
            }
+            Intent.ACTION_VIEW -> {
+                // Retrieve OTP
+                intent.dataString?.let { extra ->
+                    if (OtpEntryFields.isOTPUri(extra))
+                        otpString = extra
+                }
+            }
            else -> {}
        }

-        // Setting to integrate Magikeyboard
-        val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)

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

-        // If database is open
-        SearchHelper.checkAutoSearchInfo(this,
-                Database.getInstance(),
-                searchInfo,
-                { items ->
-                    // Items found
-                    if (searchShareForMagikeyboard) {
-                        if (items.size == 1) {
-                            // Automatically populate keyboard
-                            val entryPopulate = items[0]
-                            populateKeyboardAndMoveAppToBackground(this,
-                                    entryPopulate,
-                                    intent)
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun launch(searchInfo: SearchInfo) {
+
+        if (!searchInfo.containsOnlyNullValues()) {
+            // Setting to integrate Magikeyboard
+            val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
+
+            // If database is open
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
+            SearchHelper.checkAutoSearchInfo(this,
+                    database,
+                    searchInfo,
+                    { items ->
+                        // Items found
+                        if (searchInfo.otpString != null) {
+                            if (!readOnly) {
+                                GroupActivity.launchForSaveResult(this,
+                                        searchInfo,
+                                        false)
+                            } else {
+                                Toast.makeText(applicationContext,
+                                        R.string.autofill_read_only_save,
+                                        Toast.LENGTH_LONG)
+                                        .show()
+                            }
+                        } else if (searchShareForMagikeyboard) {
+                            if (items.size == 1) {
+                                // Automatically populate keyboard
+                                val entryPopulate = items[0]
+                                populateKeyboardAndMoveAppToBackground(this,
+                                        entryPopulate,
+                                        intent)
+                            } else {
+                                // Select the one we want
+                                GroupActivity.launchForKeyboardSelectionResult(this,
+                                        readOnly,
+                                        searchInfo,
+                                        true)
+                            }
                        } else {
-                            // Select the one we want
-                            GroupActivity.launchForEntrySelectionResult(this,
-                                    true,
+                            GroupActivity.launchForSearchResult(this,
+                                    readOnly,
+                                    searchInfo,
+                                    true)
+                        }
+                    },
+                    {
+                        // Show the database UI to select the entry
+                        if (searchInfo.otpString != null) {
+                            if (!readOnly) {
+                                GroupActivity.launchForSaveResult(this,
+                                        searchInfo,
+                                        false)
+                            } else {
+                                Toast.makeText(applicationContext,
+                                        R.string.autofill_read_only_save,
+                                        Toast.LENGTH_LONG)
+                                        .show()
+                            }
+                        } else if (readOnly || searchShareForMagikeyboard) {
+                            GroupActivity.launchForKeyboardSelectionResult(this,
+                                    readOnly,
+                                    searchInfo,
+                                    false)
+                        } else {
+                            GroupActivity.launchForSaveResult(this,
+                                    searchInfo,
+                                    false)
+                        }
+                    },
+                    {
+                        // If database not open
+                        if (searchInfo.otpString != null) {
+                            if (!readOnly) {
+                                FileDatabaseSelectActivity.launchForSaveResult(this,
+                                        searchInfo)
+                            } else {
+                                Toast.makeText(applicationContext,
+                                        R.string.autofill_read_only_save,
+                                        Toast.LENGTH_LONG)
+                                        .show()
+                            }
+                        } else if (searchShareForMagikeyboard) {
+                            FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this,
+                                    searchInfo)
+                        } else {
+                            FileDatabaseSelectActivity.launchForSearchResult(this,
                                    searchInfo)
                        }
-                    } else {
-                        GroupActivity.launch(this,
-                                true,
-                                searchInfo)
                    }
-                },
-                {
-                    // Show the database UI to select the entry
-                    if (searchShareForMagikeyboard) {
-                        GroupActivity.launchForEntrySelectionResult(this,
-                                false,
-                                searchInfo)
-                    } else {
-                        GroupActivity.launch(this,
-                                false,
-                                searchInfo)
-                    }
-                },
-                {
-                    // If database not open
-                    if (searchShareForMagikeyboard) {
-                        FileDatabaseSelectActivity.launchForEntrySelectionResult(this,
-                                searchInfo)
-                    } else {
-                        FileDatabaseSelectActivity.launch(this,
-                                searchInfo)
-                    }
-                }
-        )
-
+            )
+        }
        finish()
-
-        super.onCreate(savedInstanceState)
    }
 }

@@ -125,6 +185,6 @@ fun populateKeyboardAndMoveAppToBackground(activity: Activity,
    // Populate Magikeyboard with entry
    MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
    // Consume the selection mode
-    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
+    EntrySelectionHelper.removeModesFromIntent(intent)
    activity.moveTaskToBack(true)
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -19,19 +19,19 @@
 */
 package com.kunzisoft.keepass.activities

-import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.assist.AssistStructure
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -42,33 +42,40 @@ import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
-import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
+import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
+import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
+import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.asError
-import kotlinx.android.synthetic.main.activity_file_selection.*
+import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import java.io.FileNotFoundException

 class FileDatabaseSelectActivity : SpecialModeActivity(),
        AssignMasterKeyDialogFragment.AssignPasswordDialogListener {

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

+    private val databaseFilesViewModel: DatabaseFilesViewModel by viewModels()
+
    // Adapter to manage database history list
    private var mAdapterDatabaseHistory: FileDatabaseHistoryAdapter? = null

@@ -76,9 +83,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),

    private var mDatabaseFileUri: Uri? = null

-    private var mOpenFileHelper: OpenFileHelper? = null
+    private var mExternalFileHelper: ExternalFileHelper? = null

-    private var mProgressDialogThread: ProgressDialogThread? = null
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -92,26 +99,14 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        toolbar.title = ""
        setSupportActionBar(toolbar)

-        fileManagerExplanationButton = findViewById(R.id.file_manager_explanation_button)
-        fileManagerExplanationButton?.setOnClickListener {
-            UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
-        }
-
-        databaseButtonsContainerView = findViewById(R.id.database_buttons_container)
-
        // Create database button
        createDatabaseButtonView = findViewById(R.id.create_database_button)
        createDatabaseButtonView?.setOnClickListener { createNewFile() }

        // Open database button
-        mOpenFileHelper = OpenFileHelper(this)
+        mExternalFileHelper = ExternalFileHelper(this)
        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
-        openDatabaseButtonView?.apply {
-            mOpenFileHelper?.openFileOnClickViewListener?.let {
-                setOnClickListener(it)
-                setOnLongClickListener(it)
-            }
-        }
+        openDatabaseButtonView?.setOpenDocumentClickListener(mExternalFileHelper)

        // History list
        val fileDatabaseHistoryRecyclerView = findViewById<RecyclerView>(R.id.file_list)
@@ -120,26 +115,25 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        (fileDatabaseHistoryRecyclerView.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
        // Construct adapter with listeners
        mAdapterDatabaseHistory = FileDatabaseHistoryAdapter(this)
+        mAdapterDatabaseHistory?.setOnDefaultDatabaseListener { databaseFile ->
+            databaseFilesViewModel.setDefaultDatabase(databaseFile)
+        }
        mAdapterDatabaseHistory?.setOnFileDatabaseHistoryOpenListener { fileDatabaseHistoryEntityToOpen ->
-            UriUtil.parse(fileDatabaseHistoryEntityToOpen.databaseUri)?.let { databaseFileUri ->
+            fileDatabaseHistoryEntityToOpen.databaseUri?.let { databaseFileUri ->
                launchPasswordActivity(
                        databaseFileUri,
-                        UriUtil.parse(fileDatabaseHistoryEntityToOpen.keyFileUri))
+                        fileDatabaseHistoryEntityToOpen.keyFileUri
+                )
            }
        }
        mAdapterDatabaseHistory?.setOnFileDatabaseHistoryDeleteListener { fileDatabaseHistoryToDelete ->
            // Remove from app database
-            mFileDatabaseHistoryAction?.deleteFileDatabaseHistory(fileDatabaseHistoryToDelete) { fileHistoryDeleted ->
-                // Remove from adapter
-                fileHistoryDeleted?.let { databaseFileHistoryDeleted ->
-                    mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileHistoryDeleted)
-                    mAdapterDatabaseHistory?.notifyDataSetChanged()
-                }
-            }
+            databaseFilesViewModel.deleteDatabaseFile(fileDatabaseHistoryToDelete)
            true
        }
        mAdapterDatabaseHistory?.setOnSaveAliasListener { fileDatabaseHistoryWithNewAlias ->
-            mFileDatabaseHistoryAction?.addOrUpdateFileDatabaseHistory(fileDatabaseHistoryWithNewAlias)
+            // Update in app database
+            databaseFilesViewModel.updateDatabaseFile(fileDatabaseHistoryWithNewAlias)
        }
        fileDatabaseHistoryRecyclerView.adapter = mAdapterDatabaseHistory

@@ -162,12 +156,70 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            mDatabaseFileUri = savedInstanceState.getParcelable(EXTRA_DATABASE_URI)
        }

+        // Observe list of databases
+        databaseFilesViewModel.databaseFilesLoaded.observe(this) { databaseFiles ->
+            try {
+                when (databaseFiles.databaseFileAction) {
+                    DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
+                        mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+                    }
+                    DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
+                        databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
+                            mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
+                        }
+                    }
+                    DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
+                        databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
+                            mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
+                        }
+                    }
+                    DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
+                        databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
+                            mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
+                        }
+                    }
+                }
+                databaseFilesViewModel.consumeAction()
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to observe database action", e)
+            }
+        }
+
+        // Observe default database
+        databaseFilesViewModel.defaultDatabase.observe(this) {
+            // Retrieve settings for default database
+            mAdapterDatabaseHistory?.setDefaultDatabase(it)
+        }
+
        // Attach the dialog thread to this activity
-        mProgressDialogThread = ProgressDialogThread(this).apply {
-            onActionFinish = { actionTask, _ ->
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
+            onActionFinish = { actionTask, result ->
                when (actionTask) {
                    ACTION_DATABASE_CREATE_TASK -> {
-                        GroupActivity.launch(this@FileDatabaseSelectActivity)
+                        result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
+                            val mainCredential = result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY) ?: MainCredential()
+                            databaseFilesViewModel.addDatabaseFile(databaseUri, mainCredential.keyFileUri)
+                        }
+                        GroupActivity.launch(this@FileDatabaseSelectActivity,
+                                PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
+                    }
+                    ACTION_DATABASE_LOAD_TASK -> {
+                        val database = Database.getInstance()
+                        if (result.isSuccess
+                                && database.loaded) {
+                            launchGroupActivity(database)
+                        } else {
+                            var resultError = ""
+                            val resultMessage = result.message
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError)
+                            Snackbar.make(coordinatorLayout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
+                        }
                    }
                }
            }
@@ -177,86 +229,44 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
    /**
     * Create a new file by calling the content provider
     */
-    @SuppressLint("InlinedApi")
    private fun createNewFile() {
-        createDocument(this, getString(R.string.database_file_name_default) +
+        mExternalFileHelper?.createDocument( getString(R.string.database_file_name_default) +
                getString(R.string.database_file_extension_default), "application/x-keepass")
    }

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

    private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-        EntrySelectionHelper.doEntrySelectionAction(intent,
-                {
-                    try {
-                        PasswordActivity.launch(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile,
-                                searchInfo)
-                    } catch (e: FileNotFoundException) {
-                        fileNoFoundAction(e)
-                    }
-                    // Remove the search info from intent
-                    if (searchInfo != null) {
-                        finish()
-                    }
+        PasswordActivity.launch(this,
+                databaseUri,
+                keyFile,
+                { exception ->
+                    fileNoFoundAction(exception)
                },
-                {
-                    try {
-                        PasswordActivity.launchForKeyboardResult(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile,
-                                searchInfo)
-                    } catch (e: FileNotFoundException) {
-                        fileNoFoundAction(e)
-                    }
-                    finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        try {
-                            PasswordActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
-                                    databaseUri, keyFile,
-                                    assistStructure,
-                                    searchInfo)
-                        } catch (e: FileNotFoundException) {
-                            fileNoFoundAction(e)
-                        }
-                    }
-                })
+                { onCancelSpecialMode() },
+                { onLaunchActivitySpecialMode() })
    }

-    private fun launchGroupActivity(readOnly: Boolean) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-        EntrySelectionHelper.doEntrySelectionAction(intent,
-                {
-                    GroupActivity.launch(this@FileDatabaseSelectActivity,
-                            false,
-                            searchInfo,
-                            readOnly)
-                },
-                {
-                    GroupActivity.launchForEntrySelectionResult(this@FileDatabaseSelectActivity,
-                            false,
-                            searchInfo,
-                            readOnly)
-                    // Do not keep history
-                    finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
-                                assistStructure,
-                                false,
-                                searchInfo,
-                                readOnly)
-                    }
-                })
+    private fun launchGroupActivity(database: Database) {
+        GroupActivity.launch(this,
+                database.isReadOnly,
+                { onValidateSpecialMode() },
+                { onCancelSpecialMode() },
+                { onLaunchActivitySpecialMode() })
+    }
+
+    override fun onValidateSpecialMode() {
+        super.onValidateSpecialMode()
+        finish()
+    }
+
+    override fun onCancelSpecialMode() {
+        super.onCancelSpecialMode()
+        finish()
    }

    private fun launchPasswordActivityWithPath(databaseUri: Uri) {
@@ -270,54 +280,42 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        super.onResume()

        // Show open and create button or special mode
-        if  (mSelectionMode) {
-            // Disable buttons if in selection mode or request for autofill
-            databaseButtonsContainerView?.visibility = View.GONE
-        } else {
-            if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
-                // There is an activity which can handle this intent.
-                createDatabaseButtonView?.visibility = View.VISIBLE
-            } else{
-                // No Activity found that can handle this intent.
+        when (mSpecialMode) {
+            SpecialMode.DEFAULT -> {
+                if (ExternalFileHelper.allowCreateDocumentByStorageAccessFramework(packageManager)) {
+                    // There is an activity which can handle this intent.
+                    createDatabaseButtonView?.visibility = View.VISIBLE
+                } else{
+                    // No Activity found that can handle this intent.
+                    createDatabaseButtonView?.visibility = View.GONE
+                }
+            }
+            else -> {
+                // Disable create button if in selection mode or request for autofill
                createDatabaseButtonView?.visibility = View.GONE
            }
-            databaseButtonsContainerView?.visibility = View.VISIBLE
        }

        val database = Database.getInstance()
        if (database.loaded) {
-            launchGroupActivity(database.isReadOnly)
+            launchGroupActivity(database)
        } else {
            // Construct adapter with listeners
            if (PreferencesUtil.showRecentFiles(this)) {
-                mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
-                    databaseFileHistoryList?.let { historyList ->
-                        val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(this@FileDatabaseSelectActivity)
-                        mAdapterDatabaseHistory?.addDatabaseFileHistoryList(
-                                // Show only uri accessible
-                                historyList.filter {
-                                    if (hideBrokenLocations) {
-                                        FileDatabaseInfo(this@FileDatabaseSelectActivity,
-                                                it.databaseUri).exists
-                                    } else
-                                        true
-                                })
-                        mAdapterDatabaseHistory?.notifyDataSetChanged()
-                    }
-                }
+                databaseFilesViewModel.loadListOfDatabases()
            } else {
                mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
                mAdapterDatabaseHistory?.notifyDataSetChanged()
            }

            // Register progress task
-            mProgressDialogThread?.registerProgressTask()
+            mProgressDatabaseTaskProvider?.registerProgressTask()
        }
    }

    override fun onPause() {
        // Unregister progress task
-        mProgressDialogThread?.unregisterProgressTask()
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()

        super.onPause()
    }
@@ -330,34 +328,25 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        outState.putParcelable(EXTRA_DATABASE_URI, mDatabaseFileUri)
    }

-    override fun onAssignKeyDialogPositiveClick(
-            masterPasswordChecked: Boolean, masterPassword: String?,
-            keyFileChecked: Boolean, keyFile: Uri?) {
+    override fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential) {

        try {
            mDatabaseFileUri?.let { databaseUri ->

                // Create the new database
-                mProgressDialogThread?.startDatabaseCreate(
+                mProgressDatabaseTaskProvider?.startDatabaseCreate(
                        databaseUri,
-                        masterPasswordChecked,
-                        masterPassword,
-                        keyFileChecked,
-                        keyFile
+                        mainCredential
                )
            }
        } catch (e: Exception) {
            val error = getString(R.string.error_create_database_file)
-            Snackbar.make(activity_file_selection_coordinator_layout, error, Snackbar.LENGTH_LONG).asError().show()
+            Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
            Log.e(TAG, error, e)
        }
    }

-    override fun onAssignKeyDialogNegativeClick(
-            masterPasswordChecked: Boolean, masterPassword: String?,
-            keyFileChecked: Boolean, keyFile: Uri?) {
-
-    }
+    override fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential) {}

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
@@ -366,24 +355,21 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
        }

-        mOpenFileHelper?.onActivityResultCallback(requestCode, resultCode, data
-        ) { uri ->
+        mExternalFileHelper?.onOpenDocumentResult(requestCode, resultCode, data) { uri ->
            if (uri != null) {
                launchPasswordActivityWithPath(uri)
            }
        }

        // Retrieve the created URI from the file manager
-        onCreateDocumentResult(requestCode, resultCode, data) { databaseFileCreatedUri ->
+        mExternalFileHelper?.onCreateDocumentResult(requestCode, resultCode, data) { databaseFileCreatedUri ->
            mDatabaseFileUri = databaseFileCreatedUri
            if (mDatabaseFileUri != null) {
                AssignMasterKeyDialogFragment.getInstance(true)
                        .show(supportFragmentManager, "passwordDialog")
            } else {
                val error = getString(R.string.error_create_database)
-                coordinatorLayout?.let {
-                    Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-                }
+                Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
                Log.e(TAG, error)
            }
        }
@@ -392,22 +378,24 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)

-        if (!mSelectionMode) {
+        if (mSpecialMode == SpecialMode.DEFAULT) {
            MenuUtil.defaultMenuInflater(menuInflater, menu)
        }

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

        return true
    }

    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
        // If no recent files
-        val createDatabaseEducationPerformed = createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
+        val createDatabaseEducationPerformed =
+                createDatabaseButtonView != null
+                && createDatabaseButtonView!!.visibility == View.VISIBLE
                && mAdapterDatabaseHistory != null
-                && mAdapterDatabaseHistory!!.itemCount > 0
+                && mAdapterDatabaseHistory!!.itemCount == 0
                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
-                createDatabaseButtonView!!,
+                        createDatabaseButtonView!!,
                {
                    createNewFile()
                },
@@ -420,9 +408,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            openDatabaseButtonView != null
                    && fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
                    openDatabaseButtonView!!,
-                    {tapTargetView ->
+                    { tapTargetView ->
                        tapTargetView?.let {
-                            mOpenFileHelper?.openFileOnClickViewListener?.onClick(it)
+                            mExternalFileHelper?.openDocument()
                        }
                    },
                    {}
@@ -431,7 +419,11 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return MenuUtil.onDefaultMenuOptionsItemSelected(this, item) && super.onOptionsItemSelected(item)
+        when (item.itemId) {
+            android.R.id.home -> UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
+        }
+        MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
+        return super.onOptionsItemSelected(item)
    }

    companion object {
@@ -442,17 +434,38 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),

        /*
         * -------------------------
-         * Launch only to standard search, else pass by PasswordActivity
+         * 		Standard Launch
         * -------------------------
         */

-        fun launch(context: Context,
-                   searchInfo: SearchInfo? = null) {
-            val intent = Intent(context, FileDatabaseSelectActivity::class.java)
-            searchInfo?.let {
-                intent.putExtra(KEY_SEARCH_INFO, it)
-            }
-            context.startActivity(intent)
+        fun launch(context: Context) {
+            context.startActivity(Intent(context, FileDatabaseSelectActivity::class.java))
+        }
+
+        /*
+         * -------------------------
+         * 		Search Launch
+         * -------------------------
+         */
+
+        fun launchForSearchResult(context: Context,
+                                  searchInfo: SearchInfo) {
+            EntrySelectionHelper.startActivityForSearchModeResult(context,
+                    Intent(context, FileDatabaseSelectActivity::class.java),
+                    searchInfo)
+        }
+
+        /*
+         * -------------------------
+         * 		Save Launch
+         * -------------------------
+         */
+
+        fun launchForSaveResult(context: Context,
+                                searchInfo: SearchInfo) {
+            EntrySelectionHelper.startActivityForSaveModeResult(context,
+                    Intent(context, FileDatabaseSelectActivity::class.java),
+                    searchInfo)
        }

        /*
@@ -461,9 +474,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         * -------------------------
         */

-        fun launchForEntrySelectionResult(activity: Activity,
-                                          searchInfo: SearchInfo? = null) {
-            EntrySelectionHelper.startActivityForEntrySelectionResult(activity,
+        fun launchForKeyboardSelectionResult(activity: Activity,
+                                             searchInfo: SearchInfo? = null) {
+            EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(activity,
                    Intent(activity, FileDatabaseSelectActivity::class.java),
                    searchInfo)
        }
@@ -476,12 +489,24 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),

        @RequiresApi(api = Build.VERSION_CODES.O)
        fun launchForAutofillResult(activity: Activity,
-                                    assistStructure: AssistStructure,
+                                    autofillComponent: AutofillComponent,
                                    searchInfo: SearchInfo? = null) {
            AutofillHelper.startActivityForAutofillResult(activity,
                    Intent(activity, FileDatabaseSelectActivity::class.java),
-                    assistStructure,
+                    autofillComponent,
                    searchInfo)
        }
+
+        /*
+         * -------------------------
+         * 		Registration Launch
+         * -------------------------
+         */
+        fun launchForRegistration(context: Context,
+                                  registerInfo: RegisterInfo? = null) {
+            EntrySelectionHelper.startActivityForRegistrationModeResult(context,
+                    Intent(context, FileDatabaseSelectActivity::class.java),
+                    registerInfo)
+        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
@@ -0,0 +1,324 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.viewModels
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.commit
+import com.google.android.material.snackbar.Snackbar
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.fragments.IconPickerFragment
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.updateLockPaddingLeft
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+import kotlinx.coroutines.*
+
+
+class IconPickerActivity : LockingActivity() {
+
+    private lateinit var toolbar: Toolbar
+    private lateinit var coordinatorLayout: CoordinatorLayout
+    private lateinit var uploadButton: View
+    private var lockView: View? = null
+
+    private var mIconImage: IconImage = IconImage()
+
+    private val mainScope = CoroutineScope(Dispatchers.Main)
+
+    private val iconPickerViewModel: IconPickerViewModel by viewModels()
+    private var mCustomIconsSelectionMode = false
+    private var mIconsSelected: List<IconImageCustom> = ArrayList()
+
+    private var mDatabase: Database? = null
+
+    private var mExternalFileHelper: ExternalFileHelper? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_icon_picker)
+
+        mDatabase = Database.getInstance()
+
+        toolbar = findViewById(R.id.toolbar)
+        toolbar.title = " "
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        updateIconsSelectedViews()
+
+        coordinatorLayout = findViewById(R.id.icon_picker_coordinator)
+
+        mExternalFileHelper = ExternalFileHelper(this)
+
+        uploadButton = findViewById(R.id.icon_picker_upload)
+        if (mDatabase?.allowCustomIcons == true) {
+            uploadButton.setOpenDocumentClickListener(mExternalFileHelper)
+        } else {
+            uploadButton.visibility = View.GONE
+        }
+
+        lockView = findViewById(R.id.lock_button)
+        lockView?.setOnClickListener {
+            lockAndExit()
+        }
+
+        intent?.getParcelableExtra<IconImage>(EXTRA_ICON)?.let {
+            mIconImage = it
+        }
+
+        if (savedInstanceState == null) {
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                add(R.id.icon_picker_fragment, IconPickerFragment.getInstance(
+                        // Default selection tab
+                        if (mIconImage.custom.isUnknown)
+                            IconPickerFragment.IconTab.STANDARD
+                        else
+                            IconPickerFragment.IconTab.CUSTOM
+                ), ICON_PICKER_FRAGMENT_TAG)
+            }
+        } else {
+            mIconImage = savedInstanceState.getParcelable(EXTRA_ICON) ?: mIconImage
+        }
+
+        // Focus view to reinitialize timeout
+        findViewById<ViewGroup>(R.id.icon_picker_container)?.resetAppTimeoutWhenViewFocusedOrChanged(this)
+
+        iconPickerViewModel.standardIconPicked.observe(this) { iconStandard ->
+            mIconImage.standard = iconStandard
+            // Remove the custom icon if a standard one is selected
+            mIconImage.custom = IconImageCustom()
+            setResult()
+            finish()
+        }
+        iconPickerViewModel.customIconPicked.observe(this) { iconCustom ->
+            // Keep the standard icon if a custom one is selected
+            mIconImage.custom = iconCustom
+            setResult()
+            finish()
+        }
+        iconPickerViewModel.customIconsSelected.observe(this) { iconsSelected ->
+            mIconsSelected = iconsSelected
+            updateIconsSelectedViews()
+        }
+        iconPickerViewModel.customIconAdded.observe(this) { iconCustomAdded ->
+            if (iconCustomAdded.error && !iconCustomAdded.errorConsumed) {
+                Snackbar.make(coordinatorLayout, iconCustomAdded.errorStringId, Snackbar.LENGTH_LONG).asError().show()
+                iconCustomAdded.errorConsumed = true
+            }
+            uploadButton.isEnabled = true
+        }
+        iconPickerViewModel.customIconRemoved.observe(this) { iconCustomRemoved ->
+            if (iconCustomRemoved.error && !iconCustomRemoved.errorConsumed) {
+                Snackbar.make(coordinatorLayout, iconCustomRemoved.errorStringId, Snackbar.LENGTH_LONG).asError().show()
+                iconCustomRemoved.errorConsumed = true
+            }
+            uploadButton.isEnabled = true
+        }
+    }
+
+    private fun updateIconsSelectedViews() {
+        if (mIconsSelected.isEmpty()) {
+            mCustomIconsSelectionMode = false
+            toolbar.title = " "
+        } else {
+            mCustomIconsSelectionMode = true
+            toolbar.title = mIconsSelected.size.toString()
+        }
+        invalidateOptionsMenu()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putParcelable(EXTRA_ICON, mIconImage)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // Show the lock button
+        lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+
+        // Padding if lock button visible
+        toolbar.updateLockPaddingLeft()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        super.onCreateOptionsMenu(menu)
+
+        if (mCustomIconsSelectionMode) {
+            menuInflater.inflate(R.menu.icon, menu)
+        }
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                if (mCustomIconsSelectionMode) {
+                    iconPickerViewModel.deselectAllCustomIcons()
+                } else {
+                    onBackPressed()
+                }
+            }
+            R.id.menu_delete -> {
+                mIconsSelected.forEach { iconToRemove ->
+                    removeCustomIcon(iconToRemove)
+                }
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun addCustomIcon(iconToUploadUri: Uri?) {
+        uploadButton.isEnabled = false
+        mainScope.launch {
+            withContext(Dispatchers.IO) {
+                // on Progress with thread
+                val asyncResult: Deferred<IconPickerViewModel.IconCustomState?> = async {
+                    val iconCustomState = IconPickerViewModel.IconCustomState(null, true, R.string.error_upload_file)
+                    UriUtil.getFileData(this@IconPickerActivity, iconToUploadUri)?.also { documentFile ->
+                        if (documentFile.length() > MAX_ICON_SIZE) {
+                            iconCustomState.errorStringId = R.string.error_file_to_big
+                        } else {
+                            mDatabase?.buildNewCustomIcon { customIcon, binary ->
+                                if (customIcon != null) {
+                                    iconCustomState.iconCustom = customIcon
+                                    mDatabase?.let { database ->
+                                        BinaryDatabaseManager.resizeBitmapAndStoreDataInBinaryFile(
+                                                contentResolver,
+                                                database,
+                                                iconToUploadUri,
+                                                binary)
+                                        when {
+                                            binary == null -> {
+                                            }
+                                            binary.getSize() <= 0 -> {
+                                            }
+                                            database.isCustomIconBinaryDuplicate(binary) -> {
+                                                iconCustomState.errorStringId = R.string.error_duplicate_file
+                                            }
+                                            else -> {
+                                                iconCustomState.error = false
+                                            }
+                                        }
+                                    }
+                                    if (iconCustomState.error) {
+                                        mDatabase?.removeCustomIcon(customIcon)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    iconCustomState
+                }
+                withContext(Dispatchers.Main) {
+                    asyncResult.await()?.let { customIcon ->
+                        iconPickerViewModel.addCustomIcon(customIcon)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun removeCustomIcon(iconImageCustom: IconImageCustom) {
+        uploadButton.isEnabled = false
+        iconPickerViewModel.deselectAllCustomIcons()
+        mDatabase?.removeCustomIcon(iconImageCustom)
+        iconPickerViewModel.removeCustomIcon(
+                IconPickerViewModel.IconCustomState(iconImageCustom, false, R.string.error_remove_file)
+        )
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mExternalFileHelper?.onOpenDocumentResult(requestCode, resultCode, data) { uri ->
+            addCustomIcon(uri)
+        }
+    }
+
+    private fun setResult() {
+        setResult(Activity.RESULT_OK, Intent().apply {
+            putExtra(EXTRA_ICON, mIconImage)
+        })
+    }
+
+    override fun onBackPressed() {
+        setResult()
+        super.onBackPressed()
+    }
+
+    companion object {
+
+        private const val ICON_PICKER_FRAGMENT_TAG = "ICON_PICKER_FRAGMENT_TAG"
+
+        private const val ICON_SELECTED_REQUEST = 15861
+        private const val EXTRA_ICON = "EXTRA_ICON"
+
+        private const val MAX_ICON_SIZE = 5242880
+
+        fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?, listener: (icon: IconImage) -> Unit) {
+            if (requestCode == ICON_SELECTED_REQUEST) {
+                if (resultCode == Activity.RESULT_OK) {
+                    listener.invoke(data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
+                }
+            }
+        }
+
+        fun launch(context: Activity,
+                   previousIcon: IconImage?) {
+            // Create an instance to return the picker icon
+            context.startActivityForResult(
+                    Intent(context,
+                    IconPickerActivity::class.java).apply {
+                        if (previousIcon != null)
+                            putExtra(EXTRA_ICON, previousIcon)
+                    },
+                    ICON_SELECTED_REQUEST)
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ * KeePassDX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KeePassDX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.text.format.Formatter
+import android.util.Log
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.appcompat.widget.Toolbar
+import com.igreenwood.loupe.Loupe
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import kotlin.math.max
+
+class ImageViewerActivity : LockingActivity() {
+
+    private var mDatabase: Database? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_image_viewer)
+
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        val imageContainerView: ViewGroup = findViewById(R.id.image_viewer_container)
+        val imageView: ImageView = findViewById(R.id.image_viewer_image)
+        val progressView: View = findViewById(R.id.image_viewer_progress)
+
+        // Approximately, to not OOM and allow a zoom
+        val mImagePreviewMaxWidth = max(
+                resources.displayMetrics.widthPixels * 2,
+                resources.displayMetrics.heightPixels * 2
+        )
+
+        mDatabase = Database.getInstance()
+
+        try {
+            progressView.visibility = View.VISIBLE
+            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
+
+                supportActionBar?.title = attachment.name
+
+                val size = attachment.binaryData.getSize()
+                supportActionBar?.subtitle = Formatter.formatFileSize(this, size)
+
+                mDatabase?.let { database ->
+                    BinaryDatabaseManager.loadBitmap(
+                            database,
+                            attachment.binaryData,
+                            mImagePreviewMaxWidth
+                    ) { bitmapLoaded ->
+                        if (bitmapLoaded == null) {
+                            finish()
+                        } else {
+                            progressView.visibility = View.GONE
+                            imageView.setImageBitmap(bitmapLoaded)
+                        }
+                    }
+                }
+            } ?: finish()
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to view the binary", e)
+            finish()
+        }
+
+        Loupe.create(imageView, imageContainerView) {
+            onViewTranslateListener = object : Loupe.OnViewTranslateListener {
+
+                override fun onStart(view: ImageView) {
+                    // called when the view starts moving
+                }
+
+                override fun onViewTranslate(view: ImageView, amount: Float) {
+                    // called whenever the view position changed
+                }
+
+                override fun onRestore(view: ImageView) {
+                    // called when the view drag gesture ended
+                }
+
+                override fun onDismiss(view: ImageView) {
+                    // called when the view drag gesture ended
+                    finish()
+                }
+            }
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> finish()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+
+        private val TAG = ImageViewerActivity::class.simpleName
+
+        private const val IMAGE_ATTACHMENT_TAG = "IMAGE_ATTACHMENT_TAG"
+
+        fun getInstance(context: Context, imageAttachment: Attachment) {
+            context.startActivity(Intent(context, ImageViewerActivity::class.java).apply {
+                putExtra(IMAGE_ATTACHMENT_TAG, imageAttachment)
+            })
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
@@ -30,16 +30,22 @@ import com.kunzisoft.keepass.database.search.SearchHelper
 class MagikeyboardLauncherActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
+        val database = Database.getInstance()
+        val readOnly = database.isReadOnly
        SearchHelper.checkAutoSearchInfo(this,
-                Database.getInstance(),
+                database,
                null,
-                {},
                {
-                    GroupActivity.launchForEntrySelectionResult(this)
+                    // Not called
+                    // if items found directly returns before calling this activity
+                },
+                {
+                    // Select if not found
+                    GroupActivity.launchForKeyboardSelectionResult(this, readOnly)
                },
                {
                    // Pass extra to get entry
-                    FileDatabaseSelectActivity.launchForEntrySelectionResult(this)
+                    FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this)
                }
        )
        finish()
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -20,60 +20,58 @@
 package com.kunzisoft.keepass.activities

 import android.app.Activity
-import android.app.assist.AssistStructure
-import android.app.backup.BackupManager
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
 import android.view.*
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.widget.*
+import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
-import androidx.biometric.BiometricManager
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.app.ActivityCompat
+import androidx.fragment.app.commit
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
-import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
-import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.*
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
+import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.biometric.AdvancedUnlockFragment
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
-import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
+import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.CIPHER_ENTITY_KEY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_KEY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.MASTER_PASSWORD_KEY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.READ_ONLY_KEY
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.CIPHER_ENTITY_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.PreferencesUtil
-import com.kunzisoft.keepass.utils.FileDatabaseInfo
+import com.kunzisoft.keepass.utils.BACK_PREVIOUS_KEYBOARD_ACTION
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 import com.kunzisoft.keepass.view.asError
-import kotlinx.android.synthetic.main.activity_password.*
+import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
 import java.io.FileNotFoundException

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

    // Views
    private var toolbar: Toolbar? = null
@@ -83,16 +81,18 @@ open class PasswordActivity : SpecialModeActivity() {
    private var confirmButtonView: Button? = null
    private var checkboxPasswordView: CompoundButton? = null
    private var checkboxKeyFileView: CompoundButton? = null
-    private var checkboxDefaultDatabaseView: CompoundButton? = null
-    private var advancedUnlockInfoView: AdvancedUnlockInfoView? = null
    private var infoContainerView: ViewGroup? = null
-    private var enableButtonOnCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null
+    private lateinit var coordinatorLayout: CoordinatorLayout
+    private var advancedUnlockFragment: AdvancedUnlockFragment? = null

+    private val databaseFileViewModel: DatabaseFileViewModel by viewModels()
+
+    private var mDefaultDatabase: Boolean = false
    private var mDatabaseFileUri: Uri? = null
    private var mDatabaseKeyFileUri: Uri? = null

    private var mRememberKeyFile: Boolean = false
-    private var mOpenFileHelper: OpenFileHelper? = null
+    private var mExternalFileHelper: ExternalFileHelper? = null

    private var mPermissionAsked = false
    private var readOnly: Boolean = false
@@ -107,9 +107,8 @@ open class PasswordActivity : SpecialModeActivity() {
            field = value
        }

-    private var mProgressDialogThread: ProgressDialogThread? = null
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null

-    private var advancedUnlockedManager: AdvancedUnlockedManager? = null
    private var mAllowAutoOpenBiometricPrompt: Boolean = true

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -129,20 +128,15 @@ open class PasswordActivity : SpecialModeActivity() {
        keyFileSelectionView = findViewById(R.id.keyfile_selection)
        checkboxPasswordView = findViewById(R.id.password_checkbox)
        checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
-        checkboxDefaultDatabaseView = findViewById(R.id.default_database)
-        advancedUnlockInfoView = findViewById(R.id.biometric_info)
        infoContainerView = findViewById(R.id.activity_password_info_container)
+        coordinatorLayout = findViewById(R.id.activity_password_coordinator_layout)

        mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
        readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrPreference(this, savedInstanceState)
+        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)

-        mOpenFileHelper = OpenFileHelper(this@PasswordActivity)
-        keyFileSelectionView?.apply {
-            mOpenFileHelper?.openFileOnClickViewListener?.let {
-                setOnClickListener(it)
-                setOnLongClickListener(it)
-            }
-        }
+        mExternalFileHelper = ExternalFileHelper(this@PasswordActivity)
+        keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)

        passwordView?.setOnEditorActionListener(onEditorActionListener)
        passwordView?.addTextChangedListener(object : TextWatcher {
@@ -156,31 +150,67 @@ open class PasswordActivity : SpecialModeActivity() {
            }
        })

-        enableButtonOnCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ ->
-            enableOrNotTheConfirmationButton()
-        }
-
        // If is a view intent
        getUriFromIntent(intent)
        if (savedInstanceState?.containsKey(KEY_KEYFILE) == true) {
            mDatabaseKeyFileUri = UriUtil.parse(savedInstanceState.getString(KEY_KEYFILE))
        }
-
        if (savedInstanceState?.containsKey(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT) == true) {
            mAllowAutoOpenBiometricPrompt = savedInstanceState.getBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT)
        }

-        mProgressDialogThread = ProgressDialogThread(this).apply {
+        // Init Biometric elements
+        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
+        checkboxPasswordView?.setOnCheckedChangeListener { _, _ ->
+            advancedUnlockFragment?.checkUnlockAvailability()
+            enableOrNotTheConfirmationButton()
+        }
+
+        // Observe if default database
+        databaseFileViewModel.isDefaultDatabase.observe(this) { isDefaultDatabase ->
+            mDefaultDatabase = isDefaultDatabase
+        }
+
+        // Observe database file change
+        databaseFileViewModel.databaseFileLoaded.observe(this) { databaseFile ->
+            // Force read only if the file does not exists
+            mForceReadOnly = databaseFile?.let {
+                !it.databaseFileExists
+            } ?: true
+            invalidateOptionsMenu()
+
+            // Post init uri with KeyFile only if needed
+            val keyFileUri =
+                    if (mRememberKeyFile
+                            && (mDatabaseKeyFileUri == null || mDatabaseKeyFileUri.toString().isEmpty())) {
+                        databaseFile?.keyFileUri
+                    } else {
+                        mDatabaseKeyFileUri
+                    }
+
+            // Define title
+            filenameView?.text = databaseFile?.databaseAlias ?: ""
+
+            onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri)
+        }
+
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
            onActionFinish = { actionTask, result ->
                when (actionTask) {
                    ACTION_DATABASE_LOAD_TASK -> {
-                        // Recheck biometric if error
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                            if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
-                                // Stay with the same mode and init it
-                                advancedUnlockedManager?.initBiometricMode()
-                            }
-                        }
+                        // Recheck advanced unlock if error
+                        advancedUnlockFragment?.initAdvancedUnlockMode()

                        if (result.isSuccess) {
                            mDatabaseKeyFileUri = null
@@ -194,32 +224,37 @@ open class PasswordActivity : SpecialModeActivity() {
                            if (resultException != null) {
                                resultError = resultException.getLocalizedMessage(resources)

-                                // Relaunch loading if we need to fix UUID
-                                if (resultException is DuplicateUuidDatabaseException) {
-                                    showLoadDatabaseDuplicateUuidMessage {
+                                when (resultException) {
+                                    is DuplicateUuidDatabaseException -> {
+                                        // Relaunch loading if we need to fix UUID
+                                        showLoadDatabaseDuplicateUuidMessage {

-                                        var databaseUri: Uri? = null
-                                        var masterPassword: String? = null
-                                        var keyFileUri: Uri? = null
-                                        var readOnly = true
-                                        var cipherEntity: CipherDatabaseEntity? = null
+                                            var databaseUri: Uri? = null
+                                            var mainCredential: MainCredential = MainCredential()
+                                            var readOnly = true
+                                            var cipherEntity: CipherDatabaseEntity? = null

-                                        result.data?.let { resultData ->
-                                            databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
-                                            masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
-                                            keyFileUri = resultData.getParcelable(KEY_FILE_KEY)
-                                            readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                            cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
+                                            result.data?.let { resultData ->
+                                                databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
+                                                mainCredential = resultData.getParcelable(MAIN_CREDENTIAL_KEY) ?: mainCredential
+                                                readOnly = resultData.getBoolean(READ_ONLY_KEY)
+                                                cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
+                                            }
+
+                                            databaseUri?.let { databaseFileUri ->
+                                                showProgressDialogAndLoadDatabase(
+                                                        databaseFileUri,
+                                                        mainCredential,
+                                                        readOnly,
+                                                        cipherEntity,
+                                                        true)
+                                            }
                                        }
-
-                                        databaseUri?.let { databaseFileUri ->
-                                            showProgressDialogAndLoadDatabase(
-                                                    databaseFileUri,
-                                                    masterPassword,
-                                                    keyFileUri,
-                                                    readOnly,
-                                                    cipherEntity,
-                                                    true)
+                                    }
+                                    is FileNotFoundDatabaseException -> {
+                                        // Remove this default database inaccessible
+                                        if (mDefaultDatabase) {
+                                            databaseFileViewModel.removeDefaultDatabase()
                                        }
                                    }
                                }
@@ -229,8 +264,8 @@ open class PasswordActivity : SpecialModeActivity() {
                            if (resultMessage != null && resultMessage.isNotEmpty()) {
                                resultError = "$resultError $resultMessage"
                            }
-                            Log.e(TAG, resultError, resultException)
-                            Snackbar.make(activity_password_coordinator_layout,
+                            Log.e(TAG, resultError)
+                            Snackbar.make(coordinatorLayout,
                                    resultError,
                                    Snackbar.LENGTH_LONG).asError().show()
                        }
@@ -251,6 +286,9 @@ open class PasswordActivity : SpecialModeActivity() {
            mDatabaseFileUri = intent?.getParcelableExtra(KEY_FILENAME)
            mDatabaseKeyFileUri = intent?.getParcelableExtra(KEY_KEYFILE)
        }
+        mDatabaseFileUri?.let {
+            databaseFileViewModel.checkIfIsDefaultDatabase(it)
+        }
    }

    override fun onNewIntent(intent: Intent?) {
@@ -259,74 +297,49 @@ open class PasswordActivity : SpecialModeActivity() {
    }

    private fun launchGroupActivity() {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-        EntrySelectionHelper.doEntrySelectionAction(intent,
-                {
-                    GroupActivity.launch(this@PasswordActivity,
-                            true,
-                            searchInfo,
-                            readOnly)
-                    // Finish activity if no search info
-                    if (searchInfo != null) {
-                        finish()
-                    }
-                },
-                {
-                    SearchHelper.checkAutoSearchInfo(this,
-                            Database.getInstance(),
-                            searchInfo,
-                            { items ->
-                                // Response is build
-                                if (items.size == 1) {
-                                    populateKeyboardAndMoveAppToBackground(this@PasswordActivity,
-                                            items[0],
-                                            intent)
-                                } else {
-                                    // Select the one we want
-                                    GroupActivity.launchForEntrySelectionResult(this,
-                                            true,
-                                            searchInfo)
-                                }
-                            },
-                            {
-                                // Here no search info found, disable auto search
-                                GroupActivity.launchForEntrySelectionResult(this@PasswordActivity,
-                                        false,
-                                        searchInfo,
-                                        readOnly)
-                            },
-                            {
-                                // Simply close if database not opened, normally not happened
-                            }
-                    )
-                    // Do not keep history
-                    finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        SearchHelper.checkAutoSearchInfo(this,
-                                Database.getInstance(),
-                                searchInfo,
-                                { items ->
-                                    // Response is build
-                                    AutofillHelper.buildResponse(this, items)
-                                    finish()
-                                },
-                                {
-                                    // Here no search info found, disable auto search
-                                    GroupActivity.launchForAutofillResult(this@PasswordActivity,
-                                            assistStructure,
-                                            false,
-                                            searchInfo,
-                                            readOnly)
-                                },
-                                {
-                                    // Simply close if database not opened, normally not happened
-                                    finish()
-                                }
-                        )
-                    }
-                })
+        GroupActivity.launch(this,
+                readOnly,
+                { onValidateSpecialMode() },
+                { onCancelSpecialMode() },
+                { onLaunchActivitySpecialMode() }
+        )
+    }
+
+    override fun onValidateSpecialMode() {
+        super.onValidateSpecialMode()
+        finish()
+    }
+
+    override fun onCancelSpecialMode() {
+        super.onCancelSpecialMode()
+        finish()
+    }
+
+    override fun retrieveCredentialForEncryption(): String {
+        return passwordView?.text?.toString() ?: ""
+    }
+
+    override fun conditionToStoreCredential(): Boolean {
+        return checkboxPasswordView?.isChecked == true
+    }
+
+    override fun onCredentialEncrypted(databaseUri: Uri,
+                                       encryptedCredential: String,
+                                       ivSpec: String) {
+        // Load the database if password is registered with biometric
+        verifyCheckboxesAndLoadDatabase(
+                CipherDatabaseEntity(
+                        databaseUri.toString(),
+                        encryptedCredential,
+                        ivSpec)
+        )
+    }
+
+    override fun onCredentialDecrypted(databaseUri: Uri,
+                                       decryptedCredential: String) {
+        // Load the database if password is retrieve from biometric
+        // Retrieve from biometric
+        verifyKeyFileCheckboxAndLoadDatabase(decryptedCredential)
    }

    private val onEditorActionListener = object : TextView.OnEditorActionListener {
@@ -353,80 +366,35 @@ open class PasswordActivity : SpecialModeActivity() {
                clearCredentialsViews()
            }

-            mProgressDialogThread?.registerProgressTask()
+            mProgressDatabaseTaskProvider?.registerProgressTask()
+
+            // Back to previous keyboard is setting activated
+            if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this)) {
+                sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
+            }

            // Don't allow auto open prompt if lock become when UI visible
            mAllowAutoOpenBiometricPrompt = if (LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true)
                false
            else
                mAllowAutoOpenBiometricPrompt
-
-            initUriFromIntent()
+            mDatabaseFileUri?.let { databaseFileUri ->
+                databaseFileViewModel.loadDatabaseFile(databaseFileUri)
+            }

            checkPermission()
        }
    }

-    private fun initUriFromIntent() {
-        /*
-        // "canXrite" doesn't work with Google Drive, don't really know why?
-        mForceReadOnly = mDatabaseFileUri?.let {
-            !FileDatabaseInfo(this, it).canWrite
-        } ?: false
-        */
-        mForceReadOnly = mDatabaseFileUri?.let {
-            !FileDatabaseInfo(this, it).exists
-        } ?: true
-
-        // Post init uri with KeyFile if needed
-        if (mRememberKeyFile && (mDatabaseKeyFileUri == null || mDatabaseKeyFileUri.toString().isEmpty())) {
-            // Retrieve KeyFile in a thread
-            mDatabaseFileUri?.let { databaseUri ->
-                FileDatabaseHistoryAction.getInstance(applicationContext)
-                        .getKeyFileUriByDatabaseUri(databaseUri)  {
-                            onPostInitUri(databaseUri, it)
-                        }
-            }
-        } else {
-            onPostInitUri(mDatabaseFileUri, mDatabaseKeyFileUri)
-        }
-    }
-
-    private fun onPostInitUri(databaseFileUri: Uri?, keyFileUri: Uri?) {
-        // Define title
-        databaseFileUri?.let {
-            FileDatabaseInfo(this, it).retrieveDatabaseTitle { title ->
-                filenameView?.text = title
-            }
-        }
-
+    private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
        // Define Key File text
        if (mRememberKeyFile) {
            populateKeyFileTextView(keyFileUri)
        }

-        // Define listeners for default database checkbox and validate button
-        checkboxDefaultDatabaseView?.setOnCheckedChangeListener { _, isChecked ->
-            var newDefaultFileUri: Uri? = null
-            if (isChecked) {
-                newDefaultFileUri = databaseFileUri ?: newDefaultFileUri
-            }
-
-            PreferencesUtil.saveDefaultDatabasePath(this, newDefaultFileUri)
-
-            val backupManager = BackupManager(this@PasswordActivity)
-            backupManager.dataChanged()
-        }
+        // Define listener for validate button
        confirmButtonView?.setOnClickListener { verifyCheckboxesAndLoadDatabase() }

-        // Retrieve settings for default database
-        val defaultFilename = PreferencesUtil.getDefaultDatabasePath(this)
-        if (databaseFileUri != null
-                && databaseFileUri.path != null && databaseFileUri.path!!.isNotEmpty()
-                && databaseFileUri == UriUtil.parse(defaultFilename)) {
-            checkboxDefaultDatabaseView?.isChecked = true
-        }
-
        // If Activity is launch with a password and want to open directly
        val intent = intent
        val password = intent.getStringExtra(KEY_PASSWORD)
@@ -440,47 +408,9 @@ open class PasswordActivity : SpecialModeActivity() {
            verifyCheckboxesAndLoadDatabase(password, keyFileUri)
        } else {
            // Init Biometric elements
-            var biometricInitialize = false
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (PreferencesUtil.isBiometricUnlockEnable(this)) {
-
-                    if (advancedUnlockedManager == null && databaseFileUri != null) {
-                        advancedUnlockedManager = AdvancedUnlockedManager(this,
-                                databaseFileUri,
-                                advancedUnlockInfoView,
-                                checkboxPasswordView,
-                                enableButtonOnCheckedChangeListener,
-                                passwordView,
-                                { passwordEncrypted, ivSpec ->
-                                    // Load the database if password is registered with biometric
-                                    if (passwordEncrypted != null && ivSpec != null) {
-                                        verifyCheckboxesAndLoadDatabase(
-                                                CipherDatabaseEntity(
-                                                    databaseFileUri.toString(),
-                                                    passwordEncrypted,
-                                                    ivSpec)
-                                        )
-                                    }
-                                },
-                                { passwordDecrypted ->
-                                    // Load the database if password is retrieve from biometric
-                                    passwordDecrypted?.let {
-                                        // Retrieve from biometric
-                                        verifyKeyFileCheckboxAndLoadDatabase(it)
-                                    }
-                                })
-                    }
-                    advancedUnlockedManager?.isBiometricPromptAutoOpenEnable = mAllowAutoOpenBiometricPrompt
-                    advancedUnlockedManager?.checkBiometricAvailability()
-                    biometricInitialize = true
-                } else {
-                    advancedUnlockedManager?.destroy()
-                }
-            }
-            if (!biometricInitialize) {
-                checkboxPasswordView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
-            }
-            checkboxKeyFileView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
+            advancedUnlockFragment?.loadDatabase(databaseFileUri,
+                    mAllowAutoOpenBiometricPrompt
+                                        && mProgressDatabaseTaskProvider?.isBinded() != true)
        }

        enableOrNotTheConfirmationButton()
@@ -530,12 +460,7 @@ open class PasswordActivity : SpecialModeActivity() {
    }

    override fun onPause() {
-        mProgressDialogThread?.unregisterProgressTask()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            advancedUnlockedManager?.destroy()
-            advancedUnlockedManager = null
-        }
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()

        // Reinit locking activity UI variable
        LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
@@ -587,28 +512,35 @@ open class PasswordActivity : SpecialModeActivity() {
            clearCredentialsViews()
        }

-        databaseFileUri?.let { databaseUri ->
-            // Show the progress dialog and load the database
-            showProgressDialogAndLoadDatabase(
-                    databaseUri,
-                    password,
-                    keyFileUri,
-                    readOnly,
-                    cipherDatabaseEntity,
-                    false)
+        if (readOnly && (
+                mSpecialMode == SpecialMode.SAVE
+                || mSpecialMode == SpecialMode.REGISTRATION)
+        ) {
+            Log.e(TAG, getString(R.string.autofill_read_only_save))
+            Snackbar.make(coordinatorLayout,
+                    R.string.autofill_read_only_save,
+                    Snackbar.LENGTH_LONG).asError().show()
+        } else {
+            databaseFileUri?.let { databaseUri ->
+                // Show the progress dialog and load the database
+                showProgressDialogAndLoadDatabase(
+                        databaseUri,
+                        MainCredential(password, keyFileUri),
+                        readOnly,
+                        cipherDatabaseEntity,
+                        false)
+            }
        }
    }

    private fun showProgressDialogAndLoadDatabase(databaseUri: Uri,
-                                                  password: String?,
-                                                  keyFile: Uri?,
+                                                  mainCredential: MainCredential,
                                                  readOnly: Boolean,
                                                  cipherDatabaseEntity: CipherDatabaseEntity?,
                                                  fixDuplicateUUID: Boolean) {
-        mProgressDialogThread?.startDatabaseLoad(
+        mProgressDatabaseTaskProvider?.startDatabaseLoad(
                databaseUri,
-                password,
-                keyFile,
+                mainCredential,
                readOnly,
                cipherDatabaseEntity,
                fixDuplicateUUID
@@ -625,21 +557,16 @@ open class PasswordActivity : SpecialModeActivity() {
        val inflater = menuInflater
        // Read menu
        inflater.inflate(R.menu.open_file, menu)
-        if (mSelectionMode || mForceReadOnly) {
+        if (mForceReadOnly) {
            menu.removeItem(R.id.menu_open_file_read_mode_key)
        } else {
            changeOpenFileReadIcon(menu.findItem(R.id.menu_open_file_read_mode_key))
        }

-        if (!mSelectionMode) {
+        if (mSpecialMode == SpecialMode.DEFAULT) {
            MenuUtil.defaultMenuInflater(inflater, menu)
        }

-        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // biometric menu
-            advancedUnlockedManager?.inflateOptionsMenu(inflater, menu)
-        }
-
        super.onCreateOptionsMenu(menu)

        launchEducation(menu)
@@ -649,13 +576,13 @@ open class PasswordActivity : SpecialModeActivity() {

    // Check permission
    private fun checkPermission() {
-        val writePermission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-        val permissions = arrayOf(writePermission)
-        if (Build.VERSION.SDK_INT >= 23
+        if (Build.VERSION.SDK_INT in 23..28
                && !readOnly
                && !mPermissionAsked) {
            mPermissionAsked = true
            // Check self permission to show or not the dialog
+            val writePermission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+            val permissions = arrayOf(writePermission)
            if (toolbar != null
                    && ActivityCompat.checkSelfPermission(this, writePermission) != PackageManager.PERMISSION_GRANTED) {
                ActivityCompat.requestPermissions(this, permissions, WRITE_EXTERNAL_STORAGE_REQUEST)
@@ -682,7 +609,7 @@ open class PasswordActivity : SpecialModeActivity() {
        if (!performedEductionInProgress) {
            performedEductionInProgress = true
            // Show education views
-            Handler().post { performedNextEducation(PasswordActivityEducation(this), menu) }
+            Handler(Looper.getMainLooper()).post { performedNextEducation(PasswordActivityEducation(this), menu) }
        }
    }

@@ -704,27 +631,25 @@ open class PasswordActivity : SpecialModeActivity() {
                    && passwordActivityEducation.checkAndPerformedReadOnlyEducation(
                    educationToolbar.findViewById(R.id.menu_open_file_read_mode_key),
                    {
-                        onOptionsItemSelected(menu.findItem(R.id.menu_open_file_read_mode_key))
+                        try {
+                            menu.findItem(R.id.menu_open_file_read_mode_key)
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Unable to find read mode menu")
+                        }
                        performedNextEducation(passwordActivityEducation, menu)
                    },
                    {
                        performedNextEducation(passwordActivityEducation, menu)
                    })

-            if (!readOnlyEducationPerformed) {
-                val biometricCanAuthenticate = BiometricManager.from(this).canAuthenticate()
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                        && PreferencesUtil.isBiometricUnlockEnable(applicationContext)
-                        && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
-                        && advancedUnlockInfoView != null && advancedUnlockInfoView?.unlockIconImageView != null
-                        && passwordActivityEducation.checkAndPerformedBiometricEducation(advancedUnlockInfoView?.unlockIconImageView!!,
-                        {
-                            performedNextEducation(passwordActivityEducation, menu)
-                        },
-                        {
-                            performedNextEducation(passwordActivityEducation, menu)
-                        })
-            }
+            advancedUnlockFragment?.performEducation(passwordActivityEducation,
+                    readOnlyEducationPerformed,
+                    {
+                        performedNextEducation(passwordActivityEducation, menu)
+                    },
+                    {
+                        performedNextEducation(passwordActivityEducation, menu)
+                    })
        }
    }

@@ -746,10 +671,7 @@ open class PasswordActivity : SpecialModeActivity() {
                readOnly = !readOnly
                changeOpenFileReadIcon(item)
            }
-            R.id.menu_biometric_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                advancedUnlockedManager?.deleteEntryKey()
-            }
-            else -> return MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
+            else -> MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
        }

        return super.onOptionsItemSelected(item)
@@ -763,14 +685,17 @@ open class PasswordActivity : SpecialModeActivity() {

        mAllowAutoOpenBiometricPrompt = false

+        // To get device credential unlock result
+        advancedUnlockFragment?.onActivityResult(requestCode, resultCode, data)
+
        // To get entry in result
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
        }

        var keyFileResult = false
-        mOpenFileHelper?.let {
-            keyFileResult = it.onActivityResultCallback(requestCode, resultCode, data
+        mExternalFileHelper?.let {
+            keyFileResult = it.onOpenDocumentResult(requestCode, resultCode, data
            ) { uri ->
                if (uri != null) {
                    mDatabaseKeyFileUri = uri
@@ -783,7 +708,7 @@ open class PasswordActivity : SpecialModeActivity() {
            when (resultCode) {
                LockingActivity.RESULT_EXIT_LOCK -> {
                    clearCredentialsViews()
-                    Database.getInstance().closeAndClear(applicationContext.filesDir)
+                    Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this))
                }
                Activity.RESULT_CANCELED -> {
                    clearCredentialsViews()
@@ -796,6 +721,8 @@ open class PasswordActivity : SpecialModeActivity() {

        private val TAG = PasswordActivity::class.java.name

+        private const val UNLOCK_FRAGMENT_TAG = "UNLOCK_FRAGMENT_TAG"
+
        private const val KEY_FILENAME = "fileName"
        private const val KEY_KEYFILE = "keyFile"
        private const val VIEW_INTENT = "android.intent.action.VIEW"
@@ -823,19 +750,52 @@ open class PasswordActivity : SpecialModeActivity() {
         */

        @Throws(FileNotFoundException::class)
-        fun launch(
-                activity: Activity,
-                databaseFile: Uri,
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
+        fun launch(activity: Activity,
+                   databaseFile: Uri,
+                   keyFile: Uri?) {
            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                searchInfo?.let {
-                    intent.putExtra(KEY_SEARCH_INFO, it)
-                }
                activity.startActivity(intent)
            }
        }

+        /*
+         * -------------------------
+         * 		Share Launch
+         * -------------------------
+         */
+
+        @Throws(FileNotFoundException::class)
+        fun launchForSearchResult(activity: Activity,
+                                  databaseFile: Uri,
+                                  keyFile: Uri?,
+                                  searchInfo: SearchInfo) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                EntrySelectionHelper.startActivityForSearchModeResult(
+                        activity,
+                        intent,
+                        searchInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Save Launch
+         * -------------------------
+         */
+
+        @Throws(FileNotFoundException::class)
+        fun launchForSaveResult(activity: Activity,
+                                databaseFile: Uri,
+                                keyFile: Uri?,
+                                searchInfo: SearchInfo) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                EntrySelectionHelper.startActivityForSaveModeResult(
+                        activity,
+                        intent,
+                        searchInfo)
+            }
+        }
+
        /*
         * -------------------------
         * 		Keyboard Launch
@@ -843,13 +803,12 @@ open class PasswordActivity : SpecialModeActivity() {
         */

        @Throws(FileNotFoundException::class)
-        fun launchForKeyboardResult(
-                activity: Activity,
-                databaseFile: Uri,
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
+        fun launchForKeyboardResult(activity: Activity,
+                                    databaseFile: Uri,
+                                    keyFile: Uri?,
+                                    searchInfo: SearchInfo?) {
            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                EntrySelectionHelper.startActivityForEntrySelectionResult(
+                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(
                        activity,
                        intent,
                        searchInfo)
@@ -864,22 +823,93 @@ open class PasswordActivity : SpecialModeActivity() {

        @RequiresApi(api = Build.VERSION_CODES.O)
        @Throws(FileNotFoundException::class)
-        fun launchForAutofillResult(
-                activity: Activity,
-                databaseFile: Uri,
-                keyFile: Uri?,
-                assistStructure: AssistStructure?,
-                searchInfo: SearchInfo?) {
-            if (assistStructure != null) {
-                buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                    AutofillHelper.startActivityForAutofillResult(
-                            activity,
-                            intent,
-                            assistStructure,
-                            searchInfo)
-                }
-            } else {
-                launch(activity, databaseFile, keyFile, searchInfo)
+        fun launchForAutofillResult(activity: Activity,
+                                    databaseFile: Uri,
+                                    keyFile: Uri?,
+                                    autofillComponent: AutofillComponent,
+                                    searchInfo: SearchInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                AutofillHelper.startActivityForAutofillResult(
+                        activity,
+                        intent,
+                        autofillComponent,
+                        searchInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Registration Launch
+         * -------------------------
+         */
+        fun launchForRegistration(activity: Activity,
+                                  databaseFile: Uri,
+                                  keyFile: Uri?,
+                                  registerInfo: RegisterInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                EntrySelectionHelper.startActivityForRegistrationModeResult(
+                        activity,
+                        intent,
+                        registerInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Global Launch
+         * -------------------------
+         */
+        fun launch(activity: Activity,
+                   databaseUri: Uri,
+                   keyFile: Uri?,
+                   fileNoFoundAction: (exception: FileNotFoundException) -> Unit,
+                   onCancelSpecialMode: () -> Unit,
+                   onLaunchActivitySpecialMode: () -> Unit) {
+
+            try {
+                EntrySelectionHelper.doSpecialAction(activity.intent,
+                        {
+                            PasswordActivity.launch(activity,
+                                    databaseUri, keyFile)
+                        },
+                        { searchInfo -> // Search Action
+                            PasswordActivity.launchForSearchResult(activity,
+                                    databaseUri, keyFile,
+                                    searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo -> // Save Action
+                            PasswordActivity.launchForSaveResult(activity,
+                                    databaseUri, keyFile,
+                                    searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo -> // Keyboard Selection Action
+                            PasswordActivity.launchForKeyboardResult(activity,
+                                    databaseUri, keyFile,
+                                    searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo, autofillComponent -> // Autofill Selection Action
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                PasswordActivity.launchForAutofillResult(activity,
+                                        databaseUri, keyFile,
+                                        autofillComponent,
+                                        searchInfo)
+                                onLaunchActivitySpecialMode()
+                            } else {
+                                onCancelSpecialMode()
+                            }
+                        },
+                        { registerInfo -> // Registration Action
+                            PasswordActivity.launchForRegistration(activity,
+                                    databaseUri, keyFile,
+                                    registerInfo)
+                            onLaunchActivitySpecialMode()
+                        }
+                )
+            } catch (e: FileNotFoundException) {
+                fileNoFoundAction(e)
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
@@ -25,16 +25,20 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import com.google.android.material.textfield.TextInputLayout
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.text.Editable
+import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.View
 import android.widget.CompoundButton
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
+import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView

 class AssignMasterKeyDialogFragment : DialogFragment() {
@@ -56,7 +60,11 @@ class AssignMasterKeyDialogFragment : DialogFragment() {

    private var mListener: AssignPasswordDialogListener? = null

-    private var mOpenFileHelper: OpenFileHelper? = null
+    private var mExternalFileHelper: ExternalFileHelper? = null
+
+    private var mEmptyPasswordConfirmationDialog: AlertDialog? = null
+    private var mNoKeyConfirmationDialog: AlertDialog? = null
+    private var mEmptyKeyFileConfirmationDialog: AlertDialog? = null

    private val passwordTextWatcher = object : TextWatcher {
        override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
@@ -69,10 +77,8 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
    }

    interface AssignPasswordDialogListener {
-        fun onAssignKeyDialogPositiveClick(masterPasswordChecked: Boolean, masterPassword: String?,
-                                           keyFileChecked: Boolean, keyFile: Uri?)
-        fun onAssignKeyDialogNegativeClick(masterPasswordChecked: Boolean, masterPassword: String?,
-                                           keyFileChecked: Boolean, keyFile: Uri?)
+        fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential)
+        fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential)
    }

    override fun onAttach(activity: Context) {
@@ -85,6 +91,17 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
        }
    }

+    override fun onDetach() {
+        mListener = null
+        mEmptyPasswordConfirmationDialog?.dismiss()
+        mEmptyPasswordConfirmationDialog = null
+        mNoKeyConfirmationDialog?.dismiss()
+        mNoKeyConfirmationDialog = null
+        mEmptyKeyFileConfirmationDialog?.dismiss()
+        mEmptyKeyFileConfirmationDialog = null
+        super.onDetach()
+    }
+
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->

@@ -99,11 +116,14 @@ class AssignMasterKeyDialogFragment : DialogFragment() {

            rootView = inflater.inflate(R.layout.fragment_set_password, null)
            builder.setView(rootView)
-                    .setTitle(R.string.assign_master_key)
                    // Add action buttons
                    .setPositiveButton(android.R.string.ok) { _, _ -> }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }

+            rootView?.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
+                UriUtil.gotoUrl(activity, R.string.credentials_explanation_url)
+            }
+
            passwordCheckBox = rootView?.findViewById(R.id.password_checkbox)
            passwordTextInputLayout = rootView?.findViewById(R.id.password_input_layout)
            passwordView = rootView?.findViewById(R.id.pass_password)
@@ -113,11 +133,8 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)

-            mOpenFileHelper = OpenFileHelper(this)
-            keyFileSelectionView?.apply {
-                setOnClickListener(mOpenFileHelper?.openFileOnClickViewListener)
-                setOnLongClickListener(mOpenFileHelper?.openFileOnClickViewListener)
-            }
+            mExternalFileHelper = ExternalFileHelper(this)
+            keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)

            val dialog = builder.create()

@@ -129,7 +146,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                        mMasterPassword = ""
                        mKeyFile = null

-                        var error = verifyPassword() || verifyFile()
+                        var error = verifyPassword() || verifyKeyFile()
                        if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
                            error = true
                            if (allowNoMasterKey)
@@ -139,17 +156,13 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                            }
                        }
                        if (!error) {
-                            mListener?.onAssignKeyDialogPositiveClick(
-                                    passwordCheckBox!!.isChecked, mMasterPassword,
-                                    keyFileCheckBox!!.isChecked, mKeyFile)
+                            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
                            dismiss()
                        }
                    }
                    val negativeButton = dialog1.getButton(DialogInterface.BUTTON_NEGATIVE)
                    negativeButton.setOnClickListener {
-                        mListener?.onAssignKeyDialogNegativeClick(
-                                passwordCheckBox!!.isChecked, mMasterPassword,
-                                keyFileCheckBox!!.isChecked, mKeyFile)
+                        mListener?.onAssignKeyDialogNegativeClick(retrieveMainCredential())
                        dismiss()
                    }
                }
@@ -161,6 +174,12 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
        return super.onCreateDialog(savedInstanceState)
    }

+    private fun retrieveMainCredential(): MainCredential {
+        val masterPassword = if (passwordCheckBox!!.isChecked) mMasterPassword else null
+        val keyFile = if (keyFileCheckBox!!.isChecked) mKeyFile else null
+        return MainCredential(masterPassword, keyFile)
+    }
+
    override fun onResume() {
        super.onResume()

@@ -199,7 +218,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
        return error
    }

-    private fun verifyFile(): Boolean {
+    private fun verifyKeyFile(): Boolean {
        var error = false
        if (keyFileCheckBox != null
                && keyFileCheckBox!!.isChecked) {
@@ -219,15 +238,14 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
            val builder = AlertDialog.Builder(it)
            builder.setMessage(R.string.warning_empty_password)
                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        if (!verifyFile()) {
-                            mListener?.onAssignKeyDialogPositiveClick(
-                                    passwordCheckBox!!.isChecked, mMasterPassword,
-                                    keyFileCheckBox!!.isChecked, mKeyFile)
+                        if (!verifyKeyFile()) {
+                            mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
                            this@AssignMasterKeyDialogFragment.dismiss()
                        }
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            builder.create().show()
+            mEmptyPasswordConfirmationDialog = builder.create()
+            mEmptyPasswordConfirmationDialog?.show()
        }
    }

@@ -236,24 +254,48 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
            val builder = AlertDialog.Builder(it)
            builder.setMessage(R.string.warning_no_encryption_key)
                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        mListener?.onAssignKeyDialogPositiveClick(
-                                passwordCheckBox!!.isChecked, mMasterPassword,
-                                keyFileCheckBox!!.isChecked, mKeyFile)
+                        mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
                        this@AssignMasterKeyDialogFragment.dismiss()
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            builder.create().show()
+            mNoKeyConfirmationDialog = builder.create()
+            mNoKeyConfirmationDialog?.show()
+        }
+    }
+
+    private fun showEmptyKeyFileConfirmationDialog() {
+        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")
+                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()
        }
    }

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)

-        mOpenFileHelper?.onActivityResultCallback(requestCode, resultCode, data
-        ) { uri ->
+        mExternalFileHelper?.onOpenDocumentResult(requestCode, resultCode, data) { uri ->
            uri?.let { pathUri ->
-                keyFileCheckBox?.isChecked = true
-                keyFileSelectionView?.uri = pathUri
+                UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
+                    keyFileSelectionView?.error = null
+                    keyFileCheckBox?.isChecked = true
+                    keyFileSelectionView?.uri = pathUri
+                    if (lengthFile <= 0L) {
+                        showEmptyKeyFileConfirmationDialog()
+                    }
+                }
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.activities.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
+
+
+class DatabaseChangedDialogFragment : DialogFragment() {
+
+    var actionDatabaseListener: ActionDatabaseChangedListener? = null
+
+    override fun onPause() {
+        super.onPause()
+        actionDatabaseListener = null
+        this.dismiss()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+
+            val oldSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelable(OLD_FILE_DATABASE_INFO)
+            val newSnapFileDatabaseInfo: SnapFileDatabaseInfo? = arguments?.getParcelable(NEW_FILE_DATABASE_INFO)
+
+            if (oldSnapFileDatabaseInfo != null && newSnapFileDatabaseInfo != null) {
+                // Use the Builder class for convenient dialog construction
+                val builder = AlertDialog.Builder(activity)
+
+                val stringBuilder = SpannableStringBuilder()
+                if (newSnapFileDatabaseInfo.exists) {
+                    stringBuilder.append(getString(R.string.warning_database_info_changed))
+                    stringBuilder.append("\n\n" +oldSnapFileDatabaseInfo.toString(activity)
+                            + "\n→\n" +
+                            newSnapFileDatabaseInfo.toString(activity) + "\n\n")
+                    stringBuilder.append(getString(R.string.warning_database_info_changed_options))
+                } else {
+                    stringBuilder.append(getString(R.string.warning_database_revoked))
+                }
+                builder.setMessage(stringBuilder)
+                builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                    actionDatabaseListener?.validateDatabaseChanged()
+                }
+                return builder.create()
+            }
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    interface ActionDatabaseChangedListener {
+        fun validateDatabaseChanged()
+    }
+
+    companion object {
+
+        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"
+
+        fun getInstance(oldSnapFileDatabaseInfo: SnapFileDatabaseInfo,
+                        newSnapFileDatabaseInfo: SnapFileDatabaseInfo)
+        : DatabaseChangedDialogFragment {
+            val fragment = DatabaseChangedDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(OLD_FILE_DATABASE_INFO, oldSnapFileDatabaseInfo)
+                putParcelable(NEW_FILE_DATABASE_INFO, newSnapFileDatabaseInfo)
+            }
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
@@ -24,6 +24,11 @@ class DatePickerFragment : DialogFragment() {
        }
    }

+    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 {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
@@ -27,11 +27,11 @@ import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getListNodesFromBundle

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

    private var mNodesToDelete: List<Node> = ArrayList()
    private var mListener: DeleteNodeListener? = null
@@ -46,6 +46,15 @@ class DeleteNodesDialogFragment : DialogFragment() {
        }
    }

+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    protected open fun retrieveMessage(): String {
+        return getString(R.string.warning_permanently_delete_nodes)
+    }
+
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

        arguments?.apply {
@@ -63,11 +72,11 @@ class DeleteNodesDialogFragment : DialogFragment() {
            // Use the Builder class for convenient dialog construction
            val builder = AlertDialog.Builder(activity)

-            builder.setMessage(getString(R.string.warning_permanently_delete_nodes))
-            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+            builder.setMessage(retrieveMessage())
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
                mListener?.permanentlyDeleteNodes(mNodesToDelete)
            }
-            builder.setNegativeButton(android.R.string.no) { _, _ -> dismiss() }
+            builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
            // Create the AlertDialog object and return it
            return builder.create()
        }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.activities.dialogs

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

@@ -31,7 +32,7 @@ class DuplicateUuidDialog : DialogFragment() {
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            // Use the Builder class for convenient dialog construction
-            val builder = androidx.appcompat.app.AlertDialog.Builder(activity).apply {
+            val builder = AlertDialog.Builder(activity).apply {
                val message = getString(R.string.contains_duplicate_uuid) +
                        "\n\n" + getString(R.string.contains_duplicate_uuid_procedure)
                setMessage(message)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EmptyRecycleBinDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EmptyRecycleBinDialogFragment.kt
@@ -0,0 +1,39 @@
+/*
+ * 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.activities.dialogs
+
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+
+class EmptyRecycleBinDialogFragment : DeleteNodesDialogFragment() {
+
+    override fun retrieveMessage(): String {
+        return getString(R.string.warning_empty_recycle_bin)
+    }
+
+    companion object {
+        fun getInstance(nodesToDelete: List<Node>): EmptyRecycleBinDialogFragment {
+            return EmptyRecycleBinDialogFragment().apply {
+                arguments = getBundleFromListNodes(nodesToDelete)
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import android.widget.CompoundButton
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputLayout
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.security.ProtectedString
+import com.kunzisoft.keepass.model.Field
+
+
+class EntryCustomFieldDialogFragment: DialogFragment() {
+
+    private var oldField: Field? = null
+
+    private var entryCustomFieldListener: EntryCustomFieldListener? = null
+
+    private var customFieldLabelContainer: TextInputLayout? = null
+    private var customFieldLabel: TextView? = null
+    private var customFieldDeleteButton: ImageView? = null
+    private var customFieldProtectionButton: CompoundButton? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            entryCustomFieldListener = context as EntryCustomFieldListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + EntryCustomFieldListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        entryCustomFieldListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val root = activity.layoutInflater.inflate(R.layout.fragment_entry_new_field, null)
+            customFieldLabelContainer = root?.findViewById(R.id.entry_custom_field_label_container)
+            customFieldLabel = root?.findViewById(R.id.entry_custom_field_label)
+            customFieldDeleteButton = root?.findViewById(R.id.entry_custom_field_delete)
+            customFieldProtectionButton = root?.findViewById(R.id.entry_custom_field_protection)
+
+            oldField = arguments?.getParcelable(KEY_FIELD)
+            oldField?.let { oldCustomField ->
+                customFieldLabel?.text = oldCustomField.name
+                customFieldProtectionButton?.isChecked = oldCustomField.protectedValue.isProtected
+
+                customFieldDeleteButton?.visibility = View.VISIBLE
+                customFieldDeleteButton?.setOnClickListener {
+                    entryCustomFieldListener?.onDeleteCustomFieldApproved(oldCustomField)
+                    (dialog as AlertDialog?)?.dismiss()
+                }
+            } ?: run {
+                customFieldDeleteButton?.visibility = View.GONE
+            }
+
+            val builder = AlertDialog.Builder(activity)
+            builder.setView(root)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            val dialogCreated = builder.create()
+
+            customFieldLabel?.requestFocus()
+            customFieldLabel?.imeOptions = EditorInfo.IME_ACTION_DONE
+            customFieldLabel?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    approveIfValid()
+                }
+                false
+            }
+
+            dialogCreated.window?.setSoftInputMode(SOFT_INPUT_STATE_VISIBLE)
+            return dialogCreated
+
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // To prevent auto dismiss
+        val d = dialog as AlertDialog?
+        if (d != null) {
+            val positiveButton = d.getButton(Dialog.BUTTON_POSITIVE) as Button
+            positiveButton.setOnClickListener {
+                approveIfValid()
+            }
+        }
+    }
+
+    private fun approveIfValid() {
+        if (isValid()) {
+            oldField?.let {
+                // New property with old value
+                entryCustomFieldListener?.onEditCustomFieldApproved(it,
+                        Field(customFieldLabel?.text?.toString() ?: "",
+                                ProtectedString(customFieldProtectionButton?.isChecked == true,
+                                        it.protectedValue.stringValue))
+                )
+            } ?: run {
+                entryCustomFieldListener?.onNewCustomFieldApproved(
+                        Field(customFieldLabel?.text?.toString() ?: "",
+                                ProtectedString(customFieldProtectionButton?.isChecked == true))
+                )
+            }
+            (dialog as AlertDialog?)?.dismiss()
+        }
+    }
+
+    private fun isValid(): Boolean {
+        return if (customFieldLabel?.text?.toString()?.isNotEmpty() != true) {
+            setError(R.string.error_string_key)
+            false
+        } else {
+            setError(null)
+            true
+        }
+    }
+
+    fun setError(@StringRes errorId: Int?) {
+        customFieldLabelContainer?.error = if (errorId == null) null else {
+            requireContext().getString(errorId)
+        }
+    }
+
+    interface EntryCustomFieldListener {
+        fun onNewCustomFieldApproved(newField: Field)
+        fun onEditCustomFieldApproved(oldField: Field, newField: Field)
+        fun onDeleteCustomFieldApproved(oldField: Field)
+    }
+
+    companion object {
+
+        private const val KEY_FIELD = "KEY_FIELD"
+
+        fun getInstance(): EntryCustomFieldDialogFragment {
+            return EntryCustomFieldDialogFragment()
+        }
+
+        fun getInstance(field: Field): EntryCustomFieldDialogFragment {
+            return EntryCustomFieldDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_FIELD, field)
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+/**
+ * Custom Dialog to confirm big file to upload
+ */
+class FileTooBigDialogFragment : DialogFragment() {
+
+    private var mActionChooseListener: ActionChooseListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            mActionChooseListener = context as ActionChooseListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + ActionChooseListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+            builder.setMessage(SpannableStringBuilder().apply {
+                append(getString(R.string.warning_file_too_big))
+                append("\n\n")
+                append(getString(R.string.warning_sure_add_file))
+            })
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                mActionChooseListener?.onValidateUploadFileTooBig(
+                        arguments?.getParcelable(KEY_FILE_URI),
+                        arguments?.getString(KEY_FILE_NAME))
+            }
+            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
+                dismiss()
+            }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    interface ActionChooseListener {
+        fun onValidateUploadFileTooBig(attachmentToUploadUri: Uri?, fileName: String?)
+    }
+
+    companion object {
+        const val MAX_WARNING_BINARY_FILE = 5242880
+
+        private const val KEY_FILE_URI = "KEY_FILE_URI"
+        private const val KEY_FILE_NAME = "KEY_FILE_NAME"
+
+        fun build(attachmentToUploadUri: Uri,
+                  fileName: String): FileTooBigDialogFragment {
+            val fragment = FileTooBigDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(KEY_FILE_URI, attachmentToUploadUri)
+                putString(KEY_FILE_NAME, fileName)
+            }
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
@@ -26,13 +26,11 @@ import com.google.android.material.textfield.TextInputLayout
 import androidx.fragment.app.DialogFragment
 import androidx.appcompat.app.AlertDialog
 import android.view.View
-import android.widget.Button
-import android.widget.CompoundButton
-import android.widget.EditText
-import android.widget.SeekBar
+import android.widget.*
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.view.applyFontVisibility

 class GeneratePasswordDialogFragment : DialogFragment() {
@@ -64,6 +62,11 @@ class GeneratePasswordDialogFragment : DialogFragment() {
        }
    }

+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            val builder = AlertDialog.Builder(activity)
@@ -73,6 +76,15 @@ class GeneratePasswordDialogFragment : DialogFragment() {
            passwordInputLayoutView = root?.findViewById(R.id.password_input_layout)
            passwordView = root?.findViewById(R.id.password)
            passwordView?.applyFontVisibility()
+            val passwordCopyView: ImageView? = root?.findViewById(R.id.password_copy_button)
+            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyPasswordAndProtectedFields(activity))
+                View.VISIBLE else View.GONE
+            val clipboardHelper = ClipboardHelper(activity)
+            passwordCopyView?.setOnClickListener {
+                clipboardHelper.timeoutCopyToClipboard(passwordView!!.text.toString(),
+                        getString(R.string.copy_field,
+                                getString(R.string.entry_password)))
+            }

            lengthTextView = root?.findViewById(R.id.length)

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
@@ -23,34 +23,40 @@ import android.app.Dialog
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
-import com.google.android.material.textfield.TextInputLayout
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
+import android.view.View
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.IconPickerActivity
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Group
+import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.model.GroupInfo
+import com.kunzisoft.keepass.view.ExpirationView
+import org.joda.time.DateTime

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

    private var mDatabase: Database? = null

-    private var editGroupListener: EditGroupListener? = null
+    private var mEditGroupListener: EditGroupListener? = null

-    private var editGroupDialogAction: EditGroupDialogAction? = null
-    private var nameGroup: String? = null
-    private var iconGroup: IconImage? = null
+    private var mEditGroupDialogAction = EditGroupDialogAction.NONE
+    private var mGroupInfo = GroupInfo()

-    private var nameTextLayoutView: TextInputLayout? = null
-    private var nameTextView: TextView? = null
-    private var iconButtonView: ImageView? = null
+    private lateinit var iconButtonView: ImageView
    private var iconColor: Int = 0
+    private lateinit var nameTextLayoutView: TextInputLayout
+    private lateinit var nameTextView: TextView
+    private lateinit var notesTextLayoutView: TextInputLayout
+    private lateinit var notesTextView: TextView
+    private lateinit var expirationView: ExpirationView

    enum class EditGroupDialogAction {
        CREATION, UPDATE, NONE;
@@ -67,21 +73,28 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
        // Verify that the host activity implements the callback interface
        try {
            // Instantiate the NoticeDialogListener so we can send events to the host
-            editGroupListener = context as EditGroupListener
+            mEditGroupListener = context as EditGroupListener
        } catch (e: ClassCastException) {
            // The activity doesn't implement the interface, throw exception
            throw ClassCastException(context.toString()
                    + " must implement " + GroupEditDialogFragment::class.java.name)
        }
+    }

+    override fun onDetach() {
+        mEditGroupListener = null
+        super.onDetach()
    }

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            val root = activity.layoutInflater.inflate(R.layout.fragment_group_edit, null)
-            nameTextLayoutView = root?.findViewById(R.id.group_edit_name_container)
-            nameTextView = root?.findViewById(R.id.group_edit_name)
-            iconButtonView = root?.findViewById(R.id.group_edit_icon_button)
+            iconButtonView = root.findViewById(R.id.group_edit_icon_button)
+            nameTextLayoutView = root.findViewById(R.id.group_edit_name_container)
+            nameTextView = root.findViewById(R.id.group_edit_name)
+            notesTextLayoutView = root.findViewById(R.id.group_edit_note_container)
+            notesTextView = root.findViewById(R.id.group_edit_note)
+            expirationView = root.findViewById(R.id.group_edit_expiration)

            // Retrieve the textColor to tint the icon
            val ta = activity.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
@@ -90,47 +103,47 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP

            // Init elements
            mDatabase = Database.getInstance()
-            editGroupDialogAction = EditGroupDialogAction.NONE
-            nameGroup = ""
-            iconGroup = mDatabase?.iconFactory?.folderIcon

            if (savedInstanceState != null
                    && savedInstanceState.containsKey(KEY_ACTION_ID)
-                    && savedInstanceState.containsKey(KEY_NAME)
-                    && savedInstanceState.containsKey(KEY_ICON)) {
-                editGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(savedInstanceState.getInt(KEY_ACTION_ID))
-                nameGroup = savedInstanceState.getString(KEY_NAME)
-                iconGroup = savedInstanceState.getParcelable(KEY_ICON)
-
+                    && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
+                mEditGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(savedInstanceState.getInt(KEY_ACTION_ID))
+                mGroupInfo = savedInstanceState.getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
            } else {
                arguments?.apply {
                    if (containsKey(KEY_ACTION_ID))
-                        editGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(getInt(KEY_ACTION_ID))
-
-                    if (containsKey(KEY_NAME) && containsKey(KEY_ICON)) {
-                        nameGroup = getString(KEY_NAME)
-                        iconGroup = getParcelable(KEY_ICON)
+                        mEditGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(getInt(KEY_ACTION_ID))
+                    if (containsKey(KEY_GROUP_INFO)) {
+                        mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
                    }
                }
            }

-            // populate the name
-            nameTextView?.text = nameGroup
-            // populate the icon
-            assignIconView()
+            // populate info in views
+            populateInfoToViews()
+            expirationView.setOnDateClickListener = {
+                expirationView.expiryTime.date.let { expiresDate ->
+                    val dateTime = DateTime(expiresDate)
+                    val defaultYear = dateTime.year
+                    val defaultMonth = dateTime.monthOfYear-1
+                    val defaultDay = dateTime.dayOfMonth
+                    DatePickerFragment.getInstance(defaultYear, defaultMonth, defaultDay)
+                            .show(parentFragmentManager, "DatePickerFragment")
+                }
+            }

            val builder = AlertDialog.Builder(activity)
            builder.setView(root)
                    .setPositiveButton(android.R.string.ok, null)
                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        editGroupListener?.cancelEditGroup(
-                                editGroupDialogAction,
-                                nameTextView?.text?.toString(),
-                                iconGroup)
+                        retrieveGroupInfoFromViews()
+                        mEditGroupListener?.cancelEditGroup(
+                                mEditGroupDialogAction,
+                                mGroupInfo)
                    }

-            iconButtonView?.setOnClickListener { _ ->
-                IconPickerDialogFragment().show(parentFragmentManager, "IconPickerDialogFragment")
+            iconButtonView.setOnClickListener { _ ->
+                IconPickerActivity.launch(activity, mGroupInfo.icon)
            }

            return builder.create()
@@ -146,69 +159,104 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
        if (d != null) {
            val positiveButton = d.getButton(Dialog.BUTTON_POSITIVE) as Button
            positiveButton.setOnClickListener {
+                retrieveGroupInfoFromViews()
                if (isValid()) {
-                    editGroupListener?.approveEditGroup(
-                            editGroupDialogAction,
-                            nameTextView?.text?.toString(),
-                            iconGroup)
+                    mEditGroupListener?.approveEditGroup(
+                            mEditGroupDialogAction,
+                            mGroupInfo)
                    d.dismiss()
                }
            }
        }
    }

-    private fun assignIconView() {
-        if (mDatabase?.drawFactory != null && iconGroup != null) {
-            iconButtonView?.assignDatabaseIcon(mDatabase?.drawFactory!!, iconGroup!!, iconColor)
-        }
+    fun getExpiryTime(): DateInstant {
+        retrieveGroupInfoFromViews()
+        return mGroupInfo.expiryTime
    }

-    override fun iconPicked(bundle: Bundle) {
-        iconGroup = IconPickerDialogFragment.getIconStandardFromBundle(bundle)
+    fun setExpiryTime(expiryTime: DateInstant) {
+        mGroupInfo.expiryTime = expiryTime
+        populateInfoToViews()
+    }
+
+    private fun populateInfoToViews() {
+        assignIconView()
+        nameTextView.text = mGroupInfo.title
+        notesTextLayoutView.visibility = if (mGroupInfo.notes == null) View.GONE else View.VISIBLE
+        mGroupInfo.notes?.let {
+            notesTextView.text = it
+        }
+        expirationView.expires = mGroupInfo.expires
+        expirationView.expiryTime = mGroupInfo.expiryTime
+    }
+
+    private fun retrieveGroupInfoFromViews() {
+        mGroupInfo.title = nameTextView.text.toString()
+        // Only if there
+        val newNotes = notesTextView.text.toString()
+        if (newNotes.isNotEmpty()) {
+            mGroupInfo.notes = newNotes
+        }
+        mGroupInfo.expires = expirationView.expires
+        mGroupInfo.expiryTime = expirationView.expiryTime
+    }
+
+    private fun assignIconView() {
+        mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconButtonView, mGroupInfo.icon, iconColor)
+    }
+
+    fun setIcon(icon: IconImage) {
+        mGroupInfo.icon = icon
        assignIconView()
    }

    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putInt(KEY_ACTION_ID, editGroupDialogAction!!.ordinal)
-        outState.putString(KEY_NAME, nameGroup)
-        outState.putParcelable(KEY_ICON, iconGroup)
+        retrieveGroupInfoFromViews()
+        outState.putInt(KEY_ACTION_ID, mEditGroupDialogAction.ordinal)
+        outState.putParcelable(KEY_GROUP_INFO, mGroupInfo)
        super.onSaveInstanceState(outState)
    }

    private fun isValid(): Boolean {
-        if (nameTextView?.text?.toString()?.isNotEmpty() != true) {
-            nameTextLayoutView?.error = getString(R.string.error_no_name)
-            return false
+        val error = mEditGroupListener?.isValidGroupName(nameTextView.text.toString()) ?: Error(false, null)
+        error.messageId?.let { messageId ->
+            nameTextLayoutView.error = getString(messageId)
+        } ?: kotlin.run {
+            nameTextLayoutView.error = null
        }
-        return true
+        return !error.isError
    }

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

    companion object {

        const val TAG_CREATE_GROUP = "TAG_CREATE_GROUP"
-
-        const val KEY_NAME = "KEY_NAME"
-        const val KEY_ICON = "KEY_ICON"
        const val KEY_ACTION_ID = "KEY_ACTION_ID"
+        const val KEY_GROUP_INFO = "KEY_GROUP_INFO"

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

-        fun build(group: Group): GroupEditDialogFragment {
+        fun update(groupInfo: GroupInfo): GroupEditDialogFragment {
            val bundle = Bundle()
-            bundle.putString(KEY_NAME, group.title)
-            bundle.putParcelable(KEY_ICON, group.icon)
            bundle.putInt(KEY_ACTION_ID, UPDATE.ordinal)
+            bundle.putParcelable(KEY_GROUP_INFO, groupInfo)
            val fragment = GroupEditDialogFragment()
            fragment.arguments = bundle
            return fragment
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
@@ -1,141 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.GridView
-import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.widget.ImageViewCompat
-import androidx.fragment.app.DialogFragment
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
-import com.kunzisoft.keepass.icons.IconPack
-import com.kunzisoft.keepass.icons.IconPackChooser
-
-
-class IconPickerDialogFragment : DialogFragment() {
-
-    private var iconPickerListener: IconPickerListener? = null
-    private var iconPack: IconPack? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            iconPickerListener = context as IconPickerListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + IconPickerListener::class.java.name)
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val builder = AlertDialog.Builder(activity)
-
-            iconPack = IconPackChooser.getSelectedIconPack(requireContext())
-
-            // Inflate and set the layout for the dialog
-            // Pass null as the parent view because its going in the dialog layout
-            val root = activity.layoutInflater.inflate(R.layout.fragment_icon_picker, null)
-            builder.setView(root)
-
-            val currIconGridView = root.findViewById<GridView>(R.id.IconGridView)
-            currIconGridView.adapter = ImageAdapter(activity)
-
-            currIconGridView.setOnItemClickListener { _, _, position, _ ->
-                val bundle = Bundle()
-                bundle.putParcelable(KEY_ICON_STANDARD, IconImageStandard(position))
-                iconPickerListener?.iconPicked(bundle)
-                dismiss()
-            }
-
-            builder.setNegativeButton(android.R.string.cancel) { _, _ -> this@IconPickerDialogFragment.dialog?.cancel() }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    inner class ImageAdapter internal constructor(private val context: Context) : BaseAdapter() {
-
-        override fun getCount(): Int {
-            return iconPack?.numberOfIcons() ?: 0
-        }
-
-        override fun getItem(position: Int): Any? {
-            return null
-        }
-
-        override fun getItemId(position: Int): Long {
-            return 0
-        }
-
-        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-            val currentView: View = convertView
-                    ?: (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater)
-                        .inflate(R.layout.item_icon, parent, false)
-
-            iconPack?.let { iconPack ->
-                val iconImageView = currentView.findViewById<ImageView>(R.id.icon_image)
-                iconImageView.setImageResource(iconPack.iconToResId(position))
-
-                // Assign color if icons are tintable
-                if (iconPack.tintable()) {
-                    // Retrieve the textColor to tint the icon
-                    val ta = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-                    ImageViewCompat.setImageTintList(iconImageView, ColorStateList.valueOf(ta.getColor(0, Color.BLACK)))
-                    ta.recycle()
-                }
-            }
-
-            return currentView
-        }
-    }
-
-    interface IconPickerListener {
-        fun iconPicked(bundle: Bundle)
-    }
-
-    companion object {
-
-        private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD"
-
-        fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? {
-            return bundle.getParcelable(KEY_ICON_STANDARD)
-        }
-
-        fun launch(activity: AppCompatActivity) {
-            // Create an instance of the dialog fragment and show it
-            val dialog = IconPickerDialogFragment()
-            dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
@@ -21,20 +21,46 @@ package com.kunzisoft.keepass.activities.dialogs

 import android.app.AlertDialog
 import android.app.Dialog
-import android.content.DialogInterface
+import android.content.Context
+import android.net.Uri
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.model.MainCredential

 class PasswordEncodingDialogFragment : DialogFragment() {

-    var positiveButtonClickListener: DialogInterface.OnClickListener? = null
+    private var mListener: Listener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as Listener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + Listener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        val databaseUri: Uri? = savedInstanceState?.getParcelable(DATABASE_URI_KEY)
+        val mainCredential: MainCredential = savedInstanceState?.getParcelable(MAIN_CREDENTIAL) ?: MainCredential()
+
        activity?.let { activity ->
            val builder = AlertDialog.Builder(activity)
            builder.setMessage(activity.getString(R.string.warning_password_encoding)).setTitle(R.string.warning)
-            builder.setPositiveButton(android.R.string.ok, positiveButtonClickListener)
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                mListener?.onPasswordEncodingValidateListener(
+                        databaseUri,
+                        mainCredential
+                )
+            }
            builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() }

            return builder.create()
@@ -42,5 +68,24 @@ class PasswordEncodingDialogFragment : DialogFragment() {
        return super.onCreateDialog(savedInstanceState)
    }

+    interface Listener {
+        fun onPasswordEncodingValidateListener(databaseUri: Uri?,
+                                               mainCredential: MainCredential)
+    }

+    companion object {
+
+        private const val DATABASE_URI_KEY = "DATABASE_URI_KEY"
+        private const val MAIN_CREDENTIAL = "MAIN_CREDENTIAL"
+
+        fun getInstance(databaseUri: Uri,
+                        mainCredential: MainCredential): SortDialogFragment {
+            val fragment = SortDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(DATABASE_URI_KEY, databaseUri)
+                putParcelable(MAIN_CREDENTIAL, mainCredential)
+            }
+            return fragment
+        }
+    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Attachment
+
+/**
+ * Custom Dialog to confirm big file to upload
+ */
+class ReplaceFileDialogFragment : DialogFragment() {
+
+    private var mActionChooseListener: ActionChooseListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            mActionChooseListener = context as ActionChooseListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + ActionChooseListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+            builder.setMessage(SpannableStringBuilder().apply {
+                append(getString(R.string.warning_replace_file))
+                append("\n\n")
+                append(getString(R.string.warning_sure_add_file))
+            })
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                mActionChooseListener?.onValidateReplaceFile(
+                        arguments?.getParcelable(KEY_FILE_URI),
+                        arguments?.getParcelable(KEY_ENTRY_ATTACHMENT))
+            }
+            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
+                dismiss()
+            }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    interface ActionChooseListener {
+        fun onValidateReplaceFile(attachmentToUploadUri: Uri?, attachment: Attachment?)
+    }
+
+    companion object {
+        private const val KEY_FILE_URI = "KEY_FILE_URI"
+        private const val KEY_ENTRY_ATTACHMENT = "KEY_ENTRY_ATTACHMENT"
+
+        fun build(attachmentToUploadUri: Uri,
+                  attachment: Attachment): ReplaceFileDialogFragment {
+            val fragment = ReplaceFileDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(KEY_FILE_URI, attachmentToUploadUri)
+                putParcelable(KEY_ENTRY_ATTACHMENT, attachment)
+            }
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
@@ -28,10 +28,8 @@ import android.text.TextWatcher
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.Spinner
+import android.view.inputmethod.EditorInfo
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
@@ -48,6 +46,7 @@ import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_TOTP_PERIOD
 import com.kunzisoft.keepass.otp.OtpTokenType
 import com.kunzisoft.keepass.otp.OtpType
 import com.kunzisoft.keepass.otp.TokenCalculator
+import com.kunzisoft.keepass.utils.UriUtil
 import java.util.*

 class SetOTPDialogFragment : DialogFragment() {
@@ -56,6 +55,7 @@ class SetOTPDialogFragment : DialogFragment() {

    private var mOtpElement: OtpElement = OtpElement()

+    private var otpTypeMessage: TextView? = null
    private var otpTypeSpinner: Spinner? = null
    private var otpTokenTypeSpinner: Spinner? = null
    private var otpSecretContainer: TextInputLayout? = null
@@ -73,6 +73,8 @@ class SetOTPDialogFragment : DialogFragment() {
    private var totpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null
    private var hotpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null
    private var otpAlgorithmAdapter: ArrayAdapter<TokenCalculator.HashAlgorithm>? = null
+    private var mHotpTokenTypeArray: Array<OtpTokenType>? = null
+    private var mTotpTokenTypeArray: Array<OtpTokenType>? = null

    private var mManualEvent = false
    private var mOnFocusChangeListener = View.OnFocusChangeListener { _, isFocus ->
@@ -89,9 +91,9 @@ class SetOTPDialogFragment : DialogFragment() {
    }

    private var mSecretWellFormed = false
-    private var mCounterWellFormed = true
-    private var mPeriodWellFormed = true
-    private var mDigitsWellFormed = true
+    private var mCounterWellFormed = false
+    private var mPeriodWellFormed = false
+    private var mDigitsWellFormed = false

    override fun onAttach(context: Context) {
        super.onAttach(context)
@@ -106,6 +108,11 @@ class SetOTPDialogFragment : DialogFragment() {
        }
    }

+    override fun onDetach() {
+        mCreateOTPElementListener = null
+        super.onDetach()
+    }
+
    @SuppressLint("ClickableViewAccessibility")
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

@@ -128,6 +135,7 @@ class SetOTPDialogFragment : DialogFragment() {

        activity?.let { activity ->
            val root = activity.layoutInflater.inflate(R.layout.fragment_set_otp, null) as ViewGroup?
+            otpTypeMessage = root?.findViewById(R.id.setup_otp_type_message)
            otpTypeSpinner = root?.findViewById(R.id.setup_otp_type)
            otpTokenTypeSpinner = root?.findViewById(R.id.setup_otp_token_type)
            otpSecretContainer = root?.findViewById(R.id.setup_otp_secret_label)
@@ -152,26 +160,48 @@ class SetOTPDialogFragment : DialogFragment() {
            otpCounterTextView?.setOnTouchListener(mOnTouchListener)
            otpDigitsTextView?.setOnTouchListener(mOnTouchListener)

+            // To manage focus
+            otpPeriodTextView?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                    otpDigitsTextView?.requestFocus()
+                    true
+                } else
+                    false
+            }
+            otpCounterTextView?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                    otpDigitsTextView?.requestFocus()
+                    true
+                } else
+                    false
+            }
+            otpCounterTextView?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                    root?.requestFocus(View.FOCUS_DOWN)
+                    true
+                } else
+                    false
+            }

            // HOTP / TOTP Type selection
            val otpTypeArray = OtpType.values()
-            otpTypeAdapter = ArrayAdapter<OtpType>(activity,
+            otpTypeAdapter = ArrayAdapter(activity,
                    android.R.layout.simple_spinner_item, otpTypeArray).apply {
                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
            }
            otpTypeSpinner?.adapter = otpTypeAdapter

            // Otp Token type selection
-            val hotpTokenTypeArray = OtpTokenType.getHotpTokenTypeValues()
+            mHotpTokenTypeArray = OtpTokenType.getHotpTokenTypeValues()
            hotpTokenTypeAdapter = ArrayAdapter(activity,
-                    android.R.layout.simple_spinner_item, hotpTokenTypeArray).apply {
+                    android.R.layout.simple_spinner_item, mHotpTokenTypeArray!!).apply {
                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
            }
            // Proprietary only on closed and full version
-            val totpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
+            mTotpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
                    BuildConfig.CLOSED_STORE && BuildConfig.FULL_VERSION)
            totpTokenTypeAdapter = ArrayAdapter(activity,
-                    android.R.layout.simple_spinner_item, totpTokenTypeArray).apply {
+                    android.R.layout.simple_spinner_item, mTotpTokenTypeArray!!).apply {
                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
            }
            otpTokenTypeAdapter = hotpTokenTypeAdapter
@@ -179,7 +209,7 @@ class SetOTPDialogFragment : DialogFragment() {

            // OTP Algorithm
            val otpAlgorithmArray = TokenCalculator.HashAlgorithm.values()
-            otpAlgorithmAdapter = ArrayAdapter<TokenCalculator.HashAlgorithm>(activity,
+            otpAlgorithmAdapter = ArrayAdapter(activity,
                    android.R.layout.simple_spinner_item, otpAlgorithmArray).apply {
                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
            }
@@ -194,13 +224,16 @@ class SetOTPDialogFragment : DialogFragment() {

            val builder = AlertDialog.Builder(activity)
            builder.apply {
-                setTitle(R.string.entry_setup_otp)
                setView(root)
                        .setPositiveButton(android.R.string.ok) {_, _ -> }
                        .setNegativeButton(android.R.string.cancel) { _, _ ->
                        }
            }

+            root?.findViewById<View>(R.id.otp_information)?.setOnClickListener {
+                UriUtil.gotoUrl(activity, R.string.otp_explanation_url)
+            }
+
            return builder.create()
        }
        return super.onCreateDialog(savedInstanceState)
@@ -344,35 +377,63 @@ class SetOTPDialogFragment : DialogFragment() {
    }

    private fun upgradeTokenType() {
+        val tokenType = mOtpElement.tokenType
        when (mOtpElement.type) {
            OtpType.HOTP -> {
                otpPeriodContainer?.visibility = View.GONE
                otpCounterContainer?.visibility = View.VISIBLE
                otpTokenTypeSpinner?.adapter = hotpTokenTypeAdapter
-                otpTokenTypeSpinner?.setSelection(OtpTokenType
-                        .getHotpTokenTypeValues().indexOf(mOtpElement.tokenType))
+                mHotpTokenTypeArray?.let { otpTokenTypeArray ->
+                    defineOtpTokenTypeSpinner(otpTokenTypeArray, tokenType, OtpTokenType.RFC4226)
+                }
            }
            OtpType.TOTP -> {
                otpPeriodContainer?.visibility = View.VISIBLE
                otpCounterContainer?.visibility = View.GONE
                otpTokenTypeSpinner?.adapter = totpTokenTypeAdapter
-                otpTokenTypeSpinner?.setSelection(OtpTokenType
-                        .getTotpTokenTypeValues().indexOf(mOtpElement.tokenType))
+                mTotpTokenTypeArray?.let { otpTokenTypeArray ->
+                    defineOtpTokenTypeSpinner(otpTokenTypeArray, tokenType, OtpTokenType.RFC6238)
+                }
            }
        }
    }

+    private fun defineOtpTokenTypeSpinner(otpTokenTypeArray: Array<OtpTokenType>,
+                                          tokenType: OtpTokenType,
+                                          defaultTokenType: OtpTokenType) {
+        val formTokenType = if (otpTokenTypeArray.contains(tokenType)) {
+            otpTypeMessage?.visibility = View.GONE
+            tokenType
+        } else {
+            otpTypeMessage?.visibility = View.VISIBLE
+            defaultTokenType
+        }
+        otpTokenTypeSpinner?.setSelection(otpTokenTypeArray.indexOf(formTokenType))
+    }
+
    private fun upgradeParameters() {
        otpAlgorithmSpinner?.setSelection(TokenCalculator.HashAlgorithm.values()
                .indexOf(mOtpElement.algorithm))
+
+        val secret = mOtpElement.getBase32Secret()
        otpSecretTextView?.apply {
-            setText(mOtpElement.getBase32Secret())
+            setText(secret)
            // Cursor at end
            setSelection(this.text.length)
        }
-        otpCounterTextView?.setText(mOtpElement.counter.toString())
-        otpPeriodTextView?.setText(mOtpElement.period.toString())
-        otpDigitsTextView?.setText(mOtpElement.digits.toString())
+        mSecretWellFormed = OtpElement.isValidBase32(secret)
+
+        val counter = mOtpElement.counter
+        otpCounterTextView?.setText(counter.toString())
+        mCounterWellFormed = OtpElement.isValidCounter(counter)
+
+        val period = mOtpElement.period
+        otpPeriodTextView?.setText(period.toString())
+        mPeriodWellFormed = OtpElement.isValidPeriod(period)
+
+        val digits = mOtpElement.digits
+        otpDigitsTextView?.setText(digits.toString())
+        mDigitsWellFormed = OtpElement.isValidDigits(digits)
    }

    override fun onSaveInstanceState(outState: Bundle) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
@@ -54,6 +54,11 @@ class SortDialogFragment : DialogFragment() {
        }
    }

+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            val builder = AlertDialog.Builder(activity)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
@@ -25,6 +25,11 @@ class TimePickerFragment : DialogFragment() {
        }
    }

+    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 {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
@@ -90,12 +90,12 @@ class UnavailableFeatureDialogFragment : DialogFragment() {
            }
        }
        if (apiName.isEmpty()) {
-            val mapper = arrayOf("ANDROID BASE", "ANDROID BASE 1.1", "CUPCAKE", "DONUT", "ECLAIR", "ECLAIR_0_1", "ECLAIR_MR1", "FROYO", "GINGERBREAD", "GINGERBREAD_MR1", "HONEYCOMB", "HONEYCOMB_MR1", "HONEYCOMB_MR2", "ICE_CREAM_SANDWICH", "ICE_CREAM_SANDWICH_MR1", "JELLY_BEAN", "JELLY_BEAN", "JELLY_BEAN", "KITKAT", "KITKAT", "LOLLIPOOP", "LOLLIPOOP_MR1", "MARSHMALLOW", "NOUGAT", "NOUGAT", "OREO", "OREO")
+            val mapper = arrayOf("ANDROID BASE", "ANDROID BASE 1.1", "CUPCAKE", "DONUT", "ECLAIR", "ECLAIR_0_1", "ECLAIR_MR1", "FROYO", "GINGERBREAD", "GINGERBREAD_MR1", "HONEYCOMB", "HONEYCOMB_MR1", "HONEYCOMB_MR2", "ICE_CREAM_SANDWICH", "ICE_CREAM_SANDWICH_MR1", "JELLY_BEAN", "JELLY_BEAN", "JELLY_BEAN", "KITKAT", "KITKAT", "LOLLIPOOP", "LOLLIPOOP_MR1", "MARSHMALLOW", "NOUGAT", "NOUGAT", "OREO", "OREO", "PIE", "", "")
            val index = apiNumber - 1
            apiName = if (index < mapper.size) mapper[index] else "UNKNOWN_VERSION"
        }
        if (version.isEmpty()) {
-            val versions = arrayOf("1.0", "1.1", "1.5", "1.6", "2.0", "2.0.1", "2.1", "2.2.X", "2.3", "2.3.3", "3.0", "3.1", "3.2.0", "4.0.1", "4.0.3", "4.1.0", "4.2.0", "4.3.0", "4.4", "4.4", "5.0", "5.1", "6.0", "7.0", "7.1", "8.0.0", "8.1.0")
+            val versions = arrayOf("1.0", "1.1", "1.5", "1.6", "2.0", "2.0.1", "2.1", "2.2.X", "2.3", "2.3.3", "3.0", "3.1", "3.2.0", "4.0.1", "4.0.3", "4.1.0", "4.2.0", "4.3.0", "4.4", "4.4", "5.0", "5.1", "6.0", "7.0", "7.1", "8.0.0", "8.1.0", "9", "10", "11")
            val index = apiNumber - 1
            version = if (index < versions.size) versions[index] else "UNKNOWN_VERSION"
        }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryEditFragment.kt
@@ -0,0 +1,528 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.fragments
+
+import android.content.Context
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.ImageView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.EntryEditActivity
+import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.education.EntryEditActivityEducation
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+import com.kunzisoft.keepass.model.*
+import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.ExpirationView
+import com.kunzisoft.keepass.view.applyFontVisibility
+import com.kunzisoft.keepass.view.collapse
+import com.kunzisoft.keepass.view.expand
+
+class EntryEditFragment: StylishFragment() {
+
+    private lateinit var entryTitleLayoutView: TextInputLayout
+    private lateinit var entryTitleView: EditText
+    private lateinit var entryIconView: ImageView
+    private lateinit var entryUserNameView: EditText
+    private lateinit var entryUrlView: EditText
+    private lateinit var entryPasswordLayoutView: TextInputLayout
+    private lateinit var entryPasswordView: EditText
+    private lateinit var entryPasswordGeneratorView: View
+    private lateinit var entryExpirationView: ExpirationView
+    private lateinit var entryNotesView: EditText
+    private lateinit var extraFieldsContainerView: View
+    private lateinit var extraFieldsListView: ViewGroup
+    private lateinit var attachmentsContainerView: View
+    private lateinit var attachmentsListView: RecyclerView
+
+    private lateinit var attachmentsAdapter: EntryAttachmentsItemsAdapter
+
+    private var fontInVisibility: Boolean = false
+    private var iconColor: Int = 0
+
+    var drawFactory: IconDrawableFactory? = null
+    var setOnDateClickListener: (() -> Unit)? = null
+    var setOnPasswordGeneratorClickListener: View.OnClickListener? = null
+    var setOnIconViewClickListener: ((IconImage) -> Unit)? = null
+    var setOnEditCustomField: ((Field) -> Unit)? = null
+    var setOnRemoveAttachment: ((Attachment) -> Unit)? = null
+
+    // Elements to modify the current entry
+    private var mEntryInfo = EntryInfo()
+    private var mLastFocusedEditField: FocusedEditField? = null
+    private var mExtraViewToRequestFocus: EditText? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val rootView = inflater.cloneInContext(contextThemed)
+            .inflate(R.layout.fragment_entry_edit_contents, container, false)
+
+        fontInVisibility = PreferencesUtil.fieldFontIsInVisibility(requireContext())
+
+        entryTitleLayoutView = rootView.findViewById(R.id.entry_edit_container_title)
+        entryTitleView = rootView.findViewById(R.id.entry_edit_title)
+        entryIconView = rootView.findViewById(R.id.entry_edit_icon_button)
+        entryIconView.setOnClickListener {
+            setOnIconViewClickListener?.invoke(mEntryInfo.icon)
+        }
+
+        entryUserNameView = rootView.findViewById(R.id.entry_edit_user_name)
+        entryUrlView = rootView.findViewById(R.id.entry_edit_url)
+        entryPasswordLayoutView = rootView.findViewById(R.id.entry_edit_container_password)
+        entryPasswordView = rootView.findViewById(R.id.entry_edit_password)
+        entryPasswordGeneratorView = rootView.findViewById(R.id.entry_edit_password_generator_button)
+        entryPasswordGeneratorView.setOnClickListener {
+            setOnPasswordGeneratorClickListener?.onClick(it)
+        }
+        entryExpirationView = rootView.findViewById(R.id.entry_edit_expiration)
+        entryExpirationView.setOnDateClickListener = setOnDateClickListener
+
+        entryNotesView = rootView.findViewById(R.id.entry_edit_notes)
+
+        extraFieldsContainerView = rootView.findViewById(R.id.extra_fields_container)
+        extraFieldsListView = rootView.findViewById(R.id.extra_fields_list)
+
+        attachmentsContainerView = rootView.findViewById(R.id.entry_attachments_container)
+        attachmentsListView = rootView.findViewById(R.id.entry_attachments_list)
+        attachmentsAdapter = EntryAttachmentsItemsAdapter(requireContext())
+        // TODO retrieve current database with its unique key
+        attachmentsAdapter.database = Database.getInstance()
+        //attachmentsAdapter.database = arguments?.getInt(KEY_DATABASE)
+        attachmentsAdapter.onListSizeChangedListener = { previousSize, newSize ->
+            if (previousSize > 0 && newSize == 0) {
+                attachmentsContainerView.collapse(true)
+            } else if (previousSize == 0 && newSize == 1) {
+                attachmentsContainerView.expand(true)
+            }
+        }
+        attachmentsListView.apply {
+            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            adapter = attachmentsAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
+        }
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        iconColor = taIconColor?.getColor(0, Color.WHITE) ?: Color.WHITE
+        taIconColor?.recycle()
+
+        rootView?.resetAppTimeoutWhenViewFocusedOrChanged(requireContext())
+
+        // Retrieve the new entry after an orientation change
+        if (arguments?.containsKey(KEY_TEMP_ENTRY_INFO) == true)
+            mEntryInfo = arguments?.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        else if (savedInstanceState?.containsKey(KEY_TEMP_ENTRY_INFO) == true) {
+            mEntryInfo = savedInstanceState.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        }
+
+        if (savedInstanceState?.containsKey(KEY_LAST_FOCUSED_FIELD) == true) {
+            mLastFocusedEditField = savedInstanceState.getParcelable(KEY_LAST_FOCUSED_FIELD) ?: mLastFocusedEditField
+        }
+
+        populateViewsWithEntry()
+
+        return rootView
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+
+        drawFactory = null
+        setOnDateClickListener = null
+        setOnPasswordGeneratorClickListener = null
+        setOnIconViewClickListener = null
+        setOnRemoveAttachment = null
+        setOnEditCustomField = null
+    }
+
+    fun getEntryInfo(): EntryInfo {
+        populateEntryWithViews()
+        return mEntryInfo
+    }
+
+    fun generatePasswordEducationPerformed(entryEditActivityEducation: EntryEditActivityEducation): Boolean {
+        return entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+                entryPasswordGeneratorView,
+                {
+                    GeneratePasswordDialogFragment().show(parentFragmentManager, "PasswordGeneratorFragment")
+                },
+                {
+                    try {
+                        (activity as? EntryEditActivity?)?.performedNextEducation(entryEditActivityEducation)
+                    } catch (ignore: Exception) {}
+                }
+        )
+    }
+
+    private fun populateViewsWithEntry() {
+        // Set info in view
+        icon = mEntryInfo.icon
+        title = mEntryInfo.title
+        username = mEntryInfo.username
+        url = mEntryInfo.url
+        password = mEntryInfo.password
+        expires = mEntryInfo.expires
+        expiryTime = mEntryInfo.expiryTime
+        notes = mEntryInfo.notes
+        assignExtraFields(mEntryInfo.customFields) { fields ->
+            setOnEditCustomField?.invoke(fields)
+        }
+        assignAttachments(mEntryInfo.attachments, StreamDirection.UPLOAD) { attachment ->
+            setOnRemoveAttachment?.invoke(attachment)
+        }
+    }
+
+    private fun populateEntryWithViews() {
+        // Icon already populate
+        mEntryInfo.title = title
+        mEntryInfo.username = username
+        mEntryInfo.url = url
+        mEntryInfo.password = password
+        mEntryInfo.expires = expires
+        mEntryInfo.expiryTime = expiryTime
+        mEntryInfo.notes = notes
+        mEntryInfo.customFields = getExtraFields()
+        mEntryInfo.otpModel = OtpEntryFields.parseFields { key ->
+            getExtraFields().firstOrNull { it.name == key }?.protectedValue?.toString()
+        }?.otpModel
+        mEntryInfo.attachments = getAttachments()
+    }
+
+    var title: String
+        get() {
+            return entryTitleView.text.toString()
+        }
+        set(value) {
+            entryTitleView.setText(value)
+            if (fontInVisibility)
+                entryTitleView.applyFontVisibility()
+        }
+
+    var icon: IconImage
+        get() {
+            return mEntryInfo.icon
+        }
+        set(value) {
+            mEntryInfo.icon = value
+            drawFactory?.assignDatabaseIcon(entryIconView, value, iconColor)
+        }
+
+    var username: String
+        get() {
+            return entryUserNameView.text.toString()
+        }
+        set(value) {
+            entryUserNameView.setText(value)
+            if (fontInVisibility)
+                entryUserNameView.applyFontVisibility()
+        }
+
+    var url: String
+        get() {
+            return entryUrlView.text.toString()
+        }
+        set(value) {
+            entryUrlView.setText(value)
+            if (fontInVisibility)
+                entryUrlView.applyFontVisibility()
+        }
+
+    var password: String
+        get() {
+            return entryPasswordView.text.toString()
+        }
+        set(value) {
+            entryPasswordView.setText(value)
+            if (fontInVisibility) {
+                entryPasswordView.applyFontVisibility()
+            }
+        }
+
+    var expires: Boolean
+        get() {
+            return entryExpirationView.expires
+        }
+        set(value) {
+            entryExpirationView.expires = value
+        }
+
+    var expiryTime: DateInstant
+        get() {
+            return entryExpirationView.expiryTime
+        }
+        set(value) {
+            entryExpirationView.expiryTime = value
+        }
+
+    var notes: String
+        get() {
+            return entryNotesView.text.toString()
+        }
+        set(value) {
+            entryNotesView.setText(value)
+            if (fontInVisibility)
+                entryNotesView.applyFontVisibility()
+        }
+
+    /* -------------
+     * Extra Fields
+     * -------------
+     */
+
+    private var mExtraFieldsList: MutableList<Field> = ArrayList()
+    private var mOnEditButtonClickListener: ((item: Field)->Unit)? = null
+
+    private fun buildViewFromField(extraField: Field): View? {
+        val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
+        val itemView: View? = inflater?.inflate(R.layout.item_entry_edit_extra_field, extraFieldsListView, false)
+        itemView?.id = View.NO_ID
+
+        val extraFieldValueContainer: TextInputLayout? = itemView?.findViewById(R.id.entry_extra_field_value_container)
+        extraFieldValueContainer?.endIconMode = if (extraField.protectedValue.isProtected)
+             TextInputLayout.END_ICON_PASSWORD_TOGGLE else TextInputLayout.END_ICON_NONE
+        extraFieldValueContainer?.hint = extraField.name
+        extraFieldValueContainer?.id = View.NO_ID
+
+        val extraFieldValue: TextInputEditText? = itemView?.findViewById(R.id.entry_extra_field_value)
+        extraFieldValue?.apply {
+            if (extraField.protectedValue.isProtected) {
+                inputType = extraFieldValue.inputType or EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
+            }
+            setText(extraField.protectedValue.toString())
+            if (fontInVisibility)
+                applyFontVisibility()
+        }
+        extraFieldValue?.id = View.NO_ID
+        extraFieldValue?.tag = "FIELD_VALUE_TAG"
+        if (mLastFocusedEditField?.field == extraField) {
+            mExtraViewToRequestFocus = extraFieldValue
+        }
+
+        val extraFieldEditButton: View? = itemView?.findViewById(R.id.entry_extra_field_edit)
+        extraFieldEditButton?.setOnClickListener {
+            mOnEditButtonClickListener?.invoke(extraField)
+        }
+        extraFieldEditButton?.id = View.NO_ID
+
+        return itemView
+    }
+
+    fun getExtraFields(): List<Field> {
+        mLastFocusedEditField = null
+        for (index in 0 until extraFieldsListView.childCount) {
+            val extraFieldValue: EditText = extraFieldsListView.getChildAt(index)
+                    .findViewWithTag("FIELD_VALUE_TAG")
+            val extraField = mExtraFieldsList[index]
+            extraField.protectedValue.stringValue = extraFieldValue.text?.toString() ?: ""
+            if (extraFieldValue.isFocused) {
+                mLastFocusedEditField = FocusedEditField().apply {
+                    field = extraField
+                    cursorSelectionStart = extraFieldValue.selectionStart
+                    cursorSelectionEnd = extraFieldValue.selectionEnd
+                }
+            }
+        }
+        return mExtraFieldsList
+    }
+
+    /**
+     * Remove all children and add new views for each field
+     */
+    fun assignExtraFields(fields: List<Field>,
+                          onEditButtonClickListener: ((item: Field)->Unit)?) {
+        extraFieldsContainerView.visibility = if (fields.isEmpty()) View.GONE else View.VISIBLE
+        // Reinit focused field
+        mExtraFieldsList.clear()
+        mExtraFieldsList.addAll(fields)
+        extraFieldsListView.removeAllViews()
+        fields.forEach {
+            extraFieldsListView.addView(buildViewFromField(it))
+        }
+        // Request last focus
+        mLastFocusedEditField?.let { focusField ->
+            mExtraViewToRequestFocus?.apply {
+                requestFocus()
+                setSelection(focusField.cursorSelectionStart,
+                                focusField.cursorSelectionEnd)
+            }
+        }
+        mLastFocusedEditField = null
+        mOnEditButtonClickListener = onEditButtonClickListener
+    }
+
+    /**
+     * Update an extra field or create a new one if doesn't exists, the old value is lost
+     */
+    fun putExtraField(extraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val oldField = mExtraFieldsList.firstOrNull { it.name == extraField.name }
+        oldField?.let {
+            val index = mExtraFieldsList.indexOf(oldField)
+            mExtraFieldsList.removeAt(index)
+            mExtraFieldsList.add(index, extraField)
+            extraFieldsListView.removeViewAt(index)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView, index)
+            newView?.requestFocus()
+        } ?: kotlin.run {
+            mExtraFieldsList.add(extraField)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView)
+            newView?.requestFocus()
+        }
+    }
+
+    /**
+     * Update an extra field and keep the old value
+     */
+    fun replaceExtraField(oldExtraField: Field, newExtraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        val oldValueEditText: EditText = extraFieldsListView.getChildAt(index)
+                .findViewWithTag("FIELD_VALUE_TAG")
+        val oldValue = oldValueEditText.text.toString()
+        val newExtraFieldWithOldValue = Field(newExtraField).apply {
+            this.protectedValue.stringValue = oldValue
+        }
+        mExtraFieldsList.removeAt(index)
+        mExtraFieldsList.add(index, newExtraFieldWithOldValue)
+        extraFieldsListView.removeViewAt(index)
+        val newView = buildViewFromField(newExtraFieldWithOldValue)
+        extraFieldsListView.addView(newView, index)
+        newView?.requestFocus()
+    }
+
+    fun removeExtraField(oldExtraField: Field) {
+        val previousSize = mExtraFieldsList.size
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        extraFieldsListView.getChildAt(index)?.let {
+            it.collapse(true) {
+                mExtraFieldsList.removeAt(index)
+                extraFieldsListView.removeViewAt(index)
+                val newSize = mExtraFieldsList.size
+
+                if (previousSize > 0 && newSize == 0) {
+                    extraFieldsContainerView.collapse(true)
+                } else if (previousSize == 0 && newSize == 1) {
+                    extraFieldsContainerView.expand(true)
+                }
+            }
+        }
+    }
+
+    /* -------------
+     * Attachments
+     * -------------
+     */
+
+    fun getAttachments(): List<Attachment> {
+        return attachmentsAdapter.itemsList.map { it.attachment }
+    }
+
+    fun assignAttachments(attachments: List<Attachment>,
+                          streamDirection: StreamDirection,
+                          onDeleteItem: (attachment: Attachment)->Unit) {
+        attachmentsContainerView.visibility = if (attachments.isEmpty()) View.GONE else View.VISIBLE
+        attachmentsAdapter.assignItems(attachments.map { EntryAttachmentState(it, streamDirection) })
+        attachmentsAdapter.onDeleteButtonClickListener = { item ->
+            onDeleteItem.invoke(item.attachment)
+        }
+    }
+
+    fun containsAttachment(): Boolean {
+        return !attachmentsAdapter.isEmpty()
+    }
+
+    fun containsAttachment(attachment: EntryAttachmentState): Boolean {
+        return attachmentsAdapter.contains(attachment)
+    }
+
+    fun putAttachment(attachment: EntryAttachmentState,
+                      onPreviewLoaded: (()-> Unit)? = null) {
+        attachmentsContainerView.visibility = View.VISIBLE
+        attachmentsAdapter.putItem(attachment)
+        attachmentsAdapter.onBinaryPreviewLoaded = {
+            onPreviewLoaded?.invoke()
+        }
+    }
+
+    fun removeAttachment(attachment: EntryAttachmentState) {
+        attachmentsAdapter.removeItem(attachment)
+    }
+
+    fun clearAttachments() {
+        attachmentsAdapter.clear()
+    }
+
+    fun getAttachmentViewPosition(attachment: EntryAttachmentState, position: (Float) -> Unit) {
+        attachmentsListView.postDelayed({
+            position.invoke(attachmentsContainerView.y
+                    + attachmentsListView.y
+                    + (attachmentsListView.getChildAt(attachmentsAdapter.indexOf(attachment))?.y
+                    ?: 0F)
+            )
+        }, 250)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        populateEntryWithViews()
+        outState.putParcelable(KEY_TEMP_ENTRY_INFO, mEntryInfo)
+        outState.putParcelable(KEY_LAST_FOCUSED_FIELD, mLastFocusedEditField)
+
+        super.onSaveInstanceState(outState)
+    }
+
+    companion object {
+        const val KEY_TEMP_ENTRY_INFO = "KEY_TEMP_ENTRY_INFO"
+        const val KEY_DATABASE = "KEY_DATABASE"
+        const val KEY_LAST_FOCUSED_FIELD = "KEY_LAST_FOCUSED_FIELD"
+
+        fun getInstance(entryInfo: EntryInfo?): EntryEditFragment {
+                        //database: Database?): EntryEditFragment {
+            return EntryEditFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_TEMP_ENTRY_INFO, entryInfo)
+                    // TODO Unique database key database.key
+                    putInt(KEY_DATABASE, 0)
+                }
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconCustomFragment.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.fragments
+
+import android.os.Bundle
+import android.view.View
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+
+
+class IconCustomFragment : IconFragment<IconImageCustom>() {
+
+    override fun retrieveMainLayoutId(): Int {
+        return R.layout.fragment_icon_grid
+    }
+
+    override fun defineIconList() {
+        mDatabase?.doForEachCustomIcons { customIcon, _ ->
+            iconPickerAdapter.addIcon(customIcon, false)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerViewModel.customIconsSelected.observe(viewLifecycleOwner) { customIconsSelected ->
+            if (customIconsSelected.isEmpty()) {
+                iconActionSelectionMode = false
+                iconPickerAdapter.deselectAllIcons()
+            } else {
+                iconActionSelectionMode = true
+                iconPickerAdapter.updateIconSelectedState(customIconsSelected)
+            }
+        }
+        iconPickerViewModel.customIconAdded.observe(viewLifecycleOwner) { iconCustomAdded ->
+            if (!iconCustomAdded.error) {
+                iconCustomAdded?.iconCustom?.let { icon ->
+                    iconPickerAdapter.addIcon(icon)
+                    iconCustomAdded.iconCustom = null
+                }
+                iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
+            }
+        }
+        iconPickerViewModel.customIconRemoved.observe(viewLifecycleOwner) { iconCustomRemoved ->
+            if (!iconCustomRemoved.error) {
+                iconCustomRemoved?.iconCustom?.let { icon ->
+                    iconPickerAdapter.removeIcon(icon)
+                    iconCustomRemoved.iconCustom = null
+                }
+            }
+        }
+    }
+
+    override fun onIconClickListener(icon: IconImageCustom) {
+        if (iconActionSelectionMode) {
+            // Same long click behavior after each single click
+            onIconLongClickListener(icon)
+        } else {
+            iconPickerViewModel.pickCustomIcon(icon)
+        }
+    }
+
+    override fun onIconLongClickListener(icon: IconImageCustom) {
+        // Select or deselect item if already selected
+        icon.selected = !icon.selected
+        iconPickerAdapter.updateIcon(icon)
+        iconActionSelectionMode = iconPickerAdapter.containsAnySelectedIcon()
+        iconPickerViewModel.selectCustomIcons(iconPickerAdapter.getSelectedIcons())
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconFragment.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.fragments
+
+import android.content.Context
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.IconPickerAdapter
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImageDraw
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+abstract class IconFragment<T: IconImageDraw> : StylishFragment(),
+        IconPickerAdapter.IconPickerListener<T> {
+
+    protected lateinit var iconsGridView: RecyclerView
+    protected lateinit var iconPickerAdapter: IconPickerAdapter<T>
+    protected var iconActionSelectionMode = false
+
+    protected var mDatabase: Database? = null
+
+    protected val iconPickerViewModel: IconPickerViewModel by activityViewModels()
+
+    abstract fun retrieveMainLayoutId(): Int
+
+    abstract fun defineIconList()
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        mDatabase = Database.getInstance()
+
+        // Retrieve the textColor to tint the icon
+        val ta = contextThemed?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        val tintColor = ta?.getColor(0, Color.BLACK) ?: Color.BLACK
+        ta?.recycle()
+
+        iconPickerAdapter = IconPickerAdapter<T>(context, tintColor).apply {
+            iconDrawableFactory = mDatabase?.iconDrawableFactory
+        }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val populateList = launch {
+                iconPickerAdapter.clear()
+                defineIconList()
+            }
+            withContext(Dispatchers.Main) {
+                populateList.join()
+                iconPickerAdapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        val root = inflater.inflate(retrieveMainLayoutId(), container, false)
+        iconsGridView = root.findViewById(R.id.icons_grid_view)
+        iconsGridView.adapter = iconPickerAdapter
+        return root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerAdapter.iconPickerListener = this
+    }
+
+    fun onIconDeleteClicked() {
+        iconActionSelectionMode = false
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconPickerFragment.kt
@@ -0,0 +1,77 @@
+package com.kunzisoft.keepass.activities.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.IconPickerPagerAdapter
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+
+class IconPickerFragment : StylishFragment() {
+
+    private var iconPickerPagerAdapter: IconPickerPagerAdapter? = null
+    private lateinit var viewPager: ViewPager2
+
+    private val iconPickerViewModel: IconPickerViewModel by activityViewModels()
+
+    private var mDatabase: Database? = null
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_icon_picker, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        mDatabase = Database.getInstance()
+
+        viewPager = view.findViewById(R.id.icon_picker_pager)
+        val tabLayout = view.findViewById<TabLayout>(R.id.icon_picker_tabs)
+        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
+                if (mDatabase?.allowCustomIcons == true) 2 else 1)
+        viewPager.adapter = iconPickerPagerAdapter
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            tab.text = when (position) {
+                1 -> getString(R.string.icon_section_custom)
+                else -> getString(R.string.icon_section_standard)
+            }
+        }.attach()
+
+        arguments?.apply {
+            if (containsKey(ICON_TAB_ARG)) {
+                viewPager.currentItem = getInt(ICON_TAB_ARG)
+            }
+            remove(ICON_TAB_ARG)
+        }
+
+        iconPickerViewModel.customIconAdded.observe(viewLifecycleOwner) { _ ->
+            viewPager.currentItem = 1
+        }
+    }
+
+    enum class IconTab {
+        STANDARD, CUSTOM
+    }
+
+    companion object {
+
+        private const val ICON_TAB_ARG = "ICON_TAB_ARG"
+
+        fun getInstance(iconTab: IconTab): IconPickerFragment {
+            val fragment = IconPickerFragment()
+            fragment.arguments = Bundle().apply {
+                putInt(ICON_TAB_ARG, iconTab.ordinal)
+            }
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/IconStandardFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
 *
 * This file is part of KeePassDX.
 *
@@ -17,35 +17,27 @@
 *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.kunzisoft.keepass.stream
+package com.kunzisoft.keepass.activities.fragments

-import java.io.IOException
-import java.io.OutputStream
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard

-class NullOutputStream : OutputStream() {

-    @Throws(IOException::class)
-    override fun close() {
-        super.close()
+class IconStandardFragment : IconFragment<IconImageStandard>() {
+
+    override fun retrieveMainLayoutId(): Int {
+        return R.layout.fragment_icon_grid
    }

-    @Throws(IOException::class)
-    override fun flush() {
-        super.flush()
+    override fun defineIconList() {
+        mDatabase?.doForEachStandardIcons { standardIcon ->
+            iconPickerAdapter.addIcon(standardIcon, false)
+        }
    }

-    @Throws(IOException::class)
-    override fun write(buffer: ByteArray, offset: Int, count: Int) {
-        super.write(buffer, offset, count)
+    override fun onIconClickListener(icon: IconImageStandard) {
+        iconPickerViewModel.pickStandardIcon(icon)
    }

-    @Throws(IOException::class)
-    override fun write(buffer: ByteArray) {
-        super.write(buffer)
-    }
-
-    @Throws(IOException::class)
-    override fun write(oneByte: Int) {
-    }
-
-}
+    override fun onIconLongClickListener(icon: IconImageStandard) {}
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/ListNodesFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/ListNodesFragment.kt
@@ -17,34 +17,30 @@
 *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.kunzisoft.keepass.activities
+package com.kunzisoft.keepass.activities.fragments

 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
+import android.view.*
+import androidx.appcompat.view.ActionMode
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-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.appcompat.view.ActionMode
-
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.adapters.NodeAdapter
-import com.kunzisoft.keepass.database.element.SortNodeEnum
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.activities.EntryEditActivity
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.NodeAdapter
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.Group
+import com.kunzisoft.keepass.database.element.SortNodeEnum
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import java.util.*

 class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
@@ -69,10 +65,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis


    private var readOnly: Boolean = false
-        get() {
-            return field || selectionMode
-        }
-    private var selectionMode: Boolean = false
+    private var specialMode: SpecialMode = SpecialMode.DEFAULT

    val isEmpty: Boolean
        get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0
@@ -97,6 +90,12 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }
    }

+    override fun onDetach() {
+        nodeClickListener = null
+        onScrollListener = null
+        super.onDetach()
+    }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -189,11 +188,16 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        super.onResume()

        activity?.intent?.let {
-            selectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(it)
+            specialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(it)
        }

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

        if (isASearchResult && mAdapter!= null && mAdapter!!.isEmpty) {
            // To show the " no search entry found "
@@ -205,10 +209,12 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }
    }

+    @Throws(IllegalArgumentException::class)
    fun rebuildList() {
        // Add elements to the list
        mainGroup?.let { mainGroup ->
            mAdapter?.apply {
+                // Thrown an exception when sort cannot be performed
                rebuildList(mainGroup)
                // To visually change the elements
                if (PreferencesUtil.APPEARANCE_CHANGED) {
@@ -227,8 +233,13 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }

        // Tell the adapter to refresh it's list
-        mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
-        rebuildList()
+        try {
+            mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
+            rebuildList()
+        } catch (e:Exception) {
+            Log.e(TAG, "Unable to rebuild the list with the sort")
+            e.printStackTrace()
+        }
    }

    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -266,14 +277,15 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
    }

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

        return object : ActionMode.Callback {

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

            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
@@ -299,13 +311,17 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                        menu?.removeItem(R.id.menu_edit)
                    }

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

                    // Deletion
@@ -318,7 +334,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                // Add the number of items selected in title
                mode?.title = nodes.size.toString()

-                return true
+                return actionModeCallback.onPrepareActionMode(mode, menu)
            }

            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
@@ -348,7 +364,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                        nodeActionSelectionMode = false
                        returnValue
                    }
-                    else -> false
+                    else -> actionModeCallback.onActionItemClicked(mode, item)
                }
            }

@@ -358,6 +374,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                mAdapter?.unselectActionNodes()
                nodeActionPasteMode = PasteMode.UNDEFINED
                nodeActionSelectionMode = false
+                actionModeCallback.onDestroyActionMode(mode)
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
@@ -19,59 +19,191 @@
 */
 package com.kunzisoft.keepass.activities.helpers

-import android.app.assist.AssistStructure
 import android.content.Context
 import android.content.Intent
 import android.os.Build
+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

 object EntrySelectionHelper {

-    private const val EXTRA_ENTRY_SELECTION_MODE = "com.kunzisoft.keepass.extra.ENTRY_SELECTION_MODE"
-    private const val DEFAULT_ENTRY_SELECTION_MODE = false
-    // Key to retrieve search in intent
-    const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
+    private const val KEY_SPECIAL_MODE = "com.kunzisoft.keepass.extra.SPECIAL_MODE"
+    private const val KEY_TYPE_MODE = "com.kunzisoft.keepass.extra.TYPE_MODE"
+    private const val KEY_SEARCH_INFO = "com.kunzisoft.keepass.extra.SEARCH_INFO"
+    private const val KEY_REGISTER_INFO = "com.kunzisoft.keepass.extra.REGISTER_INFO"

-    fun startActivityForEntrySelectionResult(context: Context,
-                                             intent: Intent,
-                                             searchInfo: SearchInfo?) {
-        addEntrySelectionModeExtraInIntent(intent)
-        searchInfo?.let {
-            intent.putExtra(KEY_SEARCH_INFO, it)
-        }
+    fun startActivityForSearchModeResult(context: Context,
+                                         intent: Intent,
+                                         searchInfo: SearchInfo) {
+        addSpecialModeInIntent(intent, SpecialMode.SEARCH)
+        addSearchInfoInIntent(intent, searchInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
        context.startActivity(intent)
    }

-    fun addEntrySelectionModeExtraInIntent(intent: Intent) {
-        intent.putExtra(EXTRA_ENTRY_SELECTION_MODE, true)
+    fun startActivityForSaveModeResult(context: Context,
+                                             intent: Intent,
+                                             searchInfo: SearchInfo) {
+        addSpecialModeInIntent(intent, SpecialMode.SAVE)
+        addTypeModeInIntent(intent, TypeMode.DEFAULT)
+        addSearchInfoInIntent(intent, searchInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        context.startActivity(intent)
    }

-    fun removeEntrySelectionModeFromIntent(intent: Intent) {
-        intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
+    fun startActivityForKeyboardSelectionModeResult(context: Context,
+                                                    intent: Intent,
+                                                    searchInfo: SearchInfo?) {
+        addSpecialModeInIntent(intent, SpecialMode.SELECTION)
+        addTypeModeInIntent(intent, TypeMode.MAGIKEYBOARD)
+        addSearchInfoInIntent(intent, searchInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        context.startActivity(intent)
    }

-    fun retrieveEntrySelectionModeFromIntent(intent: Intent): Boolean {
-        return intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)
+    fun startActivityForRegistrationModeResult(context: Context,
+                                               intent: Intent,
+                                               registerInfo: RegisterInfo?) {
+        addSpecialModeInIntent(intent, SpecialMode.REGISTRATION)
+        // At the moment, only autofill for registration
+        addTypeModeInIntent(intent, TypeMode.AUTOFILL)
+        addRegisterInfoInIntent(intent, registerInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        context.startActivity(intent)
    }

-    fun doEntrySelectionAction(intent: Intent,
-                               standardAction: () -> Unit,
-                               keyboardAction: () -> Unit,
-                               autofillAction: (assistStructure: AssistStructure) -> Unit) {
-        var assistStructureInit = false
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AutofillHelper.retrieveAssistStructure(intent)?.let { assistStructure ->
-                autofillAction.invoke(assistStructure)
-                assistStructureInit = true
-            }
+    fun addSearchInfoInIntent(intent: Intent, searchInfo: SearchInfo?) {
+        searchInfo?.let {
+            intent.putExtra(KEY_SEARCH_INFO, it)
        }
-        if (!assistStructureInit) {
-            if (intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)) {
-                intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
-                keyboardAction.invoke()
-            } else {
-                standardAction.invoke()
+    }
+
+    fun retrieveSearchInfoFromIntent(intent: Intent): SearchInfo? {
+        return intent.getParcelableExtra(KEY_SEARCH_INFO)
+    }
+
+    fun addRegisterInfoInIntent(intent: Intent, registerInfo: RegisterInfo?) {
+        registerInfo?.let {
+            intent.putExtra(KEY_REGISTER_INFO, it)
+        }
+    }
+
+    fun retrieveRegisterInfoFromIntent(intent: Intent): RegisterInfo? {
+        return intent.getParcelableExtra(KEY_REGISTER_INFO)
+    }
+
+    fun removeInfoFromIntent(intent: Intent) {
+        intent.removeExtra(KEY_SEARCH_INFO)
+        intent.removeExtra(KEY_REGISTER_INFO)
+    }
+
+    fun addSpecialModeInIntent(intent: Intent, specialMode: SpecialMode) {
+        intent.putExtra(KEY_SPECIAL_MODE, specialMode as Serializable)
+    }
+
+    fun retrieveSpecialModeFromIntent(intent: Intent): SpecialMode {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (AutofillHelper.retrieveAutofillComponent(intent) != null)
+                return SpecialMode.SELECTION
+        }
+        return intent.getSerializableExtra(KEY_SPECIAL_MODE) as SpecialMode?
+                ?: SpecialMode.DEFAULT
+    }
+
+    fun addTypeModeInIntent(intent: Intent, typeMode: TypeMode) {
+        intent.putExtra(KEY_TYPE_MODE, typeMode as Serializable)
+    }
+
+    fun retrieveTypeModeFromIntent(intent: Intent): TypeMode {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (AutofillHelper.retrieveAutofillComponent(intent) != null)
+                return TypeMode.AUTOFILL
+        }
+        return intent.getSerializableExtra(KEY_TYPE_MODE) as TypeMode? ?: TypeMode.DEFAULT
+    }
+
+    fun removeModesFromIntent(intent: Intent) {
+        intent.removeExtra(KEY_SPECIAL_MODE)
+        intent.removeExtra(KEY_TYPE_MODE)
+    }
+
+    fun doSpecialAction(intent: Intent,
+                        defaultAction: () -> Unit,
+                        searchAction: (searchInfo: SearchInfo) -> Unit,
+                        saveAction: (searchInfo: SearchInfo) -> Unit,
+                        keyboardSelectionAction: (searchInfo: SearchInfo?) -> Unit,
+                        autofillSelectionAction: (searchInfo: SearchInfo?,
+                                                  autofillComponent: AutofillComponent) -> Unit,
+                        autofillRegistrationAction: (registerInfo: RegisterInfo?) -> Unit) {
+
+        when (retrieveSpecialModeFromIntent(intent)) {
+            SpecialMode.DEFAULT -> {
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                defaultAction.invoke()
+            }
+            SpecialMode.SEARCH -> {
+                val searchInfo = retrieveSearchInfoFromIntent(intent)
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                if (searchInfo != null)
+                    searchAction.invoke(searchInfo)
+                else {
+                    defaultAction.invoke()
+                }
+            }
+            SpecialMode.SAVE -> {
+                val searchInfo = retrieveSearchInfoFromIntent(intent)
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                if (searchInfo != null)
+                    saveAction.invoke(searchInfo)
+                else {
+                    defaultAction.invoke()
+                }
+            }
+            SpecialMode.SELECTION -> {
+                val searchInfo: SearchInfo? = retrieveSearchInfoFromIntent(intent)
+                var autofillComponentInit = false
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    AutofillHelper.retrieveAutofillComponent(intent)?.let { autofillComponent ->
+                        autofillSelectionAction.invoke(searchInfo, autofillComponent)
+                        autofillComponentInit = true
+                    }
+                }
+                if (!autofillComponentInit) {
+                    if (intent.getSerializableExtra(KEY_SPECIAL_MODE) != null) {
+                        when (retrieveTypeModeFromIntent(intent)) {
+                            TypeMode.DEFAULT -> {
+                                removeModesFromIntent(intent)
+                                if (searchInfo != null)
+                                    searchAction.invoke(searchInfo)
+                                else
+                                    defaultAction.invoke()
+                            }
+                            TypeMode.MAGIKEYBOARD -> keyboardSelectionAction.invoke(searchInfo)
+                            else -> {
+                                // In this case, error
+                                removeModesFromIntent(intent)
+                                removeInfoFromIntent(intent)
+                            }
+                        }
+                    } else {
+                        if (searchInfo != null)
+                            searchAction.invoke(searchInfo)
+                        else
+                            defaultAction.invoke()
+                    }
+                }
+            }
+            SpecialMode.REGISTRATION -> {
+                val registerInfo: RegisterInfo? = retrieveRegisterInfoFromIntent(intent)
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                autofillRegistrationAction.invoke(registerInfo)
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ExternalFileHelper.kt
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.helpers
+
+import android.annotation.SuppressLint
+import android.app.Activity.RESULT_OK
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import android.view.View
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
+import com.kunzisoft.keepass.utils.UriUtil
+
+class ExternalFileHelper {
+
+    private var activity: FragmentActivity? = null
+    private var fragment: Fragment? = null
+
+    constructor(context: FragmentActivity) {
+        this.activity = context
+        this.fragment = null
+    }
+
+    constructor(context: Fragment) {
+        this.activity = context.activity
+        this.fragment = context
+    }
+
+    fun openDocument(getContent: Boolean = false,
+                     typeString: String = "*/*") {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            try {
+                if (getContent) {
+                    openActivityWithActionGetContent(typeString)
+                } else {
+                    openActivityWithActionOpenDocument(typeString)
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to open document", e)
+                showFileManagerDialogFragment()
+            }
+        } else {
+            showFileManagerDialogFragment()
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.KITKAT)
+    private fun openActivityWithActionOpenDocument(typeString: String) {
+        val intentOpenDocument = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = typeString
+            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+            }
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+        if (fragment != null)
+            fragment?.startActivityForResult(intentOpenDocument, OPEN_DOC)
+        else
+            activity?.startActivityForResult(intentOpenDocument, OPEN_DOC)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.KITKAT)
+    private fun openActivityWithActionGetContent(typeString: String) {
+        val intentGetContent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = typeString
+            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+            }
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+        if (fragment != null)
+            fragment?.startActivityForResult(intentGetContent, GET_CONTENT)
+        else
+            activity?.startActivityForResult(intentGetContent, GET_CONTENT)
+    }
+
+    /**
+     * To use in onActivityResultCallback in Fragment or Activity
+     * @param onFileSelected Callback retrieve from data
+     * @return true if requestCode was captured, false elsewhere
+     */
+    fun onOpenDocumentResult(requestCode: Int, resultCode: Int, data: Intent?,
+                             onFileSelected: ((uri: Uri?) -> Unit)?): Boolean {
+
+        when (requestCode) {
+            FILE_BROWSE -> {
+                if (resultCode == RESULT_OK) {
+                    val filename = data?.dataString
+                    var keyUri: Uri? = null
+                    if (filename != null) {
+                        keyUri = UriUtil.parse(filename)
+                    }
+                    onFileSelected?.invoke(keyUri)
+                }
+                return true
+            }
+            GET_CONTENT, OPEN_DOC -> {
+                if (resultCode == RESULT_OK) {
+                    if (data != null) {
+                        val uri = data.data
+                        if (uri != null) {
+                            try {
+                                // try to persist read and write permissions
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                                    activity?.contentResolver?.apply {
+                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                // nop
+                            }
+                            onFileSelected?.invoke(uri)
+                        }
+                    }
+                }
+                return true
+            }
+        }
+        return false
+    }
+
+    /**
+     * Show Browser dialog to select file picker app
+     */
+    private fun showFileManagerDialogFragment() {
+        try {
+            if (fragment != null) {
+                fragment?.parentFragmentManager
+            } else {
+                activity?.supportFragmentManager
+            }?.let { fragmentManager ->
+                FileManagerDialogFragment().show(fragmentManager, "browserDialog")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Can't open BrowserDialog", e)
+        }
+    }
+
+    fun createDocument(titleString: String,
+                       typeString: String = "application/octet-stream"): Int? {
+        val idCode = getUnusedCreateFileRequestCode()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            try {
+                val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    type = typeString
+                    putExtra(Intent.EXTRA_TITLE, titleString)
+                }
+                if (fragment != null)
+                    fragment?.startActivityForResult(intent, idCode)
+                else
+                    activity?.startActivityForResult(intent, idCode)
+                return idCode
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to create document", e)
+                showFileManagerDialogFragment()
+            }
+        } else {
+            showFileManagerDialogFragment()
+        }
+        return null
+    }
+
+    /**
+     * To use in onActivityResultCallback in Fragment or Activity
+     * @param onFileCreated Callback retrieve from data
+     * @return true if requestCode was captured, false elsewhere
+     */
+    fun onCreateDocumentResult(requestCode: Int, resultCode: Int, data: Intent?,
+                               onFileCreated: (fileCreated: Uri?)->Unit) {
+        // Retrieve the created URI from the file manager
+        if (fileRequestCodes.contains(requestCode) && resultCode == RESULT_OK) {
+            onFileCreated.invoke(data?.data)
+            fileRequestCodes.remove(requestCode)
+        }
+    }
+
+    companion object {
+
+        private const val TAG = "OpenFileHelper"
+
+        private const val GET_CONTENT = 25745
+        private const val OPEN_DOC = 25845
+        private const val FILE_BROWSE = 25645
+
+        private var CREATE_FILE_REQUEST_CODE_DEFAULT = 3853
+        private var fileRequestCodes = ArrayList<Int>()
+
+        private fun getUnusedCreateFileRequestCode(): Int {
+            val newCreateFileRequestCode = CREATE_FILE_REQUEST_CODE_DEFAULT++
+            fileRequestCodes.add(newCreateFileRequestCode)
+            return newCreateFileRequestCode
+        }
+
+        @SuppressLint("InlinedApi")
+        fun allowCreateDocumentByStorageAccessFramework(packageManager: PackageManager,
+                                                        typeString: String = "application/octet-stream"): Boolean {
+            return when {
+                // To check if a custom file manager can manage the ACTION_CREATE_DOCUMENT
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT -> {
+                    packageManager.queryIntentActivities(Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                        addCategory(Intent.CATEGORY_OPENABLE)
+                        type = typeString
+                    }, PackageManager.MATCH_DEFAULT_ONLY).isNotEmpty()
+                }
+                else -> true
+            }
+        }
+    }
+}
+
+fun View.setOpenDocumentClickListener(externalFileHelper: ExternalFileHelper?) {
+    externalFileHelper?.let { fileHelper ->
+        setOnClickListener {
+            fileHelper.openDocument()
+        }
+        setOnLongClickListener {
+            fileHelper.openDocument(true)
+            true
+        }
+    } ?: kotlin.run {
+        setOnClickListener(null)
+        setOnLongClickListener(null)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/OpenFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/OpenFileHelper.kt
@@ -1,241 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.helpers
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Activity.RESULT_OK
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.util.Log
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
-import com.kunzisoft.keepass.utils.UriUtil
-
-class OpenFileHelper {
-
-    private var activity: Activity? = null
-    private var fragment: Fragment? = null
-
-    val openFileOnClickViewListener: OpenFileOnClickViewListener
-        get() = OpenFileOnClickViewListener()
-
-    constructor(context: Activity) {
-        this.activity = context
-        this.fragment = null
-    }
-
-    constructor(context: Fragment) {
-        this.activity = context.activity
-        this.fragment = context
-    }
-
-    inner class OpenFileOnClickViewListener : View.OnClickListener, View.OnLongClickListener {
-
-        private fun onAbstractClick(longClick: Boolean = false) {
-            try {
-                if (longClick) {
-                    try {
-                        openActivityWithActionGetContent()
-                    } catch (e: Exception) {
-                        openActivityWithActionOpenDocument()
-                    }
-                } else {
-                    try {
-                        openActivityWithActionOpenDocument()
-                    } catch (e: Exception) {
-                        openActivityWithActionGetContent()
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Enable to start the file picker activity", e)
-                // Open browser dialog
-                if (lookForOpenIntentsFilePicker())
-                    showBrowserDialog()
-            }
-        }
-
-        override fun onClick(v: View) {
-            onAbstractClick()
-        }
-
-        override fun onLongClick(v: View?): Boolean {
-            onAbstractClick(true)
-            return true
-        }
-    }
-
-    @SuppressLint("InlinedApi")
-    private fun openActivityWithActionOpenDocument() {
-        val intentOpenDocument = Intent(APP_ACTION_OPEN_DOCUMENT).apply {
-            addCategory(Intent.CATEGORY_OPENABLE)
-            type = "*/*"
-            flags = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
-                    Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or
-                    Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-        }
-        if (fragment != null)
-            fragment?.startActivityForResult(intentOpenDocument, OPEN_DOC)
-        else
-            activity?.startActivityForResult(intentOpenDocument, OPEN_DOC)
-    }
-
-    @SuppressLint("InlinedApi")
-    private fun openActivityWithActionGetContent() {
-        val intentGetContent = Intent(Intent.ACTION_GET_CONTENT).apply {
-            addCategory(Intent.CATEGORY_OPENABLE)
-            type = "*/*"
-            flags = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
-                    Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or
-                    Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-        }
-        if (fragment != null)
-            fragment?.startActivityForResult(intentGetContent, GET_CONTENT)
-        else
-            activity?.startActivityForResult(intentGetContent, GET_CONTENT)
-    }
-
-    private fun lookForOpenIntentsFilePicker(): Boolean {
-        var showBrowser = false
-        try {
-            if (isIntentAvailable(activity!!, OPEN_INTENTS_FILE_BROWSE)) {
-                val intent = Intent(OPEN_INTENTS_FILE_BROWSE)
-                if (fragment != null)
-                    fragment?.startActivityForResult(intent, FILE_BROWSE)
-                else
-                    activity?.startActivityForResult(intent, FILE_BROWSE)
-            } else {
-                showBrowser = true
-            }
-        } catch (e: Exception) {
-            Log.w(TAG, "Enable to start OPEN_INTENTS_FILE_BROWSE", e)
-            showBrowser = true
-        }
-
-        return showBrowser
-    }
-
-    /**
-     * Indicates whether the specified action can be used as an intent. This
-     * method queries the package manager for installed packages that can
-     * respond to an intent with the specified action. If no suitable package is
-     * found, this method returns false.
-     *
-     * @param context The application's environment.
-     * @param action The Intent action to check for availability.
-     *
-     * @return True if an Intent with the specified action can be sent and
-     * responded to, false otherwise.
-     */
-    private fun isIntentAvailable(context: Context, action: String): Boolean {
-        val packageManager = context.packageManager
-        val intent = Intent(action)
-        val list = packageManager.queryIntentActivities(intent,
-                PackageManager.MATCH_DEFAULT_ONLY)
-        return list.size > 0
-    }
-
-    /**
-     * Show Browser dialog to select file picker app
-     */
-    private fun showBrowserDialog() {
-        try {
-            val fileManagerDialogFragment = FileManagerDialogFragment()
-            fragment?.let {
-                fileManagerDialogFragment.show(it.parentFragmentManager, "browserDialog")
-            } ?: fileManagerDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
-        } catch (e: Exception) {
-            Log.e(TAG, "Can't open BrowserDialog", e)
-        }
-    }
-
-    /**
-     * To use in onActivityResultCallback in Fragment or Activity
-     * @param keyFileCallback Callback retrieve from data
-     * @return true if requestCode was captured, false elsechere
-     */
-    fun onActivityResultCallback(
-            requestCode: Int,
-            resultCode: Int,
-            data: Intent?,
-            keyFileCallback: ((uri: Uri?) -> Unit)?): Boolean {
-
-        when (requestCode) {
-            FILE_BROWSE -> {
-                if (resultCode == RESULT_OK) {
-                    val filename = data?.dataString
-                    var keyUri: Uri? = null
-                    if (filename != null) {
-                        keyUri = UriUtil.parse(filename)
-                    }
-                    keyFileCallback?.invoke(keyUri)
-                }
-                return true
-            }
-            GET_CONTENT, OPEN_DOC -> {
-                if (resultCode == RESULT_OK) {
-                    if (data != null) {
-                        val uri = data.data
-                        if (uri != null) {
-                            try {
-                                // try to persist read and write permissions
-                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                                    activity?.contentResolver?.apply {
-                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-                                    }
-                                }
-                            } catch (e: Exception) {
-                                // nop
-                            }
-                            keyFileCallback?.invoke(uri)
-                        }
-                    }
-                }
-                return true
-            }
-        }
-        return false
-    }
-
-    companion object {
-
-        private const val TAG = "OpenFileHelper"
-
-        private var APP_ACTION_OPEN_DOCUMENT: String = try {
-            Intent::class.java.getField("ACTION_OPEN_DOCUMENT").get(null) as String
-        } catch (e: Exception) {
-            "android.intent.action.OPEN_DOCUMENT"
-        }
-
-        const val OPEN_INTENTS_FILE_BROWSE = "org.openintents.action.PICK_FILE"
-
-        private const val GET_CONTENT = 25745
-        private const val OPEN_DOC = 25845
-        private const val FILE_BROWSE = 25645
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/SpecialMode.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/SpecialMode.kt
@@ -0,0 +1,9 @@
+package com.kunzisoft.keepass.activities.helpers
+
+enum class SpecialMode {
+    DEFAULT,
+    SEARCH,
+    SAVE,
+    SELECTION,
+    REGISTRATION;
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/TypeMode.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/TypeMode.kt
@@ -0,0 +1,5 @@
+package com.kunzisoft.keepass.activities.helpers
+
+enum class TypeMode {
+    DEFAULT, MAGIKEYBOARD, AUTOFILL
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
@@ -19,14 +19,20 @@
 */
 package com.kunzisoft.keepass.activities.lock

+import android.annotation.SuppressLint
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
@@ -42,7 +48,7 @@ abstract class LockingActivity : SpecialModeActivity() {
    // Force readOnly if Entry Selection mode
    protected var mReadOnly: Boolean
        get() {
-            return mReadOnlyToSave || mSelectionMode
+            return mReadOnlyToSave
        }
        set(value) {
            mReadOnlyToSave = value
@@ -50,10 +56,13 @@ abstract class LockingActivity : SpecialModeActivity() {
    private var mReadOnlyToSave: Boolean = false
    protected var mAutoSaveEnable: Boolean = true

-    var mProgressDialogThread: ProgressDialogThread? = null
+    var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
        private set

    override fun onCreate(savedInstanceState: Bundle?) {
+
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
+
        super.onCreate(savedInstanceState)

        if (savedInstanceState != null
@@ -71,14 +80,13 @@ abstract class LockingActivity : SpecialModeActivity() {
                    LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
                // Add onActivityForResult response
                setResult(RESULT_EXIT_LOCK)
+                closeOptionsMenu()
                finish()
            }
            registerLockReceiver(mLockReceiver)
        }

        mExitLock = false
-
-        mProgressDialogThread = ProgressDialogThread(this)
    }

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -94,7 +102,16 @@ abstract class LockingActivity : SpecialModeActivity() {
    override fun onResume() {
        super.onResume()

-        mProgressDialogThread?.registerProgressTask()
+        // If in ave or registration mode, don't allow read only
+        if ((mSpecialMode == SpecialMode.SAVE
+                        || mSpecialMode == SpecialMode.REGISTRATION)
+                && mReadOnly) {
+            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            finish()
+        }
+
+        mProgressDatabaseTaskProvider?.registerProgressTask()

        // To refresh when back to normal workflow from selection workflow
        mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent)
@@ -129,7 +146,7 @@ abstract class LockingActivity : SpecialModeActivity() {
    override fun onPause() {
        LOCKING_ACTIVITY_UI_VISIBLE = false

-        mProgressDialogThread?.unregisterProgressTask()
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()

        super.onPause()

@@ -148,25 +165,6 @@ abstract class LockingActivity : SpecialModeActivity() {
        sendBroadcast(Intent(LOCK_ACTION))
    }

-    /**
-     * To reset the app timeout when a view is focused or changed
-     */
-    protected fun resetAppTimeoutWhenViewFocusedOrChanged(vararg views: View?) {
-        views.forEach {
-            it?.setOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus) {
-                    Log.d(TAG, "View focused, reset app timeout")
-                    TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this)
-                }
-            }
-            if (it is ViewGroup) {
-                for (i in 0..it.childCount) {
-                    resetAppTimeoutWhenViewFocusedOrChanged(it.getChildAt(i))
-                }
-            }
-        }
-    }
-
    override fun onBackPressed() {
        if (mTimeoutEnable) {
            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
@@ -179,7 +177,7 @@ abstract class LockingActivity : SpecialModeActivity() {

    companion object {

-        private const val TAG = "LockingActivity"
+        const val TAG = "LockingActivity"

        const val RESULT_EXIT_LOCK = 1450

@@ -190,3 +188,28 @@ abstract class LockingActivity : SpecialModeActivity() {
        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
    }
 }
+
+/**
+ * To reset the app timeout when a view is focused or changed
+ */
+@SuppressLint("ClickableViewAccessibility")
+fun View.resetAppTimeoutWhenViewFocusedOrChanged(context: Context) {
+    setOnTouchListener { _, event ->
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                //Log.d(LockingActivity.TAG, "View touched, try to reset app timeout")
+                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context)
+            }
+        }
+        false
+    }
+    setOnFocusChangeListener { _, _ ->
+        //Log.d(LockingActivity.TAG, "View focused, try to reset app timeout")
+        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context)
+    }
+    if (this is ViewGroup) {
+        for (i in 0..childCount) {
+            getChildAt(i)?.resetAppTimeoutWhenViewFocusedOrChanged(context)
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
@@ -1,12 +1,13 @@
 package com.kunzisoft.keepass.activities.selection

-import android.os.Build
+import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
+import com.kunzisoft.keepass.activities.helpers.TypeMode
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.SpecialModeView
@@ -16,40 +17,128 @@ import com.kunzisoft.keepass.view.SpecialModeView
 */
 abstract class SpecialModeActivity : StylishActivity() {

-    protected var mSelectionMode: Boolean = false
+    protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
+    private var mTypeMode: TypeMode = TypeMode.DEFAULT

-    protected var mAutofillSelection: Boolean = false
+    private var mSpecialModeView: SpecialModeView? = null

-    private var specialModeView: SpecialModeView? = null
+    override fun onBackPressed() {
+        if (mSpecialMode != SpecialMode.DEFAULT)
+            onCancelSpecialMode()
+        else
+            super.onBackPressed()
+    }
+
+    /**
+     * To call the regular onBackPressed() method in special mode
+     */
+    protected fun onRegularBackPressed() {
+        super.onBackPressed()
+    }
+
+    /**
+     * Intent sender uses special retains data in callback
+     */
+    private fun isIntentSender(): Boolean {
+        return (mSpecialMode == SpecialMode.SELECTION
+                && mTypeMode == TypeMode.AUTOFILL)
+                /* TODO Registration callback #765
+                || (mSpecialMode == SpecialMode.REGISTRATION
+                && mTypeMode == TypeMode.AUTOFILL
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+                */
+    }
+
+    fun onLaunchActivitySpecialMode() {
+        if (!isIntentSender()) {
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            EntrySelectionHelper.removeInfoFromIntent(intent)
+            finish()
+        }
+    }
+
+    open fun onValidateSpecialMode() {
+        if (isIntentSender()) {
+            super.finish()
+        } else {
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            EntrySelectionHelper.removeInfoFromIntent(intent)
+            if (mSpecialMode != SpecialMode.DEFAULT) {
+                // To move the app in background
+                moveTaskToBack(true)
+            }
+        }
+    }

    open fun onCancelSpecialMode() {
-        onBackPressed()
+        if (isIntentSender()) {
+            // To get the app caller, only for IntentSender
+            super.onBackPressed()
+        } else {
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            EntrySelectionHelper.removeInfoFromIntent(intent)
+            if (mSpecialMode != SpecialMode.DEFAULT) {
+                // To move the app in background
+                moveTaskToBack(true)
+            }
+        }
+    }
+
+    protected fun backToTheAppCaller() {
+        if (isIntentSender()) {
+            // To get the app caller, only for IntentSender
+            super.onBackPressed()
+        } else {
+            // To move the app in background
+            moveTaskToBack(true)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        mSpecialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(intent)
+        mTypeMode = EntrySelectionHelper.retrieveTypeModeFromIntent(intent)
    }

    override fun onResume() {
        super.onResume()

-        mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mAutofillSelection = AutofillHelper.retrieveAssistStructure(intent) != null
-        }
-
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(EntrySelectionHelper.KEY_SEARCH_INFO)
+        mSpecialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(intent)
+        mTypeMode = EntrySelectionHelper.retrieveTypeModeFromIntent(intent)
+        val searchInfo: SearchInfo? = EntrySelectionHelper.retrieveRegisterInfoFromIntent(intent)?.searchInfo
+                ?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)

        // To show the selection mode
-        specialModeView = findViewById(R.id.special_mode_view)
-        specialModeView?.apply {
+        mSpecialModeView = findViewById(R.id.special_mode_view)
+        mSpecialModeView?.apply {
            // Populate title
-            val typeModeId = if (mAutofillSelection)
-                R.string.autofill
-            else
-                R.string.magic_keyboard_title
-            title = "${resources.getString(R.string.selection_mode)} (${getString(typeModeId)})"
+            val selectionModeStringId = when (mSpecialMode) {
+                SpecialMode.DEFAULT, // Not important because hidden
+                SpecialMode.SEARCH -> R.string.search_mode
+                SpecialMode.SAVE -> R.string.save_mode
+                SpecialMode.SELECTION -> R.string.selection_mode
+                SpecialMode.REGISTRATION -> R.string.registration_mode
+            }
+            val typeModeStringId = when (mTypeMode) {
+                TypeMode.DEFAULT, // Not important because hidden
+                TypeMode.MAGIKEYBOARD -> R.string.magic_keyboard_title
+                TypeMode.AUTOFILL -> R.string.autofill
+            }
+            title = getString(selectionModeStringId)
+            if (mTypeMode != TypeMode.DEFAULT)
+                title = "$title (${getString(typeModeStringId)})"
            // Populate subtitle
            subtitle = searchInfo?.getName(resources)

            // Show the toolbar or not
-            visible = mSelectionMode
+            visible = when (mSpecialMode) {
+                SpecialMode.DEFAULT -> false
+                SpecialMode.SEARCH -> true
+                SpecialMode.SAVE -> true
+                SpecialMode.SELECTION -> true
+                SpecialMode.REGISTRATION -> true
+            }

            // Add back listener
            onCancelButtonClickListener = View.OnClickListener {
@@ -58,7 +147,7 @@ abstract class SpecialModeActivity : StylishActivity() {

            // Create menu
            menu.clear()
-            if (mAutofillSelection) {
+            if (mTypeMode == TypeMode.AUTOFILL) {
                menuInflater.inflate(R.menu.autofill, menu)
                setOnMenuItemClickListener {  menuItem ->
                    when (menuItem.itemId) {
@@ -70,9 +159,15 @@ abstract class SpecialModeActivity : StylishActivity() {
                }
            }
        }
+
+        // To hide home button from the regular toolbar in special mode
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            supportActionBar?.setDisplayHomeAsUpEnabled(false)
+            supportActionBar?.setDisplayShowHomeEnabled(false)
+        }
    }

-    fun blockAutofill(searchInfo: SearchInfo?) {
+    private fun blockAutofill(searchInfo: SearchInfo?) {
        val webDomain = searchInfo?.webDomain
        val applicationId = searchInfo?.applicationId
        if (webDomain != null) {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
@@ -20,11 +20,11 @@
 package com.kunzisoft.keepass.activities.stylish

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

 /**
 * Class that provides functions to retrieve and assign a theme to a module
@@ -37,18 +37,63 @@ object Stylish {
     * Initialize the class with a theme preference
     * @param context Context to retrieve the theme preference
     */
-    fun init(context: Context) {
-        val stylishPrefKey = context.getString(R.string.setting_style_key)
+    fun load(context: Context) {
        Log.d(Stylish::class.java.name, "Attatching to " + context.packageName)
-        themeString = PreferenceManager.getDefaultSharedPreferences(context).getString(stylishPrefKey, context.getString(R.string.list_style_name_light))
+        themeString = PreferencesUtil.getStyle(context)
+    }
+
+    fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
+        val systemNightMode = when (PreferencesUtil.getStyleBrightness(context)) {
+            context.getString(R.string.list_style_brightness_light) -> false
+            context.getString(R.string.list_style_brightness_night) -> true
+            else -> {
+                when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
+                    Configuration.UI_MODE_NIGHT_YES -> true
+                    else -> false
+                }
+            }
+        }
+        return if (systemNightMode) {
+            retrieveEquivalentNightStyle(context, styleString)
+        } else {
+            retrieveEquivalentLightStyle(context, styleString)
+        }
+    }
+
+    fun retrieveEquivalentLightStyle(context: Context, styleString: String): String {
+        return when (styleString) {
+            context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light)
+            context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white)
+            context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear)
+            context.getString(R.string.list_style_name_blue_night) -> context.getString(R.string.list_style_name_blue)
+            context.getString(R.string.list_style_name_red_night) -> context.getString(R.string.list_style_name_red)
+            context.getString(R.string.list_style_name_purple_dark) -> context.getString(R.string.list_style_name_purple)
+            else -> styleString
+        }
+    }
+
+    private fun retrieveEquivalentNightStyle(context: Context, styleString: String): String {
+        return when (styleString) {
+            context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night)
+            context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black)
+            context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark)
+            context.getString(R.string.list_style_name_blue) -> context.getString(R.string.list_style_name_blue_night)
+            context.getString(R.string.list_style_name_red) -> context.getString(R.string.list_style_name_red_night)
+            context.getString(R.string.list_style_name_purple) -> context.getString(R.string.list_style_name_purple_dark)
+            else -> styleString
+        }
+    }
+
+    fun defaultStyle(context: Context): String {
+        return context.getString(R.string.list_style_name_light)
    }

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

    /**
@@ -58,14 +103,18 @@ object Stylish {
     */
    @StyleRes
    fun getThemeId(context: Context): Int {
-
-        return when (themeString) {
+        return when (retrieveEquivalentSystemStyle(context, themeString ?: context.getString(R.string.list_style_name_light))) {
            context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night
+            context.getString(R.string.list_style_name_white) -> R.style.KeepassDXStyle_White
            context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black
+            context.getString(R.string.list_style_name_clear) -> R.style.KeepassDXStyle_Clear
            context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark
            context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue
+            context.getString(R.string.list_style_name_blue_night) -> R.style.KeepassDXStyle_Blue_Night
            context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red
+            context.getString(R.string.list_style_name_red_night) -> R.style.KeepassDXStyle_Red_Night
            context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple
+            context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark
            else -> R.style.KeepassDXStyle_Light
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
@@ -42,18 +42,33 @@ abstract class StylishFragment : Fragment() {
        contextThemed = ContextThemeWrapper(context, themeId)
    }

+    @Suppress("DEPRECATION")
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        // To fix status bar color
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            val window = requireActivity().window
-
-            val attrColorPrimaryDark = intArrayOf(android.R.attr.colorPrimaryDark)
-            val taColorPrimaryDark = contextThemed?.theme?.obtainStyledAttributes(attrColorPrimaryDark)
            val defaultColor = Color.BLACK
-            window.statusBarColor = taColorPrimaryDark?.getColor(0, defaultColor) ?: defaultColor
-            taColorPrimaryDark?.recycle()
-        }

+            try {
+                val taStatusBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
+                window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
+                taStatusBarColor?.recycle()
+            } catch (e: Exception) {}
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                try {
+                    val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
+                    if (taWindowStatusLight?.getBoolean(0, false) == true) {
+                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    }
+                    taWindowStatusLight?.recycle()
+                } catch (e: Exception) {}
+            }
+            try {
+                val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
+                window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
+                taNavigationBarColor?.recycle()
+            } catch (e: Exception) {}
+        }
        return super.onCreateView(inflater, container, savedInstanceState)
    }

--- a/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
@@ -0,0 +1,128 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.view.collapse
+
+abstract class AnimatedItemsAdapter<Item, T: RecyclerView.ViewHolder>(val context: Context)
+    : RecyclerView.Adapter<T>() {
+
+    protected val inflater: LayoutInflater = LayoutInflater.from(context)
+    var itemsList: MutableList<Item> = ArrayList()
+        private set
+
+    var onDeleteButtonClickListener: ((item: Item)->Unit)? = null
+    private var mItemToRemove: Item? = null
+
+    var onListSizeChangedListener: ((previousSize: Int, newSize: Int)->Unit)? = null
+
+    override fun getItemCount(): Int {
+        return itemsList.size
+    }
+
+    open fun assignItems(items: List<Item>) {
+        val previousSize = itemsList.size
+        itemsList.apply {
+            clear()
+            addAll(items)
+        }
+        notifyDataSetChanged()
+        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
+    }
+
+    open fun isEmpty(): Boolean {
+        return itemsList.isEmpty()
+    }
+
+    open fun contains(item: Item): Boolean {
+        return itemsList.contains(item)
+    }
+
+    open fun indexOf(item: Item): Int {
+        return itemsList.indexOf(item)
+    }
+
+    open fun putItem(item: Item) {
+        val previousSize = itemsList.size
+        if (itemsList.contains(item)) {
+            val index = itemsList.indexOf(item)
+            itemsList.removeAt(index)
+            itemsList.add(index, item)
+            notifyItemChanged(index)
+        } else {
+            itemsList.add(item)
+            notifyItemInserted(itemsList.indexOf(item))
+        }
+        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
+    }
+
+    /**
+     * Only replace [oldItem] by [newItem] if [oldItem] exists
+     */
+    open fun replaceItem(oldItem: Item, newItem: Item) {
+        if (itemsList.contains(oldItem)) {
+            val index = itemsList.indexOf(oldItem)
+            itemsList.removeAt(index)
+            itemsList.add(index, newItem)
+            notifyItemChanged(index)
+        }
+    }
+
+    /**
+     * Only remove [item] if doesn't exists
+     */
+    open fun removeItem(item: Item) {
+        if (itemsList.contains(item)) {
+            mItemToRemove = item
+            notifyItemChanged(itemsList.indexOf(item))
+        }
+    }
+
+    protected fun performDeletion(holder: T, item: Item): Boolean {
+        val effectivelyDeletionPerformed = mItemToRemove == item
+        if (effectivelyDeletionPerformed) {
+            holder.itemView.collapse(true) {
+                deleteItem(item)
+            }
+        }
+        return effectivelyDeletionPerformed
+    }
+
+    protected fun onBindDeleteButton(holder: T, deleteButton: View, item: Item, position: Int) {
+        deleteButton.apply {
+            visibility = View.VISIBLE
+            if (performDeletion(holder, item)) {
+                setOnClickListener(null)
+            } else {
+                setOnClickListener {
+                    onDeleteButtonClickListener?.invoke(item)
+                    mItemToRemove = item
+                    notifyItemChanged(position)
+                }
+            }
+        }
+    }
+
+    private fun deleteItem(item: Item) {
+        val previousSize = itemsList.size
+        val position = itemsList.indexOf(item)
+        if (position >= 0) {
+            itemsList.removeAt(position)
+            notifyItemRemoved(position)
+            mItemToRemove = null
+            for (i in 0 until itemsList.size) {
+                notifyItemChanged(i)
+            }
+        }
+        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
+    }
+
+    fun clear() {
+        if (itemsList.size > 0) {
+            itemsList.clear()
+            notifyDataSetChanged()
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsAdapter.kt
@@ -1,100 +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.adapters
-
-import android.content.Context
-import android.text.format.Formatter
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-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.database.CompressionAlgorithm
-import com.kunzisoft.keepass.model.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachment
-
-class EntryAttachmentsAdapter(val context: Context) : RecyclerView.Adapter<EntryAttachmentsAdapter.EntryBinariesViewHolder>() {
-
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryAttachmentsList: MutableList<EntryAttachment> = ArrayList()
-    var onItemClickListener: ((item: EntryAttachment, position: Int)->Unit)? = null
-
-    private val mDatabase = Database.getInstance()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryBinariesViewHolder {
-        return EntryBinariesViewHolder(inflater.inflate(R.layout.item_attachment, parent, false))
-    }
-
-    override fun onBindViewHolder(holder: EntryBinariesViewHolder, position: Int) {
-        val entryAttachment = entryAttachmentsList[position]
-
-        holder.binaryFileTitle.text = entryAttachment.name
-        holder.binaryFileSize.text = Formatter.formatFileSize(context,
-                entryAttachment.binaryAttachment.length())
-        holder.binaryFileCompression.apply {
-            if (mDatabase.compressionAlgorithm == CompressionAlgorithm.GZip
-                    || entryAttachment.binaryAttachment.isCompressed == true) {
-                text = CompressionAlgorithm.GZip.getName(context.resources)
-                visibility = View.VISIBLE
-            } else {
-                text = ""
-                visibility = View.GONE
-            }
-        }
-        holder.binaryFileProgress.apply {
-            visibility = when (entryAttachment.downloadState) {
-                AttachmentState.NULL, AttachmentState.COMPLETE, AttachmentState.ERROR -> View.GONE
-                AttachmentState.START, AttachmentState.IN_PROGRESS -> View.VISIBLE
-            }
-            progress = entryAttachment.downloadProgression
-        }
-
-        holder.itemView.setOnClickListener {
-            onItemClickListener?.invoke(entryAttachment, position)
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return entryAttachmentsList.size
-    }
-
-    fun updateProgress(entryAttachment: EntryAttachment) {
-        val indexEntryAttachment = entryAttachmentsList.indexOfLast { current -> current.name == entryAttachment.name }
-        if (indexEntryAttachment != -1) {
-            entryAttachmentsList[indexEntryAttachment] = entryAttachment
-            notifyItemChanged(indexEntryAttachment)
-        }
-    }
-
-    fun clear() {
-        entryAttachmentsList.clear()
-    }
-
-    inner class EntryBinariesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-        var binaryFileTitle: TextView = itemView.findViewById(R.id.item_attachment_title)
-        var binaryFileSize: TextView = itemView.findViewById(R.id.item_attachment_size)
-        var binaryFileCompression: TextView = itemView.findViewById(R.id.item_attachment_compression)
-        var binaryFileProgress: ProgressBar = itemView.findViewById(R.id.item_attachment_progress)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.text.format.Formatter
+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.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.ImageViewerActivity
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.model.AttachmentState
+import com.kunzisoft.keepass.model.EntryAttachmentState
+import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import com.kunzisoft.keepass.view.expand
+import kotlin.math.max
+
+
+class EntryAttachmentsItemsAdapter(context: Context)
+    : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {
+
+    var database: Database? = null
+    var onItemClickListener: ((item: EntryAttachmentState)->Unit)? = null
+    var onBinaryPreviewLoaded: ((item: EntryAttachmentState) -> Unit)? = null
+
+    // Approximately
+    private val mImagePreviewMaxWidth = max(
+            context.resources.displayMetrics.widthPixels,
+            context.resources.getDimensionPixelSize(R.dimen.item_file_info_height)
+    )
+    private var mTitleColor: Int
+
+    init {
+        // Get the primary text color of the theme
+        val typedValue = TypedValue()
+        context.theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true)
+        val typedArray: TypedArray = context.obtainStyledAttributes(typedValue.data, intArrayOf(
+                android.R.attr.textColor))
+        mTitleColor = typedArray.getColor(0, -1)
+        typedArray.recycle()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryBinariesViewHolder {
+        return EntryBinariesViewHolder(inflater.inflate(R.layout.item_attachment, parent, false))
+    }
+
+    override fun onBindViewHolder(holder: EntryBinariesViewHolder, position: Int) {
+        val entryAttachmentState = itemsList[position]
+
+        holder.itemView.visibility = View.VISIBLE
+        holder.binaryFileThumbnail.apply {
+            // Perform image loading only if upload is finished
+            if (entryAttachmentState.downloadState != AttachmentState.START
+                    && entryAttachmentState.downloadState != AttachmentState.IN_PROGRESS) {
+                // Show the bitmap image if loaded
+                if (entryAttachmentState.previewState == AttachmentState.NULL) {
+                    entryAttachmentState.previewState = AttachmentState.IN_PROGRESS
+                    // Load the bitmap image
+                    database?.let { database ->
+                        BinaryDatabaseManager.loadBitmap(
+                                database,
+                                entryAttachmentState.attachment.binaryData,
+                                mImagePreviewMaxWidth
+                        ) { imageLoaded ->
+                            if (imageLoaded == null) {
+                                entryAttachmentState.previewState = AttachmentState.ERROR
+                                visibility = View.GONE
+                                onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                            } else {
+                                entryAttachmentState.previewState = AttachmentState.COMPLETE
+                                setImageBitmap(imageLoaded)
+                                if (visibility != View.VISIBLE) {
+                                    expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height)) {
+                                        onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                visibility = View.GONE
+            }
+            this.setOnClickListener {
+                ImageViewerActivity.getInstance(context, entryAttachmentState.attachment)
+            }
+        }
+        holder.binaryFileBroken.apply {
+            setColorFilter(Color.RED)
+            visibility = if (entryAttachmentState.attachment.binaryData.isCorrupted) {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+        }
+        holder.binaryFileTitle.text = entryAttachmentState.attachment.name
+        if (entryAttachmentState.attachment.binaryData.isCorrupted) {
+            holder.binaryFileTitle.setTextColor(Color.RED)
+        } else {
+            holder.binaryFileTitle.setTextColor(mTitleColor)
+        }
+
+        val size = entryAttachmentState.attachment.binaryData.getSize()
+        holder.binaryFileSize.text = Formatter.formatFileSize(context, size)
+        holder.binaryFileCompression.apply {
+            if (entryAttachmentState.attachment.binaryData.isCompressed) {
+                text = CompressionAlgorithm.GZip.getName(context.resources)
+                visibility = View.VISIBLE
+            } else {
+                text = ""
+                visibility = View.GONE
+            }
+        }
+        when (entryAttachmentState.streamDirection) {
+            StreamDirection.UPLOAD -> {
+                holder.binaryFileProgressIcon.isActivated = true
+                when (entryAttachmentState.downloadState) {
+                    AttachmentState.START,
+                    AttachmentState.IN_PROGRESS -> {
+                        holder.binaryFileProgressContainer.visibility = View.VISIBLE
+                        holder.binaryFileProgress.apply {
+                            visibility = View.VISIBLE
+                            progress = entryAttachmentState.downloadProgression
+                        }
+                        holder.binaryFileDeleteButton.apply {
+                            visibility = View.GONE
+                            setOnClickListener(null)
+                        }
+                    }
+                    AttachmentState.NULL,
+                    AttachmentState.ERROR,
+                    AttachmentState.CANCELED,
+                    AttachmentState.COMPLETE -> {
+                        holder.binaryFileProgressContainer.visibility = View.GONE
+                        holder.binaryFileProgress.visibility = View.GONE
+                        holder.binaryFileDeleteButton.apply {
+                            visibility = View.VISIBLE
+                            onBindDeleteButton(holder, this, entryAttachmentState, position)
+                        }
+                    }
+                }
+                holder.binaryFileInfo.setOnClickListener(null)
+            }
+            StreamDirection.DOWNLOAD -> {
+                holder.binaryFileProgressIcon.isActivated = false
+                holder.binaryFileProgressContainer.visibility = View.VISIBLE
+                holder.binaryFileDeleteButton.visibility = View.GONE
+                holder.binaryFileProgress.apply {
+                    visibility = when (entryAttachmentState.downloadState) {
+                        AttachmentState.NULL,
+                        AttachmentState.COMPLETE,
+                        AttachmentState.CANCELED,
+                        AttachmentState.ERROR -> View.GONE
+
+                        AttachmentState.START,
+                        AttachmentState.IN_PROGRESS -> View.VISIBLE
+                    }
+                    progress = entryAttachmentState.downloadProgression
+                }
+                holder.binaryFileInfo.setOnClickListener {
+                    onItemClickListener?.invoke(entryAttachmentState)
+                }
+            }
+        }
+    }
+
+    class EntryBinariesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        var binaryFileThumbnail: ImageView = itemView.findViewById(R.id.item_attachment_thumbnail)
+        var binaryFileInfo: View = itemView.findViewById(R.id.item_attachment_info)
+        var binaryFileBroken: ImageView = itemView.findViewById(R.id.item_attachment_broken)
+        var binaryFileTitle: TextView = itemView.findViewById(R.id.item_attachment_title)
+        var binaryFileSize: TextView = itemView.findViewById(R.id.item_attachment_size)
+        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 binaryFileDeleteButton: View = itemView.findViewById(R.id.item_attachment_delete_button)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -22,31 +22,33 @@ package com.kunzisoft.keepass.adapters
 import android.content.Context
 import android.graphics.Color
 import android.graphics.PorterDuff
+import android.net.Uri
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
-import android.util.TypedValue
-import android.view.*
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.TextView
-import android.widget.ViewSwitcher
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryEntity
-import com.kunzisoft.keepass.utils.FileDatabaseInfo
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.model.DatabaseFile
+import com.kunzisoft.keepass.view.collapse
+import com.kunzisoft.keepass.view.expand

-class FileDatabaseHistoryAdapter(private val context: Context)
+class FileDatabaseHistoryAdapter(context: Context)
    : RecyclerView.Adapter<FileDatabaseHistoryAdapter.FileDatabaseHistoryViewHolder>() {

    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var fileItemOpenListener: ((FileDatabaseHistoryEntity)->Unit)? = null
-    private var fileSelectClearListener: ((FileDatabaseHistoryEntity)->Boolean)? = null
-    private var saveAliasListener: ((FileDatabaseHistoryEntity)->Unit)? = null
+    private var defaultDatabaseListener: ((DatabaseFile?) -> Unit)? = null
+    private var fileItemOpenListener: ((DatabaseFile)->Unit)? = null
+    private var fileSelectClearListener: ((DatabaseFile)->Boolean)? = null
+    private var saveAliasListener: ((DatabaseFile)->Unit)? = null

-    private val listDatabaseFiles = ArrayList<FileDatabaseHistoryEntity>()
+    private val listDatabaseFiles = ArrayList<DatabaseFile>()

-    private var mExpandedPosition = -1
-    private var mPreviousExpandedPosition = -1
+    private var mDefaultDatabaseFile: DatabaseFile? = null
+    private var mExpandedDatabaseFile: DatabaseFile? = null
+    private var mPreviousExpandedDatabaseFile: DatabaseFile? = null

    @ColorInt
    private val defaultColor: Int
@@ -63,43 +65,49 @@ class FileDatabaseHistoryAdapter(private val context: Context)
    }

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FileDatabaseHistoryViewHolder {
-        val view = inflater.inflate(R.layout.item_file_row, parent, false)
+        val view = inflater.inflate(R.layout.item_file_info, parent, false)
        return FileDatabaseHistoryViewHolder(view)
    }

    override fun onBindViewHolder(holder: FileDatabaseHistoryViewHolder, position: Int) {
        // Get info from position
-        val fileHistoryEntity = listDatabaseFiles[position]
-        val fileDatabaseInfo = FileDatabaseInfo(context, fileHistoryEntity.databaseUri)
+        val databaseFile = listDatabaseFiles[position]

        // Click item to open file
-        if (fileItemOpenListener != null)
-            holder.fileContainer.setOnClickListener {
-                fileItemOpenListener?.invoke(fileHistoryEntity)
+        holder.fileContainer.setOnClickListener {
+            fileItemOpenListener?.invoke(databaseFile)
+        }
+
+        // Default database
+        holder.defaultFileButton.apply {
+            this.isChecked = mDefaultDatabaseFile == databaseFile
+            setOnClickListener {
+                defaultDatabaseListener?.invoke(if (isChecked) databaseFile else null)
            }
+        }

        // File alias
-        holder.fileAlias.text = fileDatabaseInfo.retrieveDatabaseAlias(fileHistoryEntity.databaseAlias)
+        holder.fileAlias.text = databaseFile.databaseAlias

        // File path
-        holder.filePath.text = UriUtil.decode(fileDatabaseInfo.fileUri?.toString())
+        holder.filePath.text = databaseFile.databaseDecodedPath

-        if (fileDatabaseInfo.exists) {
-            holder.fileInformation.clearColorFilter()
+        if (databaseFile.databaseFileExists) {
+            holder.fileInformationButton.clearColorFilter()
        } else {
-            holder.fileInformation.setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY)
+            holder.fileInformationButton.setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY)
        }

        // Modification
-        fileDatabaseInfo.getModificationString()?.let {
+        databaseFile.databaseLastModified?.let {
            holder.fileModification.text = it
-            holder.fileModification.visibility = View.VISIBLE
+            holder.fileModificationContainer.visibility = View.VISIBLE
        } ?: run {
-            holder.fileModification.visibility = View.GONE
+            holder.fileModificationContainer.visibility = View.GONE
        }

        // Size
-        fileDatabaseInfo.getSizeString()?.let {
+        databaseFile.databaseSize?.let {
            holder.fileSize.text = it
            holder.fileSize.visibility = View.VISIBLE
        } ?: run {
@@ -107,15 +115,24 @@ class FileDatabaseHistoryAdapter(private val context: Context)
        }

        // Click on information
-        val isExpanded = position == mExpandedPosition
-        //This line hides or shows the layout in question
-        holder.fileExpandContainer.visibility = if (isExpanded) View.VISIBLE else View.GONE
+        val isExpanded = databaseFile == mExpandedDatabaseFile
+        // Hides or shows info
+        holder.fileExpandContainer.apply {
+            if (isExpanded) {
+                if (visibility != View.VISIBLE) {
+                    visibility = View.VISIBLE
+                    expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height))
+                }
+            } else {
+                collapse(true)
+            }
+        }

        // Save alias modification
        holder.fileAliasCloseButton.setOnClickListener {
            // Change the alias
-            fileHistoryEntity.databaseAlias = holder.fileAliasEdit.text.toString()
-            saveAliasListener?.invoke(fileHistoryEntity)
+            databaseFile.databaseAlias = holder.fileAliasEdit.text.toString()
+            saveAliasListener?.invoke(databaseFile)

            // Finish save mode
            holder.fileMainSwitcher.showPrevious()
@@ -130,20 +147,22 @@ class FileDatabaseHistoryAdapter(private val context: Context)
        }

        holder.fileDeleteButton.setOnClickListener {
-            fileSelectClearListener?.invoke(fileHistoryEntity)
+            fileSelectClearListener?.invoke(databaseFile)
        }

        if (isExpanded) {
-            mPreviousExpandedPosition = position
+            mPreviousExpandedDatabaseFile = databaseFile
        }
-
-        holder.fileInformation.setOnClickListener {
-            mExpandedPosition = if (isExpanded) -1 else position
-
-            // Notify change
-            if (mPreviousExpandedPosition < itemCount)
-                notifyItemChanged(mPreviousExpandedPosition)
-            notifyItemChanged(position)
+        holder.fileInformationButton.apply {
+            animate().rotation(if (isExpanded) 180F else 0F).start()
+            setOnClickListener {
+                mExpandedDatabaseFile = if (isExpanded) null else databaseFile
+                // Notify change
+                val previousExpandedPosition = listDatabaseFiles.indexOf(mPreviousExpandedDatabaseFile)
+                notifyItemChanged(previousExpandedPosition)
+                val expandedPosition = listDatabaseFiles.indexOf(mExpandedDatabaseFile)
+                notifyItemChanged(expandedPosition)
+            }
        }

        // Refresh View / Close alias modification if not contains fileAlias
@@ -160,33 +179,68 @@ class FileDatabaseHistoryAdapter(private val context: Context)
        listDatabaseFiles.clear()
    }

-    fun addDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<FileDatabaseHistoryEntity>) {
-        listDatabaseFiles.clear()
-        listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
+    fun addDatabaseFileHistory(fileDatabaseHistoryToAdd: DatabaseFile) {
+        listDatabaseFiles.add(0, fileDatabaseHistoryToAdd)
+        notifyItemInserted(0)
    }

-    fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: FileDatabaseHistoryEntity) {
-        listDatabaseFiles.remove(fileDatabaseHistoryToDelete)
+    fun updateDatabaseFileHistory(fileDatabaseHistoryToUpdate: DatabaseFile) {
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToUpdate)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToUpdate)) {
+            listDatabaseFiles.add(index, fileDatabaseHistoryToUpdate)
+            notifyItemChanged(index)
+        }
    }

-    fun setOnFileDatabaseHistoryOpenListener(listener : ((FileDatabaseHistoryEntity)->Unit)?) {
+    fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: DatabaseFile) {
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToDelete)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToDelete)) {
+            notifyItemRemoved(index)
+        }
+    }
+
+    fun replaceAllDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<DatabaseFile>) {
+        if (listDatabaseFiles.isEmpty()) {
+            listFileDatabaseHistoryToAdd.forEach {
+                listDatabaseFiles.add(it)
+                notifyItemInserted(listDatabaseFiles.size)
+            }
+        } else {
+            listDatabaseFiles.clear()
+            listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun setDefaultDatabase(databaseUri: Uri?) {
+        val defaultDatabaseFile = listDatabaseFiles.firstOrNull { it.databaseUri == databaseUri }
+        mDefaultDatabaseFile = defaultDatabaseFile
+        notifyDataSetChanged()
+    }
+
+    fun setOnDefaultDatabaseListener(listener: ((DatabaseFile?) -> Unit)?) {
+        this.defaultDatabaseListener = listener
+    }
+
+    fun setOnFileDatabaseHistoryOpenListener(listener : ((DatabaseFile)->Unit)?) {
        this.fileItemOpenListener = listener
    }

-    fun setOnFileDatabaseHistoryDeleteListener(listener : ((FileDatabaseHistoryEntity)->Boolean)?) {
+    fun setOnFileDatabaseHistoryDeleteListener(listener : ((DatabaseFile)->Boolean)?) {
        this.fileSelectClearListener = listener
    }

-    fun setOnSaveAliasListener(listener : ((FileDatabaseHistoryEntity)->Unit)?) {
+    fun setOnSaveAliasListener(listener : ((DatabaseFile)->Unit)?) {
        this.saveAliasListener = listener
    }

-    inner class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

        var fileContainer: ViewGroup = itemView.findViewById(R.id.file_container_basic_info)

+        var defaultFileButton: CompoundButton = itemView.findViewById(R.id.default_file_button)
        var fileAlias: TextView = itemView.findViewById(R.id.file_alias)
-        var fileInformation: ImageView = itemView.findViewById(R.id.file_information)
+        var fileInformationButton: ImageView = itemView.findViewById(R.id.file_information_button)

        var fileMainSwitcher: ViewSwitcher = itemView.findViewById(R.id.file_main_switcher)
        var fileAliasEdit: EditText = itemView.findViewById(R.id.file_alias_edit)
@@ -196,6 +250,7 @@ class FileDatabaseHistoryAdapter(private val context: Context)
        var fileModifyButton: ImageView = itemView.findViewById(R.id.file_modify_button)
        var fileDeleteButton: ImageView = itemView.findViewById(R.id.file_delete_button)
        var filePath: TextView = itemView.findViewById(R.id.file_path)
+        var fileModificationContainer: ViewGroup = itemView.findViewById(R.id.file_modification_container)
        var fileModification: TextView = itemView.findViewById(R.id.file_modification)
        var fileSize: TextView = itemView.findViewById(R.id.file_size)
    }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerAdapter.kt
@@ -0,0 +1,121 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.icon.IconImageDraw
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+
+class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tintIcon: Int)
+    : RecyclerView.Adapter<IconPickerAdapter<I>.CustomIconViewHolder>() {
+
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+
+    private val iconList = ArrayList<I>()
+
+    var iconDrawableFactory: IconDrawableFactory? = null
+    var iconPickerListener: IconPickerListener<I>? = null
+
+    val lastPosition: Int
+        get() = iconList.lastIndex
+
+    fun addIcon(icon: I, notify: Boolean = true) {
+        if (!iconList.contains(icon)) {
+            iconList.add(icon)
+            if (notify) {
+                notifyItemInserted(iconList.indexOf(icon))
+            }
+        }
+    }
+
+    fun updateIcon(icon: I) {
+        val index = iconList.indexOf(icon)
+        if (index != -1) {
+            iconList[index] = icon
+            notifyItemChanged(index)
+        }
+    }
+
+    fun updateIconSelectedState(icons: List<I>) {
+        icons.forEach { icon ->
+            val index = iconList.indexOf(icon)
+            if (index != -1
+                    && iconList[index].selected != icon.selected) {
+                iconList[index] = icon
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun removeIcon(icon: I) {
+        if (iconList.contains(icon)) {
+            val position = iconList.indexOf(icon)
+            iconList.remove(icon)
+            notifyItemRemoved(position)
+        }
+    }
+
+    fun containsAnySelectedIcon(): Boolean {
+        return iconList.firstOrNull { it.selected } != null
+    }
+
+    fun deselectAllIcons() {
+        iconList.forEachIndexed { index, icon ->
+            if (icon.selected) {
+                icon.selected = false
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun getSelectedIcons(): List<I> {
+        return iconList.filter { it.selected }
+    }
+
+    fun clear() {
+        iconList.clear()
+    }
+
+    fun setList(icons: List<I>) {
+        iconList.clear()
+        icons.forEach { iconImage ->
+            iconList.add(iconImage)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomIconViewHolder {
+        val view = inflater.inflate(R.layout.item_icon, parent, false)
+        return CustomIconViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: CustomIconViewHolder, position: Int) {
+        val icon = iconList[position]
+        iconDrawableFactory?.assignDatabaseIcon(holder.iconImageView, icon, tintIcon)
+        holder.iconContainerView.isSelected = icon.selected
+        holder.itemView.setOnClickListener {
+            iconPickerListener?.onIconClickListener(icon)
+        }
+        holder.itemView.setOnLongClickListener {
+            iconPickerListener?.onIconLongClickListener(icon)
+            true
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return iconList.size
+    }
+
+    interface IconPickerListener<I: IconImageDraw> {
+        fun onIconClickListener(icon: I)
+        fun onIconLongClickListener(icon: I)
+    }
+
+    inner class CustomIconViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var iconContainerView: ViewGroup = itemView.findViewById(R.id.icon_container)
+        var iconImageView: ImageView = itemView.findViewById(R.id.icon_image)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerPagerAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/IconPickerPagerAdapter.kt
@@ -0,0 +1,24 @@
+package com.kunzisoft.keepass.adapters
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.kunzisoft.keepass.activities.fragments.IconCustomFragment
+import com.kunzisoft.keepass.activities.fragments.IconStandardFragment
+
+class IconPickerPagerAdapter(fragment: Fragment, val size: Int)
+    : FragmentStateAdapter(fragment) {
+
+    private val iconStandardFragment = IconStandardFragment()
+    private val iconCustomFragment = IconCustomFragment()
+
+    override fun getItemCount(): Int {
+        return size
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return when (position) {
+            1 -> iconCustomFragment
+            else -> iconStandardFragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
@@ -28,6 +28,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -39,7 +40,6 @@ import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.setTextSize
 import com.kunzisoft.keepass.view.strikeOut
@@ -52,72 +52,67 @@ import java.util.*
 class NodeAdapter (private val context: Context)
    : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {

-    private var nodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
-    private val nodeSortedListCallback: NodeSortedListCallback
-    private val nodeSortedList: SortedList<Node>
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
+    private val mNodeSortedListCallback: NodeSortedListCallback
+    private val mNodeSortedList: SortedList<Node>
+    private val mInflater: LayoutInflater = LayoutInflater.from(context)

-    private var calculateViewTypeTextSize = Array(2) { true} // number of view type
-    private var textSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
-    private var prefSizeMultiplier: Float = 0F
-    private var subtextDefaultDimension: Float = 0F
-    private var infoTextDefaultDimension: Float = 0F
-    private var numberChildrenTextDefaultDimension: Float = 0F
-    private var iconDefaultDimension: Float = 0F
+    private var mCalculateViewTypeTextSize = Array(2) { true } // number of view type
+    private var mTextSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
+    private var mPrefSizeMultiplier: Float = 0F
+    private var mSubtextDefaultDimension: Float = 0F
+    private var mInfoTextDefaultDimension: Float = 0F
+    private var mNumberChildrenTextDefaultDimension: Float = 0F
+    private var mIconDefaultDimension: Float = 0F

-    private var showUserNames: Boolean = true
-    private var showNumberEntries: Boolean = true
-    private var entryFilters = arrayOf<Group.ChildFilter>()
+    private var mShowUserNames: Boolean = true
+    private var mShowNumberEntries: Boolean = true
+    private var mEntryFilters = arrayOf<Group.ChildFilter>()

-    private var actionNodesList = LinkedList<Node>()
-    private var nodeClickCallback: NodeClickCallback? = null
+    private var mActionNodesList = LinkedList<Node>()
+    private var mNodeClickCallback: NodeClickCallback? = null

    private val mDatabase: Database

    @ColorInt
-    private val contentSelectionColor: Int
+    private val mContentSelectionColor: Int
    @ColorInt
-    private val iconGroupColor: Int
+    private val mIconGroupColor: Int
    @ColorInt
-    private val iconEntryColor: Int
+    private val mIconEntryColor: Int

    /**
     * Determine if the adapter contains or not any element
     * @return true if the list is empty
     */
    val isEmpty: Boolean
-        get() = nodeSortedList.size() <= 0
+        get() = mNodeSortedList.size() <= 0

    init {
-        this.infoTextDefaultDimension = context.resources.getDimension(R.dimen.list_medium_size_default)
-        this.subtextDefaultDimension = context.resources.getDimension(R.dimen.list_small_size_default)
-        this.numberChildrenTextDefaultDimension = context.resources.getDimension(R.dimen.list_tiny_size_default)
-        this.iconDefaultDimension = context.resources.getDimension(R.dimen.list_icon_size_default)
+        this.mIconDefaultDimension = context.resources.getDimension(R.dimen.list_icon_size_default)

        assignPreferences()

-        this.nodeSortedListCallback = NodeSortedListCallback()
-        this.nodeSortedList = SortedList(Node::class.java, nodeSortedListCallback)
+        this.mNodeSortedListCallback = NodeSortedListCallback()
+        this.mNodeSortedList = SortedList(Node::class.java, mNodeSortedListCallback)

        // Database
        this.mDatabase = Database.getInstance()

        // Color of content selection
-        val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        this.contentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
-        taContentSelectionColor.recycle()
+        this.mContentSelectionColor = ContextCompat.getColor(context, R.color.white)
        // Retrieve the color to tint the icon
        val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
-        this.iconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
+        this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
        taTextColorPrimary.recycle()
        // In two times to fix bug compilation
        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        this.iconEntryColor = taTextColor.getColor(0, Color.BLACK)
+        this.mIconEntryColor = taTextColor.getColor(0, Color.BLACK)
        taTextColor.recycle()
    }

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

        notifyChangeSort(
                PreferencesUtil.getListSort(context),
@@ -128,13 +123,13 @@ class NodeAdapter (private val context: Context)
                        )
                )

-        this.showUserNames = PreferencesUtil.showUsernamesListEntries(context)
-        this.showNumberEntries = PreferencesUtil.showNumberEntries(context)
+        this.mShowUserNames = PreferencesUtil.showUsernamesListEntries(context)
+        this.mShowNumberEntries = PreferencesUtil.showNumberEntries(context)

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

        // Reinit textSize for all view type
-        calculateViewTypeTextSize.forEachIndexed { index, _ -> calculateViewTypeTextSize[index] = true }
+        mCalculateViewTypeTextSize.forEachIndexed { index, _ -> mCalculateViewTypeTextSize[index] = true }
    }

    /**
@@ -142,12 +137,12 @@ class NodeAdapter (private val context: Context)
     */
    fun rebuildList(group: Group) {
        assignPreferences()
-        nodeSortedList.replaceAll(group.getFilteredChildren(entryFilters))
+        mNodeSortedList.replaceAll(group.getFilteredChildren(mEntryFilters))
    }

    private inner class NodeSortedListCallback: SortedListAdapterCallback<Node>(this) {
        override fun compare(item1: Node, item2: Node): Int {
-            return nodeComparator!!.compare(item1, item2)
+            return mNodeComparator!!.compare(item1, item2)
        }

        override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
@@ -162,7 +157,7 @@ class NodeAdapter (private val context: Context)
    }

    fun contains(node: Node): Boolean {
-        return nodeSortedList.indexOf(node) != SortedList.INVALID_POSITION
+        return mNodeSortedList.indexOf(node) != SortedList.INVALID_POSITION
    }

    /**
@@ -170,7 +165,7 @@ class NodeAdapter (private val context: Context)
     * @param node Node to add
     */
    fun addNode(node: Node) {
-        nodeSortedList.add(node)
+        mNodeSortedList.add(node)
    }

    /**
@@ -178,7 +173,7 @@ class NodeAdapter (private val context: Context)
     * @param nodes Nodes to add
     */
    fun addNodes(nodes: List<Node>) {
-        nodeSortedList.addAll(nodes)
+        mNodeSortedList.addAll(nodes)
    }

    /**
@@ -186,7 +181,7 @@ class NodeAdapter (private val context: Context)
     * @param node Node to delete
     */
    fun removeNode(node: Node) {
-        nodeSortedList.remove(node)
+        mNodeSortedList.remove(node)
    }

    /**
@@ -195,7 +190,7 @@ class NodeAdapter (private val context: Context)
     */
    fun removeNodes(nodes: List<Node>) {
        nodes.forEach { node ->
-            nodeSortedList.remove(node)
+            mNodeSortedList.remove(node)
        }
    }

@@ -203,9 +198,9 @@ class NodeAdapter (private val context: Context)
     * Remove a node at [position] in the list
     */
    fun removeNodeAt(position: Int) {
-        nodeSortedList.removeItemAt(position)
+        mNodeSortedList.removeItemAt(position)
        // Refresh all the next items
-        notifyItemRangeChanged(position, nodeSortedList.size() - position)
+        notifyItemRangeChanged(position, mNodeSortedList.size() - position)
    }

    /**
@@ -226,10 +221,10 @@ class NodeAdapter (private val context: Context)
     * @param newNode Node after the update
     */
    fun updateNode(oldNode: Node, newNode: Node) {
-        nodeSortedList.beginBatchedUpdates()
-        nodeSortedList.remove(oldNode)
-        nodeSortedList.add(newNode)
-        nodeSortedList.endBatchedUpdates()
+        mNodeSortedList.beginBatchedUpdates()
+        mNodeSortedList.remove(oldNode)
+        mNodeSortedList.add(newNode)
+        mNodeSortedList.endBatchedUpdates()
    }

    /**
@@ -238,30 +233,30 @@ class NodeAdapter (private val context: Context)
     * @param newNodes Node after the update
     */
    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
-        nodeSortedList.beginBatchedUpdates()
+        mNodeSortedList.beginBatchedUpdates()
        oldNodes.forEach { oldNode ->
-            nodeSortedList.remove(oldNode)
+            mNodeSortedList.remove(oldNode)
        }
-        nodeSortedList.addAll(newNodes)
-        nodeSortedList.endBatchedUpdates()
+        mNodeSortedList.addAll(newNodes)
+        mNodeSortedList.endBatchedUpdates()
    }

    fun notifyNodeChanged(node: Node) {
-        notifyItemChanged(nodeSortedList.indexOf(node))
+        notifyItemChanged(mNodeSortedList.indexOf(node))
    }

    fun setActionNodes(actionNodes: List<Node>) {
-        this.actionNodesList.apply {
+        this.mActionNodesList.apply {
            clear()
            addAll(actionNodes)
        }
    }

    fun unselectActionNodes() {
-        actionNodesList.forEach {
-            notifyItemChanged(nodeSortedList.indexOf(it))
+        mActionNodesList.forEach {
+            notifyItemChanged(mNodeSortedList.indexOf(it))
        }
-        this.actionNodesList.apply {
+        this.mActionNodesList.apply {
            clear()
        }
    }
@@ -271,49 +266,55 @@ class NodeAdapter (private val context: Context)
     */
    fun notifyChangeSort(sortNodeEnum: SortNodeEnum,
                         sortNodeParameters: SortNodeEnum.SortNodeParameters) {
-        this.nodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
+        this.mNodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
    }

    override fun getItemViewType(position: Int): Int {
-        return nodeSortedList.get(position).type.ordinal
+        return mNodeSortedList.get(position).type.ordinal
    }

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NodeViewHolder {
        val view: View = if (viewType == Type.GROUP.ordinal) {
-            inflater.inflate(R.layout.item_list_nodes_group, parent, false)
+            mInflater.inflate(R.layout.item_list_nodes_group, parent, false)
        } else {
-            inflater.inflate(R.layout.item_list_nodes_entry, parent, false)
+            mInflater.inflate(R.layout.item_list_nodes_entry, parent, false)
        }
-        return NodeViewHolder(view)
+        val nodeViewHolder = NodeViewHolder(view)
+        mInfoTextDefaultDimension = nodeViewHolder.text.textSize
+        mSubtextDefaultDimension = nodeViewHolder.subText.textSize
+        nodeViewHolder.numberChildren?.let {
+            mNumberChildrenTextDefaultDimension = it.textSize
+        }
+        return nodeViewHolder
    }

    override fun onBindViewHolder(holder: NodeViewHolder, position: Int) {
-        val subNode = nodeSortedList.get(position)
+        val subNode = mNodeSortedList.get(position)

        // Node selection
-        holder.container.isSelected = actionNodesList.contains(subNode)
+        holder.container.isSelected = mActionNodesList.contains(subNode)

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

        // Assign text
        holder.text.apply {
            text = subNode.title
-            setTextSize(textSizeUnit, infoTextDefaultDimension, prefSizeMultiplier)
+            setTextSize(mTextSizeUnit, mInfoTextDefaultDimension, mPrefSizeMultiplier)
            strikeOut(subNode.isCurrentlyExpires)
        }
        // Add subText with username
@@ -331,24 +332,27 @@ class NodeAdapter (private val context: Context)
            holder.text.text = entry.getVisualTitle()
            holder.subText.apply {
                val username = entry.username
-                if (showUserNames && username.isNotEmpty()) {
+                if (mShowUserNames && username.isNotEmpty()) {
                    visibility = View.VISIBLE
                    text = username
-                    setTextSize(textSizeUnit, subtextDefaultDimension, prefSizeMultiplier)
+                    setTextSize(mTextSizeUnit, mSubtextDefaultDimension, mPrefSizeMultiplier)
                }
            }

+            holder.attachmentIcon?.visibility =
+                    if (entry.containsAttachment()) View.VISIBLE else View.GONE
+
            mDatabase.stopManageEntry(entry)
        }

        // Add number of entries in groups
        if (subNode.type == Type.GROUP) {
-            if (showNumberEntries) {
+            if (mShowNumberEntries) {
                holder.numberChildren?.apply {
                    text = (subNode as Group)
-                            .getNumberOfChildEntries(entryFilters)
+                            .getNumberOfChildEntries(mEntryFilters)
                            .toString()
-                    setTextSize(textSizeUnit, numberChildrenTextDefaultDimension, prefSizeMultiplier)
+                    setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                    visibility = View.VISIBLE
                }
            } else {
@@ -358,22 +362,22 @@ class NodeAdapter (private val context: Context)

        // Assign click
        holder.container.setOnClickListener {
-            nodeClickCallback?.onNodeClick(subNode)
+            mNodeClickCallback?.onNodeClick(subNode)
        }
        holder.container.setOnLongClickListener {
-            nodeClickCallback?.onNodeLongClick(subNode) ?: false
+            mNodeClickCallback?.onNodeLongClick(subNode) ?: false
        }
    }
    
    override fun getItemCount(): Int {
-        return nodeSortedList.size()
+        return mNodeSortedList.size()
    }

    /**
     * Assign a listener when a node is clicked
     */
    fun setOnNodeClickListener(nodeClickCallback: NodeClickCallback?) {
-        this.nodeClickCallback = nodeClickCallback
+        this.mNodeClickCallback = nodeClickCallback
    }

    /**
@@ -391,6 +395,7 @@ class NodeAdapter (private val context: Context)
        var text: TextView = itemView.findViewById(R.id.node_text)
        var subText: TextView = itemView.findViewById(R.id.node_subtext)
        var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
+        var attachmentIcon: ImageView? = itemView.findViewById(R.id.node_attachment_icon)
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
@@ -36,7 +36,6 @@ import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.strikeOut

@@ -46,7 +45,8 @@ class SearchEntryCursorAdapter(private val context: Context,

    private val cursorInflater: LayoutInflater? = context.getSystemService(
            Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
-    private var displayUsername: Boolean = false
+    private var mDisplayUsername: Boolean = false
+    private var mOmitBackup: Boolean = true
    private val iconColor: Int

    init {
@@ -59,7 +59,8 @@ class SearchEntryCursorAdapter(private val context: Context,
    }

    fun reInit(context: Context) {
-        this.displayUsername = PreferencesUtil.showUsernamesListEntries(context)
+        this.mDisplayUsername = PreferencesUtil.showUsernamesListEntries(context)
+        this.mOmitBackup = PreferencesUtil.omitBackup(context)
    }

    override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
@@ -79,10 +80,9 @@ class SearchEntryCursorAdapter(private val context: Context,
            val viewHolder = view.tag as ViewHolder

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

            // Assign title
            viewHolder.textViewTitle?.apply {
@@ -93,11 +93,12 @@ class SearchEntryCursorAdapter(private val context: Context,
            // Assign subtitle
            viewHolder.textViewSubTitle?.apply {
                val entryUsername = currentEntry.username
-                text = if (displayUsername && entryUsername.isNotEmpty()) {
+                text = if (mDisplayUsername && entryUsername.isNotEmpty()) {
                    String.format("(%s)", entryUsername)
                } else {
                    ""
                }
+                visibility = if (text.isEmpty()) View.GONE else View.VISIBLE
                strikeOut(currentEntry.isCurrentlyExpires)
            }
        }
@@ -107,10 +108,24 @@ class SearchEntryCursorAdapter(private val context: Context,
        return database.createEntry()?.apply {
            database.startManageEntry(this)
            entryKDB?.let { entryKDB ->
-                (cursor as EntryCursorKDB).populateEntry(entryKDB, database.iconFactory)
+                (cursor as EntryCursorKDB).populateEntry(entryKDB,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
            }
            entryKDBX?.let { entryKDBX ->
-                (cursor as EntryCursorKDBX).populateEntry(entryKDBX, database.iconFactory)
+                (cursor as EntryCursorKDBX).populateEntry(entryKDBX,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
            }
            database.stopManageEntry(this)
        }
@@ -129,7 +144,9 @@ class SearchEntryCursorAdapter(private val context: Context,
        if (database.type == DatabaseKDBX.TYPE)
            cursorKDBX = EntryCursorKDBX()

-        val searchGroup = database.createVirtualGroupFromSearch(query, SearchHelper.MAX_SEARCH_ENTRY)
+        val searchGroup = database.createVirtualGroupFromSearch(query,
+                mOmitBackup,
+                SearchHelper.MAX_SEARCH_ENTRY)
        if (searchGroup != null) {
            // Search in hide entries but not meta-stream
            for (entry in searchGroup.getFilteredChildEntries(Group.ChildFilter.getDefaults(context))) {
@@ -156,8 +173,8 @@ class SearchEntryCursorAdapter(private val context: Context,
    }

    private class ViewHolder {
-        internal var imageViewIcon: ImageView? = null
-        internal var textViewTitle: TextView? = null
-        internal var textViewSubTitle: TextView? = null
+        var imageViewIcon: ImageView? = null
+        var textViewTitle: TextView? = null
+        var textViewSubTitle: TextView? = null
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/App.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/App.kt
@@ -22,18 +22,19 @@ package com.kunzisoft.keepass.app
 import androidx.multidex.MultiDexApplication
 import com.kunzisoft.keepass.activities.stylish.Stylish
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.utils.UriUtil

 class App : MultiDexApplication() {

    override fun onCreate() {
        super.onCreate()

-        Stylish.init(this)
+        Stylish.load(this)
        PRNGFixes.apply()
    }

    override fun onTerminate() {
-        Database.getInstance().closeAndClear(applicationContext.filesDir)
+        Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this))
        super.onTerminate()
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
@@ -19,27 +19,101 @@
 */
 package com.kunzisoft.keepass.app.database

+import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
 import android.net.Uri
+import android.os.IBinder
+import android.util.Log
+import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
+import java.util.*

-class CipherDatabaseAction(applicationContext: Context) {
+class CipherDatabaseAction(context: Context) {

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

+    // Temp DAO to easily remove content if object no longer in memory
+    private var useTempDao = PreferencesUtil.isTempAdvancedUnlockEnable(applicationContext)
+
+    private val mIntentAdvancedUnlockService = Intent(applicationContext,
+            AdvancedUnlockNotificationService::class.java)
+    private var mBinder: AdvancedUnlockNotificationService.AdvancedUnlockBinder? = null
+    private var mServiceConnection: ServiceConnection? = null
+
+    private var mDatabaseListeners = LinkedList<DatabaseListener>()
+
+    fun reloadPreferences() {
+        useTempDao = PreferencesUtil.isTempAdvancedUnlockEnable(applicationContext)
+    }
+
+    @Synchronized
+    private fun attachService(performedAction: () -> Unit) {
+        // Check if a service is currently running else do nothing
+        if (mBinder != null) {
+            performedAction.invoke()
+        } else if (mServiceConnection == null) {
+            mServiceConnection = object : ServiceConnection {
+                override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
+                    mBinder = (serviceBinder as AdvancedUnlockNotificationService.AdvancedUnlockBinder)
+                    performedAction.invoke()
+                }
+
+                override fun onServiceDisconnected(name: ComponentName?) {
+                    mBinder = null
+                    mServiceConnection = null
+                    mDatabaseListeners.forEach {
+                        it.onDatabaseCleared()
+                    }
+                }
+            }
+            applicationContext.bindService(mIntentAdvancedUnlockService,
+                    mServiceConnection!!,
+                    Context.BIND_ABOVE_CLIENT)
+            if (mBinder == null) {
+                try {
+                    applicationContext.startService(mIntentAdvancedUnlockService)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to start cipher action", e)
+                }
+            }
+        }
+    }
+
+    fun registerDatabaseListener(listener: DatabaseListener) {
+        mDatabaseListeners.add(listener)
+    }
+
+    fun unregisterDatabaseListener(listener: DatabaseListener) {
+        mDatabaseListeners.remove(listener)
+    }
+
+    interface DatabaseListener {
+        fun onDatabaseCleared()
+    }
+
    fun getCipherDatabase(databaseUri: Uri,
                          cipherDatabaseResultListener: (CipherDatabaseEntity?) -> Unit) {
-        ActionDatabaseAsyncTask(
-                {
-                    cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
-                },
-                {
-                    cipherDatabaseResultListener.invoke(it)
-                }
-        ).execute()
+        if (useTempDao) {
+            attachService {
+                cipherDatabaseResultListener.invoke(mBinder?.getCipherDatabase(databaseUri))
+            }
+        } else {
+            IOActionTask(
+                    {
+                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
+                    },
+                    {
+                        cipherDatabaseResultListener.invoke(it)
+                    }
+            ).execute()
+        }
    }

    fun containsCipherDatabase(databaseUri: Uri,
@@ -51,42 +125,60 @@ class CipherDatabaseAction(applicationContext: Context) {

    fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
                                  cipherDatabaseResultListener: (() -> Unit)? = null) {
-        ActionDatabaseAsyncTask(
-                {
-                    val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
-
-                    // Update values if element not yet in the database
-                    if (cipherDatabaseRetrieve == null) {
-                        cipherDatabaseDao.add(cipherDatabaseEntity)
-                    } else {
-                        cipherDatabaseDao.update(cipherDatabaseEntity)
+        if (useTempDao) {
+            attachService {
+                mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
+                cipherDatabaseResultListener?.invoke()
+            }
+        } else {
+            IOActionTask(
+                    {
+                        val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
+                        // Update values if element not yet in the database
+                        if (cipherDatabaseRetrieve == null) {
+                            cipherDatabaseDao.add(cipherDatabaseEntity)
+                        } else {
+                            cipherDatabaseDao.update(cipherDatabaseEntity)
+                        }
+                    },
+                    {
+                        cipherDatabaseResultListener?.invoke()
                    }
-                },
-                {
-                    cipherDatabaseResultListener?.invoke()
-                }
-        ).execute()
+            ).execute()
+        }
    }

    fun deleteByDatabaseUri(databaseUri: Uri,
                            cipherDatabaseResultListener: (() -> Unit)? = null) {
-        ActionDatabaseAsyncTask(
-                {
-                    cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
-                },
-                {
-                    cipherDatabaseResultListener?.invoke()
-                }
-        ).execute()
+        if (useTempDao) {
+            attachService {
+                mBinder?.deleteByDatabaseUri(databaseUri)
+                cipherDatabaseResultListener?.invoke()
+            }
+        } else {
+            IOActionTask(
+                    {
+                        cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
+                    },
+                    {
+                        cipherDatabaseResultListener?.invoke()
+                    }
+            ).execute()
+        }
    }

    fun deleteAll() {
-        ActionDatabaseAsyncTask(
+        attachService {
+            mBinder?.deleteAll()
+        }
+        IOActionTask(
                {
                    cipherDatabaseDao.deleteAll()
                }
        ).execute()
    }

-    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction)
+    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction) {
+        private val TAG = CipherDatabaseAction::class.java.name
+    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseEntity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseEntity.kt
@@ -43,6 +43,11 @@ data class CipherDatabaseEntity(
            parcel.readString()!!,
            parcel.readString()!!)

+    fun replaceContent(copy: CipherDatabaseEntity) {
+        this.encryptedValue = copy.encryptedValue
+        this.specParameters = copy.specParameters
+    }
+
    override fun writeToParcel(parcel: Parcel, flags: Int) {
        parcel.writeString(databaseUri)
        parcel.writeString(encryptedValue)
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt
@@ -21,31 +21,45 @@ package com.kunzisoft.keepass.app.database

 import android.content.Context
 import android.net.Uri
+import android.util.Log
+import com.kunzisoft.keepass.model.DatabaseFile
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
 import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.viewmodels.FileDatabaseInfo

-class FileDatabaseHistoryAction(applicationContext: Context) {
+class FileDatabaseHistoryAction(private val applicationContext: Context) {

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

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

    fun getKeyFileUriByDatabaseUri(databaseUri: Uri,
                                   keyFileUriResultListener: (Uri?) -> Unit) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                {
                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
                },
@@ -59,61 +73,124 @@ class FileDatabaseHistoryAction(applicationContext: Context) {
        ).execute()
    }

-    fun getAllFileDatabaseHistories(fileHistoryResultListener: (fileDatabaseHistoryResult: List<FileDatabaseHistoryEntity>?) -> Unit) {
-        ActionDatabaseAsyncTask(
+    fun getDatabaseFileList(databaseFileListResult: (List<DatabaseFile>) -> Unit) {
+        IOActionTask(
                {
-                    databaseFileHistoryDao.getAll()
+                    val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(applicationContext)
+                    // Show only uri accessible
+                    val databaseFileListLoaded = ArrayList<DatabaseFile>()
+                    databaseFileHistoryDao.getAll().forEach { fileDatabaseHistoryEntity ->
+                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext, fileDatabaseHistoryEntity.databaseUri)
+                        if (hideBrokenLocations && fileDatabaseInfo.exists
+                                || !hideBrokenLocations) {
+                            databaseFileListLoaded.add(
+                                    DatabaseFile(
+                                            UriUtil.parse(fileDatabaseHistoryEntity.databaseUri),
+                                            UriUtil.parse(fileDatabaseHistoryEntity.keyFileUri),
+                                            UriUtil.decode(fileDatabaseHistoryEntity.databaseUri),
+                                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias),
+                                            fileDatabaseInfo.exists,
+                                            fileDatabaseInfo.getLastModificationString(),
+                                            fileDatabaseInfo.getSizeString()
+                                    )
+                            )
+                        }
+                    }
+                    databaseFileListLoaded
                },
                {
-                    fileHistoryResultListener.invoke(it)
-                }
-        ).execute()
-    }
-
-    fun addOrUpdateDatabaseUri(databaseUri: Uri, keyFileUri: Uri? = null) {
-        addOrUpdateFileDatabaseHistory(FileDatabaseHistoryEntity(
-                databaseUri.toString(),
-                "",
-                keyFileUri?.toString(),
-                System.currentTimeMillis()
-        ), true)
-    }
-
-    fun addOrUpdateFileDatabaseHistory(fileDatabaseHistory: FileDatabaseHistoryEntity, unmodifiedAlias: Boolean = false) {
-        ActionDatabaseAsyncTask(
-                {
-                    val fileDatabaseHistoryRetrieve = databaseFileHistoryDao.getByDatabaseUri(fileDatabaseHistory.databaseUri)
-
-                    if (unmodifiedAlias) {
-                        fileDatabaseHistory.databaseAlias = fileDatabaseHistoryRetrieve?.databaseAlias ?: ""
-                    }
-                    // Update values if history element not yet in the database
-                    if (fileDatabaseHistoryRetrieve == null) {
-                        databaseFileHistoryDao.add(fileDatabaseHistory)
-                    } else {
-                        databaseFileHistoryDao.update(fileDatabaseHistory)
+                    databaseFileList ->
+                    databaseFileList?.let {
+                        databaseFileListResult.invoke(it)
                    }
                }
        ).execute()
    }

-    fun deleteFileDatabaseHistory(fileDatabaseHistory: FileDatabaseHistoryEntity,
-                                  fileHistoryDeletedResult: (FileDatabaseHistoryEntity?) -> Unit) {
-        ActionDatabaseAsyncTask(
+    fun addOrUpdateDatabaseUri(databaseUri: Uri, keyFileUri: Uri? = null,
+                               databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
+        addOrUpdateDatabaseFile(DatabaseFile(
+                databaseUri,
+                keyFileUri
+        ), databaseFileAddedOrUpdatedResult)
+    }
+
+    fun addOrUpdateDatabaseFile(databaseFileToAddOrUpdate: DatabaseFile,
+                                databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
+        IOActionTask(
                {
-                    databaseFileHistoryDao.delete(fileDatabaseHistory)
+                    databaseFileToAddOrUpdate.databaseUri?.let { databaseUri ->
+                        // Try to get info in database first
+                        val fileDatabaseHistoryRetrieve = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+
+                        // Complete alias if not exists
+                        val fileDatabaseHistory = FileDatabaseHistoryEntity(
+                                databaseUri.toString(),
+                                databaseFileToAddOrUpdate.databaseAlias
+                                        ?: fileDatabaseHistoryRetrieve?.databaseAlias
+                                        ?: "",
+                                databaseFileToAddOrUpdate.keyFileUri?.toString(),
+                                System.currentTimeMillis()
+                        )
+
+                        // Update values if history element not yet in the database
+                        try {
+                            if (fileDatabaseHistoryRetrieve == null) {
+                                    databaseFileHistoryDao.add(fileDatabaseHistory)
+                            } else {
+                                databaseFileHistoryDao.update(fileDatabaseHistory)
+                            }
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Unable to add or update database history", e)
+                        }
+
+                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext,
+                                fileDatabaseHistory.databaseUri)
+                        DatabaseFile(
+                                UriUtil.parse(fileDatabaseHistory.databaseUri),
+                                UriUtil.parse(fileDatabaseHistory.keyFileUri),
+                                UriUtil.decode(fileDatabaseHistory.databaseUri),
+                                fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias),
+                                fileDatabaseInfo.exists,
+                                fileDatabaseInfo.getLastModificationString(),
+                                fileDatabaseInfo.getSizeString()
+                        )
+                    }
                },
                {
-                    if (it != null && it > 0)
-                        fileHistoryDeletedResult.invoke(fileDatabaseHistory)
-                    else
-                        fileHistoryDeletedResult.invoke(null)
+                    databaseFileAddedOrUpdatedResult?.invoke(it)
+                }
+        ).execute()
+    }
+
+    fun deleteDatabaseFile(databaseFileToDelete: DatabaseFile,
+                           databaseFileDeletedResult: (DatabaseFile?) -> Unit) {
+        IOActionTask(
+                {
+                    databaseFileToDelete.databaseUri?.let { databaseUri ->
+                        databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())?.let { fileDatabaseHistory ->
+                            val returnValue = databaseFileHistoryDao.delete(fileDatabaseHistory)
+                            if (returnValue > 0) {
+                                DatabaseFile(
+                                        UriUtil.parse(fileDatabaseHistory.databaseUri),
+                                        UriUtil.parse(fileDatabaseHistory.keyFileUri),
+                                        UriUtil.decode(fileDatabaseHistory.databaseUri),
+                                        databaseFileToDelete.databaseAlias
+                                )
+                            } else {
+                                null
+                            }
+                        }
+                    }
+                },
+                {
+                    databaseFileDeletedResult.invoke(it)
                }
        ).execute()
    }

    fun deleteKeyFileByDatabaseUri(databaseUri: Uri) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                {
                    databaseFileHistoryDao.deleteKeyFileByDatabaseUri(databaseUri.toString())
                }
@@ -121,7 +198,7 @@ class FileDatabaseHistoryAction(applicationContext: Context) {
    }

    fun deleteAllKeyFiles() {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                {
                    databaseFileHistoryDao.deleteAllKeyFiles()
                }
@@ -129,12 +206,14 @@ class FileDatabaseHistoryAction(applicationContext: Context) {
    }

    fun deleteAll() {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                {
                    databaseFileHistoryDao.deleteAll()
                }
        ).execute()
    }

-    companion object : SingletonHolderParameter<FileDatabaseHistoryAction, Context>(::FileDatabaseHistoryAction)
+    companion object : SingletonHolderParameter<FileDatabaseHistoryAction, Context>(::FileDatabaseHistoryAction) {
+        private val TAG = FileDatabaseHistoryAction::class.java.name
+    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/IOActionTask.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/IOActionTask.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.app.database
+
+import kotlinx.coroutines.*
+
+/**
+ * Class to invoke action in a separate IO thread
+ */
+class IOActionTask<T>(
+        private val action: () -> T ,
+        private val afterActionDatabaseListener: ((T?) -> Unit)? = null) {
+
+    private val mainScope = CoroutineScope(Dispatchers.Main)
+
+    fun execute() {
+        mainScope.launch {
+            withContext(Dispatchers.IO) {
+                val asyncResult: Deferred<T?> = async {
+                        try {
+                            action.invoke()
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                            null
+                        }
+                }
+                withContext(Dispatchers.Main) {
+                    afterActionDatabaseListener?.invoke(asyncResult.await())
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillComponent.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillComponent.kt
@@ -0,0 +1,7 @@
+package com.kunzisoft.keepass.autofill
+
+import android.app.assist.AssistStructure
+import android.view.inputmethod.InlineSuggestionsRequest
+
+data class AutofillComponent(val assistStructure: AssistStructure,
+                             val inlineSuggestionsRequest: InlineSuggestionsRequest?)
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
@@ -19,27 +19,37 @@
 */
 package com.kunzisoft.keepass.autofill

+import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.PendingIntent
 import android.app.assist.AssistStructure
 import android.content.Context
 import android.content.Intent
+import android.graphics.BlendMode
+import android.graphics.drawable.Icon
 import android.os.Build
 import android.service.autofill.Dataset
 import android.service.autofill.FillResponse
+import android.service.autofill.InlinePresentation
 import android.util.Log
 import android.view.autofill.AutofillManager
 import android.view.autofill.AutofillValue
+import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.RemoteViews
+import android.widget.Toast
 import androidx.annotation.RequiresApi
+import androidx.autofill.inline.UiVersions
+import androidx.autofill.inline.v1.InlineSuggestionUi
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.AutofillSettingsActivity
+import com.kunzisoft.keepass.settings.PreferencesUtil


@RequiresApi(api = Build.VERSION_CODES.O)
@@ -47,11 +57,17 @@ object AutofillHelper {

    private const val AUTOFILL_RESPONSE_REQUEST_CODE = 8165

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

-    fun retrieveAssistStructure(intent: Intent?): AssistStructure? {
-        intent?.let {
-            return it.getParcelableExtra(ASSIST_STRUCTURE)
+    fun retrieveAutofillComponent(intent: Intent?): AutofillComponent? {
+        intent?.getParcelableExtra<AssistStructure?>(EXTRA_ASSIST_STRUCTURE)?.let { assistStructure ->
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                AutofillComponent(assistStructure,
+                        intent.getParcelableExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST))
+            } else {
+                AutofillComponent(assistStructure, null)
+            }
        }
        return null
    }
@@ -68,26 +84,28 @@ object AutofillHelper {
        return ""
    }

-    internal fun addHeader(responseBuilder: FillResponse.Builder,
-                           packageName: String,
-                           webDomain: String?,
-                           applicationId: String?) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            if (webDomain != null) {
-                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_web_domain).apply {
-                    setTextViewText(R.id.autofill_web_domain_text, webDomain)
-                })
-            } else if (applicationId != null) {
-                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_app_id).apply {
-                    setTextViewText(R.id.autofill_app_id_text, applicationId)
-                })
+    private fun newRemoteViews(context: Context,
+                               remoteViewsText: String,
+                               remoteViewsIcon: IconImage? = null): RemoteViews {
+        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
+        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
+        if (remoteViewsIcon != null) {
+            try {
+                Database.getInstance().iconDrawableFactory.getBitmapFromIcon(context,
+                        remoteViewsIcon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
+                    presentation.setImageViewBitmap(R.id.autofill_entry_icon, bitmap)
+                }
+            } catch (e: Exception) {
+                Log.e(RemoteViews::class.java.name, "Unable to assign icon in remote view", e)
            }
        }
+        return presentation
    }

-    internal fun buildDataset(context: Context,
+    private fun buildDataset(context: Context,
                              entryInfo: EntryInfo,
-                              struct: StructureParser.Result): Dataset? {
+                              struct: StructureParser.Result,
+                              inlinePresentation: InlinePresentation?): Dataset? {
        val title = makeEntryTitle(entryInfo)
        val views = newRemoteViews(context, title, entryInfo.icon)
        val builder = Dataset.Builder(views)
@@ -100,6 +118,12 @@ object AutofillHelper {
            builder.setValue(password, AutofillValue.forText(entryInfo.password))
        }

+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            inlinePresentation?.let {
+                builder.setInlinePresentation(it)
+            }
+        }
+
        return try {
            builder.build()
        } catch (e: IllegalArgumentException) {
@@ -108,44 +132,135 @@ object AutofillHelper {
        }
    }

+    /**
+     * Method to assign a drawable to a new icon from a database icon
+     */
+    private fun buildIconFromEntry(context: Context, entryInfo: EntryInfo): Icon? {
+        try {
+            Database.getInstance().iconDrawableFactory.getBitmapFromIcon(context,
+                    entryInfo.icon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
+                return Icon.createWithBitmap(bitmap)
+            }
+        } catch (e: Exception) {
+            Log.e(RemoteViews::class.java.name, "Unable to assign icon in remote view", e)
+        }
+        return null
+    }
+
+    @RequiresApi(Build.VERSION_CODES.R)
+    @SuppressLint("RestrictedApi")
+    private fun buildInlinePresentationForEntry(context: Context,
+                                                inlineSuggestionsRequest: InlineSuggestionsRequest,
+                                                positionItem: Int,
+                                                entryInfo: EntryInfo): InlinePresentation? {
+        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
+        val maxSuggestion = inlineSuggestionsRequest.maxSuggestionCount
+
+        if (positionItem <= maxSuggestion-1
+                && inlinePresentationSpecs.size > positionItem) {
+            val inlinePresentationSpec = inlinePresentationSpecs[positionItem]
+
+            // Make sure that the IME spec claims support for v1 UI template.
+            val imeStyle = inlinePresentationSpec.style
+            if (!UiVersions.getVersions(imeStyle).contains(UiVersions.INLINE_UI_VERSION_1))
+                return null
+
+            // Build the content for IME UI
+            val pendingIntent = PendingIntent.getActivity(context,
+                    0,
+                    Intent(context, AutofillSettingsActivity::class.java),
+                    0)
+            return InlinePresentation(
+                    InlineSuggestionUi.newContentBuilder(pendingIntent).apply {
+                        setContentDescription(context.getString(R.string.autofill_sign_in_prompt))
+                        setTitle(entryInfo.title)
+                        setSubtitle(entryInfo.username)
+                        setStartIcon(Icon.createWithResource(context, R.mipmap.ic_launcher_round).apply {
+                            setTintBlendMode(BlendMode.DST)
+                        })
+                        buildIconFromEntry(context, entryInfo)?.let { icon ->
+                            setEndIcon(icon.apply {
+                                setTintBlendMode(BlendMode.DST)
+                            })
+                        }
+                    }.build().slice, inlinePresentationSpec, false)
+        }
+        return null
+    }
+
+    fun buildResponse(context: Context,
+                      entriesInfo: List<EntryInfo>,
+                      parseResult: StructureParser.Result,
+                      inlineSuggestionsRequest: InlineSuggestionsRequest?): FillResponse {
+        val responseBuilder = FillResponse.Builder()
+        // Add Header
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val packageName = context.packageName
+            parseResult.webDomain?.let { webDomain ->
+                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_web_domain).apply {
+                    setTextViewText(R.id.autofill_web_domain_text, webDomain)
+                })
+            } ?: kotlin.run {
+                parseResult.applicationId?.let { applicationId ->
+                    responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_app_id).apply {
+                        setTextViewText(R.id.autofill_app_id_text, applicationId)
+                    })
+                }
+            }
+        }
+        // Add inline suggestion for new IME and dataset
+        entriesInfo.forEachIndexed { index, entryInfo ->
+            val inlinePresentation = inlineSuggestionsRequest?.let {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    buildInlinePresentationForEntry(context, inlineSuggestionsRequest, index, entryInfo)
+                } else {
+                    null
+                }
+            }
+            responseBuilder.addDataset(buildDataset(context, entryInfo, parseResult, inlinePresentation))
+        }
+        return responseBuilder.build()
+    }
+
    /**
     * Build the Autofill response for one entry
     */
-    fun buildResponse(activity: Activity, entryInfo: EntryInfo) {
-        buildResponse(activity, ArrayList<EntryInfo>().apply { add(entryInfo) })
+    fun buildResponseAndSetResult(activity: Activity, entryInfo: EntryInfo) {
+        buildResponseAndSetResult(activity, ArrayList<EntryInfo>().apply { add(entryInfo) })
    }

    /**
     * Build the Autofill response for many entry
     */
-    fun buildResponse(activity: Activity, entriesInfo: List<EntryInfo>) {
+    fun buildResponseAndSetResult(activity: Activity, entriesInfo: List<EntryInfo>) {
        if (entriesInfo.isEmpty()) {
            activity.setResult(Activity.RESULT_CANCELED)
        } else {
            var setResultOk = false
-            activity.intent?.extras?.let { extras ->
-                if (extras.containsKey(ASSIST_STRUCTURE)) {
-                    activity.intent?.getParcelableExtra<AssistStructure>(ASSIST_STRUCTURE)?.let { structure ->
-                        StructureParser(structure).parse()?.let { result ->
-                            // New Response
-                            val responseBuilder = FillResponse.Builder()
-                            entriesInfo.forEach {
-                                responseBuilder.addDataset(buildDataset(activity, it, result))
-                            }
-                            val mReplyIntent = Intent()
-                            Log.d(activity.javaClass.name, "Successed Autofill auth.")
-                            mReplyIntent.putExtra(
-                                    AutofillManager.EXTRA_AUTHENTICATION_RESULT,
-                                    responseBuilder.build())
-                            setResultOk = true
-                            activity.setResult(Activity.RESULT_OK, mReplyIntent)
+            activity.intent?.getParcelableExtra<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 inlineSuggestionsRequest = activity.intent?.getParcelableExtra<InlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
+                        if (inlineSuggestionsRequest != null) {
+                            Toast.makeText(activity.applicationContext, R.string.autofill_inline_suggestions_keyboard, Toast.LENGTH_SHORT).show()
                        }
+                        buildResponse(activity, entriesInfo, result, inlineSuggestionsRequest)
+                    } else {
+                        buildResponse(activity, entriesInfo, result, null)
                    }
+                    val mReplyIntent = Intent()
+                    Log.d(activity.javaClass.name, "Successed Autofill auth.")
+                    mReplyIntent.putExtra(
+                            AutofillManager.EXTRA_AUTHENTICATION_RESULT,
+                            response)
+                    setResultOk = true
+                    activity.setResult(Activity.RESULT_OK, mReplyIntent)
                }
-                if (!setResultOk) {
-                    Log.w(activity.javaClass.name, "Failed Autofill auth.")
-                    activity.setResult(Activity.RESULT_CANCELED)
-                }
+            }
+            if (!setResultOk) {
+                Log.w(activity.javaClass.name, "Failed Autofill auth.")
+                activity.setResult(Activity.RESULT_CANCELED)
            }
        }
    }
@@ -155,13 +270,17 @@ object AutofillHelper {
     */
    fun startActivityForAutofillResult(activity: Activity,
                                       intent: Intent,
-                                       assistStructure: AssistStructure,
+                                       autofillComponent: AutofillComponent,
                                       searchInfo: SearchInfo?) {
-        EntrySelectionHelper.addEntrySelectionModeExtraInIntent(intent)
-        intent.putExtra(ASSIST_STRUCTURE, assistStructure)
-        searchInfo?.let {
-            intent.putExtra(KEY_SEARCH_INFO, it)
+        EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.SELECTION)
+        intent.putExtra(EXTRA_ASSIST_STRUCTURE, autofillComponent.assistStructure)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                && PreferencesUtil.isAutofillInlineSuggestionsEnable(activity)) {
+            autofillComponent.inlineSuggestionsRequest?.let {
+                intent.putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+            }
        }
+        EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
        activity.startActivityForResult(intent, AUTOFILL_RESPONSE_REQUEST_CODE)
    }

@@ -179,19 +298,4 @@ object AutofillHelper {
            activity.finish()
        }
    }
-
-    private fun newRemoteViews(context: Context,
-                               remoteViewsText: String,
-                               remoteViewsIcon: IconImage? = null): RemoteViews {
-        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
-        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
-        if (remoteViewsIcon != null) {
-            presentation.assignDatabaseIcon(context,
-                    R.id.autofill_entry_icon,
-                    Database.getInstance().drawFactory,
-                    remoteViewsIcon,
-                    ContextCompat.getColor(context, R.color.green))
-        }
-        return presentation
-    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -19,89 +19,133 @@
 */
 package com.kunzisoft.keepass.autofill

+import android.annotation.SuppressLint
+import android.app.PendingIntent
+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.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.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.AutofillSettingsActivity
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import java.util.concurrent.atomic.AtomicBoolean
+

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

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

    override fun onCreate() {
        super.onCreate()
+        getPreferences()
+    }

+    private fun getPreferences() {
        applicationIdBlocklist = PreferencesUtil.applicationIdBlocklist(this)
        webDomainBlocklist = PreferencesUtil.webDomainBlocklist(this)
+        askToSaveData = PreferencesUtil.askToSaveAutofillData(this)
+        autofillInlineSuggestionsEnabled = PreferencesUtil.isAutofillInlineSuggestionsEnable(this)
    }

    override fun onFillRequest(request: FillRequest,
                               cancellationSignal: CancellationSignal,
                               callback: FillCallback) {
-        val fillContexts = request.fillContexts
-        val latestStructure = fillContexts[fillContexts.size - 1].structure

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

-        // Check user's settings for authenticating Responses and Datasets.
-        StructureParser(latestStructure).parse()?.let { parseResult ->
+        // Lock
+        if (!mLock.get()) {
+            mLock.set(true)
+            // Check user's settings for authenticating Responses and Datasets.
+            val latestStructure = request.fillContexts.last().structure
+            StructureParser(latestStructure).parse()?.let { parseResult ->

-            // Build search info only if applicationId or webDomain are not blocked
-            if (searchAllowedFor(parseResult.applicationId, applicationIdBlocklist)
-                    && searchAllowedFor(parseResult.domain, webDomainBlocklist)) {
-                val searchInfo = SearchInfo().apply {
-                    applicationId = parseResult.applicationId
-                    webDomain = parseResult.domain
-                }
-
-                SearchHelper.checkAutoSearchInfo(this,
-                        Database.getInstance(),
-                        searchInfo,
-                        { items ->
-                            val responseBuilder = FillResponse.Builder()
-                            AutofillHelper.addHeader(responseBuilder, packageName,
-                                    parseResult.domain, parseResult.applicationId)
-                            items.forEach {
-                                responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
-                            }
-                            callback.onSuccess(responseBuilder.build())
-                        },
-                        {
-                            // Show UI if no search result
-                            showUIForEntrySelection(parseResult, searchInfo, callback)
-                        },
-                        {
-                            // Show UI if database not open
-                            showUIForEntrySelection(parseResult, searchInfo, callback)
+                // Build search info only if applicationId or webDomain are not blocked
+                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+                    val searchInfo = SearchInfo().apply {
+                        applicationId = parseResult.applicationId
+                        webDomain = parseResult.webDomain
+                        webScheme = parseResult.webScheme
+                    }
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
+                        searchInfo.webDomain = webDomainWithoutSubDomain
+                        val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                                && autofillInlineSuggestionsEnabled) {
+                            request.inlineSuggestionsRequest
+                        } else {
+                            null
                        }
-                )
+                        launchSelection(searchInfo,
+                                parseResult,
+                                inlineSuggestionsRequest,
+                                callback)
+                    }
+                }
            }
        }
    }

+    private fun launchSelection(searchInfo: SearchInfo,
+                                parseResult: StructureParser.Result,
+                                inlineSuggestionsRequest: InlineSuggestionsRequest?,
+                                callback: FillCallback) {
+        SearchHelper.checkAutoSearchInfo(this,
+                Database.getInstance(),
+                searchInfo,
+                { items ->
+                    callback.onSuccess(
+                            AutofillHelper.buildResponse(this,
+                                    items, parseResult, inlineSuggestionsRequest)
+                    )
+                },
+                {
+                    // Show UI if no search result
+                    showUIForEntrySelection(parseResult,
+                            searchInfo, inlineSuggestionsRequest, callback)
+                },
+                {
+                    // Show UI if database not open
+                    showUIForEntrySelection(parseResult,
+                            searchInfo, inlineSuggestionsRequest, callback)
+                }
+        )
+    }
+
+    @SuppressLint("RestrictedApi")
    private fun showUIForEntrySelection(parseResult: StructureParser.Result,
                                        searchInfo: SearchInfo,
+                                        inlineSuggestionsRequest: InlineSuggestionsRequest?,
                                        callback: FillCallback) {
        parseResult.allAutofillIds().let { autofillIds ->
            if (autofillIds.isNotEmpty()) {
                // If the entire Autofill Response is authenticated, AuthActivity is used
                // to generate Response.
-                val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this,
-                        searchInfo)
+                val intentSender = AutofillLauncherActivity.getAuthIntentSenderForSelection(this,
+                        searchInfo, inlineSuggestionsRequest)
                val responseBuilder = FillResponse.Builder()
-                val remoteViewsUnlock: RemoteViews = if (!parseResult.domain.isNullOrEmpty()) {
+                val remoteViewsUnlock: RemoteViews = if (!parseResult.webDomain.isNullOrEmpty()) {
                    RemoteViews(packageName, R.layout.item_autofill_unlock_web_domain).apply {
-                        setTextViewText(R.id.autofill_web_domain_text, parseResult.domain)
+                        setTextViewText(R.id.autofill_web_domain_text, parseResult.webDomain)
                    }
                } else if (!parseResult.applicationId.isNullOrEmpty()) {
                    RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
@@ -110,29 +154,112 @@ class KeeAutofillService : AutofillService() {
                } else {
                    RemoteViews(packageName, R.layout.item_autofill_unlock)
                }
-                responseBuilder.setAuthentication(autofillIds, sender, remoteViewsUnlock)
+
+                // Tell to service the interest to save credentials
+                if (askToSaveData) {
+                    var types: Int = SaveInfo.SAVE_DATA_TYPE_GENERIC
+                    val info = ArrayList<AutofillId>()
+                    // Only if at least a password
+                    parseResult.passwordId?.let { passwordInfo ->
+                        parseResult.usernameId?.let { usernameInfo ->
+                            types = types or SaveInfo.SAVE_DATA_TYPE_USERNAME
+                            info.add(usernameInfo)
+                        }
+                        types = types or SaveInfo.SAVE_DATA_TYPE_PASSWORD
+                        info.add(passwordInfo)
+                    }
+                    if (info.isNotEmpty()) {
+                        responseBuilder.setSaveInfo(
+                                SaveInfo.Builder(types, info.toTypedArray()).build()
+                        )
+                    }
+                }
+
+                // Build inline presentation
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                        && autofillInlineSuggestionsEnabled) {
+                    var inlinePresentation: InlinePresentation? = null
+                    inlineSuggestionsRequest?.let {
+                        val inlinePresentationSpecs = inlineSuggestionsRequest.inlinePresentationSpecs
+                        if (inlineSuggestionsRequest.maxSuggestionCount > 0
+                                && inlinePresentationSpecs.size > 0) {
+                            val inlinePresentationSpec = inlinePresentationSpecs[0]
+
+                            // Make sure that the IME spec claims support for v1 UI template.
+                            val imeStyle = inlinePresentationSpec.style
+                            if (UiVersions.getVersions(imeStyle).contains(UiVersions.INLINE_UI_VERSION_1)) {
+                                // Build the content for IME UI
+                                inlinePresentation = InlinePresentation(
+                                        InlineSuggestionUi.newContentBuilder(
+                                                PendingIntent.getActivity(this,
+                                                        0,
+                                                        Intent(this, AutofillSettingsActivity::class.java),
+                                                        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 {
+                                                setTintBlendMode(BlendMode.DST)
+                                            })
+                                        }.build().slice, inlinePresentationSpec, false)
+                            }
+                        }
+                    }
+                    // Build response
+                    responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock, inlinePresentation)
+                }
+                responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock)
                callback.onSuccess(responseBuilder.build())
            }
        }
    }

    override fun onSaveRequest(request: SaveRequest, callback: SaveCallback) {
-        // TODO Save autofill
-        //callback.onFailure(getString(R.string.autofill_not_support_save));
+        if (askToSaveData) {
+            val latestStructure = request.fillContexts.last().structure
+            StructureParser(latestStructure).parse(true)?.let { parseResult ->
+
+                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+                    Log.d(TAG, "autofill onSaveRequest password")
+
+                    // Show UI to save data
+                    val registerInfo = RegisterInfo(SearchInfo().apply {
+                        applicationId = parseResult.applicationId
+                        webDomain = parseResult.webDomain
+                        webScheme = parseResult.webScheme
+                    },
+                            parseResult.usernameValue?.textValue?.toString(),
+                            parseResult.passwordValue?.textValue?.toString())
+                    // TODO Callback in each activity #765
+                    //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    //    callback.onSuccess(AutofillLauncherActivity.getAuthIntentSenderForRegistration(this,
+                    //            registerInfo))
+                    //} else {
+                        AutofillLauncherActivity.launchForRegistration(this, registerInfo)
+                        callback.onSuccess()
+                    //}
+                    return
+                }
+            }
+        }
+        callback.onFailure("Saving form values is not allowed")
    }

    override fun onConnected() {
        Log.d(TAG, "onConnected")
+        getPreferences()
    }

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

    companion object {
        private val TAG = KeeAutofillService::class.java.name

-        fun searchAllowedFor(element: String?, blockList: Set<String>?): Boolean {
+        fun autofillAllowedFor(element: String?, blockList: Set<String>?): Boolean {
            element?.let { elementNotNull ->
                if (blockList?.any { appIdBlocked ->
                            elementNotNull.contains(appIdBlocked)
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
@@ -25,6 +25,7 @@ import androidx.annotation.RequiresApi
 import android.util.Log
 import android.view.View
 import android.view.autofill.AutofillId
+import android.view.autofill.AutofillValue
 import java.util.*


@@ -32,16 +33,21 @@ import java.util.*
 * Parse AssistStructure and guess username and password fields.
 */
@RequiresApi(api = Build.VERSION_CODES.O)
-internal class StructureParser(private val structure: AssistStructure) {
+class StructureParser(private val structure: AssistStructure) {
    private var result: Result? = null
-    private var usernameCandidate: AutofillId? = null
+
    private var usernameNeeded = true

-    fun parse(): Result? {
+    private var usernameCandidate: AutofillId? = null
+    private var usernameValueCandidate: AutofillValue? = null
+
+    fun parse(saveValue: Boolean = false): Result? {
        try {
            result = Result()
            result?.apply {
+                allowSaveValues = saveValue
                usernameCandidate = null
+                usernameValueCandidate = null
                mainLoop@ for (i in 0 until structure.windowNodeCount) {
                    val windowNode = structure.getWindowNodeAt(i)
                    applicationId = windowNode.title.toString().split("/")[0]
@@ -51,8 +57,12 @@ internal class StructureParser(private val structure: AssistStructure) {
                        break@mainLoop
                }
                // If not explicit username field found, add the field just before password field.
-                if (usernameId == null && passwordId != null && usernameCandidate != null)
+                if (usernameId == null && passwordId != null && usernameCandidate != null) {
                    usernameId = usernameCandidate
+                    if (allowSaveValues) {
+                        usernameValue = usernameValueCandidate
+                    }
+                }
            }

            // Return the result only if password field is retrieved
@@ -68,11 +78,23 @@ internal class StructureParser(private val structure: AssistStructure) {

    private fun parseViewNode(node: AssistStructure.ViewNode): Boolean {
        // Get the domain of a web app
-        node.webDomain?.let {
-            result?.domain = it
-            Log.d(TAG, "Autofill domain: $it")
+        node.webDomain?.let { webDomain ->
+            if (webDomain.isNotEmpty()) {
+                result?.webDomain = webDomain
+                Log.d(TAG, "Autofill domain: $webDomain")
+            }
        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            node.webScheme?.let { webScheme ->
+                if (webScheme.isNotEmpty()) {
+                    result?.webScheme = webScheme
+                    Log.d(TAG, "Autofill scheme: $webScheme")
+                }
+            }
+        }
+        val domainNotEmpty = result?.webDomain?.isNotEmpty() == true

+        var returnValue = false
        // Only parse visible nodes
        if (node.visibility == View.VISIBLE) {
            if (node.autofillId != null
@@ -81,39 +103,41 @@ internal class StructureParser(private val structure: AssistStructure) {
                val hints = node.autofillHints
                if (hints != null && hints.isNotEmpty()) {
                    if (parseNodeByAutofillHint(node))
-                        return true
+                        returnValue = true
                } else if (parseNodeByHtmlAttributes(node))
-                    return true
+                    returnValue = true
                else if (parseNodeByAndroidInput(node))
-                    return true
+                    returnValue = true
            }
+            // Optimized return but only if domain not empty
+            if (domainNotEmpty && returnValue)
+                return true
            // Recursive method to process each node
            for (i in 0 until node.childCount) {
                if (parseViewNode(node.getChildAt(i)))
+                    returnValue = true
+                if (domainNotEmpty && returnValue)
                    return true
            }
        }
-        return false
+        return returnValue
    }

    private fun parseNodeByAutofillHint(node: AssistStructure.ViewNode): Boolean {
        val autofillId = node.autofillId
        node.autofillHints?.forEach {
            when {
-                it.equals(View.AUTOFILL_HINT_USERNAME, true)
-                        || it.equals(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
-                        || it.equals("email", true)
-                        || it.equals(View.AUTOFILL_HINT_PHONE, true)
-                        || it.contains("OrUsername", true)
-                        || it.contains("OrEmailAddress", true)
-                        || it.contains("OrEmail", true)
-                        || it.contains("OrPhone", true)-> {
+                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)-> {
                    result?.usernameId = autofillId
+                    result?.usernameValue = node.autofillValue
                    Log.d(TAG, "Autofill username hint")
                }
-                it.equals(View.AUTOFILL_HINT_PASSWORD, true)
-                        || it.contains("password", true) -> {
+                it.contains(View.AUTOFILL_HINT_PASSWORD, true) -> {
                    result?.passwordId = autofillId
+                    result?.passwordValue = node.autofillValue
                    Log.d(TAG, "Autofill password hint")
                    // Username not needed in this case
                    usernameNeeded = false
@@ -143,14 +167,17 @@ internal class StructureParser(private val structure: AssistStructure) {
                            when (pairAttribute.second.toLowerCase(Locale.ENGLISH)) {
                                "tel", "email" -> {
                                    result?.usernameId = autofillId
+                                    result?.usernameValue = node.autofillValue
                                    Log.d(TAG, "Autofill username web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                }
                                "text" -> {
                                    usernameCandidate = autofillId
+                                    usernameValueCandidate = node.autofillValue
                                    Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                }
                                "password" -> {
                                    result?.passwordId = autofillId
+                                    result?.passwordValue = node.autofillValue
                                    Log.d(TAG, "Autofill password web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                    return true
                                }
@@ -185,6 +212,7 @@ internal class StructureParser(private val structure: AssistStructure) {
                            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,
@@ -192,13 +220,28 @@ internal class StructureParser(private val structure: AssistStructure) {
                            InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
                            InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
                        usernameCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
                        Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
                    }
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) -> {
+                        // Some forms used visible password as username
+                        if (usernameCandidate == null && usernameValueCandidate == null) {
+                            usernameCandidate = autofillId
+                            usernameValueCandidate = node.autofillValue
+                            Log.d(TAG, "Autofill visible password android text type (as username): ${showHexInputType(inputType)}")
+                        } else if (result?.passwordId == null && result?.passwordValue == null) {
+                            result?.passwordId = autofillId
+                            result?.passwordValue = node.autofillValue
+                            Log.d(TAG, "Autofill visible password android text type (as password): ${showHexInputType(inputType)}")
+                            usernameNeeded = false
+                        }
+                    }
                    inputIsVariationType(inputType,
                            InputType.TYPE_TEXT_VARIATION_PASSWORD,
-                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
                            InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
                        result?.passwordId = autofillId
+                        result?.passwordValue = node.autofillValue
                        Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
                        usernameNeeded = false
                        return true
@@ -223,11 +266,13 @@ internal class StructureParser(private val structure: AssistStructure) {
                    inputIsVariationType(inputType,
                            InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
                        usernameCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
                        Log.d(TAG, "Autofill usernale candidate android number type: ${showHexInputType(inputType)}")
                    }
                    inputIsVariationType(inputType,
                            InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
                        result?.passwordId = autofillId
+                        result?.passwordValue = node.autofillValue
                        Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
                        usernameNeeded = false
                        return true
@@ -242,9 +287,16 @@ internal class StructureParser(private val structure: AssistStructure) {
    }

    @RequiresApi(api = Build.VERSION_CODES.O)
-    internal class Result {
+    class Result {
        var applicationId: String? = null
-        var domain: String? = null
+
+        var webDomain: String? = null
+            set(value) {
+                if (field == null)
+                    field = value
+            }
+
+        var webScheme: String? = null
            set(value) {
                if (field == null)
                    field = value
@@ -272,6 +324,21 @@ internal class StructureParser(private val structure: AssistStructure) {
            }
            return all.toTypedArray()
        }
+
+        // Only in registration mode
+        var allowSaveValues = false
+
+        var usernameValue: AutofillValue? = null
+            set(value) {
+                if (allowSaveValues && field == null)
+                    field = value
+            }
+
+        var passwordValue: AutofillValue? = null
+            set(value) {
+                if (allowSaveValues && field == null)
+                    field = value
+            }
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockCryptoPrompt.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockCryptoPrompt.kt
@@ -0,0 +1,10 @@
+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)
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
@@ -0,0 +1,628 @@
+/*
+ * 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.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.annotation.RequiresApi
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import com.getkeepsafe.taptargetview.TapTargetView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.app.database.CipherDatabaseAction
+import com.kunzisoft.keepass.database.exception.IODatabaseException
+import com.kunzisoft.keepass.education.PasswordActivityEducation
+import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
+
+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
+
+    /**
+     * Manage setting to auto open biometric prompt
+     */
+    private var mAutoOpenPrompt: Boolean = false
+        get() {
+            return field && mAutoOpenPromptEnabled
+        }
+
+    // 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.DatabaseListener? = null
+
+    // 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
+
+    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)
+
+        retainInstance = true
+        setHasOptionsMenu(true)
+
+        cipherDatabaseAction = CipherDatabaseAction.getInstance(requireContext().applicationContext)
+    }
+
+    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
+    }
+
+    private data class ActivityResult(var requestCode: Int, var resultCode: Int, var data: Intent?)
+    private var activityResult: ActivityResult? = null
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // To wait resume
+        if (keepConnection) {
+            activityResult = ActivityResult(requestCode, resultCode, data)
+        }
+        keepConnection = false
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(requireContext())
+        mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(requireContext())
+        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)
+    }
+
+    fun loadDatabase(databaseUri: Uri?, autoOpenPrompt: Boolean) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // To get device credential unlock result, only if same database uri
+            if (databaseUri != null
+                    && mAdvancedUnlockEnabled) {
+                activityResult?.let {
+                    if (databaseUri == databaseFileUri) {
+                        advancedUnlockManager?.onActivityResult(it.requestCode, it.resultCode)
+                    } else {
+                        disconnect()
+                    }
+                } ?: run {
+                    this.mAutoOpenPrompt = autoOpenPrompt
+                    connect(databaseUri)
+                }
+            } else {
+                disconnect()
+            }
+            activityResult = null
+        }
+    }
+
+    /**
+     * Check unlock availability and change the current mode depending of device's state
+     */
+    fun checkUnlockAvailability() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            allowOpenBiometricPrompt = true
+            if (PreferencesUtil.isBiometricUnlockEnable(requireContext())) {
+                mAdvancedUnlockInfoView?.setIconResource(R.drawable.fingerprint)
+
+                // biometric not supported (by API level or hardware) so keep option hidden
+                // or manually disable
+                val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(requireContext())
+                if (!PreferencesUtil.isAdvancedUnlockEnable(requireContext())
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
+                    toggleMode(Mode.BIOMETRIC_UNAVAILABLE)
+                } else if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED) {
+                    toggleMode(Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED)
+                } else {
+                    // biometric is available but not configured, show icon but in disabled state with some information
+                    if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
+                        toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
+                    } else {
+                        selectMode()
+                    }
+                }
+            } else if (PreferencesUtil.isDeviceCredentialUnlockEnable(requireContext())) {
+                mAdvancedUnlockInfoView?.setIconResource(R.drawable.bolt)
+                if (AdvancedUnlockManager.isDeviceSecure(requireContext())) {
+                    selectMode()
+                } else {
+                    toggleMode(Mode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED)
+                }
+            }
+        }
+    }
+
+    @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...
+            requireContext().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("")
+
+        mAdvancedUnlockInfoView?.setIconViewClickListener(false) {
+            onAuthenticationError(BiometricPrompt.ERROR_UNABLE_TO_PROCESS,
+                    requireContext().getString(R.string.credential_before_click_advanced_unlock_button))
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt) {
+        activity?.runOnUiThread {
+            if (allowOpenBiometricPrompt) {
+                if (cryptoPrompt.isDeviceCredentialOperation)
+                    keepConnection = true
+                try {
+                    advancedUnlockManager?.openAdvancedUnlockPrompt(cryptoPrompt)
+                } 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")
+    }
+
+    @Synchronized
+    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.DatabaseListener {
+            override fun onDatabaseCleared() {
+                deleteEncryptedDatabaseKey()
+            }
+        }
+        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() {
+        allowOpenBiometricPrompt = false
+        mAdvancedUnlockInfoView?.setIconViewClickListener(false, null)
+        advancedUnlockManager?.closeBiometricPrompt()
+        databaseFileUri?.let { databaseUri ->
+            cipherDatabaseAction.deleteByDatabaseUri(databaseUri) {
+                checkUnlockAvailability()
+            }
+        }
+    }
+
+    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+        activity?.runOnUiThread {
+            Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
+            setAdvancedUnlockedMessageView(errString.toString())
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onAuthenticationFailed() {
+        activity?.runOnUiThread {
+            Log.e(TAG, "Biometric authentication failed, biometric not recognized")
+            setAdvancedUnlockedMessageView(R.string.advanced_unlock_not_recognized)
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onAuthenticationSucceeded() {
+        activity?.runOnUiThread {
+            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)
+                    }
+                    AdvancedUnlockNotificationService.startServiceForTimeout(requireContext())
+                }
+                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: String, ivSpec: String) {
+        databaseFileUri?.let { databaseUri ->
+            mBuilderListener?.onCredentialEncrypted(databaseUri, encryptedValue, ivSpec)
+        }
+    }
+
+    override fun handleDecryptedResult(decryptedValue: String) {
+        // Load database directly with password retrieve
+        databaseFileUri?.let {
+            mBuilderListener?.onCredentialDecrypted(it, decryptedValue)
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onInvalidKeyException(e: Exception) {
+        setAdvancedUnlockedMessageView(R.string.advanced_unlock_invalid_key)
+    }
+
+    override fun onGenericException(e: Exception) {
+        val errorMessage = e.cause?.localizedMessage ?: e.localizedMessage ?: ""
+        setAdvancedUnlockedMessageView(errorMessage)
+    }
+
+    private fun showViews(show: Boolean) {
+        activity?.runOnUiThread {
+            mAdvancedUnlockInfoView?.visibility = if (show)
+                View.VISIBLE
+            else {
+                View.GONE
+            }
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun setAdvancedUnlockedTitleView(textId: Int) {
+        activity?.runOnUiThread {
+            mAdvancedUnlockInfoView?.setTitle(textId)
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun setAdvancedUnlockedMessageView(textId: Int) {
+        activity?.runOnUiThread {
+            mAdvancedUnlockInfoView?.setMessage(textId)
+        }
+    }
+
+    private fun setAdvancedUnlockedMessageView(text: CharSequence) {
+        activity?.runOnUiThread {
+            mAdvancedUnlockInfoView?.message = text
+        }
+    }
+
+    fun performEducation(passwordActivityEducation: PasswordActivityEducation,
+                         readOnlyEducationPerformed: Boolean,
+                         onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
+                         onOuterViewClick: ((TapTargetView?) -> Unit)? = null) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    && !readOnlyEducationPerformed) {
+                val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(requireContext())
+                PreferencesUtil.isAdvancedUnlockEnable(requireContext())
+                        && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
+                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
+                        && mAdvancedUnlockInfoView != null && mAdvancedUnlockInfoView?.visibility == View.VISIBLE
+                        && mAdvancedUnlockInfoView?.unlockIconImageView != null
+                        && passwordActivityEducation.checkAndPerformedBiometricEducation(mAdvancedUnlockInfoView!!.unlockIconImageView!!,
+                        onEducationViewClick,
+                        onOuterViewClick)
+            }
+        } catch (ignored: Exception) {}
+    }
+
+    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(): String
+        fun conditionToStoreCredential(): Boolean
+        fun onCredentialEncrypted(databaseUri: Uri, encryptedCredential: String, ivSpec: String)
+        fun onCredentialDecrypted(databaseUri: Uri, decryptedCredential: String)
+    }
+
+    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
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
@@ -0,0 +1,465 @@
+/*
+ * 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.Context
+import android.os.Build
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyPermanentlyInvalidatedException
+import android.security.keystore.KeyProperties
+import android.util.Base64
+import android.util.Log
+import 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.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
+        }
+    }
+
+    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(KeyProperties.BLOCK_MODE_CBC)
+                                        .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
+                                        // Require the user to authenticate with a fingerprint to authorize every use
+                                        // of the key, don't use it for device credential because it's the user authentication
+                                        .apply {
+                                            if (biometricUnlockEnable) {
+                                                setUserAuthenticationRequired(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
+    }
+
+    fun initEncryptData(actionIfCypherInit
+                        : (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
+        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?.onInvalidKeyException(unrecoverableKeyException)
+        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
+            Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
+            advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to initialize encrypt data", e)
+            advancedUnlockCallback?.onGenericException(e)
+        }
+    }
+
+    fun encryptData(value: String) {
+        if (!isKeyManagerInitialized) {
+            return
+        }
+        try {
+            val encrypted = cipher?.doFinal(value.toByteArray())
+            val encryptedBase64 = Base64.encodeToString(encrypted, Base64.NO_WRAP)
+
+            // passes updated iv spec on to callback so this can be stored for decryption
+            cipher?.parameters?.getParameterSpec(IvParameterSpec::class.java)?.let{ spec ->
+                val ivSpecValue = Base64.encodeToString(spec.iv, Base64.NO_WRAP)
+                advancedUnlockCallback?.handleEncryptedResult(encryptedBase64, ivSpecValue)
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to encrypt data", e)
+            advancedUnlockCallback?.onGenericException(e)
+        }
+    }
+
+    fun initDecryptData(ivSpecValue: String, actionIfCypherInit
+                        : (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
+        if (!isKeyManagerInitialized) {
+            return
+        }
+        try {
+            // important to restore spec here that was used for decryption
+            val iv = Base64.decode(ivSpecValue, Base64.NO_WRAP)
+            val spec = IvParameterSpec(iv)
+
+            getSecretKey()?.let { secretKey ->
+                cipher?.let { cipher ->
+                    cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
+
+                    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)
+            deleteKeystoreKey()
+        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
+            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
+            advancedUnlockCallback?.onInvalidKeyException(invalidKeyException)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to initialize decrypt data", e)
+            advancedUnlockCallback?.onGenericException(e)
+        }
+    }
+
+    fun decryptData(encryptedValue: String) {
+        if (!isKeyManagerInitialized) {
+            return
+        }
+        try {
+            // actual decryption here
+            val encrypted = Base64.decode(encryptedValue, Base64.NO_WRAP)
+            cipher?.doFinal(encrypted)?.let { decrypted ->
+                advancedUnlockCallback?.handleDecryptedResult(String(decrypted))
+            }
+        } catch (badPaddingException: BadPaddingException) {
+            Log.e(TAG, "Unable to decrypt data", badPaddingException)
+            advancedUnlockCallback?.onInvalidKeyException(badPaddingException)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to decrypt data", e)
+            advancedUnlockCallback?.onGenericException(e)
+        }
+    }
+
+    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)
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    @Synchronized
+    fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt) {
+        // 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)
+            retrieveContext().startActivityForResult(
+                    keyGuardManager?.createConfirmDeviceCredentialIntent(promptTitle, promptDescription),
+                    REQUEST_DEVICE_CREDENTIAL)
+        }
+    }
+
+    @Synchronized
+    fun onActivityResult(requestCode: Int, resultCode: Int) {
+        if (requestCode == REQUEST_DEVICE_CREDENTIAL) {
+            if (resultCode == Activity.RESULT_OK) {
+                advancedUnlockCallback?.onAuthenticationSucceeded()
+            } else {
+                advancedUnlockCallback?.onAuthenticationFailed()
+            }
+        }
+    }
+
+    fun closeBiometricPrompt() {
+        biometricPrompt?.cancelAuthentication()
+    }
+
+    interface AdvancedUnlockErrorCallback {
+        fun onInvalidKeyException(e: Exception)
+        fun onGenericException(e: Exception)
+    }
+
+    interface AdvancedUnlockCallback : AdvancedUnlockErrorCallback {
+        fun onAuthenticationSucceeded()
+        fun onAuthenticationFailed()
+        fun onAuthenticationError(errorCode: Int, errString: CharSequence)
+        fun handleEncryptedResult(encryptedValue: String, ivSpec: String)
+        fun handleDecryptedResult(decryptedValue: String)
+    }
+
+    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
+
+        private const val REQUEST_DEVICE_CREDENTIAL = 556
+
+        @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: String, ivSpec: String) {}
+
+                    override fun handleDecryptedResult(decryptedValue: String) {}
+
+                    override fun onInvalidKeyException(e: Exception) {
+                        advancedCallback.onInvalidKeyException(e)
+                    }
+
+                    override fun onGenericException(e: Exception) {
+                        advancedCallback.onGenericException(e)
+                    }
+                }
+                deleteKeystoreKey()
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
@@ -1,356 +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.Intent
-import android.net.Uri
-import android.os.Build
-import android.provider.Settings
-import android.util.Log
-import android.view.Menu
-import android.view.MenuInflater
-import android.widget.CompoundButton
-import android.widget.TextView
-import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricConstants
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.database.CipherDatabaseAction
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
-
-@RequiresApi(api = Build.VERSION_CODES.M)
-class AdvancedUnlockedManager(var context: FragmentActivity,
-                              var databaseFileUri: Uri,
-                              private var advancedUnlockInfoView: AdvancedUnlockInfoView?,
-                              private var checkboxPasswordView: CompoundButton?,
-                              private var onCheckedPasswordChangeListener: CompoundButton.OnCheckedChangeListener? = null,
-                              var passwordView: TextView?,
-                              private var loadDatabaseAfterRegisterCredentials: (encryptedPassword: String?, ivSpec: String?) -> Unit,
-                              private var loadDatabaseAfterRetrieveCredentials: (decryptedPassword: String?) -> Unit)
-    : BiometricUnlockDatabaseHelper.BiometricUnlockCallback {
-
-    private var biometricUnlockDatabaseHelper: BiometricUnlockDatabaseHelper? = null
-    private var biometricMode: Mode = Mode.UNAVAILABLE
-
-    private var biometricPromptAutoOpenPreference = PreferencesUtil.isBiometricPromptAutoOpenEnable(context)
-    var isBiometricPromptAutoOpenEnable: Boolean = true
-        get() {
-            return field && biometricPromptAutoOpenPreference
-        }
-
-    private var cipherDatabaseAction = CipherDatabaseAction.getInstance(context.applicationContext)
-
-    init {
-        // Add a check listener to change fingerprint mode
-        checkboxPasswordView?.setOnCheckedChangeListener { compoundButton, checked ->
-            checkBiometricAvailability()
-            // Add old listener to enable the button, only be call here because of onCheckedChange bug
-            onCheckedPasswordChangeListener?.onCheckedChanged(compoundButton, checked)
-        }
-    }
-
-    /**
-     * Check biometric availability and change the current mode depending of device's state
-     */
-    fun checkBiometricAvailability() {
-
-        // biometric not supported (by API level or hardware) so keep option hidden
-        // or manually disable
-        val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate()
-
-        if (!PreferencesUtil.isBiometricUnlockEnable(context)
-                || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
-                || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
-            toggleMode(Mode.UNAVAILABLE)
-        } 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.BIOMETRIC_NOT_CONFIGURED)
-            } else {
-                // Check if fingerprint well init (be called the first time the fingerprint is configured
-                // and the activity still active)
-                if (biometricUnlockDatabaseHelper?.isKeyManagerInitialized != true) {
-                    biometricUnlockDatabaseHelper = BiometricUnlockDatabaseHelper(context)
-                    // callback for fingerprint findings
-                    biometricUnlockDatabaseHelper?.biometricUnlockCallback = this
-                    biometricUnlockDatabaseHelper?.authenticationCallback = biometricAuthenticationCallback
-                }
-                // Recheck to change the mode
-                if (biometricUnlockDatabaseHelper?.isKeyManagerInitialized != true) {
-                    toggleMode(Mode.KEY_MANAGER_UNAVAILABLE)
-                } else {
-                    if (checkboxPasswordView?.isChecked == true) {
-                        // listen for encryption
-                        toggleMode(Mode.STORE_CREDENTIAL)
-                    } else {
-                        cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { 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
-                            })
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun toggleMode(newBiometricMode: Mode) {
-        if (newBiometricMode != biometricMode) {
-            biometricMode = newBiometricMode
-            initBiometricMode()
-        }
-    }
-
-    private val biometricAuthenticationCallback = object : BiometricPrompt.AuthenticationCallback () {
-
-        override fun onAuthenticationError(
-                errorCode: Int,
-                errString: CharSequence) {
-            context.runOnUiThread {
-                Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
-                setAdvancedUnlockedMessageView(errString.toString())
-            }
-        }
-
-        override fun onAuthenticationFailed() {
-            context.runOnUiThread {
-                Log.e(TAG, "Biometric authentication failed, biometric not recognized")
-                setAdvancedUnlockedMessageView(R.string.biometric_not_recognized)
-            }
-        }
-
-        override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-            context.runOnUiThread {
-                when (biometricMode) {
-                    Mode.UNAVAILABLE -> {}
-                    Mode.BIOMETRIC_NOT_CONFIGURED -> {}
-                    Mode.KEY_MANAGER_UNAVAILABLE -> {}
-                    Mode.WAIT_CREDENTIAL -> {}
-                    Mode.STORE_CREDENTIAL -> {
-                        // newly store the entered password in encrypted way
-                        biometricUnlockDatabaseHelper?.encryptData(passwordView?.text.toString())
-                    }
-                    Mode.EXTRACT_CREDENTIAL -> {
-                        // retrieve the encrypted value from preferences
-                        cipherDatabaseAction.getCipherDatabase(databaseFileUri) {
-                            it?.encryptedValue?.let { value ->
-                                biometricUnlockDatabaseHelper?.decryptData(value)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun initNotAvailable() {
-        showFingerPrintViews(false)
-
-        advancedUnlockInfoView?.setIconViewClickListener(false, null)
-    }
-
-    private fun initNotConfigured() {
-        showFingerPrintViews(true)
-        setAdvancedUnlockedTitleView(R.string.configure_biometric)
-        setAdvancedUnlockedMessageView("")
-
-        advancedUnlockInfoView?.setIconViewClickListener(false) {
-            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
-        }
-    }
-
-    private fun initKeyManagerNotAvailable() {
-        showFingerPrintViews(true)
-        setAdvancedUnlockedTitleView(R.string.keystore_not_accessible)
-        setAdvancedUnlockedMessageView("")
-
-        advancedUnlockInfoView?.setIconViewClickListener(false) {
-            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
-        }
-    }
-
-    private fun initWaitData() {
-        showFingerPrintViews(true)
-        setAdvancedUnlockedTitleView(R.string.no_credentials_stored)
-        setAdvancedUnlockedMessageView("")
-
-        advancedUnlockInfoView?.setIconViewClickListener(false) {
-            biometricAuthenticationCallback.onAuthenticationError(
-                    BiometricConstants.ERROR_UNABLE_TO_PROCESS
-                    , context.getString(R.string.credential_before_click_biometric_button))
-        }
-    }
-
-    private fun openBiometricPrompt(biometricPrompt: BiometricPrompt?,
-                                    cryptoObject: BiometricPrompt.CryptoObject,
-                                    promptInfo: BiometricPrompt.PromptInfo) {
-        context.runOnUiThread {
-            biometricPrompt?.authenticate(promptInfo, cryptoObject)
-        }
-    }
-
-    private fun initEncryptData() {
-        showFingerPrintViews(true)
-        setAdvancedUnlockedTitleView(R.string.open_biometric_prompt_store_credential)
-        setAdvancedUnlockedMessageView("")
-
-        biometricUnlockDatabaseHelper?.initEncryptData { biometricPrompt, cryptoObject, promptInfo ->
-
-            cryptoObject?.let { crypto ->
-                // Set listener to open the biometric dialog and save credential
-                advancedUnlockInfoView?.setIconViewClickListener { _ ->
-                    openBiometricPrompt(biometricPrompt, crypto, promptInfo)
-                }
-            }
-
-        }
-    }
-
-    private fun initDecryptData() {
-        showFingerPrintViews(true)
-        setAdvancedUnlockedTitleView(R.string.open_biometric_prompt_unlock_database)
-        setAdvancedUnlockedMessageView("")
-
-        if (biometricUnlockDatabaseHelper != null) {
-            cipherDatabaseAction.getCipherDatabase(databaseFileUri) {
-
-                it?.specParameters?.let { specs ->
-                    biometricUnlockDatabaseHelper?.initDecryptData(specs) { biometricPrompt, cryptoObject, promptInfo ->
-
-                        cryptoObject?.let { crypto ->
-                            // Set listener to open the biometric dialog and check credential
-                            advancedUnlockInfoView?.setIconViewClickListener { _ ->
-                                openBiometricPrompt(biometricPrompt, crypto, promptInfo)
-                            }
-
-                            // Auto open the biometric prompt
-                            if (isBiometricPromptAutoOpenEnable) {
-                                isBiometricPromptAutoOpenEnable = false
-                                openBiometricPrompt(biometricPrompt, crypto, promptInfo)
-                            }
-                        }
-
-                    }
-                }
-            }
-        }
-    }
-
-    @Synchronized
-    fun initBiometricMode() {
-        when (biometricMode) {
-            Mode.UNAVAILABLE -> initNotAvailable()
-            Mode.BIOMETRIC_NOT_CONFIGURED -> initNotConfigured()
-            Mode.KEY_MANAGER_UNAVAILABLE -> initKeyManagerNotAvailable()
-            Mode.WAIT_CREDENTIAL -> initWaitData()
-            Mode.STORE_CREDENTIAL -> initEncryptData()
-            Mode.EXTRACT_CREDENTIAL -> initDecryptData()
-        }
-        // Show fingerprint key deletion
-        context.invalidateOptionsMenu()
-    }
-
-    fun destroy() {
-        // Close the biometric prompt
-        biometricUnlockDatabaseHelper?.closeBiometricPrompt()
-        // Restore the checked listener
-        checkboxPasswordView?.setOnCheckedChangeListener(onCheckedPasswordChangeListener)
-    }
-
-    // Only to fix multiple fingerprint menu #332
-    private var addBiometricMenuInProgress = false
-    fun inflateOptionsMenu(menuInflater: MenuInflater, menu: Menu) {
-        if (!addBiometricMenuInProgress) {
-            addBiometricMenuInProgress = true
-            cipherDatabaseAction.containsCipherDatabase(databaseFileUri) {
-                if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.BIOMETRIC_NOT_CONFIGURED)
-                        && it) {
-                    menuInflater.inflate(R.menu.advanced_unlock, menu)
-                    addBiometricMenuInProgress = false
-                }
-            }
-        }
-    }
-
-    fun deleteEntryKey() {
-        biometricUnlockDatabaseHelper?.deleteEntryKey()
-        cipherDatabaseAction.deleteByDatabaseUri(databaseFileUri)
-        biometricMode = Mode.BIOMETRIC_NOT_CONFIGURED
-        checkBiometricAvailability()
-    }
-
-    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {
-        loadDatabaseAfterRegisterCredentials.invoke(encryptedValue, ivSpec)
-    }
-
-    override fun handleDecryptedResult(decryptedValue: String) {
-        // Load database directly with password retrieve
-        loadDatabaseAfterRetrieveCredentials.invoke(decryptedValue)
-    }
-
-    override fun onInvalidKeyException(e: Exception) {
-        setAdvancedUnlockedMessageView(R.string.biometric_invalid_key)
-    }
-
-    override fun onBiometricException(e: Exception) {
-        e.localizedMessage?.let {
-            setAdvancedUnlockedMessageView(it)
-        }
-    }
-
-    private fun showFingerPrintViews(show: Boolean) {
-        context.runOnUiThread { advancedUnlockInfoView?.hide = !show }
-    }
-
-    private fun setAdvancedUnlockedTitleView(textId: Int) {
-        context.runOnUiThread {
-            advancedUnlockInfoView?.setTitle(textId)
-        }
-    }
-
-    private fun setAdvancedUnlockedMessageView(textId: Int) {
-        context.runOnUiThread {
-            advancedUnlockInfoView?.setMessage(textId)
-        }
-    }
-
-    private fun setAdvancedUnlockedMessageView(text: CharSequence) {
-        context.runOnUiThread {
-            advancedUnlockInfoView?.message = text
-        }
-    }
-
-    enum class Mode {
-        UNAVAILABLE, BIOMETRIC_NOT_CONFIGURED, KEY_MANAGER_UNAVAILABLE, WAIT_CREDENTIAL, STORE_CREDENTIAL, EXTRACT_CREDENTIAL
-    }
-
-    companion object {
-
-        private val TAG = AdvancedUnlockedManager::class.java.name
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
@@ -1,323 +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.app.KeyguardManager
-import android.content.Context
-import android.os.Build
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyPermanentlyInvalidatedException
-import android.security.keystore.KeyProperties
-import android.util.Base64
-import android.util.Log
-import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.R
-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 BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
-
-    private var biometricPrompt: BiometricPrompt? = null
-
-    private var keyStore: KeyStore? = null
-    private var keyGenerator: KeyGenerator? = null
-    private var cipher: Cipher? = null
-    private var keyguardManager: KeyguardManager? = null
-    private var cryptoObject: BiometricPrompt.CryptoObject? = null
-
-    private var isKeyManagerInit = false
-    var authenticationCallback: BiometricPrompt.AuthenticationCallback? = null
-    var biometricUnlockCallback: BiometricUnlockCallback? = null
-
-    private val promptInfoStoreCredential = BiometricPrompt.PromptInfo.Builder().apply {
-        setTitle(context.getString(R.string.biometric_prompt_store_credential_title))
-        setDescription(context.getString(R.string.biometric_prompt_store_credential_message))
-        setConfirmationRequired(true)
-        // TODO device credential #102 #152
-        /*
-        if (keyguardManager?.isDeviceSecure == true)
-            setDeviceCredentialAllowed(true)
-        else
-        */
-            setNegativeButtonText(context.getString(android.R.string.cancel))
-    }.build()
-
-    private val promptInfoExtractCredential = BiometricPrompt.PromptInfo.Builder().apply {
-        setTitle(context.getString(R.string.biometric_prompt_extract_credential_title))
-        //setDescription(context.getString(R.string.biometric_prompt_extract_credential_message))
-        setConfirmationRequired(false)
-        // TODO device credential #102 #152
-        /*
-        if (keyguardManager?.isDeviceSecure == true)
-            setDeviceCredentialAllowed(true)
-        else
-         */
-            setNegativeButtonText(context.getString(android.R.string.cancel))
-    }.build()
-
-    val isKeyManagerInitialized: Boolean
-        get() {
-            if (!isKeyManagerInit) {
-                biometricUnlockCallback?.onBiometricException(Exception("Biometric not initialized"))
-            }
-            return isKeyManagerInit
-        }
-
-    init {
-        if (BiometricManager.from(context).canAuthenticate() != BiometricManager.BIOMETRIC_SUCCESS) {
-            // really not much to do when no fingerprint support found
-            isKeyManagerInit = false
-        } else {
-            this.keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager?
-
-            try {
-                this.keyStore = KeyStore.getInstance(BIOMETRIC_KEYSTORE)
-                this.keyGenerator = KeyGenerator.getInstance(BIOMETRIC_KEY_ALGORITHM, BIOMETRIC_KEYSTORE)
-                this.cipher = Cipher.getInstance(
-                        BIOMETRIC_KEY_ALGORITHM + "/"
-                                + BIOMETRIC_BLOCKS_MODES + "/"
-                                + BIOMETRIC_ENCRYPTION_PADDING)
-                this.cryptoObject = BiometricPrompt.CryptoObject(cipher!!)
-                isKeyManagerInit = (keyStore != null
-                        && keyGenerator != null
-                        && cipher != null)
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to initialize the keystore", e)
-                isKeyManagerInit = false
-                biometricUnlockCallback?.onBiometricException(e)
-            }
-        }
-    }
-
-    private fun getSecretKey(): SecretKey? {
-        if (!isKeyManagerInitialized) {
-            return null
-        }
-        try {
-            // Create new key if needed
-            keyStore?.let { keyStore ->
-                keyStore.load(null)
-
-                try {
-                    if (!keyStore.containsAlias(BIOMETRIC_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(
-                                        BIOMETRIC_KEYSTORE_KEY,
-                                        KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
-                                        .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
-                                        .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
-                                        // Require the user to authenticate with a fingerprint to authorize every use
-                                        // of the key
-                                        .setUserAuthenticationRequired(true)
-                                        .build())
-                        keyGenerator?.generateKey()
-                    }
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to create a key in keystore", e)
-                    biometricUnlockCallback?.onBiometricException(e)
-                }
-
-                return keyStore.getKey(BIOMETRIC_KEYSTORE_KEY, null) as SecretKey?
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to retrieve the key in keystore", e)
-            biometricUnlockCallback?.onBiometricException(e)
-        }
-        return null
-    }
-
-    fun initEncryptData(actionIfCypherInit
-                        : (biometricPrompt: BiometricPrompt?,
-                           cryptoObject: BiometricPrompt.CryptoObject?,
-                           promptInfo: BiometricPrompt.PromptInfo)->Unit) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            getSecretKey()?.let { secretKey ->
-                cipher?.init(Cipher.ENCRYPT_MODE, secretKey)
-
-                initBiometricPrompt()
-                actionIfCypherInit.invoke(biometricPrompt, cryptoObject, promptInfoStoreCredential)
-            }
-
-        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
-            Log.e(TAG, "Unable to initialize encrypt data", unrecoverableKeyException)
-            biometricUnlockCallback?.onInvalidKeyException(unrecoverableKeyException)
-        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
-            Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
-            biometricUnlockCallback?.onInvalidKeyException(invalidKeyException)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to initialize encrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
-        }
-    }
-
-    fun encryptData(value: String) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            val encrypted = cipher?.doFinal(value.toByteArray())
-            val encryptedBase64 = Base64.encodeToString(encrypted, Base64.NO_WRAP)
-
-            // passes updated iv spec on to callback so this can be stored for decryption
-            cipher?.parameters?.getParameterSpec(IvParameterSpec::class.java)?.let{ spec ->
-                val ivSpecValue = Base64.encodeToString(spec.iv, Base64.NO_WRAP)
-                biometricUnlockCallback?.handleEncryptedResult(encryptedBase64, ivSpecValue)
-            }
-
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to encrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
-        }
-    }
-
-    fun initDecryptData(ivSpecValue: String, actionIfCypherInit
-            : (biometricPrompt: BiometricPrompt?,
-               cryptoObject: BiometricPrompt.CryptoObject?,
-               promptInfo: BiometricPrompt.PromptInfo)->Unit) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            // important to restore spec here that was used for decryption
-            val iv = Base64.decode(ivSpecValue, Base64.NO_WRAP)
-            val spec = IvParameterSpec(iv)
-
-            getSecretKey()?.let { secretKey ->
-                cipher?.init(Cipher.DECRYPT_MODE, secretKey, spec)
-
-                initBiometricPrompt()
-                actionIfCypherInit.invoke(biometricPrompt, cryptoObject, promptInfoExtractCredential)
-            }
-
-        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
-            Log.e(TAG, "Unable to initialize decrypt data", unrecoverableKeyException)
-            deleteEntryKey()
-        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
-            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
-            biometricUnlockCallback?.onInvalidKeyException(invalidKeyException)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to initialize decrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
-        }
-    }
-
-    fun decryptData(encryptedValue: String) {
-        if (!isKeyManagerInitialized) {
-            return
-        }
-        try {
-            // actual decryption here
-            val encrypted = Base64.decode(encryptedValue, Base64.NO_WRAP)
-            cipher?.doFinal(encrypted)?.let { decrypted ->
-                biometricUnlockCallback?.handleDecryptedResult(String(decrypted))
-            }
-        } catch (badPaddingException: BadPaddingException) {
-            Log.e(TAG, "Unable to decrypt data", badPaddingException)
-            biometricUnlockCallback?.onInvalidKeyException(badPaddingException)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to decrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
-        }
-    }
-
-    fun deleteEntryKey() {
-        try {
-            keyStore?.load(null)
-            keyStore?.deleteEntry(BIOMETRIC_KEYSTORE_KEY)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to delete entry key in keystore", e)
-            biometricUnlockCallback?.onBiometricException(e)
-        }
-    }
-
-    @Synchronized
-    fun initBiometricPrompt() {
-        if (biometricPrompt == null) {
-            authenticationCallback?.let {
-                biometricPrompt = BiometricPrompt(context, Executors.newSingleThreadExecutor(), it)
-            }
-        }
-    }
-
-    fun closeBiometricPrompt() {
-        biometricPrompt?.cancelAuthentication()
-    }
-
-    interface BiometricUnlockErrorCallback {
-        fun onInvalidKeyException(e: Exception)
-        fun onBiometricException(e: Exception)
-    }
-
-    interface BiometricUnlockCallback : BiometricUnlockErrorCallback {
-        fun handleEncryptedResult(encryptedValue: String, ivSpec: String)
-        fun handleDecryptedResult(decryptedValue: String)
-    }
-
-    companion object {
-
-        private val TAG = BiometricUnlockDatabaseHelper::class.java.name
-
-        private const val BIOMETRIC_KEYSTORE = "AndroidKeyStore"
-        private const val BIOMETRIC_KEYSTORE_KEY = "com.kunzisoft.keepass.biometric.key"
-        private const val BIOMETRIC_KEY_ALGORITHM = KeyProperties.KEY_ALGORITHM_AES
-        private const val BIOMETRIC_BLOCKS_MODES = KeyProperties.BLOCK_MODE_CBC
-        private const val BIOMETRIC_ENCRYPTION_PADDING = KeyProperties.ENCRYPTION_PADDING_PKCS7
-
-        /**
-         * Remove entry key in keystore
-         */
-        fun deleteEntryKeyInKeystoreForBiometric(context: FragmentActivity,
-                                                 biometricCallback: BiometricUnlockErrorCallback) {
-            BiometricUnlockDatabaseHelper(context).apply {
-                biometricUnlockCallback = object : BiometricUnlockCallback {
-
-                    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {}
-
-                    override fun handleDecryptedResult(decryptedValue: String) {}
-
-                    override fun onInvalidKeyException(e: Exception) {
-                        biometricCallback.onInvalidKeyException(e)
-                    }
-
-                    override fun onBiometricException(e: Exception) {
-                        biometricCallback.onBiometricException(e)
-                    }
-                }
-                deleteEntryKey()
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.kt
@@ -1,79 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto
-
-import android.os.Build
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.crypto.engine.ChaCha20Engine
-import com.kunzisoft.keepass.crypto.engine.CipherEngine
-import com.kunzisoft.keepass.crypto.engine.TwofishEngine
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.NoSuchAlgorithmException
-import java.security.Security
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-
-object CipherFactory {
-
-    private var blacklistInit = false
-    private var blacklisted: Boolean = false
-
-    init {
-        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME)
-        Security.addProvider(BouncyCastleProvider())
-    }
-
-    fun deviceBlacklisted(): Boolean {
-        if (!blacklistInit) {
-            blacklistInit = true
-            // The Acer Iconia A500 is special and seems to always crash in the native crypto libraries
-            blacklisted = Build.MODEL == "A500"
-        }
-        return blacklisted
-    }
-
-    private fun hasNativeImplementation(transformation: String): Boolean {
-        return transformation == "AES/CBC/PKCS5Padding"
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
-    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
-        // Return the native AES if it is possible
-        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
-            Cipher.getInstance(transformation, AESProvider())
-        } else {
-            Cipher.getInstance(transformation)
-        }
-    }
-
-    /**
-     * Generate appropriate cipher based on KeePass 2.x UUID's
-     */
-    @Throws(NoSuchAlgorithmException::class)
-    fun getInstance(uuid: UUID): CipherEngine {
-        return when (uuid) {
-            AesEngine.CIPHER_UUID -> AesEngine()
-            TwofishEngine.CIPHER_UUID -> TwofishEngine()
-            ChaCha20Engine.CIPHER_UUID -> ChaCha20Engine()
-            else -> throw NoSuchAlgorithmException("UUID unrecognized.")
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt
@@ -1,105 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto
-
-import com.kunzisoft.keepass.stream.NullOutputStream
-import com.kunzisoft.keepass.stream.longTo8Bytes
-import java.io.IOException
-import java.security.DigestOutputStream
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Mac
-import kotlin.math.min
-
-object CryptoUtil {
-
-    fun resizeKey(inBytes: ByteArray, inOffset: Int, cbIn: Int, cbOut: Int): ByteArray {
-        if (cbOut == 0) return ByteArray(0)
-
-        val hash: ByteArray = if (cbOut <= 32) {
-            hashSha256(inBytes, inOffset, cbIn)
-        } else {
-            hashSha512(inBytes, inOffset, cbIn)
-        }
-
-        if (cbOut == hash.size) {
-            return hash
-        }
-
-        val ret = ByteArray(cbOut)
-        if (cbOut < hash.size) {
-            System.arraycopy(hash, 0, ret, 0, cbOut)
-        } else {
-            var pos = 0
-            var r: Long = 0
-            while (pos < cbOut) {
-                val hmac: Mac
-                try {
-                    hmac = Mac.getInstance("HmacSHA256")
-                } catch (e: NoSuchAlgorithmException) {
-                    throw RuntimeException(e)
-                }
-
-                val pbR = longTo8Bytes(r)
-                val part = hmac.doFinal(pbR)
-
-                val copy = min(cbOut - pos, part.size)
-                System.arraycopy(part, 0, ret, pos, copy)
-                pos += copy
-                r++
-
-                Arrays.fill(part, 0.toByte())
-            }
-        }
-
-        Arrays.fill(hash, 0.toByte())
-        return ret
-    }
-
-    fun hashSha256(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
-        return hashGen("SHA-256", data, offset, count)
-    }
-
-    fun hashSha512(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
-        return hashGen("SHA-512", data, offset, count)
-    }
-
-    private fun hashGen(transform: String, data: ByteArray, offset: Int, count: Int): ByteArray {
-        val hash: MessageDigest
-        try {
-            hash = MessageDigest.getInstance(transform)
-        } catch (e: NoSuchAlgorithmException) {
-            throw RuntimeException(e)
-        }
-
-        val nos = NullOutputStream()
-        val dos = DigestOutputStream(nos, hash)
-
-        try {
-            dos.write(data, offset, count)
-            dos.close()
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-
-        return hash.digest()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt
@@ -1,70 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto
-
-import org.bouncycastle.crypto.StreamCipher
-import org.bouncycastle.crypto.engines.ChaCha7539Engine
-import org.bouncycastle.crypto.engines.Salsa20Engine
-import org.bouncycastle.crypto.params.KeyParameter
-import org.bouncycastle.crypto.params.ParametersWithIV
-
-object StreamCipherFactory {
-
-    private val SALSA_IV = byteArrayOf(0xE8.toByte(), 0x30, 0x09, 0x4B, 0x97.toByte(), 0x20, 0x5D, 0x2A)
-
-    fun getInstance(alg: CrsAlgorithm?, key: ByteArray): StreamCipher? {
-        return when {
-            alg === CrsAlgorithm.Salsa20 -> getSalsa20(key)
-            alg === CrsAlgorithm.ChaCha20 -> getChaCha20(key)
-            else -> null
-        }
-    }
-
-    private fun getSalsa20(key: ByteArray): StreamCipher {
-        // Build stream cipher key
-        val key32 = CryptoUtil.hashSha256(key)
-
-        val keyParam = KeyParameter(key32)
-        val ivParam = ParametersWithIV(keyParam, SALSA_IV)
-
-        val cipher = Salsa20Engine()
-        cipher.init(true, ivParam)
-
-        return cipher
-    }
-
-    private fun getChaCha20(key: ByteArray): StreamCipher {
-        // Build stream cipher key
-        val hash = CryptoUtil.hashSha512(key)
-        val key32 = ByteArray(32)
-        val iv = ByteArray(12)
-
-        System.arraycopy(hash, 0, key32, 0, 32)
-        System.arraycopy(hash, 32, iv, 0, 12)
-
-        val keyParam = KeyParameter(key32)
-        val ivParam = ParametersWithIV(keyParam, iv)
-
-        val cipher = ChaCha7539Engine()
-        cipher.init(true, ivParam)
-
-        return cipher
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt
@@ -1,68 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.engine
-
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class AesEngine : CipherEngine() {
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
-        val cipher = CipherFactory.getInstance("AES/CBC/PKCS5Padding", androidOverride)
-        cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
-        return cipher
-    }
-
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.AESRijndael
-    }
-
-    companion object {
-
-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0x31.toByte(),
-                        0xC1.toByte(),
-                        0xF2.toByte(),
-                        0xE6.toByte(),
-                        0xBF.toByte(),
-                        0x71.toByte(),
-                        0x43.toByte(),
-                        0x50.toByte(),
-                        0xBE.toByte(),
-                        0x58.toByte(),
-                        0x05.toByte(),
-                        0x21.toByte(),
-                        0x6A.toByte(),
-                        0xFC.toByte(),
-                        0x5A.toByte(),
-                        0xFF.toByte()))
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt
@@ -1,72 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.engine
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class TwofishEngine : CipherEngine() {
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
-        val cipher: Cipher = if (opmode == Cipher.ENCRYPT_MODE) {
-            CipherFactory.getInstance("Twofish/CBC/ZeroBytePadding", androidOverride)
-        } else {
-            CipherFactory.getInstance("Twofish/CBC/NoPadding", androidOverride)
-        }
-        cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
-
-        return cipher
-    }
-
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.Twofish
-    }
-
-    companion object {
-
-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0xAD.toByte(),
-                        0x68.toByte(),
-                        0xF2.toByte(),
-                        0x9F.toByte(),
-                        0x57.toByte(),
-                        0x6F.toByte(),
-                        0x4B.toByte(),
-                        0xB9.toByte(),
-                        0xA3.toByte(),
-                        0x6A.toByte(),
-                        0xD4.toByte(),
-                        0x7A.toByte(),
-                        0xF9.toByte(),
-                        0x65.toByte(),
-                        0x34.toByte(),
-                        0x6C.toByte()))
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AESKeyTransformerFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AESKeyTransformerFactory.kt
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.finalkey
-
-import com.kunzisoft.keepass.crypto.CipherFactory.deviceBlacklisted
-
-object AESKeyTransformerFactory : KeyTransformer() {
-    override fun transformMasterKey(seed: ByteArray?, key: ByteArray?, rounds: Long?): ByteArray? {
-        // Prefer the native final key implementation
-        val keyTransformer = if (!deviceBlacklisted()
-                && NativeAESKeyTransformer.available()) {
-            NativeAESKeyTransformer()
-        } else {
-            // Fall back on the android crypto implementation
-            AndroidAESKeyTransformer()
-        }
-        return keyTransformer.transformMasterKey(seed, key, rounds)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java
@@ -1,48 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.keyDerivation;
-
-import com.kunzisoft.keepass.crypto.NativeLib;
-import com.kunzisoft.keepass.utils.UnsignedInt;
-
-import java.io.IOException;
-
-public class Argon2Native {
-
-    public static byte[] transformKey(byte[] password, byte[] salt, UnsignedInt parallelism,
-                                      UnsignedInt memory, UnsignedInt iterations, byte[] secretKey,
-                                      byte[] associatedData, UnsignedInt version) throws IOException {
-        NativeLib.INSTANCE.init();
-
-        return nTransformMasterKey(
-                password,
-                salt,
-                parallelism.toInt(),
-                memory.toInt(),
-                iterations.toInt(),
-                secretKey,
-                associatedData,
-                version.toInt());
-    }
-
-    private static native byte[] nTransformMasterKey(byte[] password, byte[] salt, int parallelism,
-                                              int memory, int iterations, byte[] secretKey,
-                                              byte[] associatedData, int version) throws IOException;
-}
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/AssignPasswordInDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/AssignPasswordInDatabaseRunnable.kt
@@ -24,39 +24,26 @@ 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 AssignPasswordInDatabaseRunnable (
        context: Context,
        database: Database,
        protected val mDatabaseUri: Uri,
-        withMasterPassword: Boolean,
-        masterPassword: String?,
-        withKeyFile: Boolean,
-        keyFile: Uri?)
+        protected val mMainCredential: MainCredential)
    : SaveDatabaseRunnable(context, database, true) {

-    private var mMasterPassword: String? = null
-    protected var mKeyFile: Uri? = null
-
    private var mBackupKey: ByteArray? = null

-    init {
-        if (withMasterPassword)
-            this.mMasterPassword = masterPassword
-        if (withKeyFile)
-            this.mKeyFile = keyFile
-    }
-
    override fun onStartRun() {
        // Set key
        try {
-            // TODO move master key methods
            mBackupKey = ByteArray(database.masterKey.size)
            System.arraycopy(database.masterKey, 0, mBackupKey!!, 0, mBackupKey!!.size)

-            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mKeyFile)
-            database.retrieveMasterKey(mMasterPassword, uriInputStream)
+            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mMainCredential.keyFileUri)
+            database.retrieveMasterKey(mMainCredential.masterPassword, uriInputStream)
        } catch (e: Exception) {
            erase(mBackupKey)
            setError(e)
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt
@@ -24,47 +24,54 @@ import android.net.Uri
 import android.util.Log
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.UriUtil

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

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

        super.onStartRun()
    }

-    override fun onFinishRun() {
-        super.onFinishRun()
+    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)) mKeyFile else null)
+                                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() {
+        super.onFinishRun()
+
+        createDatabaseResult?.invoke(result)
+    }
 }
--- a/Show More
+++ b/Show More