First commit for cancelable loading

2025-12-04 15:49:33 +01:00 · 2019-10-24 14:53:55 +02:00
695 changed files with 19464 additions and 37513 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -20,6 +20,9 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.

+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
 ** Keepass Database **
 - Created with: [e.g Windows KeePass 2.42]
 - Version: [e.g. 2]
@@ -27,7 +30,7 @@ A clear and concise description of what you expected to happen.
 - Size: [e.g. 150Mo]
 - Contains attachment: [e.g. Yes]

-**KeePassDX (please complete the following information):**
+**KeePass DX (please complete the following information):**
 - Version: [e.g. 2.5.0.0beta23]
 - Build: [e.g. Free]
 - Language: [e.g. French]
@@ -35,7 +38,7 @@ A clear and concise description of what you expected to happen.
 **Android (please complete the following information):**
 - Device: [e.g. GalaxyS8]
 - Version: [e.g. 8.1]
+ - Browser: [e.g. Chrome]

 **Additional context**
 Add any other context about the problem here.
- - Browser for Autofill: [e.g. Chrome version X]
--- a/.gitignore
+++ b/.gitignore
@@ -38,13 +38,6 @@ proguard/
 # Android Studio captures folder
 captures/

-# Eclipse/VS Code
-.project
-.settings/*
-*/.project
-*/.classpath
-*/.settings/*
-
 # Intellij
 *.iml
 .idea/workspace.xml
--- a/200
+++ b/200
@@ -1,152 +1,14 @@
-KeePassDX(2.8.7)
- * Downgrade to Android API 29 (crash on startup with API 30 on some devices)
- Sorry for the inconvenience
-
-KeePassDX(2.8.6)
- * Fix Autofill recognition #712
- * Keep value after renaming custom field #709
- * Prevent random binary bug #713
- * Fix dialog background #717
- * Better domain recognition for autofill #702
- * Write custom data #651
- * Fix autolink #720
-
-KeePassDX(2.8.5)
- * Fix Base 64 #708
-
-KeePassDX(2.8.4)
- * Fix incomplete attachment deletion #684
- * Fix opening database v1 without backup folder #692
- * Fix ANR during first entry education #685
- * Entry edition as fragment and manual views to fix focus #686
- * Fix opening database with corrupted attachment #691
- * Manage empty keyfile #679
-
-KeePassDX(2.8.3)
- * Upload attachments
- * Visibility button for each hidden field
- * Fix read header file
- * Fix deletion in KDB database
- * Fix minor issues
-
-KeePassDX(2.8.2)
- * Fix themes / new UI
- * Fix multiples notifications
- * Fix entry in Magikeyboard memory
- * Fix biometric view visibility
- * Fix fields order
- * Upgrade code with ViewModel and LiveData
-
-KeePassDX(2.8.1)
- * Capture exceptions in coroutines
-
-KeePassDX(2.8)
- * Fix TOTP period (> 60s)
- * Fix searching in recycle bin
- * Settings to back to the previous keyboard during database credentials and after form filling
- * Improve action tasks
- * Improve recognition to reset app timeout
- * Fix minor issues
-
-KeePassDX(2.7)
- * Add blocklists for autofill
- * Add autofill compatibility mode (usefull for Browser not compatible)
- * Upgrade autofill recognition algorithm
- * Setting to search through web subdomains
- * Refactoring selection mode
-
-KeePassDX(2.6)
- * Share a web domain to automatically search for an entry
- * Default group icon for a new entry
- * Better autofill recognition
- * Fix entry not visually deleted in search
- * Fix hanged loading dialog
- * Fix auto open biometric prompt if comes from background
- * Minor fixes
-
-KeePassDX(2.5)
- * First stable version of KeePassDX
- * Fork completely rewritten from the KeePassDroid project
- * Fix small issues from the last Release Candidate
-
-KeePassDX(2.5RC2)
- * Replacement of Spongy Castle by Bouncy Castle
- * Update Autofill compatibility
- * Fix Magikeyboard "Go" action
- * Fix KeeWeb database opening
- * Fix default username
- * Fix themes
- * Fix small issues
-
-KeePassDX(2.5RC1)
- * Add write permission to keep compatibility with old file managers
- * Fix autofill for apps
- * Auto search for autofill
- * New keyfile input
- * Icon to hide keyfile input
- * New lock button
- * Setting to hide lock button in user interface
- * Clickable links in notes
- * Fix autofill for key-value pairs
-
-KeePassDX(2.5beta30)
- * Fix Lock after screen off (wait 1.5 seconds)
- * Upgrade autofill algorithm
- * Fix ANR during file verifications
-
-KeePassDX(2.5beta29)
- * Upgrade autofill algorithm
- * Delete registered KeyFile after save new credentials
- * Fix title and username entry view refresh after an update
- * Fix database lock request (open notification always active)
- * Allow empty title in entries
- * Add expiration datetime
-
-KeePassDX(2.5beta28)
- * Fix read only database
- * Upgrade to Android SDK 29
-
-KeePassDX (2.5beta27)
- * New setting to hide broken links
- * Show URL when title is empty
- * Setting to open search field at database opening
- * Fix settings for database locations
- * Fix error message when database file not writable
- * Fix appearance refresh settings
- * Sort optimization
-
-KeePassDX (2.5.0.0beta26)
- * Download attachments
- * Change file size string format
- * Prevent screenshot for all screen
- * Auto performed "Go" key in Magikeyboard
- * Restore and delete entry history
- * Setting to hide expired entries
- * New Black theme
- * Fix crash when clearing clipboard
- * Fix attachments compressions
- * Fix dates
- * Fix UUID message for Database v1
-
-KeePassDX (2.5.0.0beta25)
- * Setting for Recycle Bin
- * Fix Recycle bin issues
- * Fix TOTP
- * Fix infinite save
- * Fix update group
- * Fix OOM
-
-KeePassDX (2.5.0.0beta24)
- * Add OTP (HOTP / TOTP)
+KeepassDX (2.5.0.0beta24)
 * Add settings (Color, Security, Master Key)
 * Show history of each entry
 * Auto repair database for nodes with same UUID
 * Management of expired nodes
 * Multi-selection for actions (Cut - Copy - Delete)
- * Open/Save database as service / Add persistent notification
- * Fix settings / edit group / small bugs
+ * Fix settings
+ * Fix edit group
+ * Fix small bugs

-KeePassDX (2.5.0.0beta23)
+KeepassDX (2.5.0.0beta23)
 * New, more secure database creation workflow
 * Recognize more database files
 * Add alias for history files (WARNING: history is erased)
@@ -155,14 +17,14 @@ KeePassDX (2.5.0.0beta23)
 * Fix OOM with KeyFile
 * Fix small issues

-KeePassDX (2.5.0.0beta22)
+KeepassDX (2.5.0.0beta22)
 * Rebuild code for actions
 * Add UUID as entry view
 * Fix bug with natural order
 * Fix number of entries in databaseV1
 * New entry views

-KeePassDX (2.5.0.0beta21)
+KeepassDX (2.5.0.0beta21)
 * Fix nested groups no longer visible in V1 databases
 * Improved data import algorithm for V1 databases
 * Add natural database sort
@@ -170,10 +32,10 @@ KeePassDX (2.5.0.0beta21)
 * Fix button disabled with only KeyFile
 * Show the number of entries in a group

-KeePassDX (2.5.0.0beta20)
+KeepassDX (2.5.0.0beta20)
 * Fix a major bug that displays an entry history

-KeePassDX (2.5.0.0beta19)
+KeepassDX (2.5.0.0beta19)
 * Add lock button always visible
 * New connection workflow
 * Code refactored in Kotlin
@@ -184,7 +46,7 @@ KeePassDX (2.5.0.0beta19)
 * Fix memory when load database
 * Fix small bugs

-KeePassDX (2.5.0.0beta18)
+KeepassDX (2.5.0.0beta18)
 * New recent databases views
 * New information dialog
 * Custom fields for the Magikeyboard
@@ -193,10 +55,10 @@ KeePassDX (2.5.0.0beta18)
 * Fix memory when opening the database
 * Memory management for attachments

-KeePassDX (2.5.0.0beta17)
+KeepassDX (2.5.0.0beta17)
 * Fix font and search

-KeePassDX (2.5.0.0beta16)
+KeepassDX (2.5.0.0beta16)
 * New search in a single fragment
 * Search suggestions
 * Added the display of usernames
@@ -204,20 +66,20 @@ KeePassDX (2.5.0.0beta16)
 * Fix read-only mode
 * Fix parcelable / toolbar / back

-KeePassDX (2.5.0.0beta15)
+KeepassDX (2.5.0.0beta15)
 * Read only mode
 * Best group recovery for the navigation fragment
 * Fix copies in notifications
 * Fix orientation
 * Added translations

-KeePassDX (2.5.0.0beta14)
+KeepassDX (2.5.0.0beta14)
 * Optimize all the memory with parcelables / fix search

-KeePassDX (2.5.0.0beta13)
+KeepassDX (2.5.0.0beta13)
 * Fix memory issue with parcelable (crash in beta12 version)

-KeePassDX (2.5.0.0beta12)
+KeepassDX (2.5.0.0beta12)
 * Added the Magikeyboard to fill the forms (settings still in development)
 * Added move and copy for groups and entries
 * New navigation in a single screen / new animations between activities
@@ -230,10 +92,10 @@ KeePassDX (2.5.0.0beta12)
 * Fix the fingerprint recognition (WARNING : The keystore is reinit, you must delete the old keys)
 * Fix small bugs

-KeePassDX (2.5.0.0beta11)
+KeepassDX (2.5.0.0beta11)
 * Fix crash in beta10 version

-KeePassDX (2.5.0.0beta10)
+KeepassDX (2.5.0.0beta10)
 * Dynamically change Algorithm and Key Derivation Function in settings
 * Upgrade translations
 * New red volcano theme, fix classic dark theme
@@ -241,7 +103,7 @@ KeePassDX (2.5.0.0beta10)
 * Update fingerprint state with checkbox
 * Fix bugs

-KeePassDX (2.5.0.0beta9)
+KeepassDX (2.5.0.0beta9)
 * Education Screens to learn how to use the app
 * New designs
 * New custom font for character visibility
@@ -250,9 +112,9 @@ KeePassDX (2.5.0.0beta9)
 * Change setting organisation
 * Pro version

-KeePassDX (2.5.0.0beta8)
+KeepassDX (2.5.0.0beta8)
 * Hide custom entries protected
- * Best management of field references (https://KeePass.info/help/base/fieldrefs.html)
+ * Best management of field references (https://keepass.info/help/base/fieldrefs.html)
 * Change database / default settings
 * Add Autofill for search
 * Add sorting by last access and by creation time
@@ -260,7 +122,7 @@ KeePassDX (2.5.0.0beta8)
 * Refactor old code
 * Fix bugs

-KeePassDX (2.5.0.0beta7)
+KeepassDX (2.5.0.0beta7)
 * Rebuild Notifications
 * Change links to https
 * Add extended Ascii (ñæËÌÂÝÜ...)
@@ -269,10 +131,10 @@ KeePassDX (2.5.0.0beta7)
 * Add setting to prevent the password copy
 * Fix bugs

-KeePassDX (2.5.0.0beta6)
+KeepassDX (2.5.0.0beta6)
 * Fix crash

-KeePassDX (2.5.0.0beta5)
+KeepassDX (2.5.0.0beta5)
 * Autofill (Android O)
 * Deletion for group
 * New sorts with (Asc/Dsc, Groups before or after)
@@ -293,7 +155,7 @@ KeePassDX (2.5.0.0beta5)
 * Fix many small bugs
 * Add recycle bin setting (not yet accessible)

-KeePassDX (2.5.0.0beta4)
+KeepassDX (2.5.0.0beta4)
 * Show only file name
 * Setting for full path
 * Add information for each database file
@@ -302,7 +164,7 @@ KeePassDX (2.5.0.0beta4)
 * Delete view assignment for fingerprint opening
 * Merge KeePassDroid 2.2.1

-KeePassDX (2.5.0.0beta3)
+KeepassDX (2.5.0.0beta3)
 * New database workflow with new screens and folder selection
 * Settings for default password generation
 * Fingerprint dialog for explanations
@@ -313,17 +175,17 @@ KeePassDX (2.5.0.0beta3)
 * Merge KeePassDroid 2.2.0.9
 * Add corruption fix mode

-KeePassDX (2.5.0.0beta2)
+KeepassDX (2.5.0.0beta2)
 * Remove libs for F-Droid

-KeePassDX (2.5.0.0beta1)
- * Fork KeePassDroid
+KeepassDX (2.5.0.0beta1)
+ * Fork KeepassDroid
 * Add Material Design
 * Add Light and Night theme
 * Min API is 14
 * Solve bug for fingerprint
 * Update French translation
- * Change donation (see KeePassDroid to contribute on both projects)
+ * Change donation (see KeepassDroid to contribute on both projects)

 KeePassDroid (2.2.1)
 * Fix kdbx4 date corruption
@@ -584,7 +446,7 @@ KeePassDroid (1.9.10)

 KeePassDroid (1.9.9)
 * Go back to explicitly storing blank fields in the database
-   (works around bug in KeePassx)
+   (works around bug in keepassx)
 * Add support for native code on MIPS architectures
 * Adding Vibrate permission. On some devices notifications fail
   without the vibrate permission.
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 ---

-KeePassDX is free software: you can redistribute it and/or modify
+KeePass DX 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.
@@ -13,7 +13,7 @@ KeePassDX is free software: you can redistribute it and/or modify
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-The KeePassDX icon was created by Jeremy JAMET and is licensed under the terms of GPLv3.
+The KeePass DX icon was created by Jeremy JAMET and is licensed under the terms of GPLv3.

 ---

--- a/LICENSES/LICENSE_ANDROID_BACKUP_SERVICE
+++ b/LICENSES/LICENSE_ANDROID_BACKUP_SERVICE
@@ -1,177 +0,0 @@
-Terms of Service
-
-This is the terms of service for the Android Backup Service.
-
-1. Your relationship with Google
-
-1.1 Your use of the Android Backup Service (referred to as the "Service" in this document) is subject to the terms of a legal agreement between you and Google. "Google" means Google LLC, whose principal place of business is at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. This document explains how the agreement is made up, and sets out some of the terms of that agreement.
-
-1.2 Unless otherwise agreed in writing with Google, your agreement with Google will always include, at a minimum, the terms and conditions set out in this document. These are referred to below as the "Terms".
-
-1.3 The Terms form a legally binding agreement between you and Google in relation to your use of the Service. It is important that you take the time to read them carefully.
-
-2. Accepting the Terms
-
-2.1 In order to use the Service, you must first agree to the Terms. You may not use the Service if you do not accept the Terms.
-
-2.2 You can accept the Terms by clicking to accept or agree to the Terms, where this option is made available to you by Google.
-
-2.3 You may not use the Service and may not accept the Terms if you are not of legal age to form a binding contract with Google.
-
-2.4 You represent that you have full power, capacity and authority to accept these Terms. If you are accepting on behalf of your employer or another entity, you represent that you have full legal authority to bind your employer or such entity to these Terms. If you don't have the legal authority to bind, please ensure that an authorized person from your entity consents to and accepts these Terms.
-
-3. Provision of the Service by Google
-
-3.1 Google has subsidiaries and affiliated legal entities around the world ("Subsidiaries and Affiliates"). Sometimes, these companies will be providing the Service to you on behalf of Google itself. You acknowledge and agree that Subsidiaries and Affiliates will be entitled to provide the Service to you.
-
-3.2 Google is constantly innovating in order to provide the best possible experience for its users. You acknowledge and agree that the form and nature of the Service which Google provides may change from time to time without prior notice to you.
-
-3.3 As part of this continuing innovation, you acknowledge and agree that Google may stop (permanently or temporarily) providing the Service (or any features within the Service) to you or to users generally at Google's sole discretion, without prior notice to you. You may stop using the Service at any time. You do not need to specifically inform Google when you stop using the Service.
-
-3.4 You acknowledge and agree that if Google disables your Backup Service Key, you and the Android application(s) you developed ("Application(s)") may be prevented from accessing the Service and any content that is stored with the Service.
-
-3.5 You acknowledge and agree that Google may set a fixed upper limit on the number of backup transmissions you may send or receive through the Service or on the amount of storage space used for the provision of the Service at any time, at Google's discretion. You agree to abide by any such fixed upper limits.
-
-4. Use of the Service by you
-
-4.1 In order to access the Service, you must have a unique application identifier ("Package Name") for your Application as described in the documentation for the Service.
-
-4.2 After supplying Google with the Package Name and accepting the Terms, you will be issued an alphanumeric key ("Backup Service Key") assigned to you by Google that is uniquely associated with your Application. Your Application must include this Backup Service Key as described in the documentation for the Service.
-
-4.3 There is currently no limit to the number of Backup Service Keys you may obtain in this manner provided that you use a different Package Name for each Backup Service Key you obtain. You agree that each Backup Service Key is only valid for Applications with the corresponding Package Name. You agree that Google may, in its sole discretion, impose a limit on the number of Backup Service Keys that may be obtained in the future. You agree that your continued use of any of the Backup Service Keys assigned by Google, or distribution of any Applications using such Backup Service Keys, constitutes your continued agreement to these Terms.
-
-4.4 You agree to use the Service only for purposes that are permitted by (a) the Terms and (b) any applicable law, regulation, third-party terms of service, or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-
-4.5 You agree not to access (or attempt to access) any of the Service by any means other than through the interfaces, methods, and APIs that are provided by Google, unless you have been specifically allowed to do so in a separate agreement with Google.
-
-4.6 You agree that you will not engage in any activity that interferes with or disrupts the Service (or the servers and networks which are connected to the Service), or the servers or networks of any third-party.
-
-4.7 You agree that your use of the Service will be in compliance with any documentation guidelines provided by Google and that failure to comply with the documentation guidelines may result in the disabling of the Backup Service Key(s) for your Application(s).
-
-4.8 Unless you have been specifically permitted to do so in a separate agreement with Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell (a) use of the Service, or (b) access to the Service.
-
-4.9 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) your and your Application's use of the Service, any breach of your obligations under the Terms, and for the consequences (including any loss or damage which Google may suffer) of any such breach.
-
-4.10 You agree that in your use of the Service, you and your Applications will protect the privacy and legal rights of users. You must provide legally adequate privacy notice and protection for users whose data your Applications back up to the Service. Further, your Application may only use that information for the limited purpose of backing up the data to the Service unless the user has given you permission for further use. If the user has not given you permission to back up information to the Service, you may not transmit such information to the Service.
-
-4.11 You agree that you and your Applications will not transmit or store sensitive user information, such as user names, passwords, or credit card numbers, through the Service.
-
-5. Security
-
-5.1 You agree and understand that you are responsible for maintaining the security associated with any information you provide to access the Service as well as of the Backup Service Key(s) assigned to you by Google. You agree that only you are authorized to use the Backup Service Key(s) assigned to you.
-
-5.2 Accordingly, you agree that you will be solely responsible to Google for all activities that occur in connection with your access to the Service, as well as the Backup Service Key.
-
-5.3 If you become aware of any unauthorized use of your Backup Service Key(s) you agree to notify Google immediately.
-
-6. Privacy and your personal information
-
-6.1 For information about Google's data protection practices, please read Google's privacy policy at http://www.google.com/privacy.html. This policy explains how Google treats your personal information when you use the Service.
-
-6.2 You agree to the use of your data in accordance with Google's privacy policies.
-
-7. Content in the Service
-
-7.1 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any Content that you or your Applications transmit or store through the Service and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. You agree that you are solely responsible for (A) any Content that is transmitted through the Service by your Applications, and (B) any Content that Devices retrieve from the Service by virtue of your Applications. For purposes of the Terms, "Content" means information such as data, messages, settings information, written text, computer software, music, audio files or other sounds, photographs, videos or other images. "Device(s)" means device(s) powered by the Android operating system.
-
-7.2 You agree that you will not transmit any Content through the Service that is copyrighted, protected by trade secret or otherwise subject to third party proprietary rights, including patent, privacy and publicity rights, unless you are the owner of such rights or have permission from their rightful owner to transmit the Content through the Service.
-
-8. Proprietary rights
-
-8.1 You acknowledge and agree that Google (or Google's licensors) own all legal right, title and interest in and to the Service, including any intellectual property rights which subsist in the Service (whether those rights happen to be registered or not, and wherever in the world those rights may exist).
-
-8.2 Unless you have agreed otherwise in writing with Google, nothing in the Terms gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, and other distinctive brand features.
-
-8.3 If you have been given an explicit right to use any of these brand features in a separate written agreement with Google, then you agree that your use of such features shall be in compliance with that agreement, any applicable provisions of the Terms, and Google's brand feature use guidelines as updated from time to time. These guidelines can be viewed online at http://www.google.com/permissions/ guidelines.html (or such other URL as Google may provide for this purpose from time to time).
-
-8.4 You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright, trade mark notices) which may be affixed to or contained within the Service.
-
-9. License from Google
-
-9.1 Subject to terms and conditions of these Terms, Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the Service as provided to you by Google. This license is for the sole purpose of enabling you to use and enjoy the benefit of the Service as provided by Google, in the manner permitted by the Terms.
-
-9.2 You may not (and you may not permit anyone else to) copy, modify, create a derivative work of, reverse engineer, decompile or otherwise attempt to extract the source code from the Service or any part thereof, unless this is expressly permitted or required by law, or unless you have been specifically told that you may do so by Google, in writing.
-
-9.3 Unless Google has given you specific written permission to do so, you may not assign (or grant a sub-license of) your rights to use the Service, grant a security interest in or over your rights to use the Service, or otherwise transfer any part of your rights to use the Service.
-
-10. Your code
-
-10.1 Google claims no ownership or control over any source code written by you to be used with the Service. You retain copyright and any other rights you already hold in this code, and you are responsible for protecting those rights, as appropriate.
-
-11. Ending your relationship with Google
-
-11.1 The Terms will continue to apply until terminated by either you or Google as set out below.
-
-11.2 You may terminate your legal agreement with Google by discontinuing your use of the Service at any time.
-
-11.3 Google may, at any time, terminate its legal agreement with you if:
-
-  (A) you have breached any provision of the Terms (or have acted in manner which clearly shows that you do not intend to, or are unable to comply with the provisions of the Terms); or
-
-  (B) Google is required to do so by law (for example, where the provision of the Service to you is, or becomes, unlawful); or
-
-  (C) Google is transitioning to no longer providing the Service; or
-
-  (D) your Application fails to meet the documentation guidelines provided by Google.
-
-11.4 Nothing in this Section shall affect Google's rights regarding provision of the Service under Section 3 of the Terms.
-
-11.5 When these Terms come to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the Terms have been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of Sections 12, 13 and Paragraph 16 shall continue to apply to such rights, obligations and liabilities indefinitely.
-
-12. EXCLUSION OF WARRANTIES
-
-12.1 NOTHING IN THESE TERMS, INCLUDING SECTIONS 12 AND 13, SHALL EXCLUDE OR LIMIT GOOGLE'S WARRANTY OR LIABILITY FOR LOSSES WHICH MAY NOT BE LAWFULLY EXCLUDED OR LIMITED BY APPLICABLE LAW. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR CONDITIONS OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR LOSS OR DAMAGE CAUSED BY NEGLIGENCE, BREACH OF CONTRACT OR BREACH OF IMPLIED TERMS, OR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, ONLY THE LIMITATIONS WHICH ARE LAWFUL IN YOUR JURISDICTION WILL APPLY TO YOU AND OUR LIABILITY WILL BE LIMITED TO THE MAXIMUM EXTENT PERMITTED BY LAW.
-
-12.2 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SERVICE IS AT YOUR SOLE RISK AND THAT THE SERVICE AND CONTENT ARE PROVIDED "AS IS" AND "AS AVAILABLE".
-
-12.3 IN PARTICULAR, GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS DO NOT REPRESENT OR WARRANT TO YOU THAT:
-
-  (A) YOUR USE OF THE SERVICE WILL MEET YOUR REQUIREMENTS,
-
-  (B) YOUR USE OF THE SERVICE WILL BE UNINTERRUPTED, TIMELY, SECURE OR FREE FROM ERROR, AND
-
-  (C) THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE PROVIDED TO YOU AS PART OF THE SERVICE WILL BE CORRECTED.
-
-12.4 NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY YOU FROM GOOGLE OR THROUGH OR FROM THE SERVICE SHALL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN THE TERMS.
-
-12.5 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-13. LIMITATION OF LIABILITY
-
-13.1 SUBJECT TO OVERALL PROVISION IN PARAGRAPH 12.1 ABOVE, YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU FOR:
-
-  (A) ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES WHICH MAY BE INCURRED BY YOU, HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY. THIS SHALL INCLUDE, BUT NOT BE LIMITED TO, ANY LOSS OF PROFIT (WHETHER INCURRED DIRECTLY OR INDIRECTLY), ANY LOSS OF GOODWILL OR BUSINESS REPUTATION, ANY LOSS OF DATA SUFFERED, COST OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICE, OR OTHER INTANGIBLE LOSS;
-
-  (B) ANY LOSS OR DAMAGE WHICH MAY BE INCURRED BY YOU, INCLUDING BUT NOT LIMITED TO LOSS OR DAMAGE AS A RESULT OF:
-
-    (I) ANY CHANGES WHICH GOOGLE MAY MAKE TO THE SERVICE, OR FOR ANY PERMANENT OR TEMPORARY CESSATION IN THE PROVISION OF THE SERVICE (OR ANY FEATURES WITHIN THE SERVICE);
-
-    (II) THE DELETION OF, CORRUPTION OF, OR FAILURE TO STORE, ANY CONTENT AND OTHER COMMUNICATIONS DATA MAINTAINED OR TRANSMITTED BY OR THROUGH YOUR USE OF THE SERVICE;
-
-    (III) YOUR FAILURE TO PROVIDE GOOGLE WITH ACCURATE ACCOUNT INFORMATION; OR
-
-    (IV) YOUR FAILURE TO KEEP YOUR PASSWORD OR ACCOUNT DETAILS SECURE AND CONFIDENTIAL.
-
-13.2 THE LIMITATIONS ON GOOGLE'S LIABILITY TO YOU IN PARAGRAPH 13.1 ABOVE SHALL APPLY WHETHER OR NOT GOOGLE HAS BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-14. Indemnification
-
-14.1 You agree to hold harmless and indemnify Google, and its subsidiaries, affiliates, officers, agents, employees, or licensors from and against any third party claim arising from or in any way related to (a) your breach of the Terms, (b) your use of the Service, or (c) your violation of applicable laws, rules or regulations in connection with the Service, including any liability or expense arising from all claims, losses, damages (actual and consequential), suits, judgments, litigation costs and attorneys' fees, of every kind and nature. In such a case, Google will provide you with written notice of such claim, suit or action.
-
-15. Changes to the Terms
-
-15.1 Due to things like changes to the law or changes to functionality offered through the Service, Google may need to change these Terms from time to time. You should look at the Terms regularly. We'll post notice of the modified Terms within, or through, the Service. Once the modified Terms are posted, the changes will become effective immediately, and you are deemed to have accepted the modified Terms if you continue to use the Service. If you do not agree to the modified Terms for the Service, please stop using the Service.
-
-16. General legal terms
-
-16.1 The Terms constitute the whole legal agreement between you and Google and govern your use of the Service (but excluding any service which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Service.
-
-16.2 You agree that Google may provide you with notices, including those regarding changes to the Terms, by email, regular mail, or postings on the Service.
-
-16.3 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the Terms (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
-
-16.4 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of these Terms is invalid, then that provision will be removed from the Terms without affecting the rest of the Terms. The remaining provisions of the Terms will continue to be valid and enforceable.
-
-16.5 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the Terms and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the Terms which confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the Terms.
-
-16.6 The Terms, and your relationship with Google under the Terms, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the Terms. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
--- a/README.md
+++ b/README.md
@@ -1,91 +0,0 @@
-# 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/screen.jpg" width="220">
-
-### Features
-
- - Create database files / entries and groups.
- - Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm.
- - **Compatible** with the majority of alternative programs (KeePass, KeePassX, KeePassXC, …).
- - Allows opening and **copying URI / URL fields quickly**.
- - **Biometric recognition** for fast unlocking *(fingerprint / face unlock / …)*.
- - **One-Time Password** management *(HOTP / TOTP)* for Two-factor authentication (2FA).
- - Material design with **themes**.
- - **Auto-Fill** and Integration.
- - Field filling **keyboard**.
- - **History** of each entry.
- - Precise management of **settings**.
- - Code written in **native languages** *(Kotlin / Java / JNI / C)*.
-
-KeepassDX is **open source** and **ad-free**.
-
-## What is KeePassDX?
-
-An alternative to remembering an endless list of passwords manually. This is made more difficult by **using different passwords for each account**. If you use one password everywhere and security fails only one of those places, it grants access to your e-mail account, website, etc, and you may not know about it or notice, before bad things happen.
-
-KeePassDX is a **password manager for Android**, which helps you **manage your passwords in a secure way**. You can put all your passwords in one database, locked with a **master key** and/or a **keyfile**. You **only have to remember one single master password and/or select the keyfile** to unlock the whole database. The databases are encrypted using the best and **most secure encryption algorithms** currently known.
-
-## Small print?
-
-KeePassDX is under **open source GPL3 license**, meaning you can use, study, change and share it at will. Copyleft ensures it stays that way.
-From the full source, anyone can build, fork, and check whether for example the encryption algorithms are implemented correctly.
-There is **no advertising**.
-
-Do not worry, **the main features remain completely free**.
-
-Optional visual styles are accessible after a contribution (and a congratulatory message (Ո‿Ո) ) or the purchase of an extended version to encourage contribution to the work of open source projects!
-*If you contribute to the project and do not have access to the styles, do not hesitate to contact the author at [contact@kunzisoft.com](contact@kunzisoft.com).*
-
-## Contributions
-
-* Add features by making a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
-* Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** KeePassDX to your language (on [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or by sending a [pull request](https://help.github.com/articles/about-pull-requests/)).
-* **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
-* Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePassDX.
-
-## Download
-
-*[F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/) is the recommended way of installing, a libre software project that verifies that all the libraries and app code is libre software.*
-
-[<img src="https://f-droid.org/badge/get-it-on.png"
-      alt="Get it on F-Droid"
-      height="80">](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/)
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-      alt="Get it on Google Play"
-	height="80">](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free)
-	
-## Frequently Asked Questions
-
-Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/wiki/FAQ) 
-	
-## Other devices
-
- [KeePass](https://keepass.info/) (https://keepass.info/) is the original and official project for the desktop, with technical documentation for standardized database files. It is updated regularly with active maintenance (written in C#).
-
- [KeePassXC](https://keepassxc.org/) (https://keepassxc.org/) is an alternative integration of KeePass written in C++.
-
- [KeeWeb](https://keeweb.info/) (https://keeweb.info/) is a web version that is also compatible with KeePass files.
-
-## License
-
-  Copyright © 2020 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
-
-  This file is part of KeePassDX.
-
-  [KeePassDX](https://www.keepassdx.com) 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/>.
-  
-  *This project is a fork of [KeepassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -0,0 +1,84 @@
+# Android Keepass DX
+
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> Keepass DX is a **multi-format KeePass manager for Android devices**. The application allows to create 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">
+
+### Features
+
+ * Create database files / entries and groups
+ * Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm
+ * **Compatible** with the majority of alternative programs (KeePass, KeePassX, KeePass XC...)
+ * Allows **fast copy** of fields and opening of URI / URL
+ * **Fingerprint** for fast unlocking
+ * Material design with **themes**
+ * **AutoFill** and Integration
+ * Field filling **keyboard**
+ * Precise management of **settings**
+ * Code written in **native language** *(Kotlin / Java / JNI / C)*
+
+Keepass DX is **open source** and **ad-free**. 
+
+## What is KeePass DX?
+
+Today you need to remember many passwords. You need a password for your e-mail account, your website's FTP password, online passwords (like website member account), etc. etc. etc. The list is endless. Also, you **should use different passwords for each account**. Because if you use only one password everywhere and someone gets this password you have a problem... A serious problem. The thief would have access to your e-mail account, website, etc. Unimaginable.
+
+KeePass DX is a **free open source password manager for Android**, which helps you to **manage your passwords in a secure way**. You can put all your passwords in one database, which is locked with one **master key** or a **key file**. So you **only have to remember one single master password or select the key file** to unlock the whole database. The databases are encrypted using the best and **most secure encryption algorithms** currently known.
+
+## Is it really free?
+
+Yes, KeePass DX is under **free license (OSI certified)** and **without advertising**. You can have a look at its full source and check whether the encryption algorithms are implemented correctly.
+
+*Note : If you access the application from a store, visual features may not be available to incentivize the contribution to the work of open source projects. These optional visuals are accessible after a donation (and a small congratulation message :) or the purchase of an extended version, but do not worry, the main features remain completely free. If you contribute to the project and you do not have access to the themes, do not hesitate to contact me at [contact@kunzisoft.com](contact@kunzisoft.com), I will give you the procedure.*
+
+## Contributions
+
+You can contribute in different ways to help us on our work.
+
+* Add features by a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
+* Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** into your language (By using [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or with a manual [pull request](https://help.github.com/articles/about-pull-requests/))
+* **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
+* Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePass DX
+
+## Download
+
+*We recommend the installation from [F-Droid](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/) which verifies that all libraries and application code are open source.*
+
+[<img src="https://f-droid.org/badge/get-it-on.png"
+      alt="Get it on F-Droid"
+      height="80">](https://f-droid.org/en/packages/com.kunzisoft.keepass.libre/)
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Get it on Google Play"
+	height="80">](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free)
+	
+## F.A.Q.
+
+Other questions? You can read the [F.A.Q.](https://www.keepassdx.com/FAQ) 
+	
+## Other devices
+
+- [KeePass XC](https://keepassxc.org/) (https://keepassxc.org/) works with **GNU/Linux**, **Mac** and **Windows**, is updated regularly and under the terms of the GNU General Public License. This is the recommended version for computers.
+
+- [KeePass](https://keepass.info/) (https://keepass.info/) is the historical project, with good technical documentation for standardized database files but only running on **Windows**.
+
+## License
+
+ Copyright (c) 2019 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
+
+ This file is part of KeePass DX.
+
+  [KeePass DX](https://www.keepassdx.com) 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.
+
+  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+  
+  *This project is a fork of [KeepassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*
--- a/_config.yml
+++ b/_config.yml
@@ -1 +0,0 @@
-theme: jekyll-theme-cayman
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,29 +4,22 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'

 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+    ndkVersion "20.0.5594570"

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
        minSdkVersion 14
-        targetSdkVersion 29
-        versionCode = 43
-        versionName = "2.8.7"
+        targetSdkVersion 28
+        versionCode = 24
+        versionName = "2.5.0.0beta24"
        multiDexEnabled true

        testApplicationId = "com.kunzisoft.keepass.tests"
        testInstrumentationRunner = "android.test.InstrumentationTestRunner"

        buildConfigField "String[]", "ICON_PACKS", "{\"classic\",\"material\"}"
-        manifestPlaceholders = [ googleAndroidBackupAPIKey:"" ]
-
-        kapt {
-            arguments {
-                arg("room.incremental", "true")
-                arg("room.schemaLocation", "$projectDir/schemas".toString())
-            }
-        }
    }

    externalNativeBuild {
@@ -35,6 +28,7 @@ android {
        }
    }

+
    buildTypes {
        release {
            minifyEnabled = false
@@ -42,36 +36,35 @@ android {
        }
    }

-    flavorDimensions "version"
+    dexOptions {
+    }
+
+    flavorDimensions "tier"
    productFlavors {
        libre {
-            dimension "version"
            applicationIdSuffix = ".libre"
            buildConfigField "String", "BUILD_VERSION", "\"libre\""
            buildConfigField "boolean", "FULL_VERSION", "true"
            buildConfigField "boolean", "CLOSED_STORE", "false"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
+
        }
        pro {
-            dimension "version"
            applicationIdSuffix = ".pro"
            buildConfigField "String", "BUILD_VERSION", "\"pro\""
            buildConfigField "boolean", "FULL_VERSION", "true"
            buildConfigField "boolean", "CLOSED_STORE", "true"
            buildConfigField "String[]", "STYLES_DISABLED", "{}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
-            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIZiXvrQCzSV9LNI6-p7cjTKENZLHIrz_zaqZuQQ" ]
        }
        free {
-            dimension "version"
            applicationIdSuffix = ".free"
            buildConfigField "String", "BUILD_VERSION", "\"free\""
            buildConfigField "boolean", "FULL_VERSION", "false"
            buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
-            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
        }
    }

@@ -85,47 +78,38 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
        sourceCompatibility JavaVersion.VERSION_1_8
    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }

-def room_version = "2.2.5"
+def spongycastleVersion = "1.58.0.0"
+def room_version = "2.2.0"

 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 "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
    implementation 'androidx.cardview:cardview:1.0.0'
-    // WARNING: Bug with extra field
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.0.1'
-    // Lifecycle - LiveData - ViewModel - Coroutines
-    implementation "androidx.core:core-ktx:1.3.1"
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
-    // WARNING: To upgrade with style, bug in edit text
+    implementation 'androidx.biometric:biometric:1.0.0-rc01'
    implementation 'com.google.android.material:material:1.0.0'
-    // Database
+
    implementation "androidx.room:room-runtime:$room_version"
    kapt "androidx.room:room-compiler:$room_version"
-    // Crypto
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.65.01'
+
+    implementation "com.madgag.spongycastle:core:$spongycastleVersion"
+    implementation "com.madgag.spongycastle:prov:$spongycastleVersion"
    // Time
-    implementation 'joda-time:joda-time:2.10.6'
+    implementation 'joda-time:joda-time:2.9.9'
    // Color
    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.3'
    // Education
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
    // Apache Commons Collections
-    implementation 'commons-collections:commons-collections:3.2.2'
-    // Apache Commons Codec
-    implementation 'commons-codec:commons-codec:1.14'
+    implementation 'commons-collections:commons-collections:3.2.1'
+    implementation 'org.apache.commons:commons-io:1.3.2'
+    // Base64
+    implementation 'biz.source_code:base64coder:2010-12-19'
    // Icon pack
    implementation project(path: ':icon-pack-classic')
    implementation project(path: ':icon-pack-material')
-
-    // Tests
-    androidTestImplementation 'junit:junit:4.13'
 }
--- a/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/1.json
+++ b/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/1.json
@@ -1,84 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 1,
-    "identityHash": "56438e5f7372ef3e36e33b782aed245d",
-    "entities": [
-      {
-        "tableName": "file_database_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `database_alias` TEXT NOT NULL, `keyfile_uri` TEXT, `updated` INTEGER NOT NULL, PRIMARY KEY(`database_uri`))",
-        "fields": [
-          {
-            "fieldPath": "databaseUri",
-            "columnName": "database_uri",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "databaseAlias",
-            "columnName": "database_alias",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyFileUri",
-            "columnName": "keyfile_uri",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updated",
-            "columnName": "updated",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "database_uri"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "cipher_database",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `encrypted_value` TEXT NOT NULL, `specs_parameters` TEXT NOT NULL, PRIMARY KEY(`database_uri`))",
-        "fields": [
-          {
-            "fieldPath": "databaseUri",
-            "columnName": "database_uri",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "encryptedValue",
-            "columnName": "encrypted_value",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "specParameters",
-            "columnName": "specs_parameters",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "database_uri"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '56438e5f7372ef3e36e33b782aed245d')"
-    ]
-  }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.tests
+
+import junit.framework.TestCase
+
+import com.kunzisoft.keepass.database.element.PwDate
+import org.junit.Assert
+
+class PwDateTest : TestCase() {
+
+    fun testDate() {
+        val jDate = PwDate(System.currentTimeMillis())
+        val intermediate = PwDate(jDate)
+        val cDate = PwDate(intermediate.byteArrayDate!!, 0)
+
+        Assert.assertTrue("jDate and intermediate not equal", jDate == intermediate)
+        Assert.assertTrue("jDate and cDate not equal", cDate == jDate)
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
@@ -1,45 +1,49 @@
 /*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package com.kunzisoft.keepass.tests.utils
+package com.kunzisoft.keepass.tests

-import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.stream.*
-import com.kunzisoft.keepass.utils.UnsignedInt
-import com.kunzisoft.keepass.utils.UnsignedLong
-import junit.framework.TestCase
 import org.junit.Assert.assertArrayEquals
-import java.io.ByteArrayOutputStream
-import java.util.*

-class ValuesTest : TestCase() {
+import java.io.ByteArrayOutputStream
+import java.util.Calendar
+import java.util.Random
+
+import junit.framework.TestCase
+
+import com.kunzisoft.keepass.database.element.PwDate
+import com.kunzisoft.keepass.stream.LEDataInputStream
+import com.kunzisoft.keepass.stream.LEDataOutputStream
+import com.kunzisoft.keepass.utils.Types
+
+class TypesTest : TestCase() {

    fun testReadWriteLongZero() {
        testReadWriteLong(0.toByte())
    }

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

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

    fun testReadWriteLongRnd() {
@@ -52,9 +56,15 @@ class ValuesTest : TestCase() {

    private fun testReadWriteLong(value: Byte) {
        val orig = ByteArray(8)
-        setArray(orig, value, 8)
+        val dest = ByteArray(8)
+
+        setArray(orig, value, 0, 8)
+
+        val one = LEDataInputStream.readLong(orig, 0)
+        LEDataOutputStream.writeLong(one, dest, 0)
+
+        assertArrayEquals(orig, dest)

-        assertArrayEquals(orig, longTo8Bytes(bytes64ToLong(orig)))
    }

    fun testReadWriteIntZero() {
@@ -62,30 +72,33 @@ class ValuesTest : TestCase() {
    }

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

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

    private fun testReadWriteInt(value: Byte) {
        val orig = ByteArray(4)
+        val dest = ByteArray(4)

        for (i in 0..3) {
            orig[i] = 0
        }

-        setArray(orig, value, 4)
+        setArray(orig, value, 0, 4)

-        val one = bytes4ToUInt(orig)
-        val dest = uIntTo4Bytes(one)
+        val one = LEDataInputStream.readInt(orig, 0)
+
+        LEDataOutputStream.writeInt(one, dest, 0)

        assertArrayEquals(orig, dest)
+
    }

-    private fun setArray(buf: ByteArray, value: Byte, size: Int) {
-        for (i in 0 until size) {
+    private fun setArray(buf: ByteArray, value: Byte, offset: Int, size: Int) {
+        for (i in offset until offset + size) {
            buf[i] = value
        }
    }
@@ -96,28 +109,32 @@ class ValuesTest : TestCase() {
        orig[0] = 0
        orig[1] = 1

-        val one = bytes2ToUShort(orig)
-        val dest = uShortTo2Bytes(one)
+        val one = LEDataInputStream.readUShort(orig, 0)
+        val dest = LEDataOutputStream.writeUShortBuf(one)

        assertArrayEquals(orig, dest)
+
    }

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

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

    private fun testReadWriteShort(value: Byte) {
        val orig = ByteArray(2)
-        setArray(orig, value, 2)
+        val dest = ByteArray(2)

-        val one = bytes2ToUShort(orig)
-        val dest = uShortTo2Bytes(one)
+        setArray(orig, value, 0, 2)
+
+        val one = LEDataInputStream.readUShort(orig, 0)
+        LEDataOutputStream.writeUShort(one, dest, 0)

        assertArrayEquals(orig, dest)
+
    }

    fun testReadWriteByteZero() {
@@ -125,16 +142,24 @@ class ValuesTest : TestCase() {
    }

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

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

    private fun testReadWriteByte(value: Byte) {
-        val dest: Byte = UnsignedInt(UnsignedInt.fromKotlinByte(value)).toKotlinByte()
-        assert(value == dest)
+        val orig = ByteArray(1)
+        val dest = ByteArray(1)
+
+        setArray(orig, value, 0, 1)
+
+        val one = Types.readUByte(orig, 0)
+        Types.writeUByte(one, dest, 0)
+
+        assertArrayEquals(orig, dest)
+
    }

    fun testDate() {
@@ -143,37 +168,27 @@ class ValuesTest : TestCase() {
        val expected = Calendar.getInstance()
        expected.set(2008, 1, 2, 3, 4, 5)

+        val buf = PwDate.writeTime(expected.time, cal)
        val actual = Calendar.getInstance()
-        dateTo5Bytes(expected.time, cal)?.let { buf ->
-            actual.time = bytes5ToDate(buf, cal).date
-        }
-
-        val jDate = DateInstant(System.currentTimeMillis())
-        val intermediate = DateInstant(jDate)
-        val cDate = bytes5ToDate(dateTo5Bytes(intermediate.date)!!)
+        actual.time = PwDate.readTime(buf, 0, cal)

        assertEquals("Year mismatch: ", 2008, actual.get(Calendar.YEAR))
        assertEquals("Month mismatch: ", 1, actual.get(Calendar.MONTH))
-        assertEquals("Day mismatch: ", 2, actual.get(Calendar.DAY_OF_MONTH))
+        assertEquals("Day mismatch: ", 1, actual.get(Calendar.DAY_OF_MONTH))
        assertEquals("Hour mismatch: ", 3, actual.get(Calendar.HOUR_OF_DAY))
        assertEquals("Minute mismatch: ", 4, actual.get(Calendar.MINUTE))
        assertEquals("Second mismatch: ", 5, actual.get(Calendar.SECOND))
-        assertTrue("jDate and intermediate not equal", jDate == intermediate)
-        assertTrue("jDate $jDate and cDate $cDate not equal", cDate == jDate)
    }

    fun testUUID() {
+        val rnd = Random()
        val bUUID = ByteArray(16)
-        Random().nextBytes(bUUID)
+        rnd.nextBytes(bUUID)

-        val uuid = bytes16ToUuid(bUUID)
-        val eUUID = uuidTo16Bytes(uuid)
-
-        val lUUID = bytes16ToUuid(bUUID)
-        val leUUID = uuidTo16Bytes(lUUID)
+        val uuid = Types.bytestoUUID(bUUID)
+        val eUUID = Types.UUIDtoBytes(uuid)

        assertArrayEquals("UUID match failed", bUUID, eUUID)
-        assertArrayEquals("UUID match failed", bUUID, leUUID)
    }

    @Throws(Exception::class)
@@ -184,8 +199,8 @@ class ValuesTest : TestCase() {
        }

        val bos = ByteArrayOutputStream()
-        val leos = LittleEndianDataOutputStream(bos)
-        leos.writeLong(UnsignedLong.MAX_VALUE)
+        val leos = LEDataOutputStream(bos)
+        leos.writeLong(Types.ULONG_MAX_VALUE)
        leos.close()

        val uLongMax = bos.toByteArray()
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- * KeePassDX is free software: you can redistribute it and/or modify
+ * KeePass DX 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,
+ * KeePass DX 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/>.
+ * along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.tests.crypto
@@ -80,4 +80,6 @@ class AESTest : TestCase() {

        assertArrayEquals("Arrays differ on size: $dataSize", outAndroid, outNative)
    }
+
+
 }
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- * KeePassDX is free software: you can redistribute it and/or modify
+ * KeePass DX 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,
+ * KeePass DX 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/>.
+ * along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.tests.crypto
@@ -39,8 +39,9 @@ import junit.framework.TestCase

 import com.kunzisoft.keepass.crypto.CipherFactory
 import com.kunzisoft.keepass.crypto.engine.AesEngine
+import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.stream.BetterCipherInputStream
-import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
+import com.kunzisoft.keepass.stream.LEDataInputStream

 class CipherTest : TestCase() {
    private val rand = Random()
@@ -92,7 +93,7 @@ class CipherTest : TestCase() {

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

        val decrypttext = lis.readBytes(MESSAGE_LENGTH)

--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- * KeePassDX is free software: you can redistribute it and/or modify
+ * KeePass DX 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,
+ * KeePass DX 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/>.
+ * along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.tests.crypto
@@ -26,11 +26,11 @@ import java.util.Random

 import junit.framework.TestCase

-import com.kunzisoft.keepass.crypto.finalkey.AndroidAESKeyTransformer
-import com.kunzisoft.keepass.crypto.finalkey.NativeAESKeyTransformer
+import com.kunzisoft.keepass.crypto.finalkey.AndroidFinalKey
+import com.kunzisoft.keepass.crypto.finalkey.NativeFinalKey

-class AESKeyTest : TestCase() {
-    private lateinit var mRand: Random
+class FinalKeyTest : TestCase() {
+    private var mRand: Random? = null

    @Throws(Exception::class)
    override fun setUp() {
@@ -40,28 +40,29 @@ class AESKeyTest : TestCase() {
    }

    @Throws(IOException::class)
-    fun testAES() {
+    fun testNativeAndroid() {
        // Test both an old and an even number to test my flip variable
-        testAESFinalKey(5)
-        testAESFinalKey(6)
+        testNativeFinalKey(5)
+        testNativeFinalKey(6)
    }

    @Throws(IOException::class)
-    private fun testAESFinalKey(rounds: Long) {
+    private fun testNativeFinalKey(rounds: Int) {
        val seed = ByteArray(32)
        val key = ByteArray(32)
-        val nativeKey: ByteArray?
-        val androidKey: ByteArray?
+        val nativeKey: ByteArray
+        val androidKey: ByteArray

-        mRand.nextBytes(seed)
-        mRand.nextBytes(key)
+        mRand!!.nextBytes(seed)
+        mRand!!.nextBytes(key)

-        val androidAESKey = AndroidAESKeyTransformer()
-        androidKey = androidAESKey.transformMasterKey(seed, key, rounds)
+        val aKey = AndroidFinalKey()
+        androidKey = aKey.transformMasterKey(seed, key, rounds.toLong())

-        val nativeAESKey = NativeAESKeyTransformer()
-        nativeKey = nativeAESKey.transformMasterKey(seed, key, rounds)
+        val nKey = NativeFinalKey()
+        nativeKey = nKey.transformMasterKey(seed, key, rounds.toLong())

        assertArrayEquals("Does not match", androidKey, nativeKey)
+
    }
 }
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlockTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlockTest.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- * KeePassDX is free software: you can redistribute it and/or modify
+ * KeePass DX 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,
+ * KeePass DX 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/>.
+ * along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.tests.stream
@@ -33,7 +33,7 @@ import junit.framework.TestCase
 import com.kunzisoft.keepass.stream.HashedBlockInputStream
 import com.kunzisoft.keepass.stream.HashedBlockOutputStream

-class HashedBlockTest : TestCase() {
+class HashedBlock : TestCase() {

    @Throws(IOException::class)
    fun testBlockAligned() {
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StringUtilTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StringUtilTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.tests.utils
+
+import java.util.Locale
+
+import com.kunzisoft.keepass.utils.StringUtil
+
+import junit.framework.TestCase
+
+class StringUtilTest : TestCase() {
+    private val text = "AbCdEfGhIj"
+    private val search = "BcDe"
+    private val badSearch = "Ed"
+
+    private val repText = "AbCtestingaBc"
+    private val repSearch = "ABc"
+    private val repSearchBad = "CCCCCC"
+    private val repNew = "12345"
+    private val repResult = "12345testing12345"
+
+    fun testIndexOfIgnoreCase1() {
+        assertEquals(1, StringUtil.indexOfIgnoreCase(text, search, Locale.ENGLISH))
+    }
+
+    fun testIndexOfIgnoreCase2() {
+        assertEquals(-1f, StringUtil.indexOfIgnoreCase(text, search, Locale.ENGLISH).toFloat(), 2f)
+    }
+
+    fun testIndexOfIgnoreCase3() {
+        assertEquals(-1, StringUtil.indexOfIgnoreCase(text, badSearch, Locale.ENGLISH))
+    }
+
+    fun testReplaceAllIgnoresCase1() {
+        assertEquals(repResult, StringUtil.replaceAllIgnoresCase(repText, repSearch, repNew, Locale.ENGLISH))
+    }
+
+    fun testReplaceAllIgnoresCase2() {
+        assertEquals(repText, StringUtil.replaceAllIgnoresCase(repText, repSearchBad, repNew, Locale.ENGLISH))
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/UnsignedIntTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/UnsignedIntTest.kt
@@ -1,28 +0,0 @@
-package com.kunzisoft.keepass.tests.utils
-
-import com.kunzisoft.keepass.utils.UnsignedInt
-import junit.framework.TestCase
-
-class UnsignedIntTest: TestCase() {
-
-    fun testUInt() {
-        val standardInt = UnsignedInt(15).toKotlinInt()
-        assertEquals(15, standardInt)
-        val unsignedInt = UnsignedInt(-1).toKotlinLong()
-        assertEquals(4294967295L, unsignedInt)
-    }
-
-    fun testMaxValue() {
-        val maxValue = UnsignedInt.MAX_VALUE.toKotlinLong()
-        assertEquals(4294967295L, maxValue)
-        val longValue = UnsignedInt.fromKotlinLong(4294967295L).toKotlinLong()
-        assertEquals(longValue, maxValue)
-    }
-
-    fun testLong() {
-        val longValue = UnsignedInt.fromKotlinLong(50L).toKotlinInt()
-        assertEquals(50, longValue)
-        val uIntLongValue = UnsignedInt.fromKotlinLong(4294967290).toKotlinLong()
-        assertEquals(4294967290, uIntLongValue)
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
    package="com.kunzisoft.keepass"
    android:installLocation="auto">
    <supports-screens
@@ -8,14 +7,10 @@
      android:normalScreens="true"
      android:largeScreens="true"
      android:anyDensity="true" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission
-        android:name="android.permission.VIBRATE"/>
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>

    <application
        android:label="@string/app_name"
@@ -23,15 +18,14 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:name="com.kunzisoft.keepass.app.App"
        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
+        android:fullBackupContent="@xml/backup"
        android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
-        android:largeHeap="true"
-        android:resizeableActivity="true"
-        android:theme="@style/KeepassDXStyle.Night"
-        tools:targetApi="n">
+        android:theme="@style/KeepassDXStyle.Night">
+        <!-- TODO backup API Key -->
        <meta-data
            android:name="com.google.android.backup.api_key"
-            android:value="${googleAndroidBackupAPIKey}" />
+            android:value="" />
+
        <activity
            android:name="com.kunzisoft.keepass.activities.FileDatabaseSelectActivity"
            android:theme="@style/KeepassDXStyle.SplashScreen"
@@ -124,50 +118,34 @@
            android:configChanges="keyboardHidden" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
+            android:configChanges="keyboardHidden"
+            android:windowSoftInputMode="adjustResize" />
        <!-- About and Settings -->
        <activity
            android:name="com.kunzisoft.keepass.activities.AboutActivity"
            android:launchMode="singleTask"
-            android:label="@string/about" />
-        <activity
-            android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
-        <activity
-            android:name="com.kunzisoft.keepass.activities.AutofillLauncherActivity"
-            android:theme="@style/Theme.Transparent"
+            android:label="@string/menu_about" />
+        <activity android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
+        <activity android:name="com.kunzisoft.keepass.autofill.AutofillLauncherActivity"
            android:configChanges="keyboardHidden" />
-        <activity
-            android:name="com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity" />
-        <activity
-            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
-        <activity
-            android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
-            android:theme="@style/Theme.Transparent">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
+        <activity android:name="com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity" />
+        <activity android:name="com.kunzisoft.keepass.settings.SettingsAutofillActivity" />
+        <activity android:name="com.kunzisoft.keepass.magikeyboard.KeyboardLauncherActivity"
+            android:label="@string/keyboard_name"
+            android:exported="true">
        </activity>
-        <activity
-            android:name="com.kunzisoft.keepass.activities.MagikeyboardLauncherActivity"
-            android:theme="@style/Theme.Transparent" />
-        <activity
-            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
+        <activity android:name="com.kunzisoft.keepass.settings.MagikIMESettings"
            android:label="@string/keyboard_setting_label">
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
            </intent-filter>
        </activity>

+
        <service
            android:name="com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService"
            android:enabled="true"
            android:exported="false" />
-        <service
-            android:name=".notifications.AttachmentFileNotificationService"
-            android:enabled="true"
-            android:exported="false" />
        <service
            android:name="com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService"
            android:enabled="true"
--- a/app/src/main/assets/fonts/FiraMono-Regular.ttf
+++ b/app/src/main/assets/fonts/FiraMono-Regular.ttf
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
@@ -1,35 +1,35 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities

 import android.content.pm.PackageManager.NameNotFoundException
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
+import androidx.appcompat.widget.Toolbar
 import android.util.Log
 import android.view.MenuItem
 import android.widget.TextView
-import androidx.appcompat.widget.Toolbar
-import androidx.core.text.HtmlCompat
+
 import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
+
 import org.joda.time.DateTime

 class AboutActivity : StylishActivity() {
@@ -40,7 +40,7 @@ class AboutActivity : StylishActivity() {
        setContentView(R.layout.activity_about)

        val toolbar = findViewById<Toolbar>(R.id.toolbar)
-        toolbar.title = getString(R.string.about)
+        toolbar.title = getString(R.string.menu_about)
        setSupportActionBar(toolbar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -64,17 +64,9 @@ class AboutActivity : StylishActivity() {
        val buildTextView = findViewById<TextView>(R.id.activity_about_build)
        buildTextView.text = build

-        findViewById<TextView>(R.id.activity_about_licence_text).apply {
-            movementMethod = LinkMovementMethod.getInstance()
-            text = HtmlCompat.fromHtml(getString(R.string.html_about_licence, DateTime().year),
-                    HtmlCompat.FROM_HTML_MODE_LEGACY)
-        }

-        findViewById<TextView>(R.id.activity_about_contribution_text).apply {
-            movementMethod = LinkMovementMethod.getInstance()
-            text = HtmlCompat.fromHtml(getString(R.string.html_about_contribution),
-                    HtmlCompat.FROM_HTML_MODE_LEGACY)
-        }
+        val disclaimerText = findViewById<TextView>(R.id.disclaimer)
+        disclaimerText.text = getString(R.string.disclaimer_formal, DateTime().year)
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
@@ -1,117 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities
-
-import android.app.Activity
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.IntentSender
-import android.os.Build
-import android.os.Bundle
-import android.widget.Toast
-import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.autofill.AutofillHelper
-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.SearchInfo
-import com.kunzisoft.keepass.settings.PreferencesUtil
-
-@RequiresApi(api = Build.VERSION_CODES.O)
-class AutofillLauncherActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-
-        // Build search param
-        val searchInfo = SearchInfo().apply {
-            applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
-            webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
-        }
-
-        // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
-        val assistStructure = AutofillHelper.retrieveAssistStructure(intent)
-
-        if (assistStructure == null) {
-            setResult(Activity.RESULT_CANCELED)
-            finish()
-        } else if (!KeeAutofillService.searchAllowedFor(searchInfo.applicationId,
-                        PreferencesUtil.applicationIdBlocklist(this))
-                || !KeeAutofillService.searchAllowedFor(searchInfo.webDomain,
-                        PreferencesUtil.webDomainBlocklist(this))) {
-            // If item not allowed, show a toast
-            Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
-            setResult(Activity.RESULT_CANCELED)
-            finish()
-        } else {
-            // If database is open
-            SearchHelper.checkAutoSearchInfo(this,
-                    Database.getInstance(),
-                    searchInfo,
-                    { items ->
-                        // Items found
-                        AutofillHelper.buildResponse(this, items)
-                        finish()
-                    },
-                    {
-                        // Show the database UI to select the entry
-                        GroupActivity.launchForAutofillResult(this,
-                                assistStructure,
-                                false,
-                                searchInfo)
-                    },
-                    {
-                        // If database not open
-                        FileDatabaseSelectActivity.launchForAutofillResult(this,
-                                assistStructure,
-                                searchInfo)
-                    }
-            )
-        }
-
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
-        super.onActivityResult(requestCode, resultCode, data)
-    }
-
-    companion object {
-
-        private const val KEY_SEARCH_APPLICATION_ID = "KEY_SEARCH_APPLICATION_ID"
-        private const val KEY_SEARCH_DOMAIN = "KEY_SEARCH_DOMAIN"
-
-        fun getAuthIntentSenderForResponse(context: Context,
-                                           searchInfo: SearchInfo? = 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)
-                        }
-                    },
-                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 */
 package com.kunzisoft.keepass.activities

@@ -22,76 +22,53 @@ import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.os.Looper
+import com.google.android.material.appbar.CollapsingToolbarLayout
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.Toolbar
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
-import android.widget.ProgressBar
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.Toolbar
-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.lock.LockingActivity
-import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.activities.lock.LockingHideActivity
 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.database.element.EntryVersioned
+import com.kunzisoft.keepass.database.element.PwNodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME
-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_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
+import com.kunzisoft.keepass.settings.SettingsAutofillActivity
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.utils.createDocument
-import com.kunzisoft.keepass.utils.onCreateDocumentResult
 import com.kunzisoft.keepass.view.EntryContentsView
-import com.kunzisoft.keepass.view.showActionError
 import java.util.*
-import kotlin.collections.HashMap

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

-    private var coordinatorLayout: CoordinatorLayout? = null
    private var collapsingToolbarLayout: CollapsingToolbarLayout? = null
    private var titleIconView: ImageView? = null
    private var historyView: View? = null
    private var entryContentsView: EntryContentsView? = null
-    private var entryProgress: ProgressBar? = null
-    private var lockView: View? = null
    private var toolbar: Toolbar? = null

    private var mDatabase: Database? = null

-    private var mEntry: Entry? = null
-
+    private var mEntry: EntryVersioned? = null
    private var mIsHistory: Boolean = false
-    private var mEntryLastVersion: Entry? = null
-    private var mEntryHistoryPosition: Int = -1

    private var mShowPassword: Boolean = false

-    private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
-    private var mAttachmentsToDownload: HashMap<Int, Attachment> = HashMap()
-
    private var clipboardHelper: ClipboardHelper? = null
-    private var mFirstLaunchOfActivity: Boolean = false
+    private var firstLaunchOfActivity: Boolean = false

    private var iconColor: Int = 0

@@ -119,65 +96,29 @@ class EntryActivity : LockingActivity() {
        invalidateOptionsMenu()

        // Get views
-        coordinatorLayout = findViewById(R.id.toolbar_coordinator)
        collapsingToolbarLayout = findViewById(R.id.toolbar_layout)
        titleIconView = findViewById(R.id.entry_icon)
        historyView = findViewById(R.id.history_container)
        entryContentsView = findViewById(R.id.entry_contents)
        entryContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
-        entryProgress = findViewById(R.id.entry_progress)
-        lockView = findViewById(R.id.lock_button)
-
-        lockView?.setOnClickListener {
-            lockAndExit()
-        }
-
-        // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)

        // Init the clipboard helper
        clipboardHelper = ClipboardHelper(this)
-        mFirstLaunchOfActivity = savedInstanceState?.getBoolean(KEY_FIRST_LAUNCH_ACTIVITY) ?: true
-
-        // Init attachment service binder manager
-        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
-
-        mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
-            when (actionTask) {
-                ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
-                ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
-                    // Close the current activity after an history action
-                    if (result.isSuccess)
-                        finish()
-                }
-            }
-            coordinatorLayout?.showActionError(result)
-        }
+        firstLaunchOfActivity = true
    }

    override fun onResume() {
        super.onResume()

-        // Show the lock button
-        lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
-            View.VISIBLE
-        } else {
-            View.GONE
-        }
-
        // Get Entry from UUID
        try {
-            val keyEntry: NodeId<UUID>? = intent.getParcelableExtra(KEY_ENTRY)
-            if (keyEntry != null) {
-                mEntry = mDatabase?.getEntryById(keyEntry)
-                mEntryLastVersion = mEntry
-            }
+            val keyEntry: PwNodeId<UUID> = intent.getParcelableExtra(KEY_ENTRY)
+            mEntry = mDatabase?.getEntryById(keyEntry)
        } catch (e: ClassCastException) {
            Log.e(TAG, "Unable to retrieve the entry key")
        }

-        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, mEntryHistoryPosition)
-        mEntryHistoryPosition = historyPosition
+        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, -1)
        if (historyPosition >= 0) {
            mIsHistory = true
            mEntry = mEntry?.getHistory()?.get(historyPosition)
@@ -201,7 +142,7 @@ class EntryActivity : LockingActivity() {
            val entryInfo = entry.getEntryInfo(Database.getInstance())

            // Manage entry copy to start notification if allowed
-            if (mFirstLaunchOfActivity) {
+            if (firstLaunchOfActivity) {
                // Manage entry to launch copying notification if allowed
                ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
                // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
@@ -211,25 +152,10 @@ class EntryActivity : LockingActivity() {
            }
        }

-        mAttachmentFileBinderManager?.apply {
-            registerProgressTask()
-            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
-                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
-                    entryContentsView?.putAttachment(entryAttachmentState)
-                }
-            }
-        }
-
-        mFirstLaunchOfActivity = false
+        firstLaunchOfActivity = false
    }

-    override fun onPause() {
-        mAttachmentFileBinderManager?.unregisterProgressTask()
-
-        super.onPause()
-    }
-
-    private fun fillEntryDataInContentsView(entry: Entry) {
+    private fun fillEntryDataInContentsView(entry: EntryVersioned) {

        val database = Database.getInstance()
        database.startManageEntry(entry)
@@ -242,13 +168,14 @@ class EntryActivity : LockingActivity() {
        toolbar?.title = entryTitle

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

        val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
                PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)
@@ -261,7 +188,7 @@ class EntryActivity : LockingActivity() {
                            "\n\n" +
                            getString(R.string.clipboard_warning))
                    .create().apply {
-                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
+                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) {dialog, _ ->
                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, true)
                            dialog.dismiss()
                            fillEntryDataInContentsView(entry)
@@ -275,54 +202,43 @@ class EntryActivity : LockingActivity() {
                    }
        }

-        val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
-            View.OnClickListener {
+        entryContentsView?.assignPassword(entry.password, allowCopyPasswordAndProtectedFields)
+        if (allowCopyPasswordAndProtectedFields) {
+            entryContentsView?.assignPasswordCopyListener(View.OnClickListener {
                database.startManageEntry(entry)
                clipboardHelper?.timeoutCopyToClipboard(entry.password,
-                        getString(R.string.copy_field,
+                                getString(R.string.copy_field,
                                getString(R.string.entry_password)))
                database.stopManageEntry(entry)
-            }
+            })
        } else {
            // If dialog not already shown
            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
-                showWarningClipboardDialogOnClickListener
+                entryContentsView?.assignPasswordCopyListener(showWarningClipboardDialogOnClickListener)
            } else {
-                null
+                entryContentsView?.assignPasswordCopyListener(null)
            }
        }
-        entryContentsView?.assignPassword(entry.password,
-                allowCopyPasswordAndProtectedFields,
-                onPasswordCopyClickListener)
-
-        //Assign OTP field
-        entryContentsView?.assignOtp(entry.getOtpElement(), entryProgress,
-                View.OnClickListener {
-                    entry.getOtpElement()?.let { otpElement ->
-                        clipboardHelper?.timeoutCopyToClipboard(
-                                otpElement.token,
-                                getString(R.string.copy_field, getString(R.string.entry_otp))
-                        )
-                    }
-        })

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

        // Assign custom fields
-        if (mDatabase?.allowEntryCustomFields() == true) {
+        if (entry.allowCustomFields()) {
            entryContentsView?.clearExtraFields()
-            entry.getExtraFields().forEach { field ->
-                val label = field.name
-                val value = field.protectedValue
+
+            for (element in entry.customFields.entries) {
+                val label = element.key
+                val value = element.value
+
                val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
                if (allowCopyProtectedField) {
-                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
+                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField, View.OnClickListener {
                        clipboardHelper?.timeoutCopyToClipboard(
                                value.toString(),
                                getString(R.string.copy_field, label)
                        )
-                    }
+                    })
                } else {
                    // If dialog not already shown
                    if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
@@ -333,16 +249,7 @@ class EntryActivity : LockingActivity() {
                }
            }
        }
-        entryContentsView?.setHiddenProtectedValue(!mShowPassword)
-
-        // Manage attachments
-        mDatabase?.binaryPool?.let { binaryPool ->
-            entryContentsView?.assignAttachments(entry.getAttachments(binaryPool).toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
-                createDocument(this, attachmentItem.name)?.let { requestCode ->
-                    mAttachmentsToDownload[requestCode] = attachmentItem
-                }
-            }
-        }
+        entryContentsView?.setHiddenPasswordStyle(!mShowPassword)

        // Assign dates
        entryContentsView?.assignCreationDate(entry.creationTime)
@@ -355,6 +262,9 @@ class EntryActivity : LockingActivity() {
            entryContentsView?.assignExpiresDate(getString(R.string.never))
        }

+        // Assign special data
+        entryContentsView?.assignUUID(entry.nodeId.id)
+
        // Manage history
        historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
        if (mIsHistory) {
@@ -362,19 +272,22 @@ class EntryActivity : LockingActivity() {
            collapsingToolbarLayout?.contentScrim = ColorDrawable(taColorAccent.getColor(0, Color.BLACK))
            taColorAccent.recycle()
        }
-        entryContentsView?.assignHistory(entry.getHistory()) { historyItem, position ->
-            launch(this, historyItem, mReadOnly, position)
+        val entryHistory = entry.getHistory()
+        // isMainEntry = not an history
+        val showHistoryView = entryHistory.isNotEmpty()
+        entryContentsView?.showHistory(showHistoryView)
+        if (showHistoryView) {
+            entryContentsView?.assignHistory(entryHistory)
+            entryContentsView?.onHistoryClick { historyItem, position ->
+                launch(this, historyItem, true, position)
+            }
        }

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

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
-
        when (requestCode) {
            EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE ->
                // Not directly get the entry from intent data but from database
@@ -382,14 +295,15 @@ class EntryActivity : LockingActivity() {
                    fillEntryDataInContentsView(it)
                }
        }
+    }

-        onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
-            if (createdFileUri != null) {
-                mAttachmentsToDownload[requestCode]?.let { attachmentToDownload ->
-                    mAttachmentFileBinderManager
-                            ?.startDownloadAttachment(createdFileUri, attachmentToDownload)
-                }
-            }
+    private fun changeShowPasswordIcon(togglePassword: MenuItem?) {
+        if (mShowPassword) {
+            togglePassword?.setTitle(R.string.menu_hide_password)
+            togglePassword?.setIcon(R.drawable.ic_visibility_off_white_24dp)
+        } else {
+            togglePassword?.setTitle(R.string.menu_showpass)
+            togglePassword?.setIcon(R.drawable.ic_visibility_white_24dp)
        }
    }

@@ -399,15 +313,21 @@ class EntryActivity : LockingActivity() {
        val inflater = menuInflater
        MenuUtil.contributionMenuInflater(inflater, menu)
        inflater.inflate(R.menu.entry, menu)
-        inflater.inflate(R.menu.database, menu)
-        if (mIsHistory && !mReadOnly) {
-            inflater.inflate(R.menu.entry_history, menu)
-        }
-        if (mIsHistory || mReadOnly) {
-            menu.findItem(R.id.menu_save_database)?.isVisible = false
+        inflater.inflate(R.menu.database_lock, menu)
+
+        if (mReadOnly) {
            menu.findItem(R.id.menu_edit)?.isVisible = false
        }

+        val togglePassword = menu.findItem(R.id.menu_toggle_pass)
+        entryContentsView?.let {
+            if (it.isPasswordPresent || it.atLeastOneFieldProtectedPresent()) {
+                changeShowPasswordIcon(togglePassword)
+            } else {
+                togglePassword?.isVisible = false
+            }
+        }
+
        val gotoUrl = menu.findItem(R.id.menu_goto_url)
        gotoUrl?.apply {
            // In API >= 11 onCreateOptionsMenu may be called before onCreate completes
@@ -423,38 +343,38 @@ class EntryActivity : LockingActivity() {
        }

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

        return true
    }

    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
                                       menu: Menu) {
-        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
-        val entryCopyEducationPerformed = entryFieldCopyView != null
+        val entryCopyEducationPerformed = entryContentsView?.isUserNamePresent == true
                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
-                        entryFieldCopyView,
+                        findViewById(R.id.entry_user_name_action_image),
                        {
-                            val appNameString = getString(R.string.app_name)
-                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
-                                    getString(R.string.copy_field, appNameString))
+                            clipboardHelper?.timeoutCopyToClipboard(mEntry!!.username,
+                                    getString(R.string.copy_field,
+                                            getString(R.string.entry_user_name)))
                        },
                        {
-                            performedNextEducation(entryActivityEducation, menu)
+                            // Launch autofill settings
+                            startActivity(Intent(this@EntryActivity, SettingsAutofillActivity::class.java))
                        })

        if (!entryCopyEducationPerformed) {
-            val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
            // entryEditEducationPerformed
-            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
-                    menuEditView,
-                    {
-                        onOptionsItemSelected(menu.findItem(R.id.menu_edit))
-                    },
-                    {
-                        performedNextEducation(entryActivityEducation, menu)
-                    }
-            )
+            toolbar?.findViewById<View>(R.id.menu_edit) != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
+                            toolbar!!.findViewById(R.id.menu_edit),
+                            {
+                                onOptionsItemSelected(menu.findItem(R.id.menu_edit))
+                            },
+                            {
+                                // Open Keepass doc to create field references
+                                startActivity(Intent(Intent.ACTION_VIEW,
+                                        UriUtil.parse(getString(R.string.field_references_url))))
+                            })
        }
    }

@@ -464,12 +384,21 @@ class EntryActivity : LockingActivity() {
                MenuUtil.onContributionItemSelected(this)
                return true
            }
+
+            R.id.menu_toggle_pass -> {
+                mShowPassword = !mShowPassword
+                changeShowPasswordIcon(item)
+                entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
+                return true
+            }
+
            R.id.menu_edit -> {
                mEntry?.let {
                    EntryEditActivity.launch(this@EntryActivity, it)
                }
                return true
            }
+
            R.id.menu_goto_url -> {
                var url: String = mEntry?.url ?: ""

@@ -479,56 +408,40 @@ class EntryActivity : LockingActivity() {
                }

                UriUtil.gotoUrl(this, url)
+
                return true
            }
-            R.id.menu_restore_entry_history -> {
-                mEntryLastVersion?.let { mainEntry ->
-                    mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory(
-                            mainEntry,
-                            mEntryHistoryPosition,
-                            !mReadOnly && mAutoSaveEnable)
-                }
-            }
-            R.id.menu_delete_entry_history -> {
-                mEntryLastVersion?.let { mainEntry ->
-                    mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(
-                            mainEntry,
-                            mEntryHistoryPosition,
-                            !mReadOnly && mAutoSaveEnable)
-                }
-            }
-            R.id.menu_save_database -> {
-                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
+
+            R.id.menu_lock -> {
+                lockAndExit()
+                return true
            }
+
            android.R.id.home -> finish() // close this activity and return to preview activity (if there is any)
        }
+
        return super.onOptionsItemSelected(item)
    }

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

    override fun finish() {
        // Transit data in previous Activity after an update
-        Intent().apply {
-            putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mEntry)
-            setResult(EntryEditActivity.UPDATE_ENTRY_RESULT_CODE, this)
-        }
+        /*
+		TODO Slowdown when add entry as result
+        Intent intent = new Intent();
+        intent.putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mEntry);
+        setResult(EntryEditActivity.UPDATE_ENTRY_RESULT_CODE, intent);
+        */
        super.finish()
    }

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

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

-        fun launch(activity: Activity, entry: Entry, readOnly: Boolean, historyPosition: Int? = null) {
+        fun launch(activity: Activity, entry: EntryVersioned, readOnly: Boolean, historyPosition: Int? = null) {
            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                val intent = Intent(activity, EntryActivity::class.java)
                intent.putExtra(KEY_ENTRY, entry.nodeId)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -1,107 +1,68 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 */
 package com.kunzisoft.keepass.activities

 import android.app.Activity
-import android.app.DatePickerDialog
-import android.app.TimePickerDialog
 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.appcompat.app.AlertDialog
+import android.widget.ScrollView
 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.SelectFileHelper
-import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
+import com.kunzisoft.keepass.activities.lock.LockingHideActivity
+import com.kunzisoft.keepass.database.action.ProgressDialogThread
 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.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_UPDATE_ENTRY_TASK
-import com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService
-import com.kunzisoft.keepass.otp.OtpElement
-import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.settings.PreferencesUtil
-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.utils.closeDatabase
-import com.kunzisoft.keepass.view.asError
-import com.kunzisoft.keepass.view.showActionError
-import com.kunzisoft.keepass.view.updateLockPaddingLeft
-import org.joda.time.DateTime
+import com.kunzisoft.keepass.view.EntryEditContentsView
 import java.util.*
-import kotlin.collections.ArrayList

-class EntryEditActivity : LockingActivity(),
+class EntryEditActivity : LockingHideActivity(),
        IconPickerDialogFragment.IconPickerListener,
-        EntryCustomFieldDialogFragment.EntryCustomFieldListener,
-        GeneratePasswordDialogFragment.GeneratePasswordListener,
-        SetOTPDialogFragment.CreateOtpListener,
-        DatePickerDialog.OnDateSetListener,
-        TimePickerDialog.OnTimeSetListener,
-        FileTooBigDialogFragment.ActionChooseListener,
-        ReplaceFileDialogFragment.ActionChooseListener {
+        GeneratePasswordDialogFragment.GeneratePasswordListener {

    private var mDatabase: Database? = null

    // Refs of an entry and group in database, are not modifiable
-    private var mEntry: Entry? = null
-    private var mParent: Group? = null
+    private var mEntry: EntryVersioned? = null
+    private var mParent: GroupVersioned? = null
+    // New or copy of mEntry in the database to be modifiable
+    private var mNewEntry: EntryVersioned? = null
    private var mIsNew: Boolean = false

    // Views
-    private var coordinatorLayout: CoordinatorLayout? = null
-    private var scrollView: NestedScrollView? = null
-    private var entryEditFragment: EntryEditFragment? = null
-    private var entryEditAddToolBar: Toolbar? = null
-    private var validateButton: View? = null
-    private var lockView: View? = null
+    private var scrollView: ScrollView? = null
+    private var entryEditContentsView: EntryEditContentsView? = null
+    private var saveView: View? = null

-    // To manage attachments
-    private var mSelectFileHelper: SelectFileHelper? = null
-    private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
-    private var mAllowMultipleAttachments: Boolean = false
-    private var mTempAttachments = ArrayList<Attachment>()
+    // Dialog thread
+    private var progressDialogThread: ProgressDialogThread? = null

    // Education
    private var entryEditActivityEducation: EntryEditActivityEducation? = null
@@ -116,29 +77,19 @@ class EntryEditActivity : LockingActivity(),
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        coordinatorLayout = findViewById(R.id.entry_edit_coordinator_layout)
-
        scrollView = findViewById(R.id.entry_edit_scroll)
        scrollView?.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET

-        lockView = findViewById(R.id.lock_button)
-        lockView?.setOnClickListener {
-            lockAndExit()
-        }
-
+        entryEditContentsView = findViewById(R.id.entry_edit_contents)
+        entryEditContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
        // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
-
-        stopService(Intent(this, ClipboardEntryNotificationService::class.java))
-        stopService(Intent(this, KeyboardEntryNotificationService::class.java))
+        resetAppTimeoutWhenViewFocusedOrChanged(entryEditContentsView)

        // 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 {
+        intent.getParcelableExtra<PwNodeId<UUID>>(KEY_ENTRY)?.let {
            mIsNew = false
            // Create an Entry copy to modify from the database entry
            mEntry = mDatabase?.getEntryById(it)
@@ -152,210 +103,128 @@ class EntryEditActivity : LockingActivity(),
                    entry.parent = mParent
                }
            }
-            tempEntryInfo = mEntry?.getEntryInfo(mDatabase, true)
+
+            // Create the new entry from the current one
+            if (savedInstanceState == null
+                    || !savedInstanceState.containsKey(KEY_NEW_ENTRY)) {
+                mEntry?.let { entry ->
+                    // Create a copy to modify
+                    mNewEntry = EntryVersioned(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 {
+        intent.getParcelableExtra<PwNodeId<*>>(KEY_PARENT)?.let {
            mIsNew = true
+            // Create an empty new entry
+            if (savedInstanceState == null
+                    || !savedInstanceState.containsKey(KEY_NEW_ENTRY)) {
+                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) {
-                tempEntryInfo?.icon = parentIcon
-            }
-            // Set default username
-            tempEntryInfo?.username = mDatabase?.defaultUsername ?: ""
-        }
-
-        // 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)
+            // Add the default icon
+            mDatabase?.drawFactory?.let { iconFactory ->
+                entryEditContentsView?.setDefaultIcon(iconFactory)
            }
        }

-        // Retrieve temp attachments in case of deletion
-        if (savedInstanceState?.containsKey(TEMP_ATTACHMENTS) == true) {
-            mTempAttachments = savedInstanceState.getParcelableArrayList(TEMP_ATTACHMENTS) ?: mTempAttachments
+        // Retrieve the new entry after an orientation change
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(KEY_NEW_ENTRY)) {
+            mNewEntry = savedInstanceState.getParcelable(KEY_NEW_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)

-        // Bottom Bar
-        entryEditAddToolBar = findViewById(R.id.entry_edit_bottom_bar)
-        entryEditAddToolBar?.apply {
-            menuInflater.inflate(R.menu.entry_edit, menu)
+        // Add listener to the icon
+        entryEditContentsView?.setOnIconViewClickListener { IconPickerDialogFragment.launch(this@EntryEditActivity) }

-            menu.findItem(R.id.menu_add_field).apply {
-                val allowCustomField = mDatabase?.allowEntryCustomFields() == true
-                isEnabled = allowCustomField
-                isVisible = allowCustomField
-            }
-
-            // Attachment not compatible below KitKat
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-                menu.findItem(R.id.menu_add_attachment).isVisible = false
-            }
-
-            menu.findItem(R.id.menu_add_otp).apply {
-                val allowOTP = mDatabase?.allowOTP == true
-                isEnabled = allowOTP
-                // OTP not compatible below KitKat
-                isVisible = allowOTP && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
-            }
-
-            setOnMenuItemClickListener { item ->
-                when (item.itemId) {
-                    R.id.menu_add_field -> {
-                        addNewCustomField()
-                        true
-                    }
-                    R.id.menu_add_attachment -> {
-                        addNewAttachment(item)
-                        true
-                    }
-                    R.id.menu_add_otp -> {
-                        setupOTP()
-                        true
-                    }
-                    else -> true
-                }
-            }
-        }
-
-        // To retrieve attachment
-        mSelectFileHelper = SelectFileHelper(this)
-        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
+        // Generate password button
+        entryEditContentsView?.setOnPasswordGeneratorClickListener { openPasswordGenerator() }

        // Save button
-        validateButton = findViewById(R.id.entry_edit_validate)
-        validateButton?.setOnClickListener { saveEntry() }
+        saveView = findViewById(R.id.entry_edit_save)
+        saveView?.setOnClickListener { saveEntry() }
+
+        entryEditContentsView?.allowCustomField(mNewEntry?.allowCustomFields() == true) { addNewCustomField() }

        // Verify the education views
        entryEditActivityEducation = EntryEditActivityEducation(this)

        // Create progress dialog
-        mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
+        progressDialogThread = ProgressDialogThread(this) { actionTask, result ->
            when (actionTask) {
                ACTION_DATABASE_CREATE_ENTRY_TASK,
                ACTION_DATABASE_UPDATE_ENTRY_TASK -> {
-                    try {
-                        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) {
-                                mEntry = newNodes[0] as Entry?
-                                finish()
-                            }
-                        }
-                    } catch (e: Exception) {
-                        Log.e(TAG, "Unable to retrieve entry after database action", e)
-                    }
-                }
-            }
-            coordinatorLayout?.showActionError(result)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
-            View.VISIBLE
-        } else {
-            View.GONE
-        }
-
-        // Padding if lock button visible
-        entryEditAddToolBar?.updateLockPaddingLeft()
-
-        mAllowMultipleAttachments = mDatabase?.allowMultipleAttachments == true
-        mAttachmentFileBinderManager?.apply {
-            registerProgressTask()
-            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
-                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
-                    when (entryAttachmentState.downloadState) {
-                        AttachmentState.START -> {
-                            entryEditFragment?.apply {
-                                // When only one attachment is allowed
-                                if (!mAllowMultipleAttachments) {
-                                    clearAttachments()
-                                }
-                                putAttachment(entryAttachmentState)
-                                // Scroll to the attachment position
-                                getAttachmentViewPosition(entryAttachmentState) {
-                                    scrollView?.smoothScrollTo(0, it.toInt())
-                                }
-                            }
-                        }
-                        AttachmentState.IN_PROGRESS -> {
-                            entryEditFragment?.putAttachment(entryAttachmentState)
-                        }
-                        AttachmentState.COMPLETE -> {
-                            entryEditFragment?.apply {
-                                putAttachment(entryAttachmentState)
-                                // Scroll to the attachment position
-                                getAttachmentViewPosition(entryAttachmentState) {
-                                    scrollView?.smoothScrollTo(0, it.toInt())
-                                }
-                            }
-                        }
-                        AttachmentState.ERROR -> {
-                            entryEditFragment?.removeAttachment(entryAttachmentState)
-                            coordinatorLayout?.let {
-                                Snackbar.make(it, R.string.error_file_not_create, Snackbar.LENGTH_LONG).asError().show()
-                            }
-                        }
-                        else -> {}
-                    }
+                    if (result.isSuccess)
+                        finish()
                }
            }
        }
    }

-    override fun onPause() {
-        mAttachmentFileBinderManager?.unregisterProgressTask()
+    private fun populateViewsWithEntry(newEntry: EntryVersioned) {
+        // Don't start the field reference manager, we want to see the raw ref
+        mDatabase?.stopManageEntry(newEntry)

-        super.onPause()
+        // Set info in temp parameters
+        temporarilySaveAndShowSelectedIcon(newEntry.icon)
+
+        // Set info in view
+        entryEditContentsView?.apply {
+            title = newEntry.title
+            username = if (newEntry.username.isEmpty()) mDatabase?.defaultUsername ?:"" else newEntry.username
+            url = newEntry.url
+            password = newEntry.password
+            notes = newEntry.notes
+            for (entry in newEntry.customFields.entries) {
+                post {
+                    addNewCustomField(entry.key, entry.value)
+                }
+            }
+        }
+    }
+
+    private fun populateEntryWithViews(newEntry: EntryVersioned) {
+
+        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
+                notes = entryView.notes
+                entryView.customFields.forEach { customField ->
+                    addExtraField(customField.name, customField.protectedValue)
+                }
+            }
+        }
+
+        mDatabase?.stopManageEntry(newEntry)
+    }
+
+    private fun temporarilySaveAndShowSelectedIcon(icon: PwIcon) {
+        mNewEntry?.icon = icon
+        mDatabase?.drawFactory?.let { iconDrawFactory ->
+            entryEditContentsView?.setIcon(iconDrawFactory, icon)
+        }
    }

    /**
@@ -366,145 +235,45 @@ class EntryEditActivity : LockingActivity(),
    }

    /**
-     * Add a new customized field
+     * Add a new customized field view and scroll to bottom
     */
    private fun addNewCustomField() {
-        EntryCustomFieldDialogFragment.getInstance().show(supportFragmentManager, "customFieldDialog")
-    }
-
-    private fun editCustomField(field: Field) {
-        EntryCustomFieldDialogFragment.getInstance(field).show(supportFragmentManager, "customFieldDialog")
-    }
-
-    override fun onNewCustomFieldApproved(newField: Field) {
-        entryEditFragment?.apply {
-            putExtraField(newField)
-        }
-    }
-
-    override fun onEditCustomFieldApproved(oldField: Field, newField: Field) {
-        entryEditFragment?.replaceExtraField(oldField, newField)
-    }
-
-    override fun onDeleteCustomFieldApproved(oldField: Field) {
-        entryEditFragment?.removeExtraField(oldField)
-    }
-
-    /**
-     * Add a new attachment
-     */
-    private fun addNewAttachment(item: MenuItem) {
-        mSelectFileHelper?.selectFileOnClickViewListener?.onMenuItemClick(item)
-    }
-
-    override fun onValidateUploadFileTooBig(attachmentToUploadUri: Uri?, fileName: String?) {
-        if (attachmentToUploadUri != null && fileName != null) {
-            buildNewAttachment(attachmentToUploadUri, fileName)
-        }
-    }
-
-    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(UriUtil.getBinaryDir(this), compression)?.let { binaryAttachment ->
-            val entryAttachment = Attachment(fileName, binaryAttachment)
-            // Ask to replace the current attachment
-            if ((mDatabase?.allowMultipleAttachments != true && entryEditFragment?.containsAttachment() == true) ||
-                    entryEditFragment?.containsAttachment(EntryAttachmentState(entryAttachment, StreamDirection.UPLOAD)) == true) {
-                ReplaceFileDialogFragment.build(attachmentToUploadUri, entryAttachment)
-                        .show(supportFragmentManager, "replacementFileFragment")
-            } else {
-                startUploadAttachment(attachmentToUploadUri, entryAttachment)
-            }
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
-            uri?.let { attachmentToUploadUri ->
-                // TODO Async to get the name
-                UriUtil.getFileData(this, attachmentToUploadUri)?.also { documentFile ->
-                    documentFile.name?.let { fileName ->
-                        if (documentFile.length() > MAX_WARNING_BINARY_FILE) {
-                            FileTooBigDialogFragment.build(attachmentToUploadUri, fileName)
-                                    .show(supportFragmentManager, "fileTooBigFragment")
-                        } else {
-                            buildNewAttachment(attachmentToUploadUri, fileName)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Set up OTP (HOTP or TOTP) and add it as extra field
-     */
-    private fun setupOTP() {
-        // Retrieve the current otpElement if exists
-        // and open the dialog to set up the OTP
-        SetOTPDialogFragment.build(entryEditFragment?.getEntryInfo()?.otpModel)
-                .show(supportFragmentManager, "addOTPDialog")
+        entryEditContentsView?.addNewCustomField()
    }

    /**
     * Saves the new entry or update an existing entry in the database
     */
    private fun saveEntry() {
-        // Get the temp entry
-        entryEditFragment?.getEntryInfo()?.let { newEntryInfo ->

-            if (mIsNew) {
-                // Create new one
-                mDatabase?.createEntry()
-            } else {
-                // Create a clone
-                Entry(mEntry!!)
-            }?.let { newEntry ->
+        // Launch a validation and show the error if present
+        if (entryEditContentsView?.isValid() == true) {
+            // Clone the entry
+            mNewEntry?.let { newEntry ->

-                newEntry.setEntryInfo(mDatabase, newEntryInfo)
+                // WARNING Add the parent previously deleted
+                newEntry.parent = mEntry?.parent
                // Build info
-                newEntry.lastAccessTime = DateInstant()
-                newEntry.lastModificationTime = DateInstant()
+                newEntry.lastAccessTime = PwDate()
+                newEntry.lastModificationTime = PwDate()

-                // Delete temp attachment if not used
-                mTempAttachments.forEach {
-                    mDatabase?.binaryPool?.let { binaryPool ->
-                        if (!newEntry.getAttachments(binaryPool).contains(it)) {
-                            mDatabase?.removeAttachmentIfNotUsed(it)
-                        }
-                    }
-                }
+                populateEntryWithViews(newEntry)

                // Open a progress dialog and save entry
                if (mIsNew) {
                    mParent?.let { parent ->
-                        mProgressDatabaseTaskProvider?.startDatabaseCreateEntry(
+                        progressDialogThread?.startDatabaseCreateEntry(
                                newEntry,
                                parent,
-                                !mReadOnly && mAutoSaveEnable
+                                !mReadOnly
                        )
                    }
                } else {
                    mEntry?.let { oldEntry ->
-                        mProgressDatabaseTaskProvider?.startDatabaseUpdateEntry(
+                        progressDialogThread?.startDatabaseUpdateEntry(
                                oldEntry,
                                newEntry,
-                                !mReadOnly && mAutoSaveEnable
+                                !mReadOnly
                        )
                    }
                }
@@ -512,159 +281,98 @@ class EntryEditActivity : LockingActivity(),
        }
    }

+    override fun onResume() {
+        super.onResume()
+
+        progressDialogThread?.registerProgressTask()
+    }
+
+    override fun onPause() {
+        progressDialogThread?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)

        val inflater = menuInflater
-        inflater.inflate(R.menu.database, menu)
-        // Save database not needed here
-        menu.findItem(R.id.menu_save_database)?.isVisible = false
+        inflater.inflate(R.menu.database_lock, menu)
        MenuUtil.contributionMenuInflater(inflater, menu)

+        entryEditActivityEducation?.let {
+            Handler().post { performedNextEducation(it) }
+        }
+
        return true
    }

+    private fun performedNextEducation(entryEditActivityEducation: EntryEditActivityEducation) {
+        val passwordView = entryEditContentsView?.generatePasswordView
+        val addNewFieldView = entryEditContentsView?.addNewFieldView

-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        entryEditActivityEducation?.let {
-            Handler(Looper.getMainLooper()).post { performedNextEducation(it) }
-        }
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    fun performedNextEducation(entryEditActivityEducation: EntryEditActivityEducation) {
-        if (entryEditFragment?.generatePasswordEducationPerformed(entryEditActivityEducation) != true) {
-            val addNewFieldView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_field)
-            val addNewFieldEducationPerformed = mDatabase?.allowEntryCustomFields() == true
-                    && addNewFieldView != null
-                    && addNewFieldView.isVisible
+        val generatePasswordEducationPerformed = passwordView != null
+                && entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+                passwordView,
+                {
+                    openPasswordGenerator()
+                },
+                {
+                    performedNextEducation(entryEditActivityEducation)
+                }
+        )
+        if (!generatePasswordEducationPerformed) {
+            // entryNewFieldEducationPerformed
+            mNewEntry != null && mNewEntry!!.allowCustomFields() && mNewEntry!!.customFields.isEmpty()
+                    && addNewFieldView != null && addNewFieldView.visibility == View.VISIBLE
                    && entryEditActivityEducation.checkAndPerformedEntryNewFieldEducation(
                    addNewFieldView,
                    {
                        addNewCustomField()
-                    },
-                    {
-                        performedNextEducation(entryEditActivityEducation)
-                    }
-            )
-            if (!addNewFieldEducationPerformed) {
-                val attachmentView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_attachment)
-                val addAttachmentEducationPerformed = attachmentView != null
-                        && attachmentView.isVisible
-                        && entryEditActivityEducation.checkAndPerformedAttachmentEducation(
-                        attachmentView,
-                        {
-                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(attachmentView)
-                        },
-                        {
-                            performedNextEducation(entryEditActivityEducation)
-                        }
-                )
-                if (!addAttachmentEducationPerformed) {
-                    val setupOtpView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_otp)
-                    setupOtpView != null
-                            && setupOtpView.isVisible
-                            && entryEditActivityEducation.checkAndPerformedSetUpOTPEducation(
-                            setupOtpView,
-                            {
-                                setupOTP()
-                            }
-                    )
-                }
-            }
+                    })
        }
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
-            R.id.menu_save_database -> {
-                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
+            R.id.menu_lock -> {
+                lockAndExit()
+                return true
            }
+
            R.id.menu_contribute -> {
                MenuUtil.onContributionItemSelected(this)
                return true
            }
-            android.R.id.home -> {
-                onBackPressed()
-            }
+
+            android.R.id.home -> finish()
        }

        return super.onOptionsItemSelected(item)
    }

-    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, titleOTP, usernameOTP)
-        mEntry?.putExtraField(Field(otpField.name, otpField.protectedValue))
-        entryEditFragment?.apply {
-            putExtraField(otpField)
-        }
-    }
-
    override fun iconPicked(bundle: Bundle) {
        IconPickerDialogFragment.getIconStandardFromBundle(bundle)?.let { icon ->
-            entryEditFragment?.icon = icon
-        }
-    }
-
-    override fun onDateSet(datePicker: DatePicker?, year: Int, month: Int, day: Int) {
-        // To fix android 4.4 issue
-        // https://stackoverflow.com/questions/12436073/datepicker-ondatechangedlistener-called-twice
-        if (datePicker?.isShown == true) {
-            entryEditFragment?.expiryTime?.date?.let { expiresDate ->
-                // Save the date
-                entryEditFragment?.expiryTime =
-                        DateInstant(DateTime(expiresDate)
-                                .withYear(year)
-                                .withMonthOfYear(month + 1)
-                                .withDayOfMonth(day)
-                                .toDate())
-                // Launch the time picker
-                val dateTime = DateTime(expiresDate)
-                val defaultHour = dateTime.hourOfDay
-                val defaultMinute = dateTime.minuteOfHour
-                TimePickerFragment.getInstance(defaultHour, defaultMinute)
-                        .show(supportFragmentManager, "TimePickerFragment")
-            }
-        }
-    }
-
-    override fun onTimeSet(timePicker: TimePicker?, hours: Int, minutes: Int) {
-        entryEditFragment?.expiryTime?.date?.let { expiresDate ->
-            // Save the date
-            entryEditFragment?.expiryTime =
-                    DateInstant(DateTime(expiresDate)
-                            .withHourOfDay(hours)
-                            .withMinuteOfHour(minutes)
-                            .toDate())
+            temporarilySaveAndShowSelectedIcon(icon)
        }
    }

    override fun onSaveInstanceState(outState: Bundle) {
-
-        outState.putParcelableArrayList(TEMP_ATTACHMENTS, mTempAttachments)
+        mNewEntry?.let {
+            populateEntryWithViews(it)
+            outState.putParcelable(KEY_NEW_ENTRY, it)
+        }

        super.onSaveInstanceState(outState)
    }

    override fun acceptPassword(bundle: Bundle) {
        bundle.getString(GeneratePasswordDialogFragment.KEY_PASSWORD_ID)?.let {
-            entryEditFragment?.password = it
+            entryEditContentsView?.password = it
        }

        entryEditActivityEducation?.let {
-            Handler(Looper.getMainLooper()).post { performedNextEducation(it) }
+            Handler().post { performedNextEducation(it) }
        }
    }

@@ -672,22 +380,13 @@ class EntryEditActivity : LockingActivity(),
        // Do nothing here
    }

-    override fun onBackPressed() {
-        AlertDialog.Builder(this)
-                .setMessage(R.string.discard_changes)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(R.string.discard) { _, _ ->
-                    super@EntryEditActivity.onBackPressed()
-                }.create().show()
-    }
-
    override fun finish() {
        // Assign entry callback as a result in all case
        try {
-            mEntry?.let { entry ->
+            mNewEntry?.let {
                val bundle = Bundle()
                val intentEntry = Intent()
-                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, entry)
+                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, mNewEntry)
                intentEntry.putExtras(bundle)
                if (mIsNew) {
                    setResult(ADD_ENTRY_RESULT_CODE, intentEntry)
@@ -711,7 +410,7 @@ class EntryEditActivity : LockingActivity(),
        const val KEY_PARENT = "parent"

        // SaveInstanceState
-        const val TEMP_ATTACHMENTS = "TEMP_ATTACHMENTS"
+        const val KEY_NEW_ENTRY = "new_entry"

        // Keys for callback
        const val ADD_ENTRY_RESULT_CODE = 31
@@ -719,15 +418,13 @@ 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
         */
-        fun launch(activity: Activity, pwEntry: Entry) {
+        fun launch(activity: Activity, pwEntry: EntryVersioned) {
            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                val intent = Intent(activity, EntryEditActivity::class.java)
                intent.putExtra(KEY_ENTRY, pwEntry.nodeId)
@@ -741,7 +438,7 @@ class EntryEditActivity : LockingActivity(),
         * @param activity from activity
         * @param pwGroup Group who will contains new entry
         */
-        fun launch(activity: Activity, pwGroup: Group) {
+        fun launch(activity: Activity, pwGroup: GroupVersioned) {
            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                val intent = Intent(activity, EntryEditActivity::class.java)
                intent.putExtra(KEY_PARENT, pwGroup.nodeId)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
@@ -1,546 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities
-
-import android.content.Context
-import android.graphics.Color
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import android.widget.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.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()
-
-        // 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)
-                }
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntrySelectionLauncherActivity.kt
@@ -1,130 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities
-
-import android.app.Activity
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.database.element.Database
-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.settings.PreferencesUtil
-
-/**
- * Activity to search or select entry in database,
- * Commonly used with Magikeyboard
- */
-class EntrySelectionLauncherActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-
-        var sharedWebDomain: String? = null
-
-        when (intent?.action) {
-            Intent.ACTION_SEND -> {
-                if ("text/plain" == intent.type) {
-                    // Retrieve web domain
-                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-                        sharedWebDomain = Uri.parse(it).host
-                    }
-                }
-            }
-            else -> {}
-        }
-
-        // Setting to integrate Magikeyboard
-        val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
-
-        // Build search param
-        val searchInfo = SearchInfo().apply {
-            webDomain = sharedWebDomain
-        }
-
-        // If database is open
-        SearchHelper.checkAutoSearchInfo(this,
-                Database.getInstance(),
-                searchInfo,
-                { items ->
-                    // Items found
-                    if (searchShareForMagikeyboard) {
-                        if (items.size == 1) {
-                            // Automatically populate keyboard
-                            val entryPopulate = items[0]
-                            populateKeyboardAndMoveAppToBackground(this,
-                                    entryPopulate,
-                                    intent)
-                        } else {
-                            // Select the one we want
-                            GroupActivity.launchForEntrySelectionResult(this,
-                                    true,
-                                    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)
-    }
-}
-
-fun populateKeyboardAndMoveAppToBackground(activity: Activity,
-                                           entry: EntryInfo,
-                                           intent: Intent,
-                                           toast: Boolean = true) {
-    // Populate Magikeyboard with entry
-    MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
-    // Consume the selection mode
-    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
-    activity.moveTaskToBack(true)
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities
@@ -22,59 +22,51 @@ 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.Environment
 import android.os.Handler
-import android.os.Looper
+import android.preference.PreferenceManager
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import androidx.activity.viewModels
+import android.widget.TextView
 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
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.BrowserDialogFragment
 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.selection.SpecialModeActivity
+import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
+import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
+import com.kunzisoft.keepass.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
-import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_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
-import com.kunzisoft.keepass.utils.*
+import com.kunzisoft.keepass.utils.MenuUtil
+import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.asError
-import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import kotlinx.android.synthetic.main.activity_file_selection.*
 import java.io.FileNotFoundException

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

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

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

@@ -82,9 +74,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),

    private var mDatabaseFileUri: Uri? = null

-    private var mSelectFileHelper: SelectFileHelper? = null
+    private var mOpenFileHelper: OpenFileHelper? = null

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

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -92,25 +84,31 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(applicationContext)

        setContentView(R.layout.activity_file_selection)
-        coordinatorLayout = findViewById(R.id.activity_file_selection_coordinator_layout)
+        fileListContainer = findViewById(R.id.container_file_list)

        val toolbar = findViewById<Toolbar>(R.id.toolbar)
        toolbar.title = ""
        setSupportActionBar(toolbar)

-        // Create database button
-        createDatabaseButtonView = findViewById(R.id.create_database_button)
-        createDatabaseButtonView?.setOnClickListener { createNewFile() }
-
-        // Open database button
-        mSelectFileHelper = SelectFileHelper(this)
-        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
-        openDatabaseButtonView?.apply {
-            mSelectFileHelper?.selectFileOnClickViewListener?.let {
-                setOnClickListener(it)
-                setOnLongClickListener(it)
-            }
+        // Create button
+        createButtonView = findViewById(R.id.create_database_button)
+        if (Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    type = "application/x-keepass"
+                }.resolveActivity(packageManager) == null) {
+            // No Activity found that can handle this intent.
+            createButtonView?.visibility = View.GONE
        }
+        else{
+            // There is an activity which can handle this intent.
+            createButtonView?.visibility = View.VISIBLE
+        }
+
+        createButtonView?.setOnClickListener { createNewFile() }
+
+        mOpenFileHelper = OpenFileHelper(this)
+        openDatabaseButtonView = findViewById(R.id.open_database_button)
+        openDatabaseButtonView?.setOnClickListener(mOpenFileHelper?.openFileOnClickViewListener)

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

@@ -145,12 +146,13 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        if (!(savedInstanceState != null
                        && savedInstanceState.containsKey(EXTRA_STAY)
                        && savedInstanceState.getBoolean(EXTRA_STAY, false))) {
-            val databasePath = PreferencesUtil.getDefaultDatabasePath(this)
+            val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+            val databasePath = prefs.getString(PasswordActivity.KEY_DEFAULT_DATABASE_PATH, "")

            UriUtil.parse(databasePath)?.let { databaseFileUri ->
                launchPasswordActivityWithPath(databaseFileUri)
            } ?: run {
-                Log.i(TAG, "No default database to prepare")
+                Log.i(TAG, "Unable to launch Password Activity")
            }
        }

@@ -160,48 +162,14 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            mDatabaseFileUri = savedInstanceState.getParcelable(EXTRA_DATABASE_URI)
        }

-        // Observe list of databases
-        databaseFilesViewModel.databaseFilesLoaded.observe(this, Observer { databaseFiles ->
-            when (databaseFiles.databaseFileAction) {
-                DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
-                    mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
-                }
-                DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
-                        mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
-                    }
-                    GroupActivity.launch(this@FileDatabaseSelectActivity)
-                }
-                DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
-                        mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
-                    }
-                }
-                DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
-                        mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
-                    }
-                }
-            }
-            databaseFilesViewModel.consumeAction()
-        })
-
-        // Observe default database
-        databaseFilesViewModel.defaultDatabase.observe(this, Observer {
-            // Retrieve settings for default database
-            mAdapterDatabaseHistory?.setDefaultDatabase(it)
-        })
-
        // Attach the dialog thread to this activity
-        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
-            onActionFinish = { actionTask, result ->
-                when (actionTask) {
-                    ACTION_DATABASE_CREATE_TASK -> {
-                        result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
-                            val keyFileUri = result.data?.getParcelable<Uri?>(KEY_FILE_URI_KEY)
-                            databaseFilesViewModel.addDatabaseFile(databaseUri, keyFileUri)
-                        }
-                    }
+        progressDialogThread = ProgressDialogThread(this) { actionTask, result ->
+            when (actionTask) {
+                ACTION_DATABASE_CREATE_TASK -> {
+                    // TODO Check
+                    // mAdapterDatabaseHistory?.notifyDataSetChanged()
+                    // updateFileListVisibility()
+                    GroupActivity.launch(this)
                }
            }
        }
@@ -210,83 +178,74 @@ 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")
+        try {
+            startActivityForResult(Intent(
+                    Intent.ACTION_CREATE_DOCUMENT).apply {
+                        addCategory(Intent.CATEGORY_OPENABLE)
+                        type = "application/x-keepass"
+                        putExtra(Intent.EXTRA_TITLE, getString(R.string.database_file_name_default) +
+                                getString(R.string.database_file_extension_default))
+                    },
+                    CREATE_FILE_REQUEST_CODE)
+        } catch (e: Exception) {
+            BrowserDialogFragment().show(supportFragmentManager, "browserDialog")
+        }
    }

    private fun fileNoFoundAction(e: FileNotFoundException) {
        val error = getString(R.string.file_not_found_content)
-        coordinatorLayout?.let {
-            Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-        }
+        Snackbar.make(activity_file_selection_coordinator_layout, 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)
        EntrySelectionHelper.doEntrySelectionAction(intent,
                {
                    try {
                        PasswordActivity.launch(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile,
-                                searchInfo)
+                                databaseUri, keyFile)
                    } catch (e: FileNotFoundException) {
                        fileNoFoundAction(e)
                    }
-                    // Remove the search info from intent
-                    if (searchInfo != null) {
-                        finish()
-                    }
                },
                {
                    try {
                        PasswordActivity.launchForKeyboardResult(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile,
-                                searchInfo)
+                                databaseUri, keyFile)
+                        finish()
                    } 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)
+                                    assistStructure)
                        } catch (e: FileNotFoundException) {
                            fileNoFoundAction(e)
                        }
+
                    }
                })
    }

    private fun launchGroupActivity(readOnly: Boolean) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
        EntrySelectionHelper.doEntrySelectionAction(intent,
                {
-                    GroupActivity.launch(this@FileDatabaseSelectActivity,
-                            false,
-                            searchInfo,
-                            readOnly)
+                    GroupActivity.launch(this@FileDatabaseSelectActivity, readOnly)
                },
                {
-                    GroupActivity.launchForEntrySelectionResult(this@FileDatabaseSelectActivity,
-                            false,
-                            searchInfo,
-                            readOnly)
+                    GroupActivity.launchForKeyboardSelection(this@FileDatabaseSelectActivity, readOnly)
                    // Do not keep history
                    finish()
                },
                { assistStructure ->
                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
-                                assistStructure,
-                                false,
-                                searchInfo,
-                                readOnly)
+                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity, assistStructure, readOnly)
                    }
                })
    }
@@ -298,43 +257,51 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            overridePendingTransition(0, 0)
    }

-    override fun onResume() {
-        super.onResume()
-
-        // Show open and create button or special mode
-        if  (mSelectionMode) {
-            // Disable create button if in selection mode or request for autofill
-            createDatabaseButtonView?.visibility = View.GONE
-        } else {
-            if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
-                // There is an activity which can handle this intent.
-                createDatabaseButtonView?.visibility = View.VISIBLE
-            } else{
-                // No Activity found that can handle this intent.
-                createDatabaseButtonView?.visibility = View.GONE
-            }
+    private fun updateExternalStorageWarning() {
+        // To show errors
+        var warning = -1
+        val state = Environment.getExternalStorageState()
+        if (state == Environment.MEDIA_MOUNTED_READ_ONLY) {
+            warning = R.string.read_only_warning
+        } else if (state != Environment.MEDIA_MOUNTED) {
+            warning = R.string.warning_unmounted
        }

+        val labelWarningView = findViewById<TextView>(R.id.label_warning)
+        if (warning != -1) {
+            labelWarningView.setText(warning)
+            labelWarningView.visibility = View.VISIBLE
+        } else {
+            labelWarningView.visibility = View.INVISIBLE
+        }
+    }
+
+    override fun onResume() {
        val database = Database.getInstance()
        if (database.loaded) {
            launchGroupActivity(database.isReadOnly)
-        } else {
-            // Construct adapter with listeners
-            if (PreferencesUtil.showRecentFiles(this)) {
-                databaseFilesViewModel.loadListOfDatabases()
-            } else {
-                mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+        }
+
+        super.onResume()
+
+        updateExternalStorageWarning()
+
+        // Construct adapter with listeners
+        mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
+            databaseFileHistoryList?.let {
+                mAdapterDatabaseHistory?.addDatabaseFileHistoryList(it)
+                updateFileListVisibility()
                mAdapterDatabaseHistory?.notifyDataSetChanged()
            }
-
-            // Register progress task
-            mProgressDatabaseTaskProvider?.registerProgressTask()
        }
+
+        // Register progress task
+        progressDialogThread?.registerProgressTask()
    }

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

        super.onPause()
    }
@@ -347,6 +314,13 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        outState.putParcelable(EXTRA_DATABASE_URI, mDatabaseFileUri)
    }

+    private fun updateFileListVisibility() {
+        if (mAdapterDatabaseHistory?.itemCount == 0)
+            fileListContainer?.visibility = View.INVISIBLE
+        else
+            fileListContainer?.visibility = View.VISIBLE
+    }
+
    override fun onAssignKeyDialogPositiveClick(
            masterPasswordChecked: Boolean, masterPassword: String?,
            keyFileChecked: Boolean, keyFile: Uri?) {
@@ -355,7 +329,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            mDatabaseFileUri?.let { databaseUri ->

                // Create the new database
-                mProgressDatabaseTaskProvider?.startDatabaseCreate(
+                progressDialogThread?.startDatabaseCreate(
                        databaseUri,
                        masterPasswordChecked,
                        masterPassword,
@@ -383,48 +357,42 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
        }

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

        // Retrieve the created URI from the file manager
-        onCreateDocumentResult(requestCode, resultCode, data) { databaseFileCreatedUri ->
-            mDatabaseFileUri = databaseFileCreatedUri
+        if (requestCode == CREATE_FILE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+            mDatabaseFileUri = data?.data
            if (mDatabaseFileUri != null) {
                AssignMasterKeyDialogFragment.getInstance(true)
                        .show(supportFragmentManager, "passwordDialog")
-            } else {
-                val error = getString(R.string.error_create_database)
-                coordinatorLayout?.let {
-                    Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-                }
-                Log.e(TAG, error)
            }
+            // else {
+                // TODO Show error
+            // }
        }
    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        super.onCreateOptionsMenu(menu)
+        MenuUtil.defaultMenuInflater(menuInflater, menu)

-        if (!mSelectionMode) {
-            MenuUtil.defaultMenuInflater(menuInflater, menu)
-        }
-
-        Handler(Looper.getMainLooper()).post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
+        Handler().post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }

        return true
    }

    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
        // If no recent files
-        val createDatabaseEducationPerformed =
-                createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
+        val createDatabaseEducationPerformed = createButtonView != null && createButtonView!!.visibility == View.VISIBLE
                && mAdapterDatabaseHistory != null
                && mAdapterDatabaseHistory!!.itemCount > 0
                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
-                        createDatabaseButtonView!!,
+                createButtonView!!,
                {
                    createNewFile()
                },
@@ -439,7 +407,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                    openDatabaseButtonView!!,
                    {tapTargetView ->
                        tapTargetView?.let {
-                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+                            mOpenFileHelper?.openFileOnClickViewListener?.onClick(it)
                        }
                    },
                    {}
@@ -448,10 +416,6 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
    }

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

@@ -461,32 +425,22 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
        private const val EXTRA_STAY = "EXTRA_STAY"
        private const val EXTRA_DATABASE_URI = "EXTRA_DATABASE_URI"

+        private const val CREATE_FILE_REQUEST_CODE = 3853
+
        /*
         * -------------------------
-         * Launch only to standard search, else pass by PasswordActivity
+         * No Standard Launch, pass by PasswordActivity
         * -------------------------
         */

-        fun launch(context: Context,
-                   searchInfo: SearchInfo? = null) {
-            val intent = Intent(context, FileDatabaseSelectActivity::class.java)
-            searchInfo?.let {
-                intent.putExtra(KEY_SEARCH_INFO, it)
-            }
-            context.startActivity(intent)
-        }
-
        /*
         * -------------------------
         * 		Keyboard Launch
         * -------------------------
         */

-        fun launchForEntrySelectionResult(activity: Activity,
-                                          searchInfo: SearchInfo? = null) {
-            EntrySelectionHelper.startActivityForEntrySelectionResult(activity,
-                    Intent(activity, FileDatabaseSelectActivity::class.java),
-                    searchInfo)
+        fun launchForKeyboardSelection(activity: Activity) {
+            EntrySelectionHelper.startActivityForEntrySelection(activity, Intent(activity, FileDatabaseSelectActivity::class.java))
        }

        /*
@@ -496,13 +450,10 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         */

        @RequiresApi(api = Build.VERSION_CODES.O)
-        fun launchForAutofillResult(activity: Activity,
-                                    assistStructure: AssistStructure,
-                                    searchInfo: SearchInfo? = null) {
+        fun launchForAutofillResult(activity: Activity, assistStructure: AssistStructure) {
            AutofillHelper.startActivityForAutofillResult(activity,
                    Intent(activity, FileDatabaseSelectActivity::class.java),
-                    assistStructure,
-                    searchInfo)
+                    assistStructure)
        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
@@ -1,27 +1,10 @@
-/*
- * 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.content.Intent
+import android.content.SharedPreferences
 import android.os.Bundle
+import android.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import android.util.Log
@@ -35,16 +18,16 @@ 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.database.SortNodeEnum
+import com.kunzisoft.keepass.database.element.GroupVersioned
+import com.kunzisoft.keepass.database.element.NodeVersioned
 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.database.element.Database
-import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.element.Type
 import java.util.*

 class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
@@ -52,8 +35,8 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
    private var nodeClickListener: NodeClickListener? = null
    private var onScrollListener: OnScrollListener? = null

-    private var mNodesRecyclerView: RecyclerView? = null
-    var mainGroup: Group? = null
+    private var listView: RecyclerView? = null
+    var mainGroup: GroupVersioned? = null
        private set
    private var mAdapter: NodeAdapter? = null

@@ -61,12 +44,14 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        private set
    var nodeActionPasteMode: PasteMode = PasteMode.UNDEFINED
        private set
-    private val listActionNodes = LinkedList<Node>()
-    private val listPasteNodes = LinkedList<Node>()
+    private val listActionNodes = LinkedList<NodeVersioned>()
+    private val listPasteNodes = LinkedList<NodeVersioned>()

    private var notFoundView: View? = null
    private var isASearchResult: Boolean = false

+    // Preferences for sorting
+    private var prefs: SharedPreferences? = null

    private var readOnly: Boolean = false
        get() {
@@ -97,12 +82,6 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }
    }

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

@@ -124,7 +103,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
            mAdapter = NodeAdapter(context)
            mAdapter?.apply {
                setOnNodeClickListener(object : NodeAdapter.NodeClickCallback {
-                    override fun onNodeClick(node: Node) {
+                    override fun onNodeClick(node: NodeVersioned) {
                        if (nodeActionSelectionMode) {
                            if (listActionNodes.contains(node)) {
                                // Remove selected item if already selected
@@ -141,7 +120,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                        }
                    }

-                    override fun onNodeLongClick(node: Node): Boolean {
+                    override fun onNodeLongClick(node: NodeVersioned): Boolean {
                        if (nodeActionPasteMode == PasteMode.UNDEFINED) {
                            // Select the first item after a long click
                            if (!listActionNodes.contains(node))
@@ -157,6 +136,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                })
            }
        }
+        prefs = PreferenceManager.getDefaultSharedPreferences(context)
    }

    override fun onSaveInstanceState(outState: Bundle) {
@@ -170,17 +150,11 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        // To apply theme
        val rootView = inflater.cloneInContext(contextThemed)
                .inflate(R.layout.fragment_list_nodes, container, false)
-        mNodesRecyclerView = rootView.findViewById(R.id.nodes_list)
+        listView = rootView.findViewById(R.id.nodes_list)
        notFoundView = rootView.findViewById(R.id.not_found_container)

-        mNodesRecyclerView?.apply {
-            scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
-            layoutManager = LinearLayoutManager(context)
-            adapter = mAdapter
-        }
-
        onScrollListener?.let { onScrollListener ->
-            mNodesRecyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            listView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                    super.onScrolled(recyclerView, dx, dy)
                    onScrollListener.onScrolled(dy)
@@ -188,6 +162,8 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
            })
        }

+        rebuildList()
+
        return rootView
    }

@@ -199,14 +175,14 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }

        // Refresh data
-        rebuildList()
+        mAdapter?.notifyDataSetChanged()

        if (isASearchResult && mAdapter!= null && mAdapter!!.isEmpty) {
            // To show the " no search entry found "
-            mNodesRecyclerView?.visibility = View.GONE
+            listView?.visibility = View.GONE
            notFoundView?.visibility = View.VISIBLE
        } else {
-            mNodesRecyclerView?.visibility = View.VISIBLE
+            listView?.visibility = View.VISIBLE
            notFoundView?.visibility = View.GONE
        }
    }
@@ -214,27 +190,30 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
    fun rebuildList() {
        // Add elements to the list
        mainGroup?.let { mainGroup ->
-            mAdapter?.apply {
-                rebuildList(mainGroup)
-                // To visually change the elements
-                if (PreferencesUtil.APPEARANCE_CHANGED) {
-                    notifyDataSetChanged()
-                    PreferencesUtil.APPEARANCE_CHANGED = false
-                }
-            }
+            mAdapter?.rebuildList(mainGroup)
+        }
+        listView?.apply {
+            scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
+            layoutManager = LinearLayoutManager(context)
+            adapter = mAdapter
        }
    }

-    override fun onSortSelected(sortNodeEnum: SortNodeEnum,
-                                sortNodeParameters: SortNodeEnum.SortNodeParameters) {
-        // Save setting
-        context?.let {
-            PreferencesUtil.saveNodeSort(it, sortNodeEnum, sortNodeParameters)
+    override fun onSortSelected(sortNodeEnum: SortNodeEnum, ascending: Boolean, groupsBefore: Boolean, recycleBinBottom: Boolean) {
+        // Toggle setting
+        prefs?.edit()?.apply {
+            putString(getString(R.string.sort_node_key), sortNodeEnum.name)
+            putBoolean(getString(R.string.sort_ascending_key), ascending)
+            putBoolean(getString(R.string.sort_group_before_key), groupsBefore)
+            putBoolean(getString(R.string.sort_recycle_bin_bottom_key), recycleBinBottom)
+            apply()
        }

        // Tell the adapter to refresh it's list
-        mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
-        rebuildList()
+        mAdapter?.notifyChangeSort(sortNodeEnum, ascending, groupsBefore)
+        mainGroup?.let { mainGroup ->
+            mAdapter?.rebuildList(mainGroup)
+        }
    }

    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -249,7 +228,8 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
            R.id.menu_sort -> {
                context?.let { context ->
                    val sortDialogFragment: SortDialogFragment =
-                            if (Database.getInstance().isRecycleBinEnabled) {
+                            if (Database.getInstance().allowRecycleBin
+                                    && Database.getInstance().isRecycleBinEnabled) {
                                SortDialogFragment.getInstance(
                                        PreferencesUtil.getListSort(context),
                                        PreferencesUtil.getAscendingSort(context),
@@ -271,16 +251,15 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        }
    }

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

        return object : ActionMode.Callback {

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

            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
@@ -297,8 +276,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                    // Open and Edit for a single item
                    if (nodes.size == 1) {
                        // Edition
-                        if (readOnly
-                                || (database.isRecycleBinEnabled && nodes[0] == database.recycleBin)) {
+                        if (readOnly || nodes[0] == database.recycleBin) {
                            menu?.removeItem(R.id.menu_edit)
                        }
                    } else {
@@ -309,15 +287,15 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                    // Copy and Move (not for groups)
                    if (readOnly
                            || isASearchResult
+                            || nodes.any { it == database.recycleBin }
                            || nodes.any { it.type == Type.GROUP }) {
-                        // TODO Copy For Group
+                        // TODO COPY For Group
                        menu?.removeItem(R.id.menu_copy)
                        menu?.removeItem(R.id.menu_move)
                    }

                    // Deletion
-                    if (readOnly
-                            || (database.isRecycleBinEnabled && nodes.any { it == database.recycleBin })) {
+                    if (readOnly || nodes.any { it == database.recycleBin }) {
                        menu?.removeItem(R.id.menu_delete)
                    }
                }
@@ -325,7 +303,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                // Add the number of items selected in title
                mode?.title = nodes.size.toString()

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

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

@@ -365,7 +343,6 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                mAdapter?.unselectActionNodes()
                nodeActionPasteMode = PasteMode.UNDEFINED
                nodeActionSelectionMode = false
-                actionModeCallback.onDestroyActionMode(mode)
            }
        }
    }
@@ -377,42 +354,46 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
            EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE -> {
                if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE
                        || resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
-                    data?.getParcelableExtra<Node>(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY)?.let { changedNode ->
+                    data?.getParcelableExtra<NodeVersioned>(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY)?.let { newNode ->
                        if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
-                            addNode(changedNode)
-                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE)
-                            mAdapter?.notifyDataSetChanged()
+                            mAdapter?.addNode(newNode)
+                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
+                            //mAdapter.updateLastNodeRegister(newNode);
+                            mainGroup?.let { mainGroup ->
+                                mAdapter?.rebuildList(mainGroup)
+                            }
+                        }
                    } ?: Log.e(this.javaClass.name, "New node can be retrieve in Activity Result")
                }
            }
        }
    }

-    fun contains(node: Node): Boolean {
+    fun contains(node: NodeVersioned): Boolean {
        return mAdapter?.contains(node) ?: false
    }

-    fun addNode(newNode: Node) {
+    fun addNode(newNode: NodeVersioned) {
        mAdapter?.addNode(newNode)
    }

-    fun addNodes(newNodes: List<Node>) {
+    fun addNodes(newNodes: List<NodeVersioned>) {
        mAdapter?.addNodes(newNodes)
    }

-    fun updateNode(oldNode: Node, newNode: Node? = null) {
+    fun updateNode(oldNode: NodeVersioned, newNode: NodeVersioned? = null) {
        mAdapter?.updateNode(oldNode, newNode ?: oldNode)
    }

-    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
+    fun updateNodes(oldNodes: List<NodeVersioned>, newNodes: List<NodeVersioned>) {
        mAdapter?.updateNodes(oldNodes, newNodes)
    }

-    fun removeNode(pwNode: Node) {
+    fun removeNode(pwNode: NodeVersioned) {
        mAdapter?.removeNode(pwNode)
    }

-    fun removeNodes(nodes: List<Node>) {
+    fun removeNodes(nodes: List<NodeVersioned>) {
        mAdapter?.removeNodes(nodes)
    }

@@ -428,20 +409,20 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickListener {
-        fun onNodeClick(node: Node)
-        fun onNodeSelected(nodes: List<Node>): Boolean
+        fun onNodeClick(node: NodeVersioned)
+        fun onNodeSelected(nodes: List<NodeVersioned>): Boolean
    }

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

    enum class PasteMode {
@@ -466,7 +447,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
        private const val GROUP_KEY = "GROUP_KEY"
        private const val IS_SEARCH = "IS_SEARCH"

-        fun newInstance(group: Group?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
+        fun newInstance(group: GroupVersioned?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
            val bundle = Bundle()
            if (group != null) {
                bundle.putParcelable(GROUP_KEY, group)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
@@ -1,48 +0,0 @@
-/*
- * Copyright 2020 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.search.SearchHelper
-
-/**
- * Activity to select entry in database and populate it in Magikeyboard
- */
-class MagikeyboardLauncherActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        SearchHelper.checkAutoSearchInfo(this,
-                Database.getInstance(),
-                null,
-                {},
-                {
-                    GroupActivity.launchForEntrySelectionResult(this)
-                },
-                {
-                    // Pass extra to get entry
-                    FileDatabaseSelectActivity.launchForEntrySelectionResult(this)
-                }
-        )
-        finish()
-        super.onCreate(savedInstanceState)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -1,124 +1,118 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities

 import android.app.Activity
 import android.app.assist.AssistStructure
+import android.app.backup.BackupManager
 import android.content.Intent
-import android.content.pm.PackageManager
+import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.os.Looper
+import android.preference.PreferenceManager
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
-import android.view.*
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
-import android.widget.*
-import androidx.activity.viewModels
+import android.widget.Button
+import android.widget.CompoundButton
+import android.widget.EditText
+import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.biometric.BiometricManager
-import androidx.core.app.ActivityCompat
-import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
+import com.kunzisoft.keepass.activities.dialogs.FingerPrintExplanationDialog
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
+import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
-import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
+import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
+import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager
-import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
+import com.kunzisoft.keepass.database.action.ProgressDialogThread
 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.LoadDatabaseDuplicateUuidException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
-import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.CIPHER_ENTITY_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_URI_KEY
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.MASTER_PASSWORD_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.READ_ONLY_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.utils.BACK_PREVIOUS_KEYBOARD_ACTION
+import com.kunzisoft.keepass.utils.FileDatabaseInfo
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.utils.closeDatabase
 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() {
+class PasswordActivity : StylishActivity() {

    // Views
    private var toolbar: Toolbar? = null
+
+    private var containerView: View? = null
    private var filenameView: TextView? = null
    private var passwordView: EditText? = null
-    private var keyFileSelectionView: KeyFileSelectionView? = null
+    private var keyFileView: EditText? = null
    private var confirmButtonView: Button? = null
    private var checkboxPasswordView: CompoundButton? = null
    private var checkboxKeyFileView: CompoundButton? = null
+    private var checkboxDefaultDatabaseView: CompoundButton? = null
    private var advancedUnlockInfoView: AdvancedUnlockInfoView? = null
-    private var infoContainerView: ViewGroup? = null
    private var enableButtonOnCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null

-    private val databaseFileViewModel: DatabaseFileViewModel by viewModels()
-
    private var mDatabaseFileUri: Uri? = null
    private var mDatabaseKeyFileUri: Uri? = null

+    private var prefs: SharedPreferences? = null
+
    private var mRememberKeyFile: Boolean = false
-    private var mSelectFileHelper: SelectFileHelper? = null
+    private var mOpenFileHelper: OpenFileHelper? = null

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

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

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

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

+        prefs = PreferenceManager.getDefaultSharedPreferences(this)
+
+        mRememberKeyFile = PreferencesUtil.rememberKeyFiles(this)
+
        setContentView(R.layout.activity_password)

        toolbar = findViewById(R.id.toolbar)
@@ -127,26 +121,21 @@ open class PasswordActivity : SpecialModeActivity() {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        confirmButtonView = findViewById(R.id.activity_password_open_button)
+        containerView = findViewById(R.id.container)
+        confirmButtonView = findViewById(R.id.pass_ok)
        filenameView = findViewById(R.id.filename)
        passwordView = findViewById(R.id.password)
-        keyFileSelectionView = findViewById(R.id.keyfile_selection)
+        keyFileView = findViewById(R.id.pass_keyfile)
        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)
+        checkboxDefaultDatabaseView = findViewById(R.id.default_database)
+        advancedUnlockInfoView = findViewById(R.id.fingerprint_info)

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

-        mSelectFileHelper = SelectFileHelper(this@PasswordActivity)
-        keyFileSelectionView?.apply {
-            mSelectFileHelper?.selectFileOnClickViewListener?.let {
-                setOnClickListener(it)
-                setOnLongClickListener(it)
-            }
-        }
+        val browseView = findViewById<View>(R.id.open_database_button)
+        mOpenFileHelper = OpenFileHelper(this@PasswordActivity)
+        browseView.setOnClickListener(mOpenFileHelper!!.openFileOnClickViewListener)

        passwordView?.setOnEditorActionListener(onEditorActionListener)
        passwordView?.addTextChangedListener(object : TextWatcher {
@@ -159,58 +148,52 @@ open class PasswordActivity : SpecialModeActivity() {
                    checkboxPasswordView?.isChecked = true
            }
        })
+        keyFileView?.setOnEditorActionListener(onEditorActionListener)
+        keyFileView?.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+
+            override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+
+            override fun afterTextChanged(editable: Editable) {
+                if (editable.toString().isNotEmpty() && checkboxKeyFileView?.isChecked != true)
+                    checkboxKeyFileView?.isChecked = true
+            }
+        })

        enableButtonOnCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ ->
            enableOrNotTheConfirmationButton()
        }

-        // If is a view intent
-        getUriFromIntent(intent)
-        if (savedInstanceState?.containsKey(KEY_KEYFILE) == true) {
-            mDatabaseKeyFileUri = UriUtil.parse(savedInstanceState.getString(KEY_KEYFILE))
-        }
-        if (savedInstanceState?.containsKey(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT) == true) {
-            mAllowAutoOpenBiometricPrompt = savedInstanceState.getBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT)
-        }
-
-        // Observe database file change
-        databaseFileViewModel.databaseFileLoaded.observe(this, Observer { databaseFile ->
-            // Force read only if the file does not exists
-            mForceReadOnly = databaseFile?.let {
-                !it.databaseFileExists
-            } ?: true
-            invalidateOptionsMenu()
-
-            // Post init uri with KeyFile only if needed
-            val keyFileUri =
-                    if (mRememberKeyFile
-                            && (mDatabaseKeyFileUri == null || mDatabaseKeyFileUri.toString().isEmpty())) {
-                        databaseFile?.keyFileUri
-                    } else {
-                        mDatabaseKeyFileUri
+        progressDialogThread = ProgressDialogThread(this) { actionTask, result ->
+            when (actionTask) {
+                ACTION_DATABASE_LOAD_TASK -> {
+                    // Recheck fingerprint if error
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
+                            // Stay with the same mode and init it
+                            advancedUnlockedManager?.initBiometricMode()
+                        }
                    }

-            // Define title
-            filenameView?.text = databaseFile?.databaseAlias ?: ""
+                    var databaseUri: Uri? = null
+                    var masterPassword: String? = null
+                    var keyFileUri: Uri? = null
+                    var readOnly = true
+                    var cipherEntity: CipherDatabaseEntity? = null

-            onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri)
-        })
+                    result.data?.let { resultData ->
+                        databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
+                        masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
+                        keyFileUri = resultData.getParcelable(KEY_FILE_KEY)
+                        readOnly = resultData.getBoolean(READ_ONLY_KEY)
+                        cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
+                    }

-        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
-            onActionFinish = { actionTask, result ->
-                when (actionTask) {
-                    ACTION_DATABASE_LOAD_TASK -> {
-                        // Recheck biometric if error
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                            if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
-                                // Stay with the same mode and init it
-                                advancedUnlockedManager?.initBiometricMode()
-                            }
-                        }
+                    databaseUri?.let { databaseFileUri ->
+                        // Remove the password in view in all cases
+                        removePassword()

                        if (result.isSuccess) {
-                            mDatabaseKeyFileUri = null
-                            clearCredentialsViews(true)
                            launchGroupActivity()
                        } else {
                            var resultError = ""
@@ -219,43 +202,24 @@ open class PasswordActivity : SpecialModeActivity() {

                            if (resultException != null) {
                                resultError = resultException.getLocalizedMessage(resources)
-
-                                // Relaunch loading if we need to fix UUID
-                                if (resultException is DuplicateUuidDatabaseException) {
+                                if (resultException is LoadDatabaseDuplicateUuidException)
                                    showLoadDatabaseDuplicateUuidMessage {
-
-                                        var databaseUri: Uri? = null
-                                        var masterPassword: String? = null
-                                        var keyFileUri: Uri? = null
-                                        var readOnly = true
-                                        var cipherEntity: CipherDatabaseEntity? = null
-
-                                        result.data?.let { resultData ->
-                                            databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
-                                            masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
-                                            keyFileUri = resultData.getParcelable(KEY_FILE_URI_KEY)
-                                            readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                            cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
-                                        }
-
-                                        databaseUri?.let { databaseFileUri ->
-                                            showProgressDialogAndLoadDatabase(
-                                                    databaseFileUri,
-                                                    masterPassword,
-                                                    keyFileUri,
-                                                    readOnly,
-                                                    cipherEntity,
-                                                    true)
-                                        }
+                                        showProgressDialogAndLoadDatabase(
+                                                databaseFileUri,
+                                                masterPassword,
+                                                keyFileUri,
+                                                readOnly,
+                                                cipherEntity,
+                                                true)
                                    }
-                                }
                            }

-                            // Show error message
                            if (resultMessage != null && resultMessage.isNotEmpty()) {
                                resultError = "$resultError $resultMessage"
                            }
-                            Log.e(TAG, resultError)
+
+                            Log.e(TAG, resultError, resultException)
+
                            Snackbar.make(activity_password_coordinator_layout,
                                    resultError,
                                    Snackbar.LENGTH_LONG).asError().show()
@@ -266,91 +230,19 @@ open class PasswordActivity : SpecialModeActivity() {
        }
    }

-    private fun getUriFromIntent(intent: Intent?) {
-        // If is a view intent
-        val action = intent?.action
-        if (action != null
-                && action == VIEW_INTENT) {
-            mDatabaseFileUri = intent.data
-            mDatabaseKeyFileUri = UriUtil.getUriFromIntent(intent, KEY_KEYFILE)
-        } else {
-            mDatabaseFileUri = intent?.getParcelableExtra(KEY_FILENAME)
-            mDatabaseKeyFileUri = intent?.getParcelableExtra(KEY_KEYFILE)
-        }
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        getUriFromIntent(intent)
-    }
-
    private fun launchGroupActivity() {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
        EntrySelectionHelper.doEntrySelectionAction(intent,
                {
-                    GroupActivity.launch(this@PasswordActivity,
-                            true,
-                            searchInfo,
-                            readOnly)
-                    // Finish activity if no search info
-                    if (searchInfo != null) {
-                        finish()
-                    }
+                    GroupActivity.launch(this@PasswordActivity, readOnly)
                },
                {
-                    SearchHelper.checkAutoSearchInfo(this,
-                            Database.getInstance(),
-                            searchInfo,
-                            { items ->
-                                // Response is build
-                                if (items.size == 1) {
-                                    populateKeyboardAndMoveAppToBackground(this@PasswordActivity,
-                                            items[0],
-                                            intent)
-                                } else {
-                                    // Select the one we want
-                                    GroupActivity.launchForEntrySelectionResult(this,
-                                            true,
-                                            searchInfo)
-                                }
-                            },
-                            {
-                                // Here no search info found, disable auto search
-                                GroupActivity.launchForEntrySelectionResult(this@PasswordActivity,
-                                        false,
-                                        searchInfo,
-                                        readOnly)
-                            },
-                            {
-                                // Simply close if database not opened, normally not happened
-                            }
-                    )
+                    GroupActivity.launchForKeyboardSelection(this@PasswordActivity, readOnly)
                    // Do not keep history
                    finish()
                },
                { assistStructure ->
                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        SearchHelper.checkAutoSearchInfo(this,
-                                Database.getInstance(),
-                                searchInfo,
-                                { items ->
-                                    // Response is build
-                                    AutofillHelper.buildResponse(this, items)
-                                    finish()
-                                },
-                                {
-                                    // Here no search info found, disable auto search
-                                    GroupActivity.launchForAutofillResult(this@PasswordActivity,
-                                            assistStructure,
-                                            false,
-                                            searchInfo,
-                                            readOnly)
-                                },
-                                {
-                                    // Simply close if database not opened, normally not happened
-                                    finish()
-                                }
-                        )
+                        GroupActivity.launchForAutofillResult(this@PasswordActivity, assistStructure, readOnly)
                    }
                })
    }
@@ -366,54 +258,107 @@ open class PasswordActivity : SpecialModeActivity() {
    }

    override fun onResume() {
+        if (Database.getInstance().loaded)
+            launchGroupActivity()
+
+        // If the database isn't accessible make sure to clear the password field, if it
+        // was saved in the instance state
+        if (Database.getInstance().loaded) {
+            setEmptyViews()
+        }
+
+        // For check shutdown
        super.onResume()

-        if (Database.getInstance().loaded) {
-            launchGroupActivity()
+        progressDialogThread?.registerProgressTask()
+
+        initUriFromIntent()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
+        super.onSaveInstanceState(outState)
+    }
+
+    private fun initUriFromIntent() {
+
+        val databaseUri: Uri?
+        val keyFileUri: Uri?
+
+        // If is a view intent
+        val action = intent.action
+        if (action != null
+                && action == VIEW_INTENT) {
+            databaseUri = intent.data
+            keyFileUri = UriUtil.getUriFromIntent(intent, KEY_KEYFILE)
        } else {
-            mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
+            databaseUri = intent.getParcelableExtra(KEY_FILENAME)
+            keyFileUri = intent.getParcelableExtra(KEY_KEYFILE)
+        }

-            // If the database isn't accessible make sure to clear the password field, if it
-            // was saved in the instance state
-            if (Database.getInstance().loaded) {
-                clearCredentialsViews()
+        // Post init uri with KeyFile if needed
+        if (mRememberKeyFile && (keyFileUri == null || keyFileUri.toString().isEmpty())) {
+            // Retrieve KeyFile in a thread
+            databaseUri?.let { databaseUriNotNull ->
+                FileDatabaseHistoryAction.getInstance(applicationContext)
+                        .getKeyFileUriByDatabaseUri(databaseUriNotNull)  {
+                            onPostInitUri(databaseUri, it)
+                        }
            }
-
-            mProgressDatabaseTaskProvider?.registerProgressTask()
-
-            // Back to previous keyboard is setting activated
-            if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this)) {
-                sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
-            }
-
-            // Don't allow auto open prompt if lock become when UI visible
-            mAllowAutoOpenBiometricPrompt = if (LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true)
-                false
-            else
-                mAllowAutoOpenBiometricPrompt
-
-            mDatabaseFileUri?.let { databaseFileUri ->
-                databaseFileViewModel.loadDatabaseFile(databaseFileUri)
-            }
-
-            checkPermission()
+        } else {
+            onPostInitUri(databaseUri, keyFileUri)
        }
    }

-    private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
-        // Define Key File text
-        if (mRememberKeyFile) {
-            populateKeyFileTextView(keyFileUri)
+    private fun onPostInitUri(databaseFileUri: Uri?, keyFileUri: Uri?) {
+        mDatabaseFileUri = databaseFileUri
+        mDatabaseKeyFileUri = keyFileUri
+
+        // Define title
+        databaseFileUri?.let {
+            FileDatabaseInfo(this, it).retrieveDatabaseTitle { title ->
+                filenameView?.text = title
+            }
        }

-        // Define listener for validate button
+        // Define Key File text
+        val keyUriString = keyFileUri?.toString() ?: ""
+        if (keyUriString.isNotEmpty() && mRememberKeyFile) { // Bug KeepassDX #18
+            populateKeyFileTextView(keyUriString)
+        }
+
+        // Define listeners for default database checkbox and validate button
+        checkboxDefaultDatabaseView?.setOnCheckedChangeListener { _, isChecked ->
+            var newDefaultFileName: Uri? = null
+            if (isChecked) {
+                newDefaultFileName = databaseFileUri ?: newDefaultFileName
+            }
+
+            prefs?.edit()?.apply {
+                newDefaultFileName?.let {
+                    putString(KEY_DEFAULT_DATABASE_PATH, newDefaultFileName.toString())
+                } ?: kotlin.run {
+                    remove(KEY_DEFAULT_DATABASE_PATH)
+                }
+                apply()
+            }
+
+            val backupManager = BackupManager(this@PasswordActivity)
+            backupManager.dataChanged()
+        }
        confirmButtonView?.setOnClickListener { verifyCheckboxesAndLoadDatabase() }

+        // Retrieve settings for default database
+        val defaultFilename = prefs?.getString(KEY_DEFAULT_DATABASE_PATH, "")
+        if (databaseFileUri != null
+                && databaseFileUri.path != null && databaseFileUri.path!!.isNotEmpty()
+                && databaseFileUri == UriUtil.parse(defaultFilename)) {
+            checkboxDefaultDatabaseView?.isChecked = true
+        }
+
        // If Activity is launch with a password and want to open directly
        val intent = intent
        val password = intent.getStringExtra(KEY_PASSWORD)
-        // Consume the intent extra password
-        intent.removeExtra(KEY_PASSWORD)
        val launchImmediately = intent.getBooleanExtra(KEY_LAUNCH_IMMEDIATELY, false)
        if (password != null) {
            populatePasswordTextView(password)
@@ -421,10 +366,15 @@ open class PasswordActivity : SpecialModeActivity() {
        if (launchImmediately) {
            verifyCheckboxesAndLoadDatabase(password, keyFileUri)
        } else {
-            // Init Biometric elements
-            var biometricInitialize = false
+            // Init FingerPrint elements
+            var fingerPrintInit = false
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                if (PreferencesUtil.isBiometricUnlockEnable(this)) {
+
+                    advancedUnlockInfoView?.setOnClickListener {
+                        FingerPrintExplanationDialog().show(supportFragmentManager, "fingerPrintExplanationDialog")
+                    }
+
                    if (advancedUnlockedManager == null && databaseFileUri != null) {
                        advancedUnlockedManager = AdvancedUnlockedManager(this,
                                databaseFileUri,
@@ -446,20 +396,18 @@ open class PasswordActivity : SpecialModeActivity() {
                                { passwordDecrypted ->
                                    // Load the database if password is retrieve from biometric
                                    passwordDecrypted?.let {
-                                        // Retrieve from biometric
+                                        // Retrieve from fingerprint
                                        verifyKeyFileCheckboxAndLoadDatabase(it)
                                    }
                                })
                    }
-                    advancedUnlockedManager?.isBiometricPromptAutoOpenEnable = mAllowAutoOpenBiometricPrompt
-                    advancedUnlockedManager?.checkBiometricAvailability()
-                    biometricInitialize = true
+                    advancedUnlockedManager?.initBiometric()
+                    fingerPrintInit = true
                } else {
                    advancedUnlockedManager?.destroy()
-                    advancedUnlockInfoView?.visibility = View.GONE
                }
            }
-            if (!biometricInitialize) {
+            if (!fingerPrintInit) {
                checkboxPasswordView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
            }
            checkboxKeyFileView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
@@ -480,9 +428,10 @@ open class PasswordActivity : SpecialModeActivity() {
        }
    }

-    private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile) {
+    private fun setEmptyViews() {
        populatePasswordTextView(null)
-        if (clearKeyFile) {
+        // Bug KeepassDX #18
+        if (!mRememberKeyFile) {
            populateKeyFileTextView(null)
        }
    }
@@ -499,46 +448,38 @@ open class PasswordActivity : SpecialModeActivity() {
        }
    }

-    private fun populateKeyFileTextView(uri: Uri?) {
-        if (uri == null || uri.toString().isEmpty()) {
-            keyFileSelectionView?.uri = null
+    private fun populateKeyFileTextView(text: String?) {
+        if (text == null || text.isEmpty()) {
+            keyFileView?.setText("")
            if (checkboxKeyFileView?.isChecked == true)
                checkboxKeyFileView?.isChecked = false
        } else {
-            keyFileSelectionView?.uri = uri
+            keyFileView?.setText(text)
            if (checkboxKeyFileView?.isChecked != true)
                checkboxKeyFileView?.isChecked = true
        }
    }

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

-        // Reinit locking activity UI variable
-        LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
-        mAllowAutoOpenBiometricPrompt = true
+        progressDialogThread?.unregisterProgressTask()

        super.onPause()
    }

-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(KEY_PERMISSION_ASKED, mPermissionAsked)
-        mDatabaseKeyFileUri?.let {
-            outState.putString(KEY_KEYFILE, it.toString())
+    override fun onDestroy() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            advancedUnlockedManager?.destroy()
        }
-        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
-        outState.putBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT, false)
-        super.onSaveInstanceState(outState)
+        super.onDestroy()
    }

    private fun verifyCheckboxesAndLoadDatabase(cipherDatabaseEntity: CipherDatabaseEntity? = null) {
        val password: String? = passwordView?.text?.toString()
-        val keyFile: Uri? = keyFileSelectionView?.uri
+        val keyFile: Uri? = UriUtil.parse(keyFileView?.text?.toString())
        verifyCheckboxesAndLoadDatabase(password, keyFile, cipherDatabaseEntity)
    }

@@ -551,7 +492,7 @@ open class PasswordActivity : SpecialModeActivity() {
    }

    private fun verifyKeyFileCheckboxAndLoadDatabase(password: String?) {
-        val keyFile: Uri? = keyFileSelectionView?.uri
+        val keyFile: Uri? = UriUtil.parse(keyFileView?.text?.toString())
        verifyKeyFileCheckbox(keyFile)
        loadDatabase(mDatabaseFileUri, password, mDatabaseKeyFileUri)
    }
@@ -560,13 +501,18 @@ open class PasswordActivity : SpecialModeActivity() {
        mDatabaseKeyFileUri = if (checkboxKeyFileView?.isChecked != true) null else keyFile
    }

+    private fun removePassword() {
+        passwordView?.setText("")
+        checkboxPasswordView?.isChecked = false
+    }
+
    private fun loadDatabase(databaseFileUri: Uri?,
                             password: String?,
                             keyFileUri: Uri?,
                             cipherDatabaseEntity: CipherDatabaseEntity? = null) {

        if (PreferencesUtil.deletePasswordAfterConnexionAttempt(this)) {
-            clearCredentialsViews()
+            removePassword()
        }

        databaseFileUri?.let { databaseUri ->
@@ -587,7 +533,7 @@ open class PasswordActivity : SpecialModeActivity() {
                                                  readOnly: Boolean,
                                                  cipherDatabaseEntity: CipherDatabaseEntity?,
                                                  fixDuplicateUUID: Boolean) {
-        mProgressDatabaseTaskProvider?.startDatabaseLoad(
+        progressDialogThread?.startDatabaseLoad(
                databaseUri,
                password,
                keyFile,
@@ -603,77 +549,39 @@ open class PasswordActivity : SpecialModeActivity() {
        }.show(supportFragmentManager, "duplicateUUIDDialog")
    }

+    // To fix multiple view education
+    private var performedEductionInProgress = false
+
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        val inflater = menuInflater
        // Read menu
        inflater.inflate(R.menu.open_file, menu)
-        if (mSelectionMode || mForceReadOnly) {
-            menu.removeItem(R.id.menu_open_file_read_mode_key)
-        } else {
-            changeOpenFileReadIcon(menu.findItem(R.id.menu_open_file_read_mode_key))
-        }
+        changeOpenFileReadIcon(menu.findItem(R.id.menu_open_file_read_mode_key))

-        if (!mSelectionMode) {
-            MenuUtil.defaultMenuInflater(inflater, menu)
-        }
+        MenuUtil.defaultMenuInflater(inflater, menu)

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

        super.onCreateOptionsMenu(menu)

-        launchEducation(menu)
+        if (!performedEductionInProgress) {
+            performedEductionInProgress = true
+            // Show education views
+            Handler().post { performedNextEducation(PasswordActivityEducation(this), menu) }
+        }

        return true
    }

-    // Check permission
-    private fun checkPermission() {
-        val writePermission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-        val permissions = arrayOf(writePermission)
-        if (Build.VERSION.SDK_INT >= 23
-                && !readOnly
-                && !mPermissionAsked) {
-            mPermissionAsked = true
-            // Check self permission to show or not the dialog
-            if (toolbar != null
-                    && ActivityCompat.checkSelfPermission(this, writePermission) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this, permissions, WRITE_EXTERNAL_STORAGE_REQUEST)
-            }
-        }
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        when (requestCode) {
-            WRITE_EXTERNAL_STORAGE_REQUEST -> {
-                if (grantResults.isEmpty() || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                    if (ActivityCompat.shouldShowRequestPermissionRationale(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE))
-                        Toast.makeText(this, R.string.read_only_warning, Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    // To fix multiple view education
-    private var performedEductionInProgress = false
-    private fun launchEducation(menu: Menu) {
-        if (!performedEductionInProgress) {
-            performedEductionInProgress = true
-            // Show education views
-            Handler(Looper.getMainLooper()).post { performedNextEducation(PasswordActivityEducation(this), menu) }
-        }
-    }
-
    private fun performedNextEducation(passwordActivityEducation: PasswordActivityEducation,
                                       menu: Menu) {
-        val educationToolbar = toolbar
-        val unlockEducationPerformed = educationToolbar != null
+        val educationContainerView = containerView
+        val unlockEducationPerformed = educationContainerView != null
                && passwordActivityEducation.checkAndPerformedUnlockEducation(
-                educationToolbar,
+                educationContainerView,
                        {
                            performedNextEducation(passwordActivityEducation, menu)
                        },
@@ -681,6 +589,7 @@ open class PasswordActivity : SpecialModeActivity() {
                            performedNextEducation(passwordActivityEducation, menu)
                        })
        if (!unlockEducationPerformed) {
+            val educationToolbar = toolbar
            val readOnlyEducationPerformed =
                    educationToolbar?.findViewById<View>(R.id.menu_open_file_read_mode_key) != null
                    && passwordActivityEducation.checkAndPerformedReadOnlyEducation(
@@ -694,18 +603,15 @@ open class PasswordActivity : SpecialModeActivity() {
                    })

            if (!readOnlyEducationPerformed) {
+
                val biometricCanAuthenticate = BiometricManager.from(this).canAuthenticate()
+                // fingerprintEducationPerformed
                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                        && PreferencesUtil.isBiometricUnlockEnable(applicationContext)
                        && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
                        && advancedUnlockInfoView != null && advancedUnlockInfoView?.unlockIconImageView != null
-                        && passwordActivityEducation.checkAndPerformedBiometricEducation(advancedUnlockInfoView?.unlockIconImageView!!,
-                        {
-                            performedNextEducation(passwordActivityEducation, menu)
-                        },
-                        {
-                            performedNextEducation(passwordActivityEducation, menu)
-                        })
+                        && passwordActivityEducation.checkAndPerformedFingerprintEducation(advancedUnlockInfoView?.unlockIconImageView!!)
+
            }
        }
    }
@@ -728,7 +634,7 @@ open class PasswordActivity : SpecialModeActivity() {
                readOnly = !readOnly
                changeOpenFileReadIcon(item)
            }
-            R.id.menu_biometric_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            R.id.menu_fingerprint_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                advancedUnlockedManager?.deleteEntryKey()
            }
            else -> return MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
@@ -743,32 +649,26 @@ open class PasswordActivity : SpecialModeActivity() {
            data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)

-        mAllowAutoOpenBiometricPrompt = false
-
        // To get entry in result
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
        }

        var keyFileResult = false
-        mSelectFileHelper?.let {
+        mOpenFileHelper?.let {
            keyFileResult = it.onActivityResultCallback(requestCode, resultCode, data
            ) { uri ->
                if (uri != null) {
-                    mDatabaseKeyFileUri = uri
-                    populateKeyFileTextView(uri)
+                    populateKeyFileTextView(uri.toString())
                }
            }
        }
        if (!keyFileResult) {
            // this block if not a key file response
            when (resultCode) {
-                LockingActivity.RESULT_EXIT_LOCK -> {
-                    clearCredentialsViews()
-                    Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this))
-                }
-                Activity.RESULT_CANCELED -> {
-                    clearCredentialsViews()
+                LockingActivity.RESULT_EXIT_LOCK, Activity.RESULT_CANCELED -> {
+                    setEmptyViews()
+                    Database.getInstance().closeAndClear(applicationContext.filesDir)
                }
            }
        }
@@ -778,16 +678,14 @@ open class PasswordActivity : SpecialModeActivity() {

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

+        const val KEY_DEFAULT_DATABASE_PATH = "KEY_DEFAULT_DATABASE_PATH"
+
        private const val KEY_FILENAME = "fileName"
        private const val KEY_KEYFILE = "keyFile"
        private const val VIEW_INTENT = "android.intent.action.VIEW"

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

        private fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?,
                                         intentBuildLauncher: (Intent) -> Unit) {
@@ -808,12 +706,8 @@ open class PasswordActivity : SpecialModeActivity() {
        fun launch(
                activity: Activity,
                databaseFile: Uri,
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
+                keyFile: Uri?) {
            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                searchInfo?.let {
-                    intent.putExtra(KEY_SEARCH_INFO, it)
-                }
                activity.startActivity(intent)
            }
        }
@@ -828,13 +722,9 @@ open class PasswordActivity : SpecialModeActivity() {
        fun launchForKeyboardResult(
                activity: Activity,
                databaseFile: Uri,
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
+                keyFile: Uri?) {
            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                EntrySelectionHelper.startActivityForEntrySelectionResult(
-                        activity,
-                        intent,
-                        searchInfo)
+                EntrySelectionHelper.startActivityForEntrySelection(activity, intent)
            }
        }

@@ -850,18 +740,16 @@ open class PasswordActivity : SpecialModeActivity() {
                activity: Activity,
                databaseFile: Uri,
                keyFile: Uri?,
-                assistStructure: AssistStructure?,
-                searchInfo: SearchInfo?) {
+                assistStructure: AssistStructure?) {
            if (assistStructure != null) {
                buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
                    AutofillHelper.startActivityForAutofillResult(
                            activity,
                            intent,
-                            assistStructure,
-                            searchInfo)
+                            assistStructure)
                }
            } else {
-                launch(activity, databaseFile, keyFile, searchInfo)
+                launch(activity, databaseFile, keyFile)
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -25,20 +25,17 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.text.Editable
-import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.View
 import android.widget.CompoundButton
-import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
 import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.view.KeyFileSelectionView

 class AssignMasterKeyDialogFragment : DialogFragment() {

@@ -54,16 +51,13 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
    private var passwordRepeatTextInputLayout: TextInputLayout? = null
    private var passwordRepeatView: TextView? = null

+    private var keyFileTextInputLayout: TextInputLayout? = null
    private var keyFileCheckBox: CompoundButton? = null
-    private var keyFileSelectionView: KeyFileSelectionView? = null
+    private var keyFileView: TextView? = null

    private var mListener: AssignPasswordDialogListener? = null

-    private var mSelectFileHelper: SelectFileHelper? = null
-
-    private var mEmptyPasswordConfirmationDialog: AlertDialog? = null
-    private var mNoKeyConfirmationDialog: AlertDialog? = null
-    private var mEmptyKeyFileConfirmationDialog: AlertDialog? = null
+    private var mOpenFileHelper: OpenFileHelper? = null

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

+    private val keyFileTextWatcher = object : TextWatcher {
+        override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+
+        override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+
+        override fun afterTextChanged(editable: Editable) {
+            keyFileCheckBox?.isChecked = true
+        }
+    }
+
    interface AssignPasswordDialogListener {
        fun onAssignKeyDialogPositiveClick(masterPasswordChecked: Boolean, masterPassword: String?,
                                           keyFileChecked: Boolean, keyFile: Uri?)
@@ -92,17 +96,6 @@ 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 ->

@@ -117,29 +110,24 @@ 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)
            passwordRepeatTextInputLayout = rootView?.findViewById(R.id.password_repeat_input_layout)
            passwordRepeatView = rootView?.findViewById(R.id.pass_conf_password)

+            keyFileTextInputLayout = rootView?.findViewById(R.id.keyfile_input_layout)
            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
-            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)
+            keyFileView = rootView?.findViewById(R.id.pass_keyfile)

-            mSelectFileHelper = SelectFileHelper(this)
-            keyFileSelectionView?.apply {
-                setOnClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
-                setOnLongClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
-            }
+            mOpenFileHelper = OpenFileHelper(this)
+            rootView?.findViewById<View>(R.id.open_database_button)?.setOnClickListener { view ->
+                mOpenFileHelper?.openFileOnClickViewListener?.onClick(view) }

            val dialog = builder.create()

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

-                        var error = verifyPassword() || verifyKeyFile()
+                        var error = verifyPassword() || verifyFile()
                        if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
                            error = true
                            if (allowNoMasterKey)
@@ -188,12 +176,14 @@ class AssignMasterKeyDialogFragment : DialogFragment() {

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

    override fun onPause() {
        super.onPause()

        passwordView?.removeTextChangedListener(passwordTextWatcher)
+        keyFileView?.removeTextChangedListener(keyFileTextWatcher)
    }

    private fun verifyPassword(): Boolean {
@@ -221,16 +211,16 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
        return error
    }

-    private fun verifyKeyFile(): Boolean {
+    private fun verifyFile(): Boolean {
        var error = false
        if (keyFileCheckBox != null
                && keyFileCheckBox!!.isChecked) {

-            keyFileSelectionView?.uri?.let { uri ->
+            UriUtil.parse(keyFileView?.text?.toString())?.let { uri ->
                mKeyFile = uri
            } ?: run {
                error = true
-                keyFileSelectionView?.error = getString(R.string.error_nokeyfile)
+                keyFileTextInputLayout?.error = getString(R.string.error_nokeyfile)
            }
        }
        return error
@@ -241,7 +231,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
            val builder = AlertDialog.Builder(it)
            builder.setMessage(R.string.warning_empty_password)
                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        if (!verifyKeyFile()) {
+                        if (!verifyFile()) {
                            mListener?.onAssignKeyDialogPositiveClick(
                                    passwordCheckBox!!.isChecked, mMasterPassword,
                                    keyFileCheckBox!!.isChecked, mKeyFile)
@@ -249,8 +239,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                        }
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            mEmptyPasswordConfirmationDialog = builder.create()
-            mEmptyPasswordConfirmationDialog?.show()
+            builder.create().show()
        }
    }

@@ -265,44 +254,19 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                        this@AssignMasterKeyDialogFragment.dismiss()
                    }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            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()
+            builder.create().show()
        }
    }

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

-        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+        mOpenFileHelper?.onActivityResultCallback(requestCode, resultCode, data
+        ) { uri ->
            uri?.let { pathUri ->
-                UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
-                    keyFileSelectionView?.error = null
-                    keyFileCheckBox?.isChecked = true
-                    keyFileSelectionView?.uri = pathUri
-                    if (lengthFile <= 0L) {
-                        showEmptyKeyFileConfirmationDialog()
-                    }
-                }
+                keyFileCheckBox?.isChecked = true
+                keyFileView?.text = pathUri.toString()
+
            }
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -28,7 +28,7 @@ import android.widget.TextView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.utils.UriUtil

-class FileManagerDialogFragment : DialogFragment() {
+class BrowserDialogFragment : DialogFragment() {

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
@@ -41,8 +41,15 @@ class FileManagerDialogFragment : DialogFragment() {
            val textDescription = root.findViewById<TextView>(R.id.file_manager_install_description)
            textDescription.text = getString(R.string.file_manager_install_description)

-            root.findViewById<Button>(R.id.file_manager_button).setOnClickListener {
-                UriUtil.gotoUrl(requireContext(), R.string.file_manager_explanation_url)
+            val market = root.findViewById<Button>(R.id.file_manager_install_play_store)
+            market.setOnClickListener {
+                UriUtil.gotoUrl(context!!, R.string.file_manager_play_store)
+                dismiss()
+            }
+
+            val web = root.findViewById<Button>(R.id.file_manager_install_f_droid)
+            web.setOnClickListener {
+                UriUtil.gotoUrl(context!!, R.string.file_manager_f_droid)
                dismiss()
            }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
@@ -1,66 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.DatePickerDialog
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-
-class DatePickerFragment : DialogFragment() {
-
-    private var mDefaultYear: Int = 2000
-    private var mDefaultMonth: Int = 1
-    private var mDefaultDay: Int = 1
-
-    private var mListener: DatePickerDialog.OnDateSetListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            mListener = context as DatePickerDialog.OnDateSetListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + DatePickerDialog.OnDateSetListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        // Create a new instance of DatePickerDialog and return it
-        return context?.let {
-            arguments?.apply {
-                if (containsKey(DEFAULT_YEAR_BUNDLE_KEY))
-                    mDefaultYear = getInt(DEFAULT_YEAR_BUNDLE_KEY)
-                if (containsKey(DEFAULT_MONTH_BUNDLE_KEY))
-                    mDefaultMonth = getInt(DEFAULT_MONTH_BUNDLE_KEY)
-                if (containsKey(DEFAULT_DAY_BUNDLE_KEY))
-                    mDefaultDay = getInt(DEFAULT_DAY_BUNDLE_KEY)
-            }
-
-            DatePickerDialog(it, mListener, mDefaultYear, mDefaultMonth, mDefaultDay)
-        } ?: super.onCreateDialog(savedInstanceState)
-    }
-
-    companion object {
-
-        private const val DEFAULT_YEAR_BUNDLE_KEY = "DEFAULT_YEAR_BUNDLE_KEY"
-        private const val DEFAULT_MONTH_BUNDLE_KEY = "DEFAULT_MONTH_BUNDLE_KEY"
-        private const val DEFAULT_DAY_BUNDLE_KEY = "DEFAULT_DAY_BUNDLE_KEY"
-
-        fun getInstance(defaultYear: Int,
-                        defaultMonth: Int,
-                        defaultDay: Int): DatePickerFragment {
-            return DatePickerFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(DEFAULT_YEAR_BUNDLE_KEY, defaultYear)
-                    putInt(DEFAULT_MONTH_BUNDLE_KEY, defaultMonth)
-                    putInt(DEFAULT_DAY_BUNDLE_KEY, defaultDay)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
@@ -1,98 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
-
-class DeleteNodesDialogFragment : DialogFragment() {
-
-    private var mNodesToDelete: List<Node> = ArrayList()
-    private var mListener: DeleteNodeListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            mListener = context as DeleteNodeListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + DeleteNodeListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        arguments?.apply {
-            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
-                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
-                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), this)
-            }
-        } ?: savedInstanceState?.apply {
-            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
-                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
-                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), savedInstanceState)
-            }
-        }
-        activity?.let { activity ->
-            // Use the Builder class for convenient dialog construction
-            val builder = AlertDialog.Builder(activity)
-
-            builder.setMessage(getString(R.string.warning_permanently_delete_nodes))
-            builder.setPositiveButton(android.R.string.ok) { _, _ ->
-                mListener?.permanentlyDeleteNodes(mNodesToDelete)
-            }
-            builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
-            // Create the AlertDialog object and return it
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putAll(getBundleFromListNodes(mNodesToDelete))
-    }
-
-    interface DeleteNodeListener {
-        fun permanentlyDeleteNodes(nodes: List<Node>)
-    }
-
-    companion object {
-        fun getInstance(nodesToDelete: List<Node>): DeleteNodesDialogFragment {
-            return DeleteNodesDialogFragment().apply {
-                arguments = getBundleFromListNodes(nodesToDelete)
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
@@ -1,182 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
-import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.CompoundButton
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.textfield.TextInputLayout
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.security.ProtectedString
-import com.kunzisoft.keepass.model.Field
-
-
-class EntryCustomFieldDialogFragment: DialogFragment() {
-
-    private var oldField: Field? = null
-
-    private var entryCustomFieldListener: EntryCustomFieldListener? = null
-
-    private var customFieldLabelContainer: TextInputLayout? = null
-    private var customFieldLabel: TextView? = null
-    private var customFieldDeleteButton: ImageView? = null
-    private var customFieldProtectionButton: CompoundButton? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            entryCustomFieldListener = context as EntryCustomFieldListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + EntryCustomFieldListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        entryCustomFieldListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_entry_new_field, null)
-            customFieldLabelContainer = root?.findViewById(R.id.entry_custom_field_label_container)
-            customFieldLabel = root?.findViewById(R.id.entry_custom_field_label)
-            customFieldDeleteButton = root?.findViewById(R.id.entry_custom_field_delete)
-            customFieldProtectionButton = root?.findViewById(R.id.entry_custom_field_protection)
-
-            oldField = arguments?.getParcelable(KEY_FIELD)
-            oldField?.let { oldCustomField ->
-                customFieldLabel?.text = oldCustomField.name
-                customFieldProtectionButton?.isChecked = oldCustomField.protectedValue.isProtected
-
-                customFieldDeleteButton?.visibility = View.VISIBLE
-                customFieldDeleteButton?.setOnClickListener {
-                    entryCustomFieldListener?.onDeleteCustomFieldApproved(oldCustomField)
-                    (dialog as AlertDialog?)?.dismiss()
-                }
-            } ?: run {
-                customFieldDeleteButton?.visibility = View.GONE
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            val dialogCreated = builder.create()
-
-            customFieldLabel?.requestFocus()
-            customFieldLabel?.imeOptions = EditorInfo.IME_ACTION_DONE
-            customFieldLabel?.setOnEditorActionListener { _, actionId, _ ->
-                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    approveIfValid()
-                }
-                false
-            }
-
-            dialogCreated.window?.setSoftInputMode(SOFT_INPUT_STATE_VISIBLE)
-            return dialogCreated
-
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        // To prevent auto dismiss
-        val d = dialog as AlertDialog?
-        if (d != null) {
-            val positiveButton = d.getButton(Dialog.BUTTON_POSITIVE) as Button
-            positiveButton.setOnClickListener {
-                approveIfValid()
-            }
-        }
-    }
-
-    private fun approveIfValid() {
-        if (isValid()) {
-            oldField?.let {
-                // New property with old value
-                entryCustomFieldListener?.onEditCustomFieldApproved(it,
-                        Field(customFieldLabel?.text?.toString() ?: "",
-                                ProtectedString(customFieldProtectionButton?.isChecked == true,
-                                        it.protectedValue.stringValue))
-                )
-            } ?: run {
-                entryCustomFieldListener?.onNewCustomFieldApproved(
-                        Field(customFieldLabel?.text?.toString() ?: "",
-                                ProtectedString(customFieldProtectionButton?.isChecked == true))
-                )
-            }
-            (dialog as AlertDialog?)?.dismiss()
-        }
-    }
-
-    private fun isValid(): Boolean {
-        return if (customFieldLabel?.text?.toString()?.isNotEmpty() != true) {
-            setError(R.string.error_string_key)
-            false
-        } else {
-            setError(null)
-            true
-        }
-    }
-
-    fun setError(@StringRes errorId: Int?) {
-        customFieldLabelContainer?.error = if (errorId == null) null else {
-            requireContext().getString(errorId)
-        }
-    }
-
-    interface EntryCustomFieldListener {
-        fun onNewCustomFieldApproved(newField: Field)
-        fun onEditCustomFieldApproved(oldField: Field, newField: Field)
-        fun onDeleteCustomFieldApproved(oldField: Field)
-    }
-
-    companion object {
-
-        private const val KEY_FIELD = "KEY_FIELD"
-
-        fun getInstance(): EntryCustomFieldDialogFragment {
-            return EntryCustomFieldDialogFragment()
-        }
-
-        fun getInstance(field: Field): EntryCustomFieldDialogFragment {
-            return EntryCustomFieldDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putParcelable(KEY_FIELD, field)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
@@ -1,97 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import com.kunzisoft.keepass.R
-
-/**
- * Custom Dialog to confirm big file to upload
- */
-class FileTooBigDialogFragment : DialogFragment() {
-
-    private var mActionChooseListener: ActionChooseListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        // Verify that the host activity implements the callback interface
-        try {
-            mActionChooseListener = context as ActionChooseListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + ActionChooseListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mActionChooseListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            // Use the Builder class for convenient dialog construction
-            val builder = AlertDialog.Builder(activity)
-            builder.setMessage(SpannableStringBuilder().apply {
-                append(getString(R.string.warning_file_too_big))
-                append("\n\n")
-                append(getString(R.string.warning_sure_add_file))
-            })
-            builder.setPositiveButton(android.R.string.ok) { _, _ ->
-                mActionChooseListener?.onValidateUploadFileTooBig(
-                        arguments?.getParcelable(KEY_FILE_URI),
-                        arguments?.getString(KEY_FILE_NAME))
-            }
-            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
-                dismiss()
-            }
-            // Create the AlertDialog object and return it
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    interface ActionChooseListener {
-        fun onValidateUploadFileTooBig(attachmentToUploadUri: Uri?, fileName: String?)
-    }
-
-    companion object {
-        const val MAX_WARNING_BINARY_FILE = 5242880
-
-        private const val KEY_FILE_URI = "KEY_FILE_URI"
-        private const val KEY_FILE_NAME = "KEY_FILE_NAME"
-
-        fun build(attachmentToUploadUri: Uri,
-                  fileName: String): FileTooBigDialogFragment {
-            val fragment = FileTooBigDialogFragment()
-            fragment.arguments = Bundle().apply {
-                putParcelable(KEY_FILE_URI, attachmentToUploadUri)
-                putString(KEY_FILE_NAME, fileName)
-            }
-            return fragment
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FingerPrintExplanationDialog.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FingerPrintExplanationDialog.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.view.View
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.biometric.FingerPrintAnimatedVector
+import com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity
+
+@RequiresApi(api = Build.VERSION_CODES.M)
+class FingerPrintExplanationDialog : DialogFragment() {
+
+    private var fingerPrintAnimatedVector: FingerPrintAnimatedVector? = null
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val builder = AlertDialog.Builder(activity)
+            val inflater = activity.layoutInflater
+
+            val rootView = inflater.inflate(R.layout.fragment_fingerprint_explanation, null)
+
+            rootView.findViewById<View>(R.id.fingerprint_setting_link_text).setOnClickListener {
+                startActivity(Intent(android.provider.Settings.ACTION_SECURITY_SETTINGS))
+            }
+
+            rootView.findViewById<View>(R.id.auto_open_biometric_prompt_button).setOnClickListener {
+                startActivity(Intent(activity, SettingsAdvancedUnlockActivity::class.java))
+            }
+
+            fingerPrintAnimatedVector = FingerPrintAnimatedVector(activity,
+                    rootView.findViewById(R.id.biometric_image))
+
+            builder.setView(rootView)
+                    .setPositiveButton(android.R.string.ok) { _, _ -> }
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        fingerPrintAnimatedVector?.startScan()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        fingerPrintAnimatedVector?.stopScan()
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -64,11 +64,6 @@ class GeneratePasswordDialogFragment : DialogFragment() {
        }
    }

-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            val builder = AlertDialog.Builder(activity)
@@ -172,6 +167,7 @@ class GeneratePasswordDialogFragment : DialogFragment() {
        var password = ""
        try {
            val length = Integer.valueOf(root?.findViewById<EditText>(R.id.length)?.text.toString())
+
            password = PasswordGenerator(resources).generatePassword(length,
                    uppercaseBox?.isChecked == true,
                    lowercaseBox?.isChecked == true,
@@ -182,7 +178,6 @@ class GeneratePasswordDialogFragment : DialogFragment() {
                    specialsBox?.isChecked == true,
                    bracketsBox?.isChecked == true,
                    extendedBox?.isChecked == true)
-            passwordInputLayoutView?.error = null
        } catch (e: NumberFormatException) {
            passwordInputLayoutView?.error = getString(R.string.error_wrong_length)
        } catch (e: IllegalArgumentException) {
@@ -198,6 +193,7 @@ class GeneratePasswordDialogFragment : DialogFragment() {
    }

    companion object {
+
        const val KEY_PASSWORD_ID = "KEY_PASSWORD_ID"
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -33,8 +33,8 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.GroupVersioned
+import com.kunzisoft.keepass.database.element.PwIcon
 import com.kunzisoft.keepass.icons.assignDatabaseIcon

 class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {
@@ -45,7 +45,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP

    private var editGroupDialogAction: EditGroupDialogAction? = null
    private var nameGroup: String? = null
-    private var iconGroup: IconImage? = null
+    private var iconGroup: PwIcon? = null

    private var nameTextLayoutView: TextInputLayout? = null
    private var nameTextView: TextView? = null
@@ -73,11 +73,7 @@ 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 {
@@ -134,7 +130,9 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
                    }

            iconButtonView?.setOnClickListener { _ ->
-                IconPickerDialogFragment().show(parentFragmentManager, "IconPickerDialogFragment")
+                fragmentManager?.let {
+                    IconPickerDialogFragment().show(it, "IconPickerDialogFragment")
+                }
            }

            return builder.create()
@@ -188,8 +186,8 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
    }

    interface EditGroupListener {
-        fun approveEditGroup(action: EditGroupDialogAction?, name: String?, icon: IconImage?)
-        fun cancelEditGroup(action: EditGroupDialogAction?, name: String?, icon: IconImage?)
+        fun approveEditGroup(action: EditGroupDialogAction?, name: String?, icon: PwIcon?)
+        fun cancelEditGroup(action: EditGroupDialogAction?, name: String?, icon: PwIcon?)
    }

    companion object {
@@ -208,7 +206,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
            return fragment
        }

-        fun build(group: Group): GroupEditDialogFragment {
+        fun build(group: GroupVersioned): GroupEditDialogFragment {
            val bundle = Bundle()
            bundle.putString(KEY_NAME, group.title)
            bundle.putParcelable(KEY_ICON, group.icon)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -24,19 +24,18 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import androidx.core.widget.ImageViewCompat
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.GridView
 import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.widget.ImageViewCompat
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.database.element.PwIconStandard
 import com.kunzisoft.keepass.icons.IconPack
 import com.kunzisoft.keepass.icons.IconPackChooser

@@ -57,16 +56,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)

-            iconPack = IconPackChooser.getSelectedIconPack(requireContext())
+            iconPack = IconPackChooser.getSelectedIconPack(context!!)

            // Inflate and set the layout for the dialog
            // Pass null as the parent view because its going in the dialog layout
@@ -78,7 +72,7 @@ class IconPickerDialogFragment : DialogFragment() {

            currIconGridView.setOnItemClickListener { _, _, position, _ ->
                val bundle = Bundle()
-                bundle.putParcelable(KEY_ICON_STANDARD, IconImageStandard(position))
+                bundle.putParcelable(KEY_ICON_STANDARD, PwIconStandard(position))
                iconPickerListener?.iconPicked(bundle)
                dismiss()
            }
@@ -118,7 +112,7 @@ class IconPickerDialogFragment : DialogFragment() {
                    // Retrieve the textColor to tint the icon
                    val ta = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
                    ImageViewCompat.setImageTintList(iconImageView, ColorStateList.valueOf(ta.getColor(0, Color.BLACK)))
-                    ta.recycle()
+                    ta?.recycle()
                }
            }

@@ -134,11 +128,11 @@ class IconPickerDialogFragment : DialogFragment() {

        private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD"

-        fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? {
+        fun getIconStandardFromBundle(bundle: Bundle): PwIconStandard? {
            return bundle.getParcelable(KEY_ICON_STANDARD)
        }

-        fun launch(activity: FragmentActivity) {
+        fun launch(activity: StylishActivity) {
            // Create an instance of the dialog fragment and show it
            val dialog = IconPickerDialogFragment()
            dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/KeyboardExplanationDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/KeyboardExplanationDialogFragment.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.os.Bundle
+import android.provider.Settings
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.view.View
+import com.kunzisoft.keepass.BuildConfig
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.utils.UriUtil
+
+class KeyboardExplanationDialogFragment : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let {
+            val builder = AlertDialog.Builder(activity!!)
+            val inflater = activity!!.layoutInflater
+
+            val rootView = inflater.inflate(R.layout.fragment_keyboard_explanation, null)
+
+            rootView.findViewById<View>(R.id.keyboards_activate_device_setting_button)
+                    .setOnClickListener { launchActivateKeyboardSetting() }
+
+            val containerKeyboardSwitcher = rootView.findViewById<View>(R.id.container_keyboard_switcher)
+            if (BuildConfig.CLOSED_STORE) {
+                containerKeyboardSwitcher.setOnClickListener { UriUtil.gotoUrl(context!!, R.string.keyboard_switcher_play_store) }
+            } else {
+                containerKeyboardSwitcher.setOnClickListener { UriUtil.gotoUrl(context!!, R.string.keyboard_switcher_f_droid) }
+            }
+
+            builder.setView(rootView)
+                    .setPositiveButton(android.R.string.ok) { _, _ -> }
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    private fun launchActivateKeyboardSetting() {
+        val intent = Intent(Settings.ACTION_INPUT_METHOD_SETTINGS)
+        intent.addFlags(FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
@@ -1,71 +1,40 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs

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

 class PasswordEncodingDialogFragment : DialogFragment() {

-    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()
-    }
+    var positiveButtonClickListener: DialogInterface.OnClickListener? = null

    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) { _, _ ->
-                mListener?.onPasswordEncodingValidateListener(
-                        databaseUri,
-                        masterPasswordChecked,
-                        masterPassword,
-                        keyFileChecked,
-                        keyFile
-                )
-            }
+            builder.setPositiveButton(android.R.string.ok, positiveButtonClickListener)
            builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() }

            return builder.create()
@@ -73,36 +42,5 @@ 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
-        }
-    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -45,13 +45,13 @@ class ProFeatureDialogFragment : DialogFragment() {
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_ad_free), FROM_HTML_MODE_LEGACY)).append("\n\n")
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_buy_pro), FROM_HTML_MODE_LEGACY))
                builder.setPositiveButton(R.string.download) { _, _ ->
-                    UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
+                    UriUtil.gotoUrl(context!!, R.string.app_pro_url)
                }
            } else {
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_feature_generosity), FROM_HTML_MODE_LEGACY)).append("\n\n")
                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_donation), FROM_HTML_MODE_LEGACY))
                builder.setPositiveButton(R.string.contribute) { _, _ ->
-                    UriUtil.gotoUrl(requireContext(), R.string.contribution_url)
+                    UriUtil.gotoUrl(context!!, R.string.contribution_url)
                }
            }
            builder.setMessage(stringBuilder)
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReadOnlyDialog.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReadOnlyDialog.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.os.Build
+import android.os.Bundle
+import android.preference.PreferenceManager
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+class ReadOnlyDialog : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = androidx.appcompat.app.AlertDialog.Builder(activity)
+
+            var warning = getString(R.string.read_only_warning)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                warning = warning + "\n\n" + getString(R.string.read_only_kitkat_warning)
+            }
+            builder.setMessage(warning)
+
+            builder.setPositiveButton(getString(android.R.string.ok)) { _, _ -> dismiss() }
+            builder.setNegativeButton(getString(R.string.beta_dontask)) { _, _ ->
+                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+                val edit = prefs.edit()
+                edit.putBoolean(getString(R.string.show_read_only_warning), false)
+                edit.apply()
+                dismiss()
+            }
+
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
@@ -1,96 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Attachment
-
-/**
- * Custom Dialog to confirm big file to upload
- */
-class ReplaceFileDialogFragment : DialogFragment() {
-
-    private var mActionChooseListener: ActionChooseListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        // Verify that the host activity implements the callback interface
-        try {
-            mActionChooseListener = context as ActionChooseListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + ActionChooseListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mActionChooseListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            // Use the Builder class for convenient dialog construction
-            val builder = AlertDialog.Builder(activity)
-            builder.setMessage(SpannableStringBuilder().apply {
-                append(getString(R.string.warning_replace_file))
-                append("\n\n")
-                append(getString(R.string.warning_sure_add_file))
-            })
-            builder.setPositiveButton(android.R.string.ok) { _, _ ->
-                mActionChooseListener?.onValidateReplaceFile(
-                        arguments?.getParcelable(KEY_FILE_URI),
-                        arguments?.getParcelable(KEY_ENTRY_ATTACHMENT))
-            }
-            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
-                dismiss()
-            }
-            // Create the AlertDialog object and return it
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    interface ActionChooseListener {
-        fun onValidateReplaceFile(attachmentToUploadUri: Uri?, attachment: Attachment?)
-    }
-
-    companion object {
-        private const val KEY_FILE_URI = "KEY_FILE_URI"
-        private const val KEY_ENTRY_ATTACHMENT = "KEY_ENTRY_ATTACHMENT"
-
-        fun build(attachmentToUploadUri: Uri,
-                  attachment: Attachment): ReplaceFileDialogFragment {
-            val fragment = ReplaceFileDialogFragment()
-            fragment.arguments = Bundle().apply {
-                putParcelable(KEY_FILE_URI, attachmentToUploadUri)
-                putParcelable(KEY_ENTRY_ATTACHMENT, attachment)
-            }
-            return fragment
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
@@ -1,441 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.annotation.SuppressLint
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import android.widget.AdapterView
-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
-import com.kunzisoft.keepass.BuildConfig
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.model.OtpModel
-import com.kunzisoft.keepass.otp.OtpElement
-import com.kunzisoft.keepass.otp.OtpElement.Companion.MAX_HOTP_COUNTER
-import com.kunzisoft.keepass.otp.OtpElement.Companion.MAX_OTP_DIGITS
-import com.kunzisoft.keepass.otp.OtpElement.Companion.MAX_TOTP_PERIOD
-import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_HOTP_COUNTER
-import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_OTP_DIGITS
-import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_TOTP_PERIOD
-import com.kunzisoft.keepass.otp.OtpTokenType
-import com.kunzisoft.keepass.otp.OtpType
-import com.kunzisoft.keepass.otp.TokenCalculator
-import java.util.*
-
-class SetOTPDialogFragment : DialogFragment() {
-
-    private var mCreateOTPElementListener: CreateOtpListener? = null
-
-    private var mOtpElement: OtpElement = OtpElement()
-
-    private var otpTypeSpinner: Spinner? = null
-    private var otpTokenTypeSpinner: Spinner? = null
-    private var otpSecretContainer: TextInputLayout? = null
-    private var otpSecretTextView: EditText? = null
-    private var otpPeriodContainer: TextInputLayout? = null
-    private var otpPeriodTextView: EditText? = null
-    private var otpCounterContainer: TextInputLayout? = null
-    private var otpCounterTextView: EditText? = null
-    private var otpDigitsContainer: TextInputLayout? = null
-    private var otpDigitsTextView: EditText? = null
-    private var otpAlgorithmSpinner: Spinner? = null
-
-    private var otpTypeAdapter: ArrayAdapter<OtpType>? = null
-    private var otpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null
-    private var totpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null
-    private var hotpTokenTypeAdapter: ArrayAdapter<OtpTokenType>? = null
-    private var otpAlgorithmAdapter: ArrayAdapter<TokenCalculator.HashAlgorithm>? = null
-
-    private var mManualEvent = false
-    private var mOnFocusChangeListener = View.OnFocusChangeListener { _, isFocus ->
-        if (!isFocus)
-            mManualEvent = true
-    }
-    private var mOnTouchListener = View.OnTouchListener { _, event ->
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                mManualEvent = true
-            }
-        }
-        false
-    }
-
-    private var mSecretWellFormed = false
-    private var mCounterWellFormed = false
-    private var mPeriodWellFormed = false
-    private var mDigitsWellFormed = false
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        // Verify that the host activity implements the callback interface
-        try {
-            // Instantiate the NoticeDialogListener so we can send events to the host
-            mCreateOTPElementListener = context as CreateOtpListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + CreateOtpListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mCreateOTPElementListener = null
-        super.onDetach()
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        // Retrieve OTP model from instance state
-        if (savedInstanceState != null) {
-            if (savedInstanceState.containsKey(KEY_OTP)) {
-                savedInstanceState.getParcelable<OtpModel>(KEY_OTP)?.let { otpModel ->
-                    mOtpElement = OtpElement(otpModel)
-                }
-            }
-        } else {
-            arguments?.apply {
-                if (containsKey(KEY_OTP)) {
-                    getParcelable<OtpModel?>(KEY_OTP)?.let { otpModel ->
-                        mOtpElement = OtpElement(otpModel)
-                    }
-                }
-            }
-        }
-
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_set_otp, null) as ViewGroup?
-            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)
-            otpSecretTextView = root?.findViewById(R.id.setup_otp_secret)
-            otpAlgorithmSpinner = root?.findViewById(R.id.setup_otp_algorithm)
-            otpPeriodContainer= root?.findViewById(R.id.setup_otp_period_label)
-            otpPeriodTextView = root?.findViewById(R.id.setup_otp_period)
-            otpCounterContainer= root?.findViewById(R.id.setup_otp_counter_label)
-            otpCounterTextView = root?.findViewById(R.id.setup_otp_counter)
-            otpDigitsContainer = root?.findViewById(R.id.setup_otp_digits_label)
-            otpDigitsTextView = root?.findViewById(R.id.setup_otp_digits)
-
-            // To fix init element
-            // With tab keyboard selection
-            otpSecretTextView?.onFocusChangeListener = mOnFocusChangeListener
-            // With finger selection
-            otpTypeSpinner?.setOnTouchListener(mOnTouchListener)
-            otpTokenTypeSpinner?.setOnTouchListener(mOnTouchListener)
-            otpSecretTextView?.setOnTouchListener(mOnTouchListener)
-            otpAlgorithmSpinner?.setOnTouchListener(mOnTouchListener)
-            otpPeriodTextView?.setOnTouchListener(mOnTouchListener)
-            otpCounterTextView?.setOnTouchListener(mOnTouchListener)
-            otpDigitsTextView?.setOnTouchListener(mOnTouchListener)
-
-            // To manage focus
-            otpPeriodTextView?.setOnEditorActionListener { _, actionId, _ ->
-                if (actionId == EditorInfo.IME_ACTION_NEXT) {
-                    otpDigitsTextView?.requestFocus()
-                    true
-                } else
-                    false
-            }
-            otpCounterTextView?.setOnEditorActionListener { _, actionId, _ ->
-                if (actionId == EditorInfo.IME_ACTION_NEXT) {
-                    otpDigitsTextView?.requestFocus()
-                    true
-                } else
-                    false
-            }
-            otpCounterTextView?.setOnEditorActionListener { _, actionId, _ ->
-                if (actionId == EditorInfo.IME_ACTION_NEXT) {
-                    root?.requestFocus(View.FOCUS_DOWN)
-                    true
-                } else
-                    false
-            }
-
-            // HOTP / TOTP Type selection
-            val otpTypeArray = OtpType.values()
-            otpTypeAdapter = ArrayAdapter<OtpType>(activity,
-                    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()
-            hotpTokenTypeAdapter = ArrayAdapter(activity,
-                    android.R.layout.simple_spinner_item, hotpTokenTypeArray).apply {
-                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            }
-            // Proprietary only on closed and full version
-            val totpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
-                    BuildConfig.CLOSED_STORE && BuildConfig.FULL_VERSION)
-            totpTokenTypeAdapter = ArrayAdapter(activity,
-                    android.R.layout.simple_spinner_item, totpTokenTypeArray).apply {
-                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            }
-            otpTokenTypeAdapter = hotpTokenTypeAdapter
-            otpTokenTypeSpinner?.adapter = otpTokenTypeAdapter
-
-            // OTP Algorithm
-            val otpAlgorithmArray = TokenCalculator.HashAlgorithm.values()
-            otpAlgorithmAdapter = ArrayAdapter<TokenCalculator.HashAlgorithm>(activity,
-                    android.R.layout.simple_spinner_item, otpAlgorithmArray).apply {
-                setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            }
-            otpAlgorithmSpinner?.adapter = otpAlgorithmAdapter
-
-            // Set the default value of OTP element
-            upgradeType()
-            upgradeTokenType()
-            upgradeParameters()
-
-            attachListeners()
-
-            val builder = AlertDialog.Builder(activity)
-            builder.apply {
-                setTitle(R.string.entry_setup_otp)
-                setView(root)
-                        .setPositiveButton(android.R.string.ok) {_, _ -> }
-                        .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        }
-            }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        (dialog as AlertDialog).getButton(Dialog.BUTTON_POSITIVE).setOnClickListener {
-            if (mSecretWellFormed
-                    && mCounterWellFormed
-                    && mPeriodWellFormed
-                    && mDigitsWellFormed) {
-                mCreateOTPElementListener?.onOtpCreated(mOtpElement)
-                dismiss()
-            }
-        }
-    }
-
-    private fun attachListeners() {
-        // Set Type listener
-        otpTypeSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                if (mManualEvent) {
-                    (parent?.selectedItem as OtpType?)?.let {
-                        mOtpElement.type = it
-                        upgradeTokenType()
-                    }
-                }
-            }
-        }
-
-        // Set type token listener
-        otpTokenTypeSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                if (mManualEvent) {
-                    (parent?.selectedItem as OtpTokenType?)?.let {
-                        mOtpElement.tokenType = it
-                        upgradeParameters()
-                    }
-                }
-            }
-        }
-
-        // Set algorithm spinner
-        otpAlgorithmSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                if (mManualEvent) {
-                    (parent?.selectedItem as TokenCalculator.HashAlgorithm?)?.let {
-                        mOtpElement.algorithm = it
-                    }
-                }
-            }
-        }
-
-        // Set secret in OtpElement
-        otpSecretTextView?.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                s?.toString()?.let { userString ->
-                    try {
-                        mOtpElement.setBase32Secret(userString.toUpperCase(Locale.ENGLISH))
-                        otpSecretContainer?.error = null
-                    } catch (exception: Exception) {
-                        otpSecretContainer?.error = getString(R.string.error_otp_secret_key)
-                    }
-                    mSecretWellFormed = otpSecretContainer?.error == null
-                }
-            }
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        })
-
-        // Set counter in OtpElement
-        otpCounterTextView?.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                if (mManualEvent) {
-                    s?.toString()?.toLongOrNull()?.let {
-                        try {
-                            mOtpElement.counter = it
-                            otpCounterContainer?.error = null
-                        } catch (exception: Exception) {
-                            otpCounterContainer?.error = getString(R.string.error_otp_counter,
-                                    MIN_HOTP_COUNTER, MAX_HOTP_COUNTER)
-                        }
-                        mCounterWellFormed = otpCounterContainer?.error == null
-                    }
-                }
-            }
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        })
-
-        // Set period in OtpElement
-        otpPeriodTextView?.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                if (mManualEvent) {
-                    s?.toString()?.toIntOrNull()?.let {
-                        try {
-                            mOtpElement.period = it
-                            otpPeriodContainer?.error = null
-                        } catch (exception: Exception) {
-                            otpPeriodContainer?.error = getString(R.string.error_otp_period,
-                                    MIN_TOTP_PERIOD, MAX_TOTP_PERIOD)
-                        }
-                        mPeriodWellFormed = otpPeriodContainer?.error == null
-                    }
-                }
-            }
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        })
-
-        // Set digits in OtpElement
-        otpDigitsTextView?.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                if (mManualEvent) {
-                    s?.toString()?.toIntOrNull()?.let {
-                        try {
-                            mOtpElement.digits = it
-                            otpDigitsContainer?.error = null
-                        } catch (exception: Exception) {
-                            otpDigitsContainer?.error = getString(R.string.error_otp_digits,
-                                    MIN_OTP_DIGITS, MAX_OTP_DIGITS)
-                        }
-                        mDigitsWellFormed = otpDigitsContainer?.error == null
-                    }
-                }
-            }
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        })
-    }
-
-    private fun upgradeType() {
-        otpTypeSpinner?.setSelection(OtpType.values().indexOf(mOtpElement.type))
-    }
-
-    private fun upgradeTokenType() {
-        when (mOtpElement.type) {
-            OtpType.HOTP -> {
-                otpPeriodContainer?.visibility = View.GONE
-                otpCounterContainer?.visibility = View.VISIBLE
-                otpTokenTypeSpinner?.adapter = hotpTokenTypeAdapter
-                otpTokenTypeSpinner?.setSelection(OtpTokenType
-                        .getHotpTokenTypeValues().indexOf(mOtpElement.tokenType))
-            }
-            OtpType.TOTP -> {
-                otpPeriodContainer?.visibility = View.VISIBLE
-                otpCounterContainer?.visibility = View.GONE
-                otpTokenTypeSpinner?.adapter = totpTokenTypeAdapter
-                otpTokenTypeSpinner?.setSelection(OtpTokenType
-                        .getTotpTokenTypeValues().indexOf(mOtpElement.tokenType))
-            }
-        }
-    }
-
-    private fun upgradeParameters() {
-        otpAlgorithmSpinner?.setSelection(TokenCalculator.HashAlgorithm.values()
-                .indexOf(mOtpElement.algorithm))
-
-        val secret = mOtpElement.getBase32Secret()
-        otpSecretTextView?.apply {
-            setText(secret)
-            // Cursor at end
-            setSelection(this.text.length)
-        }
-        mSecretWellFormed = OtpElement.isValidBase32(secret)
-
-        val counter = mOtpElement.counter
-        otpCounterTextView?.setText(counter.toString())
-        mCounterWellFormed = OtpElement.isValidCounter(counter)
-
-        val period = mOtpElement.period
-        otpPeriodTextView?.setText(period.toString())
-        mPeriodWellFormed = OtpElement.isValidPeriod(period)
-
-        val digits = mOtpElement.digits
-        otpDigitsTextView?.setText(digits.toString())
-        mDigitsWellFormed = OtpElement.isValidDigits(digits)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putParcelable(KEY_OTP, mOtpElement.otpModel)
-    }
-
-    interface CreateOtpListener {
-        fun onOtpCreated(otpElement: OtpElement)
-    }
-
-    companion object {
-
-        private const val KEY_OTP = "KEY_OTP"
-
-        fun build(otpModel: OtpModel? = null): SetOTPDialogFragment {
-            return SetOTPDialogFragment().apply {
-                if (otpModel != null) {
-                    arguments = Bundle().apply {
-                        putParcelable(KEY_OTP, otpModel)
-                    }
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -29,7 +29,7 @@ import android.view.View
 import android.widget.CompoundButton
 import android.widget.RadioGroup
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.SortNodeEnum
+import com.kunzisoft.keepass.database.SortNodeEnum

 class SortDialogFragment : DialogFragment() {

@@ -54,11 +54,6 @@ class SortDialogFragment : DialogFragment() {
        }
    }

-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        activity?.let { activity ->
            val builder = AlertDialog.Builder(activity)
@@ -87,9 +82,7 @@ class SortDialogFragment : DialogFragment() {
            builder.setView(rootView)
                    // Add action buttons
                    .setPositiveButton(android.R.string.ok
-                    ) { _, _ -> mListener?.onSortSelected(mSortNodeEnum,
-                            SortNodeEnum.SortNodeParameters(mAscending, mGroupsBefore, mRecycleBinBottom))
-                    }
+                    ) { _, _ -> mListener?.onSortSelected(mSortNodeEnum, mAscending, mGroupsBefore, mRecycleBinBottom) }
                    .setNegativeButton(android.R.string.cancel) { _, _ -> }

            val ascendingView = rootView.findViewById<CompoundButton>(R.id.sort_selection_ascending)
@@ -157,7 +150,10 @@ class SortDialogFragment : DialogFragment() {
    }

    interface SortSelectionListener {
-        fun onSortSelected(sortNodeEnum: SortNodeEnum, sortNodeParameters: SortNodeEnum.SortNodeParameters)
+        fun onSortSelected(sortNodeEnum: SortNodeEnum,
+                           ascending: Boolean,
+                           groupsBefore: Boolean,
+                           recycleBinBottom: Boolean)
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
@@ -1,62 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.DatePickerDialog
-import android.app.Dialog
-import android.app.TimePickerDialog
-import android.content.Context
-import android.os.Bundle
-import android.text.format.DateFormat
-import androidx.fragment.app.DialogFragment
-
-class TimePickerFragment : DialogFragment() {
-
-    private var defaultHour: Int = 0
-    private var defaultMinute: Int = 0
-
-    private var mListener: TimePickerDialog.OnTimeSetListener? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            mListener = context as TimePickerDialog.OnTimeSetListener
-        } catch (e: ClassCastException) {
-            throw ClassCastException(context.toString()
-                    + " must implement " + DatePickerDialog.OnDateSetListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        mListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        // Create a new instance of DatePickerDialog and return it
-        return context?.let {
-            arguments?.apply {
-                if (containsKey(DEFAULT_HOUR_BUNDLE_KEY))
-                    defaultHour = getInt(DEFAULT_HOUR_BUNDLE_KEY)
-                if (containsKey(DEFAULT_MINUTE_BUNDLE_KEY))
-                    defaultMinute = getInt(DEFAULT_MINUTE_BUNDLE_KEY)
-            }
-
-            TimePickerDialog(it, mListener, defaultHour, defaultMinute, DateFormat.is24HourFormat(activity))
-        } ?: super.onCreateDialog(savedInstanceState)
-    }
-
-    companion object {
-
-        private const val DEFAULT_HOUR_BUNDLE_KEY = "DEFAULT_HOUR_BUNDLE_KEY"
-        private const val DEFAULT_MINUTE_BUNDLE_KEY = "DEFAULT_MINUTE_BUNDLE_KEY"
-
-        fun getInstance(defaultHour: Int,
-                        defaultMinute: Int): TimePickerFragment {
-            return TimePickerFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(DEFAULT_HOUR_BUNDLE_KEY, defaultHour)
-                    putInt(DEFAULT_MINUTE_BUNDLE_KEY, defaultMinute)
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -24,6 +24,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import androidx.appcompat.app.AlertDialog
+import android.text.Html
 import android.text.SpannableStringBuilder
 import android.text.method.LinkMovementMethod
 import android.widget.TextView
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.dialogs
@@ -52,7 +52,7 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_buy_pro), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
                    builder.setPositiveButton(R.string.download) { _, _ ->
-                        UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
+                        UriUtil.gotoUrl(context!!, R.string.app_pro_url)
                    }
                    builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
                }
@@ -61,7 +61,7 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
                builder.setPositiveButton(R.string.contribute) { _, _ ->
-                    UriUtil.gotoUrl(requireContext(), R.string.contribution_url)
+                    UriUtil.gotoUrl(context!!, R.string.contribution_url)
                }
                builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
            }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.activities.helpers

 import android.app.assist.AssistStructure
@@ -24,22 +5,15 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.model.SearchInfo

 object EntrySelectionHelper {

    private const val EXTRA_ENTRY_SELECTION_MODE = "com.kunzisoft.keepass.extra.ENTRY_SELECTION_MODE"
    private const val DEFAULT_ENTRY_SELECTION_MODE = false
-    // Key to retrieve search in intent
-    const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"

-    fun startActivityForEntrySelectionResult(context: Context,
-                                             intent: Intent,
-                                             searchInfo: SearchInfo?) {
+    fun startActivityForEntrySelection(context: Context, intent: Intent) {
        addEntrySelectionModeExtraInIntent(intent)
-        searchInfo?.let {
-            intent.putExtra(KEY_SEARCH_INFO, it)
-        }
+        // only to avoid visible flickering when redirecting
        context.startActivity(intent)
    }

--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/SelectFileHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/SelectFileHelper.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.helpers
@@ -28,20 +28,19 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.util.Log
-import android.view.MenuItem
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.BrowserDialogFragment
 import com.kunzisoft.keepass.utils.UriUtil

-class SelectFileHelper {
+class OpenFileHelper {

    private var activity: Activity? = null
    private var fragment: Fragment? = null

-    val selectFileOnClickViewListener: SelectFileOnClickViewListener
-        get() = SelectFileOnClickViewListener()
+    val openFileOnClickViewListener: OpenFileOnClickViewListener
+        get() = OpenFileOnClickViewListener()

    constructor(context: Activity) {
        this.activity = context
@@ -53,25 +52,14 @@ class SelectFileHelper {
        this.fragment = context
    }

-    inner class SelectFileOnClickViewListener :
-            View.OnClickListener,
-            View.OnLongClickListener,
-            MenuItem.OnMenuItemClickListener {
+    inner class OpenFileOnClickViewListener : View.OnClickListener {

-        private fun onAbstractClick(longClick: Boolean = false) {
+        override fun onClick(v: View) {
            try {
-                if (longClick) {
-                    try {
-                        openActivityWithActionGetContent()
-                    } catch (e: Exception) {
-                        openActivityWithActionOpenDocument()
-                    }
-                } else {
-                    try {
-                        openActivityWithActionOpenDocument()
-                    } catch (e: Exception) {
-                        openActivityWithActionGetContent()
-                    }
+                try {
+                    openActivityWithActionOpenDocument()
+                } catch(e: Exception) {
+                    openActivityWithActionGetContent()
                }
            } catch (e: Exception) {
                Log.e(TAG, "Enable to start the file picker activity", e)
@@ -80,31 +68,16 @@ class SelectFileHelper {
                    showBrowserDialog()
            }
        }
-
-        override fun onClick(v: View) {
-            onAbstractClick()
-        }
-
-        override fun onLongClick(v: View?): Boolean {
-            onAbstractClick(true)
-            return true
-        }
-
-        override fun onMenuItemClick(item: MenuItem?): Boolean {
-            onAbstractClick()
-            return true
-        }
    }

    @SuppressLint("InlinedApi")
    private fun openActivityWithActionOpenDocument() {
-        val intentOpenDocument = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+        val intentOpenDocument = Intent(APP_ACTION_OPEN_DOCUMENT).apply {
            addCategory(Intent.CATEGORY_OPENABLE)
            type = "*/*"
-            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-            addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+            flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
+                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION or
+                    Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
        }
        if (fragment != null)
            fragment?.startActivityForResult(intentOpenDocument, OPEN_DOC)
@@ -112,15 +85,10 @@ class SelectFileHelper {
            activity?.startActivityForResult(intentOpenDocument, OPEN_DOC)
    }

-    @SuppressLint("InlinedApi")
    private fun openActivityWithActionGetContent() {
        val intentGetContent = Intent(Intent.ACTION_GET_CONTENT).apply {
            addCategory(Intent.CATEGORY_OPENABLE)
            type = "*/*"
-            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-            addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
        }
        if (fragment != null)
            fragment?.startActivityForResult(intentGetContent, GET_CONTENT)
@@ -173,10 +141,11 @@ class SelectFileHelper {
     */
    private fun showBrowserDialog() {
        try {
-            val fileManagerDialogFragment = FileManagerDialogFragment()
-            fragment?.let {
-                fileManagerDialogFragment.show(it.parentFragmentManager, "browserDialog")
-            } ?: fileManagerDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
+            val browserDialogFragment = BrowserDialogFragment()
+            if (fragment != null && fragment!!.fragmentManager != null)
+                browserDialogFragment.show(fragment!!.fragmentManager!!, "browserDialog")
+            else
+                browserDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
        } catch (e: Exception) {
            Log.e(TAG, "Can't open BrowserDialog", e)
        }
@@ -235,6 +204,12 @@ class SelectFileHelper {

        private const val TAG = "OpenFileHelper"

+        private var APP_ACTION_OPEN_DOCUMENT: String = try {
+            Intent::class.java.getField("ACTION_OPEN_DOCUMENT").get(null) as String
+        } catch (e: Exception) {
+            "android.intent.action.OPEN_DOCUMENT"
+        }
+
        const val OPEN_INTENTS_FILE_BROWSE = "org.openintents.action.PICK_FILE"

        private const val GET_CONTENT = 25745
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ReadOnlyHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/ReadOnlyHelper.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.activities.helpers

 import android.content.Context
--- a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt
@@ -1,39 +1,55 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.lock

-import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.os.Bundle
-import android.view.MotionEvent
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
-import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
-import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
+import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService
+import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.*
+import com.kunzisoft.keepass.utils.LOCK_ACTION

-abstract class LockingActivity : SpecialModeActivity() {
+abstract class LockingActivity : StylishActivity() {
+
+    companion object {
+
+        private const val TAG = "LockingActivity"
+
+        const val RESULT_EXIT_LOCK = 1450
+
+        const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
+        const val TIMEOUT_ENABLE_KEY_DEFAULT = true
+    }

    protected var mTimeoutEnable: Boolean = true

@@ -41,18 +57,11 @@ abstract class LockingActivity : SpecialModeActivity() {
    private var mExitLock: Boolean = false

    // Force readOnly if Entry Selection mode
-    protected var mReadOnly: Boolean
+    protected var mReadOnly: Boolean = false
        get() {
-            return mReadOnlyToSave || mSelectionMode
+            return field || mSelectionMode
        }
-        set(value) {
-            mReadOnlyToSave = value
-        }
-    private var mReadOnlyToSave: Boolean = false
-    protected var mAutoSaveEnable: Boolean = true
-
-    var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
-        private set
+    protected var mSelectionMode: Boolean = false

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -66,21 +75,16 @@ abstract class LockingActivity : SpecialModeActivity() {
        }

        if (mTimeoutEnable) {
-            mLockReceiver = LockReceiver {
-                closeDatabase()
-                if (LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == null)
-                    LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
-                // Add onActivityForResult response
-                setResult(RESULT_EXIT_LOCK)
-                closeOptionsMenu()
-                finish()
+            mLockReceiver = LockReceiver()
+            val intentFilter = IntentFilter().apply {
+                addAction(Intent.ACTION_SCREEN_OFF)
+                addAction(LOCK_ACTION)
            }
-            registerLockReceiver(mLockReceiver)
+            registerReceiver(mLockReceiver, intentFilter)
        }

        mExitLock = false
-
-        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
+        mReadOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState, intent)
    }

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -96,13 +100,8 @@ abstract class LockingActivity : SpecialModeActivity() {
    override fun onResume() {
        super.onResume()

-        mProgressDatabaseTaskProvider?.registerProgressTask()
-
        // To refresh when back to normal workflow from selection workflow
-        mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent)
-        mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
-
-        invalidateOptionsMenu()
+        mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)

        if (mTimeoutEnable) {
            // End activity if database not loaded
@@ -120,19 +119,16 @@ abstract class LockingActivity : SpecialModeActivity() {
                TimeoutHelper.recordTime(this)
        }

-        LOCKING_ACTIVITY_UI_VISIBLE = true
+        invalidateOptionsMenu()
    }

    override fun onSaveInstanceState(outState: Bundle) {
+        ReadOnlyHelper.onSaveInstanceState(outState, mReadOnly)
        outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
        super.onSaveInstanceState(outState)
    }

    override fun onPause() {
-        LOCKING_ACTIVITY_UI_VISIBLE = false
-
-        mProgressDatabaseTaskProvider?.unregisterProgressTask()
-
        super.onPause()

        if (mTimeoutEnable) {
@@ -142,32 +138,40 @@ abstract class LockingActivity : SpecialModeActivity() {
    }

    override fun onDestroy() {
-        unregisterLockReceiver(mLockReceiver)
        super.onDestroy()
+        if (mLockReceiver != null)
+            unregisterReceiver(mLockReceiver)
+    }
+
+    inner class LockReceiver : BroadcastReceiver() {
+
+        override fun onReceive(context: Context, intent: Intent) {
+            // If allowed, lock and exit
+            if (!TimeoutHelper.temporarilyDisableTimeout) {
+                intent.action?.let {
+                    when (it) {
+                        Intent.ACTION_SCREEN_OFF -> if (PreferencesUtil.isLockDatabaseWhenScreenShutOffEnable(this@LockingActivity)) {
+                            lockAndExit()
+                        }
+                        LOCK_ACTION -> lockAndExit()
+                    }
+                }
+            }
+        }
    }

    protected fun lockAndExit() {
-        sendBroadcast(Intent(LOCK_ACTION))
+        lock()
    }

    /**
     * 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")
+                    Log.d(TAG, "View focused, reset app timeout")
                    TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this)
                }
            }
@@ -188,17 +192,21 @@ abstract class LockingActivity : SpecialModeActivity() {
            super.onBackPressed()
        }
    }
-
-    companion object {
-
-        private const val TAG = "LockingActivity"
-
-        const val RESULT_EXIT_LOCK = 1450
-
-        const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
-        const val TIMEOUT_ENABLE_KEY_DEFAULT = true
-
-        private var LOCKING_ACTIVITY_UI_VISIBLE = false
-        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
-    }
+}
+
+fun Activity.lock() {
+    // Stop the Magikeyboard service
+    stopService(Intent(this, KeyboardEntryNotificationService::class.java))
+    MagikIME.removeEntry(this)
+
+    Log.i(Activity::class.java.name, "Shutdown " + localClassName +
+            " after inactivity or manual lock")
+    (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).apply {
+        cancelAll()
+    }
+    // Clear data
+    Database.getInstance().closeAndClear(applicationContext.filesDir)
+    // Add onActivityForResult response
+    setResult(LockingActivity.RESULT_EXIT_LOCK)
+    finish()
 }
--- a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingHideActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingHideActivity.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.lock
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.view.WindowManager
+
+/**
+ * Locking Hide Activity that sets FLAG_SECURE to prevent screenshots, and from
+ * appearing in the recent app preview
+ */
+abstract class LockingHideActivity : LockingActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Several gingerbread devices have problems with FLAG_SECURE
+        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+    }
+
+    /* (non-Javadoc) Workaround for HTC Linkify issues
+	 * @see android.app.Activity#startActivity(android.content.Intent)
+	 */
+    override fun startActivity(intent: Intent) {
+        try {
+            if (intent.component != null && intent.component!!.shortClassName == ".HtcLinkifyDispatcherActivity") {
+                intent.component = null
+            }
+            super.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            /* Catch the bad HTC implementation case */
+            super.startActivity(Intent.createChooser(intent, null))
+        }
+
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt
@@ -1,90 +0,0 @@
-package com.kunzisoft.keepass.activities.selection
-
-import android.os.Build
-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.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
-
-/**
- * Activity to manage special mode (ie: selection mode)
- */
-abstract class SpecialModeActivity : StylishActivity() {
-
-    protected var mSelectionMode: Boolean = false
-
-    protected var mAutofillSelection: Boolean = false
-
-    private var specialModeView: SpecialModeView? = null
-
-    open fun onCancelSpecialMode() {
-        onBackPressed()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mAutofillSelection = AutofillHelper.retrieveAssistStructure(intent) != null
-        }
-
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(EntrySelectionHelper.KEY_SEARCH_INFO)
-
-        // To show the selection mode
-        specialModeView = findViewById(R.id.special_mode_view)
-        specialModeView?.apply {
-            // Populate title
-            val typeModeId = if (mAutofillSelection)
-                R.string.autofill
-            else
-                R.string.magic_keyboard_title
-            title = "${resources.getString(R.string.selection_mode)} (${getString(typeModeId)})"
-            // Populate subtitle
-            subtitle = searchInfo?.getName(resources)
-
-            // Show the toolbar or not
-            visible = mSelectionMode
-
-            // Add back listener
-            onCancelButtonClickListener = View.OnClickListener {
-                onCancelSpecialMode()
-            }
-
-            // Create menu
-            menu.clear()
-            if (mAutofillSelection) {
-                menuInflater.inflate(R.menu.autofill, menu)
-                setOnMenuItemClickListener {  menuItem ->
-                    when (menuItem.itemId) {
-                        R.id.menu_block_autofill -> {
-                            blockAutofill(searchInfo)
-                        }
-                    }
-                    true
-                }
-            }
-        }
-    }
-
-    fun blockAutofill(searchInfo: SearchInfo?) {
-        val webDomain = searchInfo?.webDomain
-        val applicationId = searchInfo?.applicationId
-        if (webDomain != null) {
-            PreferencesUtil.addWebDomainToBlocklist(this,
-                    webDomain)
-        } else if (applicationId != null) {
-            PreferencesUtil.addApplicationIdToBlocklist(this,
-                    applicationId)
-        }
-        onCancelSpecialMode()
-        Toast.makeText(this.applicationContext,
-                R.string.autofill_block_restart,
-                Toast.LENGTH_LONG).show()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.stylish
@@ -61,7 +61,6 @@ object Stylish {

        return when (themeString) {
            context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night
-            context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black
            context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark
            context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue
            context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt
@@ -1,64 +1,38 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.stylish

-import android.content.ActivityNotFoundException
-import android.content.Intent
 import android.os.Bundle
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
-import android.view.WindowManager

-/**
- * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from
- * appearing in the recent app preview
- */
 abstract class StylishActivity : AppCompatActivity() {

    @StyleRes
    private var themeId: Int = 0

-    /* (non-Javadoc) Workaround for HTC Linkify issues
-     * @see android.app.Activity#startActivity(android.content.Intent)
-     */
-    override fun startActivity(intent: Intent) {
-        try {
-            intent.component?.let {
-                if (it.shortClassName == ".HtcLinkifyDispatcherActivity")
-                    intent.component = null
-            }
-            super.startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            /* Catch the bad HTC implementation case */
-            super.startActivity(Intent.createChooser(intent, null))
-        }
-    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        this.themeId = Stylish.getThemeId(this)
        setTheme(themeId)
-
-        // Several gingerbread devices have problems with FLAG_SECURE
-        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
    }

    override fun onResume() {
--- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishFragment.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.activities.stylish
@@ -44,21 +44,14 @@ abstract class StylishFragment : Fragment() {

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        // To fix status bar color
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val window = requireActivity().window
+        if (activity != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            val window = activity!!.window
+
+            val attrColorPrimaryDark = intArrayOf(android.R.attr.colorPrimaryDark)
+            val taColorPrimaryDark = contextThemed?.theme?.obtainStyledAttributes(attrColorPrimaryDark)
            val defaultColor = Color.BLACK
-
-            try {
-                val taStatusBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
-                window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
-                taStatusBarColor?.recycle()
-            } catch (e: Exception) {}
-
-            try {
-                val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
-                window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
-                taNavigationBarColor?.recycle()
-            } catch (e: Exception) {}
+            window.statusBarColor = taColorPrimaryDark?.getColor(0, defaultColor) ?: defaultColor
+            taColorPrimaryDark?.recycle()
        }

        return super.onCreateView(inflater, container, savedInstanceState)
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/AnimatedItemsAdapter.kt
@@ -1,126 +0,0 @@
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.view.collapse
-
-abstract class AnimatedItemsAdapter<Item, T: RecyclerView.ViewHolder>(val context: Context)
-    : RecyclerView.Adapter<T>() {
-
-    protected val inflater: LayoutInflater = LayoutInflater.from(context)
-    var itemsList: MutableList<Item> = ArrayList()
-        private set
-
-    var onDeleteButtonClickListener: ((item: Item)->Unit)? = null
-    private var mItemToRemove: Item? = null
-
-    var onListSizeChangedListener: ((previousSize: Int, newSize: Int)->Unit)? = null
-
-    override fun getItemCount(): Int {
-        return itemsList.size
-    }
-
-    open fun assignItems(items: List<Item>) {
-        val previousSize = itemsList.size
-        itemsList.apply {
-            clear()
-            addAll(items)
-        }
-        notifyDataSetChanged()
-        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
-    }
-
-    open fun isEmpty(): Boolean {
-        return itemsList.isEmpty()
-    }
-
-    open fun contains(item: Item): Boolean {
-        return itemsList.contains(item)
-    }
-
-    open fun indexOf(item: Item): Int {
-        return itemsList.indexOf(item)
-    }
-
-    open fun putItem(item: Item) {
-        val previousSize = itemsList.size
-        if (itemsList.contains(item)) {
-            val index = itemsList.indexOf(item)
-            itemsList.removeAt(index)
-            itemsList.add(index, item)
-            notifyItemChanged(index)
-        } else {
-            itemsList.add(item)
-            notifyItemInserted(itemsList.indexOf(item))
-        }
-        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
-    }
-
-    /**
-     * Only replace [oldItem] by [newItem] if [oldItem] exists
-     */
-    open fun replaceItem(oldItem: Item, newItem: Item) {
-        if (itemsList.contains(oldItem)) {
-            val index = itemsList.indexOf(oldItem)
-            itemsList.removeAt(index)
-            itemsList.add(index, newItem)
-            notifyItemChanged(index)
-        }
-    }
-
-    /**
-     * Only remove [item] if doesn't exists
-     */
-    open fun removeItem(item: Item) {
-        if (itemsList.contains(item)) {
-            mItemToRemove = item
-            notifyItemChanged(itemsList.indexOf(item))
-        }
-    }
-
-    protected fun performDeletion(holder: T, item: Item): Boolean {
-        val effectivelyDeletionPerformed = mItemToRemove == item
-        if (effectivelyDeletionPerformed) {
-            holder.itemView.collapse(true) {
-                deleteItem(item)
-            }
-        }
-        return effectivelyDeletionPerformed
-    }
-
-    protected fun onBindDeleteButton(holder: T, deleteButton: View, item: Item, position: Int) {
-        deleteButton.apply {
-            visibility = View.VISIBLE
-            if (performDeletion(holder, item)) {
-                setOnClickListener(null)
-            } else {
-                setOnClickListener {
-                    onDeleteButtonClickListener?.invoke(item)
-                    mItemToRemove = item
-                    notifyItemChanged(position)
-                }
-            }
-        }
-    }
-
-    private fun deleteItem(item: Item) {
-        val previousSize = itemsList.size
-        val position = itemsList.indexOf(item)
-        if (position >= 0) {
-            itemsList.removeAt(position)
-            notifyItemRemoved(position)
-            mItemToRemove = null
-            for (i in 0 until itemsList.size) {
-                notifyItemChanged(i)
-            }
-        }
-        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
-    }
-
-    fun clear() {
-        itemsList.clear()
-        notifyDataSetChanged()
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt
@@ -1,148 +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.content.res.TypedArray
-import android.graphics.Color
-import android.text.format.Formatter
-import android.util.TypedValue
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
-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))
-    }
-
-    override fun onBindViewHolder(holder: EntryBinariesViewHolder, position: Int) {
-        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 {
-            if (entryAttachmentState.attachment.binaryAttachment.isCompressed) {
-                text = CompressionAlgorithm.GZip.getName(context.resources)
-                visibility = View.VISIBLE
-            } else {
-                text = ""
-                visibility = View.GONE
-            }
-        }
-        when (entryAttachmentState.streamDirection) {
-            StreamDirection.UPLOAD -> {
-                holder.binaryFileProgressIcon.isActivated = true
-                when (entryAttachmentState.downloadState) {
-                    AttachmentState.START,
-                    AttachmentState.IN_PROGRESS -> {
-                        holder.binaryFileProgressContainer.visibility = View.VISIBLE
-                        holder.binaryFileProgress.apply {
-                            visibility = View.VISIBLE
-                            progress = entryAttachmentState.downloadProgression
-                        }
-                        holder.binaryFileDeleteButton.apply {
-                            visibility = View.GONE
-                            setOnClickListener(null)
-                        }
-                    }
-                    AttachmentState.NULL,
-                    AttachmentState.ERROR,
-                    AttachmentState.COMPLETE -> {
-                        holder.binaryFileProgressContainer.visibility = View.GONE
-                        holder.binaryFileProgress.visibility = View.GONE
-                        holder.binaryFileDeleteButton.apply {
-                            visibility = View.VISIBLE
-                            onBindDeleteButton(holder, this, entryAttachmentState, position)
-                        }
-                    }
-                }
-                holder.itemView.setOnClickListener(null)
-            }
-            StreamDirection.DOWNLOAD -> {
-                holder.binaryFileProgressIcon.isActivated = false
-                holder.binaryFileProgressContainer.visibility = View.VISIBLE
-                holder.binaryFileDeleteButton.visibility = View.GONE
-                holder.binaryFileProgress.apply {
-                    visibility = when (entryAttachmentState.downloadState) {
-                        AttachmentState.NULL, AttachmentState.COMPLETE, AttachmentState.ERROR -> View.GONE
-                        AttachmentState.START, AttachmentState.IN_PROGRESS -> View.VISIBLE
-                    }
-                    progress = entryAttachmentState.downloadProgression
-                }
-                holder.itemView.setOnClickListener {
-                    onItemClickListener?.invoke(entryAttachmentState)
-                }
-            }
-        }
-    }
-
-    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)
-        var binaryFileProgressContainer: View = itemView.findViewById(R.id.item_attachment_progress_container)
-        var binaryFileProgressIcon: ImageView = itemView.findViewById(R.id.item_attachment_icon)
-        var binaryFileProgress: ProgressBar = itemView.findViewById(R.id.item_attachment_progress)
-        var binaryFileDeleteButton: View = itemView.findViewById(R.id.item_attachment_delete_button)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
@@ -1,22 +1,3 @@
-/*
- * 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
@@ -26,13 +7,13 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.EntryVersioned

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

    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryHistoryList: MutableList<Entry> = ArrayList()
-    var onItemClickListener: ((item: Entry, position: Int)->Unit)? = null
+    var entryHistoryList: MutableList<EntryVersioned> = ArrayList()
+    var onItemClickListener: ((item: EntryVersioned, position: Int)->Unit)? = null

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryHistoryViewHolder {
        return EntryHistoryViewHolder(inflater.inflate(R.layout.item_list_entry_history, parent, false))
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FieldsAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FieldsAdapter.kt
@@ -1,22 +1,3 @@
-/*
- * 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
@@ -34,9 +15,10 @@ import java.util.ArrayList
 class FieldsAdapter(context: Context) : RecyclerView.Adapter<FieldsAdapter.FieldViewHolder>() {

    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var fields: MutableList<Field> = ArrayList()
+    var fields: MutableList<Field> = ArrayList()
    var onItemClickListener: OnItemClickListener? = null

+
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FieldViewHolder {
        val view = inflater.inflate(R.layout.keyboard_popup_fields_item, parent, false)
        return FieldViewHolder(view)
@@ -52,11 +34,6 @@ class FieldsAdapter(context: Context) : RecyclerView.Adapter<FieldsAdapter.Field
        return fields.size
    }

-    fun setFields(fieldsToAdd: List<Field>) {
-        fields.clear()
-        fields.addAll(fieldsToAdd)
-    }
-
    fun clear() {
        fields.clear()
    }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -1,54 +1,50 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.adapters

 import android.content.Context
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.net.Uri
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.*
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
+import android.util.TypedValue
+import android.view.*
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.ViewSwitcher
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.model.DatabaseFile
-import com.kunzisoft.keepass.view.collapse
-import com.kunzisoft.keepass.view.expand
+import com.kunzisoft.keepass.app.database.FileDatabaseHistoryEntity
+import com.kunzisoft.keepass.utils.FileDatabaseInfo
+import com.kunzisoft.keepass.utils.UriUtil

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

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

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

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

    @ColorInt
    private val defaultColor: Int
@@ -65,74 +61,47 @@ class FileDatabaseHistoryAdapter(context: Context)
    }

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

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

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

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

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

-        if (databaseFile.databaseFileExists) {
-            holder.fileInformationButton.clearColorFilter()
-        } else {
-            holder.fileInformationButton.setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY)
-        }
+        holder.filePreciseInfoContainer.visibility = if (fileDatabaseInfo.found()) {
+            // Modification
+            holder.fileModification.text = fileDatabaseInfo.getModificationString()
+            // Size
+            holder.fileSize.text = fileDatabaseInfo.getSizeString()

-        // Modification
-        databaseFile.databaseLastModified?.let {
-            holder.fileModification.text = it
-            holder.fileModificationContainer.visibility = View.VISIBLE
-        } ?: run {
-            holder.fileModificationContainer.visibility = View.GONE
-        }
-
-        // Size
-        databaseFile.databaseSize?.let {
-            holder.fileSize.text = it
-            holder.fileSize.visibility = View.VISIBLE
-        } ?: run {
-            holder.fileSize.visibility = View.GONE
-        }
+            View.VISIBLE
+        } else
+            View.GONE

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

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

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

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

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

        // Refresh View / Close alias modification if not contains fileAlias
@@ -175,72 +142,33 @@ class FileDatabaseHistoryAdapter(context: Context)
        return listDatabaseFiles.size
    }

-    fun clearDatabaseFileHistoryList() {
+    fun addDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<FileDatabaseHistoryEntity>) {
        listDatabaseFiles.clear()
+        listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
    }

-    fun addDatabaseFileHistory(fileDatabaseHistoryToAdd: DatabaseFile) {
-        listDatabaseFiles.add(0, fileDatabaseHistoryToAdd)
-        notifyItemInserted(0)
+    fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: FileDatabaseHistoryEntity) {
+        listDatabaseFiles.remove(fileDatabaseHistoryToDelete)
    }

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

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

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

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

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

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

        var fileMainSwitcher: ViewSwitcher = itemView.findViewById(R.id.file_main_switcher)
        var fileAliasEdit: EditText = itemView.findViewById(R.id.file_alias_edit)
@@ -250,7 +178,7 @@ class FileDatabaseHistoryAdapter(context: Context)
        var fileModifyButton: ImageView = itemView.findViewById(R.id.file_modify_button)
        var fileDeleteButton: ImageView = itemView.findViewById(R.id.file_delete_button)
        var filePath: TextView = itemView.findViewById(R.id.file_path)
-        var fileModificationContainer: ViewGroup = itemView.findViewById(R.id.file_modification_container)
+        var filePreciseInfoContainer: ViewGroup = itemView.findViewById(R.id.file_precise_info_container)
        var fileModification: TextView = itemView.findViewById(R.id.file_modification)
        var fileSize: TextView = itemView.findViewById(R.id.file_size)
    }
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
@@ -1,84 +1,76 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.adapters

 import android.content.Context
 import android.graphics.Color
+import android.graphics.Paint
+import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.annotation.ColorInt
+import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.SortNodeEnum
-import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
-import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.SortNodeEnum
+import com.kunzisoft.keepass.database.element.*
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.setTextSize
-import com.kunzisoft.keepass.view.strikeOut
 import java.util.*

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

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

    private var calculateViewTypeTextSize = Array(2) { true} // number of view type
    private var textSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
-    private var prefSizeMultiplier: Float = 0F
-    private var subtextDefaultDimension: Float = 0F
-    private var infoTextDefaultDimension: Float = 0F
-    private var numberChildrenTextDefaultDimension: Float = 0F
-    private var iconDefaultDimension: Float = 0F
-
+    private var prefTextSize: Float = 0F
+    private var subtextSize: Float = 0F
+    private var infoTextSize: Float = 0F
+    private var numberChildrenTextSize: Float = 0F
+    private var iconSize: Float = 0F
+    private var listSort: SortNodeEnum = SortNodeEnum.DB
+    private var ascendingSort: Boolean = true
+    private var groupsBeforeSort: Boolean = true
+    private var recycleBinBottomSort: Boolean = true
    private var showUserNames: Boolean = true
    private var showNumberEntries: Boolean = true
-    private var entryFilters = arrayOf<Group.ChildFilter>()

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

    private val mDatabase: Database

-    @ColorInt
-    private val contentSelectionColor: Int
-    @ColorInt
    private val iconGroupColor: Int
-    @ColorInt
    private val iconEntryColor: Int

    /**
@@ -89,23 +81,27 @@ class NodeAdapter (private val context: Context)
        get() = nodeSortedList.size() <= 0

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

-        this.nodeSortedListCallback = NodeSortedListCallback()
-        this.nodeSortedList = SortedList(Node::class.java, nodeSortedListCallback)
+        this.nodeSortedList = SortedList(NodeVersioned::class.java, object : SortedListAdapterCallback<NodeVersioned>(this) {
+            override fun compare(item1: NodeVersioned, item2: NodeVersioned): Int {
+                return listSort.getNodeComparator(ascendingSort, groupsBeforeSort, recycleBinBottomSort).compare(item1, item2)
+            }
+
+            override fun areContentsTheSame(oldItem: NodeVersioned, newItem: NodeVersioned): Boolean {
+                return oldItem.type == newItem.type
+                        && oldItem.title == newItem.title
+                        && oldItem.icon == newItem.icon
+            }
+
+            override fun areItemsTheSame(item1: NodeVersioned, item2: NodeVersioned): Boolean {
+                return item1 == item2
+            }
+        })

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

-        // Color of content selection
-        val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        this.contentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
-        taContentSelectionColor.recycle()
        // Retrieve the color to tint the icon
        val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
        this.iconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
@@ -116,23 +112,20 @@ class NodeAdapter (private val context: Context)
        taTextColor.recycle()
    }

-    fun assignPreferences() {
-        this.prefSizeMultiplier = PreferencesUtil.getListTextSize(context)
-
-        notifyChangeSort(
-                PreferencesUtil.getListSort(context),
-                        SortNodeEnum.SortNodeParameters(
-                            PreferencesUtil.getAscendingSort(context),
-                            PreferencesUtil.getGroupsBeforeSort(context),
-                            PreferencesUtil.getRecycleBinBottomSort(context)
-                        )
-                )
+    private fun assignPreferences() {
+        this.prefTextSize = PreferencesUtil.getListTextSize(context)
+        this.infoTextSize = context.resources.getDimension(R.dimen.list_medium_size_default) * prefTextSize
+        this.subtextSize = context.resources.getDimension(R.dimen.list_small_size_default) * prefTextSize
+        this.numberChildrenTextSize = context.resources.getDimension(R.dimen.list_tiny_size_default) * prefTextSize
+        this.iconSize = context.resources.getDimension(R.dimen.list_icon_size_default) * prefTextSize

+        this.listSort = PreferencesUtil.getListSort(context)
+        this.ascendingSort = PreferencesUtil.getAscendingSort(context)
+        this.groupsBeforeSort = PreferencesUtil.getGroupsBeforeSort(context)
+        this.recycleBinBottomSort = PreferencesUtil.getRecycleBinBottomSort(context)
        this.showUserNames = PreferencesUtil.showUsernamesListEntries(context)
        this.showNumberEntries = PreferencesUtil.showNumberEntries(context)

-        this.entryFilters = Group.ChildFilter.getDefaults(context)
-
        // Reinit textSize for all view type
        calculateViewTypeTextSize.forEachIndexed { index, _ -> calculateViewTypeTextSize[index] = true }
    }
@@ -140,28 +133,19 @@ class NodeAdapter (private val context: Context)
    /**
     * Rebuild the list by clear and build children from the group
     */
-    fun rebuildList(group: Group) {
+    fun rebuildList(group: GroupVersioned) {
+        this.nodeSortedList.clear()
        assignPreferences()
-        nodeSortedList.replaceAll(group.getFilteredChildren(entryFilters))
+        try {
+            this.nodeSortedList.addAll(group.getChildren())
+        } catch (e: Exception) {
+            Log.e(TAG, "Can't add node elements to the list", e)
+            Toast.makeText(context, "Can't add node elements to the list : " + e.message, Toast.LENGTH_LONG).show()
+        }
+        notifyDataSetChanged()
    }

-    private inner class NodeSortedListCallback: SortedListAdapterCallback<Node>(this) {
-        override fun compare(item1: Node, item2: Node): Int {
-            return nodeComparator!!.compare(item1, item2)
-        }
-
-        override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
-            return oldItem.type == newItem.type
-                    && oldItem.title == newItem.title
-                    && oldItem.icon == newItem.icon
-        }
-
-        override fun areItemsTheSame(item1: Node, item2: Node): Boolean {
-            return item1 == item2
-        }
-    }
-
-    fun contains(node: Node): Boolean {
+    fun contains(node: NodeVersioned): Boolean {
        return nodeSortedList.indexOf(node) != SortedList.INVALID_POSITION
    }

@@ -169,7 +153,7 @@ class NodeAdapter (private val context: Context)
     * Add a node to the list
     * @param node Node to add
     */
-    fun addNode(node: Node) {
+    fun addNode(node: NodeVersioned) {
        nodeSortedList.add(node)
    }

@@ -177,7 +161,7 @@ class NodeAdapter (private val context: Context)
     * Add nodes to the list
     * @param nodes Nodes to add
     */
-    fun addNodes(nodes: List<Node>) {
+    fun addNodes(nodes: List<NodeVersioned>) {
        nodeSortedList.addAll(nodes)
    }

@@ -185,7 +169,7 @@ class NodeAdapter (private val context: Context)
     * Remove a node in the list
     * @param node Node to delete
     */
-    fun removeNode(node: Node) {
+    fun removeNode(node: NodeVersioned) {
        nodeSortedList.remove(node)
    }

@@ -193,7 +177,7 @@ class NodeAdapter (private val context: Context)
     * Remove nodes in the list
     * @param nodes Nodes to delete
     */
-    fun removeNodes(nodes: List<Node>) {
+    fun removeNodes(nodes: List<NodeVersioned>) {
        nodes.forEach { node ->
            nodeSortedList.remove(node)
        }
@@ -225,7 +209,7 @@ class NodeAdapter (private val context: Context)
     * @param oldNode Node before the update
     * @param newNode Node after the update
     */
-    fun updateNode(oldNode: Node, newNode: Node) {
+    fun updateNode(oldNode: NodeVersioned, newNode: NodeVersioned) {
        nodeSortedList.beginBatchedUpdates()
        nodeSortedList.remove(oldNode)
        nodeSortedList.add(newNode)
@@ -237,7 +221,7 @@ class NodeAdapter (private val context: Context)
     * @param oldNodes Nodes before the update
     * @param newNodes Node after the update
     */
-    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
+    fun updateNodes(oldNodes: List<NodeVersioned>, newNodes: List<NodeVersioned>) {
        nodeSortedList.beginBatchedUpdates()
        oldNodes.forEach { oldNode ->
            nodeSortedList.remove(oldNode)
@@ -246,11 +230,11 @@ class NodeAdapter (private val context: Context)
        nodeSortedList.endBatchedUpdates()
    }

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

-    fun setActionNodes(actionNodes: List<Node>) {
+    fun setActionNodes(actionNodes: List<NodeVersioned>) {
        this.actionNodesList.apply {
            clear()
            addAll(actionNodes)
@@ -269,9 +253,10 @@ class NodeAdapter (private val context: Context)
    /**
     * Notify a change sort of the list
     */
-    fun notifyChangeSort(sortNodeEnum: SortNodeEnum,
-                         sortNodeParameters: SortNodeEnum.SortNodeParameters) {
-        this.nodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
+    fun notifyChangeSort(sortNodeEnum: SortNodeEnum, ascending: Boolean, groupsBefore: Boolean) {
+        this.listSort = sortNodeEnum
+        this.ascendingSort = ascending
+        this.groupsBeforeSort = groupsBefore
    }

    override fun getItemViewType(position: Int): Int {
@@ -289,76 +274,28 @@ class NodeAdapter (private val context: Context)

    override fun onBindViewHolder(holder: NodeViewHolder, position: Int) {
        val subNode = nodeSortedList.get(position)
-
-        // Node selection
-        holder.container.isSelected = actionNodesList.contains(subNode)
-
        // Assign image
-        val iconColor = if (holder.container.isSelected)
-            contentSelectionColor
-        else when (subNode.type) {
+        val iconColor = when (subNode.type) {
            Type.GROUP -> iconGroupColor
            Type.ENTRY -> iconEntryColor
        }
-        holder.imageIdentifier?.setColorFilter(iconColor)
        holder.icon.apply {
            assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor)
            // Relative size of the icon
            layoutParams?.apply {
-                height = (iconDefaultDimension * prefSizeMultiplier).toInt()
-                width = (iconDefaultDimension * prefSizeMultiplier).toInt()
+                height = iconSize.toInt()
+                width = iconSize.toInt()
            }
        }
-
        // Assign text
        holder.text.apply {
            text = subNode.title
-            setTextSize(textSizeUnit, infoTextDefaultDimension, prefSizeMultiplier)
-            strikeOut(subNode.isCurrentlyExpires)
+            setTextSize(textSizeUnit, infoTextSize)
+            paintFlags = if (subNode.isCurrentlyExpires)
+                paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+            else
+                paintFlags and Paint.STRIKE_THRU_TEXT_FLAG
        }
-        // Add subText with username
-        holder.subText.apply {
-            text = ""
-            strikeOut(subNode.isCurrentlyExpires)
-            visibility = View.GONE
-        }
-
-        // Specific elements for entry
-        if (subNode.type == Type.ENTRY) {
-            val entry = subNode as Entry
-            mDatabase.startManageEntry(entry)
-
-            holder.text.text = entry.getVisualTitle()
-            holder.subText.apply {
-                val username = entry.username
-                if (showUserNames && username.isNotEmpty()) {
-                    visibility = View.VISIBLE
-                    text = username
-                    setTextSize(textSizeUnit, subtextDefaultDimension, prefSizeMultiplier)
-                }
-            }
-
-            holder.attachmentIcon?.visibility =
-                    if (entry.containsAttachment()) View.VISIBLE else View.GONE
-
-            mDatabase.stopManageEntry(entry)
-        }
-
-        // Add number of entries in groups
-        if (subNode.type == Type.GROUP) {
-            if (showNumberEntries) {
-                holder.numberChildren?.apply {
-                    text = (subNode as Group)
-                            .getNumberOfChildEntries(entryFilters)
-                            .toString()
-                    setTextSize(textSizeUnit, numberChildrenTextDefaultDimension, prefSizeMultiplier)
-                    visibility = View.VISIBLE
-                }
-            } else {
-                holder.numberChildren?.visibility = View.GONE
-            }
-        }
-
        // Assign click
        holder.container.setOnClickListener {
            nodeClickCallback?.onNodeClick(subNode)
@@ -366,6 +303,47 @@ class NodeAdapter (private val context: Context)
        holder.container.setOnLongClickListener {
            nodeClickCallback?.onNodeLongClick(subNode) ?: false
        }
+
+        holder.container.isSelected = actionNodesList.contains(subNode)
+
+        // Add subText with username
+        holder.subText.apply {
+            text = ""
+            paintFlags = if (subNode.isCurrentlyExpires)
+                paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+            else
+                paintFlags and Paint.STRIKE_THRU_TEXT_FLAG
+            visibility = View.GONE
+            if (subNode.type == Type.ENTRY) {
+                val entry = subNode as EntryVersioned
+
+                mDatabase.startManageEntry(entry)
+
+                holder.text.text = entry.getVisualTitle()
+
+                val username = entry.username
+                if (showUserNames && username.isNotEmpty()) {
+                    visibility = View.VISIBLE
+                    text = username
+                    setTextSize(textSizeUnit, subtextSize)
+                }
+
+                mDatabase.stopManageEntry(entry)
+            }
+        }
+
+        // Add number of entries in groups
+        if (subNode.type == Type.GROUP) {
+            if (showNumberEntries) {
+                holder.numberChildren?.apply {
+                    text = (subNode as GroupVersioned).getChildEntries(true).size.toString()
+                    setTextSize(textSizeUnit, numberChildrenTextSize)
+                    visibility = View.VISIBLE
+                }
+            } else {
+                holder.numberChildren?.visibility = View.GONE
+            }
+        }
    }

    override fun getItemCount(): Int {
@@ -383,18 +361,16 @@ class NodeAdapter (private val context: Context)
     * Callback listener to redefine to do an action when a node is click
     */
    interface NodeClickCallback {
-        fun onNodeClick(node: Node)
-        fun onNodeLongClick(node: Node): Boolean
+        fun onNodeClick(node: NodeVersioned)
+        fun onNodeLongClick(node: NodeVersioned): Boolean
    }

    class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
        var container: View = itemView.findViewById(R.id.node_container)
-        var imageIdentifier: ImageView? = itemView.findViewById(R.id.node_image_identifier)
        var icon: ImageView = itemView.findViewById(R.id.node_icon)
        var text: TextView = itemView.findViewById(R.id.node_text)
        var subText: TextView = itemView.findViewById(R.id.node_subtext)
        var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
-        var attachmentIcon: ImageView? = itemView.findViewById(R.id.node_attachment_icon)
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.adapters
@@ -22,32 +22,27 @@ package com.kunzisoft.keepass.adapters
 import android.content.Context
 import android.database.Cursor
 import android.graphics.Color
+import androidx.cursoradapter.widget.CursorAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.cursor.EntryCursorKDB
-import com.kunzisoft.keepass.database.cursor.EntryCursorKDBX
+import com.kunzisoft.keepass.database.cursor.EntryCursor
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.database.DatabaseKDB
-import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
-import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.database.element.EntryVersioned
+import com.kunzisoft.keepass.database.element.PwIcon
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.strikeOut
+import java.util.*

-class SearchEntryCursorAdapter(private val context: Context,
-                               private val database: Database)
+class SearchEntryCursorAdapter(context: Context, private val database: Database)
    : androidx.cursoradapter.widget.CursorAdapter(context, null, FLAG_REGISTER_CONTENT_OBSERVER) {

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

    init {
@@ -60,13 +55,12 @@ class SearchEntryCursorAdapter(private val context: Context,
    }

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

    override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {

-        val view = cursorInflater!!.inflate(R.layout.item_search_entry, parent, false)
+        val view = cursorInflater.inflate(R.layout.item_search_entry, parent, false)
        val viewHolder = ViewHolder()
        viewHolder.imageViewIcon = view.findViewById(R.id.entry_icon)
        viewHolder.textViewTitle = view.findViewById(R.id.entry_text)
@@ -77,91 +71,56 @@ class SearchEntryCursorAdapter(private val context: Context,
    }

    override fun bindView(view: View, context: Context, cursor: Cursor) {
-        getEntryFrom(cursor)?.let { currentEntry ->
-            val viewHolder = view.tag as ViewHolder

-            // Assign image
-            viewHolder.imageViewIcon?.assignDatabaseIcon(
-                    database.drawFactory,
-                    currentEntry.icon,
-                    iconColor)
-
-            // Assign title
-            viewHolder.textViewTitle?.apply {
-                text = currentEntry.getVisualTitle()
-                strikeOut(currentEntry.isCurrentlyExpires)
-            }
-
-            // Assign subtitle
-            viewHolder.textViewSubTitle?.apply {
-                val entryUsername = currentEntry.username
-                text = if (mDisplayUsername && entryUsername.isNotEmpty()) {
-                    String.format("(%s)", entryUsername)
-                } else {
-                    ""
-                }
-                strikeOut(currentEntry.isCurrentlyExpires)
-            }
+        // Retrieve elements from cursor
+        val uuid = UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
+                cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS)))
+        val iconFactory = database.iconFactory
+        var icon: PwIcon = iconFactory.getIcon(
+                UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
+                        cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))))
+        if (icon.isUnknown) {
+            icon = iconFactory.getIcon(cursor.getInt(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_STANDARD)))
+            if (icon.isUnknown)
+                icon = iconFactory.keyIcon
        }
-    }
+        val title = cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_TITLE))
+        val username = cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_USERNAME))
+        val url = cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_URL))

-    private fun getEntryFrom(cursor: Cursor): Entry? {
-        return database.createEntry()?.apply {
-            database.startManageEntry(this)
-            entryKDB?.let { entryKDB ->
-                (cursor as EntryCursorKDB).populateEntry(entryKDB, database.iconFactory)
-            }
-            entryKDBX?.let { entryKDBX ->
-                (cursor as EntryCursorKDBX).populateEntry(entryKDBX, database.iconFactory)
-            }
-            database.stopManageEntry(this)
+        val viewHolder = view.tag as ViewHolder
+
+        // Assign image
+        viewHolder.imageViewIcon?.assignDatabaseIcon(database.drawFactory, icon, iconColor)
+
+        // Assign title
+        val showTitle = EntryVersioned.getVisualTitle(false, title, username, url, uuid.toString())
+        viewHolder.textViewTitle?.text = showTitle
+        if (displayUsername && username.isNotEmpty()) {
+            viewHolder.textViewSubTitle?.text = String.format("(%s)", username)
+        } else {
+            viewHolder.textViewSubTitle?.text = ""
        }
    }

-    override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor? {
-        return searchEntries(context, constraint.toString())
-    }
-
-    private fun searchEntries(context: Context, query: String): Cursor? {
-        var cursorKDB: EntryCursorKDB? = null
-        var cursorKDBX: EntryCursorKDBX? = null
-
-        if (database.type == DatabaseKDB.TYPE)
-            cursorKDB = EntryCursorKDB()
-        if (database.type == DatabaseKDBX.TYPE)
-            cursorKDBX = EntryCursorKDBX()
-
-        val searchGroup = database.createVirtualGroupFromSearch(query,
-                mOmitBackup,
-                SearchHelper.MAX_SEARCH_ENTRY)
-        if (searchGroup != null) {
-            // Search in hide entries but not meta-stream
-            for (entry in searchGroup.getFilteredChildEntries(Group.ChildFilter.getDefaults(context))) {
-                entry.entryKDB?.let {
-                    cursorKDB?.addEntry(it)
-                }
-                entry.entryKDBX?.let {
-                    cursorKDBX?.addEntry(it)
-                }
-            }
-        }
-
-        return cursorKDB ?: cursorKDBX
-    }
-
-    fun getEntryFromPosition(position: Int): Entry? {
-        var pwEntry: Entry? = null
-
-        val cursor = this.cursor
-        if (cursor.moveToFirst() && cursor.move(position)) {
-            pwEntry = getEntryFrom(cursor)
-        }
-        return pwEntry
-    }
-
    private class ViewHolder {
        internal var imageViewIcon: ImageView? = null
        internal var textViewTitle: TextView? = null
        internal var textViewSubTitle: TextView? = null
    }
+
+    override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor? {
+        return database.searchEntries(constraint.toString())
+    }
+
+    fun getEntryFromPosition(position: Int): EntryVersioned? {
+        var pwEntry: EntryVersioned? = null
+
+        val cursor = this.cursor
+        if (cursor.moveToFirst() && cursor.move(position)) {
+            pwEntry = database.getEntryFrom(cursor)
+        }
+        return pwEntry
+    }
+
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/App.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/App.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.app
@@ -22,7 +22,6 @@ 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() {

@@ -34,7 +33,7 @@ class App : MultiDexApplication() {
    }

    override fun onTerminate() {
-        Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this))
+        Database.getInstance().closeAndClear(applicationContext.filesDir)
        super.onTerminate()
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/app/PRNGFixes.java
+++ b/app/src/main/java/com/kunzisoft/keepass/app/PRNGFixes.java
@@ -13,6 +13,8 @@ package com.kunzisoft.keepass.app;
 import android.os.Build;
 import android.os.Process;

+import com.kunzisoft.keepass.utils.StringUtil;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -64,7 +66,7 @@ public final class PRNGFixes {
    
    private static boolean supportedOnThisDevice() {
    	// Blacklist on samsung devices
-    	if (Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).contains("samsung")) {
+    	if (StringUtil.INSTANCE.indexOfIgnoreCase(Build.MANUFACTURER, "samsung", Locale.ENGLISH) >= 0) {
    		return false;
    	}
    	
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/ActionDatabaseAsyncTask.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/ActionDatabaseAsyncTask.kt
@@ -0,0 +1,20 @@
+package com.kunzisoft.keepass.app.database
+
+import android.os.AsyncTask
+
+/**
+ * Private class to invoke each method in a separate thread
+ */
+class ActionDatabaseAsyncTask<T>(
+        private val action: () -> T ,
+        private val afterActionDatabaseListener: ((T?) -> Unit)? = null
+) : AsyncTask<Void, Void, T>() {
+
+    override fun doInBackground(vararg args: Void?): T? {
+        return action.invoke()
+    }
+
+    override fun onPostExecute(result: T?) {
+        afterActionDatabaseListener?.invoke(result)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.app.database

 import androidx.room.Database
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.app.database

 import android.content.Context
@@ -32,7 +13,7 @@ class CipherDatabaseAction(applicationContext: Context) {

    fun getCipherDatabase(databaseUri: Uri,
                          cipherDatabaseResultListener: (CipherDatabaseEntity?) -> Unit) {
-        IOActionTask(
+        ActionDatabaseAsyncTask(
                {
                    cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
                },
@@ -51,7 +32,7 @@ class CipherDatabaseAction(applicationContext: Context) {

    fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
                                  cipherDatabaseResultListener: (() -> Unit)? = null) {
-        IOActionTask(
+        ActionDatabaseAsyncTask(
                {
                    val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)

@@ -70,7 +51,7 @@ class CipherDatabaseAction(applicationContext: Context) {

    fun deleteByDatabaseUri(databaseUri: Uri,
                            cipherDatabaseResultListener: (() -> Unit)? = null) {
-        IOActionTask(
+        ActionDatabaseAsyncTask(
                {
                    cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
                },
@@ -81,7 +62,7 @@ class CipherDatabaseAction(applicationContext: Context) {
    }

    fun deleteAll() {
-        IOActionTask(
+        ActionDatabaseAsyncTask(
                {
                    cipherDatabaseDao.deleteAll()
                }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseDao.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseDao.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.app.database

 import androidx.room.*
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseEntity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseEntity.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.app.database

 import android.os.Parcel
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt
@@ -1,64 +1,51 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.app.database

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

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

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

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

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

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

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

    fun deleteAllKeyFiles() {
-        IOActionTask(
+        ActionDatabaseAsyncTask(
                {
                    databaseFileHistoryDao.deleteAllKeyFiles()
                }
@@ -201,7 +121,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
    }

    fun deleteAll() {
-        IOActionTask(
+        ActionDatabaseAsyncTask(
                {
                    databaseFileHistoryDao.deleteAll()
                }
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryDao.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryDao.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.app.database

 import androidx.room.*
@@ -38,9 +19,6 @@ interface FileDatabaseHistoryDao {
    @Delete
    fun delete(fileDatabaseHistory: FileDatabaseHistoryEntity): Int

-    @Query("UPDATE file_database_history SET keyfile_uri=null WHERE database_uri = :databaseUriString")
-    fun deleteKeyFileByDatabaseUri(databaseUriString: String)
-
    @Query("UPDATE file_database_history SET keyfile_uri=null")
    fun deleteAllKeyFiles()

--- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt
@@ -1,22 +1,3 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 package com.kunzisoft.keepass.app.database

 import androidx.room.ColumnInfo
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/IOActionTask.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/IOActionTask.kt
@@ -1,45 +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.app.database
-
-import kotlinx.coroutines.*
-
-/**
- * Class to invoke action in a separate IO thread
- */
-class IOActionTask<T>(
-        private val action: () -> T ,
-        private val afterActionDatabaseListener: ((T?) -> Unit)? = null) {
-
-    private val mainScope = CoroutineScope(Dispatchers.Main)
-
-    fun execute() {
-        mainScope.launch {
-            withContext(Dispatchers.IO) {
-                val asyncResult: Deferred<T?> = async {
-                    action.invoke()
-                }
-                withContext(Dispatchers.Main) {
-                    afterActionDatabaseListener?.invoke(asyncResult.await())
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.autofill
@@ -26,20 +26,15 @@ import android.content.Intent
 import android.os.Build
 import android.service.autofill.Dataset
 import android.service.autofill.FillResponse
+import androidx.annotation.RequiresApi
 import android.util.Log
 import android.view.autofill.AutofillManager
 import android.view.autofill.AutofillValue
 import android.widget.RemoteViews
-import androidx.annotation.RequiresApi
-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.database.element.Database
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.model.EntryInfo
-import com.kunzisoft.keepass.model.SearchInfo
+import java.util.*


@RequiresApi(api = Build.VERSION_CODES.O)
@@ -61,44 +56,27 @@ object AutofillHelper {
            return String.format("%s (%s)", entryInfo.title, entryInfo.username)
        if (entryInfo.title.isNotEmpty())
            return entryInfo.title
-        if (entryInfo.url.isNotEmpty())
-            return entryInfo.url
        if (entryInfo.username.isNotEmpty())
            return entryInfo.username
+        if (entryInfo.url.isNotEmpty())
+            return entryInfo.url
        return ""
    }

-    internal fun addHeader(responseBuilder: FillResponse.Builder,
-                           packageName: String,
-                           webDomain: String?,
-                           applicationId: String?) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            if (webDomain != null) {
-                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_web_domain).apply {
-                    setTextViewText(R.id.autofill_web_domain_text, webDomain)
-                })
-            } else if (applicationId != null) {
-                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_app_id).apply {
-                    setTextViewText(R.id.autofill_app_id_text, applicationId)
-                })
-            }
-        }
-    }
-
-    internal fun buildDataset(context: Context,
-                              entryInfo: EntryInfo,
-                              struct: StructureParser.Result): Dataset? {
+    private fun buildDataset(context: Context,
+                             entryInfo: EntryInfo,
+                             struct: StructureParser.Result): Dataset? {
        val title = makeEntryTitle(entryInfo)
-        val views = newRemoteViews(context, title, entryInfo.icon)
+        val views = newRemoteViews(context.packageName, title)
        val builder = Dataset.Builder(views)
        builder.setId(entryInfo.id)

-        struct.usernameId?.let { usernameId ->
-            builder.setValue(usernameId, AutofillValue.forText(entryInfo.username))
-        }
-        struct.passwordId?.let { password ->
-            builder.setValue(password, AutofillValue.forText(entryInfo.password))
-        }
+        struct.password.forEach { id -> builder.setValue(id, AutofillValue.forText(entryInfo.password)) }
+
+        val ids = ArrayList(struct.username)
+        if (entryInfo.username.contains("@") || struct.username.isEmpty())
+            ids.addAll(struct.email)
+        ids.forEach { id -> builder.setValue(id, AutofillValue.forText(entryInfo.username)) }

        return try {
            builder.build()
@@ -109,43 +87,31 @@ object AutofillHelper {
    }

    /**
-     * Build the Autofill response for one entry
+     * Method to hit when right key is selected
     */
-    fun buildResponse(activity: Activity, entryInfo: EntryInfo) {
-        buildResponse(activity, ArrayList<EntryInfo>().apply { add(entryInfo) })
-    }
-
-    /**
-     * Build the Autofill response for many entry
-     */
-    fun buildResponse(activity: Activity, entriesInfo: List<EntryInfo>) {
-        if (entriesInfo.isEmpty()) {
-            activity.setResult(Activity.RESULT_CANCELED)
-        } else {
-            var setResultOk = false
-            activity.intent?.extras?.let { extras ->
-                if (extras.containsKey(ASSIST_STRUCTURE)) {
-                    activity.intent?.getParcelableExtra<AssistStructure>(ASSIST_STRUCTURE)?.let { structure ->
-                        StructureParser(structure).parse()?.let { result ->
-                            // New Response
-                            val responseBuilder = FillResponse.Builder()
-                            entriesInfo.forEach {
-                                responseBuilder.addDataset(buildDataset(activity, it, result))
-                            }
-                            val mReplyIntent = Intent()
-                            Log.d(activity.javaClass.name, "Successed Autofill auth.")
-                            mReplyIntent.putExtra(
-                                    AutofillManager.EXTRA_AUTHENTICATION_RESULT,
-                                    responseBuilder.build())
-                            setResultOk = true
-                            activity.setResult(Activity.RESULT_OK, mReplyIntent)
-                        }
+    fun buildResponseWhenEntrySelected(activity: Activity, entryInfo: EntryInfo) {
+        var setResultOk = false
+        activity.intent?.extras?.let { extras ->
+            if (extras.containsKey(ASSIST_STRUCTURE)) {
+                activity.intent?.getParcelableExtra<AssistStructure>(ASSIST_STRUCTURE)?.let { structure ->
+                    StructureParser(structure).parse()?.let { result ->
+                        // New Response
+                        val responseBuilder = FillResponse.Builder()
+                        val dataset = buildDataset(activity, entryInfo, result)
+                        responseBuilder.addDataset(dataset)
+                        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)
                    }
                }
-                if (!setResultOk) {
-                    Log.w(activity.javaClass.name, "Failed Autofill auth.")
-                    activity.setResult(Activity.RESULT_CANCELED)
-                }
+            }
+            if (!setResultOk) {
+                Log.w(activity.javaClass.name, "Failed Autofill auth.")
+                activity.setResult(Activity.RESULT_CANCELED)
            }
        }
    }
@@ -153,15 +119,9 @@ object AutofillHelper {
    /**
     * Utility method to start an activity with an Autofill for result
     */
-    fun startActivityForAutofillResult(activity: Activity,
-                                       intent: Intent,
-                                       assistStructure: AssistStructure,
-                                       searchInfo: SearchInfo?) {
+    fun startActivityForAutofillResult(activity: Activity, intent: Intent, assistStructure: AssistStructure) {
        EntrySelectionHelper.addEntrySelectionModeExtraInIntent(intent)
        intent.putExtra(ASSIST_STRUCTURE, assistStructure)
-        searchInfo?.let {
-            intent.putExtra(KEY_SEARCH_INFO, it)
-        }
        activity.startActivityForResult(intent, AUTOFILL_RESPONSE_REQUEST_CODE)
    }

@@ -180,18 +140,9 @@ object AutofillHelper {
        }
    }

-    private fun newRemoteViews(context: Context,
-                               remoteViewsText: String,
-                               remoteViewsIcon: IconImage? = null): RemoteViews {
-        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
-        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
-        if (remoteViewsIcon != null) {
-            presentation.assignDatabaseIcon(context,
-                    R.id.autofill_entry_icon,
-                    Database.getInstance().drawFactory,
-                    remoteViewsIcon,
-                    ContextCompat.getColor(context, R.color.green))
-        }
+    private fun newRemoteViews(packageName: String, remoteViewsText: String): RemoteViews {
+        val presentation = RemoteViews(packageName, R.layout.item_autofill_service)
+        presentation.setTextViewText(R.id.text, remoteViewsText)
        return presentation
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillLauncherActivity.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.autofill
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.IntentSender
+import android.os.Build
+import android.os.Bundle
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import com.kunzisoft.keepass.activities.FileDatabaseSelectActivity
+import com.kunzisoft.keepass.activities.GroupActivity
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.timeout.TimeoutHelper
+
+@RequiresApi(api = Build.VERSION_CODES.O)
+class AutofillLauncherActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
+        val assistStructure = AutofillHelper.retrieveAssistStructure(intent)
+        if (assistStructure != null) {
+            if (Database.getInstance().loaded && TimeoutHelper.checkTime(this))
+                GroupActivity.launchForAutofillResult(this, assistStructure, PreferencesUtil.enableReadOnlyDatabase(this))
+            else {
+                FileDatabaseSelectActivity.launchForAutofillResult(this, assistStructure)
+            }
+        } else {
+            setResult(Activity.RESULT_CANCELED)
+            finish()
+        }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    companion object {
+
+        fun getAuthIntentSenderForResponse(context: Context): IntentSender {
+            val intent = Intent(context, AutofillLauncherActivity::class.java)
+            return PendingIntent.getActivity(context, 0,
+                    intent, PendingIntent.FLAG_CANCEL_CURRENT).intentSender
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.autofill
@@ -22,95 +22,31 @@ package com.kunzisoft.keepass.autofill
 import android.os.Build
 import android.os.CancellationSignal
 import android.service.autofill.*
+import androidx.annotation.RequiresApi
 import android.util.Log
 import android.widget.RemoteViews
-import androidx.annotation.RequiresApi
 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.SearchInfo
-import com.kunzisoft.keepass.settings.PreferencesUtil

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

-    var applicationIdBlocklist: Set<String>? = null
-    var webDomainBlocklist: Set<String>? = null
-
-    override fun onCreate() {
-        super.onCreate()
-
-        applicationIdBlocklist = PreferencesUtil.applicationIdBlocklist(this)
-        webDomainBlocklist = PreferencesUtil.webDomainBlocklist(this)
-    }
-
-    override fun onFillRequest(request: FillRequest,
-                               cancellationSignal: CancellationSignal,
+    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.") }
+        cancellationSignal.setOnCancelListener { Log.e(TAG, "Cancel autofill not implemented in this sample.") }

+        val responseBuilder = FillResponse.Builder()
        // Check user's settings for authenticating Responses and Datasets.
-        StructureParser(latestStructure).parse()?.let { parseResult ->
-
-            // Build search info only if applicationId or webDomain are not blocked
-            if (searchAllowedFor(parseResult.applicationId, applicationIdBlocklist)
-                    && searchAllowedFor(parseResult.domain, webDomainBlocklist)) {
-                val searchInfo = SearchInfo().apply {
-                    applicationId = parseResult.applicationId
-                    webDomain = parseResult.domain
-                }
-
-                SearchHelper.checkAutoSearchInfo(this,
-                        Database.getInstance(),
-                        searchInfo,
-                        { items ->
-                            val responseBuilder = FillResponse.Builder()
-                            AutofillHelper.addHeader(responseBuilder, packageName,
-                                    parseResult.domain, parseResult.applicationId)
-                            items.forEach {
-                                responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
-                            }
-                            callback.onSuccess(responseBuilder.build())
-                        },
-                        {
-                            // Show UI if no search result
-                            showUIForEntrySelection(parseResult, searchInfo, callback)
-                        },
-                        {
-                            // Show UI if database not open
-                            showUIForEntrySelection(parseResult, searchInfo, callback)
-                        }
-                )
-            }
-        }
-    }
-
-    private fun showUIForEntrySelection(parseResult: StructureParser.Result,
-                                        searchInfo: SearchInfo,
-                                        callback: FillCallback) {
-        parseResult.allAutofillIds().let { autofillIds ->
-            if (autofillIds.isNotEmpty()) {
+        val parseResult = StructureParser(latestStructure).parse()
+        parseResult?.allAutofillIds()?.let { autofillIds ->
+            if (listOf(*autofillIds).isNotEmpty()) {
                // If the entire Autofill Response is authenticated, AuthActivity is used
                // to generate Response.
-                val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this,
-                        searchInfo)
-                val responseBuilder = FillResponse.Builder()
-                val remoteViewsUnlock: RemoteViews = if (!parseResult.domain.isNullOrEmpty()) {
-                    RemoteViews(packageName, R.layout.item_autofill_unlock_web_domain).apply {
-                        setTextViewText(R.id.autofill_web_domain_text, parseResult.domain)
-                    }
-                } else if (!parseResult.applicationId.isNullOrEmpty()) {
-                    RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
-                        setTextViewText(R.id.autofill_app_id_text, parseResult.applicationId)
-                    }
-                } else {
-                    RemoteViews(packageName, R.layout.item_autofill_unlock)
-                }
-                responseBuilder.setAuthentication(autofillIds, sender, remoteViewsUnlock)
+                val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this)
+                val presentation = RemoteViews(packageName, R.layout.item_autofill_service_unlock)
+                responseBuilder.setAuthentication(autofillIds, sender, presentation)
                callback.onSuccess(responseBuilder.build())
            }
        }
@@ -131,18 +67,5 @@ class KeeAutofillService : AutofillService() {

    companion object {
        private val TAG = KeeAutofillService::class.java.name
-
-        fun searchAllowedFor(element: String?, blockList: Set<String>?): Boolean {
-            element?.let { elementNotNull ->
-                if (blockList?.any { appIdBlocked ->
-                            elementNotNull.contains(appIdBlocked)
-                        } == true
-                ) {
-                    Log.d(TAG, "Autofill not allowed for $elementNotNull")
-                    return false
-                }
-            }
-            return true
-        }
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/StructureParser.kt
@@ -1,27 +1,27 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 */
 package com.kunzisoft.keepass.autofill

 import android.app.assist.AssistStructure
 import android.os.Build
-import android.text.InputType
 import androidx.annotation.RequiresApi
+import android.text.InputType
 import android.util.Log
 import android.view.View
 import android.view.autofill.AutofillId
@@ -35,238 +35,74 @@ import java.util.*
 internal class StructureParser(private val structure: AssistStructure) {
    private var result: Result? = null
    private var usernameCandidate: AutofillId? = null
-    private var usernameNeeded = true

    fun parse(): Result? {
-        try {
-            result = Result()
-            result?.apply {
-                usernameCandidate = null
-                mainLoop@ for (i in 0 until structure.windowNodeCount) {
-                    val windowNode = structure.getWindowNodeAt(i)
-                    applicationId = windowNode.title.toString().split("/")[0]
-                    Log.d(TAG, "Autofill applicationId: $applicationId")
-
-                    if (parseViewNode(windowNode.rootViewNode))
-                        break@mainLoop
+        result = Result()
+        result?.apply {
+            usernameCandidate = null
+            for (i in 0 until structure.windowNodeCount) {
+                val windowNode = structure.getWindowNodeAt(i)
+                title.add(windowNode.title)
+                windowNode.rootViewNode.webDomain?.let {
+                    webDomain.add(it)
                }
-                // If not explicit username field found, add the field just before password field.
-                if (usernameId == null && passwordId != null && usernameCandidate != null)
-                    usernameId = usernameCandidate
+                parseViewNode(windowNode.rootViewNode)
            }
-
-            // Return the result only if password field is retrieved
-            return if ((!usernameNeeded || result?.usernameId != null)
-                    && result?.passwordId != null)
-                result
-            else
-                null
-        } catch (e: Exception) {
-            return null
+            // If not explicit username field found, add the field just before password field.
+            if (username.isEmpty() && email.isEmpty()
+                    && password.isNotEmpty() && usernameCandidate != null)
+                username.add(usernameCandidate!!)
        }
+
+        return result
    }

-    private fun parseViewNode(node: AssistStructure.ViewNode): Boolean {
-        // Get the domain of a web app
-        node.webDomain?.let { webDomain ->
-            if (webDomain.isNotEmpty()) {
-                result?.domain = webDomain
-                Log.d(TAG, "Autofill domain: $webDomain")
-            }
-        }
-
-        // Only parse visible nodes
-        if (node.visibility == View.VISIBLE) {
-            if (node.autofillId != null
-                    && node.autofillType == View.AUTOFILL_TYPE_TEXT) {
-                // Parse methods
-                val hints = node.autofillHints
-                if (hints != null && hints.isNotEmpty()) {
-                    if (parseNodeByAutofillHint(node))
-                        return true
-                } else if (parseNodeByHtmlAttributes(node))
-                    return true
-                else if (parseNodeByAndroidInput(node))
-                    return true
-            }
-            // Recursive method to process each node
-            for (i in 0 until node.childCount) {
-                if (parseViewNode(node.getChildAt(i)))
-                    return true
-            }
-        }
-        return false
-    }
-
-    private fun parseNodeByAutofillHint(node: AssistStructure.ViewNode): Boolean {
+    private fun parseViewNode(node: AssistStructure.ViewNode) {
+        val hints = node.autofillHints
        val autofillId = node.autofillId
-        node.autofillHints?.forEach {
-            when {
-                it.contains(View.AUTOFILL_HINT_USERNAME, true)
-                        || it.contains(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
-                        || it.contains("email", true)
-                        || it.contains(View.AUTOFILL_HINT_PHONE, true)-> {
-                    result?.usernameId = autofillId
-                    Log.d(TAG, "Autofill username hint")
-                }
-                it.contains(View.AUTOFILL_HINT_PASSWORD, true) -> {
-                    result?.passwordId = autofillId
-                    Log.d(TAG, "Autofill password hint")
-                    // Username not needed in this case
-                    usernameNeeded = false
-                    return true
-                }
-                // Ignore autocomplete="off"
-                // https://developer.mozilla.org/en-US/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion
-                it.equals("off", true) ||
-                it.equals("on", true) -> {
-                    Log.d(TAG, "Autofill web hint")
-                    return parseNodeByHtmlAttributes(node)
-                }
-                else -> Log.d(TAG, "Autofill unsupported hint $it")
-            }
-        }
-        return false
-    }
-
-    private fun parseNodeByHtmlAttributes(node: AssistStructure.ViewNode): Boolean {
-        val autofillId = node.autofillId
-        val nodHtml = node.htmlInfo
-        when (nodHtml?.tag?.toLowerCase(Locale.ENGLISH)) {
-            "input" -> {
-                nodHtml.attributes?.forEach { pairAttribute ->
-                    when (pairAttribute.first.toLowerCase(Locale.ENGLISH)) {
-                        "type" -> {
-                            when (pairAttribute.second.toLowerCase(Locale.ENGLISH)) {
-                                "tel", "email" -> {
-                                    result?.usernameId = autofillId
-                                    Log.d(TAG, "Autofill username web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
-                                }
-                                "text" -> {
-                                    usernameCandidate = autofillId
-                                    Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
-                                }
-                                "password" -> {
-                                    result?.passwordId = autofillId
-                                    Log.d(TAG, "Autofill password web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
-                                    return true
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false
-    }
-
-    private fun inputIsVariationType(inputType: Int, vararg type: Int): Boolean {
-        type.forEach {
-            if (inputType and InputType.TYPE_MASK_VARIATION == it)
-                return true
-        }
-        return false
-    }
-
-    private fun showHexInputType(inputType: Int): String {
-        return "0x${"%08x".format(inputType)}"
-    }
-
-    private fun parseNodeByAndroidInput(node: AssistStructure.ViewNode): Boolean {
-        val autofillId = node.autofillId
-        val inputType = node.inputType
-        when (inputType and InputType.TYPE_MASK_CLASS) {
-            InputType.TYPE_CLASS_TEXT -> {
+        if (autofillId != null) {
+            if (hints != null && hints.isNotEmpty()) {
                when {
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
-                            InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS) -> {
-                        result?.usernameId = autofillId
-                        Log.d(TAG, "Autofill username android text type: ${showHexInputType(inputType)}")
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_NORMAL,
-                            InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
-                            InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
-                        usernameCandidate = autofillId
-                        Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_PASSWORD,
-                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
-                            InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
-                        result?.passwordId = autofillId
-                        Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
-                        usernameNeeded = false
-                        return true
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT,
-                            InputType.TYPE_TEXT_VARIATION_FILTER,
-                            InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE,
-                            InputType.TYPE_TEXT_VARIATION_PHONETIC,
-                            InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS,
-                            InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE,
-                            InputType.TYPE_TEXT_VARIATION_URI) -> {
-                        // Type not used
-                    }
-                    else -> {
-                        Log.d(TAG, "Autofill unknown android text type: ${showHexInputType(inputType)}")
-                    }
+                    Arrays.stream(hints).anyMatch { View.AUTOFILL_HINT_USERNAME == it } -> result?.username?.add(autofillId)
+                    Arrays.stream(hints).anyMatch { View.AUTOFILL_HINT_EMAIL_ADDRESS == it } -> result?.email?.add(autofillId)
+                    Arrays.stream(hints).anyMatch { View.AUTOFILL_HINT_PASSWORD == it } -> result?.password?.add(autofillId)
+                    else -> Log.d(TAG, "unsupported hints")
                }
-            }
-            InputType.TYPE_CLASS_NUMBER -> {
+            } else if (node.autofillType == View.AUTOFILL_TYPE_TEXT) {
+                val inputType = node.inputType
                when {
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
-                        usernameCandidate = autofillId
-                        Log.d(TAG, "Autofill usernale candidate android number type: ${showHexInputType(inputType)}")
-                    }
-                    inputIsVariationType(inputType,
-                            InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
-                        result?.passwordId = autofillId
-                        Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
-                        usernameNeeded = false
-                        return true
-                    }
-                    else -> {
-                        Log.d(TAG, "Autofill unknown android number type: ${showHexInputType(inputType)}")
-                    }
+                    inputType and InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS > 0 -> result?.email?.add(autofillId)
+                    inputType and InputType.TYPE_TEXT_VARIATION_PASSWORD > 0 -> result?.password?.add(autofillId)
+                    result?.password?.isEmpty() == true -> usernameCandidate = autofillId
                }
            }
        }
-        return false
+
+        for (i in 0 until node.childCount)
+            parseViewNode(node.getChildAt(i))
    }

    @RequiresApi(api = Build.VERSION_CODES.O)
    internal class Result {
-        var applicationId: String? = null
-        var domain: String? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
+        val title: MutableList<CharSequence>
+        val webDomain: MutableList<String>
+        val username: MutableList<AutofillId>
+        val email: MutableList<AutofillId>
+        val password: MutableList<AutofillId>

-        var usernameId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
-
-        var passwordId: AutofillId? = null
-            set(value) {
-                if (field == null)
-                    field = value
-            }
+        init {
+            title = ArrayList()
+            webDomain = ArrayList()
+            username = ArrayList()
+            email = ArrayList()
+            password = ArrayList()
+        }

        fun allAutofillIds(): Array<AutofillId> {
            val all = ArrayList<AutofillId>()
-            usernameId?.let {
-                all.add(it)
-            }
-            passwordId?.let {
-                all.add(it)
-            }
+            all.addAll(username)
+            all.addAll(email)
+            all.addAll(password)
            return all.toTypedArray()
        }
    }
--- a/app/src/main/java/com/kunzisoft/keepass/backup/SettingsBackupAgent.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/backup/SettingsBackupAgent.kt
@@ -1,29 +1,33 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.backup

+import android.annotation.SuppressLint
 import android.app.backup.BackupAgentHelper
 import android.app.backup.SharedPreferencesBackupHelper

+@SuppressLint("NewApi")
 class SettingsBackupAgent : BackupAgentHelper() {

+    //TODO Backup
+
    override fun onCreate() {
        val defaultPrefs = this.packageName + "_preferences"
        val prefHelper = SharedPreferencesBackupHelper(this, defaultPrefs)
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
@@ -1,36 +1,13 @@
-/*
- * 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
@@ -42,86 +19,80 @@ 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 advancedUnlockInfoView: AdvancedUnlockInfoView?,
+                              var checkboxPasswordView: CompoundButton?,
+                              var onCheckedPasswordChangeListener: CompoundButton.OnCheckedChangeListener? = null,
                              var passwordView: TextView?,
-                              private var loadDatabaseAfterRegisterCredentials: (encryptedPassword: String?, ivSpec: String?) -> Unit,
-                              private var loadDatabaseAfterRetrieveCredentials: (decryptedPassword: String?) -> Unit)
+                              var loadDatabaseAfterRegisterCredentials: (encryptedPassword: String?, ivSpec: String?) -> Unit,
+                              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 isBiometricPromptAutoOpenEnable = PreferencesUtil.isBiometricPromptAutoOpenEnable(context)

    private var cipherDatabaseAction = CipherDatabaseAction.getInstance(context.applicationContext)

-    init {
+    // fingerprint related code here
+    fun initBiometric() {
+
+        // Check if fingerprint well init (be called the first time the fingerprint is configured
+        // and the activity still active)
+        if (biometricUnlockDatabaseHelper == null || !biometricUnlockDatabaseHelper!!.isBiometricInitialized) {
+
+            biometricUnlockDatabaseHelper = BiometricUnlockDatabaseHelper(context, this)
+            // callback for fingerprint findings
+            biometricUnlockDatabaseHelper?.setAuthenticationCallback(biometricCallback)
+        }
+
        // 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)
        }
+
+        checkBiometricAvailability()
    }

-    /**
-     * Check biometric availability and change the current mode depending of device's state
-     */
+    @Synchronized
    fun checkBiometricAvailability() {

-        // biometric not supported (by API level or hardware) so keep option hidden
+        // fingerprint 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
+
+            // fingerprint 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)
+
+                toggleMode(Mode.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)
+                if (checkboxPasswordView?.isChecked == true) {
+                    // listen for encryption
+                    toggleMode(Mode.STORE)
                } 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
-                            })
-                        }
+                    cipherDatabaseAction.containsCipherDatabase(databaseFileUri) {
+
+                        // fingerprint available but no stored password found yet for this DB so show info don't listen
+                        toggleMode( if (it) {
+                            // listen for decryption
+                            Mode.OPEN
+                        } else {
+                            // wait for typing
+                            Mode.WAIT_CREDENTIAL
+                        })
                    }
                }
            }
@@ -135,7 +106,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
        }
    }

-    private val biometricAuthenticationCallback = object : BiometricPrompt.AuthenticationCallback () {
+    private val biometricCallback = object : BiometricPrompt.AuthenticationCallback () {

        override fun onAuthenticationError(
                errorCode: Int,
@@ -156,15 +127,19 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
        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 -> {
+                    Mode.UNAVAILABLE -> {
+                    }
+                    Mode.PAUSE -> {
+                    }
+                    Mode.NOT_CONFIGURED -> {
+                    }
+                    Mode.WAIT_CREDENTIAL -> {
+                    }
+                    Mode.STORE -> {
                        // newly store the entered password in encrypted way
                        biometricUnlockDatabaseHelper?.encryptData(passwordView?.text.toString())
                    }
-                    Mode.EXTRACT_CREDENTIAL -> {
+                    Mode.OPEN -> {
                        // retrieve the encrypted value from preferences
                        cipherDatabaseAction.getCipherDatabase(databaseFileUri) {
                            it?.encryptedValue?.let { value ->
@@ -180,7 +155,11 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
    private fun initNotAvailable() {
        showFingerPrintViews(false)

-        advancedUnlockInfoView?.setIconViewClickListener(false, null)
+        advancedUnlockInfoView?.setIconViewClickListener(null)
+    }
+
+    private fun initPause() {
+        advancedUnlockInfoView?.setIconViewClickListener(null)
    }

    private fun initNotConfigured() {
@@ -188,19 +167,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
        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))
-        }
+        advancedUnlockInfoView?.setIconViewClickListener(null)
    }

    private fun initWaitData() {
@@ -208,20 +175,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
        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)
-        }
+        advancedUnlockInfoView?.setIconViewClickListener(null)
    }

    private fun initEncryptData() {
@@ -234,7 +188,9 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
            cryptoObject?.let { crypto ->
                // Set listener to open the biometric dialog and save credential
                advancedUnlockInfoView?.setIconViewClickListener { _ ->
-                    openBiometricPrompt(biometricPrompt, crypto, promptInfo)
+                    context.runOnUiThread {
+                        biometricPrompt?.authenticate(promptInfo, crypto)
+                    }
                }
            }

@@ -255,13 +211,17 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
                        cryptoObject?.let { crypto ->
                            // Set listener to open the biometric dialog and check credential
                            advancedUnlockInfoView?.setIconViewClickListener { _ ->
-                                openBiometricPrompt(biometricPrompt, crypto, promptInfo)
+                                context.runOnUiThread {
+                                    biometricPrompt?.authenticate(promptInfo, crypto)
+                                }
                            }

                            // Auto open the biometric prompt
                            if (isBiometricPromptAutoOpenEnable) {
                                isBiometricPromptAutoOpenEnable = false
-                                openBiometricPrompt(biometricPrompt, crypto, promptInfo)
+                                context.runOnUiThread {
+                                    biometricPrompt?.authenticate(promptInfo, crypto)
+                                }
                            }
                        }

@@ -275,22 +235,28 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
    fun initBiometricMode() {
        when (biometricMode) {
            Mode.UNAVAILABLE -> initNotAvailable()
-            Mode.BIOMETRIC_NOT_CONFIGURED -> initNotConfigured()
-            Mode.KEY_MANAGER_UNAVAILABLE -> initKeyManagerNotAvailable()
+            Mode.PAUSE -> initPause()
+            Mode.NOT_CONFIGURED -> initNotConfigured()
            Mode.WAIT_CREDENTIAL -> initWaitData()
-            Mode.STORE_CREDENTIAL -> initEncryptData()
-            Mode.EXTRACT_CREDENTIAL -> initDecryptData()
+            Mode.STORE -> initEncryptData()
+            Mode.OPEN -> initDecryptData()
        }
        // Show fingerprint key deletion
        context.invalidateOptionsMenu()
    }

+    fun pause() {
+        biometricMode = Mode.PAUSE
+        initBiometricMode()
+    }
+
    fun destroy() {
-        // Close the biometric prompt
-        allowOpenBiometricPrompt = false
-        biometricUnlockDatabaseHelper?.closeBiometricPrompt()
        // Restore the checked listener
        checkboxPasswordView?.setOnCheckedChangeListener(onCheckedPasswordChangeListener)
+
+        biometricMode = Mode.UNAVAILABLE
+        initBiometricMode()
+        biometricUnlockDatabaseHelper = null
    }

    // Only to fix multiple fingerprint menu #332
@@ -299,7 +265,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
        if (!addBiometricMenuInProgress) {
            addBiometricMenuInProgress = true
            cipherDatabaseAction.containsCipherDatabase(databaseFileUri) {
-                if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.BIOMETRIC_NOT_CONFIGURED)
+                if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.NOT_CONFIGURED)
                        && it) {
                    menuInflater.inflate(R.menu.advanced_unlock, menu)
                    addBiometricMenuInProgress = false
@@ -311,12 +277,13 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
    fun deleteEntryKey() {
        biometricUnlockDatabaseHelper?.deleteEntryKey()
        cipherDatabaseAction.deleteByDatabaseUri(databaseFileUri)
-        biometricMode = Mode.BIOMETRIC_NOT_CONFIGURED
+        biometricMode = Mode.NOT_CONFIGURED
        checkBiometricAvailability()
    }

    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {
        loadDatabaseAfterRegisterCredentials.invoke(encryptedValue, ivSpec)
+        // TODO setAdvancedUnlockedMessageView(R.string.encrypted_value_stored)
    }

    override fun handleDecryptedResult(decryptedValue: String) {
@@ -329,15 +296,12 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
    }

    override fun onBiometricException(e: Exception) {
-        e.localizedMessage?.let {
-            setAdvancedUnlockedMessageView(it)
-        }
+        if (e.localizedMessage != null)
+            setAdvancedUnlockedMessageView(e.localizedMessage)
    }

    private fun showFingerPrintViews(show: Boolean) {
-        context.runOnUiThread {
-            advancedUnlockInfoView?.visibility = if (show) View.VISIBLE else View.GONE
-        }
+        context.runOnUiThread { advancedUnlockInfoView?.hide = !show }
    }

    private fun setAdvancedUnlockedTitleView(textId: Int) {
@@ -359,7 +323,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
    }

    enum class Mode {
-        UNAVAILABLE, BIOMETRIC_NOT_CONFIGURED, KEY_MANAGER_UNAVAILABLE, WAIT_CREDENTIAL, STORE_CREDENTIAL, EXTRACT_CREDENTIAL
+        UNAVAILABLE, PAUSE, NOT_CONFIGURED, WAIT_CREDENTIAL, STORE, OPEN
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/BiometricUnlockDatabaseHelper.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.biometric
@@ -42,7 +42,8 @@ import javax.crypto.SecretKey
 import javax.crypto.spec.IvParameterSpec

@RequiresApi(api = Build.VERSION_CODES.M)
-class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
+class BiometricUnlockDatabaseHelper(private val context: FragmentActivity,
+                                    private val biometricUnlockCallback: BiometricUnlockCallback) {

    private var biometricPrompt: BiometricPrompt? = null

@@ -52,15 +53,13 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
    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 var isBiometricInit = false
+    private var authenticationCallback: BiometricPrompt.AuthenticationCallback? = 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
+        // TODO device credential
        /*
        if (keyguardManager?.isDeviceSecure == true)
            setDeviceCredentialAllowed(true)
@@ -71,9 +70,8 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {

    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
+        setDescription(context.getString(R.string.biometric_prompt_extract_credential_message))
+        // TODO device credential
        /*
        if (keyguardManager?.isDeviceSecure == true)
            setDeviceCredentialAllowed(true)
@@ -82,20 +80,20 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
            setNegativeButtonText(context.getString(android.R.string.cancel))
    }.build()

-    val isKeyManagerInitialized: Boolean
+    val isBiometricInitialized: Boolean
        get() {
-            if (!isKeyManagerInit) {
-                biometricUnlockCallback?.onBiometricException(Exception("Biometric not initialized"))
+            if (!isBiometricInit) {
+                biometricUnlockCallback.onBiometricException(Exception("Biometric not initialized"))
            }
-            return isKeyManagerInit
+            return isBiometricInit
        }

    init {
        if (BiometricManager.from(context).canAuthenticate() != BiometricManager.BIOMETRIC_SUCCESS) {
            // really not much to do when no fingerprint support found
-            isKeyManagerInit = false
+            isBiometricInit = false
        } else {
-            this.keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager?
+            this.keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager

            try {
                this.keyStore = KeyStore.getInstance(BIOMETRIC_KEYSTORE)
@@ -105,19 +103,17 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
                                + BIOMETRIC_BLOCKS_MODES + "/"
                                + BIOMETRIC_ENCRYPTION_PADDING)
                this.cryptoObject = BiometricPrompt.CryptoObject(cipher!!)
-                isKeyManagerInit = (keyStore != null
-                        && keyGenerator != null
-                        && cipher != null)
+                isBiometricInit = true
            } catch (e: Exception) {
                Log.e(TAG, "Unable to initialize the keystore", e)
-                isKeyManagerInit = false
-                biometricUnlockCallback?.onBiometricException(e)
+                isBiometricInit = false
+                biometricUnlockCallback.onBiometricException(e)
            }
        }
    }

    private fun getSecretKey(): SecretKey? {
-        if (!isKeyManagerInitialized) {
+        if (!isBiometricInitialized) {
            return null
        }
        try {
@@ -143,14 +139,14 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
                    }
                } catch (e: Exception) {
                    Log.e(TAG, "Unable to create a key in keystore", e)
-                    biometricUnlockCallback?.onBiometricException(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)
+            biometricUnlockCallback.onBiometricException(e)
        }
        return null
    }
@@ -159,7 +155,7 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
                        : (biometricPrompt: BiometricPrompt?,
                           cryptoObject: BiometricPrompt.CryptoObject?,
                           promptInfo: BiometricPrompt.PromptInfo)->Unit) {
-        if (!isKeyManagerInitialized) {
+        if (!isBiometricInitialized) {
            return
        }
        try {
@@ -172,18 +168,19 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {

        } catch (unrecoverableKeyException: UnrecoverableKeyException) {
            Log.e(TAG, "Unable to initialize encrypt data", unrecoverableKeyException)
-            biometricUnlockCallback?.onInvalidKeyException(unrecoverableKeyException)
+            biometricUnlockCallback.onInvalidKeyException(unrecoverableKeyException)
        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
            Log.e(TAG, "Unable to initialize encrypt data", invalidKeyException)
-            biometricUnlockCallback?.onInvalidKeyException(invalidKeyException)
+            biometricUnlockCallback.onInvalidKeyException(invalidKeyException)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to initialize encrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
+            biometricUnlockCallback.onBiometricException(e)
        }
+
    }

    fun encryptData(value: String) {
-        if (!isKeyManagerInitialized) {
+        if (!isBiometricInitialized) {
            return
        }
        try {
@@ -193,20 +190,21 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
            // 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)
+                biometricUnlockCallback.handleEncryptedResult(encryptedBase64, ivSpecValue)
            }

        } catch (e: Exception) {
            Log.e(TAG, "Unable to encrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
+            biometricUnlockCallback.onBiometricException(e)
        }
+
    }

    fun initDecryptData(ivSpecValue: String, actionIfCypherInit
            : (biometricPrompt: BiometricPrompt?,
               cryptoObject: BiometricPrompt.CryptoObject?,
               promptInfo: BiometricPrompt.PromptInfo)->Unit) {
-        if (!isKeyManagerInitialized) {
+        if (!isBiometricInitialized) {
            return
        }
        try {
@@ -226,30 +224,32 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
            deleteEntryKey()
        } catch (invalidKeyException: KeyPermanentlyInvalidatedException) {
            Log.e(TAG, "Unable to initialize decrypt data", invalidKeyException)
-            biometricUnlockCallback?.onInvalidKeyException(invalidKeyException)
+            biometricUnlockCallback.onInvalidKeyException(invalidKeyException)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to initialize decrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
+            biometricUnlockCallback.onBiometricException(e)
        }
+
    }

    fun decryptData(encryptedValue: String) {
-        if (!isKeyManagerInitialized) {
+        if (!isBiometricInitialized) {
            return
        }
        try {
            // actual decryption here
            val encrypted = Base64.decode(encryptedValue, Base64.NO_WRAP)
            cipher?.doFinal(encrypted)?.let { decrypted ->
-                biometricUnlockCallback?.handleDecryptedResult(String(decrypted))
+                biometricUnlockCallback.handleDecryptedResult(String(decrypted))
            }
        } catch (badPaddingException: BadPaddingException) {
            Log.e(TAG, "Unable to decrypt data", badPaddingException)
-            biometricUnlockCallback?.onInvalidKeyException(badPaddingException)
+            biometricUnlockCallback.onInvalidKeyException(badPaddingException)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to decrypt data", e)
-            biometricUnlockCallback?.onBiometricException(e)
+            biometricUnlockCallback.onBiometricException(e)
        }
+
    }

    fun deleteEntryKey() {
@@ -258,10 +258,14 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
            keyStore?.deleteEntry(BIOMETRIC_KEYSTORE_KEY)
        } catch (e: Exception) {
            Log.e(TAG, "Unable to delete entry key in keystore", e)
-            biometricUnlockCallback?.onBiometricException(e)
+            biometricUnlockCallback.onBiometricException(e)
        }
    }

+    fun setAuthenticationCallback(authenticationCallback: BiometricPrompt.AuthenticationCallback) {
+        this.authenticationCallback = authenticationCallback
+    }
+
    @Synchronized
    fun initBiometricPrompt() {
        if (biometricPrompt == null) {
@@ -271,10 +275,6 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
        }
    }

-    fun closeBiometricPrompt() {
-        biometricPrompt?.cancelAuthentication()
-    }
-
    interface BiometricUnlockErrorCallback {
        fun onInvalidKeyException(e: Exception)
        fun onBiometricException(e: Exception)
@@ -299,24 +299,22 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
         * Remove entry key in keystore
         */
        fun deleteEntryKeyInKeystoreForBiometric(context: FragmentActivity,
-                                                 biometricCallback: BiometricUnlockErrorCallback) {
-            BiometricUnlockDatabaseHelper(context).apply {
-                biometricUnlockCallback = object : BiometricUnlockCallback {
+                                                 biometricUnlockCallback: BiometricUnlockErrorCallback) {
+            val fingerPrintHelper = BiometricUnlockDatabaseHelper(context, object : BiometricUnlockCallback {

-                    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {}
+                override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {}

-                    override fun handleDecryptedResult(decryptedValue: String) {}
+                override fun handleDecryptedResult(decryptedValue: String) {}

-                    override fun onInvalidKeyException(e: Exception) {
-                        biometricCallback.onInvalidKeyException(e)
-                    }
-
-                    override fun onBiometricException(e: Exception) {
-                        biometricCallback.onBiometricException(e)
-                    }
+                override fun onInvalidKeyException(e: Exception) {
+                    biometricUnlockCallback.onInvalidKeyException(e)
                }
-                deleteEntryKey()
-            }
+
+                override fun onBiometricException(e: Exception) {
+                    biometricUnlockCallback.onBiometricException(e)
+                }
+            })
+            fingerPrintHelper.deleteEntryKey()
        }
    }

--- a/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
@@ -1,63 +1,62 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.biometric

 import android.content.Context
+import android.graphics.drawable.Animatable2
+import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
 import androidx.annotation.RequiresApi
 import android.widget.ImageView
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat

 import com.kunzisoft.keepass.R

@RequiresApi(api = Build.VERSION_CODES.M)
 class FingerPrintAnimatedVector(context: Context, imageView: ImageView) {

-    private val scanFingerprint: AnimatedVectorDrawableCompat? =
-            AnimatedVectorDrawableCompat.create(context, R.drawable.scan_fingerprint)
+    private val scanFingerprint: AnimatedVectorDrawable =
+            context.getDrawable(R.drawable.scan_fingerprint) as AnimatedVectorDrawable

    init {
        imageView.setImageDrawable(scanFingerprint)
    }

-    private var animationCallback = object : Animatable2Compat.AnimationCallback() {
+    private var animationCallback = object : Animatable2.AnimationCallback() {
        override fun onAnimationEnd(drawable: Drawable) {
-            imageView.post {
-                scanFingerprint?.start()
-            }
+            if (!scanFingerprint.isRunning)
+                scanFingerprint.start()
        }
    }

    fun startScan() {
-        scanFingerprint?.registerAnimationCallback(animationCallback)
+        scanFingerprint.registerAnimationCallback(animationCallback)

-        if (scanFingerprint?.isRunning != true)
-            scanFingerprint?.start()
+        if (!scanFingerprint.isRunning)
+            scanFingerprint.start()
    }

    fun stopScan() {
-        scanFingerprint?.unregisterAnimationCallback(animationCallback)
+        scanFingerprint.unregisterAnimationCallback(animationCallback)

-        if (scanFingerprint?.isRunning == true)
+        if (scanFingerprint.isRunning)
            scanFingerprint.stop()
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/AESProvider.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/AESProvider.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto
@@ -24,7 +24,7 @@ import com.kunzisoft.keepass.crypto.engine.AesEngine
 import com.kunzisoft.keepass.crypto.engine.ChaCha20Engine
 import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.crypto.engine.TwofishEngine
-import org.bouncycastle.jce.provider.BouncyCastleProvider
+import org.spongycastle.jce.provider.BouncyCastleProvider
 import java.security.NoSuchAlgorithmException
 import java.security.Security
 import java.util.*
@@ -37,10 +37,20 @@ object CipherFactory {
    private var blacklisted: Boolean = false

    init {
-        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME)
        Security.addProvider(BouncyCastleProvider())
    }

+    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
+    @JvmOverloads
+    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
+        // Return the native AES if it is possible
+        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
+            Cipher.getInstance(transformation, AESProvider())
+        } else {
+            Cipher.getInstance(transformation)
+        }
+    }
+
    fun deviceBlacklisted(): Boolean {
        if (!blacklistInit) {
            blacklistInit = true
@@ -54,16 +64,6 @@ object CipherFactory {
        return transformation == "AES/CBC/PKCS5Padding"
    }

-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
-    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
-        // Return the native AES if it is possible
-        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
-            Cipher.getInstance(transformation, AESProvider())
-        } else {
-            Cipher.getInstance(transformation)
-        }
-    }
-
    /**
     * Generate appropriate cipher based on KeePass 2.x UUID's
     */
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/CrsAlgorithm.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CrsAlgorithm.kt
@@ -1,36 +1,34 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *     
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto

-import com.kunzisoft.keepass.utils.UnsignedInt
+enum class CrsAlgorithm constructor(val id: Int) {

-enum class CrsAlgorithm constructor(val id: UnsignedInt) {
-
-    Null(UnsignedInt(0)),
-    ArcFourVariant(UnsignedInt(1)),
-    Salsa20(UnsignedInt(2)),
-    ChaCha20(UnsignedInt(3));
+    Null(0),
+    ArcFourVariant(1),
+    Salsa20(2),
+    ChaCha20(3);

    companion object {

-        fun fromId(num: UnsignedInt): CrsAlgorithm? {
+        fun fromId(num: Int): CrsAlgorithm? {
            for (e in values()) {
                if (e.id == num) {
                    return e
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt
@@ -1,31 +1,33 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto

+import com.kunzisoft.keepass.stream.LEDataOutputStream
 import com.kunzisoft.keepass.stream.NullOutputStream
-import com.kunzisoft.keepass.stream.longTo8Bytes
+
 import java.io.IOException
 import java.security.DigestOutputStream
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import java.util.*
+import java.util.Arrays
+
 import javax.crypto.Mac
 import kotlin.math.min

@@ -58,7 +60,7 @@ object CryptoUtil {
                    throw RuntimeException(e)
                }

-                val pbR = longTo8Bytes(r)
+                val pbR = LEDataOutputStream.writeLongBuf(r)
                val part = hmac.doFinal(pbR)

                val copy = min(cbOut - pos, part.size)
@@ -74,10 +76,12 @@ object CryptoUtil {
        return ret
    }

+    @JvmOverloads
    fun hashSha256(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
        return hashGen("SHA-256", data, offset, count)
    }

+    @JvmOverloads
    fun hashSha512(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
        return hashGen("SHA-512", data, offset, count)
    }
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/NativeAESCipherSpi.java
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/NativeAESCipherSpi.java
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto;
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/NativeLib.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/NativeLib.kt
@@ -1,20 +1,20 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/StreamCipherFactory.kt
@@ -1,29 +1,29 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto

-import org.bouncycastle.crypto.StreamCipher
-import org.bouncycastle.crypto.engines.ChaCha7539Engine
-import org.bouncycastle.crypto.engines.Salsa20Engine
-import org.bouncycastle.crypto.params.KeyParameter
-import org.bouncycastle.crypto.params.ParametersWithIV
+import org.spongycastle.crypto.StreamCipher
+import org.spongycastle.crypto.engines.ChaCha7539Engine
+import org.spongycastle.crypto.engines.Salsa20Engine
+import org.spongycastle.crypto.params.KeyParameter
+import org.spongycastle.crypto.params.ParametersWithIV

 object StreamCipherFactory {

--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt
@@ -1,28 +1,28 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto.engine


 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
+import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.utils.Types
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
@@ -41,28 +41,13 @@ class AesEngine : CipherEngine() {
        return cipher
    }

-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.AESRijndael
+    override fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm {
+        return PwEncryptionAlgorithm.AESRijndael
    }

    companion object {

-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0x31.toByte(),
-                        0xC1.toByte(),
-                        0xF2.toByte(),
-                        0xE6.toByte(),
-                        0xBF.toByte(),
-                        0x71.toByte(),
-                        0x43.toByte(),
-                        0x50.toByte(),
-                        0xBE.toByte(),
-                        0x58.toByte(),
-                        0x05.toByte(),
-                        0x21.toByte(),
-                        0x6A.toByte(),
-                        0xFC.toByte(),
-                        0x5A.toByte(),
-                        0xFF.toByte()))
+        val CIPHER_UUID: UUID = Types.bytestoUUID(
+                byteArrayOf(0x31.toByte(), 0xC1.toByte(), 0xF2.toByte(), 0xE6.toByte(), 0xBF.toByte(), 0x71.toByte(), 0x43.toByte(), 0x50.toByte(), 0xBE.toByte(), 0x58.toByte(), 0x05.toByte(), 0x21.toByte(), 0x6A.toByte(), 0xFC.toByte(), 0x5A.toByte(), 0xFF.toByte()))
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.kt
@@ -1,27 +1,27 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto.engine

-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import org.bouncycastle.jce.provider.BouncyCastleProvider
+import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.utils.Types
+import org.spongycastle.jce.provider.BouncyCastleProvider
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
@@ -44,28 +44,13 @@ class ChaCha20Engine : CipherEngine() {
        return cipher
    }

-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.ChaCha20
+    override fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm {
+        return PwEncryptionAlgorithm.ChaCha20
    }

    companion object {

-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0xD6.toByte(),
-                        0x03.toByte(),
-                        0x8A.toByte(),
-                        0x2B.toByte(),
-                        0x8B.toByte(),
-                        0x6F.toByte(),
-                        0x4C.toByte(),
-                        0xB5.toByte(),
-                        0xA5.toByte(),
-                        0x24.toByte(),
-                        0x33.toByte(),
-                        0x9A.toByte(),
-                        0x31.toByte(),
-                        0xDB.toByte(),
-                        0xB5.toByte(),
-                        0x9A.toByte()))
+        val CIPHER_UUID: UUID = Types.bytestoUUID(
+                byteArrayOf(0xD6.toByte(), 0x03.toByte(), 0x8A.toByte(), 0x2B.toByte(), 0x8B.toByte(), 0x6F.toByte(), 0x4C.toByte(), 0xB5.toByte(), 0xA5.toByte(), 0x24.toByte(), 0x33.toByte(), 0x9A.toByte(), 0x31.toByte(), 0xDB.toByte(), 0xB5.toByte(), 0x9A.toByte()))
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.kt
@@ -1,25 +1,25 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto.engine

-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm

 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
@@ -46,6 +46,6 @@ abstract class CipherEngine {
        return getCipher(opmode, key, IV, false)
    }

-    abstract fun getPwEncryptionAlgorithm(): EncryptionAlgorithm
+    abstract fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm

 }
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt
@@ -1,31 +1,33 @@
 /*
 * Copyright 2019 Jeremy Jamet / Kunzisoft.
 *
- * This file is part of KeePassDX.
+ * This file is part of KeePass DX.
 *
- *  KeePassDX is free software: you can redistribute it and/or modify
+ *  KeePass DX 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,
+ *  KeePass DX 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/>.
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 package com.kunzisoft.keepass.crypto.engine

 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
+import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.utils.Types
+
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
-import java.util.*
+import java.util.UUID
+
 import javax.crypto.Cipher
 import javax.crypto.NoSuchPaddingException
 import javax.crypto.spec.IvParameterSpec
@@ -45,28 +47,13 @@ class TwofishEngine : CipherEngine() {
        return cipher
    }

-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.Twofish
+    override fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm {
+        return PwEncryptionAlgorithm.Twofish
    }

    companion object {

-        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0xAD.toByte(),
-                        0x68.toByte(),
-                        0xF2.toByte(),
-                        0x9F.toByte(),
-                        0x57.toByte(),
-                        0x6F.toByte(),
-                        0x4B.toByte(),
-                        0xB9.toByte(),
-                        0xA3.toByte(),
-                        0x6A.toByte(),
-                        0xD4.toByte(),
-                        0x7A.toByte(),
-                        0xF9.toByte(),
-                        0x65.toByte(),
-                        0x34.toByte(),
-                        0x6C.toByte()))
+        val CIPHER_UUID: UUID = Types.bytestoUUID(
+                byteArrayOf(0xAD.toByte(), 0x68.toByte(), 0xF2.toByte(), 0x9F.toByte(), 0x57.toByte(), 0x6F.toByte(), 0x4B.toByte(), 0xB9.toByte(), 0xA3.toByte(), 0x6A.toByte(), 0xD4.toByte(), 0x7A.toByte(), 0xF9.toByte(), 0x65.toByte(), 0x34.toByte(), 0x6C.toByte()))
    }
 }
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AESKeyTransformerFactory.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AESKeyTransformerFactory.kt
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.finalkey
-
-import com.kunzisoft.keepass.crypto.CipherFactory.deviceBlacklisted
-
-object AESKeyTransformerFactory : KeyTransformer() {
-    override fun transformMasterKey(seed: ByteArray?, key: ByteArray?, rounds: Long?): ByteArray? {
-        // Prefer the native final key implementation
-        val keyTransformer = if (!deviceBlacklisted()
-                && NativeAESKeyTransformer.available()) {
-            NativeAESKeyTransformer()
-        } else {
-            // Fall back on the android crypto implementation
-            AndroidAESKeyTransformer()
-        }
-        return keyTransformer.transformMasterKey(seed, key, rounds)
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidAESKeyTransformer.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidAESKeyTransformer.kt
@@ -1,73 +0,0 @@
-/*
- * Copyright 2020 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.finalkey
-
-import java.io.IOException
-import java.security.InvalidKeyException
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import javax.crypto.Cipher
-import javax.crypto.ShortBufferException
-import javax.crypto.spec.SecretKeySpec
-
-class AndroidAESKeyTransformer : KeyTransformer() {
-    @Throws(IOException::class)
-    override fun transformMasterKey(seed: ByteArray?, key: ByteArray?, rounds: Long?): ByteArray? {
-        val cipher: Cipher = try {
-            Cipher.getInstance("AES/ECB/NoPadding")
-        } catch (e: Exception) {
-            throw IOException("Unable to get the cipher", e)
-        }
-        try {
-            cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(seed, "AES"))
-        } catch (e: InvalidKeyException) {
-            throw IOException("Unable to init the cipher", e)
-        }
-        if (key == null) {
-            throw IOException("Invalid key")
-        }
-        if (rounds == null) {
-            throw IOException("Invalid rounds")
-        }
-
-        // Encrypt key rounds times
-        val keyLength = key.size
-        val newKey = ByteArray(keyLength)
-        System.arraycopy(key, 0, newKey, 0, keyLength)
-        val destKey = ByteArray(keyLength)
-        for (i in 0 until rounds) {
-            try {
-                cipher.update(newKey, 0, newKey.size, destKey, 0)
-                System.arraycopy(destKey, 0, newKey, 0, newKey.size)
-            } catch (e: ShortBufferException) {
-                throw IOException("Short buffer", e)
-            }
-        }
-
-        // Hash the key
-        val messageDigest: MessageDigest = try {
-            MessageDigest.getInstance("SHA-256")
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("SHA-256 not implemented here: " + e.message)
-        }
-        messageDigest.update(newKey)
-        return messageDigest.digest()
-    }
-}
--- a/Show More
+++ b/Show More