Merge branch 'release/2.9.12'

Currently translated at 100.0% (507 of 507 strings)

Translation: KeePassDX/Strings
Translate-URL: https://hosted.weblate.org/projects/keepass-dx/strings/pl/

.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]

CHANGELOG

@@ -1,3 +1,110 @@
+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

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.

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.

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".
+
+---

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.

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.*

_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-cayman

app/build.gradle

@@ -4,22 +4,23 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '30.0.3'
+    ndkVersion '21.3.6528147'
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
-        versionCode = 39
+        versionCode = 56
-        versionName = "2.8.3"
+        versionName = "2.9.12"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
         testInstrumentationRunner = "android.test.InstrumentationTestRunner"
 
         buildConfigField "String[]", "ICON_PACKS", "{\"classic\",\"material\"}"
-        manifestPlaceholders = [ googleAndroidBackupAPIKey:"" ]
+        manifestPlaceholders = [ googleAndroidBackupAPIKey:"unused" ]
 
         kapt {
             arguments {
@@ -91,36 +92,38 @@ 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.2.0'
-    implementation 'androidx.preference:preference:1.1.1'
+    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.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.0.1'
+    implementation 'androidx.biometric:biometric:1.1.0-rc01'
     // Lifecycle - LiveData - ViewModel - Coroutines
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.3.2"
     implementation 'androidx.fragment:fragment-ktx:1.2.5'
-    // To upgrade with style
+    // WARNING: To upgrade with style, bug in edit text
     implementation 'com.google.android.material:material:1.0.0'
     // Database
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
+    // Autofill
+    implementation "androidx.autofill:autofill:1.1.0-rc01"
     // Crypto
     implementation 'org.bouncycastle:bcprov-jdk15on:1.65.01'
     // 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'
+    implementation 'commons-codec:commons-codec:1.15'
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')

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"
+    xmlns:aapt="http://schemas.android.com/aapt"
-android:viewportHeight="108"
+    android:viewportWidth="108"
-android:width="108dp"
+    android:viewportHeight="108"
-android:height="108dp">
+    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"

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"
+    xmlns:aapt="http://schemas.android.com/aapt"
-android:viewportHeight="108"
+    android:viewportWidth="108"
-android:width="108dp"
+    android:viewportHeight="108"
-android:height="108dp">
+    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"

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" />
@@ -148,6 +155,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"
@@ -165,13 +179,17 @@
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".notifications.AttachmentFileNotificationService"
+            android:name="com.kunzisoft.keepass.notifications.AttachmentFileNotificationService"
             android:enabled="true"
             android:exported="false" />
         <service
             android:name="com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService"
             android:enabled="true"
             android:exported="false" />
+        <service
+            android:name="com.kunzisoft.keepass.notifications.AdvancedUnlockNotificationService"
+            android:enabled="true"
+            android:exported="false" />
         <!-- Receiver for Autofill -->
         <service
             android:name="com.kunzisoft.keepass.autofill.KeeAutofillService"

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
+        // Retrieve selection mode
-        val searchInfo = SearchInfo().apply {
+        EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode ->
-            applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
+            when (specialMode) {
-            webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+                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)
+        super.onCreate(savedInstanceState)
-        val assistStructure = AutofillHelper.retrieveAssistStructure(intent)
+    }
 
-        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
+            showBlockRestartMessage()
-            Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
             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,
+                                readOnly,
-                                false,
+                                autofillComponent,
-                                searchInfo)
+                                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,
+        private const val KEY_REGISTER_INFO = "KEY_REGISTER_INFO"
-                                           searchInfo: SearchInfo? = null): IntentSender {
+
+        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)
+        }
     }
 }

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,20 +39,24 @@ 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.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.database.element.Attachment
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
 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_RELOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
+import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.ClipboardHelper
@@ -132,7 +137,7 @@ class EntryActivity : LockingActivity() {
         }
 
         // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
+        coordinatorLayout?.resetAppTimeoutWhenViewFocusedOrChanged(this)
 
         // Init the clipboard helper
         clipboardHelper = ClipboardHelper(this)
@@ -149,6 +154,10 @@ class EntryActivity : LockingActivity() {
                     if (result.isSuccess)
                         finish()
                 }
+                ACTION_DATABASE_RELOAD_TASK -> {
+                    // Close the current activity
+                    finish()
+                }
             }
             coordinatorLayout?.showActionError(result)
         }
@@ -197,8 +206,7 @@ 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 (mFirstLaunchOfActivity) {
                 // Manage entry to launch copying notification if allowed
@@ -230,23 +238,21 @@ class EntryActivity : LockingActivity() {
 
     private fun fillEntryDataInContentsView(entry: Entry) {
 
-        val database = Database.getInstance()
+        val entryInfo = entry.getEntryInfo(mDatabase)
-        database.startManageEntry(entry)
+
         // Assign title icon
-        titleIconView?.assignDatabaseIcon(database.drawFactory, entry.icon, iconColor)
+        titleIconView?.assignDatabaseIcon(mDatabase!!.drawFactory, 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?.assignUserName(entryInfo.username) {
-            database.startManageEntry(entry)
+            clipboardHelper?.timeoutCopyToClipboard(entryInfo.username,
-            clipboardHelper?.timeoutCopyToClipboard(entry.username,
                     getString(R.string.copy_field,
                             getString(R.string.entry_user_name)))
-            database.stopManageEntry(entry)
         }
 
         val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
@@ -276,11 +282,9 @@ class EntryActivity : LockingActivity() {
 
         val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
             View.OnClickListener {
-                database.startManageEntry(entry)
+                clipboardHelper?.timeoutCopyToClipboard(entryInfo.password,
-                clipboardHelper?.timeoutCopyToClipboard(entry.password,
                         getString(R.string.copy_field,
                                 getString(R.string.entry_password)))
-                database.stopManageEntry(entry)
             }
         } else {
             // If dialog not already shown
@@ -290,42 +294,46 @@ class EntryActivity : LockingActivity() {
                 null
             }
         }
-        entryContentsView?.assignPassword(entry.password,
+        entryContentsView?.assignPassword(entryInfo.password,
                 allowCopyPasswordAndProtectedFields,
                 onPasswordCopyClickListener)
 
         //Assign OTP field
-        entryContentsView?.assignOtp(entry.getOtpElement(), entryProgress,
+        entry.getOtpElement()?.let { otpElement ->
-                View.OnClickListener {
+            entryContentsView?.assignOtp(otpElement, entryProgress) {
-                    entry.getOtpElement()?.let { otpElement ->
+                clipboardHelper?.timeoutCopyToClipboard(
-                        clipboardHelper?.timeoutCopyToClipboard(
+                        otpElement.token,
-                                otpElement.token,
+                        getString(R.string.copy_field, getString(R.string.entry_otp))
-                                getString(R.string.copy_field, getString(R.string.entry_otp))
+                )
-                        )
+            }
-                    }
+        }
-        })
 
-        entryContentsView?.assignURL(entry.url)
+        entryContentsView?.assignURL(entryInfo.url)
-        entryContentsView?.assignNotes(entry.notes)
+        entryContentsView?.assignNotes(entryInfo.notes)
 
         // Assign custom fields
-        if (entry.allowCustomFields()) {
+        if (mDatabase?.allowEntryCustomFields() == true) {
             entryContentsView?.clearExtraFields()
-            for ((label, value) in entry.customFields) {
+            entryInfo.customFields.forEach { field ->
-                val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
+                val label = field.name
-                if (allowCopyProtectedField) {
+                // OTP field is already managed in dedicated view
-                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
+                if (label != OtpEntryFields.OTP_TOKEN_FIELD) {
-                        clipboardHelper?.timeoutCopyToClipboard(
+                    val value = field.protectedValue
-                                value.toString(),
+                    val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
-                                getString(R.string.copy_field, label)
+                    if (allowCopyProtectedField) {
-                        )
+                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
-                    }
+                            clipboardHelper?.timeoutCopyToClipboard(
-                } else {
+                                    value.toString(),
-                    // If dialog not already shown
+                                    getString(R.string.copy_field, label)
-                    if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                            )
-                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+                        }
                     } else {
-                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
+                        // If dialog not already shown
+                        if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+                        } else {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
+                        }
                     }
                 }
             }
@@ -333,24 +341,16 @@ class EntryActivity : LockingActivity() {
         entryContentsView?.setHiddenProtectedValue(!mShowPassword)
 
         // Manage attachments
-        mDatabase?.binaryPool?.let { binaryPool ->
+        entryContentsView?.assignAttachments(entryInfo.attachments.toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
-            entryContentsView?.assignAttachments(entry.getAttachments(binaryPool).toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
+            createDocument(this, attachmentItem.name)?.let { requestCode ->
-                createDocument(this, attachmentItem.name)?.let { requestCode ->
+                mAttachmentsToDownload[requestCode] = attachmentItem
-                    mAttachmentsToDownload[requestCode] = attachmentItem
-                }
             }
         }
 
         // Assign dates
-        entryContentsView?.assignCreationDate(entry.creationTime)
+        entryContentsView?.assignCreationDate(entryInfo.creationTime)
-        entryContentsView?.assignModificationDate(entry.lastModificationTime)
+        entryContentsView?.assignModificationDate(entryInfo.modificationTime)
-        entryContentsView?.assignLastAccessDate(entry.lastAccessTime)
+        entryContentsView?.setExpires(entryInfo.expires, entryInfo.expiryTime)
-        entryContentsView?.setExpires(entry.isCurrentlyExpires)
-        if (entry.expires) {
-            entryContentsView?.assignExpiresDate(entry.expiryTime)
-        } else {
-            entryContentsView?.assignExpiresDate(getString(R.string.never))
-        }
 
         // Manage history
         historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
@@ -365,8 +365,6 @@ class EntryActivity : LockingActivity() {
 
         // Assign special data
         entryContentsView?.assignUUID(entry.nodeId.id)
-
-        database.stopManageEntry(entry)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -404,6 +402,9 @@ class EntryActivity : LockingActivity() {
             menu.findItem(R.id.menu_save_database)?.isVisible = false
             menu.findItem(R.id.menu_edit)?.isVisible = false
         }
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            menu.findItem(R.id.menu_reload_database)?.isVisible = false
+        }
 
         val gotoUrl = menu.findItem(R.id.menu_goto_url)
         gotoUrl?.apply {
@@ -420,14 +421,14 @@ 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 entryFieldCopyView = findViewById<View>(R.id.entry_field_copy)
+        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
         val entryCopyEducationPerformed = entryFieldCopyView != null
                 && entryActivityEducation.checkAndPerformedEntryCopyEducation(
                         entryFieldCopyView,
@@ -497,6 +498,9 @@ class EntryActivity : LockingActivity() {
             R.id.menu_save_database -> {
                 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)

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

@@ -21,36 +21,47 @@ package com.kunzisoft.keepass.activities
 import android.app.Activity
 import android.app.DatePickerDialog
 import android.app.TimePickerDialog
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 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 android.widget.DatePicker
 import android.widget.TimePicker
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
+import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.*
 import com.kunzisoft.keepass.activities.dialogs.FileTooBigDialogFragment.Companion.MAX_WARNING_BINARY_FILE
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.autofill.AutofillComponent
+import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.element.*
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
-import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
 import com.kunzisoft.keepass.model.*
 import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService
 import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK
 import com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService
 import com.kunzisoft.keepass.otp.OtpElement
@@ -60,11 +71,12 @@ import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.view.EntryEditContentsView
+import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.view.showActionError
 import com.kunzisoft.keepass.view.updateLockPaddingLeft
 import org.joda.time.DateTime
 import java.util.*
+import kotlin.collections.ArrayList
 
 class EntryEditActivity : LockingActivity(),
         IconPickerDialogFragment.IconPickerListener,
@@ -81,28 +93,28 @@ class EntryEditActivity : LockingActivity(),
     // Refs of an entry and group in database, are not modifiable
     private var mEntry: Entry? = null
     private var mParent: Group? = null
-    // New or copy of mEntry in the database to be modifiable
-    private var mNewEntry: Entry? = null
     private var mIsNew: Boolean = false
 
     // Views
     private var coordinatorLayout: CoordinatorLayout? = null
     private var scrollView: NestedScrollView? = null
-    private var entryEditContentsView: EntryEditContentsView? = null
+    private var entryEditFragment: EntryEditFragment? = null
     private var entryEditAddToolBar: Toolbar? = null
     private var validateButton: View? = null
     private var lockView: View? = null
 
-    private var mFocusedEditExtraField: FocusedEditField? = null
-
     // To manage attachments
     private var mSelectFileHelper: SelectFileHelper? = null
     private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
     private var mAllowMultipleAttachments: Boolean = false
+    private var mTempAttachments = ArrayList<Attachment>()
 
     // Education
     private var entryEditActivityEducation: EntryEditActivityEducation? = null
 
+    // To ask data lost only one time
+    private var backPressedAlreadyApproved = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_entry_edit)
@@ -118,29 +130,13 @@ class EntryEditActivity : LockingActivity(),
         scrollView = findViewById(R.id.entry_edit_scroll)
         scrollView?.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
 
-        entryEditContentsView = findViewById(R.id.entry_edit_contents)
-        entryEditContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
-        entryEditContentsView?.onDateClickListener = View.OnClickListener {
-            entryEditContentsView?.expiresDate?.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(supportFragmentManager, "DatePickerFragment")
-            }
-        }
-        entryEditContentsView?.entryPasswordGeneratorView?.setOnClickListener {
-            openPasswordGenerator()
-        }
-
         lockView = findViewById(R.id.lock_button)
         lockView?.setOnClickListener {
             lockAndExit()
         }
 
         // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
+        coordinatorLayout?.resetAppTimeoutWhenViewFocusedOrChanged(this)
 
         stopService(Intent(this, ClipboardEntryNotificationService::class.java))
         stopService(Intent(this, KeyboardEntryNotificationService::class.java))
@@ -148,6 +144,8 @@ class EntryEditActivity : LockingActivity(),
         // Likely the app has been killed exit the activity
         mDatabase = Database.getInstance()
 
+        var tempEntryInfo: EntryInfo? = null
+
         // Entry is retrieve, it's an entry to update
         intent.getParcelableExtra<NodeId<UUID>>(KEY_ENTRY)?.let {
             mIsNew = false
@@ -163,70 +161,91 @@ class EntryEditActivity : LockingActivity(),
                     entry.parent = mParent
                 }
             }
-
+            tempEntryInfo = mEntry?.getEntryInfo(mDatabase, true)
-            // Create the new entry from the current one
-            if (savedInstanceState?.containsKey(KEY_NEW_ENTRY) != true) {
-                mEntry?.let { entry ->
-                    // Create a copy to modify
-                    mNewEntry = Entry(entry).also { newEntry ->
-                        // WARNING Remove the parent to keep memory with parcelable
-                        newEntry.removeParent()
-                    }
-                }
-            }
         }
 
         // Parent is retrieve, it's a new entry to create
         intent.getParcelableExtra<NodeId<*>>(KEY_PARENT)?.let {
             mIsNew = true
-            // Create an empty new entry
-            if (savedInstanceState?.containsKey(KEY_NEW_ENTRY) != true) {
-                mNewEntry = mDatabase?.createEntry()
-            }
             mParent = mDatabase?.getGroupById(it)
             // Add the default icon from parent if not a folder
             val parentIcon = mParent?.icon
+            tempEntryInfo = mDatabase?.createEntry()?.getEntryInfo(mDatabase, true)
+            // Set default icon
             if (parentIcon != null
                     && parentIcon.iconId != IconImage.UNKNOWN_ID
                     && parentIcon.iconId != IconImageStandard.FOLDER) {
-                temporarilySaveAndShowSelectedIcon(parentIcon)
+                tempEntryInfo?.icon = parentIcon
-            } else {
+            }
-                mDatabase?.drawFactory?.let { iconFactory ->
+            // Set default username
-                    entryEditContentsView?.setDefaultIcon(iconFactory)
+            tempEntryInfo?.username = mDatabase?.defaultUsername ?: ""
+        }
+
+        // Retrieve data from registration
+        val registerInfo = EntrySelectionHelper.retrieveRegisterInfoFromIntent(intent)
+        val searchInfo: SearchInfo? = registerInfo?.searchInfo
+                ?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
+        registerInfo?.username?.let {
+            tempEntryInfo?.username = it
+        }
+        registerInfo?.password?.let {
+            tempEntryInfo?.password = it
+        }
+        searchInfo?.let { tempSearchInfo ->
+            tempEntryInfo?.saveSearchInfo(mDatabase, tempSearchInfo)
+        }
+
+        // Build fragment to manage entry modification
+        entryEditFragment = supportFragmentManager.findFragmentByTag(ENTRY_EDIT_FRAGMENT_TAG) as? EntryEditFragment?
+        if (entryEditFragment == null) {
+            entryEditFragment = EntryEditFragment.getInstance(tempEntryInfo)
+        }
+        supportFragmentManager.beginTransaction()
+                .replace(R.id.entry_edit_contents, entryEditFragment!!, ENTRY_EDIT_FRAGMENT_TAG)
+                .commit()
+        entryEditFragment?.apply {
+            drawFactory = mDatabase?.drawFactory
+            setOnDateClickListener = View.OnClickListener {
+                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(supportFragmentManager, "DatePickerFragment")
                 }
             }
+            setOnPasswordGeneratorClickListener = View.OnClickListener {
+                openPasswordGenerator()
+            }
+            // Add listener to the icon
+            setOnIconViewClickListener = View.OnClickListener {
+                IconPickerDialogFragment.launch(this@EntryEditActivity)
+            }
+            setOnRemoveAttachment = { attachment ->
+                mAttachmentFileBinderManager?.removeBinaryAttachment(attachment)
+                removeAttachment(EntryAttachmentState(attachment, StreamDirection.DOWNLOAD))
+            }
+            setOnEditCustomField = { field ->
+                editCustomField(field)
+            }
         }
 
-        // Retrieve the new entry after an orientation change
+        // Retrieve temp attachments in case of deletion
-        if (savedInstanceState?.containsKey(KEY_NEW_ENTRY) == true) {
+        if (savedInstanceState?.containsKey(TEMP_ATTACHMENTS) == true) {
-            mNewEntry = savedInstanceState.getParcelable(KEY_NEW_ENTRY)
+            mTempAttachments = savedInstanceState.getParcelableArrayList(TEMP_ATTACHMENTS) ?: mTempAttachments
         }
 
-        if (savedInstanceState?.containsKey(EXTRA_FIELD_FOCUSED_ENTRY) == true) {
-            mFocusedEditExtraField = savedInstanceState.getParcelable(EXTRA_FIELD_FOCUSED_ENTRY)
-        }
-
-        // Close the activity if entry or parent can't be retrieve
-        if (mNewEntry == null || mParent == null) {
-            finish()
-            return
-        }
-
-        populateViewsWithEntry(mNewEntry!!)
-
         // Assign title
         title = if (mIsNew) getString(R.string.add_entry) else getString(R.string.edit_entry)
 
-        // Add listener to the icon
-        entryEditContentsView?.setOnIconViewClickListener { IconPickerDialogFragment.launch(this@EntryEditActivity) }
-
         // Bottom Bar
         entryEditAddToolBar = findViewById(R.id.entry_edit_bottom_bar)
         entryEditAddToolBar?.apply {
             menuInflater.inflate(R.menu.entry_edit, menu)
 
             menu.findItem(R.id.menu_add_field).apply {
-                val allowCustomField = mNewEntry?.allowCustomFields() == true
+                val allowCustomField = mDatabase?.allowEntryCustomFields() == true
                 isEnabled = allowCustomField
                 isVisible = allowCustomField
             }
@@ -278,14 +297,87 @@ class EntryEditActivity : LockingActivity(),
             when (actionTask) {
                 ACTION_DATABASE_CREATE_ENTRY_TASK,
                 ACTION_DATABASE_UPDATE_ENTRY_TASK -> {
-                    if (result.isSuccess)
+                    try {
-                        finish()
+                        if (result.isSuccess) {
+                            var newNodes: List<Node> = ArrayList()
+                            result.data?.getBundle(DatabaseTaskNotificationService.NEW_NODES_KEY)?.let { newNodesBundle ->
+                                mDatabase?.let { database ->
+                                    newNodes = DatabaseTaskNotificationService.getListNodesFromBundle(database, newNodesBundle)
+                                }
+                            }
+                            if (newNodes.size == 1) {
+                                (newNodes[0] as? Entry?)?.let { entry ->
+                                    mEntry = entry
+                                    EntrySelectionHelper.doSpecialAction(intent,
+                                            {
+                                                // Finish naturally
+                                                finishForEntryResult()
+                                            },
+                                            {
+                                                // Nothing when search retrieved
+                                            },
+                                            {
+                                                entryValidatedForSave()
+                                            },
+                                            {
+                                                entryValidatedForKeyboardSelection(entry)
+                                            },
+                                            { _, _ ->
+                                                entryValidatedForAutofillSelection(entry)
+                                            },
+                                            {
+                                                entryValidatedForAutofillRegistration()
+                                            }
+                                    )
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Unable to retrieve entry after database action", e)
+                    }
+                }
+                ACTION_DATABASE_RELOAD_TASK -> {
+                    // Close the current activity
+                    finish()
                 }
             }
             coordinatorLayout?.showActionError(result)
         }
     }
 
+    private fun entryValidatedForSave() {
+        onValidateSpecialMode()
+        finishForEntryResult()
+    }
+
+    private fun entryValidatedForKeyboardSelection(entry: Entry) {
+        // Populate Magikeyboard with entry
+        mDatabase?.let { database ->
+            populateKeyboardAndMoveAppToBackground(this,
+                    entry.getEntryInfo(database),
+                    intent)
+        }
+        onValidateSpecialMode()
+        // Don't keep activity history for entry edition
+        finishForEntryResult()
+    }
+
+    private fun entryValidatedForAutofillSelection(entry: Entry) {
+        // Build Autofill response with the entry selected
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mDatabase?.let { database ->
+                AutofillHelper.buildResponseAndSetResult(this@EntryEditActivity,
+                        entry.getEntryInfo(database))
+            }
+        }
+        onValidateSpecialMode()
+    }
+
+    private fun entryValidatedForAutofillRegistration() {
+        onValidateSpecialMode()
+        finishForEntryResult()
+    }
+
     override fun onResume() {
         super.onResume()
 
@@ -305,13 +397,12 @@ class EntryEditActivity : LockingActivity(),
                 override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
                     when (entryAttachmentState.downloadState) {
                         AttachmentState.START -> {
-                            entryEditContentsView?.apply {
+                            entryEditFragment?.apply {
                                 // When only one attachment is allowed
                                 if (!mAllowMultipleAttachments) {
                                     clearAttachments()
                                 }
                                 putAttachment(entryAttachmentState)
-                                requestLayout()
                                 // Scroll to the attachment position
                                 getAttachmentViewPosition(entryAttachmentState) {
                                     scrollView?.smoothScrollTo(0, it.toInt())
@@ -319,10 +410,10 @@ class EntryEditActivity : LockingActivity(),
                             }
                         }
                         AttachmentState.IN_PROGRESS -> {
-                            entryEditContentsView?.putAttachment(entryAttachmentState)
+                            entryEditFragment?.putAttachment(entryAttachmentState)
                         }
                         AttachmentState.COMPLETE -> {
-                            entryEditContentsView?.apply {
+                            entryEditFragment?.apply {
                                 putAttachment(entryAttachmentState)
                                 // Scroll to the attachment position
                                 getAttachmentViewPosition(entryAttachmentState) {
@@ -331,8 +422,10 @@ class EntryEditActivity : LockingActivity(),
                             }
                         }
                         AttachmentState.ERROR -> {
-                            mDatabase?.removeAttachmentIfNotUsed(entryAttachmentState.attachment)
+                            entryEditFragment?.removeAttachment(entryAttachmentState)
-                            entryEditContentsView?.removeAttachment(entryAttachmentState)
+                            coordinatorLayout?.let {
+                                Snackbar.make(it, R.string.error_file_not_create, Snackbar.LENGTH_LONG).asError().show()
+                            }
                         }
                         else -> {}
                     }
@@ -347,79 +440,6 @@ class EntryEditActivity : LockingActivity(),
         super.onPause()
     }
 
-    private fun populateViewsWithEntry(newEntry: Entry) {
-        // Don't start the field reference manager, we want to see the raw ref
-        mDatabase?.stopManageEntry(newEntry)
-
-        // Set info in temp parameters
-        temporarilySaveAndShowSelectedIcon(newEntry.icon)
-
-        // Set info in view
-        entryEditContentsView?.apply {
-            title = newEntry.title
-            username = if (mIsNew && newEntry.username.isEmpty())
-                            mDatabase?.defaultUsername ?: ""
-                       else
-                            newEntry.username
-            url = newEntry.url
-            password = newEntry.password
-            expires = newEntry.expires
-            if (expires)
-                expiresDate = newEntry.expiryTime
-            notes = newEntry.notes
-            assignExtraFields(newEntry.customFields.mapTo(ArrayList()) {
-                Field(it.key, it.value)
-            }, {
-                editCustomField(it)
-            }, mFocusedEditExtraField)
-
-            mDatabase?.binaryPool?.let { binaryPool ->
-                assignAttachments(newEntry.getAttachments(binaryPool).toSet(), StreamDirection.UPLOAD) { attachment ->
-                    newEntry.removeAttachment(attachment)
-                }
-            }
-        }
-    }
-
-    private fun populateEntryWithViews(newEntry: Entry) {
-
-        mDatabase?.startManageEntry(newEntry)
-
-        newEntry.apply {
-            // Build info from view
-            entryEditContentsView?.let { entryView ->
-                removeAllFields()
-                title = entryView.title
-                username = entryView.username
-                url = entryView.url
-                password = entryView.password
-                expires = entryView.expires
-                if (entryView.expires) {
-                    expiryTime = entryView.expiresDate
-                }
-                notes = entryView.notes
-                entryView.getExtraFields().forEach { customField ->
-                    putExtraField(customField.name, customField.protectedValue)
-                }
-                mDatabase?.binaryPool?.let { binaryPool ->
-                    entryView.getAttachments().forEach {
-                        putAttachment(it, binaryPool)
-                    }
-                }
-                mFocusedEditExtraField = entryView.getExtraFieldFocused()
-            }
-        }
-
-        mDatabase?.stopManageEntry(newEntry)
-    }
-
-    private fun temporarilySaveAndShowSelectedIcon(icon: IconImage) {
-        mNewEntry?.icon = icon
-        mDatabase?.drawFactory?.let { iconDrawFactory ->
-            entryEditContentsView?.setIcon(iconDrawFactory, icon)
-        }
-    }
-
     /**
      * Open the password generator fragment
      */
@@ -438,21 +458,43 @@ class EntryEditActivity : LockingActivity(),
         EntryCustomFieldDialogFragment.getInstance(field).show(supportFragmentManager, "customFieldDialog")
     }
 
-    override fun onNewCustomFieldApproved(newField: Field) {
+    private fun verifyNameField(field: Field,
-        entryEditContentsView?.apply {
+                                actionIfNewName: () -> Unit) {
-            putExtraField(newField)
+        var extraFieldAlreadyContainsName = false
-            getExtraFieldViewPosition(newField) { position ->
+        entryEditFragment?.getExtraFields()?.forEach {
-                scrollView?.smoothScrollTo(0, position.toInt())
+            if (it.name.equals(field.name, true))
+                extraFieldAlreadyContainsName = true
+        }
+
+        if (!extraFieldAlreadyContainsName
+                && Entry.newExtraFieldNameAllowed(field)) {
+            actionIfNewName.invoke()
+        } else {
+            Log.e(TAG, "Unable to create the new field, field name already exists")
+            coordinatorLayout?.let {
+                Snackbar.make(it, R.string.error_field_name_already_exists, Snackbar.LENGTH_LONG).asError().show()
             }
         }
     }
 
+    override fun onNewCustomFieldApproved(newField: Field) {
+        verifyNameField(newField) {
+            entryEditFragment?.putExtraField(newField)
+        }
+    }
+
     override fun onEditCustomFieldApproved(oldField: Field, newField: Field) {
-        entryEditContentsView?.replaceExtraField(oldField, newField)
+        if (oldField.name.equals(newField.name, true)) {
+            entryEditFragment?.replaceExtraField(oldField, newField)
+        } else {
+            verifyNameField(newField) {
+                entryEditFragment?.replaceExtraField(oldField, newField)
+            }
+        }
     }
 
     override fun onDeleteCustomFieldApproved(oldField: Field) {
-        entryEditContentsView?.removeExtraField(oldField)
+        entryEditFragment?.removeExtraField(oldField)
     }
 
     /**
@@ -469,22 +511,29 @@ class EntryEditActivity : LockingActivity(),
     }
 
     override fun onValidateReplaceFile(attachmentToUploadUri: Uri?, attachment: Attachment?) {
+        startUploadAttachment(attachmentToUploadUri, attachment)
+    }
+
+    private fun startUploadAttachment(attachmentToUploadUri: Uri?, attachment: Attachment?) {
         if (attachmentToUploadUri != null && attachment != null) {
+            // Start uploading in service
             mAttachmentFileBinderManager?.startUploadAttachment(attachmentToUploadUri, attachment)
+            // Add in temp list
+            mTempAttachments.add(attachment)
         }
     }
 
     private fun buildNewAttachment(attachmentToUploadUri: Uri, fileName: String) {
         val compression = mDatabase?.compressionForNewEntry() ?: false
-        mDatabase?.buildNewBinary(applicationContext.filesDir, false, compression)?.let { binaryAttachment ->
+        mDatabase?.buildNewBinary(UriUtil.getBinaryDir(this), compression)?.let { binaryAttachment ->
             val entryAttachment = Attachment(fileName, binaryAttachment)
             // Ask to replace the current attachment
-            if ((mDatabase?.allowMultipleAttachments != true && entryEditContentsView?.containsAttachment() == true) ||
+            if ((mDatabase?.allowMultipleAttachments != true && entryEditFragment?.containsAttachment() == true) ||
-                    entryEditContentsView?.containsAttachment(EntryAttachmentState(entryAttachment, StreamDirection.UPLOAD)) == true) {
+                    entryEditFragment?.containsAttachment(EntryAttachmentState(entryAttachment, StreamDirection.UPLOAD)) == true) {
                 ReplaceFileDialogFragment.build(attachmentToUploadUri, entryAttachment)
                         .show(supportFragmentManager, "replacementFileFragment")
             } else {
-                mAttachmentFileBinderManager?.startUploadAttachment(attachmentToUploadUri, entryAttachment)
+                startUploadAttachment(attachmentToUploadUri, entryAttachment)
             }
         }
     }
@@ -515,7 +564,7 @@ class EntryEditActivity : LockingActivity(),
     private fun setupOTP() {
         // Retrieve the current otpElement if exists
         // and open the dialog to set up the OTP
-        SetOTPDialogFragment.build(mEntry?.getOtpElement()?.otpModel)
+        SetOTPDialogFragment.build(entryEditFragment?.getEntryInfo()?.otpModel)
                 .show(supportFragmentManager, "addOTPDialog")
     }
 
@@ -523,18 +572,28 @@ class EntryEditActivity : LockingActivity(),
      * Saves the new entry or update an existing entry in the database
      */
     private fun saveEntry() {
-        // Launch a validation and show the error if present
+        // Get the temp entry
-        if (entryEditContentsView?.isValid() == true) {
+        entryEditFragment?.getEntryInfo()?.let { newEntryInfo ->
-            // Clone the entry
+
-            mNewEntry?.let { newEntry ->
+            if (mIsNew) {
+                // Create new one
+                mDatabase?.createEntry()
+            } else {
+                // Create a clone
+                Entry(mEntry!!)
+            }?.let { newEntry ->
 
-                // WARNING Add the parent previously deleted
-                newEntry.parent = mEntry?.parent
                 // Build info
-                newEntry.lastAccessTime = DateInstant()
+                newEntry.setEntryInfo(mDatabase, newEntryInfo)
-                newEntry.lastModificationTime = DateInstant()
 
-                populateEntryWithViews(newEntry)
+                // Delete temp attachment if not used
+                mTempAttachments.forEach {
+                    mDatabase?.binaryPool?.let { binaryPool ->
+                        if (!newEntry.getAttachments(binaryPool).contains(it)) {
+                            mDatabase?.removeAttachmentIfNotUsed(it)
+                        }
+                    }
+                }
 
                 // Open a progress dialog and save entry
                 if (mIsNew) {
@@ -560,37 +619,24 @@ class EntryEditActivity : LockingActivity(),
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
-
+        MenuUtil.contributionMenuInflater(menuInflater, menu)
-        val inflater = menuInflater
-        inflater.inflate(R.menu.database, menu)
-        // Save database not needed here
-        menu.findItem(R.id.menu_save_database)?.isVisible = false
-        MenuUtil.contributionMenuInflater(inflater, menu)
-
-        entryEditActivityEducation?.let {
-            Handler().post { performedNextEducation(it) }
-        }
-
         return true
     }
 
-    private fun performedNextEducation(entryEditActivityEducation: EntryEditActivityEducation) {
+
-        val passwordGeneratorView: View? = entryEditContentsView?.entryPasswordGeneratorView
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        val generatePasswordEducationPerformed = passwordGeneratorView != null
+        entryEditActivityEducation?.let {
-                && entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+            Handler(Looper.getMainLooper()).post { performedNextEducation(it) }
-                passwordGeneratorView,
+        }
-                {
+        return super.onPrepareOptionsMenu(menu)
-                    openPasswordGenerator()
+    }
-                },
+
-                {
+    fun performedNextEducation(entryEditActivityEducation: EntryEditActivityEducation) {
-                    performedNextEducation(entryEditActivityEducation)
+        if (entryEditFragment?.generatePasswordEducationPerformed(entryEditActivityEducation) != true) {
-                }
-        )
-        if (!generatePasswordEducationPerformed) {
             val addNewFieldView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_field)
-            val addNewFieldEducationPerformed = mNewEntry != null
+            val addNewFieldEducationPerformed = mDatabase?.allowEntryCustomFields() == true
-                    && mNewEntry!!.allowCustomFields() && addNewFieldView != null
+                    && addNewFieldView != null
-                    && addNewFieldView.visibility == View.VISIBLE
+                    && addNewFieldView.isVisible
                     && entryEditActivityEducation.checkAndPerformedEntryNewFieldEducation(
                     addNewFieldView,
                     {
@@ -602,7 +648,8 @@ class EntryEditActivity : LockingActivity(),
             )
             if (!addNewFieldEducationPerformed) {
                 val attachmentView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_attachment)
-                val addAttachmentEducationPerformed = attachmentView != null && attachmentView.visibility == View.VISIBLE
+                val addAttachmentEducationPerformed = attachmentView != null
+                        && attachmentView.isVisible
                         && entryEditActivityEducation.checkAndPerformedAttachmentEducation(
                         attachmentView,
                         {
@@ -614,7 +661,8 @@ class EntryEditActivity : LockingActivity(),
                 )
                 if (!addAttachmentEducationPerformed) {
                     val setupOtpView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_otp)
-                    setupOtpView != null && setupOtpView.visibility == View.VISIBLE
+                    setupOtpView != null
+                            && setupOtpView.isVisible
                             && entryEditActivityEducation.checkAndPerformedSetUpOTPEducation(
                             setupOtpView,
                             {
@@ -628,9 +676,6 @@ class EntryEditActivity : LockingActivity(),
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_save_database -> {
-                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
-            }
             R.id.menu_contribute -> {
                 MenuUtil.onContributionItemSelected(this)
                 return true
@@ -644,21 +689,28 @@ class EntryEditActivity : LockingActivity(),
     }
 
     override fun onOtpCreated(otpElement: OtpElement) {
+        var titleOTP: String? = null
+        var usernameOTP: String? = null
+        // Build a temp entry to get title and username (by ref)
+        entryEditFragment?.getEntryInfo()?.let { entryInfo ->
+            val entryTemp = mDatabase?.createEntry()
+            entryTemp?.setEntryInfo(mDatabase, entryInfo)
+            mDatabase?.startManageEntry(entryTemp)
+            titleOTP = entryTemp?.title
+            usernameOTP = entryTemp?.username
+            mDatabase?.stopManageEntry(mEntry)
+        }
         // Update the otp field with otpauth:// url
-        val otpField = OtpEntryFields.buildOtpField(otpElement,
+        val otpField = OtpEntryFields.buildOtpField(otpElement, titleOTP, usernameOTP)
-                mEntry?.title, mEntry?.username)
+        mEntry?.putExtraField(Field(otpField.name, otpField.protectedValue))
-        mEntry?.putExtraField(otpField.name, otpField.protectedValue)
+        entryEditFragment?.apply {
-        entryEditContentsView?.apply {
             putExtraField(otpField)
-            getExtraFieldViewPosition(otpField) { position ->
-                scrollView?.smoothScrollTo(0, position.toInt())
-            }
         }
     }
 
     override fun iconPicked(bundle: Bundle) {
         IconPickerDialogFragment.getIconStandardFromBundle(bundle)?.let { icon ->
-            temporarilySaveAndShowSelectedIcon(icon)
+            entryEditFragment?.icon = icon
         }
     }
 
@@ -666,9 +718,9 @@ class EntryEditActivity : LockingActivity(),
         // To fix android 4.4 issue
         // https://stackoverflow.com/questions/12436073/datepicker-ondatechangedlistener-called-twice
         if (datePicker?.isShown == true) {
-            entryEditContentsView?.expiresDate?.date?.let { expiresDate ->
+            entryEditFragment?.expiryTime?.date?.let { expiresDate ->
                 // Save the date
-                entryEditContentsView?.expiresDate =
+                entryEditFragment?.expiryTime =
                         DateInstant(DateTime(expiresDate)
                                 .withYear(year)
                                 .withMonthOfYear(month + 1)
@@ -685,9 +737,9 @@ class EntryEditActivity : LockingActivity(),
     }
 
     override fun onTimeSet(timePicker: TimePicker?, hours: Int, minutes: Int) {
-        entryEditContentsView?.expiresDate?.date?.let { expiresDate ->
+        entryEditFragment?.expiryTime?.date?.let { expiresDate ->
             // Save the date
-            entryEditContentsView?.expiresDate =
+            entryEditFragment?.expiryTime =
                     DateInstant(DateTime(expiresDate)
                             .withHourOfDay(hours)
                             .withMinuteOfHour(minutes)
@@ -696,25 +748,19 @@ class EntryEditActivity : LockingActivity(),
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        mNewEntry?.let {
-            populateEntryWithViews(it)
-            outState.putParcelable(KEY_NEW_ENTRY, it)
-        }
 
-        mFocusedEditExtraField?.let {
+        outState.putParcelableArrayList(TEMP_ATTACHMENTS, mTempAttachments)
-            outState.putParcelable(EXTRA_FIELD_FOCUSED_ENTRY, it)
-        }
 
         super.onSaveInstanceState(outState)
     }
 
     override fun acceptPassword(bundle: Bundle) {
         bundle.getString(GeneratePasswordDialogFragment.KEY_PASSWORD_ID)?.let {
-            entryEditContentsView?.password = it
+            entryEditFragment?.password = it
         }
 
         entryEditActivityEducation?.let {
-            Handler().post { performedNextEducation(it) }
+            Handler(Looper.getMainLooper()).post { performedNextEducation(it) }
         }
     }
 
@@ -723,21 +769,39 @@ class EntryEditActivity : LockingActivity(),
     }
 
     override fun onBackPressed() {
-        AlertDialog.Builder(this)
+        onApprovedBackPressed {
-                .setMessage(R.string.discard_changes)
+            super@EntryEditActivity.onBackPressed()
-                .setNegativeButton(android.R.string.cancel, null)
+        }
-                .setPositiveButton(R.string.discard) { _, _ ->
-                    super@EntryEditActivity.onBackPressed()
-                }.create().show()
     }
 
-    override fun finish() {
+    override fun onCancelSpecialMode() {
-        // Assign entry callback as a result in all case
+        onApprovedBackPressed {
+            super@EntryEditActivity.onCancelSpecialMode()
+            finish()
+        }
+    }
+
+    private fun onApprovedBackPressed(approved: () -> Unit) {
+        if (!backPressedAlreadyApproved) {
+            AlertDialog.Builder(this)
+                    .setMessage(R.string.discard_changes)
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .setPositiveButton(R.string.discard) { _, _ ->
+                        backPressedAlreadyApproved = true
+                        approved.invoke()
+                    }.create().show()
+        } else {
+            approved.invoke()
+        }
+    }
+
+    private fun finishForEntryResult() {
+        // Assign entry callback as a result
         try {
-            mNewEntry?.let {
+            mEntry?.let { entry ->
                 val bundle = Bundle()
                 val intentEntry = Intent()
-                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, mNewEntry)
+                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, entry)
                 intentEntry.putExtras(bundle)
                 if (mIsNew) {
                     setResult(ADD_ENTRY_RESULT_CODE, intentEntry)
@@ -761,8 +825,7 @@ class EntryEditActivity : LockingActivity(),
         const val KEY_PARENT = "parent"
 
         // SaveInstanceState
-        const val KEY_NEW_ENTRY = "new_entry"
+        const val TEMP_ATTACHMENTS = "TEMP_ATTACHMENTS"
-        const val EXTRA_FIELD_FOCUSED_ENTRY = "EXTRA_FIELD_FOCUSED_ENTRY"
 
         // Keys for callback
         const val ADD_ENTRY_RESULT_CODE = 31
@@ -770,16 +833,19 @@ class EntryEditActivity : LockingActivity(),
         const val ADD_OR_UPDATE_ENTRY_REQUEST_CODE = 7129
         const val ADD_OR_UPDATE_ENTRY_KEY = "ADD_OR_UPDATE_ENTRY_KEY"
 
+        const val ENTRY_EDIT_FRAGMENT_TAG = "ENTRY_EDIT_FRAGMENT_TAG"
+
         /**
          * Launch EntryEditActivity to update an existing entry
          *
          * @param activity from activity
-         * @param pwEntry Entry to update
+         * @param entry Entry to update
          */
-        fun launch(activity: Activity, pwEntry: Entry) {
+        fun launch(activity: Activity,
+                   entry: Entry) {
             if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                 val intent = Intent(activity, EntryEditActivity::class.java)
-                intent.putExtra(KEY_ENTRY, pwEntry.nodeId)
+                intent.putExtra(KEY_ENTRY, entry.nodeId)
                 activity.startActivityForResult(intent, ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
             }
         }
@@ -788,14 +854,102 @@ class EntryEditActivity : LockingActivity(),
          * Launch EntryEditActivity to add a new entry
          *
          * @param activity from activity
-         * @param pwGroup Group who will contains new entry
+         * @param group Group who will contains new entry
          */
-        fun launch(activity: Activity, pwGroup: Group) {
+        fun launch(activity: Activity,
+                   group: Group) {
             if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                 val intent = Intent(activity, EntryEditActivity::class.java)
-                intent.putExtra(KEY_PARENT, pwGroup.nodeId)
+                intent.putExtra(KEY_PARENT, group.nodeId)
                 activity.startActivityForResult(intent, ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
             }
         }
+
+        fun launchForSave(context: Context,
+                          entry: Entry,
+                          searchInfo: SearchInfo) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(context)) {
+                val intent = Intent(context, EntryEditActivity::class.java)
+                intent.putExtra(KEY_ENTRY, entry.nodeId)
+                EntrySelectionHelper.startActivityForSaveModeResult(context,
+                        intent,
+                        searchInfo)
+            }
+        }
+
+        fun launchForSave(context: Context,
+                          group: Group,
+                          searchInfo: SearchInfo) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(context)) {
+                val intent = Intent(context, EntryEditActivity::class.java)
+                intent.putExtra(KEY_PARENT, group.nodeId)
+                EntrySelectionHelper.startActivityForSaveModeResult(context,
+                        intent,
+                        searchInfo)
+            }
+        }
+
+        /**
+         * Launch EntryEditActivity to add a new entry in keyboard selection
+         */
+        fun launchForKeyboardSelectionResult(context: Context,
+                                             group: Group,
+                                             searchInfo: SearchInfo? = null) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(context)) {
+                val intent = Intent(context, EntryEditActivity::class.java)
+                intent.putExtra(KEY_PARENT, group.nodeId)
+                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(context,
+                        intent,
+                        searchInfo)
+            }
+        }
+
+        /**
+         * Launch EntryEditActivity to add a new entry in autofill selection
+         */
+        @RequiresApi(api = Build.VERSION_CODES.O)
+        fun launchForAutofillResult(activity: Activity,
+                                    autofillComponent: AutofillComponent,
+                                    group: Group,
+                                    searchInfo: SearchInfo? = null) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
+                val intent = Intent(activity, EntryEditActivity::class.java)
+                intent.putExtra(KEY_PARENT, group.nodeId)
+                AutofillHelper.startActivityForAutofillResult(activity,
+                        intent,
+                        autofillComponent,
+                        searchInfo)
+            }
+        }
+
+        /**
+         * Launch EntryEditActivity to register an updated entry (from autofill)
+         */
+        fun launchForRegistration(context: Context,
+                                  entry: Entry,
+                                  registerInfo: RegisterInfo? = null) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(context)) {
+                val intent = Intent(context, EntryEditActivity::class.java)
+                intent.putExtra(KEY_ENTRY, entry.nodeId)
+                EntrySelectionHelper.startActivityForRegistrationModeResult(context,
+                        intent,
+                        registerInfo)
+            }
+        }
+
+        /**
+         * Launch EntryEditActivity to register a new entry (from autofill)
+         */
+        fun launchForRegistration(context: Context,
+                                  group: Group,
+                                  registerInfo: RegisterInfo? = null) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(context)) {
+                val intent = Intent(context, EntryEditActivity::class.java)
+                intent.putExtra(KEY_PARENT, group.nodeId)
+                EntrySelectionHelper.startActivityForRegistrationModeResult(context,
+                        intent,
+                        registerInfo)
+            }
+        }
     }
 }

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

@@ -0,0 +1,549 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities
+
+import android.content.Context
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.widget.CompoundButton
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.education.EntryEditActivityEducation
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.model.*
+import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.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 entryExpiresCheckBox: CompoundButton
+    private lateinit var entryExpiresTextView: TextView
+    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
+    private var expiresInstant: DateInstant = DateInstant.IN_ONE_MONTH
+
+    var drawFactory: IconDrawableFactory? = null
+    var setOnDateClickListener: View.OnClickListener? = null
+    var setOnPasswordGeneratorClickListener: View.OnClickListener? = null
+    var setOnIconViewClickListener: View.OnClickListener? = null
+    var setOnEditCustomField: ((Field) -> Unit)? = null
+    var setOnRemoveAttachment: ((Attachment) -> Unit)? = null
+
+    // Elements to modify the current entry
+    private var mEntryInfo = EntryInfo()
+    private var mLastFocusedEditField: FocusedEditField? = null
+    private var mExtraViewToRequestFocus: EditText? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val rootView = inflater.cloneInContext(contextThemed)
+            .inflate(R.layout.fragment_entry_edit_contents, container, false)
+
+        fontInVisibility = PreferencesUtil.fieldFontIsInVisibility(requireContext())
+
+        entryTitleLayoutView = rootView.findViewById(R.id.entry_edit_container_title)
+        entryTitleView = rootView.findViewById(R.id.entry_edit_title)
+        entryIconView = rootView.findViewById(R.id.entry_edit_icon_button)
+        entryIconView.setOnClickListener {
+            setOnIconViewClickListener?.onClick(it)
+        }
+
+        entryUserNameView = rootView.findViewById(R.id.entry_edit_user_name)
+        entryUrlView = rootView.findViewById(R.id.entry_edit_url)
+        entryPasswordLayoutView = rootView.findViewById(R.id.entry_edit_container_password)
+        entryPasswordView = rootView.findViewById(R.id.entry_edit_password)
+        entryPasswordGeneratorView = rootView.findViewById(R.id.entry_edit_password_generator_button)
+        entryPasswordGeneratorView.setOnClickListener {
+            setOnPasswordGeneratorClickListener?.onClick(it)
+        }
+        entryExpiresCheckBox = rootView.findViewById(R.id.entry_edit_expires_checkbox)
+        entryExpiresTextView = rootView.findViewById(R.id.entry_edit_expires_text)
+        entryExpiresTextView.setOnClickListener {
+            if (entryExpiresCheckBox.isChecked)
+                setOnDateClickListener?.onClick(it)
+        }
+
+        entryNotesView = rootView.findViewById(R.id.entry_edit_notes)
+
+        extraFieldsContainerView = rootView.findViewById(R.id.extra_fields_container)
+        extraFieldsListView = rootView.findViewById(R.id.extra_fields_list)
+
+        attachmentsContainerView = rootView.findViewById(R.id.entry_attachments_container)
+        attachmentsListView = rootView.findViewById(R.id.entry_attachments_list)
+        attachmentsAdapter = EntryAttachmentsItemsAdapter(requireContext())
+        attachmentsAdapter.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
+        }
+
+        entryExpiresCheckBox.setOnCheckedChangeListener { _, _ ->
+            assignExpiresDateText()
+        }
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        iconColor = taIconColor?.getColor(0, Color.WHITE) ?: Color.WHITE
+        taIconColor?.recycle()
+
+        rootView?.resetAppTimeoutWhenViewFocusedOrChanged(requireContext())
+
+        // Retrieve the new entry after an orientation change
+        if (arguments?.containsKey(KEY_TEMP_ENTRY_INFO) == true)
+            mEntryInfo = arguments?.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        else if (savedInstanceState?.containsKey(KEY_TEMP_ENTRY_INFO) == true) {
+            mEntryInfo = savedInstanceState.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        }
+
+        if (savedInstanceState?.containsKey(KEY_LAST_FOCUSED_FIELD) == true) {
+            mLastFocusedEditField = savedInstanceState.getParcelable(KEY_LAST_FOCUSED_FIELD) ?: mLastFocusedEditField
+        }
+
+        populateViewsWithEntry()
+
+        return rootView
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+
+        drawFactory = null
+        setOnDateClickListener = null
+        setOnPasswordGeneratorClickListener = null
+        setOnIconViewClickListener = null
+        setOnRemoveAttachment = null
+        setOnEditCustomField = null
+    }
+
+    fun getEntryInfo(): EntryInfo? {
+        populateEntryWithViews()
+        return mEntryInfo
+    }
+
+    fun generatePasswordEducationPerformed(entryEditActivityEducation: EntryEditActivityEducation): Boolean {
+        return entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+                entryPasswordGeneratorView,
+                {
+                    GeneratePasswordDialogFragment().show(parentFragmentManager, "PasswordGeneratorFragment")
+                },
+                {
+                    try {
+                        (activity as? EntryEditActivity?)?.performedNextEducation(entryEditActivityEducation)
+                    } catch (ignore: Exception) {}
+                }
+        )
+    }
+
+    private fun populateViewsWithEntry() {
+        // Set info in view
+        icon = mEntryInfo.icon
+        title = mEntryInfo.title
+        username = mEntryInfo.username
+        url = mEntryInfo.url
+        password = mEntryInfo.password
+        expires = mEntryInfo.expires
+        expiryTime = mEntryInfo.expiryTime
+        notes = mEntryInfo.notes
+        assignExtraFields(mEntryInfo.customFields) { fields ->
+            setOnEditCustomField?.invoke(fields)
+        }
+        assignAttachments(mEntryInfo.attachments, StreamDirection.UPLOAD) { attachment ->
+            setOnRemoveAttachment?.invoke(attachment)
+        }
+    }
+
+    private fun populateEntryWithViews() {
+        // Icon already populate
+        mEntryInfo.title = title
+        mEntryInfo.username = username
+        mEntryInfo.url = url
+        mEntryInfo.password = password
+        mEntryInfo.expires = expires
+        mEntryInfo.expiryTime = expiryTime
+        mEntryInfo.notes = notes
+        mEntryInfo.customFields = getExtraFields()
+        mEntryInfo.otpModel = OtpEntryFields.parseFields { key ->
+            getExtraFields().firstOrNull { it.name == key }?.protectedValue?.toString()
+        }?.otpModel
+        mEntryInfo.attachments = getAttachments()
+    }
+
+    var title: String
+        get() {
+            return entryTitleView.text.toString()
+        }
+        set(value) {
+            entryTitleView.setText(value)
+            if (fontInVisibility)
+                entryTitleView.applyFontVisibility()
+        }
+
+    var icon: IconImage
+        get() {
+            return mEntryInfo.icon
+        }
+        set(value) {
+            mEntryInfo.icon = value
+            drawFactory?.let { drawFactory ->
+                entryIconView.assignDatabaseIcon(drawFactory, value, iconColor)
+            }
+        }
+
+    var username: String
+        get() {
+            return entryUserNameView.text.toString()
+        }
+        set(value) {
+            entryUserNameView.setText(value)
+            if (fontInVisibility)
+                entryUserNameView.applyFontVisibility()
+        }
+
+    var url: String
+        get() {
+            return entryUrlView.text.toString()
+        }
+        set(value) {
+            entryUrlView.setText(value)
+            if (fontInVisibility)
+                entryUrlView.applyFontVisibility()
+        }
+
+    var password: String
+        get() {
+            return entryPasswordView.text.toString()
+        }
+        set(value) {
+            entryPasswordView.setText(value)
+            if (fontInVisibility) {
+                entryPasswordView.applyFontVisibility()
+            }
+        }
+
+    private fun assignExpiresDateText() {
+        entryExpiresTextView.text = if (entryExpiresCheckBox.isChecked) {
+            entryExpiresTextView.setOnClickListener(setOnDateClickListener)
+            expiresInstant.getDateTimeString(resources)
+        } else {
+            entryExpiresTextView.setOnClickListener(null)
+            resources.getString(R.string.never)
+        }
+        if (fontInVisibility)
+            entryExpiresTextView.applyFontVisibility()
+    }
+
+    var expires: Boolean
+        get() {
+            return entryExpiresCheckBox.isChecked
+        }
+        set(value) {
+            if (!value) {
+                expiresInstant = DateInstant.IN_ONE_MONTH
+            }
+            entryExpiresCheckBox.isChecked = value
+            assignExpiresDateText()
+        }
+
+    var expiryTime: DateInstant
+        get() {
+            return if (expires)
+                expiresInstant
+            else
+                DateInstant.NEVER_EXPIRE
+        }
+        set(value) {
+            if (expires)
+                expiresInstant = value
+            assignExpiresDateText()
+        }
+
+    var notes: String
+        get() {
+            return entryNotesView.text.toString()
+        }
+        set(value) {
+            entryNotesView.setText(value)
+            if (fontInVisibility)
+                entryNotesView.applyFontVisibility()
+        }
+
+    /* -------------
+     * Extra Fields
+     * -------------
+     */
+
+    private var mExtraFieldsList: MutableList<Field> = ArrayList()
+    private var mOnEditButtonClickListener: ((item: Field)->Unit)? = null
+
+    private fun buildViewFromField(extraField: Field): View? {
+        val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
+        val itemView: View? = inflater?.inflate(R.layout.item_entry_edit_extra_field, extraFieldsListView, false)
+        itemView?.id = View.NO_ID
+
+        val extraFieldValueContainer: TextInputLayout? = itemView?.findViewById(R.id.entry_extra_field_value_container)
+        extraFieldValueContainer?.isPasswordVisibilityToggleEnabled = extraField.protectedValue.isProtected
+        extraFieldValueContainer?.hint = extraField.name
+        extraFieldValueContainer?.id = View.NO_ID
+
+        val extraFieldValue: TextInputEditText? = itemView?.findViewById(R.id.entry_extra_field_value)
+        extraFieldValue?.apply {
+            if (extraField.protectedValue.isProtected) {
+                inputType = extraFieldValue.inputType or EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
+            }
+            setText(extraField.protectedValue.toString())
+            if (fontInVisibility)
+                applyFontVisibility()
+        }
+        extraFieldValue?.id = View.NO_ID
+        extraFieldValue?.tag = "FIELD_VALUE_TAG"
+        if (mLastFocusedEditField?.field == extraField) {
+            mExtraViewToRequestFocus = extraFieldValue
+        }
+
+        val extraFieldEditButton: View? = itemView?.findViewById(R.id.entry_extra_field_edit)
+        extraFieldEditButton?.setOnClickListener {
+            mOnEditButtonClickListener?.invoke(extraField)
+        }
+        extraFieldEditButton?.id = View.NO_ID
+
+        return itemView
+    }
+
+    fun getExtraFields(): List<Field> {
+        mLastFocusedEditField = null
+        for (index in 0 until extraFieldsListView.childCount) {
+            val extraFieldValue: EditText = extraFieldsListView.getChildAt(index)
+                    .findViewWithTag("FIELD_VALUE_TAG")
+            val extraField = mExtraFieldsList[index]
+            extraField.protectedValue.stringValue = extraFieldValue.text?.toString() ?: ""
+            if (extraFieldValue.isFocused) {
+                mLastFocusedEditField = FocusedEditField().apply {
+                    field = extraField
+                    cursorSelectionStart = extraFieldValue.selectionStart
+                    cursorSelectionEnd = extraFieldValue.selectionEnd
+                }
+            }
+        }
+        return mExtraFieldsList
+    }
+
+    /**
+     * Remove all children and add new views for each field
+     */
+    fun assignExtraFields(fields: List<Field>,
+                          onEditButtonClickListener: ((item: Field)->Unit)?) {
+        extraFieldsContainerView.visibility = if (fields.isEmpty()) View.GONE else View.VISIBLE
+        // Reinit focused field
+        mExtraFieldsList.clear()
+        mExtraFieldsList.addAll(fields)
+        extraFieldsListView.removeAllViews()
+        fields.forEach {
+            extraFieldsListView.addView(buildViewFromField(it))
+        }
+        // Request last focus
+        mLastFocusedEditField?.let { focusField ->
+            mExtraViewToRequestFocus?.apply {
+                requestFocus()
+                setSelection(focusField.cursorSelectionStart,
+                                focusField.cursorSelectionEnd)
+            }
+        }
+        mLastFocusedEditField = null
+        mOnEditButtonClickListener = onEditButtonClickListener
+    }
+
+    /**
+     * Update an extra field or create a new one if doesn't exists, the old value is lost
+     */
+    fun putExtraField(extraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val oldField = mExtraFieldsList.firstOrNull { it.name == extraField.name }
+        oldField?.let {
+            val index = mExtraFieldsList.indexOf(oldField)
+            mExtraFieldsList.removeAt(index)
+            mExtraFieldsList.add(index, extraField)
+            extraFieldsListView.removeViewAt(index)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView, index)
+            newView?.requestFocus()
+        } ?: kotlin.run {
+            mExtraFieldsList.add(extraField)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView)
+            newView?.requestFocus()
+        }
+    }
+
+    /**
+     * Update an extra field and keep the old value
+     */
+    fun replaceExtraField(oldExtraField: Field, newExtraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        val oldValueEditText: EditText = extraFieldsListView.getChildAt(index)
+                .findViewWithTag("FIELD_VALUE_TAG")
+        val oldValue = oldValueEditText.text.toString()
+        val newExtraFieldWithOldValue = Field(newExtraField).apply {
+            this.protectedValue.stringValue = oldValue
+        }
+        mExtraFieldsList.removeAt(index)
+        mExtraFieldsList.add(index, newExtraFieldWithOldValue)
+        extraFieldsListView.removeViewAt(index)
+        val newView = buildViewFromField(newExtraFieldWithOldValue)
+        extraFieldsListView.addView(newView, index)
+        newView?.requestFocus()
+    }
+
+    fun removeExtraField(oldExtraField: Field) {
+        val previousSize = mExtraFieldsList.size
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        extraFieldsListView.getChildAt(index)?.let {
+            it.collapse(true) {
+                mExtraFieldsList.removeAt(index)
+                extraFieldsListView.removeViewAt(index)
+                val newSize = mExtraFieldsList.size
+
+                if (previousSize > 0 && newSize == 0) {
+                    extraFieldsContainerView.collapse(true)
+                } else if (previousSize == 0 && newSize == 1) {
+                    extraFieldsContainerView.expand(true)
+                }
+            }
+        }
+    }
+
+    /* -------------
+     * Attachments
+     * -------------
+     */
+
+    fun getAttachments(): List<Attachment> {
+        return attachmentsAdapter.itemsList.map { it.attachment }
+    }
+
+    fun assignAttachments(attachments: List<Attachment>,
+                          streamDirection: StreamDirection,
+                          onDeleteItem: (attachment: Attachment)->Unit) {
+        attachmentsContainerView.visibility = if (attachments.isEmpty()) View.GONE else View.VISIBLE
+        attachmentsAdapter.assignItems(attachments.map { EntryAttachmentState(it, streamDirection) })
+        attachmentsAdapter.onDeleteButtonClickListener = { item ->
+            onDeleteItem.invoke(item.attachment)
+        }
+    }
+
+    fun containsAttachment(): Boolean {
+        return !attachmentsAdapter.isEmpty()
+    }
+
+    fun containsAttachment(attachment: EntryAttachmentState): Boolean {
+        return attachmentsAdapter.contains(attachment)
+    }
+
+    fun putAttachment(attachment: EntryAttachmentState) {
+        attachmentsContainerView.visibility = View.VISIBLE
+        attachmentsAdapter.putItem(attachment)
+    }
+
+    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_LAST_FOCUSED_FIELD = "KEY_LAST_FOCUSED_FIELD"
+
+        fun getInstance(entryInfo: EntryInfo?): EntryEditFragment {
+            return EntryEditFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_TEMP_ENTRY_INFO, entryInfo)
+                }
+            }
+        }
+    }
+
+}

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
+                    // Retrieve web domain or OTP
-                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
+                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let { extra ->
-                        sharedWebDomain = Uri.parse(it).host
+                        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
+        super.onCreate(savedInstanceState)
-        SearchHelper.checkAutoSearchInfo(this,
+    }
-                Database.getInstance(),
+
-                searchInfo,
+    private fun launch(searchInfo: SearchInfo) {
-                { items ->
+
-                    // Items found
+        if (!searchInfo.containsOnlyNullValues()) {
-                    if (searchShareForMagikeyboard) {
+            // Setting to integrate Magikeyboard
-                        if (items.size == 1) {
+            val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
-                            // Automatically populate keyboard
+
-                            val entryPopulate = items[0]
+            // If database is open
-                            populateKeyboardAndMoveAppToBackground(this,
+            val database = Database.getInstance()
-                                    entryPopulate,
+            val readOnly = database.isReadOnly
-                                    intent)
+            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.launchForSearchResult(this,
-                            GroupActivity.launchForEntrySelectionResult(this,
+                                    readOnly,
-                                    true,
+                                    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)
 }

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

@@ -19,15 +19,14 @@
  */
 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
@@ -36,7 +35,6 @@ import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
@@ -44,17 +42,20 @@ 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.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
+import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
@@ -160,7 +161,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         }
 
         // Observe list of databases
-        databaseFilesViewModel.databaseFilesLoaded.observe(this, Observer { databaseFiles ->
+        databaseFilesViewModel.databaseFilesLoaded.observe(this) { databaseFiles ->
             when (databaseFiles.databaseFileAction) {
                 DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
                     mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
@@ -169,7 +170,8 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                     databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
                         mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
                     }
-                    GroupActivity.launch(this@FileDatabaseSelectActivity)
+                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                            PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
                 }
                 DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
                     databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
@@ -183,13 +185,13 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                 }
             }
             databaseFilesViewModel.consumeAction()
-        })
+        }
 
         // Observe default database
-        databaseFilesViewModel.defaultDatabase.observe(this, Observer {
+        databaseFilesViewModel.defaultDatabase.observe(this) {
             // Retrieve settings for default database
             mAdapterDatabaseHistory?.setDefaultDatabase(it)
-        })
+        }
 
         // Attach the dialog thread to this activity
         mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
@@ -201,6 +203,24 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                             databaseFilesViewModel.addDatabaseFile(databaseUri, keyFileUri)
                         }
                     }
+                    ACTION_DATABASE_LOAD_TASK -> {
+                        val database = Database.getInstance()
+                        if (result.isSuccess
+                                && database.loaded) {
+                            launchGroupActivity(database)
+                        } else {
+                            var resultError = ""
+                            val resultMessage = result.message
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError)
+                            Snackbar.make(activity_file_selection_coordinator_layout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
+                        }
+                    }
                 }
             }
         }
@@ -209,7 +229,6 @@ 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) +
                 getString(R.string.database_file_extension_default), "application/x-keepass")
@@ -217,78 +236,39 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
 
     private fun fileNoFoundAction(e: FileNotFoundException) {
         val error = getString(R.string.file_not_found_content)
+        Log.e(TAG, error, e)
         coordinatorLayout?.let {
             Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
         }
-        Log.e(TAG, error, e)
     }
 
     private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        PasswordActivity.launch(this,
-        EntrySelectionHelper.doEntrySelectionAction(intent,
+                databaseUri,
-                {
+                keyFile,
-                    try {
+                { exception ->
-                        PasswordActivity.launch(this@FileDatabaseSelectActivity,
+                    fileNoFoundAction(exception)
-                                databaseUri, keyFile,
-                                searchInfo)
-                    } catch (e: FileNotFoundException) {
-                        fileNoFoundAction(e)
-                    }
-                    // Remove the search info from intent
-                    if (searchInfo != null) {
-                        finish()
-                    }
                 },
-                {
+                { onCancelSpecialMode() },
-                    try {
+                { onLaunchActivitySpecialMode() })
-                        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)
-                        }
-                    }
-                })
     }
 
-    private fun launchGroupActivity(readOnly: Boolean) {
+    private fun launchGroupActivity(database: Database) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        GroupActivity.launch(this,
-        EntrySelectionHelper.doEntrySelectionAction(intent,
+                database.isReadOnly,
-                {
+                { onValidateSpecialMode() },
-                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                { onCancelSpecialMode() },
-                            false,
+                { onLaunchActivitySpecialMode() })
-                            searchInfo,
+    }
-                            readOnly)
+
-                },
+    override fun onValidateSpecialMode() {
-                {
+        super.onValidateSpecialMode()
-                    GroupActivity.launchForEntrySelectionResult(this@FileDatabaseSelectActivity,
+        finish()
-                            false,
+    }
-                            searchInfo,
+
-                            readOnly)
+    override fun onCancelSpecialMode() {
-                    // Do not keep history
+        super.onCancelSpecialMode()
-                    finish()
+        finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
-                                assistStructure,
-                                false,
-                                searchInfo,
-                                readOnly)
-                    }
-                })
     }
 
     private fun launchPasswordActivityWithPath(databaseUri: Uri) {
@@ -302,22 +282,25 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         super.onResume()
 
         // Show open and create button or special mode
-        if  (mSelectionMode) {
+        when (mSpecialMode) {
-            // Disable create button if in selection mode or request for autofill
+            SpecialMode.DEFAULT -> {
-            createDatabaseButtonView?.visibility = View.GONE
+                if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
-        } else {
+                    // There is an activity which can handle this intent.
-            if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
+                    createDatabaseButtonView?.visibility = View.VISIBLE
-                // There is an activity which can handle this intent.
+                } else{
-                createDatabaseButtonView?.visibility = View.VISIBLE
+                    // No Activity found that can handle this intent.
-            } else{
+                    createDatabaseButtonView?.visibility = View.GONE
-                // No Activity found that can handle this intent.
+                }
+            }
+            else -> {
+                // Disable create button if in selection mode or request for autofill
                 createDatabaseButtonView?.visibility = View.GONE
             }
         }
 
         val database = Database.getInstance()
         if (database.loaded) {
-            launchGroupActivity(database.isReadOnly)
+            launchGroupActivity(database)
         } else {
             // Construct adapter with listeners
             if (PreferencesUtil.showRecentFiles(this)) {
@@ -408,11 +391,11 @@ 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
     }
@@ -451,8 +434,8 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         when (item.itemId) {
             android.R.id.home -> UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
         }
-
+        MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
-        return MenuUtil.onDefaultMenuOptionsItemSelected(this, item) && super.onOptionsItemSelected(item)
+        return super.onOptionsItemSelected(item)
     }
 
     companion object {
@@ -463,17 +446,38 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
 
         /*
          * -------------------------
-         * Launch only to standard search, else pass by PasswordActivity
+         * 		Standard Launch
          * -------------------------
          */
 
-        fun launch(context: Context,
+        fun launch(context: Context) {
-                   searchInfo: SearchInfo? = null) {
+            context.startActivity(Intent(context, FileDatabaseSelectActivity::class.java))
-            val intent = Intent(context, FileDatabaseSelectActivity::class.java)
+        }
-            searchInfo?.let {
+
-                intent.putExtra(KEY_SEARCH_INFO, it)
+        /*
-            }
+         * -------------------------
-            context.startActivity(intent)
+         * 		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)
         }
 
         /*
@@ -482,9 +486,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
          * -------------------------
          */
 
-        fun launchForEntrySelectionResult(activity: Activity,
+        fun launchForKeyboardSelectionResult(activity: Activity,
-                                          searchInfo: SearchInfo? = null) {
+                                             searchInfo: SearchInfo? = null) {
-            EntrySelectionHelper.startActivityForEntrySelectionResult(activity,
+            EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(activity,
                     Intent(activity, FileDatabaseSelectActivity::class.java),
                     searchInfo)
         }
@@ -497,12 +501,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)
+        }
     }
 }

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

@@ -20,7 +20,6 @@ package com.kunzisoft.keepass.activities
 
 import android.app.Activity
 import android.app.SearchManager
-import android.app.assist.AssistStructure
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -28,6 +27,7 @@ import android.graphics.Color
 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
@@ -35,6 +35,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
@@ -43,15 +44,14 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.*
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+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.adapters.SearchEntryCursorAdapter
+import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
@@ -61,14 +61,17 @@ import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.education.GroupActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.model.getSearchString
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.NEW_NODES_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.OLD_NODES_KEY
@@ -152,7 +155,7 @@ class GroupActivity : LockingActivity(),
         taTextColor.recycle()
 
         // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(rootContainerView)
+        rootContainerView?.resetAppTimeoutWhenViewFocusedOrChanged(this)
 
         // Retrieve elements after an orientation change
         if (savedInstanceState != null) {
@@ -202,16 +205,48 @@ class GroupActivity : LockingActivity(),
         }
 
         // Add listeners to the add buttons
-        addNodeButtonView?.setAddGroupClickListener(View.OnClickListener {
+        addNodeButtonView?.setAddGroupClickListener {
             GroupEditDialogFragment.build()
                     .show(supportFragmentManager,
                             GroupEditDialogFragment.TAG_CREATE_GROUP)
-        })
+        }
-        addNodeButtonView?.setAddEntryClickListener(View.OnClickListener {
+        addNodeButtonView?.setAddEntryClickListener {
             mCurrentGroup?.let { currentGroup ->
-                EntryEditActivity.launch(this@GroupActivity, currentGroup)
+                EntrySelectionHelper.doSpecialAction(intent,
+                        {
+                            EntryEditActivity.launch(this@GroupActivity, currentGroup)
+                        },
+                        {
+                            // Search not used
+                        },
+                        { searchInfo ->
+                            EntryEditActivity.launchForSave(this@GroupActivity,
+                                    currentGroup, searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo ->
+                            EntryEditActivity.launchForKeyboardSelectionResult(this@GroupActivity,
+                                    currentGroup, searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo, autofillComponent ->
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                EntryEditActivity.launchForAutofillResult(this@GroupActivity,
+                                        autofillComponent,
+                                        currentGroup, searchInfo)
+                                onLaunchActivitySpecialMode()
+                            } else {
+                                onCancelSpecialMode()
+                            }
+                        },
+                        { searchInfo ->
+                            EntryEditActivity.launchForRegistration(this@GroupActivity,
+                                    currentGroup, searchInfo)
+                            onLaunchActivitySpecialMode()
+                        }
+                )
             }
-        })
+        }
 
         mDatabase?.let { database ->
             // Search suggestion
@@ -232,6 +267,41 @@ class GroupActivity : LockingActivity(),
                 refreshSearchGroup()
 
                 when (actionTask) {
+                    ACTION_DATABASE_UPDATE_ENTRY_TASK -> {
+                        if (result.isSuccess) {
+                            mListNodesFragment?.updateNodes(oldNodes, newNodes)
+                            EntrySelectionHelper.doSpecialAction(intent,
+                                    {
+                                        // Standard not used after task
+                                    },
+                                    {
+                                        // Search not used
+                                    },
+                                    {
+                                        // Save not used
+                                    },
+                                    {
+                                        try {
+                                            val entry = newNodes[0] as Entry
+                                            entrySelectedForKeyboardSelection(entry)
+                                        } catch (e: Exception) {
+                                            Log.e(TAG, "Unable to perform action for keyboard selection after entry update", e)
+                                        }
+                                    },
+                                    { _, _ ->
+                                        try {
+                                            val entry = newNodes[0] as Entry
+                                            entrySelectedForAutofillSelection(entry)
+                                        } catch (e: Exception) {
+                                            Log.e(TAG, "Unable to perform action for autofill selection after entry update", e)
+                                        }
+                                    },
+                                    {
+                                        // Not use
+                                    }
+                            )
+                        }
+                    }
                     ACTION_DATABASE_UPDATE_GROUP_TASK -> {
                         if (result.isSuccess) {
                             mListNodesFragment?.updateNodes(oldNodes, newNodes)
@@ -248,7 +318,12 @@ class GroupActivity : LockingActivity(),
                         if (result.isSuccess) {
 
                             // Rebuild all the list to avoid bug when delete node from sort
-                            mListNodesFragment?.rebuildList()
+                            try {
+                                mListNodesFragment?.rebuildList()
+                            } catch (e: Exception) {
+                                Log.e(TAG, "Unable to rebuild the list after deletion")
+                                e.printStackTrace()
+                            }
 
                             // Add trash in views list if it doesn't exists
                             if (database.isRecycleBinEnabled) {
@@ -268,6 +343,12 @@ class GroupActivity : LockingActivity(),
                             }
                         }
                     }
+                    ACTION_DATABASE_RELOAD_TASK -> {
+                        // Reload the current activity
+                        startActivity(intent)
+                        finish()
+                        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+                    }
                 }
 
                 coordinatorLayout?.showActionError(result)
@@ -305,11 +386,11 @@ class GroupActivity : LockingActivity(),
      */
     private fun manageSearchInfoIntent(intent: Intent): Boolean {
         // To relaunch the activity as ACTION_SEARCH
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        val searchInfo: SearchInfo? = EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
         val autoSearch = intent.getBooleanExtra(AUTO_SEARCH_KEY, false)
         if (searchInfo != null && autoSearch) {
             intent.action = Intent.ACTION_SEARCH
-            intent.putExtra(SearchManager.QUERY, searchInfo.getSearchString(this))
+            intent.putExtra(SearchManager.QUERY, searchInfo.toString())
             return true
         }
         return false
@@ -354,7 +435,7 @@ class GroupActivity : LockingActivity(),
             fragmentTransaction.addToBackStack(fragmentTag)
             fragmentTransaction.commit()
 
-            if (mSelectionMode)
+            if (mSpecialMode != SpecialMode.DEFAULT)
                 mSelectionModeCountBackStack++
 
             // Update last access time.
@@ -482,20 +563,6 @@ class GroupActivity : LockingActivity(),
         }
     }
 
-    override fun onCancelSpecialMode() {
-        // To remove the navigation history and
-        EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
-        val fragmentManager = supportFragmentManager
-        if (mSelectionModeCountBackStack > 0) {
-            for (selectionMode in 0 .. mSelectionModeCountBackStack) {
-                fragmentManager.popBackStack()
-            }
-        }
-        // Reinit the counter for navigation history
-        mSelectionModeCountBackStack = 0
-        backToTheAppCaller()
-    }
-
     private fun refreshNumberOfChildren() {
         numberChildrenView?.apply {
             if (PreferencesUtil.showNumberEntries(context)) {
@@ -523,28 +590,58 @@ class GroupActivity : LockingActivity(),
 
             Type.ENTRY -> try {
                 val entryVersioned = node as Entry
-                EntrySelectionHelper.doEntrySelectionAction(intent,
+                EntrySelectionHelper.doSpecialAction(intent,
                         {
                             EntryActivity.launch(this@GroupActivity, entryVersioned, mReadOnly)
                         },
                         {
-                            rebuildListNodes()
+                            // Nothing here, a search is simply performed
-                            // Populate Magikeyboard with entry
+                        },
-                            mDatabase?.let { database ->
+                        { searchInfo ->
-                                populateKeyboardAndMoveAppToBackground(this@GroupActivity,
+                            if (!mReadOnly)
-                                        entryVersioned.getEntryInfo(database),
+                                entrySelectedForSave(entryVersioned, searchInfo)
-                                        intent)
+                            else
+                                finish()
+                        },
+                        { searchInfo ->
+                            // Recheck search, only to fix #783 because workflow allows to open multiple search elements
+                            SearchHelper.checkAutoSearchInfo(this,
+                                    mDatabase!!,
+                                    searchInfo,
+                                    { _ ->
+                                        // Item in search, don't save
+                                        entrySelectedForKeyboardSelection(entryVersioned)
+                                    },
+                                    {
+                                        // Item not found, save it if required
+                                        if (!mReadOnly
+                                                && searchInfo != null
+                                                && PreferencesUtil.isKeyboardSaveSearchInfoEnable(this@GroupActivity)) {
+                                            updateEntryWithSearchInfo(entryVersioned, searchInfo)
+                                        } else {
+                                            entrySelectedForKeyboardSelection(entryVersioned)
+                                        }
+                                    },
+                                    {
+                                        // Normally not append
+                                        finish()
+                                    }
+                            )
+                        },
+                        { searchInfo, _ ->
+                            if (!mReadOnly
+                                    && searchInfo != null
+                                    && PreferencesUtil.isAutofillSaveSearchInfoEnable(this@GroupActivity)) {
+                                updateEntryWithSearchInfo(entryVersioned, searchInfo)
+                            } else {
+                                entrySelectedForAutofillSelection(entryVersioned)
                             }
                         },
-                        {
+                        { registerInfo ->
-                            // Build response with the entry selected
+                            if (!mReadOnly)
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && mDatabase != null) {
+                                entrySelectedForRegistration(entryVersioned, registerInfo)
-                                mDatabase?.let { database ->
+                            else
-                                    AutofillHelper.buildResponse(this@GroupActivity,
+                                finish()
-                                            entryVersioned.getEntryInfo(database))
-                                }
-                            }
-                            finish()
                         })
             } catch (e: ClassCastException) {
                 Log.e(TAG, "Node can't be cast in Entry")
@@ -552,6 +649,57 @@ class GroupActivity : LockingActivity(),
         }
     }
 
+    private fun entrySelectedForSave(entry: Entry, searchInfo: SearchInfo) {
+        rebuildListNodes()
+        // Save to update the entry
+        EntryEditActivity.launchForSave(this@GroupActivity,
+                entry, searchInfo)
+        onLaunchActivitySpecialMode()
+    }
+
+    private fun entrySelectedForKeyboardSelection(entry: Entry) {
+        rebuildListNodes()
+        // Populate Magikeyboard with entry
+        mDatabase?.let { database ->
+            populateKeyboardAndMoveAppToBackground(this,
+                    entry.getEntryInfo(database),
+                    intent)
+        }
+        onValidateSpecialMode()
+    }
+
+    private fun entrySelectedForAutofillSelection(entry: Entry) {
+        // Build response with the entry selected
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && mDatabase != null) {
+            mDatabase?.let { database ->
+                AutofillHelper.buildResponseAndSetResult(this,
+                        entry.getEntryInfo(database))
+            }
+        }
+        onValidateSpecialMode()
+    }
+
+    private fun entrySelectedForRegistration(entry: Entry, registerInfo: RegisterInfo?) {
+        rebuildListNodes()
+        // Registration to update the entry
+        EntryEditActivity.launchForRegistration(this@GroupActivity,
+                entry, registerInfo)
+        onLaunchActivitySpecialMode()
+    }
+
+    private fun updateEntryWithSearchInfo(entry: Entry, searchInfo: SearchInfo) {
+        val newEntry = Entry(entry)
+        newEntry.setEntryInfo(mDatabase, newEntry.getEntryInfo(mDatabase, true).apply {
+            saveSearchInfo(mDatabase, searchInfo)
+        })
+        // In selection mode, it's forced read-only, so update not allowed
+        mProgressDatabaseTaskProvider?.startDatabaseUpdateEntry(
+                entry,
+                newEntry,
+                !mReadOnly && mAutoSaveEnable
+        )
+    }
+
     private fun finishNodeAction() {
         actionNodeMode?.finish()
     }
@@ -661,7 +809,7 @@ class GroupActivity : LockingActivity(),
         return true
     }
 
-    override fun onDeleteMenuClick(nodes: List<Node>): Boolean {
+    private fun deleteNodes(nodes: List<Node>, recycleBin: Boolean = false): Boolean {
         val database = mDatabase
 
         // If recycle bin enabled, ensure it exists
@@ -681,13 +829,22 @@ class GroupActivity : LockingActivity(),
         }
         // else open the dialog to confirm deletion
         else {
-            DeleteNodesDialogFragment.getInstance(nodes)
+            val deleteNodesDialogFragment: DeleteNodesDialogFragment =
-                    .show(supportFragmentManager, "deleteNodesDialogFragment")
+            if (recycleBin) {
+                EmptyRecycleBinDialogFragment.getInstance(nodes)
+            } else {
+                DeleteNodesDialogFragment.getInstance(nodes)
+            }
+            deleteNodesDialogFragment.show(supportFragmentManager, "deleteNodesDialogFragment")
         }
         finishNodeAction()
         return true
     }
 
+    override fun onDeleteMenuClick(nodes: List<Node>): Boolean {
+        return deleteNodes(nodes)
+    }
+
     override fun permanentlyDeleteNodes(nodes: List<Node>) {
         mProgressDatabaseTaskProvider?.startDatabaseDeleteNodes(
                 nodes,
@@ -726,8 +883,10 @@ class GroupActivity : LockingActivity(),
         if (mReadOnly) {
             menu.findItem(R.id.menu_save_database)?.isVisible = false
         }
-        if (!mSelectionMode) {
+        if (mSpecialMode == SpecialMode.DEFAULT) {
             MenuUtil.defaultMenuInflater(inflater, menu)
+        } else {
+            menu.findItem(R.id.menu_reload_database)?.isVisible = false
         }
 
         // Menu for recycle bin
@@ -776,7 +935,7 @@ class GroupActivity : LockingActivity(),
         super.onCreateOptionsMenu(menu)
 
         // Launch education screen
-        Handler().post { performedNextEducation(GroupActivityEducation(this), menu) }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(GroupActivityEducation(this), menu) }
 
         return true
     }
@@ -853,10 +1012,14 @@ class GroupActivity : LockingActivity(),
                 mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
                 return true
             }
+            R.id.menu_reload_database -> {
+                mProgressDatabaseTaskProvider?.startDatabaseReload(false)
+                return true
+            }
             R.id.menu_empty_recycle_bin -> {
                 mCurrentGroup?.getChildren()?.let { listChildren ->
                     // Automatically delete all elements
-                    onDeleteMenuClick(listChildren)
+                    deleteNodes(listChildren, true)
                 }
                 return true
             }
@@ -980,7 +1143,16 @@ class GroupActivity : LockingActivity(),
     private fun rebuildListNodes() {
         mListNodesFragment = supportFragmentManager.findFragmentByTag(LIST_NODES_FRAGMENT_TAG) as ListNodesFragment?
         // to refresh fragment
-        mListNodesFragment?.rebuildList()
+        try {
+            mListNodesFragment?.rebuildList()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            coordinatorLayout?.let { coordinatorLayout ->
+                Snackbar.make(coordinatorLayout,
+                        R.string.error_rebuild_list,
+                        Snackbar.LENGTH_LONG).asError().show()
+            }
+        }
         mCurrentGroup = mListNodesFragment?.mainGroup
         // Remove search in intent
         deletePreviousSearchGroup()
@@ -992,41 +1164,51 @@ class GroupActivity : LockingActivity(),
         assignGroupViewElements()
     }
 
-    private fun backToTheAppCaller() {
-        if (mAutofillSelection) {
-            // To get the app caller, only for autofill
-            super.onBackPressed()
-        } else {
-            // To move the app in background
-            moveTaskToBack(true)
-        }
-    }
-
     override fun onBackPressed() {
         if (mListNodesFragment?.nodeActionSelectionMode == true) {
             finishNodeAction()
         } else {
             // Normal way when we are not in root
             if (mRootGroup != null && mRootGroup != mCurrentGroup) {
-                super.onBackPressed()
+                super.onRegularBackPressed()
                 rebuildListNodes()
             }
             // Else in root, lock if needed
             else {
                 intent.removeExtra(AUTO_SEARCH_KEY)
-                intent.removeExtra(KEY_SEARCH_INFO)
+                EntrySelectionHelper.removeModesFromIntent(intent)
+                EntrySelectionHelper.removeInfoFromIntent(intent)
                 if (PreferencesUtil.isLockDatabaseWhenBackButtonOnRootClicked(this)) {
                     lockAndExit()
-                    super.onBackPressed()
+                    super.onRegularBackPressed()
                 } else {
-                    // To restore standard mode
-                    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
                     backToTheAppCaller()
                 }
             }
         }
     }
 
+    private fun removeFragmentHistory() {
+        val fragmentManager = supportFragmentManager
+        if (mSelectionModeCountBackStack > 0) {
+            for (selectionMode in 0 .. mSelectionModeCountBackStack) {
+                fragmentManager.popBackStack()
+            }
+        }
+        // Reinit the counter for navigation history
+        mSelectionModeCountBackStack = 0
+    }
+
+    override fun onValidateSpecialMode() {
+        removeFragmentHistory()
+        super.onValidateSpecialMode()
+    }
+
+    override fun onCancelSpecialMode() {
+        removeFragmentHistory()
+        super.onCancelSpecialMode()
+    }
+
     companion object {
 
         private val TAG = GroupActivity::class.java.name
@@ -1074,30 +1256,62 @@ class GroupActivity : LockingActivity(),
          * -------------------------
          */
         fun launch(context: Context,
-                   autoSearch: Boolean = false,
+                   readOnly: Boolean,
-                   searchInfo: SearchInfo? = null,
+                   autoSearch: Boolean = false) {
-                   readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
             checkTimeAndBuildIntent(context, null, readOnly) { intent ->
-                searchInfo?.let {
-                    intent.putExtra(KEY_SEARCH_INFO, it)
-                }
                 intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
                 context.startActivity(intent)
             }
         }
 
+        /*
+         * -------------------------
+         * 		Search Launch
+         * -------------------------
+         */
+        fun launchForSearchResult(context: Context,
+                                  readOnly: Boolean,
+                                  searchInfo: SearchInfo,
+                                  autoSearch: Boolean = false) {
+            checkTimeAndBuildIntent(context, null, readOnly) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
+                EntrySelectionHelper.addSearchInfoInIntent(
+                        intent,
+                        searchInfo)
+                context.startActivity(intent)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Search save Launch
+         * -------------------------
+         */
+        fun launchForSaveResult(context: Context,
+                                searchInfo: SearchInfo,
+                                autoSearch: Boolean = false) {
+            checkTimeAndBuildIntent(context, null, false) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
+                EntrySelectionHelper.startActivityForSaveModeResult(context,
+                        intent,
+                        searchInfo)
+            }
+        }
+
         /*
          * -------------------------
          * 		Keyboard Launch
          * -------------------------
          */
-        fun launchForEntrySelectionResult(context: Context,
+        fun launchForKeyboardSelectionResult(context: Context,
-                                          autoSearch: Boolean = false,
+                                             readOnly: Boolean,
-                                          searchInfo: SearchInfo? = null,
+                                             searchInfo: SearchInfo? = null,
-                                          readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
+                                             autoSearch: Boolean = false) {
             checkTimeAndBuildIntent(context, null, readOnly) { intent ->
                 intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
-                EntrySelectionHelper.startActivityForEntrySelectionResult(context, intent, searchInfo)
+                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(context,
+                        intent,
+                        searchInfo)
             }
         }
 
@@ -1108,14 +1322,189 @@ class GroupActivity : LockingActivity(),
          */
         @RequiresApi(api = Build.VERSION_CODES.O)
         fun launchForAutofillResult(activity: Activity,
-                                    assistStructure: AssistStructure,
+                                    readOnly: Boolean,
-                                    autoSearch: Boolean = false,
+                                    autofillComponent: AutofillComponent,
                                     searchInfo: SearchInfo? = null,
-                                    readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(activity)) {
+                                    autoSearch: Boolean = false) {
             checkTimeAndBuildIntent(activity, null, readOnly) { intent ->
                 intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
-                AutofillHelper.startActivityForAutofillResult(activity, intent, assistStructure, searchInfo)
+                AutofillHelper.startActivityForAutofillResult(activity,
+                        intent,
+                        autofillComponent,
+                        searchInfo)
             }
         }
+
+        /*
+         * -------------------------
+         * 		Registration Launch
+         * -------------------------
+         */
+        fun launchForRegistration(context: Context,
+                                  registerInfo: RegisterInfo? = null) {
+            checkTimeAndBuildIntent(context, null, false) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, false)
+                EntrySelectionHelper.startActivityForRegistrationModeResult(context,
+                        intent,
+                        registerInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Global Launch
+         * -------------------------
+         */
+        fun launch(activity: Activity,
+                   readOnly: Boolean,
+                   onValidateSpecialMode: () -> Unit,
+                   onCancelSpecialMode: () -> Unit,
+                   onLaunchActivitySpecialMode: () -> Unit) {
+            EntrySelectionHelper.doSpecialAction(activity.intent,
+                    {
+                        GroupActivity.launch(activity,
+                                readOnly,
+                                true)
+                    },
+                    { searchInfo ->
+                        SearchHelper.checkAutoSearchInfo(activity,
+                                Database.getInstance(),
+                                searchInfo,
+                                { _ ->
+                                    // Response is build
+                                    GroupActivity.launchForSearchResult(activity,
+                                            readOnly,
+                                            searchInfo,
+                                            true)
+                                    onLaunchActivitySpecialMode()
+                                },
+                                {
+                                    // Here no search info found
+                                    if (readOnly) {
+                                        GroupActivity.launchForSearchResult(activity,
+                                                readOnly,
+                                                searchInfo,
+                                                false)
+                                    } else {
+                                        GroupActivity.launchForSaveResult(activity,
+                                                searchInfo,
+                                                false)
+                                    }
+                                    onLaunchActivitySpecialMode()
+                                },
+                                {
+                                    // Simply close if database not opened, normally not happened
+                                    onCancelSpecialMode()
+                                }
+                        )
+                    },
+                    { searchInfo ->
+                        // Save info used with OTP
+                        if (!readOnly) {
+                            GroupActivity.launchForSaveResult(activity,
+                                    searchInfo,
+                                    false)
+                            onLaunchActivitySpecialMode()
+                        }  else {
+                            Toast.makeText(activity.applicationContext,
+                                    R.string.autofill_read_only_save,
+                                    Toast.LENGTH_LONG)
+                                    .show()
+                            onCancelSpecialMode()
+                        }
+                    },
+                    { searchInfo ->
+                        SearchHelper.checkAutoSearchInfo(activity,
+                                Database.getInstance(),
+                                searchInfo,
+                                { items ->
+                                    // Response is build
+                                    if (items.size == 1) {
+                                        populateKeyboardAndMoveAppToBackground(activity,
+                                                items[0],
+                                                activity.intent)
+                                        onValidateSpecialMode()
+                                    } else {
+                                        // Select the one we want
+                                        GroupActivity.launchForKeyboardSelectionResult(activity,
+                                                readOnly,
+                                                searchInfo,
+                                                true)
+                                        onLaunchActivitySpecialMode()
+                                    }
+                                },
+                                {
+                                    // Here no search info found, disable auto search
+                                    GroupActivity.launchForKeyboardSelectionResult(activity,
+                                            readOnly,
+                                            searchInfo,
+                                            false)
+                                    onLaunchActivitySpecialMode()
+                                },
+                                {
+                                    // Simply close if database not opened, normally not happened
+                                    onCancelSpecialMode()
+                                }
+                        )
+                    },
+                    { searchInfo, autofillComponent ->
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                            SearchHelper.checkAutoSearchInfo(activity,
+                                    Database.getInstance(),
+                                    searchInfo,
+                                    { items ->
+                                        // Response is build
+                                        AutofillHelper.buildResponseAndSetResult(activity, items)
+                                        onValidateSpecialMode()
+                                    },
+                                    {
+                                        // Here no search info found, disable auto search
+                                        GroupActivity.launchForAutofillResult(activity,
+                                                readOnly,
+                                                autofillComponent,
+                                                searchInfo,
+                                                false)
+                                        onLaunchActivitySpecialMode()
+                                    },
+                                    {
+                                        // Simply close if database not opened, normally not happened
+                                        onCancelSpecialMode()
+                                    }
+                            )
+                        } else {
+                            onCancelSpecialMode()
+                        }
+                    },
+                    { registerInfo ->
+                        if (!readOnly) {
+                            SearchHelper.checkAutoSearchInfo(activity,
+                                    Database.getInstance(),
+                                    registerInfo?.searchInfo,
+                                    { _ ->
+                                        // No auto search, it's a registration
+                                        GroupActivity.launchForRegistration(activity,
+                                                registerInfo)
+                                        onLaunchActivitySpecialMode()
+                                    },
+                                    {
+                                        // Here no search info found, disable auto search
+                                        GroupActivity.launchForRegistration(activity,
+                                                registerInfo)
+                                        onLaunchActivitySpecialMode()
+                                    },
+                                    {
+                                        // Simply close if database not opened, normally not happened
+                                        onCancelSpecialMode()
+                                    }
+                            )
+                        } else {
+                            Toast.makeText(activity.applicationContext,
+                                    R.string.autofill_read_only_save,
+                                    Toast.LENGTH_LONG)
+                                    .show()
+                            onCancelSpecialMode()
+                        }
+                    })
+        }
     }
 }

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

@@ -22,29 +22,24 @@ package com.kunzisoft.keepass.activities
 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.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 +64,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
 
 
     private var readOnly: Boolean = false
-        get() {
+    private var specialMode: SpecialMode = SpecialMode.DEFAULT
-            return field || selectionMode
-        }
-    private var selectionMode: Boolean = false
 
     val isEmpty: Boolean
         get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0
@@ -97,6 +89,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 +187,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 +208,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 +232,13 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         }
 
         // Tell the adapter to refresh it's list
-        mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
+        try {
-        rebuildList()
+            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) {

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

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

@@ -20,13 +20,13 @@
 package com.kunzisoft.keepass.activities
 
 import android.app.Activity
-import android.app.assist.AssistStructure
 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
@@ -36,26 +36,27 @@ import android.widget.*
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
-import androidx.biometric.BiometricManager
 import androidx.core.app.ActivityCompat
-import androidx.lifecycle.Observer
+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.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
+import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager
+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.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
@@ -67,14 +68,13 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 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 com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
 import kotlinx.android.synthetic.main.activity_password.*
 import java.io.FileNotFoundException
 
-open class PasswordActivity : SpecialModeActivity() {
+open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.BuilderListener {
 
     // Views
     private var toolbar: Toolbar? = null
@@ -84,12 +84,12 @@ open class PasswordActivity : SpecialModeActivity() {
     private var confirmButtonView: Button? = null
     private var checkboxPasswordView: CompoundButton? = null
     private var checkboxKeyFileView: CompoundButton? = null
-    private var advancedUnlockInfoView: AdvancedUnlockInfoView? = null
+    private var advancedUnlockFragment: AdvancedUnlockFragment? = null
     private var infoContainerView: ViewGroup? = null
-    private var enableButtonOnCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null
 
     private val databaseFileViewModel: DatabaseFileViewModel by viewModels()
 
+    private var mDefaultDatabase: Boolean = false
     private var mDatabaseFileUri: Uri? = null
     private var mDatabaseKeyFileUri: Uri? = null
 
@@ -111,7 +111,6 @@ open class PasswordActivity : SpecialModeActivity() {
 
     private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
 
-    private var advancedUnlockedManager: AdvancedUnlockedManager? = null
     private var mAllowAutoOpenBiometricPrompt: Boolean = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -131,7 +130,6 @@ open class PasswordActivity : SpecialModeActivity() {
         keyFileSelectionView = findViewById(R.id.keyfile_selection)
         checkboxPasswordView = findViewById(R.id.password_checkbox)
         checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
-        advancedUnlockInfoView = findViewById(R.id.biometric_info)
         infoContainerView = findViewById(R.id.activity_password_info_container)
 
         mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
@@ -158,10 +156,6 @@ open class PasswordActivity : SpecialModeActivity() {
             }
         })
 
-        enableButtonOnCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ ->
-            enableOrNotTheConfirmationButton()
-        }
-
         // If is a view intent
         getUriFromIntent(intent)
         if (savedInstanceState?.containsKey(KEY_KEYFILE) == true) {
@@ -171,8 +165,31 @@ open class PasswordActivity : SpecialModeActivity() {
             mAllowAutoOpenBiometricPrompt = savedInstanceState.getBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT)
         }
 
+        // 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, Observer { databaseFile ->
+        databaseFileViewModel.databaseFileLoaded.observe(this) { databaseFile ->
             // Force read only if the file does not exists
             mForceReadOnly = databaseFile?.let {
                 !it.databaseFileExists
@@ -192,19 +209,14 @@ open class PasswordActivity : SpecialModeActivity() {
             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
+                        // Recheck advanced unlock if error
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        advancedUnlockFragment?.initAdvancedUnlockMode()
-                            if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
-                                // Stay with the same mode and init it
-                                advancedUnlockedManager?.initBiometricMode()
-                            }
-                        }
 
                         if (result.isSuccess) {
                             mDatabaseKeyFileUri = null
@@ -218,32 +230,40 @@ open class PasswordActivity : SpecialModeActivity() {
                             if (resultException != null) {
                                 resultError = resultException.getLocalizedMessage(resources)
 
-                                // Relaunch loading if we need to fix UUID
+                                when (resultException) {
-                                if (resultException is DuplicateUuidDatabaseException) {
+                                    is DuplicateUuidDatabaseException -> {
-                                    showLoadDatabaseDuplicateUuidMessage {
+                                        // Relaunch loading if we need to fix UUID
+                                        showLoadDatabaseDuplicateUuidMessage {
 
-                                        var databaseUri: Uri? = null
+                                            var databaseUri: Uri? = null
-                                        var masterPassword: String? = null
+                                            var masterPassword: String? = null
-                                        var keyFileUri: Uri? = null
+                                            var keyFileUri: Uri? = null
-                                        var readOnly = true
+                                            var readOnly = true
-                                        var cipherEntity: CipherDatabaseEntity? = null
+                                            var cipherEntity: CipherDatabaseEntity? = null
 
-                                        result.data?.let { resultData ->
+                                            result.data?.let { resultData ->
-                                            databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
+                                                databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
-                                            masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
+                                                masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
-                                            keyFileUri = resultData.getParcelable(KEY_FILE_URI_KEY)
+                                                keyFileUri = resultData.getParcelable(KEY_FILE_URI_KEY)
-                                            readOnly = resultData.getBoolean(READ_ONLY_KEY)
+                                                readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                            cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
+                                                cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
+                                            }
+
+                                            databaseUri?.let { databaseFileUri ->
+                                                showProgressDialogAndLoadDatabase(
+                                                        databaseFileUri,
+                                                        masterPassword,
+                                                        keyFileUri,
+                                                        readOnly,
+                                                        cipherEntity,
+                                                        true)
+                                            }
                                         }
-
+                                    }
-                                        databaseUri?.let { databaseFileUri ->
+                                    is FileNotFoundDatabaseException -> {
-                                            showProgressDialogAndLoadDatabase(
+                                        // Remove this default database inaccessible
-                                                    databaseFileUri,
+                                        if (mDefaultDatabase) {
-                                                    masterPassword,
+                                            databaseFileViewModel.removeDefaultDatabase()
-                                                    keyFileUri,
-                                                    readOnly,
-                                                    cipherEntity,
-                                                    true)
                                         }
                                     }
                                 }
@@ -275,6 +295,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?) {
@@ -283,74 +306,49 @@ open class PasswordActivity : SpecialModeActivity() {
     }
 
     private fun launchGroupActivity() {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        GroupActivity.launch(this,
-        EntrySelectionHelper.doEntrySelectionAction(intent,
+                readOnly,
-                {
+                { onValidateSpecialMode() },
-                    GroupActivity.launch(this@PasswordActivity,
+                { onCancelSpecialMode() },
-                            true,
+                { onLaunchActivitySpecialMode() }
-                            searchInfo,
+        )
-                            readOnly)
+    }
-                    // Finish activity if no search info
+
-                    if (searchInfo != null) {
+    override fun onValidateSpecialMode() {
-                        finish()
+        super.onValidateSpecialMode()
-                    }
+        finish()
-                },
+    }
-                {
+
-                    SearchHelper.checkAutoSearchInfo(this,
+    override fun onCancelSpecialMode() {
-                            Database.getInstance(),
+        super.onCancelSpecialMode()
-                            searchInfo,
+        finish()
-                            { items ->
+    }
-                                // Response is build
+
-                                if (items.size == 1) {
+    override fun retrieveCredentialForEncryption(): String {
-                                    populateKeyboardAndMoveAppToBackground(this@PasswordActivity,
+        return passwordView?.text?.toString() ?: ""
-                                            items[0],
+    }
-                                            intent)
+
-                                } else {
+    override fun conditionToStoreCredential(): Boolean {
-                                    // Select the one we want
+        return checkboxPasswordView?.isChecked == true
-                                    GroupActivity.launchForEntrySelectionResult(this,
+    }
-                                            true,
+
-                                            searchInfo)
+    override fun onCredentialEncrypted(databaseUri: Uri,
-                                }
+                                       encryptedCredential: String,
-                            },
+                                       ivSpec: String) {
-                            {
+        // Load the database if password is registered with biometric
-                                // Here no search info found, disable auto search
+        verifyCheckboxesAndLoadDatabase(
-                                GroupActivity.launchForEntrySelectionResult(this@PasswordActivity,
+                CipherDatabaseEntity(
-                                        false,
+                        databaseUri.toString(),
-                                        searchInfo,
+                        encryptedCredential,
-                                        readOnly)
+                        ivSpec)
-                            },
+        )
-                            {
+    }
-                                // Simply close if database not opened, normally not happened
+
-                            }
+    override fun onCredentialDecrypted(databaseUri: Uri,
-                    )
+                                       decryptedCredential: String) {
-                    // Do not keep history
+        // Load the database if password is retrieve from biometric
-                    finish()
+        // Retrieve from biometric
-                },
+        verifyKeyFileCheckboxAndLoadDatabase(decryptedCredential)
-                { 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()
-                                }
-                        )
-                    }
-                })
     }
 
     private val onEditorActionListener = object : TextView.OnEditorActionListener {
@@ -389,7 +387,6 @@ open class PasswordActivity : SpecialModeActivity() {
                 false
             else
                 mAllowAutoOpenBiometricPrompt
-
             mDatabaseFileUri?.let { databaseFileUri ->
                 databaseFileViewModel.loadDatabaseFile(databaseFileUri)
             }
@@ -420,47 +417,9 @@ open class PasswordActivity : SpecialModeActivity() {
             verifyCheckboxesAndLoadDatabase(password, keyFileUri)
         } else {
             // Init Biometric elements
-            var biometricInitialize = false
+            advancedUnlockFragment?.loadDatabase(databaseFileUri,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    mAllowAutoOpenBiometricPrompt
-                if (PreferencesUtil.isBiometricUnlockEnable(this)) {
+                                        && mProgressDatabaseTaskProvider?.isBinded() != true)
-                    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()
-                    advancedUnlockInfoView?.visibility = View.GONE
-                }
-            }
-            if (!biometricInitialize) {
-                checkboxPasswordView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
-            }
-            checkboxKeyFileView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
         }
 
         enableOrNotTheConfirmationButton()
@@ -512,11 +471,6 @@ open class PasswordActivity : SpecialModeActivity() {
     override fun onPause() {
         mProgressDatabaseTaskProvider?.unregisterProgressTask()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            advancedUnlockedManager?.destroy()
-            advancedUnlockedManager = null
-        }
-
         // Reinit locking activity UI variable
         LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
         mAllowAutoOpenBiometricPrompt = true
@@ -567,15 +521,25 @@ open class PasswordActivity : SpecialModeActivity() {
             clearCredentialsViews()
         }
 
-        databaseFileUri?.let { databaseUri ->
+        if (readOnly && (
-            // Show the progress dialog and load the database
+                mSpecialMode == SpecialMode.SAVE
-            showProgressDialogAndLoadDatabase(
+                || mSpecialMode == SpecialMode.REGISTRATION)
-                    databaseUri,
+        ) {
-                    password,
+            Log.e(TAG, getString(R.string.autofill_read_only_save))
-                    keyFileUri,
+            Snackbar.make(activity_password_coordinator_layout,
-                    readOnly,
+                    R.string.autofill_read_only_save,
-                    cipherDatabaseEntity,
+                    Snackbar.LENGTH_LONG).asError().show()
-                    false)
+        } else {
+            databaseFileUri?.let { databaseUri ->
+                // Show the progress dialog and load the database
+                showProgressDialogAndLoadDatabase(
+                        databaseUri,
+                        password,
+                        keyFileUri,
+                        readOnly,
+                        cipherDatabaseEntity,
+                        false)
+            }
         }
     }
 
@@ -605,21 +569,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)
@@ -629,13 +588,13 @@ open class PasswordActivity : SpecialModeActivity() {
 
     // Check permission
     private fun checkPermission() {
-        val writePermission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+        if (Build.VERSION.SDK_INT in 23..28
-        val permissions = arrayOf(writePermission)
-        if (Build.VERSION.SDK_INT >= 23
                 && !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)
@@ -662,7 +621,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) }
         }
     }
 
@@ -684,27 +643,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) {
+            advancedUnlockFragment?.performEducation(passwordActivityEducation,
-                val biometricCanAuthenticate = BiometricManager.from(this).canAuthenticate()
+                    readOnlyEducationPerformed,
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    {
-                        && PreferencesUtil.isBiometricUnlockEnable(applicationContext)
+                        performedNextEducation(passwordActivityEducation, menu)
-                        && (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)
-                        },
-                        {
-                            performedNextEducation(passwordActivityEducation, menu)
-                        })
-            }
         }
     }
 
@@ -726,10 +683,7 @@ open class PasswordActivity : SpecialModeActivity() {
                 readOnly = !readOnly
                 changeOpenFileReadIcon(item)
             }
-            R.id.menu_biometric_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            else -> MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
-                advancedUnlockedManager?.deleteEntryKey()
-            }
-            else -> return MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
         }
 
         return super.onOptionsItemSelected(item)
@@ -743,6 +697,9 @@ 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)
@@ -763,7 +720,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()
@@ -776,6 +733,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"
@@ -803,19 +762,52 @@ open class PasswordActivity : SpecialModeActivity() {
          */
 
         @Throws(FileNotFoundException::class)
-        fun launch(
+        fun launch(activity: Activity,
-                activity: Activity,
+                   databaseFile: Uri,
-                databaseFile: Uri,
+                   keyFile: Uri?) {
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
             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
@@ -823,13 +815,12 @@ open class PasswordActivity : SpecialModeActivity() {
          */
 
         @Throws(FileNotFoundException::class)
-        fun launchForKeyboardResult(
+        fun launchForKeyboardResult(activity: Activity,
-                activity: Activity,
+                                    databaseFile: Uri,
-                databaseFile: Uri,
+                                    keyFile: Uri?,
-                keyFile: Uri?,
+                                    searchInfo: SearchInfo?) {
-                searchInfo: SearchInfo?) {
             buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                EntrySelectionHelper.startActivityForEntrySelectionResult(
+                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(
                         activity,
                         intent,
                         searchInfo)
@@ -844,22 +835,93 @@ open class PasswordActivity : SpecialModeActivity() {
 
         @RequiresApi(api = Build.VERSION_CODES.O)
         @Throws(FileNotFoundException::class)
-        fun launchForAutofillResult(
+        fun launchForAutofillResult(activity: Activity,
-                activity: Activity,
+                                    databaseFile: Uri,
-                databaseFile: Uri,
+                                    keyFile: Uri?,
-                keyFile: Uri?,
+                                    autofillComponent: AutofillComponent,
-                assistStructure: AssistStructure?,
+                                    searchInfo: SearchInfo?) {
-                searchInfo: SearchInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-            if (assistStructure != null) {
+                AutofillHelper.startActivityForAutofillResult(
-                buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                        activity,
-                    AutofillHelper.startActivityForAutofillResult(
+                        intent,
-                            activity,
+                        autofillComponent,
-                            intent,
+                        searchInfo)
-                            assistStructure,
+            }
-                            searchInfo)
+        }
-                }
+
-            } else {
+        /*
-                launch(activity, databaseFile, keyFile, 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)
             }
         }
     }

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

@@ -26,15 +26,18 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
+import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.View
 import android.widget.CompoundButton
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 
 class AssignMasterKeyDialogFragment : DialogFragment() {
@@ -58,6 +61,10 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
 
     private var mSelectFileHelper: SelectFileHelper? = 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) {}
 
@@ -85,6 +92,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 +117,15 @@ 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) { _, _ -> }
 
+            val credentialsInfo: ImageView? = rootView?.findViewById(R.id.credentials_information)
+            credentialsInfo?.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)
@@ -129,7 +151,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                         mMasterPassword = ""
                         mKeyFile = null
 
-                        var error = verifyPassword() || verifyFile()
+                        var error = verifyPassword() || verifyKeyFile()
                         if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
                             error = true
                             if (allowNoMasterKey)
@@ -199,7 +221,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
         return error
     }
 
-    private fun verifyFile(): Boolean {
+    private fun verifyKeyFile(): Boolean {
         var error = false
         if (keyFileCheckBox != null
                 && keyFileCheckBox!!.isChecked) {
@@ -219,7 +241,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
             val builder = AlertDialog.Builder(it)
             builder.setMessage(R.string.warning_empty_password)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
-                        if (!verifyFile()) {
+                        if (!verifyKeyFile()) {
                             mListener?.onAssignKeyDialogPositiveClick(
                                     passwordCheckBox!!.isChecked, mMasterPassword,
                                     keyFileCheckBox!!.isChecked, mKeyFile)
@@ -227,7 +249,8 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                         }
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            builder.create().show()
+            mEmptyPasswordConfirmationDialog = builder.create()
+            mEmptyPasswordConfirmationDialog?.show()
         }
     }
 
@@ -242,7 +265,28 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                         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()
         }
     }
 
@@ -251,8 +295,14 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
 
         mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
             uri?.let { pathUri ->
-                keyFileCheckBox?.isChecked = true
+                UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
-                keyFileSelectionView?.uri = pathUri
+                    keyFileSelectionView?.error = null
+                    keyFileCheckBox?.isChecked = true
+                    keyFileSelectionView?.uri = pathUri
+                    if (lengthFile <= 0L) {
+                        showEmptyKeyFileConfirmationDialog()
+                    }
+                }
             }
         }
     }

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

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 {

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

@@ -31,7 +31,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
 import com.kunzisoft.keepass.notifications.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.setMessage(retrieveMessage())
-            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+            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()
         }

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

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

@@ -60,6 +60,11 @@ class EntryCustomFieldDialogFragment: DialogFragment() {
         }
     }
 
+    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)

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

@@ -46,6 +46,11 @@ class FileTooBigDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
             // Use the Builder class for convenient dialog construction
@@ -55,12 +60,12 @@ class FileTooBigDialogFragment : DialogFragment() {
                 append("\n\n")
                 append(getString(R.string.warning_sure_add_file))
             })
-            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
                 mActionChooseListener?.onValidateUploadFileTooBig(
                         arguments?.getParcelable(KEY_FILE_URI),
                         arguments?.getString(KEY_FILE_NAME))
             }
-            builder.setNegativeButton(android.R.string.no) { _, _ ->
+            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
                 dismiss()
             }
             // Create the AlertDialog object and return it

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.*
-import android.widget.CompoundButton
-import android.widget.EditText
-import android.widget.SeekBar
 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)
 

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

@@ -73,7 +73,11 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
             throw ClassCastException(context.toString()
                     + " must implement " + GroupEditDialogFragment::class.java.name)
         }
+    }
 
+    override fun onDetach() {
+        editGroupListener = null
+        super.onDetach()
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

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

@@ -34,6 +34,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.ImageViewCompat
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.icons.IconPack
@@ -56,6 +57,11 @@ class IconPickerDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        iconPickerListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
             val builder = AlertDialog.Builder(activity)
@@ -132,7 +138,7 @@ class IconPickerDialogFragment : DialogFragment() {
             return bundle.getParcelable(KEY_ICON_STANDARD)
         }
 
-        fun launch(activity: AppCompatActivity) {
+        fun launch(activity: FragmentActivity) {
             // Create an instance of the dialog fragment and show it
             val dialog = IconPickerDialogFragment()
             dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")

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

@@ -21,20 +21,51 @@ 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
 
 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 masterPasswordChecked: Boolean = savedInstanceState?.getBoolean(MASTER_PASSWORD_CHECKED_KEY) ?: false
+        val masterPassword: String? = savedInstanceState?.getString(MASTER_PASSWORD_KEY)
+        val keyFileChecked: Boolean = savedInstanceState?.getBoolean(KEY_FILE_CHECKED_KEY) ?: false
+        val keyFile: Uri? = savedInstanceState?.getParcelable(KEY_FILE_URI_KEY)
+
         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,
+                        masterPasswordChecked,
+                        masterPassword,
+                        keyFileChecked,
+                        keyFile
+                )
+            }
             builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() }
 
             return builder.create()
@@ -42,5 +73,36 @@ class PasswordEncodingDialogFragment : DialogFragment() {
         return super.onCreateDialog(savedInstanceState)
     }
 
+    interface Listener {
+        fun onPasswordEncodingValidateListener(databaseUri: Uri?,
+                                               masterPasswordChecked: Boolean,
+                                               masterPassword: String?,
+                                               keyFileChecked: Boolean,
+                                               keyFile: Uri?)
+    }
 
+    companion object {
+
+        private const val DATABASE_URI_KEY = "DATABASE_URI_KEY"
+        private const val MASTER_PASSWORD_CHECKED_KEY = "MASTER_PASSWORD_CHECKED_KEY"
+        private const val MASTER_PASSWORD_KEY = "MASTER_PASSWORD_KEY"
+        private const val KEY_FILE_CHECKED_KEY = "KEY_FILE_CHECKED_KEY"
+        private const val KEY_FILE_URI_KEY = "KEY_FILE_URI_KEY"
+
+        fun getInstance(databaseUri: Uri,
+                        masterPasswordChecked: Boolean,
+                        masterPassword: String?,
+                        keyFileChecked: Boolean,
+                        keyFile: Uri?): SortDialogFragment {
+            val fragment = SortDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(DATABASE_URI_KEY, databaseUri)
+                putBoolean(MASTER_PASSWORD_CHECKED_KEY, masterPasswordChecked)
+                putString(MASTER_PASSWORD_KEY, masterPassword)
+                putBoolean(KEY_FILE_CHECKED_KEY, keyFileChecked)
+                putParcelable(KEY_FILE_URI_KEY, keyFile)
+            }
+            return fragment
+        }
+    }
 }

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

@@ -47,6 +47,11 @@ class ReplaceFileDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
             // Use the Builder class for convenient dialog construction
@@ -56,12 +61,12 @@ class ReplaceFileDialogFragment : DialogFragment() {
                 append("\n\n")
                 append(getString(R.string.warning_sure_add_file))
             })
-            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
                 mActionChooseListener?.onValidateReplaceFile(
                         arguments?.getParcelable(KEY_FILE_URI),
                         arguments?.getParcelable(KEY_ENTRY_ATTACHMENT))
             }
-            builder.setNegativeButton(android.R.string.no) { _, _ ->
+            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
                 dismiss()
             }
             // Create the AlertDialog object and return it

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

@@ -29,10 +29,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.widget.AdapterView
+import android.widget.*
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.Spinner
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
@@ -57,6 +54,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
@@ -74,6 +72,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 ->
@@ -107,6 +107,11 @@ class SetOTPDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mCreateOTPElementListener = null
+        super.onDetach()
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 
@@ -129,6 +134,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)
@@ -178,23 +184,23 @@ class SetOTPDialogFragment : DialogFragment() {
 
             // 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
@@ -202,7 +208,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)
             }
@@ -367,24 +373,40 @@ 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
+                mHotpTokenTypeArray?.let { otpTokenTypeArray ->
-                        .getHotpTokenTypeValues().indexOf(mOtpElement.tokenType))
+                    defineOtpTokenTypeSpinner(otpTokenTypeArray, tokenType, OtpTokenType.RFC4226)
+                }
             }
             OtpType.TOTP -> {
                 otpPeriodContainer?.visibility = View.VISIBLE
                 otpCounterContainer?.visibility = View.GONE
                 otpTokenTypeSpinner?.adapter = totpTokenTypeAdapter
-                otpTokenTypeSpinner?.setSelection(OtpTokenType
+                mTotpTokenTypeArray?.let { otpTokenTypeArray ->
-                        .getTotpTokenTypeValues().indexOf(mOtpElement.tokenType))
+                    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))

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)

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 {

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

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 KEY_SPECIAL_MODE = "com.kunzisoft.keepass.extra.SPECIAL_MODE"
-    private const val DEFAULT_ENTRY_SELECTION_MODE = false
+    private const val KEY_TYPE_MODE = "com.kunzisoft.keepass.extra.TYPE_MODE"
-    // Key to retrieve search in intent
+    private const val KEY_SEARCH_INFO = "com.kunzisoft.keepass.extra.SEARCH_INFO"
-    const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
+    private const val KEY_REGISTER_INFO = "com.kunzisoft.keepass.extra.REGISTER_INFO"
 
-    fun startActivityForEntrySelectionResult(context: Context,
+    fun startActivityForSearchModeResult(context: Context,
-                                             intent: Intent,
+                                         intent: Intent,
-                                             searchInfo: SearchInfo?) {
+                                         searchInfo: SearchInfo) {
-        addEntrySelectionModeExtraInIntent(intent)
+        addSpecialModeInIntent(intent, SpecialMode.SEARCH)
-        searchInfo?.let {
+        addSearchInfoInIntent(intent, searchInfo)
-            intent.putExtra(KEY_SEARCH_INFO, it)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        }
         context.startActivity(intent)
     }
 
-    fun addEntrySelectionModeExtraInIntent(intent: Intent) {
+    fun startActivityForSaveModeResult(context: Context,
-        intent.putExtra(EXTRA_ENTRY_SELECTION_MODE, true)
+                                             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) {
+    fun startActivityForKeyboardSelectionModeResult(context: Context,
-        intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
+                                                    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 {
+    fun startActivityForRegistrationModeResult(context: Context,
-        return intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)
+                                               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,
+    fun addSearchInfoInIntent(intent: Intent, searchInfo: SearchInfo?) {
-                               standardAction: () -> Unit,
+        searchInfo?.let {
-                               keyboardAction: () -> Unit,
+            intent.putExtra(KEY_SEARCH_INFO, it)
-                               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
-            }
         }
-        if (!assistStructureInit) {
+    }
-            if (intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)) {
+
-                intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
+    fun retrieveSearchInfoFromIntent(intent: Intent): SearchInfo? {
-                keyboardAction.invoke()
+        return intent.getParcelableExtra(KEY_SEARCH_INFO)
-            } else {
+    }
-                standardAction.invoke()
+
+    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)
             }
         }
     }

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

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

app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt

@@ -20,12 +20,17 @@
 package com.kunzisoft.keepass.activities.lock
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
@@ -43,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
@@ -55,6 +60,9 @@ abstract class LockingActivity : SpecialModeActivity() {
         private set
 
     override fun onCreate(savedInstanceState: Bundle?) {
+
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
+
         super.onCreate(savedInstanceState)
 
         if (savedInstanceState != null
@@ -79,8 +87,6 @@ abstract class LockingActivity : SpecialModeActivity() {
         }
 
         mExitLock = false
-
-        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -96,6 +102,15 @@ abstract class LockingActivity : SpecialModeActivity() {
     override fun onResume() {
         super.onResume()
 
+        // If in ave or registration mode, don't allow read only
+        if ((mSpecialMode == SpecialMode.SAVE
+                        || mSpecialMode == SpecialMode.REGISTRATION)
+                && mReadOnly) {
+            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            finish()
+        }
+
         mProgressDatabaseTaskProvider?.registerProgressTask()
 
         // To refresh when back to normal workflow from selection workflow
@@ -150,35 +165,6 @@ abstract class LockingActivity : SpecialModeActivity() {
         sendBroadcast(Intent(LOCK_ACTION))
     }
 
-    /**
-     * To reset the app timeout when a view is focused or changed
-     */
-    @SuppressLint("ClickableViewAccessibility")
-    protected fun resetAppTimeoutWhenViewFocusedOrChanged(vararg views: View?) {
-        views.forEach {
-            it?.setOnTouchListener { _, event ->
-                when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        // Log.d(TAG, "View touched, try to reset app timeout")
-                        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this)
-                    }
-                }
-                false
-            }
-            it?.setOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus) {
-                    // Log.d(TAG, "View focused, try to 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) {
@@ -191,7 +177,7 @@ abstract class LockingActivity : SpecialModeActivity() {
 
     companion object {
 
-        private const val TAG = "LockingActivity"
+        const val TAG = "LockingActivity"
 
         const val RESULT_EXIT_LOCK = 1450
 
@@ -202,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)
+        }
+    }
+}

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)
+        mSpecialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(intent)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        mTypeMode = EntrySelectionHelper.retrieveTypeModeFromIntent(intent)
-            mAutofillSelection = AutofillHelper.retrieveAssistStructure(intent) != null
+        val searchInfo: SearchInfo? = EntrySelectionHelper.retrieveRegisterInfoFromIntent(intent)?.searchInfo
-        }
+                ?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
-
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(EntrySelectionHelper.KEY_SEARCH_INFO)
 
         // To show the selection mode
-        specialModeView = findViewById(R.id.special_mode_view)
+        mSpecialModeView = findViewById(R.id.special_mode_view)
-        specialModeView?.apply {
+        mSpecialModeView?.apply {
             // Populate title
-            val typeModeId = if (mAutofillSelection)
+            val selectionModeStringId = when (mSpecialMode) {
-                R.string.autofill
+                SpecialMode.DEFAULT, // Not important because hidden
-            else
+                SpecialMode.SEARCH -> R.string.search_mode
-                R.string.magic_keyboard_title
+                SpecialMode.SAVE -> R.string.save_mode
-            title = "${resources.getString(R.string.selection_mode)} (${getString(typeModeId)})"
+                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) {

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

@@ -20,7 +20,10 @@
 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
@@ -33,11 +36,24 @@ import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
 
+
 class EntryAttachmentsItemsAdapter(context: Context)
     : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {
 
     var onItemClickListener: ((item: EntryAttachmentState)->Unit)? = null
 
+    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))
     }
@@ -46,7 +62,20 @@ class EntryAttachmentsItemsAdapter(context: Context)
         val entryAttachmentState = itemsList[position]
 
         holder.itemView.visibility = View.VISIBLE
+        holder.binaryFileBroken.apply {
+            setColorFilter(Color.RED)
+            visibility = if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+        }
         holder.binaryFileTitle.text = entryAttachmentState.attachment.name
+        if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+            holder.binaryFileTitle.setTextColor(Color.RED)
+        } else {
+            holder.binaryFileTitle.setTextColor(mTitleColor)
+        }
         holder.binaryFileSize.text = Formatter.formatFileSize(context,
                 entryAttachmentState.attachment.binaryAttachment.length())
         holder.binaryFileCompression.apply {
@@ -107,6 +136,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
 
     class EntryBinariesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
+        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)

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

@@ -1,180 +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.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-import androidx.core.widget.doOnTextChanged
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.textfield.TextInputLayout
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.model.Field
-import com.kunzisoft.keepass.model.FocusedEditField
-import com.kunzisoft.keepass.view.EditTextSelectable
-import com.kunzisoft.keepass.view.applyFontVisibility
-
-class EntryExtraFieldsItemsAdapter(context: Context)
-    : AnimatedItemsAdapter<Field, EntryExtraFieldsItemsAdapter.EntryExtraFieldViewHolder>(context) {
-
-    var applyFontVisibility = false
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    private var mValueViewInputType: Int = 0
-    private var mLastFocusedEditField = FocusedEditField()
-    private var mLastFocusedTimestamp: Long = 0L
-
-    var onEditButtonClickListener: ((item: Field)->Unit)? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryExtraFieldViewHolder {
-        val view = EntryExtraFieldViewHolder(
-                inflater.inflate(R.layout.item_entry_edit_extra_field, parent, false)
-        )
-        mValueViewInputType = view.extraFieldValue.inputType
-        return view
-    }
-
-    override fun onBindViewHolder(holder: EntryExtraFieldViewHolder, position: Int) {
-        val extraField = itemsList[position]
-
-        holder.itemView.visibility = View.VISIBLE
-        if (extraField.protectedValue.isProtected) {
-            holder.extraFieldValueContainer.isPasswordVisibilityToggleEnabled = true
-            holder.extraFieldValue.inputType = EditorInfo.TYPE_TEXT_VARIATION_PASSWORD or mValueViewInputType
-        } else {
-            holder.extraFieldValueContainer.isPasswordVisibilityToggleEnabled = false
-            holder.extraFieldValue.inputType = mValueViewInputType
-        }
-        holder.extraFieldValueContainer.hint = extraField.name
-        holder.extraFieldValue.apply {
-            setText(extraField.protectedValue.toString())
-            // To Fix focus in RecyclerView
-            setOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus) {
-                    setFocusField(extraField, selectionStart, selectionEnd)
-                } else {
-                    // request focus on last text focused
-                    if (focusedTimestampNotExpired())
-                        requestFocusField(this, extraField, false)
-                    else
-                        removeFocusField(extraField)
-                }
-            }
-            addOnSelectionChangedListener(object: EditTextSelectable.OnSelectionChangedListener {
-                override fun onSelectionChanged(start: Int, end: Int) {
-                    mLastFocusedEditField.apply {
-                        cursorSelectionStart = start
-                        cursorSelectionEnd = end
-                    }
-                }
-            })
-            requestFocusField(this, extraField, true)
-            doOnTextChanged { text, _, _, _ ->
-                extraField.protectedValue.stringValue = text.toString()
-            }
-            if (applyFontVisibility)
-                applyFontVisibility()
-        }
-        holder.extraFieldEditButton.setOnClickListener {
-            onEditButtonClickListener?.invoke(extraField)
-        }
-        performDeletion(holder, extraField)
-    }
-
-    fun assignItems(items: List<Field>, focusedEditField: FocusedEditField?) {
-        focusedEditField?.let {
-            setFocusField(it, true)
-        }
-        super.assignItems(items)
-    }
-
-    private fun setFocusField(field: Field,
-                              selectionStart: Int,
-                              selectionEnd: Int,
-                              force: Boolean = false) {
-        mLastFocusedEditField.apply {
-            this.field = field
-            this.cursorSelectionStart = selectionStart
-            this.cursorSelectionEnd = selectionEnd
-        }
-        setFocusField(mLastFocusedEditField, force)
-    }
-
-    private fun setFocusField(field: FocusedEditField, force: Boolean = false) {
-        mLastFocusedEditField = field
-        mLastFocusedTimestamp = if (force) 0L else System.currentTimeMillis()
-    }
-
-    private fun removeFocusField(field: Field? = null) {
-        if (field == null || mLastFocusedEditField.field == field) {
-            mLastFocusedEditField.destroy()
-        }
-    }
-
-    private fun requestFocusField(editText: EditText, field: Field, setSelection: Boolean) {
-        if (field == mLastFocusedEditField.field) {
-            editText.apply {
-                post {
-                    if (setSelection) {
-                        setEditTextSelection(editText)
-                    }
-                    requestFocus()
-                    removeFocusField(field)
-                }
-            }
-        }
-    }
-
-    private fun setEditTextSelection(editText: EditText) {
-        try {
-            var newCursorPositionStart = mLastFocusedEditField.cursorSelectionStart
-            var newCursorPositionEnd = mLastFocusedEditField.cursorSelectionEnd
-            // Cursor at end if 0 or less
-            if (newCursorPositionStart < 0 || newCursorPositionEnd < 0) {
-                newCursorPositionStart = (editText.text?:"").length
-                newCursorPositionEnd = newCursorPositionStart
-            }
-            editText.setSelection(newCursorPositionStart, newCursorPositionEnd)
-        } catch (ignoredException: Exception) {}
-    }
-
-    private fun focusedTimestampNotExpired(): Boolean {
-        return mLastFocusedTimestamp == 0L || (mLastFocusedTimestamp + FOCUS_TIMESTAMP) > System.currentTimeMillis()
-    }
-
-    fun getFocusedField(): FocusedEditField {
-        return mLastFocusedEditField
-    }
-
-    class EntryExtraFieldViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var extraFieldValueContainer: TextInputLayout = itemView.findViewById(R.id.entry_extra_field_value_container)
-        var extraFieldValue: EditTextSelectable = itemView.findViewById(R.id.entry_extra_field_value)
-        var extraFieldEditButton: View = itemView.findViewById(R.id.entry_extra_field_edit)
-    }
-
-    companion object {
-        // time to focus element when a keyboard appears
-        private const val FOCUS_TIMESTAMP = 400L
-    }
-}

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

@@ -52,72 +52,69 @@ import java.util.*
 class NodeAdapter (private val context: Context)
     : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {
 
-    private var nodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
+    private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
-    private val nodeSortedListCallback: NodeSortedListCallback
+    private val mNodeSortedListCallback: NodeSortedListCallback
-    private val nodeSortedList: SortedList<Node>
+    private val mNodeSortedList: SortedList<Node>
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private val mInflater: LayoutInflater = LayoutInflater.from(context)
 
-    private var calculateViewTypeTextSize = Array(2) { true} // number of view type
+    private var mCalculateViewTypeTextSize = Array(2) { true} // number of view type
-    private var textSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
+    private var mTextSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
-    private var prefSizeMultiplier: Float = 0F
+    private var mPrefSizeMultiplier: Float = 0F
-    private var subtextDefaultDimension: Float = 0F
+    private var mSubtextDefaultDimension: Float = 0F
-    private var infoTextDefaultDimension: Float = 0F
+    private var mInfoTextDefaultDimension: Float = 0F
-    private var numberChildrenTextDefaultDimension: Float = 0F
+    private var mNumberChildrenTextDefaultDimension: Float = 0F
-    private var iconDefaultDimension: Float = 0F
+    private var mIconDefaultDimension: Float = 0F
 
-    private var showUserNames: Boolean = true
+    private var mShowUserNames: Boolean = true
-    private var showNumberEntries: Boolean = true
+    private var mShowNumberEntries: Boolean = true
-    private var entryFilters = arrayOf<Group.ChildFilter>()
+    private var mEntryFilters = arrayOf<Group.ChildFilter>()
 
-    private var actionNodesList = LinkedList<Node>()
+    private var mActionNodesList = LinkedList<Node>()
-    private var nodeClickCallback: NodeClickCallback? = null
+    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.mIconDefaultDimension = context.resources.getDimension(R.dimen.list_icon_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)
 
         assignPreferences()
 
-        this.nodeSortedListCallback = NodeSortedListCallback()
+        this.mNodeSortedListCallback = NodeSortedListCallback()
-        this.nodeSortedList = SortedList(Node::class.java, 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)
+        this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
         taContentSelectionColor.recycle()
         // 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 +125,13 @@ class NodeAdapter (private val context: Context)
                         )
                 )
 
-        this.showUserNames = PreferencesUtil.showUsernamesListEntries(context)
+        this.mShowUserNames = PreferencesUtil.showUsernamesListEntries(context)
-        this.showNumberEntries = PreferencesUtil.showNumberEntries(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 +139,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 +159,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 +167,7 @@ class NodeAdapter (private val context: Context)
      * @param node Node to add
      */
     fun addNode(node: Node) {
-        nodeSortedList.add(node)
+        mNodeSortedList.add(node)
     }
 
     /**
@@ -178,7 +175,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 +183,7 @@ class NodeAdapter (private val context: Context)
      * @param node Node to delete
      */
     fun removeNode(node: Node) {
-        nodeSortedList.remove(node)
+        mNodeSortedList.remove(node)
     }
 
     /**
@@ -195,7 +192,7 @@ class NodeAdapter (private val context: Context)
      */
     fun removeNodes(nodes: List<Node>) {
         nodes.forEach { node ->
-            nodeSortedList.remove(node)
+            mNodeSortedList.remove(node)
         }
     }
 
@@ -203,9 +200,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 +223,10 @@ class NodeAdapter (private val context: Context)
      * @param newNode Node after the update
      */
     fun updateNode(oldNode: Node, newNode: Node) {
-        nodeSortedList.beginBatchedUpdates()
+        mNodeSortedList.beginBatchedUpdates()
-        nodeSortedList.remove(oldNode)
+        mNodeSortedList.remove(oldNode)
-        nodeSortedList.add(newNode)
+        mNodeSortedList.add(newNode)
-        nodeSortedList.endBatchedUpdates()
+        mNodeSortedList.endBatchedUpdates()
     }
 
     /**
@@ -238,30 +235,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)
+        mNodeSortedList.addAll(newNodes)
-        nodeSortedList.endBatchedUpdates()
+        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 {
+        mActionNodesList.forEach {
-            notifyItemChanged(nodeSortedList.indexOf(it))
+            notifyItemChanged(mNodeSortedList.indexOf(it))
         }
-        this.actionNodesList.apply {
+        this.mActionNodesList.apply {
             clear()
         }
     }
@@ -271,49 +268,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.GROUP -> mIconGroupColor
-            Type.ENTRY -> iconEntryColor
+            Type.ENTRY -> mIconEntryColor
         }
         holder.imageIdentifier?.setColorFilter(iconColor)
         holder.icon.apply {
             assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor)
             // Relative size of the icon
             layoutParams?.apply {
-                height = (iconDefaultDimension * prefSizeMultiplier).toInt()
+                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
-                width = (iconDefaultDimension * prefSizeMultiplier).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,10 +334,10 @@ 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)
                 }
             }
 
@@ -346,12 +349,12 @@ class NodeAdapter (private val context: Context)
 
         // 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 {
@@ -361,22 +364,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
     }
 
     /**

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

@@ -100,6 +100,7 @@ class SearchEntryCursorAdapter(private val context: Context,
                 } else {
                     ""
                 }
+                visibility = if (text.isEmpty()) View.GONE else View.VISIBLE
                 strikeOut(currentEntry.isCurrentlyExpires)
             }
         }
@@ -160,8 +161,8 @@ class SearchEntryCursorAdapter(private val context: Context,
     }
 
     private class ViewHolder {
-        internal var imageViewIcon: ImageView? = null
+        var imageViewIcon: ImageView? = null
-        internal var textViewTitle: TextView? = null
+        var textViewTitle: TextView? = null
-        internal var textViewSubTitle: TextView? = null
+        var textViewSubTitle: TextView? = null
     }
 }

app/src/main/java/com/kunzisoft/keepass/app/App.kt

@@ -22,6 +22,7 @@ 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() {
 
@@ -33,7 +34,7 @@ class App : MultiDexApplication() {
     }
 
     override fun onTerminate() {
-        Database.getInstance().closeAndClear(applicationContext.filesDir)
+        Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this))
         super.onTerminate()
     }
 }

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

@@ -19,27 +19,96 @@
  */
 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 com.kunzisoft.keepass.notifications.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) {
+                applicationContext.startService(mIntentAdvancedUnlockService)
+            }
+        }
+    }
+
+    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) {
-        IOActionTask(
+        if (useTempDao) {
-                {
+            attachService {
-                    cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
+                cipherDatabaseResultListener.invoke(mBinder?.getCipherDatabase(databaseUri))
-                },
+            }
-                {
+        } else {
-                    cipherDatabaseResultListener.invoke(it)
+            IOActionTask(
-                }
+                    {
-        ).execute()
+                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
+                    },
+                    {
+                        cipherDatabaseResultListener.invoke(it)
+                    }
+            ).execute()
+        }
     }
 
     fun containsCipherDatabase(databaseUri: Uri,
@@ -51,36 +120,52 @@ class CipherDatabaseAction(applicationContext: Context) {
 
     fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
                                   cipherDatabaseResultListener: (() -> Unit)? = null) {
-        IOActionTask(
+        if (useTempDao) {
-                {
+            attachService {
-                    val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
+                mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
-
+                cipherDatabaseResultListener?.invoke()
-                    // Update values if element not yet in the database
+            }
-                    if (cipherDatabaseRetrieve == null) {
+        } else {
-                        cipherDatabaseDao.add(cipherDatabaseEntity)
+            IOActionTask(
-                    } else {
+                    {
-                        cipherDatabaseDao.update(cipherDatabaseEntity)
+                        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()
                     }
-                },
+            ).execute()
-                {
+        }
-                    cipherDatabaseResultListener?.invoke()
-                }
-        ).execute()
     }
 
     fun deleteByDatabaseUri(databaseUri: Uri,
                             cipherDatabaseResultListener: (() -> Unit)? = null) {
-        IOActionTask(
+        if (useTempDao) {
-                {
+            attachService {
-                    cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
+                mBinder?.deleteByDatabaseUri(databaseUri)
-                },
+                cipherDatabaseResultListener?.invoke()
-                {
+            }
-                    cipherDatabaseResultListener?.invoke()
+        } else {
-                }
+            IOActionTask(
-        ).execute()
+                    {
+                        cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
+                    },
+                    {
+                        cipherDatabaseResultListener?.invoke()
+                    }
+            ).execute()
+        }
     }
 
     fun deleteAll() {
+        attachService {
+            mBinder?.deleteAll()
+        }
         IOActionTask(
                 {
                     cipherDatabaseDao.deleteAll()

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)

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

@@ -21,6 +21,7 @@ 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
@@ -46,7 +47,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
                             UriUtil.decode(fileDatabaseHistoryEntity?.databaseUri),
                             fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias ?: ""),
                             fileDatabaseInfo.exists,
-                            fileDatabaseInfo.getModificationString(),
+                            fileDatabaseInfo.getLastModificationString(),
                             fileDatabaseInfo.getSizeString()
                     )
                 },
@@ -89,7 +90,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
                                             UriUtil.decode(fileDatabaseHistoryEntity.databaseUri),
                                             fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias),
                                             fileDatabaseInfo.exists,
-                                            fileDatabaseInfo.getModificationString(),
+                                            fileDatabaseInfo.getLastModificationString(),
                                             fileDatabaseInfo.getSizeString()
                                     )
                             )
@@ -133,10 +134,14 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
                         )
 
                         // Update values if history element not yet in the database
-                        if (fileDatabaseHistoryRetrieve == null) {
+                        try {
-                            databaseFileHistoryDao.add(fileDatabaseHistory)
+                            if (fileDatabaseHistoryRetrieve == null) {
-                        } else {
+                                    databaseFileHistoryDao.add(fileDatabaseHistory)
-                            databaseFileHistoryDao.update(fileDatabaseHistory)
+                            } else {
+                                databaseFileHistoryDao.update(fileDatabaseHistory)
+                            }
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Unable to add or update database history", e)
                         }
 
                         val fileDatabaseInfo = FileDatabaseInfo(applicationContext,
@@ -147,7 +152,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
                                 UriUtil.decode(fileDatabaseHistory.databaseUri),
                                 fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias),
                                 fileDatabaseInfo.exists,
-                                fileDatabaseInfo.getModificationString(),
+                                fileDatabaseInfo.getLastModificationString(),
                                 fileDatabaseInfo.getSizeString()
                         )
                     }
@@ -208,5 +213,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
         ).execute()
     }
 
-    companion object : SingletonHolderParameter<FileDatabaseHistoryAction, Context>(::FileDatabaseHistoryAction)
+    companion object : SingletonHolderParameter<FileDatabaseHistoryAction, Context>(::FileDatabaseHistoryAction) {
+        private val TAG = FileDatabaseHistoryAction::class.java.name
+    }
 }

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

@@ -34,7 +34,12 @@ class IOActionTask<T>(
         mainScope.launch {
             withContext(Dispatchers.IO) {
                 val asyncResult: Deferred<T?> = async {
-                    action.invoke()
+                        try {
+                            action.invoke()
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                            null
+                        }
                 }
                 withContext(Dispatchers.Main) {
                     afterActionDatabaseListener?.invoke(asyncResult.await())

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

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

@@ -19,27 +19,39 @@
  */
 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.icons.createIconFromDatabaseIcon
 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 +59,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? {
+    fun retrieveAutofillComponent(intent: Intent?): AutofillComponent? {
-        intent?.let {
+        intent?.getParcelableExtra<AssistStructure?>(EXTRA_ASSIST_STRUCTURE)?.let { assistStructure ->
-            return it.getParcelableExtra(ASSIST_STRUCTURE)
+            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 +86,10 @@ object AutofillHelper {
         return ""
     }
 
-    internal fun addHeader(responseBuilder: FillResponse.Builder,
+    private fun buildDataset(context: Context,
-                           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)
-                })
-            }
-        }
-    }
-
-    internal 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 +102,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 +116,120 @@ object AutofillHelper {
         }
     }
 
+    @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) {
+    fun buildResponseAndSetResult(activity: Activity, entryInfo: EntryInfo) {
-        buildResponse(activity, ArrayList<EntryInfo>().apply { add(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 ->
+            activity.intent?.getParcelableExtra<AssistStructure>(EXTRA_ASSIST_STRUCTURE)?.let { structure ->
-                if (extras.containsKey(ASSIST_STRUCTURE)) {
+                StructureParser(structure).parse()?.let { result ->
-                    activity.intent?.getParcelableExtra<AssistStructure>(ASSIST_STRUCTURE)?.let { structure ->
+                    // New Response
-                        StructureParser(structure).parse()?.let { result ->
+                    val response = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            // New Response
+                        val inlineSuggestionsRequest = activity.intent?.getParcelableExtra<InlineSuggestionsRequest?>(EXTRA_INLINE_SUGGESTIONS_REQUEST)
-                            val responseBuilder = FillResponse.Builder()
+                        if (inlineSuggestionsRequest != null) {
-                            entriesInfo.forEach {
+                            Toast.makeText(activity.applicationContext, R.string.autofill_inline_suggestions_keyboard, Toast.LENGTH_SHORT).show()
-                                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)
                         }
+                        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.")
+            if (!setResultOk) {
-                    activity.setResult(Activity.RESULT_CANCELED)
+                Log.w(activity.javaClass.name, "Failed Autofill auth.")
-                }
+                activity.setResult(Activity.RESULT_CANCELED)
             }
         }
     }
@@ -155,13 +239,17 @@ object AutofillHelper {
      */
     fun startActivityForAutofillResult(activity: Activity,
                                        intent: Intent,
-                                       assistStructure: AssistStructure,
+                                       autofillComponent: AutofillComponent,
                                        searchInfo: SearchInfo?) {
-        EntrySelectionHelper.addEntrySelectionModeExtraInIntent(intent)
+        EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.SELECTION)
-        intent.putExtra(ASSIST_STRUCTURE, assistStructure)
+        intent.putExtra(EXTRA_ASSIST_STRUCTURE, autofillComponent.assistStructure)
-        searchInfo?.let {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-            intent.putExtra(KEY_SEARCH_INFO, it)
+                && PreferencesUtil.isAutofillInlineSuggestionsEnable(activity)) {
+            autofillComponent.inlineSuggestionsRequest?.let {
+                intent.putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+            }
         }
+        EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
         activity.startActivityForResult(intent, AUTOFILL_RESPONSE_REQUEST_CODE)
     }
 
@@ -194,4 +282,11 @@ object AutofillHelper {
         }
         return presentation
     }
+
+    private fun buildIconFromEntry(context: Context, entryInfo: EntryInfo): Icon? {
+        return createIconFromDatabaseIcon(context,
+                Database.getInstance().drawFactory,
+                entryInfo.icon,
+                ContextCompat.getColor(context, R.color.green))
+    }
 }

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

@@ -19,89 +19,131 @@
  */
 package com.kunzisoft.keepass.autofill
 
+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.
+        // Lock
-        StructureParser(latestStructure).parse()?.let { parseResult ->
+        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
+                // Build search info only if applicationId or webDomain are not blocked
-            if (searchAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
-                    && searchAllowedFor(parseResult.domain, webDomainBlocklist)) {
+                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
-                val searchInfo = SearchInfo().apply {
+                    val searchInfo = SearchInfo().apply {
-                    applicationId = parseResult.applicationId
+                        applicationId = parseResult.applicationId
-                    webDomain = parseResult.domain
+                        webDomain = parseResult.webDomain
-                }
+                        webScheme = parseResult.webScheme
-
+                    }
-                SearchHelper.checkAutoSearchInfo(this,
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
-                        Database.getInstance(),
+                        searchInfo.webDomain = webDomainWithoutSubDomain
-                        searchInfo,
+                        val inlineSuggestionsRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-                        { items ->
+                                && autofillInlineSuggestionsEnabled) {
-                            val responseBuilder = FillResponse.Builder()
+                            request.inlineSuggestionsRequest
-                            AutofillHelper.addHeader(responseBuilder, packageName,
+                        } else {
-                                    parseResult.domain, parseResult.applicationId)
+                            null
-                            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)
                         }
-                )
+                        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)
+                }
+        )
+    }
+
     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,
+                val intentSender = AutofillLauncherActivity.getAuthIntentSenderForSelection(this,
-                        searchInfo)
+                        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 +152,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
+        if (askToSaveData) {
-        //callback.onFailure(getString(R.string.autofill_not_support_save));
+            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)

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 {
+        node.webDomain?.let { webDomain ->
-            result?.domain = it
+            if (webDomain.isNotEmpty()) {
-            Log.d(TAG, "Autofill domain: $it")
+                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.contains(View.AUTOFILL_HINT_USERNAME, true)
-                        || it.equals(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
+                        || it.contains(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
-                        || it.equals("email", true)
+                        || it.contains("email", true)
-                        || it.equals(View.AUTOFILL_HINT_PHONE, true)
+                        || it.contains(View.AUTOFILL_HINT_PHONE, true)-> {
-                        || it.contains("OrUsername", true)
-                        || it.contains("OrEmailAddress", true)
-                        || it.contains("OrEmail", true)
-                        || it.contains("OrPhone", true)-> {
                     result?.usernameId = autofillId
+                    result?.usernameValue = node.autofillValue
                     Log.d(TAG, "Autofill username hint")
                 }
-                it.equals(View.AUTOFILL_HINT_PASSWORD, true)
+                it.contains(View.AUTOFILL_HINT_PASSWORD, true) -> {
-                        || it.contains("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,6 +220,7 @@ 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,
@@ -199,6 +228,7 @@ internal class StructureParser(private val structure: AssistStructure) {
                             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 +253,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 +274,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 +311,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 {

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)

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

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

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

@@ -1,369 +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.view.View
-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
-
-    /**
-     * Manage setting to auto open biometric prompt
-     */
-    private var biometricPromptAutoOpenPreference = PreferencesUtil.isBiometricPromptAutoOpenEnable(context)
-    var isBiometricPromptAutoOpenEnable: Boolean = true
-        get() {
-            return field && biometricPromptAutoOpenPreference
-        }
-
-    // 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 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()
-        allowOpenBiometricPrompt = true
-
-        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 {
-            if (allowOpenBiometricPrompt)
-                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
-        allowOpenBiometricPrompt = false
-        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?.visibility = if (show) View.VISIBLE else View.GONE
-        }
-    }
-
-    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
-    }
-}

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

app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt

@@ -29,11 +29,12 @@ object StreamCipherFactory {
 
     private val SALSA_IV = byteArrayOf(0xE8.toByte(), 0x30, 0x09, 0x4B, 0x97.toByte(), 0x20, 0x5D, 0x2A)
 
-    fun getInstance(alg: CrsAlgorithm?, key: ByteArray): StreamCipher? {
+    @Throws(Exception::class)
+    fun getInstance(alg: CrsAlgorithm?, key: ByteArray): StreamCipher {
         return when {
             alg === CrsAlgorithm.Salsa20 -> getSalsa20(key)
             alg === CrsAlgorithm.ChaCha20 -> getChaCha20(key)
-            else -> null
+            else -> throw Exception("Invalid random cipher")
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.kt

@@ -42,7 +42,7 @@ class AesKdf : KdfEngine() {
             }
         }
 
-    override val defaultKeyRounds: Long = 6000L
+    override val defaultKeyRounds: Long = 500000L
 
     override fun getName(resources: Resources): String {
         return resources.getString(R.string.kdf_AES)

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Kdf.kt

@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.crypto.keyDerivation
 
 import android.content.res.Resources
+import androidx.annotation.StringRes
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.stream.bytes16ToUuid
 import com.kunzisoft.keepass.utils.UnsignedInt
@@ -27,7 +28,11 @@ import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
 
-class Argon2Kdf internal constructor() : KdfEngine() {
+class Argon2Kdf(private val type: Type) : KdfEngine() {
+
+    init {
+        uuid = type.CIPHER_UUID
+    }
 
     override val defaultParameters: KdfParameters
         get() {
@@ -45,12 +50,8 @@ class Argon2Kdf internal constructor() : KdfEngine() {
     override val defaultKeyRounds: Long
         get() = DEFAULT_ITERATIONS
 
-    init {
-        uuid = CIPHER_UUID
-    }
-
     override fun getName(resources: Resources): String {
-        return resources.getString(R.string.kdf_Argon2)
+        return resources.getString(type.nameId)
     }
 
     @Throws(IOException::class)
@@ -72,7 +73,9 @@ class Argon2Kdf internal constructor() : KdfEngine() {
         val secretKey = kdfParameters.getByteArray(PARAM_SECRET_KEY)
         val assocData = kdfParameters.getByteArray(PARAM_ASSOC_DATA)
 
-        return Argon2Native.transformKey(masterKey,
+        return Argon2Native.transformKey(
+                type,
+                masterKey,
                 salt,
                 parallelism,
                 memory,
@@ -141,9 +144,8 @@ class Argon2Kdf internal constructor() : KdfEngine() {
     override val maxParallelism: Long
         get() = MAX_PARALLELISM
 
-    companion object {
+    enum class Type(val CIPHER_UUID: UUID, @StringRes val nameId: Int) {
-
+        ARGON2_D(bytes16ToUuid(
-        val CIPHER_UUID: UUID = bytes16ToUuid(
                 byteArrayOf(0xEF.toByte(),
                         0x63.toByte(),
                         0x6D.toByte(),
@@ -159,7 +161,27 @@ class Argon2Kdf internal constructor() : KdfEngine() {
                         0x03.toByte(),
                         0xE3.toByte(),
                         0x0A.toByte(),
-                        0x0C.toByte()))
+                        0x0C.toByte())), R.string.kdf_Argon2d),
+        ARGON2_ID(bytes16ToUuid(
+                byteArrayOf(0x9E.toByte(),
+                        0x29.toByte(),
+                        0x8B.toByte(),
+                        0x19.toByte(),
+                        0x56.toByte(),
+                        0xDB.toByte(),
+                        0x47.toByte(),
+                        0x73.toByte(),
+                        0xB2.toByte(),
+                        0x3D.toByte(),
+                        0xFC.toByte(),
+                        0x3E.toByte(),
+                        0xC6.toByte(),
+                        0xF0.toByte(),
+                        0xA1.toByte(),
+                        0xE6.toByte())), R.string.kdf_Argon2id);
+    }
+
+    companion object {
 
         private const val PARAM_SALT = "S" // byte[]
         private const val PARAM_PARALLELISM = "P" // UInt32

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java

@@ -26,12 +26,29 @@ import java.io.IOException;
 
 public class Argon2Native {
 
-    public static byte[] transformKey(byte[] password, byte[] salt, UnsignedInt parallelism,
+    enum CType {
+        ARGON2_D(0),
+        ARGON2_I(1),
+        ARGON2_ID(2);
+
+        int cValue = 0;
+
+        CType(int i) {
+            cValue = i;
+        }
+    }
+
+    public static byte[] transformKey(Argon2Kdf.Type type, byte[] password, byte[] salt, UnsignedInt parallelism,
                                       UnsignedInt memory, UnsignedInt iterations, byte[] secretKey,
                                       byte[] associatedData, UnsignedInt version) throws IOException {
         NativeLib.INSTANCE.init();
 
+        CType cType = CType.ARGON2_D;
+        if (type.equals(Argon2Kdf.Type.ARGON2_ID))
+            cType = CType.ARGON2_ID;
+
         return nTransformMasterKey(
+                cType.cValue,
                 password,
                 salt,
                 parallelism.toKotlinInt(),
@@ -42,7 +59,7 @@ public class Argon2Native {
                 version.toKotlinInt());
     }
 
-    private static native byte[] nTransformMasterKey(byte[] password, byte[] salt, int parallelism,
+    private static native byte[] nTransformMasterKey(int type, byte[] password, byte[] salt, int parallelism,
                                               int memory, int iterations, byte[] secretKey,
                                               byte[] associatedData, int version) throws IOException;
 }

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfFactory.kt

@@ -21,5 +21,6 @@ package com.kunzisoft.keepass.crypto.keyDerivation
 
 object KdfFactory {
     var aesKdf = AesKdf()
-    var argon2Kdf = Argon2Kdf()
+    var argon2dKdf = Argon2Kdf(Argon2Kdf.Type.ARGON2_D)
+    var argon2idKdf = Argon2Kdf(Argon2Kdf.Type.ARGON2_ID)
 }

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfParameters.kt

@@ -19,17 +19,23 @@
  */
 package com.kunzisoft.keepass.crypto.keyDerivation
 
-import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
-import com.kunzisoft.keepass.stream.LittleEndianDataOutputStream
 import com.kunzisoft.keepass.stream.bytes16ToUuid
 import com.kunzisoft.keepass.stream.uuidTo16Bytes
 import com.kunzisoft.keepass.utils.VariantDictionary
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.util.*
 
-class KdfParameters(val uuid: UUID) : VariantDictionary() {
+class KdfParameters: VariantDictionary {
+
+    val uuid: UUID
+
+    constructor(uuid: UUID): super() {
+        this.uuid = uuid
+    }
+
+    constructor(uuid: UUID, d: VariantDictionary): super(d) {
+        this.uuid = uuid
+    }
 
     fun setParamUUID() {
         setByteArray(PARAM_UUID, uuidTo16Bytes(uuid))
@@ -41,25 +47,17 @@ class KdfParameters(val uuid: UUID) : VariantDictionary() {
 
         @Throws(IOException::class)
         fun deserialize(data: ByteArray): KdfParameters? {
-            val inputStream = LittleEndianDataInputStream(ByteArrayInputStream(data))
+            val dictionary = VariantDictionary.deserialize(data)
-            val dictionary = deserialize(inputStream)
 
             val uuidBytes = dictionary.getByteArray(PARAM_UUID) ?: return null
             val uuid = bytes16ToUuid(uuidBytes)
 
-            val kdfParameters = KdfParameters(uuid)
+            return KdfParameters(uuid, dictionary)
-            kdfParameters.copyTo(dictionary)
-            return kdfParameters
         }
 
         @Throws(IOException::class)
         fun serialize(kdfParameters: KdfParameters): ByteArray {
-            val byteArrayOutputStream = ByteArrayOutputStream()
+            return VariantDictionary.serialize(kdfParameters)
-            val outputStream = LittleEndianDataOutputStream(byteArrayOutputStream)
-
-            serialize(kdfParameters, outputStream)
-
-            return byteArrayOutputStream.toByteArray()
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt

@@ -25,6 +25,7 @@ import android.util.Log
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.UriUtil
 
 class CreateDatabaseRunnable(context: Context,
                              private val mDatabase: Database,
@@ -45,7 +46,7 @@ class CreateDatabaseRunnable(context: Context,
                 createData(mDatabaseUri, databaseName, rootName)
             }
         } catch (e: Exception) {
-            mDatabase.closeAndClear(context.applicationContext.filesDir)
+            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
             setError(e)
         }
 

app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt

@@ -30,6 +30,7 @@ import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
+import com.kunzisoft.keepass.utils.UriUtil
 
 class LoadDatabaseRunnable(private val context: Context,
                            private val mDatabase: Database,
@@ -45,7 +46,7 @@ class LoadDatabaseRunnable(private val context: Context,
 
     override fun onStartRun() {
         // Clear before we load
-        mDatabase.closeAndClear(context.applicationContext.filesDir)
+        mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
     }
 
     override fun onActionRun() {
@@ -53,13 +54,10 @@ class LoadDatabaseRunnable(private val context: Context,
             mDatabase.loadData(mUri, mPass, mKey,
                     mReadonly,
                     context.contentResolver,
-                    context.applicationContext.filesDir,
+                    UriUtil.getBinaryDir(context),
                     mFixDuplicateUUID,
                     progressTaskUpdater)
         }
-        catch (e: DuplicateUuidDatabaseException) {
-            setError(e)
-        }
         catch (e: LoadDatabaseException) {
             setError(e)
         }
@@ -81,7 +79,7 @@ class LoadDatabaseRunnable(private val context: Context,
             // Register the current time to init the lock timer
             PreferencesUtil.saveCurrentTime(context)
         } else {
-            mDatabase.closeAndClear(context.applicationContext.filesDir)
+            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt

@@ -23,10 +23,11 @@ import android.content.*
 import android.content.Context.BIND_ABOVE_CLIENT
 import android.content.Context.BIND_NOT_FOREGROUND
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import androidx.fragment.app.FragmentActivity
+import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.database.element.Entry
@@ -36,6 +37,7 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_PASSWORD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
@@ -45,7 +47,9 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COLOR_TASK
@@ -84,6 +88,7 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
     private var serviceConnection: ServiceConnection? = null
 
     private var progressTaskDialogFragment: ProgressTaskDialogFragment? = null
+    private var databaseChangedDialogFragment: DatabaseChangedDialogFragment? = null
 
     private val actionTaskListener = object: DatabaseTaskNotificationService.ActionTaskListener {
         override fun onStartAction(titleId: Int?, messageId: Int?, warningId: Int?) {
@@ -101,6 +106,28 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
         }
     }
 
+    private val mActionDatabaseListener = object: DatabaseChangedDialogFragment.ActionDatabaseChangedListener {
+        override fun validateDatabaseChanged() {
+            mBinder?.getService()?.saveDatabaseInfo()
+        }
+    }
+
+    private var databaseInfoListener = object: DatabaseTaskNotificationService.DatabaseInfoListener {
+        override fun onDatabaseInfoChanged(previousDatabaseInfo: SnapFileDatabaseInfo,
+                                           newDatabaseInfo: SnapFileDatabaseInfo) {
+            if (databaseChangedDialogFragment == null) {
+                databaseChangedDialogFragment = activity.supportFragmentManager
+                        .findFragmentByTag(DATABASE_CHANGED_DIALOG_TAG) as DatabaseChangedDialogFragment?
+                databaseChangedDialogFragment?.actionDatabaseListener = mActionDatabaseListener
+            }
+            if (progressTaskDialogFragment == null) {
+                databaseChangedDialogFragment = DatabaseChangedDialogFragment.getInstance(previousDatabaseInfo, newDatabaseInfo)
+                databaseChangedDialogFragment?.actionDatabaseListener = mActionDatabaseListener
+                databaseChangedDialogFragment?.show(activity.supportFragmentManager, DATABASE_CHANGED_DIALOG_TAG)
+            }
+        }
+    }
+
     private fun startDialog(titleId: Int? = null,
                             messageId: Int? = null,
                             warningId: Int? = null) {
@@ -140,11 +167,14 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
                 override fun onServiceConnected(name: ComponentName?, serviceBinder: IBinder?) {
                     mBinder = (serviceBinder as DatabaseTaskNotificationService.ActionTaskBinder?)?.apply {
                         addActionTaskListener(actionTaskListener)
+                        addDatabaseFileInfoListener(databaseInfoListener)
                         getService().checkAction()
+                        getService().checkDatabaseInfo()
                     }
                 }
 
                 override fun onServiceDisconnected(name: ComponentName?) {
+                    mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
                     mBinder?.removeActionTaskListener(actionTaskListener)
                     mBinder = null
                 }
@@ -169,6 +199,10 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
         serviceConnection = null
     }
 
+    fun isBinded(): Boolean {
+        return mBinder != null
+    }
+
     fun registerProgressTask() {
         stopDialog()
 
@@ -202,6 +236,7 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
     fun unregisterProgressTask() {
         stopDialog()
 
+        mBinder?.removeDatabaseFileInfoListener(databaseInfoListener)
         mBinder?.removeActionTaskListener(actionTaskListener)
         mBinder = null
 
@@ -260,6 +295,13 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
                 , ACTION_DATABASE_LOAD_TASK)
     }
 
+    fun startDatabaseReload(fixDuplicateUuid: Boolean) {
+        start(Bundle().apply {
+            putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
+        }
+                , ACTION_DATABASE_RELOAD_TASK)
+    }
+
     fun startDatabaseAssignPassword(databaseUri: Uri,
                                     masterPasswordChecked: Boolean,
                                     masterPassword: String?,
@@ -463,6 +505,13 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
                 , ACTION_DATABASE_UPDATE_COMPRESSION_TASK)
     }
 
+    fun startDatabaseRemoveUnlinkedData(save: Boolean) {
+        start(Bundle().apply {
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
+        }
+                , ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK)
+    }
+
     fun startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems: Int,
                                          newMaxHistoryItems: Int,
                                          save: Boolean) {

app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action
+
+import android.content.Context
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
+import com.kunzisoft.keepass.database.exception.LoadDatabaseException
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.tasks.ActionRunnable
+import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
+import com.kunzisoft.keepass.utils.UriUtil
+
+class ReloadDatabaseRunnable(private val context: Context,
+                             private val mDatabase: Database,
+                             private val progressTaskUpdater: ProgressTaskUpdater?,
+                             private val mLoadDatabaseResult: ((Result) -> Unit)?)
+    : ActionRunnable() {
+
+    override fun onStartRun() {
+        // Clear before we load
+        mDatabase.clear(UriUtil.getBinaryDir(context))
+    }
+
+    override fun onActionRun() {
+        try {
+            mDatabase.reloadData(context.contentResolver,
+                    UriUtil.getBinaryDir(context),
+                    progressTaskUpdater)
+        }
+        catch (e: LoadDatabaseException) {
+            setError(e)
+        }
+
+        if (result.isSuccess) {
+            // Register the current time to init the lock timer
+            PreferencesUtil.saveCurrentTime(context)
+        } else {
+            mDatabase.clearAndClose(UriUtil.getBinaryDir(context))
+        }
+    }
+
+    override fun onFinishRun() {
+        mLoadDatabaseResult?.invoke(result)
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/action/RemoveUnlinkedDataDatabaseRunnable.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
  *     
  * This file is part of KeePassDX.
  *
@@ -17,9 +17,24 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.file.output
+package com.kunzisoft.keepass.database.action
 
-open class DatabaseHeaderOutput {
+import android.content.Context
-    var hashOfHeader: ByteArray? = null
+import com.kunzisoft.keepass.database.element.Database
-        protected set
+
+class RemoveUnlinkedDataDatabaseRunnable (
+        context: Context,
+        database: Database,
+        saveDatabase: Boolean)
+    : SaveDatabaseRunnable(context, database, saveDatabase) {
+
+    override fun onActionRun() {
+        try {
+            database.removeUnlinkedAttachments()
+        } catch (e: Exception) {
+            setError(e)
+        }
+
+        super.onActionRun()
+    }
 }

app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt

@@ -31,10 +31,7 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdInt
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.database.exception.DatabaseOutputException
+import com.kunzisoft.keepass.database.exception.*
-import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException
-import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.database.exception.SignatureDatabaseException
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
 import com.kunzisoft.keepass.database.file.input.DatabaseInputKDB
@@ -330,29 +327,11 @@ class Database {
     }
 
     @Throws(LoadDatabaseException::class)
-    fun loadData(uri: Uri, password: String?, keyfile: Uri?,
+    private fun readDatabaseStream(contentResolver: ContentResolver, uri: Uri,
-                 readOnly: Boolean,
+                                   openDatabaseKDB: (InputStream) -> DatabaseKDB,
-                 contentResolver: ContentResolver,
+                                   openDatabaseKDBX: (InputStream) -> DatabaseKDBX) {
-                 cacheDirectory: File,
-                 fixDuplicateUUID: Boolean,
-                 progressTaskUpdater: ProgressTaskUpdater?) {
-
-        this.fileUri = uri
-        isReadOnly = readOnly
-        if (uri.scheme == "file") {
-            val file = File(uri.path!!)
-            isReadOnly = !file.canWrite()
-        }
-
-        // Pass KeyFile Uri as InputStreams
         var databaseInputStream: InputStream? = null
-        var keyFileInputStream: InputStream? = null
         try {
-            // Get keyFile inputStream
-            keyfile?.let {
-                keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyfile)
-            }
-
             // Load Data, pass Uris as InputStreams
             val databaseStream = UriUtil.getUriInputStream(contentResolver, uri)
                     ?: throw IOException("Database input stream cannot be retrieve")
@@ -374,22 +353,10 @@ class Database {
 
             when {
                 // Header of database KDB
-                DatabaseHeaderKDB.matchesHeader(sig1, sig2) -> setDatabaseKDB(DatabaseInputKDB(
+                DatabaseHeaderKDB.matchesHeader(sig1, sig2) -> setDatabaseKDB(openDatabaseKDB(databaseInputStream))
-                        cacheDirectory,
-                        fixDuplicateUUID)
-                        .openDatabase(databaseInputStream,
-                                password,
-                                keyFileInputStream,
-                                progressTaskUpdater))
 
                 // Header of database KDBX
-                DatabaseHeaderKDBX.matchesHeader(sig1, sig2) -> setDatabaseKDBX(DatabaseInputKDBX(
+                DatabaseHeaderKDBX.matchesHeader(sig1, sig2) -> setDatabaseKDBX(openDatabaseKDBX(databaseInputStream))
-                        cacheDirectory,
-                        fixDuplicateUUID)
-                        .openDatabase(databaseInputStream,
-                                password,
-                                keyFileInputStream,
-                                progressTaskUpdater))
 
                 // Header not recognized
                 else -> throw SignatureDatabaseException()
@@ -397,14 +364,90 @@ class Database {
 
             this.mSearchHelper = SearchHelper()
             loaded = true
+        } catch (e: LoadDatabaseException) {
+            throw e
+        } finally {
+            databaseInputStream?.close()
+        }
+    }
 
+    @Throws(LoadDatabaseException::class)
+    fun loadData(uri: Uri, password: String?, keyfile: Uri?,
+                 readOnly: Boolean,
+                 contentResolver: ContentResolver,
+                 cacheDirectory: File,
+                 fixDuplicateUUID: Boolean,
+                 progressTaskUpdater: ProgressTaskUpdater?) {
+
+        // Save database URI
+        this.fileUri = uri
+
+        // Check if the file is writable
+        this.isReadOnly = readOnly
+
+        // Pass KeyFile Uri as InputStreams
+        var keyFileInputStream: InputStream? = null
+        try {
+            // Get keyFile inputStream
+            keyfile?.let {
+                keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyfile)
+            }
+
+            // Read database stream for the first time
+            readDatabaseStream(contentResolver, uri,
+                    { databaseInputStream ->
+                        DatabaseInputKDB(cacheDirectory)
+                                .openDatabase(databaseInputStream,
+                                        password,
+                                        keyFileInputStream,
+                                        progressTaskUpdater,
+                                        fixDuplicateUUID)
+                    },
+                    { databaseInputStream ->
+                        DatabaseInputKDBX(cacheDirectory)
+                                .openDatabase(databaseInputStream,
+                                        password,
+                                        keyFileInputStream,
+                                        progressTaskUpdater,
+                                        fixDuplicateUUID)
+                    }
+            )
+        } catch (e: FileNotFoundException) {
+            Log.e(TAG, "Unable to load keyfile", e)
+            throw FileNotFoundDatabaseException()
         } catch (e: LoadDatabaseException) {
             throw e
         } catch (e: Exception) {
-            throw FileNotFoundDatabaseException()
+            throw LoadDatabaseException(e)
         } finally {
             keyFileInputStream?.close()
-            databaseInputStream?.close()
+        }
+    }
+
+    @Throws(LoadDatabaseException::class)
+    fun reloadData(contentResolver: ContentResolver,
+                   cacheDirectory: File,
+                   progressTaskUpdater: ProgressTaskUpdater?) {
+
+        // Retrieve the stream from the old database URI
+        fileUri?.let { oldDatabaseUri ->
+            readDatabaseStream(contentResolver, oldDatabaseUri,
+                    { databaseInputStream ->
+                        DatabaseInputKDB(cacheDirectory)
+                                .openDatabase(databaseInputStream,
+                                        masterKey,
+                                        progressTaskUpdater)
+                    },
+                    { databaseInputStream ->
+                        DatabaseInputKDBX(cacheDirectory)
+                                .openDatabase(databaseInputStream,
+                                        masterKey,
+                                        progressTaskUpdater)
+                    }
+            )
+        } ?: run {
+            Log.e(TAG, "Database URI is null, database cannot be reloaded")
+            throw IODatabaseException()
         }
     }
 
@@ -426,11 +469,12 @@ class Database {
                                          max: Int = Integer.MAX_VALUE): Group? {
         return mSearchHelper?.createVirtualGroupWithSearchResult(this,
                 searchInfoString, SearchParameters().apply {
-            searchInTitles = false
+            searchInTitles = true
             searchInUserNames = false
             searchInPasswords = false
             searchInUrls = true
             searchInNotes = true
+            searchInOTP = false
             searchInOther = true
             searchInUUIDs = false
             searchInTags = false
@@ -453,20 +497,21 @@ class Database {
         }
 
     fun buildNewBinary(cacheDirectory: File,
-                       enableProtection: Boolean = false,
+                       compressed: Boolean = false,
-                       compressed: Boolean = false): BinaryAttachment? {
+                       protected: Boolean = false): BinaryAttachment? {
         return mDatabaseKDB?.buildNewBinary(cacheDirectory)
-                ?: mDatabaseKDBX?.buildNewBinary(cacheDirectory, enableProtection, compressed)
+                ?: mDatabaseKDBX?.buildNewBinary(cacheDirectory, compressed, protected)
     }
 
     fun removeAttachmentIfNotUsed(attachment: Attachment) {
         // No need in KDB database because unique attachment by entry
-        mDatabaseKDBX?.removeAttachmentIfNotUsed(attachment)
+        // Don't clear to fix upload multiple times
+        mDatabaseKDBX?.removeUnlinkedAttachment(attachment.binaryAttachment, false)
     }
 
     fun removeUnlinkedAttachments() {
         // No check in database KDB because unique attachment by entry
-        mDatabaseKDBX?.removeUnlinkedAttachments()
+        mDatabaseKDBX?.removeUnlinkedAttachments(true)
     }
 
     @Throws(DatabaseOutputException::class)
@@ -529,7 +574,7 @@ class Database {
         this.fileUri = uri
     }
 
-    fun closeAndClear(filesDirectory: File? = null) {
+    fun clear(filesDirectory: File? = null) {
         drawFactory.clearCache()
         // Delete the cache of the database if present
         mDatabaseKDB?.clearCache()
@@ -542,7 +587,10 @@ class Database {
         } catch (e: Exception) {
             Log.e(TAG, "Unable to clear the directory cache.", e)
         }
+    }
 
+    fun clearAndClose(filesDirectory: File? = null) {
+        clear(filesDirectory)
         this.mDatabaseKDB = null
         this.mDatabaseKDBX = null
         this.fileUri = null
@@ -822,18 +870,25 @@ class Database {
         }
     }
 
-    fun startManageEntry(entry: Entry) {
+    fun startManageEntry(entry: Entry?) {
         mDatabaseKDBX?.let {
-            entry.startToManageFieldReferences(it)
+            entry?.startToManageFieldReferences(it)
         }
     }
 
-    fun stopManageEntry(entry: Entry) {
+    fun stopManageEntry(entry: Entry?) {
         mDatabaseKDBX?.let {
-            entry.stopToManageFieldReferences()
+            entry?.stopToManageFieldReferences()
         }
     }
 
+    /**
+     * @return true if database allows custom field
+     */
+    fun allowEntryCustomFields(): Boolean {
+        return mDatabaseKDBX != null
+    }
+
     /**
      * Remove oldest history for each entry if more than max items or max memory
      */

app/src/main/java/com/kunzisoft/keepass/database/element/DateInstant.kt

@@ -23,6 +23,8 @@ import android.content.res.Resources
 import android.os.Parcel
 import android.os.Parcelable
 import androidx.core.os.ConfigurationCompat
+import org.joda.time.Duration
+import org.joda.time.Instant
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -95,6 +97,7 @@ class DateInstant : Parcelable {
     companion object {
 
         val NEVER_EXPIRE = neverExpire
+        val IN_ONE_MONTH = DateInstant(Instant.now().plus(Duration.standardDays(30)).toDate())
         private val dateFormat = SimpleDateFormat.getDateTimeInstance()
 
         private val neverExpire: DateInstant

app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt

@@ -33,7 +33,6 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.Field
 import com.kunzisoft.keepass.otp.OtpElement
@@ -284,37 +283,43 @@ class Entry : Node, EntryVersionedInterface<Group> {
         }
 
     /**
-     * Retrieve custom fields to show, key is the label, value is the value of field (protected or not)
+     * Retrieve extra fields to show, key is the label, value is the value of field (protected or not)
      * @return Map of label/value
      */
-    val customFields: HashMap<String, ProtectedString>
+    fun getExtraFields(): List<Field> {
-        get() = entryKDBX?.customFields ?: HashMap()
+        val extraFields = ArrayList<Field>()
-
+        entryKDBX?.let {
-    /**
+            for (field in it.customFields) {
-     * To redefine if version of entry allow custom field,
+                extraFields.add(Field(field.key, field.value))
-     * @return true if entry allows custom field
+            }
-     */
+        }
-    fun allowCustomFields(): Boolean {
+        return extraFields
-        return entryKDBX?.allowCustomFields() ?: false
-    }
-
-    fun removeAllFields() {
-        entryKDBX?.removeAllFields()
     }
 
     /**
      * Update or add an extra field to the list (standard or custom)
-     * @param label Label of field, must be unique
-     * @param value Value of field
      */
-    fun putExtraField(label: String, value: ProtectedString) {
+    fun putExtraField(field: Field) {
-        entryKDBX?.putExtraField(label, value)
+        entryKDBX?.putExtraField(field.name, field.protectedValue)
+    }
+
+    private fun addExtraFields(fields: List<Field>) {
+        fields.forEach {
+            putExtraField(it)
+        }
+    }
+
+    private fun removeAllFields() {
+        entryKDBX?.removeAllFields()
     }
 
     fun getOtpElement(): OtpElement? {
-        return OtpEntryFields.parseFields { key ->
+        entryKDBX?.let {
-            customFields[key]?.toString()
+            return OtpEntryFields.parseFields { key ->
+                it.customFields[key]?.toString()
+            }
         }
+        return null
     }
 
     fun startToManageFieldReferences(database: DatabaseKDBX) {
@@ -341,16 +346,27 @@ class Entry : Node, EntryVersionedInterface<Group> {
                 || entryKDBX?.containsAttachment() == true
     }
 
-    fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
+    private fun addAttachments(binaryPool: BinaryPool, attachments: List<Attachment>) {
-        entryKDB?.putAttachment(attachment)
+        attachments.forEach {
-        entryKDBX?.putAttachment(attachment, binaryPool)
+            putAttachment(it, binaryPool)
+        }
     }
 
-    fun removeAttachment(attachment: Attachment) {
+    private fun removeAttachment(attachment: Attachment) {
         entryKDB?.removeAttachment(attachment)
         entryKDBX?.removeAttachment(attachment)
     }
 
+    private fun removeAllAttachments() {
+        entryKDB?.removeAttachment()
+        entryKDBX?.removeAttachments()
+    }
+
+    private fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
+        entryKDB?.putAttachment(attachment)
+        entryKDBX?.putAttachment(attachment, binaryPool)
+    }
+
     fun getHistory(): ArrayList<Entry> {
         val history = ArrayList<Entry>()
         val entryKDBXHistory = entryKDBX?.history ?: ArrayList()
@@ -395,8 +411,8 @@ class Entry : Node, EntryVersionedInterface<Group> {
      */
 
     /**
-     * Retrieve generated entry info,
+     * Retrieve generated entry info.
-     * Remove parameter fields and add auto generated elements in auto custom fields
+     * If are not [raw] data, remove parameter fields and add auto generated elements in auto custom fields
      */
     fun getEntryInfo(database: Database?, raw: Boolean = false): EntryInfo {
         val entryInfo = EntryInfo()
@@ -404,26 +420,59 @@ class Entry : Node, EntryVersionedInterface<Group> {
             database?.stopManageEntry(this)
         else
             database?.startManageEntry(this)
+
         entryInfo.id = nodeId.toString()
         entryInfo.title = title
         entryInfo.icon = icon
         entryInfo.username = username
         entryInfo.password = password
+        entryInfo.creationTime = creationTime
+        entryInfo.modificationTime = lastModificationTime
+        entryInfo.expires = expires
+        entryInfo.expiryTime = expiryTime
         entryInfo.url = url
         entryInfo.notes = notes
-        for (entry in customFields.entries) {
+        entryInfo.customFields = getExtraFields()
-            entryInfo.customFields.add(
-                    Field(entry.key, entry.value))
-        }
         // Add otpElement to generate token
         entryInfo.otpModel = getOtpElement()?.otpModel
-        // Replace parameter fields by generated OTP fields
+        if (!raw) {
-        entryInfo.customFields = OtpEntryFields.generateAutoFields(entryInfo.customFields)
+            // Replace parameter fields by generated OTP fields
+            entryInfo.customFields = OtpEntryFields.generateAutoFields(entryInfo.customFields)
+        }
+        database?.binaryPool?.let { binaryPool ->
+            entryInfo.attachments = getAttachments(binaryPool)
+        }
+
         if (!raw)
             database?.stopManageEntry(this)
         return entryInfo
     }
 
+    fun setEntryInfo(database: Database?, newEntryInfo: EntryInfo) {
+        database?.startManageEntry(this)
+
+        removeAllFields()
+        removeAllAttachments()
+        // NodeId stay as is
+        title = newEntryInfo.title
+        icon = newEntryInfo.icon
+        username = newEntryInfo.username
+        password = newEntryInfo.password
+        // Update date time, creation time stay as is
+        lastModificationTime = DateInstant()
+        lastAccessTime = DateInstant()
+        expires = newEntryInfo.expires
+        expiryTime = newEntryInfo.expiryTime
+        url = newEntryInfo.url
+        notes = newEntryInfo.notes
+        addExtraFields(newEntryInfo.customFields)
+        database?.binaryPool?.let { binaryPool ->
+            addAttachments(binaryPool, newEntryInfo.attachments)
+        }
+
+        database?.stopManageEntry(this)
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
@@ -453,5 +502,12 @@ class Entry : Node, EntryVersionedInterface<Group> {
         }
 
         const val PMS_TAN_ENTRY = "<TAN>"
+
+        /**
+         * True if [field] name is not a standard field name
+         */
+        fun newExtraFieldNameAllowed(field: Field): Boolean {
+            return EntryKDBX.newCustomNameAllowed(field.name)
+        }
     }
 }

app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryAttachment.kt

@@ -28,46 +28,41 @@ import java.util.zip.GZIPOutputStream
 
 class BinaryAttachment : Parcelable {
 
+    private var dataFile: File? = null
     var isCompressed: Boolean = false
         private set
     var isProtected: Boolean = false
         private set
-    private var dataFile: File? = null
+    var isCorrupted: Boolean = false
 
     fun length(): Long {
-        if (dataFile != null)
+        return dataFile?.length() ?: 0
-            return dataFile!!.length()
-        return 0
     }
 
     /**
      * Empty protected binary
      */
-    constructor() {
+    constructor()
-        this.isCompressed = false
-        this.isProtected = false
-        this.dataFile = null
-    }
 
-    constructor(dataFile: File, enableProtection: Boolean = false, compressed: Boolean = false) {
+    constructor(dataFile: File, compressed: Boolean = false, protected: Boolean = false) {
-        this.isCompressed = compressed
-        this.isProtected = enableProtection
         this.dataFile = dataFile
+        this.isCompressed = compressed
+        this.isProtected = protected
     }
 
     private constructor(parcel: Parcel) {
-        val compressedByte = parcel.readByte().toInt()
-        isCompressed = compressedByte != 0
-        isProtected = parcel.readByte().toInt() != 0
         parcel.readString()?.let {
             dataFile = File(it)
         }
+        isCompressed = parcel.readByte().toInt() != 0
+        isProtected = parcel.readByte().toInt() != 0
+        isCorrupted = parcel.readByte().toInt() != 0
     }
 
     @Throws(IOException::class)
     fun getInputDataStream(): InputStream {
         return when {
-            dataFile != null -> FileInputStream(dataFile!!)
+            length() > 0 -> FileInputStream(dataFile!!)
             else -> ByteArrayInputStream(ByteArray(0))
         }
     }
@@ -164,6 +159,7 @@ class BinaryAttachment : Parcelable {
 
         return isCompressed == other.isCompressed
                 && isProtected == other.isProtected
+                && isCorrupted == other.isCorrupted
                 && sameData
     }
 
@@ -172,6 +168,7 @@ class BinaryAttachment : Parcelable {
         var result = 0
         result = 31 * result + if (isCompressed) 1 else 0
         result = 31 * result + if (isProtected) 1 else 0
+        result = 31 * result + if (isCorrupted) 1 else 0
         result = 31 * result + dataFile!!.hashCode()
         return result
     }
@@ -185,9 +182,10 @@ class BinaryAttachment : Parcelable {
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(dataFile?.absolutePath)
         dest.writeByte((if (isCompressed) 1 else 0).toByte())
         dest.writeByte((if (isProtected) 1 else 0).toByte())
-        dest.writeString(dataFile?.absolutePath)
+        dest.writeByte((if (isCorrupted) 1 else 0).toByte())
     }
 
     companion object {

app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryPool.kt

@@ -137,6 +137,17 @@ class BinaryPool {
         pool.clear()
     }
 
+    override fun toString(): String {
+        val stringBuffer = StringBuffer()
+        for ((key, value) in pool) {
+            if (stringBuffer.isNotEmpty())
+                stringBuffer.append(", {$key:$value}")
+            else
+                stringBuffer.append("{$key:$value}")
+        }
+        return stringBuffer.toString()
+    }
+
     /**
      * Utility data class to order binaries
      */

app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt

@@ -44,6 +44,8 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
 
     private var kdfListV3: MutableList<KdfEngine> = ArrayList()
 
+    private var binaryIncrement = 0
+
     override val version: String
         get() = "KeePass 1"
 
@@ -60,8 +62,6 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     // Retrieve backup group in index
     val backupGroup: GroupKDB?
         get() {
-            if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
-                ensureBackupExists()
             return if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
                 null
             else
@@ -163,10 +163,6 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         finalKey = messageDigest.digest()
     }
 
-    override fun loadXmlKeyFile(keyInputStream: InputStream): ByteArray? {
-        return null
-    }
-
     override fun createGroup(): GroupKDB {
         return GroupKDB()
     }
@@ -186,6 +182,13 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     override fun isInRecycleBin(group: GroupKDB): Boolean {
         var currentGroup: GroupKDB? = group
 
+        // Init backup group variable
+        if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
+            findBackupGroupId()
+
+        if (backupGroup == null)
+            return false
+
         if (currentGroup == backupGroup)
             return true
 
@@ -200,17 +203,21 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         return false
     }
 
-    /**
+    private fun findBackupGroupId() {
-     * Ensure that the backup tree exists if enabled, and create it
-     * if it doesn't exist
-     */
-    fun ensureBackupExists() {
         rootGroups.forEach { currentGroup ->
             if (currentGroup.level == 0
                     && currentGroup.title.equals(BACKUP_FOLDER_TITLE, ignoreCase = true)) {
                 backupGroupId = currentGroup.id
             }
         }
+    }
+
+    /**
+     * Ensure that the backup tree exists if enabled, and create it
+     * if it doesn't exist
+     */
+    fun ensureBackupExists() {
+        findBackupGroupId()
 
         if (backupGroup == null) {
             // Create recycle bin
@@ -229,6 +236,8 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
      * @return true if node can be recycle, false elsewhere
      */
     fun canRecycle(node: NodeVersioned<*, GroupKDB, EntryKDB>): Boolean {
+        if (backupGroup == null)
+            ensureBackupExists()
         if (node == backupGroup)
             return false
         backupGroup?.let {
@@ -239,14 +248,12 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     }
 
     fun recycle(group: GroupKDB) {
-        ensureBackupExists()
         removeGroupFrom(group, group.parent)
         addGroupTo(group, backupGroup)
         group.afterAssignNewParent()
     }
 
     fun recycle(entry: EntryKDB) {
-        ensureBackupExists()
         removeEntryFrom(entry, entry.parent)
         addEntryTo(entry, backupGroup)
         entry.afterAssignNewParent()
@@ -263,8 +270,9 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     }
 
     fun buildNewBinary(cacheDirectory: File): BinaryAttachment {
-        // Generate an unique new file with timestamp
+        // Generate an unique new file
-        val fileInCache = File(cacheDirectory, System.currentTimeMillis().toString())
+        val fileInCache = File(cacheDirectory, binaryIncrement.toString())
+        binaryIncrement++
         return BinaryAttachment(fileInCache)
     }
 

app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt

@@ -32,7 +32,6 @@ import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
 import com.kunzisoft.keepass.database.action.node.NodeHandler
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.DeletedObject
-import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
@@ -42,13 +41,14 @@ import com.kunzisoft.keepass.database.element.node.NodeVersioned
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.exception.UnknownKDF
-import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_3
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_4
+import com.kunzisoft.keepass.utils.StringUtil.removeSpaceChars
+import com.kunzisoft.keepass.utils.StringUtil.toHexString
 import com.kunzisoft.keepass.utils.UnsignedInt
 import com.kunzisoft.keepass.utils.VariantDictionary
+import org.apache.commons.codec.binary.Hex
 import org.w3c.dom.Node
-import org.w3c.dom.Text
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -109,12 +109,14 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     val customData = HashMap<String, String>()
 
     var binaryPool = BinaryPool()
+    private var binaryIncrement = 0 // Unique id (don't use current time because CPU too fast)
 
     var localizedAppName = "KeePassDX"
 
     init {
         kdfList.add(KdfFactory.aesKdf)
-        kdfList.add(KdfFactory.argon2Kdf)
+        kdfList.add(KdfFactory.argon2dKdf)
+        kdfList.add(KdfFactory.argon2idKdf)
     }
 
     constructor()
@@ -180,7 +182,8 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         when (oldCompression) {
             CompressionAlgorithm.None -> {
                 when (newCompression) {
-                    CompressionAlgorithm.None -> {}
+                    CompressionAlgorithm.None -> {
+                    }
                     CompressionAlgorithm.GZip -> {
                         // Only in databaseV3.1, in databaseV4 the header is zipped during the save
                         if (kdbxVersion.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong()) {
@@ -198,7 +201,8 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
                         CompressionAlgorithm.None -> {
                             decompressAllBinaries()
                         }
-                        CompressionAlgorithm.GZip -> {}
+                        CompressionAlgorithm.GZip -> {
+                        }
                     }
                 }
             }
@@ -378,36 +382,82 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             try {
                 documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)
             } catch (e : ParserConfigurationException) {
-                Log.e(TAG, "Unable to add FEATURE_SECURE_PROCESSING to prevent XML eXternal Entity injection (XXE)", e)
+                Log.w(TAG, "Unable to add FEATURE_SECURE_PROCESSING to prevent XML eXternal Entity injection (XXE)")
             }
 
             val documentBuilder = documentBuilderFactory.newDocumentBuilder()
             val doc = documentBuilder.parse(keyInputStream)
 
+            var xmlKeyFileVersion = 1F
+
             val docElement = doc.documentElement
-            if (docElement == null || !docElement.nodeName.equals(RootElementName, ignoreCase = true)) {
+            val keyFileChildNodes = docElement.childNodes
+            // <KeyFile> Root node
+            if (docElement == null
+                    || !docElement.nodeName.equals(XML_NODE_ROOT_NAME, ignoreCase = true)) {
                 return null
             }
-
+            if (keyFileChildNodes.length < 2)
-            val children = docElement.childNodes
-            if (children.length < 2) {
                 return null
-            }
+            for (keyFileChildPosition in 0 until keyFileChildNodes.length) {
-
+                val keyFileChildNode = keyFileChildNodes.item(keyFileChildPosition)
-            for (i in 0 until children.length) {
+                // <Meta>
-                val child = children.item(i)
+                if (keyFileChildNode.nodeName.equals(XML_NODE_META_NAME, ignoreCase = true)) {
-
+                    val metaChildNodes = keyFileChildNode.childNodes
-                if (child.nodeName.equals(KeyElementName, ignoreCase = true)) {
+                    for (metaChildPosition in 0 until metaChildNodes.length) {
-                    val keyChildren = child.childNodes
+                        val metaChildNode = metaChildNodes.item(metaChildPosition)
-                    for (j in 0 until keyChildren.length) {
+                        // <Version>
-                        val keyChild = keyChildren.item(j)
+                        if (metaChildNode.nodeName.equals(XML_NODE_VERSION_NAME, ignoreCase = true)) {
-                        if (keyChild.nodeName.equals(KeyDataElementName, ignoreCase = true)) {
+                            val versionChildNodes = metaChildNode.childNodes
-                            val children2 = keyChild.childNodes
+                            for (versionChildPosition in 0 until versionChildNodes.length) {
-                            for (k in 0 until children2.length) {
+                                val versionChildNode = versionChildNodes.item(versionChildPosition)
-                                val text = children2.item(k)
+                                if (versionChildNode.nodeType == Node.TEXT_NODE) {
-                                if (text.nodeType == Node.TEXT_NODE) {
+                                    val versionText = versionChildNode.textContent.removeSpaceChars()
-                                    val txt = text as Text
+                                    try {
-                                    return Base64.decode(txt.nodeValue, BASE_64_FLAG)
+                                        xmlKeyFileVersion = versionText.toFloat()
+                                        Log.i(TAG, "Reading XML KeyFile version : $xmlKeyFileVersion")
+                                    } catch (e: Exception) {
+                                        Log.e(TAG, "XML Keyfile version cannot be read : $versionText")
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // <Key>
+                if (keyFileChildNode.nodeName.equals(XML_NODE_KEY_NAME, ignoreCase = true)) {
+                    val keyChildNodes = keyFileChildNode.childNodes
+                    for (keyChildPosition in 0 until keyChildNodes.length) {
+                        val keyChildNode = keyChildNodes.item(keyChildPosition)
+                        // <Data>
+                        if (keyChildNode.nodeName.equals(XML_NODE_DATA_NAME, ignoreCase = true)) {
+                            var hashString : String? = null
+                            if (keyChildNode.hasAttributes()) {
+                                val dataNodeAttributes = keyChildNode.attributes
+                                hashString = dataNodeAttributes
+                                        .getNamedItem(XML_ATTRIBUTE_DATA_HASH).nodeValue
+                            }
+                            val dataChildNodes = keyChildNode.childNodes
+                            for (dataChildPosition in 0 until dataChildNodes.length) {
+                                val dataChildNode = dataChildNodes.item(dataChildPosition)
+                                if (dataChildNode.nodeType == Node.TEXT_NODE) {
+                                    val dataString = dataChildNode.textContent.removeSpaceChars()
+                                    when (xmlKeyFileVersion) {
+                                        1F -> {
+                                            // No hash in KeyFile XML version 1
+                                            return Base64.decode(dataString, BASE_64_FLAG)
+                                        }
+                                        2F -> {
+                                            return if (hashString != null
+                                                    && checkKeyFileHash(dataString, hashString)) {
+                                                Log.i(TAG, "Successful key file hash check.")
+                                                Hex.decodeHex(dataString.toCharArray())
+                                            } else {
+                                                Log.e(TAG, "Unable to check the hash of the key file.")
+                                                null
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -417,10 +467,26 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         } catch (e: Exception) {
             return null
         }
-
         return null
     }
 
+    private fun checkKeyFileHash(data: String, hash: String): Boolean {
+        val digest: MessageDigest?
+        var success = false
+        try {
+            digest = MessageDigest.getInstance("SHA-256")
+            digest?.reset()
+            // hexadecimal encoding of the first 4 bytes of the SHA-256 hash of the key.
+            val dataDigest = digest.digest(Hex.decodeHex(data.toCharArray()))
+                    .copyOfRange(0, 4)
+                    .toHexString()
+            success = dataDigest == hash
+        } catch (e: NoSuchAlgorithmException) {
+            e.printStackTrace()
+        }
+        return success
+    }
+
     override fun newGroupId(): NodeIdUUID {
         var newId: NodeIdUUID
         do {
@@ -559,23 +625,29 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     }
 
     fun buildNewBinary(cacheDirectory: File,
-                       protection: Boolean,
                        compression: Boolean,
+                       protection: Boolean,
                        binaryPoolId: Int? = null): BinaryAttachment {
         // New file with current time
-        val fileInCache = File(cacheDirectory, System.currentTimeMillis().toString())
+        val fileInCache = File(cacheDirectory, binaryIncrement.toString())
-        val binaryAttachment = BinaryAttachment(fileInCache, protection, compression)
+        binaryIncrement++
+        val binaryAttachment = BinaryAttachment(fileInCache, compression, protection)
         // add attachment to pool
         binaryPool.put(binaryPoolId, binaryAttachment)
         return binaryAttachment
     }
 
-    fun removeAttachmentIfNotUsed(attachment: Attachment) {
+    fun removeUnlinkedAttachment(binary: BinaryAttachment, clear: Boolean) {
-        // Remove attachment from pool
+        val listBinaries = ArrayList<BinaryAttachment>()
-        removeUnlinkedAttachments(attachment.binaryAttachment)
+        listBinaries.add(binary)
+        removeUnlinkedAttachments(listBinaries, clear)
     }
 
-    fun removeUnlinkedAttachments(vararg binaries: BinaryAttachment) {
+    fun removeUnlinkedAttachments(clear: Boolean) {
+        removeUnlinkedAttachments(emptyList(), clear)
+    }
+
+    private fun removeUnlinkedAttachments(binaries: List<BinaryAttachment>, clear: Boolean) {
         // Build binaries to remove with all binaries known
         val binariesToRemove = ArrayList<BinaryAttachment>()
         if (binaries.isEmpty()) {
@@ -598,6 +670,8 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         binariesToRemove.forEach {
             try {
                 binaryPool.remove(it)
+                if (clear)
+                    it.clear()
             } catch (e: Exception) {
                 Log.w(TAG, "Unable to clean binaries", e)
             }
@@ -626,11 +700,12 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         private const val DEFAULT_HISTORY_MAX_ITEMS = 10 // -1 unlimited
         private const val DEFAULT_HISTORY_MAX_SIZE = (6 * 1024 * 1024).toLong() // -1 unlimited
 
-        private const val RootElementName = "KeyFile"
+        private const val XML_NODE_ROOT_NAME = "KeyFile"
-        //private const val MetaElementName = "Meta";
+        private const val XML_NODE_META_NAME = "Meta"
-        //private const val VersionElementName = "Version";
+        private const val XML_NODE_VERSION_NAME = "Version"
-        private const val KeyElementName = "Key"
+        private const val XML_NODE_KEY_NAME = "Key"
-        private const val KeyDataElementName = "Data"
+        private const val XML_NODE_DATA_NAME = "Data"
+        private const val XML_ATTRIBUTE_DATA_HASH = "Hash"
 
         const val BASE_64_FLAG = Base64.NO_WRAP
 

app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseVersioned.kt

@@ -27,8 +27,11 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
-import com.kunzisoft.keepass.database.exception.KeyFileEmptyDatabaseException
+import org.apache.commons.codec.binary.Hex
-import java.io.*
+import java.io.ByteArrayInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.io.UnsupportedEncodingException
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.util.*
@@ -125,43 +128,35 @@ abstract class DatabaseVersioned<
     @Throws(IOException::class)
     protected fun getFileKey(keyInputStream: InputStream): ByteArray {
 
-        val keyByteArrayOutputStream = ByteArrayOutputStream()
+        val keyData = keyInputStream.readBytes()
-        keyInputStream.copyTo(keyByteArrayOutputStream)
-        val keyData = keyByteArrayOutputStream.toByteArray()
 
-        val keyByteArrayInputStream = ByteArrayInputStream(keyData)
+        // Check XML key file
-        val key = loadXmlKeyFile(keyByteArrayInputStream)
+        val xmlKeyByteArray = loadXmlKeyFile(ByteArrayInputStream(keyData))
-        if (key != null) {
+        if (xmlKeyByteArray != null) {
-            return key
+            return xmlKeyByteArray
         }
 
-        when (keyData.size.toLong()) {
+        // Check 32 bytes key file
-            0L -> throw KeyFileEmptyDatabaseException()
+        when (keyData.size) {
-            32L -> return keyData
+            32 -> return keyData
-            64L -> try {
+            64 -> try {
-                return hexStringToByteArray(String(keyData))
+                return Hex.decodeHex(String(keyData).toCharArray())
-            } catch (e: IndexOutOfBoundsException) {
+            } catch (ignoredException: Exception) {
                 // Key is not base 64, treat it as binary data
             }
         }
 
-        val messageDigest: MessageDigest
+        // Hash file as binary data
         try {
-            messageDigest = MessageDigest.getInstance("SHA-256")
+            return MessageDigest.getInstance("SHA-256").digest(keyData)
         } catch (e: NoSuchAlgorithmException) {
             throw IOException("SHA-256 not supported")
         }
-
-        try {
-            messageDigest.update(keyData)
-        } catch (e: Exception) {
-            println(e.toString())
-        }
-
-        return messageDigest.digest()
     }
 
-    protected abstract fun loadXmlKeyFile(keyInputStream: InputStream): ByteArray?
+    protected open fun loadXmlKeyFile(keyInputStream: InputStream): ByteArray? {
+        return null
+    }
 
     open fun validatePasswordEncoding(password: String?, containsKeyFile: Boolean): Boolean {
         if (password == null && !containsKeyFile)
@@ -393,16 +388,5 @@ abstract class DatabaseVersioned<
         private const val TAG = "DatabaseVersioned"
 
         val UUID_ZERO = UUID(0, 0)
-
-        fun hexStringToByteArray(s: String): ByteArray {
-            val len = s.length
-            val data = ByteArray(len / 2)
-            var i = 0
-            while (i < len) {
-                data[i / 2] = ((Character.digit(s[i], 16) shl 4) + Character.digit(s[i + 1], 16)).toByte()
-                i += 2
-            }
-            return data
-        }
     }
 }

app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt

@@ -153,8 +153,8 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         this.binaryData = attachment.binaryAttachment
     }
 
-    fun removeAttachment(attachment: Attachment) {
+    fun removeAttachment(attachment: Attachment? = null) {
-        if (this.binaryDescription == attachment.name) {
+        if (attachment == null || this.binaryDescription == attachment.name) {
             this.binaryDescription = ""
             this.binaryData = null
         }

app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt

@@ -38,7 +38,6 @@ import com.kunzisoft.keepass.utils.ParcelableUtil
 import com.kunzisoft.keepass.utils.UnsignedLong
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashSet
 import kotlin.collections.LinkedHashMap
 
 class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInterface {
@@ -62,8 +61,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
             super.icon = value
         }
     var iconCustom = IconImageCustom.UNKNOWN_ICON
-    private var customData = LinkedHashMap<String, String>()
+    var customData = LinkedHashMap<String, String>()
-    // TODO Private
     var fields = LinkedHashMap<String, ProtectedString>()
     var binaries = LinkedHashMap<String, Int>() // Map<Label, PoolId>
     var foregroundColor = ""
@@ -272,10 +270,6 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
             return field
         }
 
-    fun allowCustomFields(): Boolean {
-        return true
-    }
-
     fun removeAllFields() {
         fields.clear()
     }
@@ -314,6 +308,10 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         binaries.remove(attachment.name)
     }
 
+    fun removeAttachments() {
+        binaries.clear()
+    }
+
     private fun getAttachmentsSize(binaryPool: BinaryPool): Long {
         var size = 0L
         for ((label, poolId) in binaries) {
@@ -323,11 +321,6 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         return size
     }
 
-    // TODO Remove ?
-    fun sizeOfHistory(): Int {
-        return history.size
-    }
-
     override fun putCustomData(key: String, value: String) {
         customData[key] = value
     }
@@ -376,6 +369,14 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         const val STR_URL = "URL"
         const val STR_NOTES = "Notes"
 
+        fun newCustomNameAllowed(name: String): Boolean {
+            return !(name.equals(STR_TITLE, true)
+                    || name.equals(STR_USERNAME, true)
+                    || name.equals(STR_PASSWORD, true)
+                    || name.equals(STR_URL, true)
+                    || name.equals(STR_NOTES, true))
+        }
+
         @JvmField
         val CREATOR: Parcelable.Creator<EntryKDBX> = object : Parcelable.Creator<EntryKDBX> {
             override fun createFromParcel(parcel: Parcel): EntryKDBX {

app/src/main/java/com/kunzisoft/keepass/database/exception/DatabaseException.kt

@@ -43,20 +43,12 @@ abstract class DatabaseException : Exception {
 }
 
 open class LoadDatabaseException : DatabaseException {
-
     @StringRes
     override var errorId: Int = R.string.error_load_database
     constructor() : super()
     constructor(throwable: Throwable) : super(throwable)
 }
 
-class ArcFourDatabaseException : LoadDatabaseException {
-    @StringRes
-    override var errorId: Int = R.string.error_arc4
-    constructor() : super()
-    constructor(exception: Throwable) : super(exception)
-}
-
 class FileNotFoundDatabaseException : LoadDatabaseException {
     @StringRes
     override var errorId: Int = R.string.file_not_found_content
@@ -67,7 +59,6 @@ class FileNotFoundDatabaseException : LoadDatabaseException {
 class InvalidAlgorithmDatabaseException : LoadDatabaseException {
     @StringRes
     override var errorId: Int = R.string.invalid_algorithm
-
     constructor() : super()
     constructor(exception: Throwable) : super(exception)
 }
@@ -116,13 +107,6 @@ class InvalidCredentialsDatabaseException : LoadDatabaseException {
     constructor(exception: Throwable) : super(exception)
 }
 
-class KeyFileEmptyDatabaseException : LoadDatabaseException {
-    @StringRes
-    override var errorId: Int = R.string.keyfile_is_empty
-    constructor() : super()
-    constructor(exception: Throwable) : super(exception)
-}
-
 class NoMemoryDatabaseException: LoadDatabaseException {
     @StringRes
     override var errorId: Int = R.string.error_out_of_memory

app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseHeaderKDBX.kt

@@ -33,6 +33,7 @@ import com.kunzisoft.keepass.database.exception.VersionDatabaseException
 import com.kunzisoft.keepass.stream.*
 import com.kunzisoft.keepass.utils.UnsignedInt
 import com.kunzisoft.keepass.utils.UnsignedLong
+import com.kunzisoft.keepass.utils.VariantDictionary
 import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.InputStream
@@ -221,10 +222,8 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
 
             PwDbHeaderV4Fields.KdfParameters -> databaseV4.kdfParameters = KdfParameters.deserialize(fieldData)
 
-            PwDbHeaderV4Fields.PublicCustomData -> {
+            PwDbHeaderV4Fields.PublicCustomData -> databaseV4.publicCustomData = VariantDictionary.deserialize(fieldData)
-                databaseV4.publicCustomData = KdfParameters.deserialize(fieldData)!! // TODO verify
+
-                throw IOException("Invalid header type: $fieldID")
-            }
             else -> throw IOException("Invalid header type: $fieldID")
         }
 

app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt

@@ -41,6 +41,13 @@ abstract class DatabaseInput<PwDb : DatabaseVersioned<*, *, *, *>>
     abstract fun openDatabase(databaseInputStream: InputStream,
                               password: String?,
                               keyInputStream: InputStream?,
-                              progressTaskUpdater: ProgressTaskUpdater?): PwDb
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              fixDuplicateUUID: Boolean = false): PwDb
 
+
+    @Throws(LoadDatabaseException::class)
+    abstract fun openDatabase(databaseInputStream: InputStream,
+                              masterKey: ByteArray,
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              fixDuplicateUUID: Boolean = false): PwDb
 }

app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt

@@ -45,8 +45,7 @@ import javax.crypto.spec.SecretKeySpec
 /**
  * Load a KDB database file.
  */
-class DatabaseInputKDB(cacheDirectory: File,
+class DatabaseInputKDB(cacheDirectory: File)
-                        private val fixDuplicateUUID: Boolean = false)
     : DatabaseInput<DatabaseKDB>(cacheDirectory) {
 
     private lateinit var mDatabaseToOpen: DatabaseKDB
@@ -55,7 +54,28 @@ class DatabaseInputKDB(cacheDirectory: File,
     override fun openDatabase(databaseInputStream: InputStream,
                               password: String?,
                               keyInputStream: InputStream?,
-                              progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDB {
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              fixDuplicateUUID: Boolean): DatabaseKDB {
+        return openDatabase(databaseInputStream, progressTaskUpdater, fixDuplicateUUID) {
+            mDatabaseToOpen.retrieveMasterKey(password, keyInputStream)
+        }
+    }
+
+    @Throws(LoadDatabaseException::class)
+    override fun openDatabase(databaseInputStream: InputStream,
+                              masterKey: ByteArray,
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              fixDuplicateUUID: Boolean): DatabaseKDB {
+        return openDatabase(databaseInputStream, progressTaskUpdater, fixDuplicateUUID) {
+            mDatabaseToOpen.masterKey = masterKey
+        }
+    }
+
+    @Throws(LoadDatabaseException::class)
+    private fun openDatabase(databaseInputStream: InputStream,
+                             progressTaskUpdater: ProgressTaskUpdater?,
+                             fixDuplicateUUID: Boolean,
+                             assignMasterKey: (() -> Unit)? = null): DatabaseKDB {
 
         try {
             // Load entire file, most of it's encrypted.
@@ -84,7 +104,7 @@ class DatabaseInputKDB(cacheDirectory: File,
             mDatabaseToOpen = DatabaseKDB()
 
             mDatabaseToOpen.changeDuplicateId = fixDuplicateUUID
-            mDatabaseToOpen.retrieveMasterKey(password, keyInputStream)
+            assignMasterKey?.invoke()
 
             // Select algorithm
             when {

app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt

@@ -20,13 +20,15 @@
 package com.kunzisoft.keepass.database.file.input
 
 import android.util.Base64
+import android.util.Log
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.crypto.CipherFactory
 import com.kunzisoft.keepass.crypto.StreamCipherFactory
 import com.kunzisoft.keepass.crypto.engine.CipherEngine
+import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.DeletedObject
-import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BASE_64_FLAG
@@ -36,7 +38,6 @@ import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
-import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
@@ -62,8 +63,7 @@ import javax.crypto.Cipher
 import javax.crypto.CipherInputStream
 import kotlin.math.min
 
-class DatabaseInputKDBX(cacheDirectory: File,
+class DatabaseInputKDBX(cacheDirectory: File)
-                        private val fixDuplicateUUID: Boolean = false)
     : DatabaseInput<DatabaseKDBX>(cacheDirectory) {
 
     private var randomStream: StreamCipher? = null
@@ -97,12 +97,30 @@ class DatabaseInputKDBX(cacheDirectory: File,
     override fun openDatabase(databaseInputStream: InputStream,
                               password: String?,
                               keyInputStream: InputStream?,
-                              progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDBX {
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              fixDuplicateUUID: Boolean): DatabaseKDBX {
+        return openDatabase(databaseInputStream, progressTaskUpdater, fixDuplicateUUID) {
+            mDatabase.retrieveMasterKey(password, keyInputStream)
+        }
+    }
 
+    @Throws(LoadDatabaseException::class)
+    override fun openDatabase(databaseInputStream: InputStream,
+                              masterKey: ByteArray,
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              fixDuplicateUUID: Boolean): DatabaseKDBX {
+        return openDatabase(databaseInputStream, progressTaskUpdater, fixDuplicateUUID) {
+            mDatabase.masterKey = masterKey
+        }
+    }
+
+    @Throws(LoadDatabaseException::class)
+    private fun openDatabase(databaseInputStream: InputStream,
+                             progressTaskUpdater: ProgressTaskUpdater?,
+                             fixDuplicateUUID: Boolean,
+                             assignMasterKey: (() -> Unit)? = null): DatabaseKDBX {
         try {
-            // TODO performance
             progressTaskUpdater?.updateMessage(R.string.retrieving_db_key)
-
             mDatabase = DatabaseKDBX()
 
             mDatabase.changeDuplicateId = fixDuplicateUUID
@@ -115,9 +133,8 @@ class DatabaseInputKDBX(cacheDirectory: File,
             hashOfHeader = headerAndHash.hash
             val pbHeader = headerAndHash.header
 
-            mDatabase.retrieveMasterKey(password, keyInputStream)
+            assignMasterKey?.invoke()
             mDatabase.makeFinalKey(header.masterSeed)
-            // TODO performance
 
             progressTaskUpdater?.updateMessage(R.string.decrypting_db)
             val engine: CipherEngine
@@ -184,10 +201,10 @@ class DatabaseInputKDBX(cacheDirectory: File,
                 loadInnerHeader(inputStreamXml, header)
             }
 
-            randomStream = StreamCipherFactory.getInstance(header.innerRandomStream, header.innerRandomStreamKey)
+            try {
-
+                randomStream = StreamCipherFactory.getInstance(header.innerRandomStream, header.innerRandomStreamKey)
-            if (randomStream == null) {
+            } catch (e: Exception) {
-                throw ArcFourDatabaseException()
+                throw LoadDatabaseException(e)
             }
 
             readDocumentStreamed(createPullParser(inputStreamXml))
@@ -252,10 +269,10 @@ class DatabaseInputKDBX(cacheDirectory: File,
             }
             DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary -> {
                 // Read in a file
-                val protectedFlag = dataInputStream.readBytes(1)[0].toInt() != 0
+                val protectedFlag = dataInputStream.read().toByte() == DatabaseHeaderKDBX.KdbxBinaryFlags.Protected
                 val byteLength = size - 1
                 // No compression at this level
-                val protectedBinary = mDatabase.buildNewBinary(cacheDirectory, protectedFlag, false)
+                val protectedBinary = mDatabase.buildNewBinary(cacheDirectory, false, protectedFlag)
                 protectedBinary.getOutputDataStream().use { outputStream ->
                     dataInputStream.readBytes(byteLength, DatabaseKDBX.BUFFER_SIZE_BYTES) { buffer ->
                         outputStream.write(buffer)
@@ -435,8 +452,6 @@ class DatabaseInputKDBX(cacheDirectory: File,
                 val strData = readString(xpp)
                 if (strData.isNotEmpty()) {
                     customIconData = Base64.decode(strData, BASE_64_FLAG)
-                } else {
-                    assert(false)
                 }
             } else {
                 readUnknown(xpp)
@@ -742,8 +757,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
             if (entryInHistory) {
                 ctxEntry = ctxHistoryBase
                 return KdbContext.EntryHistory
-            }
+            } else if (ctxEntry != null) {
-            else if (ctxEntry != null) {
                 // Add entry to the index only when close the XML element
                 mDatabase.addEntryIndex(ctxEntry!!)
             }
@@ -879,9 +893,14 @@ class DatabaseInputKDBX(cacheDirectory: File,
         if (encoded.isEmpty()) {
             return DatabaseVersioned.UUID_ZERO
         }
-        val buf = Base64.decode(encoded, BASE_64_FLAG)
 
-        return bytes16ToUuid(buf)
+        return try {
+            val buf = Base64.decode(encoded, BASE_64_FLAG)
+            bytes16ToUuid(buf)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to read base 64 UUID, create a random one", e)
+            UUID.randomUUID()
+        }
     }
 
     @Throws(IOException::class, XmlPullParserException::class)
@@ -949,7 +968,13 @@ class DatabaseInputKDBX(cacheDirectory: File,
                 xpp.next() // Consume end tag
                 val id = Integer.parseInt(ref)
                 // A ref is not necessarily an index in Database V3.1
-                mDatabase.binaryPool[id]
+                var binaryRetrieve = mDatabase.binaryPool[id]
+                // Create empty binary if not retrieved in pool
+                if (binaryRetrieve == null) {
+                    binaryRetrieve = mDatabase.buildNewBinary(cacheDirectory,
+                            compression = false, protection = false, binaryPoolId = id)
+                }
+                return binaryRetrieve
             }
             key != null -> {
                 createBinary(key.toIntOrNull(), xpp)
@@ -964,7 +989,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
     @Throws(IOException::class, XmlPullParserException::class)
     private fun createBinary(binaryId: Int?, xpp: XmlPullParser): BinaryAttachment? {
         var compressed = false
-        var protected = false
+        var protected = true
 
         if (xpp.attributeCount > 0) {
             val compress = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrCompressed)
@@ -981,12 +1006,19 @@ class DatabaseInputKDBX(cacheDirectory: File,
         val base64 = readString(xpp)
         if (base64.isEmpty())
             return null
-        val data = Base64.decode(base64, BASE_64_FLAG)
 
         // Build the new binary and compress
-        val binaryAttachment = mDatabase.buildNewBinary(cacheDirectory, protected, compressed, binaryId)
+        val binaryAttachment = mDatabase.buildNewBinary(cacheDirectory, compressed, protected, binaryId)
-        binaryAttachment.getOutputDataStream().use { outputStream ->
+        try {
-            outputStream.write(data)
+            binaryAttachment.getOutputDataStream().use { outputStream ->
+                outputStream.write(Base64.decode(base64, BASE_64_FLAG))
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to read base 64 attachment", e)
+            binaryAttachment.isCorrupted = true
+            binaryAttachment.getOutputDataStream().use { outputStream ->
+                outputStream.write(base64.toByteArray())
+            }
         }
         return binaryAttachment
     }
@@ -1006,29 +1038,20 @@ class DatabaseInputKDBX(cacheDirectory: File,
         return xpp.safeNextText()
     }
 
-    @Throws(XmlPullParserException::class, IOException::class)
-    private fun readBase64String(xpp: XmlPullParser): ByteArray {
-
-        //readNextNode = false;
-        Base64.decode(xpp.safeNextText(), BASE_64_FLAG)?.let { data ->
-            val plainText = ByteArray(data.size)
-            randomStream?.processBytes(data, 0, data.size, plainText, 0)
-            return plainText
-        }
-        return ByteArray(0)
-    }
 
     @Throws(XmlPullParserException::class, IOException::class)
     private fun readProtectedBase64String(xpp: XmlPullParser): ByteArray? {
-        //(xpp.getEventType() == XmlPullParser.START_TAG);
-
         if (xpp.attributeCount > 0) {
             val protect = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrProtected)
             if (protect != null && protect.equals(DatabaseKDBXXML.ValTrue, ignoreCase = true)) {
-                return readBase64String(xpp)
+                Base64.decode(xpp.safeNextText(), BASE_64_FLAG)?.let { data ->
+                    val plainText = ByteArray(data.size)
+                    randomStream?.processBytes(data, 0, data.size, plainText, 0)
+                    return plainText
+                }
+                return ByteArray(0)
             }
         }
-
         return null
     }
 
@@ -1045,6 +1068,8 @@ class DatabaseInputKDBX(cacheDirectory: File,
 
     companion object {
 
+        private val TAG = DatabaseInputKDBX::class.java.name
+
         private val DEFAULT_HISTORY_DAYS = UnsignedInt(365)
 
         @Throws(XmlPullParserException::class)

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseHeaderOutputKDBX.kt

@@ -40,13 +40,16 @@ import javax.crypto.spec.SecretKeySpec
 class DatabaseHeaderOutputKDBX @Throws(DatabaseOutputException::class)
 constructor(private val databaseKDBX: DatabaseKDBX,
             private val header: DatabaseHeaderKDBX,
-            outputStream: OutputStream) : DatabaseHeaderOutput() {
+            outputStream: OutputStream) {
 
     private val los: LittleEndianDataOutputStream
     private val mos: MacOutputStream
     private val dos: DigestOutputStream
     lateinit var headerHmac: ByteArray
 
+    var hashOfHeader: ByteArray? = null
+        private set
+
     init {
 
         val md: MessageDigest

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseInnerHeaderOutputKDBX.kt

@@ -1,75 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDroid 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.
- *
- *  KeePassDroid 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 KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.file.output
-
-import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
-import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
-import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
-import com.kunzisoft.keepass.stream.LittleEndianDataOutputStream
-import com.kunzisoft.keepass.stream.readBytes
-import java.io.IOException
-import java.io.OutputStream
-import kotlin.experimental.or
-
-class DatabaseInnerHeaderOutputKDBX(private val database: DatabaseKDBX,
-                                    private val header: DatabaseHeaderKDBX,
-                                    outputStream: OutputStream) {
-
-    private val dataOutputStream: LittleEndianDataOutputStream = LittleEndianDataOutputStream(outputStream)
-
-    @Throws(IOException::class)
-    fun output() {
-        dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomStreamID.toInt())
-        dataOutputStream.writeInt(4)
-        if (header.innerRandomStream == null)
-            throw IOException("Can't write innerRandomStream")
-        dataOutputStream.writeInt(header.innerRandomStream!!.id.toKotlinInt())
-
-        val streamKeySize = header.innerRandomStreamKey.size
-        dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomstreamKey.toInt())
-        dataOutputStream.writeInt(streamKeySize)
-        dataOutputStream.write(header.innerRandomStreamKey)
-
-        database.binaryPool.doForEachOrderedBinary { _, keyBinary ->
-            val protectedBinary = keyBinary.binary
-            var flag = DatabaseHeaderKDBX.KdbxBinaryFlags.None
-            if (protectedBinary.isProtected) {
-                flag = flag or DatabaseHeaderKDBX.KdbxBinaryFlags.Protected
-            }
-
-            // Force decompression to add binary in header
-            protectedBinary.decompress()
-
-            dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary.toInt())
-            dataOutputStream.writeInt(protectedBinary.length().toInt() + 1)
-            dataOutputStream.write(flag.toInt())
-
-            // if was compressed in cache, uncompress it
-            protectedBinary.getInputDataStream().use { inputStream ->
-                inputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
-                    dataOutputStream.write(buffer)
-                }
-            }
-        }
-
-        dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.EndOfHeader.toInt())
-        dataOutputStream.writeInt(0)
-    }
-}

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutput.kt

@@ -26,7 +26,7 @@ import java.io.OutputStream
 import java.security.NoSuchAlgorithmException
 import java.security.SecureRandom
 
-abstract class DatabaseOutput<Header : DatabaseHeader> protected constructor(protected var mOS: OutputStream) {
+abstract class DatabaseOutput<Header : DatabaseHeader> protected constructor(protected var mOutputStream: OutputStream) {
 
     @Throws(DatabaseOutputException::class)
     protected open fun setIVs(header: Header): SecureRandom {

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDB.kt

@@ -63,7 +63,7 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
         // and remove any orphaned nodes that are no longer part of the tree hierarchy
         sortGroupsForOutput()
 
-        val header = outputHeader(mOS)
+        val header = outputHeader(mOutputStream)
 
         val finalKey = getFinalKey(header)
 
@@ -85,7 +85,7 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
             cipher.init(Cipher.ENCRYPT_MODE,
                     SecretKeySpec(finalKey, "AES"),
                     IvParameterSpec(header.encryptionIV))
-            val cos = CipherOutputStream(mOS, cipher)
+            val cos = CipherOutputStream(mOutputStream, cipher)
             val bos = BufferedOutputStream(cos)
             outputPlanGroupAndEntries(bos)
             bos.flush()

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt

@@ -38,7 +38,6 @@ import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
-import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.exception.DatabaseOutputException
@@ -47,6 +46,7 @@ import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
 import com.kunzisoft.keepass.database.file.DatabaseKDBXXML
 import com.kunzisoft.keepass.database.file.DateKDBXUtil
 import com.kunzisoft.keepass.stream.*
+import com.kunzisoft.keepass.utils.UnsignedInt
 import org.bouncycastle.crypto.StreamCipher
 import org.joda.time.DateTime
 import org.xmlpull.v1.XmlSerializer
@@ -58,6 +58,7 @@ import java.util.*
 import java.util.zip.GZIPOutputStream
 import javax.crypto.Cipher
 import javax.crypto.CipherOutputStream
+import kotlin.experimental.or
 
 
 class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
@@ -81,20 +82,19 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
                 throw DatabaseOutputException("No such cipher", e)
             }
 
-            header = outputHeader(mOS)
+            header = outputHeader(mOutputStream)
 
             val osPlain: OutputStream
             osPlain = if (header!!.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
-                val cos = attachStreamEncryptor(header!!, mOS)
+                val cos = attachStreamEncryptor(header!!, mOutputStream)
                 cos.write(header!!.streamStartBytes)
 
                 HashedBlockOutputStream(cos)
             } else {
-                mOS.write(hashOfHeader!!)
+                mOutputStream.write(hashOfHeader!!)
-                mOS.write(headerHmac!!)
+                mOutputStream.write(headerHmac!!)
 
-
+                attachStreamEncryptor(header!!, HmacBlockOutputStream(mOutputStream, mDatabaseKDBX.hmacKey!!))
-                attachStreamEncryptor(header!!, HmacBlockOutputStream(mOS, mDatabaseKDBX.hmacKey!!))
             }
 
             val osXml: OutputStream
@@ -105,8 +105,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
                 }
 
                 if (header!!.version.toKotlinLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
-                    val ihOut = DatabaseInnerHeaderOutputKDBX(mDatabaseKDBX, header!!, osXml)
+                    outputInnerHeader(mDatabaseKDBX, header!!, osXml)
-                    ihOut.output()
                 }
 
                 outputDatabase(osXml)
@@ -122,6 +121,49 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         }
     }
 
+    @Throws(IOException::class)
+    private fun outputInnerHeader(database: DatabaseKDBX,
+                                  header: DatabaseHeaderKDBX,
+                                  outputStream: OutputStream) {
+        val dataOutputStream = LittleEndianDataOutputStream(outputStream)
+
+        dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomStreamID)
+        dataOutputStream.writeInt(4)
+        if (header.innerRandomStream == null)
+            throw IOException("Can't write innerRandomStream")
+        dataOutputStream.writeUInt(header.innerRandomStream!!.id)
+
+        val streamKeySize = header.innerRandomStreamKey.size
+        dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomstreamKey)
+        dataOutputStream.writeInt(streamKeySize)
+        dataOutputStream.write(header.innerRandomStreamKey)
+
+        database.binaryPool.doForEachOrderedBinary { _, keyBinary ->
+            val protectedBinary = keyBinary.binary
+            // Force decompression to add binary in header
+            protectedBinary.decompress()
+            // Write type binary
+            dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary)
+            // Write size
+            dataOutputStream.writeUInt(UnsignedInt.fromKotlinLong(protectedBinary.length() + 1))
+            // Write protected flag
+            var flag = DatabaseHeaderKDBX.KdbxBinaryFlags.None
+            if (protectedBinary.isProtected) {
+                flag = flag or DatabaseHeaderKDBX.KdbxBinaryFlags.Protected
+            }
+            dataOutputStream.writeByte(flag)
+
+            protectedBinary.getInputDataStream().use { inputStream ->
+                inputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
+                    dataOutputStream.write(buffer)
+                }
+            }
+        }
+
+        dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.EndOfHeader)
+        dataOutputStream.writeInt(0)
+    }
+
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
     private fun outputDatabase(outputStream: OutputStream) {
 
@@ -282,9 +324,10 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         }
         random.nextBytes(header.innerRandomStreamKey)
 
-        randomStream = StreamCipherFactory.getInstance(header.innerRandomStream, header.innerRandomStreamKey)
+        try {
-        if (randomStream == null) {
+            randomStream = StreamCipherFactory.getInstance(header.innerRandomStream, header.innerRandomStreamKey)
-            throw DatabaseOutputException("Invalid random cipher")
+        } catch (e: Exception) {
+            throw DatabaseOutputException(e)
         }
 
         if (header.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
@@ -359,6 +402,9 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
 
         writeFields(entry.fields)
         writeEntryBinaries(entry.binaries)
+        if (entry.containsCustomData()) {
+            writeCustomData(entry.customData)
+        }
         writeAutoType(entry.autoType)
 
         if (!isHistory) {
@@ -417,41 +463,56 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         writeObject(name, String(Base64.encode(data, BASE_64_FLAG)))
     }
 
+    /*
+    // Normally used by a single entry but obsolete because binaries are in meta tag with kdbx3.1-
+    // or in file header with kdbx4
+    // binary.isProtected attribute is not used to create the XML
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
-    private fun writeBinary(binary : BinaryAttachment) {
+    private fun writeEntryBinary(binary : BinaryAttachment) {
-        val binaryLength = binary.length()
+        if (binary.length() > 0) {
-        if (binaryLength > 0) {
             if (binary.isProtected) {
                 xml.attribute(null, DatabaseKDBXXML.AttrProtected, DatabaseKDBXXML.ValTrue)
-
+                binary.getInputDataStream().use { inputStream ->
-                binary.getInputDataStream().readBytes(BUFFER_SIZE_BYTES) { buffer ->
+                    inputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
-                    val encoded = ByteArray(buffer.size)
+                        val encoded = ByteArray(buffer.size)
-                    randomStream!!.processBytes(buffer, 0, encoded.size, encoded, 0)
+                        randomStream!!.processBytes(buffer, 0, encoded.size, encoded, 0)
-                    val charArray = String(Base64.encode(encoded, BASE_64_FLAG)).toCharArray()
+                        xml.text(String(Base64.encode(encoded, BASE_64_FLAG)))
-                    xml.text(charArray, 0, charArray.size)
+                    }
                 }
             } else {
-                if (binary.isCompressed) {
-                    xml.attribute(null, DatabaseKDBXXML.AttrCompressed, DatabaseKDBXXML.ValTrue)
-                }
                 // Write the XML
-                binary.getInputDataStream().readBytes(BUFFER_SIZE_BYTES) { buffer ->
+                binary.getInputDataStream().use { inputStream ->
-                    val charArray = String(Base64.encode(buffer, BASE_64_FLAG)).toCharArray()
+                    inputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
-                    xml.text(charArray, 0, charArray.size)
+                        xml.text(String(Base64.encode(buffer, BASE_64_FLAG)))
+                    }
                 }
             }
         }
     }
+    */
 
+    // Only uses with kdbx3.1 to write binaries in meta tag
+    // With kdbx4, don't use this method because binaries are in header file
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
     private fun writeMetaBinaries() {
         xml.startTag(null, DatabaseKDBXXML.ElemBinaries)
 
-        // Use indexes because necessarily in DatabaseV4 (binary header ref is the order)
+        // Use indexes because necessarily (binary header ref is the order)
         mDatabaseKDBX.binaryPool.doForEachOrderedBinary { index, keyBinary ->
             xml.startTag(null, DatabaseKDBXXML.ElemBinary)
             xml.attribute(null, DatabaseKDBXXML.AttrId, index.toString())
-            writeBinary(keyBinary.binary)
+            val binary = keyBinary.binary
+            if (binary.length() > 0) {
+                if (binary.isCompressed) {
+                    xml.attribute(null, DatabaseKDBXXML.AttrCompressed, DatabaseKDBXXML.ValTrue)
+                }
+                // Write the XML
+                binary.getInputDataStream().use { inputStream ->
+                    inputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
+                        xml.text(String(Base64.encode(buffer, BASE_64_FLAG)))
+                    }
+                }
+            }
             xml.endTag(null, DatabaseKDBXXML.ElemBinary)
         }
 
@@ -520,13 +581,11 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
 
         if (protect) {
             xml.attribute(null, DatabaseKDBXXML.AttrProtected, DatabaseKDBXXML.ValTrue)
-
+            val data = value.toString().toByteArray()
-            val data = value.toString().toByteArray(charset("UTF-8"))
+            val dataLength = data.size
-            val valLength = data.size
+            if (data.isNotEmpty()) {
-
+                val encoded = ByteArray(dataLength)
-            if (valLength > 0) {
+                randomStream!!.processBytes(data, 0, dataLength, encoded, 0)
-                val encoded = ByteArray(valLength)
-                randomStream!!.processBytes(data, 0, valLength, encoded, 0)
                 xml.text(String(Base64.encode(encoded, BASE_64_FLAG)))
             }
         } else {

app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt

@@ -28,14 +28,13 @@ import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorK
 import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorKDBX
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.model.getSearchString
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 
 class SearchHelper {
 
     companion object {
-        const val MAX_SEARCH_ENTRY = 6
+        const val MAX_SEARCH_ENTRY = 10
 
         /**
          * Utility method to perform actions if item is found or not after an auto search in [database]
@@ -53,7 +52,7 @@ class SearchHelper {
                         && !searchInfo.containsOnlyNullValues()) {
                     // If search provide results
                     database.createVirtualGroupFromSearchInfo(
-                            searchInfo.getSearchString(context),
+                            searchInfo.toString(),
                             PreferencesUtil.omitBackup(context),
                             MAX_SEARCH_ENTRY
                     )?.let { searchGroup ->

app/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.kt

@@ -33,6 +33,7 @@ class SearchParameters {
     var searchInUrls = true
     var searchInGroupNames = false
     var searchInNotes = true
+    var searchInOTP = false
     var searchInOther = true
     var searchInUUIDs = false
     var searchInTags = true
@@ -54,6 +55,7 @@ class SearchParameters {
         this.searchInUrls = source.searchInUrls
         this.searchInGroupNames = source.searchInGroupNames
         this.searchInNotes = source.searchInNotes
+        this.searchInOTP = source.searchInOTP
         this.searchInOther = source.searchInOther
         this.searchInUUIDs = source.searchInUUIDs
         this.searchInTags = source.searchInTags
@@ -69,6 +71,7 @@ class SearchParameters {
         searchInUrls = false
         searchInGroupNames = false
         searchInNotes = false
+        searchInOTP = false
         searchInOther = false
         searchInUUIDs = false
         searchInTags = false