Merge branch 'release/2.8.4'

Update CHANGELOG
Replace strong tag
2025-12-04 15:49:33 +01:00 · 2020-09-18 14:05:24 +02:00 · 2020-09-18 13:57:05 +02:00 · 2020-09-18 13:48:56 +02:00 · 2020-09-18 13:44:27 +02:00 · 2020-09-18 13:35:32 +02:00
1020 changed files with 63738 additions and 45007 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+** Keepass Database **
+ - Created with: [e.g Windows KeePass 2.42]
+ - Version: [e.g. 2]
+ - Location: [e.g. Remote file retrieved with GDrive app]
+ - Size: [e.g. 150Mo]
+ - Contains attachment: [e.g. Yes]
+
+**KeePassDX (please complete the following information):**
+ - Version: [e.g. 2.5.0.0beta23]
+ - Build: [e.g. Free]
+ - Language: [e.g. French]
+
+**Android (please complete the following information):**
+ - Device: [e.g. GalaxyS8]
+ - Version: [e.g. 8.1]
+
+**Additional context**
+Add any other context about the problem here.
+ - Browser for Autofill: [e.g. Chrome version X]
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,13 @@ proguard/
 # Android Studio captures folder
 captures/

+# Eclipse/VS Code
+.project
+.settings/*
+*/.project
+*/.classpath
+*/.settings/*
+
 # Intellij
 *.iml
 .idea/workspace.xml
--- a/221
+++ b/221
@@ -1,7 +1,186 @@
-KeepassDX (2.5.0.0beta16)
+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)
+ * 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
+
+KeePassDX (2.5.0.0beta23)
+ * New, more secure database creation workflow
+ * Recognize more database files
+ * Add alias for history files (WARNING: history is erased)
+ * New Biometric unlock (Fingerprint with new API)
+ * Fix entry references
+ * Fix OOM with KeyFile
+ * Fix small issues
+
+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)
+ * Fix nested groups no longer visible in V1 databases
+ * Improved data import algorithm for V1 databases
+ * Add natural database sort
+ * Add username database sort
+ * Fix button disabled with only KeyFile
+ * Show the number of entries in a group
+
+KeePassDX (2.5.0.0beta20)
+ * Fix a major bug that displays an entry history
+
+KeePassDX (2.5.0.0beta19)
+ * Add lock button always visible
+ * New connection workflow
+ * Code refactored in Kotlin
+ * Better notification implementation
+ * Better views for large screen
+ * Magikeyboard enhancement
+ * Fix Recycle Bin
+ * Fix memory when load database
+ * Fix small bugs
+
+KeePassDX (2.5.0.0beta18)
+ * New recent databases views
+ * New information dialog
+ * Custom fields for the Magikeyboard
+ * Timeout for the Magikeyboard
+ * Long press for keyboard selection
+ * Fix memory when opening the database
+ * Memory management for attachments
+
+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
@@ -9,20 +188,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
@@ -35,10 +214,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
@@ -46,7 +225,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
@@ -55,9 +234,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
@@ -65,7 +244,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 (ñæËÌÂÝÜ...)
@@ -74,10 +253,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)
@@ -98,7 +277,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
@@ -107,7 +286,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
@@ -118,17 +297,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
@@ -389,7 +568,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/45
+++ b/45
@@ -1,45 +0,0 @@
-Original author:
-Brian Pellin
-
-Achim Weimert
-Johan Berts - search patches
-Mike Mohr - Better native code for aes and sha
-Tobias Selig - icon support
-Tolga Onbay, Dirk Bergstrom - password generator
-Space Cowboy - holo theme
-josefwells
-Nicholas FitzRoy-Dale - auto launch intents
-yulin2 - responsiveness improvements
-Tadashi Saito
-vhschlenker
-bumper314 - Samsung multiwindow support
-Hans Cappelle - fingerprint sensor integration
-Jeremy Jamet - Keepass DX Material Design - Patches
-
-Translations:
-Diego Pierotto - Italian
-Laurent, Norman Obry, Nam, Bruno Parmentier, Credomo - French
-Maciej Bieniek, cod3r - Polish
-Максим Сёмочкин, i.nedoboy, filimonic, bboa - Russian
-MaWi, rvs2008, meviox, MaDill, EdlerProgrammierer, Jan Thomas - German
-yslandro - Norwegian Nynorsk
-王科峰 - Chinese
-Typhoon - Slovak
-Masahiro Inamura - Japanese
-Matsuu Takuto - Japanese
-Carlos Schlyter - Portugese (Brazil)
-YSmhXQDd6Z - Portugese (Portugal)
-andriykopanytsia - Ukranian
-intel, Zoltán Antal - Hungarian
-H Vanek - Czech
-jipanos - Spanish
-Erik Fdevriendt, Erik Jan Meijer - Dutch
-Frederik Svarre - Danish
-Oriol Garrote - Catalan
-Mika Takala - Finnish
-Niclas Burgren - Swedish
-Raimonds - Latvian
-dgarciabad - Basque
-Arthur Zamarin - Hebrew
-RaptorTFX - Greek
-zygimantus - Lithuanian
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,55 +0,0 @@
-# F.A.Q.
-
-## Why KeePass DX?
-
-KeePass DX is an **Android password manager** implemented from Keepass password manager.
-
-KeePass DX was created to meet the security and usability needs of a KeePass application on Android :
-
- - To be easy to use with **secure password management and form filling tools**.
- - To use only tools under **open source license** to guarantee the security of the application (With [open source store](https://f-droid.org/en/) and no closed API).
- - To be in a **native langage** (java) for weight, security and a better integration of the application.
- - To respect **Android design, architecture and ergonomic**.
-
-## What makes KeePass DX stand out from other password managers?
-
- - We **do not recover your sensitive data** on a private server or a closed cloud, you have control of your passwords.
- - We respect **KeePass file standards** to maintain compatibility and data porting on different devices (computers and portable devices with different operating system).
- - The code is **open source**, which implies increased **security**, you can check how the encryption algorithms are implemented.
- - We remain attentive to **your needs** and we can even integrate the features that you have defined.
- - We **do not put advertising** even in the free version.
-
-## How am I sure my passwords are safely stored on the application?
-
- We allow users to save and use passwords, keys and digital identities in a secure way by **integrating the last encryption algorithms** and **Android architecture standards**.
- You can increase the security of your database by increasing the rounds of encryption keys. *(In Settings -> Database Settings when your database is open)* **Warning**: *Increase the number of rounds sparingly to have a reasonable opening time.*
-
-## Can I store my data on a cloud storage?
-
-**Yes** this is possible. Otherwise, we **recommend using cloud with personal server and open source license**, like [NextCloud](https://f-droid.org/en/packages/com.nextcloud.client/) to be sure how your databases are stored.
-
-## Can I recover my passwords on another device if I loose my main device?
-
-**Yes** you can, but you **must first save the .kdb or .kdbx file from your database to an external storage** *(like a hardrive or a cloud)*.
-We recommend you save your data after each modification so incase you loose your android device you could retrieve the data and import it into the new KeePass DX installed on the new android device. 
-
-## Why are updates not available at the same time on all stores?
-
- **PlayStore** only needs an APK generated and manually signed to be available on the store, it usually takes **20 minutes** to be available because it is deployed with fastlane. But the management of the APK and its data by the google servers is obscure.
- **F-Droid**, to **ensure that the code is open source**, checks the sources directly on git repository (by checking the presence of new tags) and builds itself the APK that the server signs during the compilation of code and dependencies. Updating the project will take **1-10 days** for F-Droid to analyze all available repositories, build sources and deploy the generated APK. So F-Droid is slower for deployment but it is run by **volunteers** and guaranteed a **clean APK**. :)
-
-## Why not an online version?
-
-The offline and online client concepts only exists with Keepass2Android because the file access network tools are directly integrated into the code of the main application. Which is a very dubious choice knowing that **it is not normally the purpose of a password management application to take care of external file synchronization on clouds** (which can be under closed licensed and recover your data base), it is rather the purpose of the [file management application](https://developer.android.com/guide/topics/providers/document-provider).
-
-## Can I open my database easily other than with a password?
-
-**Yes**, we have integrated a secure openning option of fingerprint for android devices that support this feature, so no one can access the application without scanning his/her fingerprint or fill a master key.
-
-## Can I open my database without my master key (master password and/or key file)?
-
-**No**, you can not open a database file without the master password (and / or) the associated key file. Be sure to remember your master password and save the key file in a safe place.
-
-## Can I suggest features and report bugs for the application?
-**Yes**, we welcome this you could go ahead and do that on our github: 
-https://github.com/Kunzisoft/KeePassDX
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 ---

-KeePass DX is free software: you can redistribute it and/or modify
+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.
@@ -13,7 +13,7 @@ KeePass DX 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 KeePass DX icon was created by Jeremy JAMET and is licensed under the terms of GPLv3.
+The KeePassDX 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
@@ -0,0 +1,177 @@
+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/LICENSES/LICENSE_FONT_DROID_SANS_MONO.txt
+++ b/LICENSES/LICENSE_FONT_DROID_SANS_MONO.txt
@@ -1,201 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/LICENSES/LICENSE_FONT_FIRA_MONO_REGULAR.txt
+++ b/LICENSES/LICENSE_FONT_FIRA_MONO_REGULAR.txt
@@ -0,0 +1,93 @@
+Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,91 @@
+# 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
@@ -1,83 +0,0 @@
-# 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**
-
-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://github.com/Kunzisoft/KeePassDX/blob/master/FAQ.md) 
-	
-## 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) 2017 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
-
- 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/>.
-  
-  *This project is a fork of [KeepassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*
--- a/_config.yml
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
+.cxx
 .externalNativeBuild
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,21 +1,32 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'

 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'

    defaultConfig {
        applicationId "com.kunzisoft.keepass"
        minSdkVersion 14
-        targetSdkVersion 27
-        versionCode = 17
-        versionName = "2.5.0.0beta17"
+        targetSdkVersion 29
+        versionCode = 40
+        versionName = "2.8.4"
        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 {
@@ -24,7 +35,6 @@ android {
        }
    }

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

-    dexOptions {
-    }
-
-    flavorDimensions "tier"
+    flavorDimensions "version"
    productFlavors {
        libre {
+            dimension "version"
            applicationIdSuffix = ".libre"
-            versionNameSuffix "-libre"
+            buildConfigField "String", "BUILD_VERSION", "\"libre\""
            buildConfigField "boolean", "FULL_VERSION", "true"
            buildConfigField "boolean", "CLOSED_STORE", "false"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
-
        }
        pro {
+            dimension "version"
            applicationIdSuffix = ".pro"
-            versionNameSuffix "-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"
-            versionNameSuffix "-free"
+            buildConfigField "String", "BUILD_VERSION", "\"free\""
            buildConfigField "boolean", "FULL_VERSION", "false"
            buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
+            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
        }
    }

@@ -74,42 +85,46 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
        sourceCompatibility JavaVersion.VERSION_1_8
    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }

-def supportVersion = "27.1.1"
-def spongycastleVersion = "1.58.0.0"
-def permissionDispatcherVersion = "3.1.0"
+def room_version = "2.2.5"

 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:preference-v7:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.madgag.spongycastle:core:$spongycastleVersion"
-    implementation "com.madgag.spongycastle:prov:$spongycastleVersion"
-    // Expandable view
-    implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    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'
+    // To upgrade with style
+    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'
    // Time
-    implementation 'joda-time:joda-time:2.9.9'
-    implementation 'org.sufficientlysecure:html-textview:3.5'
-    implementation 'com.nononsenseapps:filepicker:4.1.0'
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
-    // Permissions
-    implementation("com.github.hotchemi:permissionsdispatcher:$permissionDispatcherVersion") {
-        // if you don't use android.app.Fragment you can exclude support for them
-        exclude module: "support-v13"
-    }
-    annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionDispatcherVersion"
+    implementation 'joda-time:joda-time:2.10.6'
+    // Color
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.3'
+    // Education
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
    // Apache Commons Collections
-    implementation 'commons-collections:commons-collections:3.2.1'
-    // Base64
-    implementation 'biz.source_code:base64coder:2010-12-19'
-    implementation 'com.google.code.gson:gson:2.8.4'
-    implementation 'com.google.guava:guava:23.0-android'
-    // Icon pack, classic for all, material for libre and pro
+    implementation 'commons-collections:commons-collections:3.2.2'
+    // Apache Commons Codec
+    implementation 'commons-codec:commons-codec:1.14'
+    // Icon pack
    implementation project(path: ':icon-pack-classic')
    implementation project(path: ':icon-pack-material')
-    implementation project(path: ':magikeyboard')
-    implementation project(path: ':keepass-model')
+
+    // 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
@@ -0,0 +1,84 @@
+{
+  "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/AccentTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/AccentTest.java
@@ -1,42 +0,0 @@
-/*
-* 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;
-
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.tests.database.TestData;
-
-public class AccentTest extends AndroidTestCase {
-	
-	private static final String KEYFILE = "";
-	private static final String PASSWORD = "é";
-	private static final String ASSET = "accent.kdb";
-	private static final String FILENAME = "/sdcard/accent.kdb";
-	
-	public void testOpen() {
-
-		try {
-			TestData.GetDb(getContext(), ASSET, PASSWORD, KEYFILE, FILENAME);
-		} catch (Exception e) {
-			assertTrue("Failed to open database", false);
-		}
-	}
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/AllTests.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/AllTests.java
@@ -1,34 +0,0 @@
-/*
- * 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;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import android.test.suitebuilder.TestSuiteBuilder;
-
-public class AllTests extends TestSuite {
-
-    public static Test suite() {
-        return new TestSuiteBuilder(AllTests.class)
-                .includeAllPackagesUnderHere()
-                .build();
-    }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/OutputTests.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/OutputTests.java
@@ -1,35 +0,0 @@
-/*
- * 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;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import android.test.suitebuilder.TestSuiteBuilder;
-
-public class OutputTests extends TestSuite {
-
-	public static Test suite() {
-
-		return new TestSuiteBuilder(AllTests.class)
-		.includePackages("com.kunzisoft.keepass.tests.output")
-		.build();
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.java
@@ -1,38 +0,0 @@
-/*
- * 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;
-
-import junit.framework.TestCase;
-
-import com.kunzisoft.keepass.database.PwDate;
-
-public class PwDateTest extends TestCase {
-	public void testDate() {
-		PwDate jDate = new PwDate(System.currentTimeMillis());
-		
-		PwDate intermediate = (PwDate) jDate.clone();
-		
-		PwDate cDate = new PwDate(intermediate.getCDate(), 0);
-		
-		assertTrue("jDate and intermediate not equal", jDate.equals(intermediate));
-		assertTrue("jDate and cDate not equal", cDate.equals(jDate));
-		
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV3.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV3.java
@@ -1,63 +0,0 @@
-/*
- * 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;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Calendar;
-
-
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.PwEntryV3;
-import com.kunzisoft.keepass.tests.database.TestData;
-
-public class PwEntryTestV3 extends AndroidTestCase {
-	PwEntryV3 mPE;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		mPE = (PwEntryV3) TestData.GetTest1(getContext()).getEntryAt(0);
-		
-	}
-	
-	public void testName() {
-		assertTrue("Name was " + mPE.getTitle(), mPE.getTitle().equals("Amazon"));
-	}
-	
-	public void testPassword() throws UnsupportedEncodingException {
-		String sPass = "12345";
-		byte[] password = sPass.getBytes("UTF-8");
-		
-		assertArrayEquals(password, mPE.getPasswordBytes());
-	}
-	
-	public void testCreation() {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(mPE.getCreationTime().getDate());
-		
-		assertEquals("Incorrect year.", cal.get(Calendar.YEAR), 2009);
-		assertEquals("Incorrect month.", cal.get(Calendar.MONTH), 3);
-		assertEquals("Incorrect day.", cal.get(Calendar.DAY_OF_MONTH), 23);
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java
@@ -1,67 +0,0 @@
-/*
- * 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;
-
-import com.kunzisoft.keepass.database.AutoType;
-import com.kunzisoft.keepass.database.PwEntryV4;
-import com.kunzisoft.keepass.database.PwGroupV4;
-import com.kunzisoft.keepass.database.PwIconCustom;
-import com.kunzisoft.keepass.database.PwIconStandard;
-import com.kunzisoft.keepass.database.security.ProtectedBinary;
-import com.kunzisoft.keepass.database.security.ProtectedString;
-
-import junit.framework.TestCase;
-
-import java.util.UUID;
-
-public class PwEntryTestV4 extends TestCase {
-	public void testAssign() {
-		PwEntryV4 entry = new PwEntryV4();
-		
-		entry.setAdditional("test223");
-		
-		entry.setAutoType(new AutoType());
-		entry.getAutoType().defaultSequence = "1324";
-		entry.getAutoType().enabled = true;
-		entry.getAutoType().obfuscationOptions = 123412432109L;
-		entry.getAutoType().put("key", "value");
-		
-		entry.setBackgroupColor("blue");
-		entry.putProtectedBinary("key1", new ProtectedBinary(false, new byte[] {0,1}));
-		entry.setIconCustom(new PwIconCustom(UUID.randomUUID(), new byte[0]));
-		entry.setForegroundColor("red");
-		entry.addToHistory(new PwEntryV4());
-		entry.setIconStandard(new PwIconStandard(5));
-		entry.setOverrideURL("override");
-		entry.setParent(new PwGroupV4());
-		entry.addExtraField("key2", new ProtectedString(false, "value2"));
-		entry.setUrl("http://localhost");
-		entry.setUUID(UUID.randomUUID());
-
-		PwEntryV4 target = new PwEntryV4();
-		target.updateWith(entry);
-		
-		/* This test is not so useful now that I am not implementing value equality for Entries
-		assertTrue("Entries do not match.", entry.equals(target));
-		*/
-		
-	}
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwGroupTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/PwGroupTest.java
@@ -1,44 +0,0 @@
-/*
- * 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;
-
-
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.PwGroupV3;
-import com.kunzisoft.keepass.tests.database.TestData;
-
-public class PwGroupTest extends AndroidTestCase {
-
-	PwGroupV3 mPG;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		mPG = (PwGroupV3) TestData.GetTest1(getContext()).getGroups().get(0);
-		
-	}
-	
-	public void testGroupName() {
-		 assertTrue("Name was " + mPG.getName(), mPG.getName().equals("Internet"));
-	}
-}
-
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/TestUtil.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/TestUtil.java
@@ -1,71 +0,0 @@
-/*
- * 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;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.net.Uri;
-import android.os.Environment;
-
-import com.kunzisoft.keepass.utils.EmptyUtils;
-import com.kunzisoft.keepass.utils.UriUtil;
-
-public class TestUtil {
-	private static final File sdcard = Environment.getExternalStorageDirectory();
-
-	public static void extractKey(Context ctx, String asset, String target) throws Exception {
-		
-		InputStream key = ctx.getAssets().open(asset, AssetManager.ACCESS_STREAMING);
-		
-		FileOutputStream keyFile = new FileOutputStream(target);
-		while (true) {
-			byte[] buf = new byte[1024];
-			int read = key.read(buf);
-			if ( read == -1 ) {
-				break;
-			} else {
-				keyFile.write(buf, 0, read);
-			}
-		}
-		
-		keyFile.close();
-
-	}
-
-	public static InputStream getKeyFileInputStream(Context ctx, String keyfile) throws FileNotFoundException {
-		InputStream keyIs = null;
-		if (!EmptyUtils.isNullOrEmpty(keyfile)) {
-			Uri uri = UriUtil.parseDefaultFile(keyfile);
-			keyIs = UriUtil.getUriInputStream(ctx, uri);
-		}
-
-		return keyIs;
-	}
-
-	public static String getSdPath(String filename) {
-		File file = new File(sdcard, filename);
-		return file.getAbsolutePath();
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/TypesTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/TypesTest.java
@@ -1,211 +0,0 @@
-/*
- * 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;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Calendar;
-import java.util.Random;
-import java.util.UUID;
-
-import junit.framework.TestCase;
-
-import com.kunzisoft.keepass.database.PwDate;
-import com.kunzisoft.keepass.stream.LEDataInputStream;
-import com.kunzisoft.keepass.stream.LEDataOutputStream;
-import com.kunzisoft.keepass.utils.Types;
-
-public class TypesTest extends TestCase {
-
-	public void testReadWriteLongZero() {
-		testReadWriteLong((byte) 0);
-	}
-	
-	public void testReadWriteLongMax() {
-		testReadWriteLong(Byte.MAX_VALUE);
-	}
-	
-	public void testReadWriteLongMin() {
-		testReadWriteLong(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteLongRnd() {
-		Random rnd = new Random();
-		byte[] buf = new byte[1];
-		rnd.nextBytes(buf);
-		
-		testReadWriteLong(buf[0]);
-	}
-	
-	private void testReadWriteLong(byte value) {
-		byte[] orig = new byte[8];
-		byte[] dest = new byte[8];
-		
-		setArray(orig, value, 0, 8);
-		
-		long one = LEDataInputStream.readLong(orig, 0);
-		LEDataOutputStream.writeLong(one, dest, 0);
-		
-		assertArrayEquals(orig, dest);
-
-	}
-	
-	public void testReadWriteIntZero() {
-		testReadWriteInt((byte) 0);
-	}
-	
-	public void testReadWriteIntMin() {
-		testReadWriteInt(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteIntMax() {
-		testReadWriteInt(Byte.MAX_VALUE);
-	}
-	
-	private void testReadWriteInt(byte value) {
-		byte[] orig = new byte[4];
-		byte[] dest = new byte[4];
-		
-		for (int i = 0; i < 4; i++ ) {
-			orig[i] = 0;
-		}
-		
-		setArray(orig, value, 0, 4);
-				
-		int one = LEDataInputStream.readInt(orig, 0);
-		
-		LEDataOutputStream.writeInt(one, dest, 0);
-
-		assertArrayEquals(orig, dest);
-		
-	}
-	
-	private void setArray(byte[] buf, byte value, int offset, int size) {
-		for (int i = offset; i < offset + size; i++) {
-			buf[i] = value;
-		}
-	}
-	
-	public void testReadWriteShortOne() {
-		byte[] orig = new byte[2];
-		byte[] dest = new byte[2];
-		
-		orig[0] = 0;
-		orig[1] = 1;
-		
-		int one = LEDataInputStream.readUShort(orig, 0);
-		dest = LEDataOutputStream.writeUShortBuf(one);
-		
-		assertArrayEquals(orig, dest);
-		
-	}
-	
-	public void testReadWriteShortMin() {
-		testReadWriteShort(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteShortMax() {
-		testReadWriteShort(Byte.MAX_VALUE);
-	}
-	
-	private void testReadWriteShort(byte value) {
-		byte[] orig = new byte[2];
-		byte[] dest = new byte[2];
-		
-		setArray(orig, value, 0, 2);
-		
-		int one = LEDataInputStream.readUShort(orig, 0);
-		LEDataOutputStream.writeUShort(one, dest, 0);
-		
-		assertArrayEquals(orig, dest);
-
-	}
-
-	public void testReadWriteByteZero() {
-		testReadWriteByte((byte) 0);
-	}
-	
-	public void testReadWriteByteMin() {
-		testReadWriteByte(Byte.MIN_VALUE);
-	}
-	
-	public void testReadWriteByteMax() {
-		testReadWriteShort(Byte.MAX_VALUE);
-	}
-	
-	private void testReadWriteByte(byte value) {
-		byte[] orig = new byte[1];
-		byte[] dest = new byte[1];
-		
-		setArray(orig, value, 0, 1);
-		
-		int one = Types.readUByte(orig, 0);
-		Types.writeUByte(one, dest, 0);
-		
-		assertArrayEquals(orig, dest);
-		
-	}
-	
-	public void testDate() {
-		Calendar cal = Calendar.getInstance();
-		
-		Calendar expected = Calendar.getInstance();
-		expected.set(2008, 1, 2, 3, 4, 5);
-		
-		byte[] buf = PwDate.writeTime(expected.getTime(), cal);
-		Calendar actual = Calendar.getInstance();
-		actual.setTime(PwDate.readTime(buf, 0, cal));
-		
-		assertEquals("Year mismatch: ", 2008, actual.get(Calendar.YEAR));
-		assertEquals("Month mismatch: ", 1, actual.get(Calendar.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));
-	}
-	
-	public void testUUID() {
-		Random rnd = new Random();
-		byte[] bUUID = new byte[16];
-		rnd.nextBytes(bUUID);
-		
-		UUID uuid = Types.bytestoUUID(bUUID);
-		byte[] eUUID = Types.UUIDtoBytes(uuid);
-		
-		assertArrayEquals("UUID match failed", bUUID, eUUID);
-	}
-
-	public void testULongMax() throws Exception {
-		byte[] ulongBytes = new byte[8];
-		for (int i = 0; i < ulongBytes.length; i++) {
-			ulongBytes[i] = -1;
-		}
-
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		LEDataOutputStream leos = new LEDataOutputStream(bos);
-		leos.writeLong(Types.ULONG_MAX_VALUE);
-		leos.close();
-
-		byte[] uLongMax = bos.toByteArray();
-
-		assertArrayEquals(ulongBytes, uLongMax);
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESKeyTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESKeyTest.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ * KeePassDX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KeePassDX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.tests.crypto
+
+import org.junit.Assert.assertArrayEquals
+
+import java.io.IOException
+import java.util.Random
+
+import junit.framework.TestCase
+
+import com.kunzisoft.keepass.crypto.finalkey.AndroidAESKeyTransformer
+import com.kunzisoft.keepass.crypto.finalkey.NativeAESKeyTransformer
+
+class AESKeyTest : TestCase() {
+    private lateinit var mRand: Random
+
+    @Throws(Exception::class)
+    override fun setUp() {
+        super.setUp()
+
+        mRand = Random()
+    }
+
+    @Throws(IOException::class)
+    fun testAES() {
+        // Test both an old and an even number to test my flip variable
+        testAESFinalKey(5)
+        testAESFinalKey(6)
+    }
+
+    @Throws(IOException::class)
+    private fun testAESFinalKey(rounds: Long) {
+        val seed = ByteArray(32)
+        val key = ByteArray(32)
+        val nativeKey: ByteArray?
+        val androidKey: ByteArray?
+
+        mRand.nextBytes(seed)
+        mRand.nextBytes(key)
+
+        val androidAESKey = AndroidAESKeyTransformer()
+        androidKey = androidAESKey.transformMasterKey(seed, key, rounds)
+
+        val nativeAESKey = NativeAESKeyTransformer()
+        nativeKey = nativeAESKey.transformMasterKey(seed, key, rounds)
+
+        assertArrayEquals("Does not match", androidKey, nativeKey)
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.java
@@ -1,83 +0,0 @@
-/*
-* 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.crypto;
-
-import com.kunzisoft.keepass.crypto.CipherFactory;
-
-import junit.framework.TestCase;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class AESTest extends TestCase {
-	
-	private Random mRand = new Random();
-	
-	public void testEncrypt() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException {
-		// Test above below and at the blocksize
-		testFinal(15);
-		testFinal(16);
-		testFinal(17);
-		
-		// Test random larger sizes
-		int size = mRand.nextInt(494) + 18;
-		testFinal(size);
-	}
-	
-	private void testFinal(int dataSize) throws NoSuchAlgorithmException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, InvalidAlgorithmParameterException {
-		
-		// Generate some input
-		byte[] input = new byte[dataSize];
-		mRand.nextBytes(input);
-		
-		// Generate key
-		byte[] keyArray = new byte[32];
-		mRand.nextBytes(keyArray);
-		SecretKeySpec key = new SecretKeySpec(keyArray, "AES");
-		
-		// Generate IV
-		byte[] ivArray = new byte[16];
-		mRand.nextBytes(ivArray);
-		IvParameterSpec iv = new IvParameterSpec(ivArray);
-		
-		Cipher android = CipherFactory.getInstance("AES/CBC/PKCS5Padding", true);
-		android.init(Cipher.ENCRYPT_MODE, key, iv);
-		byte[] outAndroid = android.doFinal(input, 0, dataSize);
-		
-		Cipher nat = CipherFactory.getInstance("AES/CBC/PKCS5Padding");
-		nat.init(Cipher.ENCRYPT_MODE, key, iv);
-		byte[] outNative = nat.doFinal(input, 0, dataSize);
-		
-		assertArrayEquals("Arrays differ on size: " + dataSize, outAndroid, outNative);
-	}
-	
-	
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ * KeePassDX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KeePassDX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.tests.crypto
+
+import com.kunzisoft.keepass.crypto.CipherFactory
+
+import junit.framework.TestCase
+
+import java.security.InvalidAlgorithmParameterException
+import java.security.InvalidKeyException
+import java.security.NoSuchAlgorithmException
+import java.util.Random
+
+import javax.crypto.BadPaddingException
+import javax.crypto.Cipher
+import javax.crypto.IllegalBlockSizeException
+import javax.crypto.NoSuchPaddingException
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+import org.junit.Assert.assertArrayEquals
+
+class AESTest : TestCase() {
+
+    private val mRand = Random()
+
+    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidAlgorithmParameterException::class)
+    fun testEncrypt() {
+        // Test above below and at the blocksize
+        testFinal(15)
+        testFinal(16)
+        testFinal(17)
+
+        // Test random larger sizes
+        val size = mRand.nextInt(494) + 18
+        testFinal(size)
+    }
+
+    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
+    private fun testFinal(dataSize: Int) {
+
+        // Generate some input
+        val input = ByteArray(dataSize)
+        mRand.nextBytes(input)
+
+        // Generate key
+        val keyArray = ByteArray(32)
+        mRand.nextBytes(keyArray)
+        val key = SecretKeySpec(keyArray, "AES")
+
+        // Generate IV
+        val ivArray = ByteArray(16)
+        mRand.nextBytes(ivArray)
+        val iv = IvParameterSpec(ivArray)
+
+        val android = CipherFactory.getInstance("AES/CBC/PKCS5Padding", true)
+        android.init(Cipher.ENCRYPT_MODE, key, iv)
+        val outAndroid = android.doFinal(input, 0, dataSize)
+
+        val nat = CipherFactory.getInstance("AES/CBC/PKCS5Padding")
+        nat.init(Cipher.ENCRYPT_MODE, key, iv)
+        val outNative = nat.doFinal(input, 0, dataSize)
+
+        assertArrayEquals("Arrays differ on size: $dataSize", outAndroid, outNative)
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.java
@@ -1,100 +0,0 @@
-/*
-* 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.crypto;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-
-import junit.framework.TestCase;
-
-import com.kunzisoft.keepass.crypto.CipherFactory;
-import com.kunzisoft.keepass.crypto.engine.AesEngine;
-import com.kunzisoft.keepass.crypto.engine.CipherEngine;
-import com.kunzisoft.keepass.stream.BetterCipherInputStream;
-import com.kunzisoft.keepass.stream.LEDataInputStream;
-
-public class CipherTest extends TestCase {
-	private Random rand = new Random();
-	
-	public void testCipherFactory() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException {
-		byte[] key = new byte[32];
-		byte[] iv = new byte[16];
-		
-		byte[] plaintext = new byte[1024];
-		
-		rand.nextBytes(key);
-		rand.nextBytes(iv);
-		rand.nextBytes(plaintext);
-		
-		CipherEngine aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID);
-		Cipher encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv);
-		Cipher decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv);
-
-		byte[] secrettext = encrypt.doFinal(plaintext);
-		byte[] decrypttext = decrypt.doFinal(secrettext);
-		
-		assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext);
-	}
-
-	public void testCipherStreams() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException, IOException {
-		final int MESSAGE_LENGTH = 1024;
-		
-		byte[] key = new byte[32];
-		byte[] iv = new byte[16];
-		
-		byte[] plaintext = new byte[MESSAGE_LENGTH];
-		
-		rand.nextBytes(key);
-		rand.nextBytes(iv);
-		rand.nextBytes(plaintext);
-
-		CipherEngine aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID);
-		Cipher encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv);
-		Cipher decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv);
-
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		CipherOutputStream cos = new CipherOutputStream(bos, encrypt);
-		cos.write(plaintext);
-		cos.close();
-		
-		byte[] secrettext = bos.toByteArray();
-		
-		ByteArrayInputStream bis = new ByteArrayInputStream(secrettext);
-		BetterCipherInputStream cis = new BetterCipherInputStream(bis, decrypt);
-		LEDataInputStream lis = new LEDataInputStream(cis);
-		
-		byte[] decrypttext = lis.readBytes(MESSAGE_LENGTH);
-		
-		assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext);
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ * KeePassDX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KeePassDX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.tests.crypto
+
+import org.junit.Assert.assertArrayEquals
+
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.security.InvalidAlgorithmParameterException
+import java.security.InvalidKeyException
+import java.security.NoSuchAlgorithmException
+import java.util.Random
+
+import javax.crypto.BadPaddingException
+import javax.crypto.Cipher
+import javax.crypto.CipherOutputStream
+import javax.crypto.IllegalBlockSizeException
+import javax.crypto.NoSuchPaddingException
+
+import junit.framework.TestCase
+
+import com.kunzisoft.keepass.crypto.CipherFactory
+import com.kunzisoft.keepass.crypto.engine.AesEngine
+import com.kunzisoft.keepass.stream.BetterCipherInputStream
+import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
+
+class CipherTest : TestCase() {
+    private val rand = Random()
+
+    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidAlgorithmParameterException::class, IllegalBlockSizeException::class, BadPaddingException::class)
+    fun testCipherFactory() {
+        val key = ByteArray(32)
+        val iv = ByteArray(16)
+
+        val plaintext = ByteArray(1024)
+
+        rand.nextBytes(key)
+        rand.nextBytes(iv)
+        rand.nextBytes(plaintext)
+
+        val aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID)
+        val encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv)
+        val decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv)
+
+        val secrettext = encrypt.doFinal(plaintext)
+        val decrypttext = decrypt.doFinal(secrettext)
+
+        assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext)
+    }
+
+    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidAlgorithmParameterException::class, IllegalBlockSizeException::class, BadPaddingException::class, IOException::class)
+    fun testCipherStreams() {
+        val MESSAGE_LENGTH = 1024
+
+        val key = ByteArray(32)
+        val iv = ByteArray(16)
+
+        val plaintext = ByteArray(MESSAGE_LENGTH)
+
+        rand.nextBytes(key)
+        rand.nextBytes(iv)
+        rand.nextBytes(plaintext)
+
+        val aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID)
+        val encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv)
+        val decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv)
+
+        val bos = ByteArrayOutputStream()
+        val cos = CipherOutputStream(bos, encrypt)
+        cos.write(plaintext)
+        cos.close()
+
+        val secrettext = bos.toByteArray()
+
+        val bis = ByteArrayInputStream(secrettext)
+        val cis = BetterCipherInputStream(bis, decrypt)
+        val lis = LittleEndianDataInputStream(cis)
+
+        val decrypttext = lis.readBytes(MESSAGE_LENGTH)
+
+        assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext)
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.java
@@ -1,66 +0,0 @@
-/*
-* 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.crypto;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.IOException;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import com.kunzisoft.keepass.crypto.finalkey.AndroidFinalKey;
-import com.kunzisoft.keepass.crypto.finalkey.NativeFinalKey;
-
-public class FinalKeyTest extends TestCase {
-	private Random mRand;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		mRand = new Random();
-	}
-	
-	public void testNativeAndroid() throws IOException {
-		// Test both an old and an even number to test my flip variable
-		testNativeFinalKey(5);
-		testNativeFinalKey(6);
-	}
-	
-	private void testNativeFinalKey(int rounds) throws IOException {
-		byte[] seed = new byte[32];
-		byte[] key = new byte[32];
-		byte[] nativeKey;
-		byte[] androidKey;
-		
-		mRand.nextBytes(seed);
-		mRand.nextBytes(key);
-		
-		AndroidFinalKey aKey = new AndroidFinalKey();
-		androidKey = aKey.transformMasterKey(seed, key, rounds);
-		
-		NativeFinalKey nKey = new NativeFinalKey();
-		nativeKey = nKey.transformMasterKey(seed, key, rounds);
-		
-		assertArrayEquals("Does not match", androidKey, nativeKey);
-		
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java
@@ -1,113 +0,0 @@
-/*
- * 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.database;
-
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.PwDatabaseV3;
-import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass.database.PwEntryV3;
-import com.kunzisoft.keepass.database.PwGroup;
-import com.kunzisoft.keepass.database.action.node.DeleteGroupRunnable;
-import com.kunzisoft.keepass.database.search.SearchDbHelper;
-
-import java.util.List;
-
-public class DeleteEntry extends AndroidTestCase {
-	private static final String GROUP1_NAME = "Group1";
-	private static final String ENTRY1_NAME = "Test1";
-	private static final String ENTRY2_NAME = "Test2";
-	private static final String KEYFILE = "";
-	private static final String PASSWORD = "12345";
-	private static final String ASSET = "delete.kdb";
-	private static final String FILENAME = "/sdcard/delete.kdb";
-	
-	public void testDelete() {
-		
-		Database db;
-		
-		Context ctx = getContext();
-		
-		try {
-			db = TestData.GetDb(ctx, ASSET, PASSWORD, KEYFILE, FILENAME);
-		} catch (Exception e) {
-			assertTrue("Failed to open database: " + e.getMessage(), false);
-			return;
-		}
-		
-		PwDatabaseV3 pm = (PwDatabaseV3) db.getPwDatabase();
-		PwGroup group1 = getGroup(pm, GROUP1_NAME);
-		assertNotNull("Could not find group1", group1);
-		
-		// Delete the group
-		DeleteGroupRunnable task = new DeleteGroupRunnable(null, db, group1, null, true);
-		task.run();
-		
-		// Verify the entries were deleted
-		PwEntry entry1 = getEntry(pm, ENTRY1_NAME);
-		assertNull("Entry 1 was not removed", entry1);
-
-		PwEntry entry2 = getEntry(pm, ENTRY2_NAME);
-		assertNull("Entry 2 was not removed", entry2);
-		
-		// Verify the entries were removed from the search index
-		SearchDbHelper dbHelp = new SearchDbHelper(ctx);
-		PwGroup results1 = dbHelp.search(db.getPwDatabase(), ENTRY1_NAME, 100);
-		PwGroup results2 = dbHelp.search(db.getPwDatabase(), ENTRY2_NAME, 100);
-		
-		assertEquals("Entry1 was not removed from the search results", 0, results1.numbersOfChildEntries());
-		assertEquals("Entry2 was not removed from the search results", 0, results2.numbersOfChildEntries());
-		
-		// Verify the group was deleted
-		group1 = getGroup(pm, GROUP1_NAME);
-		assertNull("Group 1 was not removed.", group1);
-
-	}
-	
-	private PwEntryV3 getEntry(PwDatabaseV3 pm, String name) {
-		List<PwEntryV3> entries = pm.getEntries();
-		for ( int i = 0; i < entries.size(); i++ ) {
-			PwEntryV3 entry = entries.get(i);
-			if ( entry.getTitle().equals(name) ) {
-				return entry;
-			}
-		}
-		
-		return null;
-		
-	}
-	
-	private PwGroup getGroup(PwDatabase pm, String name) {
-		List<PwGroup> groups = pm.getGroups();
-		for ( int i = 0; i < groups.size(); i++ ) {
-			PwGroup group = groups.get(i);
-			if ( group.getName().equals(name) ) {
-				return group;
-			}
-		}
-		
-		return null;
-	}
-	
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java
@@ -1,54 +0,0 @@
-/*
- * 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.database;
-
-import com.kunzisoft.keepass.database.PwDatabaseV4;
-import com.kunzisoft.keepass.database.PwEntryV4;
-
-import junit.framework.TestCase;
-
-public class EntryV4 extends TestCase {
-
-	public void testBackup() {
-		PwDatabaseV4 db = new PwDatabaseV4();
-		
-		db.setHistoryMaxItems(2);
-		
-		PwEntryV4 entry = new PwEntryV4();
-		entry.startToManageFieldReferences(db);
-		entry.setTitle("Title1");
-		entry.setUsername("User1");
-		entry.createBackup(db);
-		
-		entry.setTitle("Title2");
-		entry.setUsername("User2");
-		entry.createBackup(db);
-		
-		entry.setTitle("Title3");
-		entry.setUsername("User3");
-		entry.createBackup(db);
-		
-		PwEntryV4 backup = entry.getHistory().get(0);
-		entry.stopToManageFieldReferences();
-		assertEquals("Title2", backup.getTitle());
-		assertEquals("User2", backup.getUsername());
-	}
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3.java
@@ -1,62 +0,0 @@
-/*
- * 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.database;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.net.Uri;
-import android.os.Environment;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.load.ImporterV3;
-import com.kunzisoft.keepass.tests.TestUtil;
-import com.kunzisoft.keepass.utils.UriUtil;
-
-import java.io.InputStream;
-import java.io.File;
-
-public class Kdb3 extends AndroidTestCase {
-	
-	private void testKeyfile(String dbAsset, String keyAsset, String password) throws Exception {
-		Context ctx = getContext();
-
-		File sdcard = Environment.getExternalStorageDirectory();
-		String keyPath = sdcard.getAbsolutePath() + "/key";
-		
-		TestUtil.extractKey(ctx, keyAsset, keyPath);
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open(dbAsset, AssetManager.ACCESS_STREAMING);
-		
-		ImporterV3 importer = new ImporterV3();
-		importer.openDatabase(is, password, TestUtil.getKeyFileInputStream(ctx, keyPath));
-		
-		is.close();
-	}
-	
-	public void testXMLKeyFile() throws Exception {
-		testKeyfile("kdb_with_xml_keyfile.kdb", "keyfile.key", "12345");
-	}
-	
-	public void testBinary64KeyFile() throws Exception {
-		testKeyfile("binary-key.kdb", "binary.key", "12345");
-	}
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3Twofish.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb3Twofish.java
@@ -1,48 +0,0 @@
-/*
- * 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.database;
-
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.PwDatabaseV3;
-import com.kunzisoft.keepass.database.PwEncryptionAlgorithm;
-import com.kunzisoft.keepass.database.load.ImporterV3;
-
-public class Kdb3Twofish extends AndroidTestCase {
-	public void testReadTwofish() throws Exception {
-		Context ctx = getContext();
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open("twofish.kdb", AssetManager.ACCESS_STREAMING);
-		
-		ImporterV3 importer = new ImporterV3();
-
-		PwDatabaseV3 db = importer.openDatabase(is, "12345", null);
-		
-		assertTrue(db.getEncryptionAlgorithm() == PwEncryptionAlgorithm.Twofish);
-		
-		is.close();
-
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4.java
@@ -1,171 +0,0 @@
-/*
- * 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.database;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.PwDatabaseV4;
-import com.kunzisoft.keepass.database.exception.InvalidDBException;
-import com.kunzisoft.keepass.database.exception.PwDbOutputException;
-import com.kunzisoft.keepass.database.load.Importer;
-import com.kunzisoft.keepass.database.load.ImporterFactory;
-import com.kunzisoft.keepass.database.load.ImporterV4;
-import com.kunzisoft.keepass.database.save.PwDbOutput;
-import com.kunzisoft.keepass.database.save.PwDbV4Output;
-import com.kunzisoft.keepass.stream.CopyInputStream;
-import com.kunzisoft.keepass.tests.TestUtil;
-
-public class Kdb4 extends AndroidTestCase {
-
-    public void testDetection() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-
-        Importer importer = ImporterFactory.createImporter(is);
-
-        assertTrue(importer instanceof ImporterV4);
-        is.close();
-
-    }
-
-    public void testParsing() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", null);
-
-        is.close();
-
-
-    }
-
-    public void testSavingKDBXV3() throws IOException, InvalidDBException, PwDbOutputException {
-       testSaving("test.kdbx", "12345", "test-out.kdbx");
-    }
-
-    public void testSavingKDBXV4() throws IOException, InvalidDBException, PwDbOutputException {
-        testSaving("test-kdbxv4.kdbx", "1", "test-kdbxv4-out.kdbx");
-    }
-
-    private void testSaving(String inputFile, String password, String outputFile) throws IOException, InvalidDBException, PwDbOutputException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open(inputFile, AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        PwDatabaseV4 db = importer.openDatabase(is, password, null);
-        is.close();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        PwDbV4Output output =  (PwDbV4Output) PwDbOutput.getInstance(db, bos);
-        output.output();
-
-        byte[] data = bos.toByteArray();
-
-        FileOutputStream fos = new FileOutputStream(TestUtil.getSdPath(outputFile), false);
-
-        InputStream bis = new ByteArrayInputStream(data);
-        bis = new CopyInputStream(bis, fos);
-        importer = new ImporterV4();
-        db = importer.openDatabase(bis, password, null);
-        bis.close();
-
-        fos.close();
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        TestUtil.extractKey(getContext(), "keyfile.key", TestUtil.getSdPath("key"));
-        TestUtil.extractKey(getContext(), "binary.key", TestUtil.getSdPath("key-binary"));
-    }
-
-    public void testComposite() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("keyfile.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", TestUtil.getKeyFileInputStream(ctx, TestUtil.getSdPath("key")));
-
-        is.close();
-
-    }
-
-    public void testCompositeBinary() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("keyfile-binary.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", TestUtil.getKeyFileInputStream(ctx,TestUtil.getSdPath("key-binary")));
-
-        is.close();
-
-    }
-
-    public void testKeyfile() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("key-only.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "", TestUtil.getKeyFileInputStream(ctx, TestUtil.getSdPath("key")));
-
-        is.close();
-
-
-    }
-
-    public void testNoGzip() throws IOException, InvalidDBException {
-        Context ctx = getContext();
-
-        AssetManager am = ctx.getAssets();
-        InputStream is = am.open("no-encrypt.kdbx", AssetManager.ACCESS_STREAMING);
-
-        ImporterV4 importer = new ImporterV4();
-        importer.openDatabase(is, "12345", null);
-
-        is.close();
-
-
-    }
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4Header.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/Kdb4Header.java
@@ -1,50 +0,0 @@
-/*
- * 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.database;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.crypto.engine.AesEngine;
-import com.kunzisoft.keepass.database.PwDatabaseV4;
-import com.kunzisoft.keepass.database.load.ImporterV4;
-
-import java.io.InputStream;
-
-public class Kdb4Header extends AndroidTestCase {
-	public void testReadHeader() throws Exception {
-		Context ctx = getContext();
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-		
-		ImporterV4 importer = new ImporterV4();
-
-		PwDatabaseV4 db = importer.openDatabase(is, "12345", null);
-		
-		assertEquals(6000, db.getNumberKeyEncryptionRounds());
-		
-		assertTrue(db.getDataCipher().equals(AesEngine.CIPHER_UUID));
-		
-		is.close();
-
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/SprEngineTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/SprEngineTest.java
@@ -1,80 +0,0 @@
-/*
- * 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.database;
-
-import java.io.InputStream;
-import java.util.UUID;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-import biz.source_code.base64Coder.Base64Coder;
-
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.PwDatabaseV4;
-import com.kunzisoft.keepass.database.PwEntryV4;
-import com.kunzisoft.keepass.database.load.ImporterV4;
-import com.kunzisoft.keepass.utils.SprEngineV4;
-import com.kunzisoft.keepass.utils.Types;
-
-public class SprEngineTest extends AndroidTestCase {
-	private PwDatabaseV4 db;
-	private SprEngineV4 spr;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		Context ctx = getContext();
-		
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open("test.kdbx", AssetManager.ACCESS_STREAMING);
-		
-		ImporterV4 importer = new ImporterV4();
-		db = importer.openDatabase(is, "12345", null);
-		
-		is.close();
-		
-		spr = new SprEngineV4();
-	}
-	
-	private final String REF = "{REF:P@I:2B1D56590D961F48A8CE8C392CE6CD35}";
-	private final String ENCODE_UUID = "IN7RkON49Ui1UZ2ddqmLcw==";
-	private final String RESULT = "Password";
-	public void testRefReplace() {
-		UUID entryUUID = decodeUUID(ENCODE_UUID);
-		
-		PwEntryV4 entry = (PwEntryV4) db.getEntryByUUIDId(entryUUID);
-
-		
-		assertEquals(RESULT, spr.compile(REF, entry, db));
-		
-	}
-	
-	private UUID decodeUUID(String encoded) {
-		if (encoded == null || encoded.length() == 0 ) {
-			return PwDatabase.UUID_ZERO;
-		}
-		
-		byte[] buf = Base64Coder.decode(encoded);
-		return Types.bytestoUUID(buf);
-	}
-
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/TestData.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/TestData.java
@@ -1,77 +0,0 @@
-/*
- * 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.database;
-
-import java.io.InputStream;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.net.Uri;
-
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwDatabaseV3Debug;
-import com.kunzisoft.keepass.database.load.Importer;
-import com.kunzisoft.keepass.tests.TestUtil;
-
-public class TestData {
-	private static final String TEST1_KEYFILE = "";
-	private static final String TEST1_KDB = "test1.kdb";
-	private static final String TEST1_PASSWORD = "12345";
-
-	private static Database mDb1;
-
-	
-	public static Database GetDb1(Context ctx) throws Exception {
-		return GetDb1(ctx, false);
-	}
-	
-	public static Database GetDb1(Context ctx, boolean forceReload) throws Exception {
-		if ( mDb1 == null || forceReload ) {
-			mDb1 = GetDb(ctx, TEST1_KDB, TEST1_PASSWORD, TEST1_KEYFILE, "/sdcard/test1.kdb");
-		}
-		
-		return mDb1;
-	}
-	
-	public static Database GetDb(Context ctx, String asset, String password, String keyfile, String filename) throws Exception {
-		AssetManager am = ctx.getAssets();
-		InputStream is = am.open(asset, AssetManager.ACCESS_STREAMING);
-
-		Database Db = new Database();
-
-		InputStream keyIs = TestUtil.getKeyFileInputStream(ctx, keyfile);
-
-		Db.loadData(ctx, is, password, keyIs, Importer.DEBUG);
-		Uri.Builder b = new Uri.Builder();
-
-		Db.setUri(b.scheme("file").path(filename).build());
-		
-		return Db;
-		
-	}
-	
-	public static PwDatabaseV3Debug GetTest1(Context ctx) throws Exception {
-		if ( mDb1 == null ) {
-			GetDb1(ctx);
-		}
-		
-		return (PwDatabaseV3Debug) mDb1.getPwDatabase();
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/output/PwManagerOutputTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/output/PwManagerOutputTest.java
@@ -1,146 +0,0 @@
-/*
-* 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.output;
- 
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.DigestOutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.PwDatabaseV3Debug;
-import com.kunzisoft.keepass.database.PwDbHeader;
-import com.kunzisoft.keepass.database.PwDbHeaderV3;
-import com.kunzisoft.keepass.database.exception.PwDbOutputException;
-import com.kunzisoft.keepass.database.save.PwDbHeaderOutputV3;
-import com.kunzisoft.keepass.database.save.PwDbV3Output;
-import com.kunzisoft.keepass.database.save.PwDbV3OutputDebug;
-import com.kunzisoft.keepass.stream.NullOutputStream;
-import com.kunzisoft.keepass.tests.TestUtil;
-import com.kunzisoft.keepass.tests.database.TestData;
- 
-public class PwManagerOutputTest extends AndroidTestCase {
-  PwDatabaseV3Debug mPM;
-  
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    
-    mPM = TestData.GetTest1(getContext());
-  }
-  
-  public void testPlainContent() throws IOException, PwDbOutputException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
- 
-    PwDbV3Output pos = new PwDbV3OutputDebug(mPM, bos, true);
-    pos.outputPlanGroupAndEntries(bos);
-    
-    assertTrue("No output", bos.toByteArray().length > 0);
-    assertArrayEquals("Group and entry output doesn't match.", mPM.getPostHeader(), bos.toByteArray());
- 
-  }
- 
-  public void testChecksum() throws NoSuchAlgorithmException, IOException, PwDbOutputException {
-    //FileOutputStream fos = new FileOutputStream("/dev/null");
-	NullOutputStream nos = new NullOutputStream();
-    MessageDigest md = MessageDigest.getInstance("SHA-256");
-    
-    DigestOutputStream dos = new DigestOutputStream(nos, md);
-  
-    PwDbV3Output pos = new PwDbV3OutputDebug(mPM, dos, true);
-    pos.outputPlanGroupAndEntries(dos);
-    dos.close();
-    
-    byte[] digest = md.digest();
-    assertTrue("No output", digest.length > 0);
-    assertArrayEquals("Hash of groups and entries failed.", mPM.getDbHeader().contentsHash, digest);
-  }
- 
-  private void assertHeadersEquals(PwDbHeaderV3 expected, PwDbHeaderV3 actual) {
-	  assertEquals("Flags unequal", expected.flags, actual.flags);
-	  assertEquals("Entries unequal", expected.numEntries, actual.numEntries);
-	  assertEquals("Groups unequal", expected.numGroups, actual.numGroups);
-	  assertEquals("Key Rounds unequal", expected.numKeyEncRounds, actual.numKeyEncRounds);
-	  assertEquals("Signature1 unequal", expected.signature1, actual.signature1);
-	  assertEquals("Signature2 unequal", expected.signature2, actual.signature2);
-	  assertTrue("Version incompatible", PwDbHeaderV3.compatibleHeaders(expected.version, actual.version));
-	  assertArrayEquals("Hash unequal", expected.contentsHash, actual.contentsHash);
-	  assertArrayEquals("IV unequal", expected.encryptionIV, actual.encryptionIV);
-	  assertArrayEquals("Seed unequal", expected.masterSeed, actual.masterSeed);
-	  assertArrayEquals("Seed2 unequal", expected.transformSeed, actual.transformSeed);
-  }
-  
-  public void testHeader() throws PwDbOutputException, IOException {
-	ByteArrayOutputStream bActual = new ByteArrayOutputStream();
-    PwDbV3Output pActual = new PwDbV3OutputDebug(mPM, bActual, true);
-    PwDbHeaderV3 header = pActual.outputHeader(bActual);
-    
-    ByteArrayOutputStream bExpected = new ByteArrayOutputStream();
-    PwDbHeaderOutputV3 outExpected = new PwDbHeaderOutputV3(mPM.getDbHeader(), bExpected);
-    outExpected.output();
-    
-    assertHeadersEquals(mPM.getDbHeader(), header);
-    assertTrue("No output", bActual.toByteArray().length > 0);
-    assertArrayEquals("Header does not match.", bExpected.toByteArray(), bActual.toByteArray()); 
-  }
-  
-  public void testFinalKey() throws PwDbOutputException {
-	ByteArrayOutputStream bActual = new ByteArrayOutputStream();
-    PwDbV3Output pActual = new PwDbV3OutputDebug(mPM, bActual, true);
-    PwDbHeader hActual = pActual.outputHeader(bActual);
-    byte[] finalKey = pActual.getFinalKey(hActual);
-    
-    assertArrayEquals("Keys mismatched", mPM.getFinalKey(), finalKey);
-	  
-  }
-  
-  public void testFullWrite() throws IOException, PwDbOutputException  {
-	AssetManager am = getContext().getAssets();
-	InputStream is = am.open("test1.kdb");
-
-	// Pull file into byte array (for streaming fun)
-	ByteArrayOutputStream bExpected = new ByteArrayOutputStream();
-	while (true) {
-		int data = is.read();
-		if ( data == -1 ) {
-			break;
-		}
-		bExpected.write(data);
-	}
-	
-	ByteArrayOutputStream bActual = new ByteArrayOutputStream();
-	PwDbV3Output pActual = new PwDbV3OutputDebug(mPM, bActual, true);
-	pActual.output();
-	//pActual.close();
-
-	FileOutputStream fos = new FileOutputStream(TestUtil.getSdPath("test1_out.kdb"));
-	fos.write(bActual.toByteArray());
-	fos.close();
-	assertArrayEquals("Databases do not match.", bExpected.toByteArray(), bActual.toByteArray());
-  
-  }
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/search/SearchTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/search/SearchTest.java
@@ -1,72 +0,0 @@
-/*
-* 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.search;
-
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.test.AndroidTestCase;
-
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwGroup;
-import com.kunzisoft.keepass.tests.database.TestData;
-
-public class SearchTest extends AndroidTestCase {
-	
-	private Database mDb;
-	
-	@Override
-	protected void setUp() throws Exception {
-	    super.setUp();
-	    
-	    mDb = TestData.GetDb1(getContext(), true);
-	}
-	
-	public void testSearch() {
-		PwGroup results = mDb.search("Amazon");
-		assertTrue("Search result not found.", results.numbersOfChildEntries() > 0);
-		
-	}
-	
-	public void testBackupIncluded() {
-		updateOmitSetting(false);
-		PwGroup results = mDb.search("BackupOnly");
-		
-		assertTrue("Search result not found.", results.numbersOfChildEntries() > 0);
-	}
-	
-	public void testBackupExcluded() {
-		updateOmitSetting(true);
-		PwGroup results = mDb.search("BackupOnly");
-		
-		assertFalse("Search result found, but should not have been.", results.numbersOfChildEntries() > 0);
-	}
-	
-	private void updateOmitSetting(boolean setting) {
-		Context ctx = getContext();
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
-		SharedPreferences.Editor editor = prefs.edit();
-		
-		editor.putBoolean("settings_omitbackup_key", setting);
-		editor.commit();
-		
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlock.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlock.java
@@ -1,110 +0,0 @@
-/*
-* 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.stream;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Random;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import junit.framework.TestCase;
-
-import com.kunzisoft.keepass.stream.HashedBlockInputStream;
-import com.kunzisoft.keepass.stream.HashedBlockOutputStream;
-
-public class HashedBlock extends TestCase {
-	
-	private static Random rand = new Random();
-
-	public void testBlockAligned() throws IOException {
-		testSize(1024, 1024);
-	}
-	
-	public void testOffset() throws IOException {
-		testSize(1500, 1024);
-	}
-	
-	private void testSize(int blockSize, int bufferSize) throws IOException {
-		byte[] orig = new byte[blockSize];
-		
-		rand.nextBytes(orig);
-		
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		HashedBlockOutputStream output = new HashedBlockOutputStream(bos, bufferSize);
-		output.write(orig);
-		output.close();
-		
-		byte[] encoded = bos.toByteArray();
-		
-		ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-		HashedBlockInputStream input = new HashedBlockInputStream(bis);
-
-		ByteArrayOutputStream decoded = new ByteArrayOutputStream();
-		while ( true ) {
-			byte[] buf = new byte[1024];
-			int read = input.read(buf);
-			if ( read == -1 ) {
-				break;
-			}
-			
-			decoded.write(buf, 0, read);
-		}
-		
-		byte[] out = decoded.toByteArray();
-		
-		assertArrayEquals(orig, out);
-		
-	}
-	
-	public void testGZIPStream() throws IOException {
-		final int testLength = 32000;
-		
-		byte[] orig = new byte[testLength];
-		rand.nextBytes(orig);
-		
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		HashedBlockOutputStream hos = new HashedBlockOutputStream(bos);
-		GZIPOutputStream zos = new GZIPOutputStream(hos);
-		
-		zos.write(orig);
-		zos.close();
-		
-		byte[] compressed = bos.toByteArray();
-		ByteArrayInputStream bis = new ByteArrayInputStream(compressed);
-		HashedBlockInputStream his = new HashedBlockInputStream(bis);
-		GZIPInputStream zis = new GZIPInputStream(his);
-		
-		byte[] uncompressed = new byte[testLength];
-		
-		int read = 0;
-		while (read != -1 && testLength - read > 0) {
-			read += zis.read(uncompressed, read, testLength - read);
-			
-		}
-		
-		assertArrayEquals("Output not equal to input", orig, uncompressed);
-		
-		
-	}
-}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlockTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlockTest.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ * KeePassDX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * KeePassDX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.tests.stream
+
+import org.junit.Assert.assertArrayEquals
+
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.util.Random
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
+
+import junit.framework.TestCase
+
+import com.kunzisoft.keepass.stream.HashedBlockInputStream
+import com.kunzisoft.keepass.stream.HashedBlockOutputStream
+
+class HashedBlockTest : TestCase() {
+
+    @Throws(IOException::class)
+    fun testBlockAligned() {
+        testSize(1024, 1024)
+    }
+
+    @Throws(IOException::class)
+    fun testOffset() {
+        testSize(1500, 1024)
+    }
+
+    @Throws(IOException::class)
+    private fun testSize(blockSize: Int, bufferSize: Int) {
+        val orig = ByteArray(blockSize)
+
+        rand.nextBytes(orig)
+
+        val bos = ByteArrayOutputStream()
+        val output = HashedBlockOutputStream(bos, bufferSize)
+        output.write(orig)
+        output.close()
+
+        val encoded = bos.toByteArray()
+
+        val bis = ByteArrayInputStream(encoded)
+        val input = HashedBlockInputStream(bis)
+
+        val decoded = ByteArrayOutputStream()
+        while (true) {
+            val buf = ByteArray(1024)
+            val read = input.read(buf)
+            if (read == -1) {
+                break
+            }
+
+            decoded.write(buf, 0, read)
+        }
+
+        val out = decoded.toByteArray()
+
+        assertArrayEquals(orig, out)
+
+    }
+
+    @Throws(IOException::class)
+    fun testGZIPStream() {
+        val testLength = 32000
+
+        val orig = ByteArray(testLength)
+        rand.nextBytes(orig)
+
+        val bos = ByteArrayOutputStream()
+        val hos = HashedBlockOutputStream(bos)
+        val zos = GZIPOutputStream(hos)
+
+        zos.write(orig)
+        zos.close()
+
+        val compressed = bos.toByteArray()
+        val bis = ByteArrayInputStream(compressed)
+        val his = HashedBlockInputStream(bis)
+        val zis = GZIPInputStream(his)
+
+        val uncompressed = ByteArray(testLength)
+
+        var read = 0
+        while (read != -1 && testLength - read > 0) {
+            read += zis.read(uncompressed, read, testLength - read)
+
+        }
+
+        assertArrayEquals("Output not equal to input", orig, uncompressed)
+
+
+    }
+
+    companion object {
+
+        private val rand = Random()
+    }
+}
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StrUtilTest.java
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/StrUtilTest.java
@@ -1,57 +0,0 @@
-/*
- * 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.StrUtil;
-
-import junit.framework.TestCase;
-
-public class StrUtilTest extends TestCase {
-    private final String text = "AbCdEfGhIj";
-    private final String search = "BcDe";
-    private final String badSearch = "Ed";
-
-	public void testIndexOfIgnoreCase1() {
-		assertEquals(1, StrUtil.indexOfIgnoreCase(text, search, Locale.ENGLISH));
-	}
-
-	public void testIndexOfIgnoreCase2() {
-		assertEquals(-1, StrUtil.indexOfIgnoreCase(text, search, Locale.ENGLISH), 2);
-	}
-
-	public void testIndexOfIgnoreCase3() {
-		assertEquals(-1, StrUtil.indexOfIgnoreCase(text, badSearch, Locale.ENGLISH));
-	}
-	
-	private final String repText = "AbCtestingaBc";
-	private final String repSearch = "ABc";
-	private final String repSearchBad = "CCCCCC";
-	private final String repNew = "12345";
-	private final String repResult = "12345testing12345";
-	public void testReplaceAllIgnoresCase1() {
-		assertEquals(repResult, StrUtil.replaceAllIgnoresCase(repText, repSearch, repNew, Locale.ENGLISH));
-	}
-
-	public void testReplaceAllIgnoresCase2() {
-		assertEquals(repText, StrUtil.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
@@ -0,0 +1,28 @@
+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/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/ValuesTest.kt
@@ -0,0 +1,195 @@
+/*
+ * 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.tests.utils
+
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.stream.*
+import com.kunzisoft.keepass.utils.UnsignedInt
+import com.kunzisoft.keepass.utils.UnsignedLong
+import junit.framework.TestCase
+import org.junit.Assert.assertArrayEquals
+import java.io.ByteArrayOutputStream
+import java.util.*
+
+class ValuesTest : TestCase() {
+
+    fun testReadWriteLongZero() {
+        testReadWriteLong(0.toByte())
+    }
+
+    fun testReadWriteLongMax() {
+        testReadWriteLong(Byte.MAX_VALUE)
+    }
+
+    fun testReadWriteLongMin() {
+        testReadWriteLong(Byte.MIN_VALUE)
+    }
+
+    fun testReadWriteLongRnd() {
+        val rnd = Random()
+        val buf = ByteArray(1)
+        rnd.nextBytes(buf)
+
+        testReadWriteLong(buf[0])
+    }
+
+    private fun testReadWriteLong(value: Byte) {
+        val orig = ByteArray(8)
+        setArray(orig, value, 8)
+
+        assertArrayEquals(orig, longTo8Bytes(bytes64ToLong(orig)))
+    }
+
+    fun testReadWriteIntZero() {
+        testReadWriteInt(0.toByte())
+    }
+
+    fun testReadWriteIntMin() {
+        testReadWriteInt(Byte.MIN_VALUE)
+    }
+
+    fun testReadWriteIntMax() {
+        testReadWriteInt(Byte.MAX_VALUE)
+    }
+
+    private fun testReadWriteInt(value: Byte) {
+        val orig = ByteArray(4)
+
+        for (i in 0..3) {
+            orig[i] = 0
+        }
+
+        setArray(orig, value, 4)
+
+        val one = bytes4ToUInt(orig)
+        val dest = uIntTo4Bytes(one)
+
+        assertArrayEquals(orig, dest)
+    }
+
+    private fun setArray(buf: ByteArray, value: Byte, size: Int) {
+        for (i in 0 until size) {
+            buf[i] = value
+        }
+    }
+
+    fun testReadWriteShortOne() {
+        val orig = ByteArray(2)
+
+        orig[0] = 0
+        orig[1] = 1
+
+        val one = bytes2ToUShort(orig)
+        val dest = uShortTo2Bytes(one)
+
+        assertArrayEquals(orig, dest)
+    }
+
+    fun testReadWriteShortMin() {
+        testReadWriteShort(Byte.MIN_VALUE)
+    }
+
+    fun testReadWriteShortMax() {
+        testReadWriteShort(Byte.MAX_VALUE)
+    }
+
+    private fun testReadWriteShort(value: Byte) {
+        val orig = ByteArray(2)
+        setArray(orig, value, 2)
+
+        val one = bytes2ToUShort(orig)
+        val dest = uShortTo2Bytes(one)
+
+        assertArrayEquals(orig, dest)
+    }
+
+    fun testReadWriteByteZero() {
+        testReadWriteByte(0.toByte())
+    }
+
+    fun testReadWriteByteMin() {
+        testReadWriteByte(Byte.MIN_VALUE)
+    }
+
+    fun testReadWriteByteMax() {
+        testReadWriteShort(Byte.MAX_VALUE)
+    }
+
+    private fun testReadWriteByte(value: Byte) {
+        val dest: Byte = UnsignedInt(UnsignedInt.fromKotlinByte(value)).toKotlinByte()
+        assert(value == dest)
+    }
+
+    fun testDate() {
+        val cal = Calendar.getInstance()
+
+        val expected = Calendar.getInstance()
+        expected.set(2008, 1, 2, 3, 4, 5)
+
+        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)!!)
+
+        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("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 bUUID = ByteArray(16)
+        Random().nextBytes(bUUID)
+
+        val uuid = bytes16ToUuid(bUUID)
+        val eUUID = uuidTo16Bytes(uuid)
+
+        val lUUID = bytes16ToUuid(bUUID)
+        val leUUID = uuidTo16Bytes(lUUID)
+
+        assertArrayEquals("UUID match failed", bUUID, eUUID)
+        assertArrayEquals("UUID match failed", bUUID, leUUID)
+    }
+
+    @Throws(Exception::class)
+    fun testULongMax() {
+        val ulongBytes = ByteArray(8)
+        for (i in ulongBytes.indices) {
+            ulongBytes[i] = -1
+        }
+
+        val bos = ByteArrayOutputStream()
+        val leos = LittleEndianDataOutputStream(bos)
+        leos.writeLong(UnsignedLong.MAX_VALUE)
+        leos.close()
+
+        val uLongMax = bos.toByteArray()
+
+        assertArrayEquals(ulongBytes, uLongMax)
+    }
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,14 @@
      android:normalScreens="true"
      android:largeScreens="true"
      android:anyDensity="true" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <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"/>

    <application
        android:label="@string/app_name"
@@ -18,21 +23,21 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:name="com.kunzisoft.keepass.app.App"
        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup"
+        android:fullBackupContent="@xml/backup_rules"
        android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
+        android:largeHeap="true"
+        android:resizeableActivity="true"
        android:theme="@style/KeepassDXStyle.Night"
-        tools:replace="android:theme">
-        <!-- TODO backup API Key -->
+        tools:targetApi="n">
        <meta-data
            android:name="com.google.android.backup.api_key"
-            android:value="" />
-
+            android:value="${googleAndroidBackupAPIKey}" />
        <activity
-            android:name="com.kunzisoft.keepass.fileselect.FileSelectActivity"
+            android:name="com.kunzisoft.keepass.activities.FileDatabaseSelectActivity"
            android:theme="@style/KeepassDXStyle.SplashScreen"
            android:label="@string/app_name"
            android:launchMode="singleTop"
-            android:configChanges="orientation|keyboardHidden"
+            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="stateHidden" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -40,12 +45,8 @@
            </intent-filter>
        </activity>
        <activity
-            android:name="com.kunzisoft.keepass.activities.AboutActivity"
-            android:launchMode="singleTask"
-            android:label="@string/menu_about" />
-        <activity
-            android:name="com.kunzisoft.keepass.password.PasswordActivity"
-            android:configChanges="orientation|keyboardHidden"
+            android:name="com.kunzisoft.keepass.activities.PasswordActivity"
+            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="adjustResize">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
@@ -53,7 +54,7 @@
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="file" />
                <data android:scheme="content" />
-                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="*/*" />
                <data android:host="*" />
                <data android:pathPattern=".*\\.kdb" />
                <data android:pathPattern=".*\\..*\\.kdb" />
@@ -76,36 +77,36 @@
                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
            </intent-filter>
-            <intent-filter tools:ignore="AppLinkUrlError">
+            <intent-filter>
                <action android:name="android.intent.action.VIEW"/>
                <category android:name="android.intent.category.DEFAULT"/>
                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="application/octet-stream"/>
-            </intent-filter>
-        </activity>
-        <!-- Folder picker -->
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/nnf_provider_paths" />
-        </provider>
-        <activity
-            android:name="com.kunzisoft.keepass.fileselect.FilePickerStylishActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="application/x-kdb" />
+                <data android:mimeType="application/x-kdbx" />
+                <data android:mimeType="application/x-keepass" />
+                <data android:host="*" />
+                <data android:pathPattern=".*" />
+                <data android:pathPattern=".*\\.*" />
+                <data android:pathPattern=".*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.*" />
            </intent-filter>
        </activity>
+        <!-- Main Activity -->
        <activity
            android:name="com.kunzisoft.keepass.activities.GroupActivity"
-            android:configChanges="orientation|keyboardHidden"
+            android:configChanges="keyboardHidden"
            android:windowSoftInputMode="adjustPan"
-            android:launchMode="singleTop">
+            android:launchMode="singleTask">
            <meta-data
                android:name="android.app.default_searchable"
                android:value="com.kunzisoft.keepass.search.SearchResults"
@@ -120,21 +121,55 @@
        </activity>
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="stateHidden" />
+            android:configChanges="keyboardHidden" />
        <activity
            android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="stateHidden" />
-        <activity android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
-        <activity android:name="com.kunzisoft.keepass.autofill.AutoFillAuthActivity"
-            android:configChanges="orientation|keyboardHidden" />
-        <activity android:name="com.kunzisoft.keepass.selection.EntrySelectionAuthActivity"
-            android:configChanges="orientation|keyboardHidden" />
-        <activity android:name="com.kunzisoft.keepass.settings.SettingsAutofillActivity" />
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
+        <!-- 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: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>
+        <activity
+            android:name="com.kunzisoft.keepass.activities.MagikeyboardLauncherActivity"
+            android:theme="@style/Theme.Transparent" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
+            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.NotificationCopyingService"
+            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"
            android:exported="false" />
        <!-- Receiver for Autofill -->
@@ -149,6 +184,20 @@
                <action android:name="android.service.autofill.AutofillService" />
            </intent-filter>
        </service>
+        <service
+            android:name="com.kunzisoft.keepass.magikeyboard.MagikIME"
+            android:label="@string/keyboard_label"
+            android:permission="android.permission.BIND_INPUT_METHOD" >
+            <meta-data android:name="android.view.im"
+                android:resource="@xml/keyboard_method"/>
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+        </service>
+        <service
+            android:name="com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService"
+            android:enabled="true"
+            android:exported="false" />

        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
    </application>
--- a/app/src/main/assets/accent.kdb
+++ b/app/src/main/assets/accent.kdb
--- a/app/src/main/assets/binary-key.kdb
+++ b/app/src/main/assets/binary-key.kdb
--- a/app/src/main/assets/binary.key
+++ b/app/src/main/assets/binary.key
@@ -1,2 +0,0 @@
-v7<EFBFBD><07>gx<67><78><EFBFBD>"<04>Dm<44>]tIWRP<52>g<18>y<15>/˰1<CBB0><31><13>X<0B><>fW[<5B>F%<25><1E>\<5C>up4
-<EFBFBD><EFBFBD>-t;<3B>z<EFBFBD>
--- a/app/src/main/assets/delete.kdb
+++ b/app/src/main/assets/delete.kdb
--- a/app/src/main/assets/fonts/DroidSansMonoSlashed.ttf
+++ b/app/src/main/assets/fonts/DroidSansMonoSlashed.ttf
--- a/app/src/main/assets/fonts/FiraMono-Regular.ttf
+++ b/app/src/main/assets/fonts/FiraMono-Regular.ttf
--- a/app/src/main/assets/kdb_with_xml_keyfile.kdb
+++ b/app/src/main/assets/kdb_with_xml_keyfile.kdb
--- a/app/src/main/assets/key-only.kdbx
+++ b/app/src/main/assets/key-only.kdbx
--- a/app/src/main/assets/keyfile-binary.kdbx
+++ b/app/src/main/assets/keyfile-binary.kdbx
--- a/app/src/main/assets/keyfile.kdbx
+++ b/app/src/main/assets/keyfile.kdbx
--- a/app/src/main/assets/keyfile.key
+++ b/app/src/main/assets/keyfile.key
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<KeyFile>
-	<Meta>
-		<Version>1.00</Version>
-	</Meta>
-	<Key>
-		<Data>zaTWphVNtRbspnwkqjy8FGTy5IqCUx9+FNb5H+VdB24=</Data>
-	</Key>
-</KeyFile>
--- a/app/src/main/assets/no-encrypt.kdbx
+++ b/app/src/main/assets/no-encrypt.kdbx
--- a/app/src/main/assets/test-kdbxv4.kdbx
+++ b/app/src/main/assets/test-kdbxv4.kdbx
--- a/app/src/main/assets/test.kdbx
+++ b/app/src/main/assets/test.kdbx
--- a/app/src/main/assets/test1.kdb
+++ b/app/src/main/assets/test1.kdb
--- a/app/src/main/assets/twofish.kdb
+++ b/app/src/main/assets/twofish.kdb
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.java
@@ -1,81 +0,0 @@
-/*
- * 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;
-
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.stylish.StylishActivity;
-
-import org.joda.time.DateTime;
-
-public class AboutActivity extends StylishActivity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.about);
-
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setTitle(getString(R.string.menu_about));
-        setSupportActionBar(toolbar);
-        assert getSupportActionBar() != null;
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
-
-        String version;
-        try {
-            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-            version = packageInfo.versionName;
-        } catch (NameNotFoundException e) {
-            Log.w(getClass().getSimpleName(), "Unable to get application version", e);
-            version = "Unable to get application version.";
-        }
-        version = getString(R.string.version_label) + " " + version;
-        TextView versionText = (TextView) findViewById(R.id.activity_about_version);
-        versionText.setText(version);
-
-        TextView disclaimerText = (TextView) findViewById(R.id.disclaimer);
-        disclaimerText.setText(getString(R.string.disclaimer_formal, new DateTime().getYear()));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        switch (id) {
-            case android.R.id.home:
-                finish();
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
@@ -0,0 +1,89 @@
+/*
+ * 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.pm.PackageManager.NameNotFoundException
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+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() {
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_about)
+
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        toolbar.title = getString(R.string.about)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        var version: String
+        var build: String
+        try {
+            version = packageManager.getPackageInfo(packageName, 0).versionName
+            build = BuildConfig.BUILD_VERSION
+        } catch (e: NameNotFoundException) {
+            Log.w(javaClass.simpleName, "Unable to get the app or the build version", e)
+            version = "Unable to get the app version"
+            build = "Unable to get the build version"
+        }
+
+        version = getString(R.string.version_label, version)
+        val versionTextView = findViewById<TextView>(R.id.activity_about_version)
+        versionTextView.text = version
+
+        build = getString(R.string.build_label, build)
+        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)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        when (item.itemId) {
+            android.R.id.home -> finish()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt
@@ -0,0 +1,117 @@
+/*
+ * 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.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
@@ -1,522 +0,0 @@
-/*
- * 
- * 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;
-
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.getkeepsafe.taptargetview.TapTarget;
-import com.getkeepsafe.taptargetview.TapTargetView;
-import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.app.App;
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.ExtraFields;
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass.database.security.ProtectedString;
-import com.kunzisoft.keepass.lock.LockingActivity;
-import com.kunzisoft.keepass.lock.LockingHideActivity;
-import com.kunzisoft.keepass.notifications.NotificationCopyingService;
-import com.kunzisoft.keepass.notifications.NotificationField;
-import com.kunzisoft.keepass.settings.PreferencesUtil;
-import com.kunzisoft.keepass.settings.SettingsAutofillActivity;
-import com.kunzisoft.keepass.timeout.ClipboardHelper;
-import com.kunzisoft.keepass.utils.EmptyUtils;
-import com.kunzisoft.keepass.utils.MenuUtil;
-import com.kunzisoft.keepass.utils.Types;
-import com.kunzisoft.keepass.utils.Util;
-import com.kunzisoft.keepass.view.EntryContentsView;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.UUID;
-
-import static com.kunzisoft.keepass.settings.PreferencesUtil.isClipboardNotificationsEnable;
-import static com.kunzisoft.keepass.settings.PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields;
-
-public class EntryActivity extends LockingHideActivity {
-    private final static String TAG = EntryActivity.class.getName();
-
-	public static final String KEY_ENTRY = "entry";
-
-	private ImageView titleIconView;
-    private TextView titleView;
-	private EntryContentsView entryContentsView;
-    private Toolbar toolbar;
-	
-	protected PwEntry mEntry;
-	private boolean mShowPassword;
-
-	private ClipboardHelper clipboardHelper;
-	private boolean firstLaunchOfActivity;
-
-	private int iconColor;
-
-    public static void launch(Activity act, PwEntry pw, boolean readOnly) {
-        if (LockingActivity.checkTimeIsAllowedOrFinish(act)) {
-            Intent intent = new Intent(act, EntryActivity.class);
-            intent.putExtra(KEY_ENTRY, Types.UUIDtoBytes(pw.getUUID()));
-            ReadOnlyHelper.putReadOnlyInIntent(intent, readOnly);
-            act.startActivityForResult(intent, EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE);
-        }
-    }
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.entry_view);
-
-        toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        assert getSupportActionBar() != null;
-		getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
-
-		Database db = App.getDB();
-		// Likely the app has been killed exit the activity 
-		if ( ! db.getLoaded() ) {
-			finish();
-			return;
-		}
-		readOnly = db.isReadOnly() || readOnly;
-
-        mShowPassword = !PreferencesUtil.isPasswordMask(this);
-
-		// Get Entry from UUID
-		Intent i = getIntent();
-		UUID uuid = Types.bytestoUUID(i.getByteArrayExtra(KEY_ENTRY));
-		mEntry = db.getPwDatabase().getEntryByUUIDId(uuid);
-		if (mEntry == null) {
-			Toast.makeText(this, R.string.entry_not_found, Toast.LENGTH_LONG).show();
-			finish();
-			return;
-		}
-
-        // Retrieve the textColor to tint the icon
-        int[] attrs = {R.attr.textColorInverse};
-        TypedArray ta = getTheme().obtainStyledAttributes(attrs);
-        iconColor = ta.getColor(0, Color.WHITE);
-		
-		// Refresh Menu contents in case onCreateMenuOptions was called before mEntry was set
-		invalidateOptionsMenu();
-		
-		// Update last access time.
-		mEntry.touch(false, false);
-
-        // Get views
-        titleIconView = findViewById(R.id.entry_icon);
-        titleView = findViewById(R.id.entry_title);
-        entryContentsView = findViewById(R.id.entry_contents);
-        entryContentsView.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this));
-
-        // Init the clipboard helper
-        clipboardHelper = new ClipboardHelper(this);
-        firstLaunchOfActivity = true;
-	}
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        // Fill data in resume to update from EntryEditActivity
-        fillData();
-        invalidateOptionsMenu();
-
-        // Start to manage field reference to copy a value from ref
-        mEntry.startToManageFieldReferences(App.getDB().getPwDatabase());
-
-        boolean containsUsernameToCopy =
-                mEntry.getUsername().length() > 0;
-        boolean containsPasswordToCopy =
-                (mEntry.getPassword().length() > 0
-                        && PreferencesUtil.allowCopyPasswordAndProtectedFields(this));
-        boolean containsExtraFieldToCopy =
-                (mEntry.allowExtraFields()
-                        && ((mEntry.containsCustomFields()
-                                && mEntry.containsCustomFieldsNotProtected())
-                            || (mEntry.containsCustomFields()
-                                && mEntry.containsCustomFieldsProtected()
-                                && PreferencesUtil.allowCopyPasswordAndProtectedFields(this))
-                        )
-                );
-
-        // If notifications enabled in settings
-        // Don't if application timeout
-        if (firstLaunchOfActivity && !App.isShutdown() && isClipboardNotificationsEnable(getApplicationContext())) {
-            if (containsUsernameToCopy
-                    || containsPasswordToCopy
-                    || containsExtraFieldToCopy
-                    ) {
-                // username already copied, waiting for user's action before copy password.
-                Intent intent = new Intent(this, NotificationCopyingService.class);
-                intent.setAction(NotificationCopyingService.ACTION_NEW_NOTIFICATION);
-                if (mEntry.getTitle() != null)
-                    intent.putExtra(NotificationCopyingService.EXTRA_ENTRY_TITLE, mEntry.getTitle());
-                // Construct notification fields
-                ArrayList<NotificationField> notificationFields = new ArrayList<>();
-                // Add username if exists to notifications
-                if (containsUsernameToCopy)
-                    notificationFields.add(
-                            new NotificationField(
-                                    NotificationField.NotificationFieldId.USERNAME,
-                                    mEntry.getUsername(),
-                                    getResources()));
-                // Add password to notifications
-                if (containsPasswordToCopy) {
-                    notificationFields.add(
-                            new NotificationField(
-                                    NotificationField.NotificationFieldId.PASSWORD,
-                                    mEntry.getPassword(),
-                                    getResources()));
-                }
-                // Add extra fields
-                if (containsExtraFieldToCopy) {
-                    try {
-                        mEntry.getFields().doActionToAllCustomProtectedField(new ExtraFields.ActionProtected() {
-                            private int anonymousFieldNumber = 0;
-                            @Override
-                            public void doAction(String key, ProtectedString value) {
-                                //If value is not protected or allowed
-                                if (!value.isProtected() || PreferencesUtil.allowCopyPasswordAndProtectedFields(EntryActivity.this)) {
-                                    notificationFields.add(
-                                            new NotificationField(
-                                                    NotificationField.NotificationFieldId.getAnonymousFieldId()[anonymousFieldNumber],
-                                                    value.toString(),
-                                                    key,
-                                                    getResources()));
-                                    anonymousFieldNumber++;
-                                }
-                            }
-                        });
-                    } catch (ArrayIndexOutOfBoundsException e) {
-                        Log.w(TAG, "Only " + NotificationField.NotificationFieldId.getAnonymousFieldId().length +
-                                " anonymous notifications are available");
-                    }
-                }
-                // Add notifications
-                intent.putParcelableArrayListExtra(NotificationCopyingService.EXTRA_FIELDS, notificationFields);
-
-                startService(intent);
-            }
-            mEntry.stopToManageFieldReferences();
-        }
-        firstLaunchOfActivity = false;
-    }
-
-    /**
-     * Check and display learning views
-     * Displays the explanation for copying a field and editing an entry
-     */
-    private void checkAndPerformedEducation(Menu menu) {
-        if (PreferencesUtil.isEducationScreensEnabled(this)) {
-
-            if (entryContentsView != null && entryContentsView.isUserNamePresent()
-                    && !PreferencesUtil.isEducationCopyUsernamePerformed(this)) {
-                TapTargetView.showFor(this,
-                        TapTarget.forView(findViewById(R.id.entry_user_name_action_image),
-                                getString(R.string.education_field_copy_title),
-                                getString(R.string.education_field_copy_summary))
-                                .textColorInt(Color.WHITE)
-                                .tintTarget(false)
-                                .cancelable(true),
-                        new TapTargetView.Listener() {
-                            @Override
-                            public void onTargetClick(TapTargetView view) {
-                                super.onTargetClick(view);
-                                clipboardHelper.timeoutCopyToClipboard(mEntry.getUsername(),
-                                        getString(R.string.copy_field, getString(R.string.entry_user_name)));
-                            }
-
-                            @Override
-                            public void onOuterCircleClick(TapTargetView view) {
-                                super.onOuterCircleClick(view);
-                                view.dismiss(false);
-                                // Launch autofill settings
-                                startActivity(new Intent(EntryActivity.this, SettingsAutofillActivity.class));
-                            }
-                        });
-                PreferencesUtil.saveEducationPreference(this,
-                        R.string.education_copy_username_key);
-
-            } else if (!PreferencesUtil.isEducationEntryEditPerformed(this)) {
-
-                try {
-                    TapTargetView.showFor(this,
-                            TapTarget.forToolbarMenuItem(toolbar, R.id.menu_edit,
-                                    getString(R.string.education_entry_edit_title),
-                                    getString(R.string.education_entry_edit_summary))
-                                    .textColorInt(Color.WHITE)
-                                    .tintTarget(true)
-                                    .cancelable(true),
-                            new TapTargetView.Listener() {
-                                @Override
-                                public void onTargetClick(TapTargetView view) {
-                                    super.onTargetClick(view);
-                                    MenuItem editItem = menu.findItem(R.id.menu_edit);
-                                    onOptionsItemSelected(editItem);
-                                }
-
-                                @Override
-                                public void onOuterCircleClick(TapTargetView view) {
-                                    super.onOuterCircleClick(view);
-                                    view.dismiss(false);
-                                    // Open Keepass doc to create field references
-                                    Intent browserIntent = new Intent(Intent.ACTION_VIEW,
-                                            Uri.parse(getString(R.string.field_references_url)));
-                                    startActivity(browserIntent);
-                                }
-                            });
-                    PreferencesUtil.saveEducationPreference(this,
-                            R.string.education_entry_edit_key);
-                } catch (Exception e) {
-                    // If icon not visible
-                    Log.w(TAG, "Can't performed education for entry's edition");
-                }
-            }
-        }
-    }
-
-	protected void fillData() {
-		Database db = App.getDB();
-		PwDatabase pm = db.getPwDatabase();
-
-		mEntry.startToManageFieldReferences(pm);
-
-        // Assign title icon
-        db.getDrawFactory().assignDatabaseIconTo(this, titleIconView, mEntry.getIcon(), iconColor);
-
-		// Assign title text
-        titleView.setText(mEntry.getVisualTitle());
-
-        // Assign basic fields
-        entryContentsView.assignUserName(mEntry.getUsername());
-        entryContentsView.assignUserNameCopyListener(view ->
-                clipboardHelper.timeoutCopyToClipboard(mEntry.getUsername(),
-                getString(R.string.copy_field, getString(R.string.entry_user_name)))
-        );
-
-        boolean allowCopyPassword = PreferencesUtil.allowCopyPasswordAndProtectedFields(this);
-		entryContentsView.assignPassword(mEntry.getPassword(), allowCopyPassword);
-		if (allowCopyPassword) {
-            entryContentsView.assignPasswordCopyListener(view ->
-                    clipboardHelper.timeoutCopyToClipboard(mEntry.getPassword(),
-                            getString(R.string.copy_field, getString(R.string.entry_password)))
-            );
-        } else {
-		    // If dialog not already shown
-            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)) {
-                entryContentsView.assignPasswordCopyListener(v -> {
-                    String message = getString(R.string.allow_copy_password_warning) +
-                            "\n\n" +
-                            getString(R.string.clipboard_warning);
-                    AlertDialog warningDialog = new AlertDialog.Builder(EntryActivity.this)
-                            .setMessage(message).create();
-                    warningDialog.setButton(AlertDialog.BUTTON1, getText(android.R.string.ok),
-                            (dialog, which) -> {
-                                PreferencesUtil.setAllowCopyPasswordAndProtectedFields(EntryActivity.this, true);
-                                dialog.dismiss();
-                                fillData();
-                            });
-                    warningDialog.setButton(AlertDialog.BUTTON2, getText(android.R.string.cancel),
-                            (dialog, which) -> {
-                                PreferencesUtil.setAllowCopyPasswordAndProtectedFields(EntryActivity.this, false);
-                                dialog.dismiss();
-                                fillData();
-                            });
-                    warningDialog.show();
-                });
-            } else {
-                entryContentsView.assignPasswordCopyListener(null);
-            }
-        }
-
-        entryContentsView.assignURL(mEntry.getUrl());
-
-        entryContentsView.setHiddenPasswordStyle(!mShowPassword);
-        entryContentsView.assignComment(mEntry.getNotes());
-
-        // Assign custom fields
-		if (mEntry.allowExtraFields()) {
-			entryContentsView.clearExtraFields();
-
-			mEntry.getFields().doActionToAllCustomProtectedField((label, value) -> {
-			        boolean showAction = (!value.isProtected() || PreferencesUtil.allowCopyPasswordAndProtectedFields(EntryActivity.this));
-                    entryContentsView.addExtraField(label, value, showAction, view ->
-                        clipboardHelper.timeoutCopyToClipboard(
-                                value.toString(),
-                                getString(R.string.copy_field, label)
-                        )
-                    );
-            });
-		}
-
-        // Assign dates
-        entryContentsView.assignCreationDate(mEntry.getCreationTime().getDate());
-        entryContentsView.assignModificationDate(mEntry.getLastModificationTime().getDate());
-        entryContentsView.assignLastAccessDate(mEntry.getLastAccessTime().getDate());
-		Date expires = mEntry.getExpiryTime().getDate();
-		if ( mEntry.isExpires() ) {
-			entryContentsView.assignExpiresDate(expires);
-		} else {
-            entryContentsView.assignExpiresDate(getString(R.string.never));
-		}
-
-        mEntry.stopToManageFieldReferences();
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE:
-                fillData();
-                break;
-        }
-	}
-
-	private void changeShowPasswordIcon(MenuItem togglePassword) {
-		if ( mShowPassword ) {
-			togglePassword.setTitle(R.string.menu_hide_password);
-			togglePassword.setIcon(R.drawable.ic_visibility_off_white_24dp);
-		} else {
-			togglePassword.setTitle(R.string.menu_showpass);
-			togglePassword.setIcon(R.drawable.ic_visibility_white_24dp);
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		
-		MenuInflater inflater = getMenuInflater();
-        MenuUtil.contributionMenuInflater(inflater, menu);
-		inflater.inflate(R.menu.entry, menu);
-		inflater.inflate(R.menu.database_lock, menu);
-
-        if (readOnly) {
-            MenuItem edit =  menu.findItem(R.id.menu_edit);
-            if (edit != null)
-                edit.setVisible(false);
-        }
-
-		MenuItem togglePassword = menu.findItem(R.id.menu_toggle_pass);
-		if (entryContentsView != null && togglePassword != null) {
-            if (entryContentsView.isPasswordPresent() || entryContentsView.atLeastOneFieldProtectedPresent()) {
-                changeShowPasswordIcon(togglePassword);
-            } else {
-                togglePassword.setVisible(false);
-            }
-        }
-		
-		MenuItem gotoUrl = menu.findItem(R.id.menu_goto_url);
-		if (gotoUrl != null) {
-            // In API >= 11 onCreateOptionsMenu may be called before onCreate completes
-            // so mEntry may not be set
-            if (mEntry == null) {
-                gotoUrl.setVisible(false);
-            } else {
-                String url = mEntry.getUrl();
-                if (EmptyUtils.isNullOrEmpty(url)) {
-                    // disable button if url is not available
-                    gotoUrl.setVisible(false);
-                }
-            }
-        }
-
-        // Show education views
-        new Handler().post(() -> checkAndPerformedEducation(menu));
-		
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch ( item.getItemId() ) {
-            case R.id.menu_contribute:
-                return MenuUtil.onContributionItemSelected(this);
-
-            case R.id.menu_toggle_pass:
-                mShowPassword = !mShowPassword;
-                changeShowPasswordIcon(item);
-                entryContentsView.setHiddenPasswordStyle(!mShowPassword);
-                return true;
-
-            case R.id.menu_edit:
-                EntryEditActivity.launch(EntryActivity.this, mEntry);
-                return true;
-			
-            case R.id.menu_goto_url:
-                String url;
-                url = mEntry.getUrl();
-
-                // Default http:// if no protocol specified
-                if ( ! url.contains("://") ) {
-                    url = "http://" + url;
-                }
-
-                try {
-                    Util.gotoUrl(this, url);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(this, R.string.no_url_handler, Toast.LENGTH_LONG).show();
-                }
-                return true;
-			
-            case R.id.menu_lock:
-                lockAndExit();
-                return true;
-
-            case android.R.id.home :
-                finish(); // close this activity and return to preview activity (if there is any)
-        }
-
-		return super.onOptionsItemSelected(item);
-	}
-
-
-    @Override
-    public void finish() {
-        // Transit data in previous Activity after an update
-		/*
-		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();
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -0,0 +1,541 @@
+/*
+ * 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.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.os.Handler
+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.database.element.Database
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.education.EntryActivityEducation
+import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.magikeyboard.MagikIME
+import com.kunzisoft.keepass.model.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.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() {
+
+    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 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 iconColor: Int = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_entry)
+
+        toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        mDatabase = Database.getInstance()
+        mReadOnly = mDatabase!!.isReadOnly || mReadOnly
+
+        mShowPassword = !PreferencesUtil.isPasswordMask(this)
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+        iconColor = taIconColor.getColor(0, Color.BLACK)
+        taIconColor.recycle()
+
+        // Refresh Menu contents in case onCreateMenuOptions was called before mEntry was set
+        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)
+        }
+    }
+
+    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
+            }
+        } catch (e: ClassCastException) {
+            Log.e(TAG, "Unable to retrieve the entry key")
+        }
+
+        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, mEntryHistoryPosition)
+        mEntryHistoryPosition = historyPosition
+        if (historyPosition >= 0) {
+            mIsHistory = true
+            mEntry = mEntry?.getHistory()?.get(historyPosition)
+        }
+
+        if (mEntry == null) {
+            Toast.makeText(this, R.string.entry_not_found, Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        // Update last access time.
+        mEntry?.touch(modified = false, touchParents = false)
+
+        mEntry?.let { entry ->
+            // Fill data in resume to update from EntryEditActivity
+            fillEntryDataInContentsView(entry)
+            // Refresh Menu
+            invalidateOptionsMenu()
+
+            val entryInfo = entry.getEntryInfo(Database.getInstance())
+
+            // Manage entry copy to start notification if allowed
+            if (mFirstLaunchOfActivity) {
+                // Manage entry to launch copying notification if allowed
+                ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
+                // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
+                if (PreferencesUtil.isKeyboardEntrySelectionEnable(this)) {
+                    MagikIME.addEntryAndLaunchNotificationIfAllowed(this, entryInfo)
+                }
+            }
+        }
+
+        mAttachmentFileBinderManager?.apply {
+            registerProgressTask()
+            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
+                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
+                    entryContentsView?.putAttachment(entryAttachmentState)
+                }
+            }
+        }
+
+        mFirstLaunchOfActivity = false
+    }
+
+    override fun onPause() {
+        mAttachmentFileBinderManager?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
+    private fun fillEntryDataInContentsView(entry: Entry) {
+
+        val database = Database.getInstance()
+        database.startManageEntry(entry)
+        // Assign title icon
+        titleIconView?.assignDatabaseIcon(database.drawFactory, entry.icon, iconColor)
+
+        // Assign title text
+        val entryTitle = entry.title
+        collapsingToolbarLayout?.title = entryTitle
+        toolbar?.title = entryTitle
+
+        // Assign basic fields
+        entryContentsView?.assignUserName(entry.username) {
+            database.startManageEntry(entry)
+            clipboardHelper?.timeoutCopyToClipboard(entry.username,
+                    getString(R.string.copy_field,
+                            getString(R.string.entry_user_name)))
+            database.stopManageEntry(entry)
+        }
+
+        val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
+                PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)
+        val allowCopyPasswordAndProtectedFields =
+                PreferencesUtil.allowCopyPasswordAndProtectedFields(this)
+
+        val showWarningClipboardDialogOnClickListener = View.OnClickListener {
+            AlertDialog.Builder(this@EntryActivity)
+                    .setMessage(getString(R.string.allow_copy_password_warning) +
+                            "\n\n" +
+                            getString(R.string.clipboard_warning))
+                    .create().apply {
+                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
+                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, true)
+                            dialog.dismiss()
+                            fillEntryDataInContentsView(entry)
+                        }
+                        setButton(AlertDialog.BUTTON_NEGATIVE, getText(R.string.disable)) { dialog, _ ->
+                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, false)
+                            dialog.dismiss()
+                            fillEntryDataInContentsView(entry)
+                        }
+                        show()
+                    }
+        }
+
+        val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
+            View.OnClickListener {
+                database.startManageEntry(entry)
+                clipboardHelper?.timeoutCopyToClipboard(entry.password,
+                        getString(R.string.copy_field,
+                                getString(R.string.entry_password)))
+                database.stopManageEntry(entry)
+            }
+        } else {
+            // If dialog not already shown
+            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                showWarningClipboardDialogOnClickListener
+            } else {
+                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)
+
+        // Assign custom fields
+        if (mDatabase?.allowEntryCustomFields() == true) {
+            entryContentsView?.clearExtraFields()
+            entry.getExtraFields().forEach { field ->
+                val label = field.name
+                val value = field.protectedValue
+                val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
+                if (allowCopyProtectedField) {
+                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
+                        clipboardHelper?.timeoutCopyToClipboard(
+                                value.toString(),
+                                getString(R.string.copy_field, label)
+                        )
+                    }
+                } else {
+                    // If dialog not already shown
+                    if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+                    } else {
+                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
+                    }
+                }
+            }
+        }
+        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
+                }
+            }
+        }
+
+        // Assign dates
+        entryContentsView?.assignCreationDate(entry.creationTime)
+        entryContentsView?.assignModificationDate(entry.lastModificationTime)
+        entryContentsView?.assignLastAccessDate(entry.lastAccessTime)
+        entryContentsView?.setExpires(entry.isCurrentlyExpires)
+        if (entry.expires) {
+            entryContentsView?.assignExpiresDate(entry.expiryTime)
+        } else {
+            entryContentsView?.assignExpiresDate(getString(R.string.never))
+        }
+
+        // Manage history
+        historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
+        if (mIsHistory) {
+            val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+            collapsingToolbarLayout?.contentScrim = ColorDrawable(taColorAccent.getColor(0, Color.BLACK))
+            taColorAccent.recycle()
+        }
+        entryContentsView?.assignHistory(entry.getHistory()) { historyItem, position ->
+            launch(this, historyItem, mReadOnly, 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
+                mEntry?.let {
+                    fillEntryDataInContentsView(it)
+                }
+        }
+
+        onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
+            if (createdFileUri != null) {
+                mAttachmentsToDownload[requestCode]?.let { attachmentToDownload ->
+                    mAttachmentFileBinderManager
+                            ?.startDownloadAttachment(createdFileUri, attachmentToDownload)
+                }
+            }
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        super.onCreateOptionsMenu(menu)
+
+        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
+            menu.findItem(R.id.menu_edit)?.isVisible = false
+        }
+
+        val gotoUrl = menu.findItem(R.id.menu_goto_url)
+        gotoUrl?.apply {
+            // In API >= 11 onCreateOptionsMenu may be called before onCreate completes
+            // so mEntry may not be set
+            if (mEntry == null) {
+                isVisible = false
+            } else {
+                if (mEntry?.url?.isEmpty() != false) {
+                    // disable button if url is not available
+                    isVisible = false
+                }
+            }
+        }
+
+        // Show education views
+        Handler().post { performedNextEducation(EntryActivityEducation(this), menu) }
+
+        return true
+    }
+
+    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
+                                       menu: Menu) {
+        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
+        val entryCopyEducationPerformed = entryFieldCopyView != null
+                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
+                        entryFieldCopyView,
+                        {
+                            val appNameString = getString(R.string.app_name)
+                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
+                                    getString(R.string.copy_field, appNameString))
+                        },
+                        {
+                            performedNextEducation(entryActivityEducation, menu)
+                        })
+
+        if (!entryCopyEducationPerformed) {
+            val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
+            // entryEditEducationPerformed
+            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
+                    menuEditView,
+                    {
+                        onOptionsItemSelected(menu.findItem(R.id.menu_edit))
+                    },
+                    {
+                        performedNextEducation(entryActivityEducation, menu)
+                    }
+            )
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.menu_contribute -> {
+                MenuUtil.onContributionItemSelected(this)
+                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 ?: ""
+
+                // Default http:// if no protocol specified
+                if (!url.contains("://")) {
+                    url = "http://$url"
+                }
+
+                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)
+            }
+            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)
+        }
+        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) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
+                val intent = Intent(activity, EntryActivity::class.java)
+                intent.putExtra(KEY_ENTRY, entry.nodeId)
+                ReadOnlyHelper.putReadOnlyInIntent(intent, readOnly)
+                if (historyPosition != null)
+                    intent.putExtra(KEY_ENTRY_HISTORY_POSITION, historyPosition)
+                activity.startActivityForResult(intent, EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
@@ -1,590 +0,0 @@
-/*
- * 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;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.Toast;
-
-import com.getkeepsafe.taptargetview.TapTarget;
-import com.getkeepsafe.taptargetview.TapTargetView;
-import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.app.App;
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.PwDate;
-import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass.database.PwGroup;
-import com.kunzisoft.keepass.database.PwGroupId;
-import com.kunzisoft.keepass.database.PwIconStandard;
-import com.kunzisoft.keepass.database.PwNode;
-import com.kunzisoft.keepass.database.action.RunnableOnFinish;
-import com.kunzisoft.keepass.database.action.node.AddEntryRunnable;
-import com.kunzisoft.keepass.database.action.node.AfterActionNodeOnFinish;
-import com.kunzisoft.keepass.database.action.node.UpdateEntryRunnable;
-import com.kunzisoft.keepass.database.security.ProtectedString;
-import com.kunzisoft.keepass.dialogs.GeneratePasswordDialogFragment;
-import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment;
-import com.kunzisoft.keepass.lock.LockingActivity;
-import com.kunzisoft.keepass.lock.LockingHideActivity;
-import com.kunzisoft.keepass.settings.PreferencesUtil;
-import com.kunzisoft.keepass.tasks.SaveDatabaseProgressTaskDialogFragment;
-import com.kunzisoft.keepass.tasks.UpdateProgressTaskStatus;
-import com.kunzisoft.keepass.utils.MenuUtil;
-import com.kunzisoft.keepass.utils.Types;
-import com.kunzisoft.keepass.utils.Util;
-import com.kunzisoft.keepass.view.EntryEditCustomField;
-
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-import static com.kunzisoft.keepass.dialogs.IconPickerDialogFragment.KEY_ICON_STANDARD;
-
-public class EntryEditActivity extends LockingHideActivity
-		implements IconPickerDialogFragment.IconPickerListener,
-        GeneratePasswordDialogFragment.GeneratePasswordListener {
-
-    private static final String TAG = EntryEditActivity.class.getName();
-
-    // Keys for current Activity
-	public static final String KEY_ENTRY = "entry";
-	public static final String KEY_PARENT = "parent";
-
-	// Keys for callback
-	public static final int ADD_ENTRY_RESULT_CODE = 31;
-	public static final int UPDATE_ENTRY_RESULT_CODE = 32;
-	public static final int ADD_OR_UPDATE_ENTRY_REQUEST_CODE = 7129;
-	public static final String ADD_OR_UPDATE_ENTRY_KEY = "ADD_OR_UPDATE_ENTRY_KEY";
-
-	private Database database;
-
-	protected PwEntry mEntry;
-	protected PwEntry mCallbackNewEntry;
-	protected boolean mIsNew;
-	protected PwIconStandard mSelectedIconStandard;
-
-    // Views
-    private ScrollView scrollView;
-    private EditText entryTitleView;
-    private ImageView entryIconView;
-    private EditText entryUserNameView;
-    private EditText entryUrlView;
-    private EditText entryPasswordView;
-    private EditText entryConfirmationPasswordView;
-    private View generatePasswordView;
-    private EditText entryCommentView;
-    private ViewGroup entryExtraFieldsContainer;
-    private View addNewFieldView;
-    private View saveView;
-    private int iconColor;
-
-	/**
-	 * Launch EntryEditActivity to update an existing entry
-     *
-	 * @param act from activity
-	 * @param pw Entry to update
-	 */
-	public static void launch(Activity act, PwEntry pw) {
-        if (LockingActivity.checkTimeIsAllowedOrFinish(act)) {
-            Intent intent = new Intent(act, EntryEditActivity.class);
-            intent.putExtra(KEY_ENTRY, Types.UUIDtoBytes(pw.getUUID()));
-            act.startActivityForResult(intent, ADD_OR_UPDATE_ENTRY_REQUEST_CODE);
-        }
-	}
-
-	/**
-	 * Launch EntryEditActivity to add a new entry
-     *
-	 * @param act from activity
-	 * @param pwGroup Group who will contains new entry
-	 */
-	public static void launch(Activity act, PwGroup pwGroup) {
-        if (LockingActivity.checkTimeIsAllowedOrFinish(act)) {
-            Intent intent = new Intent(act, EntryEditActivity.class);
-            intent.putExtra(KEY_PARENT, pwGroup.getId());
-            act.startActivityForResult(intent, ADD_OR_UPDATE_ENTRY_REQUEST_CODE);
-        }
-	}
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.entry_edit);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        assert getSupportActionBar() != null;
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
-
-        scrollView = findViewById(R.id.entry_scroll);
-        scrollView.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
-
-        entryTitleView = findViewById(R.id.entry_title);
-        entryIconView = findViewById(R.id.icon_button);
-        entryUserNameView = findViewById(R.id.entry_user_name);
-        entryUrlView = findViewById(R.id.entry_url);
-        entryPasswordView = findViewById(R.id.entry_password);
-        entryConfirmationPasswordView = findViewById(R.id.entry_confpassword);
-        entryCommentView = findViewById(R.id.entry_comment);
-        entryExtraFieldsContainer = findViewById(R.id.advanced_container);
-		
-		// Likely the app has been killed exit the activity
-        database = App.getDB();
-		if ( ! database.getLoaded() ) {
-			finish();
-			return;
-		}
-
-		Intent intent = getIntent();
-		byte[] uuidBytes = intent.getByteArrayExtra(KEY_ENTRY);
-
-        // Retrieve the textColor to tint the icon
-        int[] attrs = {android.R.attr.textColorPrimary};
-        TypedArray ta = getTheme().obtainStyledAttributes(attrs);
-        iconColor = ta.getColor(0, Color.WHITE);
-
-        mSelectedIconStandard = database.getPwDatabase().getIconFactory().getUnknownIcon();
-
-		PwDatabase pm = database.getPwDatabase();
-		if ( uuidBytes == null ) {
-            PwGroupId parentId = intent.getParcelableExtra(KEY_PARENT);
-			PwGroup parent = pm.getGroupByGroupId(parentId);
-			mEntry = database.createEntry(parent);
-			mIsNew = true;
-			// Add the default icon
-            database.getDrawFactory().assignDefaultDatabaseIconTo(this, entryIconView, iconColor);
-		} else {
-			UUID uuid = Types.bytestoUUID(uuidBytes);
-			mEntry = pm.getEntryByUUIDId(uuid);
-			mIsNew = false;
-			fillData();
-		}
-
-        // Assign title
-        setTitle((mIsNew) ? getString(R.string.add_entry) : getString(R.string.edit_entry));
-
-		// Retrieve the icon after an orientation change
-		if (savedInstanceState != null
-                && savedInstanceState.containsKey(KEY_ICON_STANDARD)) {
-            iconPicked(savedInstanceState);
-        }
-
-		// Add listener to the icon
-        entryIconView.setOnClickListener(v ->
-                IconPickerDialogFragment.launch(EntryEditActivity.this));
-
-		// Generate password button
-        generatePasswordView = findViewById(R.id.generate_button);
-        generatePasswordView.setOnClickListener(v -> openPasswordGenerator());
-		
-		// Save button
-		saveView = findViewById(R.id.entry_save);
-        saveView.setOnClickListener(v -> saveEntry());
-
-
-		if (mEntry.allowExtraFields()) {
-            addNewFieldView = findViewById(R.id.add_new_field);
-            addNewFieldView.setVisibility(View.VISIBLE);
-            addNewFieldView.setOnClickListener(v -> addNewCustomField());
-        }
-
-        // Verify the education views
-        checkAndPerformedEducation();
-	}
-
-    /**
-     * Open the password generator fragment
-     */
-	private void openPasswordGenerator() {
-        GeneratePasswordDialogFragment generatePasswordDialogFragment = new GeneratePasswordDialogFragment();
-        generatePasswordDialogFragment.show(getSupportFragmentManager(), "PasswordGeneratorFragment");
-    }
-
-    /**
-     * Add a new view to fill in the information of the customized field
-     */
-    private void addNewCustomField() {
-        EntryEditCustomField entryEditCustomField = new EntryEditCustomField(EntryEditActivity.this);
-        entryEditCustomField.setData("", new ProtectedString(false, ""));
-        boolean visibilityFontActivated = PreferencesUtil.fieldFontIsInVisibility(this);
-        entryEditCustomField.setFontVisibility(visibilityFontActivated);
-        entryExtraFieldsContainer.addView(entryEditCustomField);
-
-        // Scroll bottom
-        scrollView.post(() -> scrollView.fullScroll(ScrollView.FOCUS_DOWN));
-    }
-
-    /**
-     * Saves the new entry or update an existing entry in the database
-     */
-    private void saveEntry() {
-        if (!validateBeforeSaving()) {
-            return;
-        }
-        mCallbackNewEntry = populateNewEntry();
-
-        // Open a progress dialog and save entry
-        AfterActionNodeOnFinish onFinish = new AfterSave();
-        EntryEditActivity act = EntryEditActivity.this;
-        RunnableOnFinish task;
-        if ( mIsNew ) {
-            task = new AddEntryRunnable(act, database, mCallbackNewEntry, onFinish);
-        } else {
-            task = new UpdateEntryRunnable(act, database, mEntry, mCallbackNewEntry, onFinish);
-        }
-        task.setUpdateProgressTaskStatus(
-                new UpdateProgressTaskStatus(this,
-                        SaveDatabaseProgressTaskDialogFragment.start(
-                                getSupportFragmentManager())
-                ));
-        new Thread(task).start();
-    }
-
-    /**
-     * Check and display learning views
-     * Displays the explanation for the icon selection, the password generator and for a new field
-     */
-    private void checkAndPerformedEducation() {
-        if (PreferencesUtil.isEducationScreensEnabled(this)) {
-            // TODO Show icon
-
-            if (!PreferencesUtil.isEducationPasswordGeneratorPerformed(this)) {
-                TapTargetView.showFor(this,
-                        TapTarget.forView(generatePasswordView,
-                                getString(R.string.education_generate_password_title),
-                                getString(R.string.education_generate_password_summary))
-                                .textColorInt(Color.WHITE)
-                                .tintTarget(false)
-                                .cancelable(true),
-                        new TapTargetView.Listener() {
-                            @Override
-                            public void onTargetClick(TapTargetView view) {
-                                super.onTargetClick(view);
-                                openPasswordGenerator();
-                            }
-
-                            @Override
-                            public void onOuterCircleClick(TapTargetView view) {
-                                super.onOuterCircleClick(view);
-                                view.dismiss(false);
-                            }
-                        });
-                PreferencesUtil.saveEducationPreference(this,
-                        R.string.education_password_generator_key);
-            } else if (mEntry.allowExtraFields()
-                    && !mEntry.containsCustomFields()
-                    && !PreferencesUtil.isEducationEntryNewFieldPerformed(this)) {
-                TapTargetView.showFor(this,
-                        TapTarget.forView(addNewFieldView,
-                                getString(R.string.education_entry_new_field_title),
-                                getString(R.string.education_entry_new_field_summary))
-                                .textColorInt(Color.WHITE)
-                                .tintTarget(false)
-                                .cancelable(true),
-                        new TapTargetView.Listener() {
-                            @Override
-                            public void onTargetClick(TapTargetView view) {
-                                super.onTargetClick(view);
-                                addNewCustomField();
-                            }
-
-                            @Override
-                            public void onOuterCircleClick(TapTargetView view) {
-                                super.onOuterCircleClick(view);
-                                view.dismiss(false);
-                            }
-                        });
-                PreferencesUtil.saveEducationPreference(this,
-                        R.string.education_entry_new_field_key);
-            }
-        }
-    }
-
-    /**
-     * Utility class to retrieve a validation or an error with a message
-     */
-    private class ErrorValidation {
-        static final int unknownMessage = -1;
-
-        boolean isValidate = false;
-        int messageId = unknownMessage;
-
-        void showValidationErrorIfNeeded() {
-            if (!isValidate && messageId != unknownMessage)
-                Toast.makeText(EntryEditActivity.this, messageId, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    /**
-     * Validate or not the entry form
-     *
-     * @return ErrorValidation An error with a message or a validation without message
-     */
-    protected ErrorValidation validate() {
-        ErrorValidation errorValidation = new ErrorValidation();
-
-        // Require title
-        String title = entryTitleView.getText().toString();
-        if ( title.length() == 0 ) {
-            errorValidation.messageId = R.string.error_title_required;
-            return errorValidation;
-        }
-
-        // Validate password
-        String pass = entryPasswordView.getText().toString();
-        String conf = entryConfirmationPasswordView.getText().toString();
-        if ( ! pass.equals(conf) ) {
-            errorValidation.messageId = R.string.error_pass_match;
-            return errorValidation;
-        }
-
-        // Validate extra fields
-        if (mEntry.allowExtraFields()) {
-            for (int i = 0; i < entryExtraFieldsContainer.getChildCount(); i++) {
-                EntryEditCustomField entryEditCustomField = (EntryEditCustomField) entryExtraFieldsContainer.getChildAt(i);
-                String key = entryEditCustomField.getLabel();
-                if (key == null || key.length() == 0) {
-                    errorValidation.messageId = R.string.error_string_key;
-                    return errorValidation;
-                }
-            }
-        }
-
-        errorValidation.isValidate = true;
-        return errorValidation;
-    }
-
-    /**
-     * Launch a validation with {@link #validate()} and show the error if present
-     *
-     * @return true if the form was validate or false if not
-     */
-	protected boolean validateBeforeSaving() {
-        ErrorValidation errorValidation = validate();
-        errorValidation.showValidationErrorIfNeeded();
-        return errorValidation.isValidate;
-	}
-	
-	protected PwEntry populateNewEntry() {
-        PwDatabase db = App.getDB().getPwDatabase();
-
-        PwEntry newEntry = mEntry.clone();
-
-        newEntry.startToManageFieldReferences(db);
-
-        newEntry.createBackup(db);
-
-        newEntry.setLastAccessTime(new PwDate());
-        newEntry.setLastModificationTime(new PwDate());
-
-        newEntry.setTitle(entryTitleView.getText().toString());
-        newEntry.setIconStandard(retrieveIcon());
-
-        newEntry.setUrl(entryUrlView.getText().toString());
-        newEntry.setUsername(entryUserNameView.getText().toString());
-        newEntry.setNotes(entryCommentView.getText().toString());
-        newEntry.setPassword(entryPasswordView.getText().toString());
-
-        if (newEntry.allowExtraFields()) {
-            // Delete all extra strings
-            newEntry.removeAllCustomFields();
-            // Add extra fields from views
-            for (int i = 0; i < entryExtraFieldsContainer.getChildCount(); i++) {
-                EntryEditCustomField view = (EntryEditCustomField) entryExtraFieldsContainer.getChildAt(i);
-                String key = view.getLabel();
-                String value = view.getValue();
-                boolean protect = view.isProtected();
-                newEntry.addExtraField(key, new ProtectedString(protect, value));
-            }
-        }
-
-        newEntry.stopToManageFieldReferences();
-
-        return newEntry;
-	}
-
-    /**
-     * Retrieve the icon by the selection, or the first icon in the list if the entry is new or the last one
-     */
-	private PwIconStandard retrieveIcon() {
-
-        if (!mSelectedIconStandard.isUnknown())
-            return mSelectedIconStandard;
-        else {
-            if (mIsNew) {
-                return database.getPwDatabase().getIconFactory().getKeyIcon();
-            }
-            else {
-                // Keep previous icon, if no new one was selected
-                return mEntry.getIconStandard();
-            }
-        }
-    }
-
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		
-		MenuInflater inflater = getMenuInflater();
-		MenuUtil.contributionMenuInflater(inflater, menu);
-		
-		return true;
-	}
-	
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch ( item.getItemId() ) {
-			case R.id.menu_contribute:
-				return MenuUtil.onContributionItemSelected(this);
-
-			case android.R.id.home:
-				finish();
-		}
-		
-		return super.onOptionsItemSelected(item);
-	}
-
-	private void assignIconView() {
-        database.getDrawFactory()
-                .assignDatabaseIconTo(
-                        this,
-                        entryIconView,
-                        mEntry.getIcon(),
-                        iconColor);
-    }
-
-	protected void fillData() {
-
-        assignIconView();
-
-		// Don't start the field reference manager, we want to see the raw ref
-        mEntry.stopToManageFieldReferences();
-
-        entryTitleView.setText(mEntry.getTitle());
-        entryUserNameView.setText(mEntry.getUsername());
-        entryUrlView.setText(mEntry.getUrl());
-        String password = mEntry.getPassword();
-        entryPasswordView.setText(password);
-        entryConfirmationPasswordView.setText(password);
-        entryCommentView.setText(mEntry.getNotes());
-
-        boolean visibilityFontActivated = PreferencesUtil.fieldFontIsInVisibility(this);
-        if (visibilityFontActivated) {
-            Util.applyFontVisibilityTo(this, entryUserNameView);
-            Util.applyFontVisibilityTo(this, entryPasswordView);
-            Util.applyFontVisibilityTo(this, entryConfirmationPasswordView);
-            Util.applyFontVisibilityTo(this, entryCommentView);
-        }
-
-		if (mEntry.allowExtraFields()) {
-            LinearLayout container = findViewById(R.id.advanced_container);
-            mEntry.getFields().doActionToAllCustomProtectedField((key, value) -> {
-                EntryEditCustomField entryEditCustomField = new EntryEditCustomField(EntryEditActivity.this);
-                entryEditCustomField.setData(key, value);
-                entryEditCustomField.setFontVisibility(visibilityFontActivated);
-                container.addView(entryEditCustomField);
-            });
-        }
-	}
-
-    @Override
-    public void iconPicked(Bundle bundle) {
-        mSelectedIconStandard = bundle.getParcelable(KEY_ICON_STANDARD);
-        mEntry.setIconStandard(mSelectedIconStandard);
-        assignIconView();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        if (!mSelectedIconStandard.isUnknown()) {
-            outState.putParcelable(KEY_ICON_STANDARD, mSelectedIconStandard);
-            super.onSaveInstanceState(outState);
-        }
-    }
-
-    @Override
-    public void acceptPassword(Bundle bundle) {
-        String generatedPassword = bundle.getString(GeneratePasswordDialogFragment.KEY_PASSWORD_ID);
-        entryPasswordView.setText(generatedPassword);
-        entryConfirmationPasswordView.setText(generatedPassword);
-
-        checkAndPerformedEducation();
-    }
-
-    @Override
-    public void cancelPassword(Bundle bundle) {
-        // Do nothing here
-    }
-
-	@Override
-	public void finish() {
-	    // Assign entry callback as a result in all case
-        try {
-            if (mCallbackNewEntry != null) {
-                Bundle bundle = new Bundle();
-                Intent intentEntry = new Intent();
-                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, mCallbackNewEntry);
-                intentEntry.putExtras(bundle);
-                if (mIsNew) {
-                    setResult(ADD_ENTRY_RESULT_CODE, intentEntry);
-                } else {
-                    setResult(UPDATE_ENTRY_RESULT_CODE, intentEntry);
-                }
-            }
-            super.finish();
-        } catch (Exception e) {
-            // Exception when parcelable can't be done
-            Log.e(TAG, "Cant add entry as result", e);
-        }
-	}
-
-	private final class AfterSave extends AfterActionNodeOnFinish {
-
-		@Override
-        public void run(@Nullable PwNode oldNode, @Nullable PwNode newNode) {
-		    runOnUiThread(() -> {
-                if ( mSuccess ) {
-                    finish();
-                } else {
-                    displayMessage(EntryEditActivity.this);
-                }
-
-                SaveDatabaseProgressTaskDialogFragment.stop(EntryEditActivity.this);
-            });
-		}
-    }
-
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -0,0 +1,750 @@
+/*
+ * 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.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.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 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.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.view.asError
+import com.kunzisoft.keepass.view.showActionError
+import com.kunzisoft.keepass.view.updateLockPaddingLeft
+import org.joda.time.DateTime
+import java.util.*
+import kotlin.collections.ArrayList
+
+class EntryEditActivity : LockingActivity(),
+        IconPickerDialogFragment.IconPickerListener,
+        EntryCustomFieldDialogFragment.EntryCustomFieldListener,
+        GeneratePasswordDialogFragment.GeneratePasswordListener,
+        SetOTPDialogFragment.CreateOtpListener,
+        DatePickerDialog.OnDateSetListener,
+        TimePickerDialog.OnTimeSetListener,
+        FileTooBigDialogFragment.ActionChooseListener,
+        ReplaceFileDialogFragment.ActionChooseListener {
+
+    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 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
+
+    // To manage attachments
+    private var mSelectFileHelper: SelectFileHelper? = null
+    private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
+    private var mAllowMultipleAttachments: Boolean = false
+    private var mTempAttachments = ArrayList<Attachment>()
+
+    // Education
+    private var entryEditActivityEducation: EntryEditActivityEducation? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_entry_edit)
+
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
+        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()
+        }
+
+        // Focus view to reinitialize timeout
+        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
+
+        stopService(Intent(this, ClipboardEntryNotificationService::class.java))
+        stopService(Intent(this, KeyboardEntryNotificationService::class.java))
+
+        // Likely the app has been killed exit the activity
+        mDatabase = Database.getInstance()
+
+        var tempEntryInfo: EntryInfo? = null
+
+        // Entry is retrieve, it's an entry to update
+        intent.getParcelableExtra<NodeId<UUID>>(KEY_ENTRY)?.let {
+            mIsNew = false
+            // Create an Entry copy to modify from the database entry
+            mEntry = mDatabase?.getEntryById(it)
+
+            // Retrieve the parent
+            mEntry?.let { entry ->
+                mParent = entry.parent
+                // If no parent, add root group as parent
+                if (mParent == null) {
+                    mParent = mDatabase?.rootGroup
+                    entry.parent = mParent
+                }
+            }
+            tempEntryInfo = mEntry?.getEntryInfo(mDatabase, true)
+        }
+
+        // Parent is retrieve, it's a new entry to create
+        intent.getParcelableExtra<NodeId<*>>(KEY_PARENT)?.let {
+            mIsNew = true
+            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)
+            }
+        }
+
+        // Retrieve temp attachments in case of deletion
+        if (savedInstanceState?.containsKey(TEMP_ATTACHMENTS) == true) {
+            mTempAttachments = savedInstanceState.getParcelableArrayList(TEMP_ATTACHMENTS) ?: mTempAttachments
+        }
+
+        // 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)
+
+            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)
+
+        // Save button
+        validateButton = findViewById(R.id.entry_edit_validate)
+        validateButton?.setOnClickListener { saveEntry() }
+
+        // Verify the education views
+        entryEditActivityEducation = EntryEditActivityEducation(this)
+
+        // Create progress dialog
+        mProgressDatabaseTaskProvider?.onActionFinish = { 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 -> {}
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onPause() {
+        mAttachmentFileBinderManager?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
+    /**
+     * Open the password generator fragment
+     */
+    private fun openPasswordGenerator() {
+        GeneratePasswordDialogFragment().show(supportFragmentManager, "PasswordGeneratorFragment")
+    }
+
+    /**
+     * Add a new customized field
+     */
+    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(applicationContext.filesDir, false, 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")
+    }
+
+    /**
+     * 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 ->
+
+                newEntry.setEntryInfo(mDatabase, newEntryInfo)
+                // Build info
+                newEntry.lastAccessTime = DateInstant()
+                newEntry.lastModificationTime = DateInstant()
+
+                // Delete temp attachment if not used
+                mTempAttachments.forEach {
+                    mDatabase?.binaryPool?.let { binaryPool ->
+                        if (!newEntry.getAttachments(binaryPool).contains(it)) {
+                            mDatabase?.removeAttachmentIfNotUsed(it)
+                        }
+                    }
+                }
+
+                // Open a progress dialog and save entry
+                if (mIsNew) {
+                    mParent?.let { parent ->
+                        mProgressDatabaseTaskProvider?.startDatabaseCreateEntry(
+                                newEntry,
+                                parent,
+                                !mReadOnly && mAutoSaveEnable
+                        )
+                    }
+                } else {
+                    mEntry?.let { oldEntry ->
+                        mProgressDatabaseTaskProvider?.startDatabaseUpdateEntry(
+                                oldEntry,
+                                newEntry,
+                                !mReadOnly && mAutoSaveEnable
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    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
+        MenuUtil.contributionMenuInflater(inflater, menu)
+
+        return true
+    }
+
+
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        entryEditActivityEducation?.let {
+            Handler().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
+                    && 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_contribute -> {
+                MenuUtil.onContributionItemSelected(this)
+                return true
+            }
+            android.R.id.home -> {
+                onBackPressed()
+            }
+        }
+
+        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())
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+
+        outState.putParcelableArrayList(TEMP_ATTACHMENTS, mTempAttachments)
+
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun acceptPassword(bundle: Bundle) {
+        bundle.getString(GeneratePasswordDialogFragment.KEY_PASSWORD_ID)?.let {
+            entryEditFragment?.password = it
+        }
+
+        entryEditActivityEducation?.let {
+            Handler().post { performedNextEducation(it) }
+        }
+    }
+
+    override fun cancelPassword(bundle: Bundle) {
+        // 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 ->
+                val bundle = Bundle()
+                val intentEntry = Intent()
+                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, entry)
+                intentEntry.putExtras(bundle)
+                if (mIsNew) {
+                    setResult(ADD_ENTRY_RESULT_CODE, intentEntry)
+                } else {
+                    setResult(UPDATE_ENTRY_RESULT_CODE, intentEntry)
+                }
+            }
+            super.finish()
+        } catch (e: Exception) {
+            // Exception when parcelable can't be done
+            Log.e(TAG, "Cant add entry as result", e)
+        }
+    }
+
+    companion object {
+
+        private val TAG = EntryEditActivity::class.java.name
+
+        // Keys for current Activity
+        const val KEY_ENTRY = "entry"
+        const val KEY_PARENT = "parent"
+
+        // SaveInstanceState
+        const val TEMP_ATTACHMENTS = "TEMP_ATTACHMENTS"
+
+        // Keys for callback
+        const val ADD_ENTRY_RESULT_CODE = 31
+        const val UPDATE_ENTRY_RESULT_CODE = 32
+        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) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
+                val intent = Intent(activity, EntryEditActivity::class.java)
+                intent.putExtra(KEY_ENTRY, pwEntry.nodeId)
+                activity.startActivityForResult(intent, ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
+            }
+        }
+
+        /**
+         * Launch EntryEditActivity to add a new entry
+         *
+         * @param activity from activity
+         * @param pwGroup Group who will contains new entry
+         */
+        fun launch(activity: Activity, pwGroup: Group) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
+                val intent = Intent(activity, EntryEditActivity::class.java)
+                intent.putExtra(KEY_PARENT, pwGroup.nodeId)
+                activity.startActivityForResult(intent, ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
@@ -0,0 +1,535 @@
+/*
+ * 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
+     */
+    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()
+        }
+    }
+
+    fun replaceExtraField(oldExtraField: Field, newExtraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        mExtraFieldsList.removeAt(index)
+        mExtraFieldsList.add(index, newExtraField)
+        extraFieldsListView.removeViewAt(index)
+        extraFieldsListView.addView(buildViewFromField(newExtraField), index)
+    }
+
+    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
@@ -0,0 +1,130 @@
+/*
+ * 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
@@ -0,0 +1,508 @@
+/*
+ * 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.annotation.SuppressLint
+import android.app.Activity
+import android.app.assist.AssistStructure
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+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.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.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.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.view.asError
+import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
+import kotlinx.android.synthetic.main.activity_file_selection.*
+import java.io.FileNotFoundException
+
+class FileDatabaseSelectActivity : SpecialModeActivity(),
+        AssignMasterKeyDialogFragment.AssignPasswordDialogListener {
+
+    // Views
+    private var coordinatorLayout: CoordinatorLayout? = null
+    private var createDatabaseButtonView: View? = null
+    private var openDatabaseButtonView: View? = null
+
+    private val databaseFilesViewModel: DatabaseFilesViewModel by viewModels()
+
+    // Adapter to manage database history list
+    private var mAdapterDatabaseHistory: FileDatabaseHistoryAdapter? = null
+
+    private var mFileDatabaseHistoryAction: FileDatabaseHistoryAction? = null
+
+    private var mDatabaseFileUri: Uri? = null
+
+    private var mSelectFileHelper: SelectFileHelper? = null
+
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(applicationContext)
+
+        setContentView(R.layout.activity_file_selection)
+        coordinatorLayout = findViewById(R.id.activity_file_selection_coordinator_layout)
+
+        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)
+            }
+        }
+
+        // History list
+        val fileDatabaseHistoryRecyclerView = findViewById<RecyclerView>(R.id.file_list)
+        fileDatabaseHistoryRecyclerView.layoutManager = LinearLayoutManager(this, RecyclerView.VERTICAL, false)
+        // Removes blinks
+        (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 ->
+                launchPasswordActivity(
+                        databaseFileUri,
+                        fileDatabaseHistoryEntityToOpen.keyFileUri
+                )
+            }
+        }
+        mAdapterDatabaseHistory?.setOnFileDatabaseHistoryDeleteListener { fileDatabaseHistoryToDelete ->
+            // Remove from app database
+            databaseFilesViewModel.deleteDatabaseFile(fileDatabaseHistoryToDelete)
+            true
+        }
+        mAdapterDatabaseHistory?.setOnSaveAliasListener { fileDatabaseHistoryWithNewAlias ->
+            // Update in app database
+            databaseFilesViewModel.updateDatabaseFile(fileDatabaseHistoryWithNewAlias)
+        }
+        fileDatabaseHistoryRecyclerView.adapter = mAdapterDatabaseHistory
+
+        // Load default database if not an orientation change
+        if (!(savedInstanceState != null
+                        && savedInstanceState.containsKey(EXTRA_STAY)
+                        && savedInstanceState.getBoolean(EXTRA_STAY, false))) {
+            val databasePath = PreferencesUtil.getDefaultDatabasePath(this)
+
+            UriUtil.parse(databasePath)?.let { databaseFileUri ->
+                launchPasswordActivityWithPath(databaseFileUri)
+            } ?: run {
+                Log.i(TAG, "No default database to prepare")
+            }
+        }
+
+        // Retrieve the database URI provided by file manager after an orientation change
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(EXTRA_DATABASE_URI)) {
+            mDatabaseFileUri = savedInstanceState.getParcelable(EXTRA_DATABASE_URI)
+        }
+
+        // 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)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 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")
+    }
+
+    private fun fileNoFoundAction(e: FileNotFoundException) {
+        val error = getString(R.string.file_not_found_content)
+        coordinatorLayout?.let {
+            Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
+        }
+        Log.e(TAG, error, e)
+    }
+
+    private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        EntrySelectionHelper.doEntrySelectionAction(intent,
+                {
+                    try {
+                        PasswordActivity.launch(this@FileDatabaseSelectActivity,
+                                databaseUri, keyFile,
+                                searchInfo)
+                    } catch (e: FileNotFoundException) {
+                        fileNoFoundAction(e)
+                    }
+                    // Remove the search info from intent
+                    if (searchInfo != null) {
+                        finish()
+                    }
+                },
+                {
+                    try {
+                        PasswordActivity.launchForKeyboardResult(this@FileDatabaseSelectActivity,
+                                databaseUri, keyFile,
+                                searchInfo)
+                    } catch (e: FileNotFoundException) {
+                        fileNoFoundAction(e)
+                    }
+                    finish()
+                },
+                { assistStructure ->
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        try {
+                            PasswordActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
+                                    databaseUri, keyFile,
+                                    assistStructure,
+                                    searchInfo)
+                        } catch (e: FileNotFoundException) {
+                            fileNoFoundAction(e)
+                        }
+                    }
+                })
+    }
+
+    private fun launchGroupActivity(readOnly: Boolean) {
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        EntrySelectionHelper.doEntrySelectionAction(intent,
+                {
+                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                            false,
+                            searchInfo,
+                            readOnly)
+                },
+                {
+                    GroupActivity.launchForEntrySelectionResult(this@FileDatabaseSelectActivity,
+                            false,
+                            searchInfo,
+                            readOnly)
+                    // Do not keep history
+                    finish()
+                },
+                { assistStructure ->
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
+                                assistStructure,
+                                false,
+                                searchInfo,
+                                readOnly)
+                    }
+                })
+    }
+
+    private fun launchPasswordActivityWithPath(databaseUri: Uri) {
+        launchPasswordActivity(databaseUri, null)
+        // Delete flickering for kitkat <=
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+            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
+            }
+        }
+
+        val database = Database.getInstance()
+        if (database.loaded) {
+            launchGroupActivity(database.isReadOnly)
+        } else {
+            // Construct adapter with listeners
+            if (PreferencesUtil.showRecentFiles(this)) {
+                databaseFilesViewModel.loadListOfDatabases()
+            } else {
+                mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+                mAdapterDatabaseHistory?.notifyDataSetChanged()
+            }
+
+            // Register progress task
+            mProgressDatabaseTaskProvider?.registerProgressTask()
+        }
+    }
+
+    override fun onPause() {
+        // Unregister progress task
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        // only to keep the current activity
+        outState.putBoolean(EXTRA_STAY, true)
+        // to retrieve the URI of a created database after an orientation change
+        outState.putParcelable(EXTRA_DATABASE_URI, mDatabaseFileUri)
+    }
+
+    override fun onAssignKeyDialogPositiveClick(
+            masterPasswordChecked: Boolean, masterPassword: String?,
+            keyFileChecked: Boolean, keyFile: Uri?) {
+
+        try {
+            mDatabaseFileUri?.let { databaseUri ->
+
+                // Create the new database
+                mProgressDatabaseTaskProvider?.startDatabaseCreate(
+                        databaseUri,
+                        masterPasswordChecked,
+                        masterPassword,
+                        keyFileChecked,
+                        keyFile
+                )
+            }
+        } catch (e: Exception) {
+            val error = getString(R.string.error_create_database_file)
+            Snackbar.make(activity_file_selection_coordinator_layout, error, Snackbar.LENGTH_LONG).asError().show()
+            Log.e(TAG, error, e)
+        }
+    }
+
+    override fun onAssignKeyDialogNegativeClick(
+            masterPasswordChecked: Boolean, masterPassword: String?,
+            keyFileChecked: Boolean, keyFile: Uri?) {
+
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+        }
+
+        mSelectFileHelper?.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 (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)
+            }
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        super.onCreateOptionsMenu(menu)
+
+        if (!mSelectionMode) {
+            MenuUtil.defaultMenuInflater(menuInflater, menu)
+        }
+
+        Handler().post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
+
+        return true
+    }
+
+    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
+        // If no recent files
+        val createDatabaseEducationPerformed =
+                createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
+                && mAdapterDatabaseHistory != null
+                && mAdapterDatabaseHistory!!.itemCount > 0
+                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
+                        createDatabaseButtonView!!,
+                {
+                    createNewFile()
+                },
+                {
+                    // But if the user cancel, it can also select a database
+                    performedNextEducation(fileDatabaseSelectActivityEducation)
+                })
+        if (!createDatabaseEducationPerformed) {
+            // selectDatabaseEducationPerformed
+            openDatabaseButtonView != null
+                    && fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
+                    openDatabaseButtonView!!,
+                    {tapTargetView ->
+                        tapTargetView?.let {
+                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+                        }
+                    },
+                    {}
+            )
+        }
+    }
+
+    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)
+    }
+
+    companion object {
+
+        private const val TAG = "FileDbSelectActivity"
+        private const val EXTRA_STAY = "EXTRA_STAY"
+        private const val EXTRA_DATABASE_URI = "EXTRA_DATABASE_URI"
+
+        /*
+         * -------------------------
+         * Launch only to standard search, else 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)
+        }
+
+        /*
+         * -------------------------
+         * 		Autofill Launch
+         * -------------------------
+         */
+
+        @RequiresApi(api = Build.VERSION_CODES.O)
+        fun launchForAutofillResult(activity: Activity,
+                                    assistStructure: AssistStructure,
+                                    searchInfo: SearchInfo? = null) {
+            AutofillHelper.startActivityForAutofillResult(activity,
+                    Intent(activity, FileDatabaseSelectActivity::class.java),
+                    assistStructure,
+                    searchInfo)
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
--- 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/IntentBuildLauncher.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/IntentBuildLauncher.java
@@ -1,7 +0,0 @@
-package com.kunzisoft.keepass.activities;
-
-import android.content.Intent;
-
-public interface IntentBuildLauncher {
-    void startActivityForResult(Intent intent);
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java
@@ -1,297 +0,0 @@
-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 android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.adapters.NodeAdapter;
-import com.kunzisoft.keepass.app.App;
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.PwGroup;
-import com.kunzisoft.keepass.database.PwNode;
-import com.kunzisoft.keepass.database.SortNodeEnum;
-import com.kunzisoft.keepass.dialogs.SortDialogFragment;
-import com.kunzisoft.keepass.settings.PreferencesUtil;
-import com.kunzisoft.keepass.stylish.StylishFragment;
-
-public class ListNodesFragment extends StylishFragment implements
-        SortDialogFragment.SortSelectionListener {
-
-    private static final String TAG = ListNodesFragment.class.getName();
-
-    private static final String GROUP_KEY = "GROUP_KEY";
-    private static final String IS_SEARCH = "IS_SEARCH";
-
-    private NodeAdapter.NodeClickCallback nodeClickCallback;
-    private NodeAdapter.NodeMenuListener nodeMenuListener;
-    private OnScrollListener onScrollListener;
-
-    private RecyclerView listView;
-    private PwGroup currentGroup;
-    private NodeAdapter mAdapter;
-
-    private View notFoundView;
-    private boolean isASearchResult;
-
-    // Preferences for sorting
-    private SharedPreferences prefs;
-
-    private boolean readOnly;
-
-    public static ListNodesFragment newInstance(PwGroup group, boolean readOnly, boolean isASearch) {
-        Bundle bundle = new Bundle();
-        if (group != null) {
-            bundle.putParcelable(GROUP_KEY, group);
-        }
-        bundle.putBoolean(IS_SEARCH, isASearch);
-        ReadOnlyHelper.putReadOnlyInBundle(bundle, readOnly);
-        ListNodesFragment listNodesFragment = new ListNodesFragment();
-        listNodesFragment.setArguments(bundle);
-        return listNodesFragment;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            nodeClickCallback = (NodeAdapter.NodeClickCallback) context;
-        } catch (ClassCastException e) {
-            // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(context.toString()
-                    + " must implement " + NodeAdapter.NodeClickCallback.class.getName());
-        }
-        try {
-            nodeMenuListener = (NodeAdapter.NodeMenuListener) context;
-        } catch (ClassCastException e) {
-            nodeMenuListener = null;
-            // Context menu can be omit
-            Log.w(TAG, context.toString()
-                    + " must implement " + NodeAdapter.NodeMenuListener.class.getName());
-        }
-        try {
-            onScrollListener = (OnScrollListener) context;
-        } catch (ClassCastException e) {
-            onScrollListener = null;
-            // Context menu can be omit
-            Log.w(TAG, context.toString()
-                    + " must implement " + RecyclerView.OnScrollListener.class.getName());
-        }
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if ( getActivity() != null ) {
-            setHasOptionsMenu(true);
-
-            readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState, getArguments());
-
-            if (getArguments() != null) {
-                // Contains all the group in element
-                if (getArguments().containsKey(GROUP_KEY)) {
-                    currentGroup = getArguments().getParcelable(GROUP_KEY);
-                }
-
-                if (getArguments().containsKey(IS_SEARCH)) {
-                    isASearchResult = getArguments().getBoolean(IS_SEARCH);
-                }
-            }
-
-            mAdapter = new NodeAdapter(getContextThemed(), getActivity().getMenuInflater());
-            mAdapter.setReadOnly(readOnly);
-            mAdapter.setIsASearchResult(isASearchResult);
-            mAdapter.setOnNodeClickListener(nodeClickCallback);
-
-            if (nodeMenuListener != null) {
-                mAdapter.setActivateContextMenu(true);
-                mAdapter.setNodeMenuListener(nodeMenuListener);
-            }
-            prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        ReadOnlyHelper.onSaveInstanceState(outState, readOnly);
-        super.onSaveInstanceState(outState);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-
-        // To apply theme
-        View rootView = inflater.cloneInContext(getContextThemed())
-                .inflate(R.layout.list_nodes_fragment, container, false);
-        listView = rootView.findViewById(R.id.nodes_list);
-        notFoundView = rootView.findViewById(R.id.not_found_container);
-
-        if (onScrollListener != null) {
-            listView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-                @Override
-                public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                    super.onScrolled(recyclerView, dx, dy);
-                    onScrollListener.onScrolled(dy);
-                }
-            });
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        rebuildList();
-
-        if (isASearchResult && mAdapter.isEmpty()) {
-            // To show the " no search entry found "
-            listView.setVisibility(View.GONE);
-            notFoundView.setVisibility(View.VISIBLE);
-        } else {
-            listView.setVisibility(View.VISIBLE);
-            notFoundView.setVisibility(View.GONE);
-        }
-    }
-
-    public void rebuildList() {
-        // Add elements to the list
-        if (currentGroup != null)
-            mAdapter.rebuildList(currentGroup);
-        assignListToNodeAdapter(listView);
-    }
-
-    protected void assignListToNodeAdapter(RecyclerView recyclerView) {
-        recyclerView.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        recyclerView.setAdapter(mAdapter);
-    }
-
-    @Override
-    public void onSortSelected(SortNodeEnum sortNodeEnum, boolean ascending, boolean groupsBefore, boolean recycleBinBottom) {
-        // Toggle setting
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putString(getString(R.string.sort_node_key), sortNodeEnum.name());
-        editor.putBoolean(getString(R.string.sort_ascending_key), ascending);
-        editor.putBoolean(getString(R.string.sort_group_before_key), groupsBefore);
-        editor.putBoolean(getString(R.string.sort_recycle_bin_bottom_key), recycleBinBottom);
-        editor.apply();
-
-        // Tell the adapter to refresh it's list
-        mAdapter.notifyChangeSort(sortNodeEnum, ascending, groupsBefore);
-        mAdapter.rebuildList(currentGroup);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.tree, menu);
-
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch ( item.getItemId() ) {
-
-            case R.id.menu_sort:
-                SortDialogFragment sortDialogFragment;
-
-                PwDatabase database = App.getDB().getPwDatabase();
-                /*
-                // TODO Recycle bin bottom
-                if (database.isRecycleBinAvailable() && database.isRecycleBinEnabled()) {
-                    sortDialogFragment =
-                            SortDialogFragment.getInstance(
-                                    PrefsUtil.getListSort(this),
-                                    PrefsUtil.getAscendingSort(this),
-                                    PrefsUtil.getGroupsBeforeSort(this),
-                                    PrefsUtil.getRecycleBinBottomSort(this));
-                } else {
-                */
-                sortDialogFragment =
-                        SortDialogFragment.getInstance(
-                                PreferencesUtil.getListSort(getContext()),
-                                PreferencesUtil.getAscendingSort(getContext()),
-                                PreferencesUtil.getGroupsBeforeSort(getContext()));
-                //}
-
-                sortDialogFragment.show(getChildFragmentManager(), "sortDialog");
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        switch (requestCode) {
-            case EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE:
-                if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE ||
-                        resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
-                    PwNode newNode = data.getParcelableExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY);
-                    if (newNode != null) {
-                        if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
-                            mAdapter.addNode(newNode);
-                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
-                            //mAdapter.updateLastNodeRegister(newNode);
-                            mAdapter.rebuildList(currentGroup);
-                        }
-                    } else {
-                        Log.e(this.getClass().getName(), "New node can be retrieve in Activity Result");
-                    }
-                }
-                break;
-        }
-    }
-
-    public boolean isEmpty() {
-        return mAdapter == null || mAdapter.getItemCount() <= 0;
-    }
-
-    public void addNode(PwNode newNode) {
-        mAdapter.addNode(newNode);
-    }
-
-    public void updateNode(PwNode oldNode, PwNode newNode) {
-        mAdapter.updateNode(oldNode, newNode);
-    }
-
-    public void removeNode(PwNode pwNode) {
-        mAdapter.removeNode(pwNode);
-    }
-
-    public PwGroup getMainGroup() {
-        return currentGroup;
-    }
-
-    public interface OnScrollListener {
-
-        /**
-         * Callback method to be invoked when the RecyclerView has been scrolled. This will be
-         * called after the scroll has completed.
-         *
-         * @param dy The amount of vertical scroll.
-         */
-        void onScrolled(int dy);
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
@@ -0,0 +1,481 @@
+/*
+ * 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.os.Bundle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.view.ActionMode
+
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.adapters.NodeAdapter
+import com.kunzisoft.keepass.database.element.SortNodeEnum
+import com.kunzisoft.keepass.database.element.Group
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.node.Type
+import java.util.*
+
+class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
+
+    private var nodeClickListener: NodeClickListener? = null
+    private var onScrollListener: OnScrollListener? = null
+
+    private var mNodesRecyclerView: RecyclerView? = null
+    var mainGroup: Group? = null
+        private set
+    private var mAdapter: NodeAdapter? = null
+
+    var nodeActionSelectionMode = false
+        private set
+    var nodeActionPasteMode: PasteMode = PasteMode.UNDEFINED
+        private set
+    private val listActionNodes = LinkedList<Node>()
+    private val listPasteNodes = LinkedList<Node>()
+
+    private var notFoundView: View? = null
+    private var isASearchResult: Boolean = false
+
+
+    private var readOnly: Boolean = false
+        get() {
+            return field || selectionMode
+        }
+    private var selectionMode: Boolean = false
+
+    val isEmpty: Boolean
+        get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            nodeClickListener = context as NodeClickListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + NodeAdapter.NodeClickCallback::class.java.name)
+        }
+
+        try {
+            onScrollListener = context as OnScrollListener
+        } catch (e: ClassCastException) {
+            onScrollListener = null
+            // Context menu can be omit
+            Log.w(TAG, context.toString()
+                    + " must implement " + RecyclerView.OnScrollListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        nodeClickListener = null
+        onScrollListener = null
+        super.onDetach()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setHasOptionsMenu(true)
+
+        readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState, arguments)
+
+        arguments?.let { args ->
+            // Contains all the group in element
+            if (args.containsKey(GROUP_KEY)) {
+                mainGroup = args.getParcelable(GROUP_KEY)
+            }
+            if (args.containsKey(IS_SEARCH)) {
+                isASearchResult = args.getBoolean(IS_SEARCH)
+            }
+        }
+
+        contextThemed?.let { context ->
+            mAdapter = NodeAdapter(context)
+            mAdapter?.apply {
+                setOnNodeClickListener(object : NodeAdapter.NodeClickCallback {
+                    override fun onNodeClick(node: Node) {
+                        if (nodeActionSelectionMode) {
+                            if (listActionNodes.contains(node)) {
+                                // Remove selected item if already selected
+                                listActionNodes.remove(node)
+                            } else {
+                                // Add selected item if not already selected
+                                listActionNodes.add(node)
+                            }
+                            nodeClickListener?.onNodeSelected(listActionNodes)
+                            setActionNodes(listActionNodes)
+                            notifyNodeChanged(node)
+                        } else {
+                            nodeClickListener?.onNodeClick(node)
+                        }
+                    }
+
+                    override fun onNodeLongClick(node: Node): Boolean {
+                        if (nodeActionPasteMode == PasteMode.UNDEFINED) {
+                            // Select the first item after a long click
+                            if (!listActionNodes.contains(node))
+                                listActionNodes.add(node)
+
+                            nodeClickListener?.onNodeSelected(listActionNodes)
+
+                            setActionNodes(listActionNodes)
+                            notifyNodeChanged(node)
+                        }
+                        return true
+                    }
+                })
+            }
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        // To apply theme
+        val rootView = inflater.cloneInContext(contextThemed)
+                .inflate(R.layout.fragment_list_nodes, container, false)
+        mNodesRecyclerView = 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() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(recyclerView, dx, dy)
+                    onScrollListener.onScrolled(dy)
+                }
+            })
+        }
+
+        return rootView
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        activity?.intent?.let {
+            selectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(it)
+        }
+
+        // Refresh data
+        rebuildList()
+
+        if (isASearchResult && mAdapter!= null && mAdapter!!.isEmpty) {
+            // To show the " no search entry found "
+            mNodesRecyclerView?.visibility = View.GONE
+            notFoundView?.visibility = View.VISIBLE
+        } else {
+            mNodesRecyclerView?.visibility = View.VISIBLE
+            notFoundView?.visibility = View.GONE
+        }
+    }
+
+    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
+                }
+            }
+        }
+    }
+
+    override fun onSortSelected(sortNodeEnum: SortNodeEnum,
+                                sortNodeParameters: SortNodeEnum.SortNodeParameters) {
+        // Save setting
+        context?.let {
+            PreferencesUtil.saveNodeSort(it, sortNodeEnum, sortNodeParameters)
+        }
+
+        // Tell the adapter to refresh it's list
+        mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
+        rebuildList()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.tree, menu)
+
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+
+            R.id.menu_sort -> {
+                context?.let { context ->
+                    val sortDialogFragment: SortDialogFragment =
+                            if (Database.getInstance().isRecycleBinEnabled) {
+                                SortDialogFragment.getInstance(
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context),
+                                        PreferencesUtil.getRecycleBinBottomSort(context))
+                            } else {
+                                SortDialogFragment.getInstance(
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context))
+                            }
+
+                    sortDialogFragment.show(childFragmentManager, "sortDialog")
+                }
+                return true
+            }
+
+            else -> return super.onOptionsItemSelected(item)
+        }
+    }
+
+    fun actionNodesCallback(nodes: List<Node>,
+                            menuListener: NodesActionMenuListener?,
+                            actionModeCallback: ActionMode.Callback) : ActionMode.Callback {
+
+        return object : ActionMode.Callback {
+
+            override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                nodeActionSelectionMode = false
+                nodeActionPasteMode = PasteMode.UNDEFINED
+                return actionModeCallback.onCreateActionMode(mode, menu)
+            }
+
+            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                menu?.clear()
+
+                if (nodeActionPasteMode != PasteMode.UNDEFINED) {
+                    mode?.menuInflater?.inflate(R.menu.node_paste_menu, menu)
+                } else {
+                    nodeActionSelectionMode = true
+                    mode?.menuInflater?.inflate(R.menu.node_menu, menu)
+
+                    val database = Database.getInstance()
+
+                    // Open and Edit for a single item
+                    if (nodes.size == 1) {
+                        // Edition
+                        if (readOnly
+                                || (database.isRecycleBinEnabled && nodes[0] == database.recycleBin)) {
+                            menu?.removeItem(R.id.menu_edit)
+                        }
+                    } else {
+                        menu?.removeItem(R.id.menu_open)
+                        menu?.removeItem(R.id.menu_edit)
+                    }
+
+                    // Copy and Move (not for groups)
+                    if (readOnly
+                            || isASearchResult
+                            || nodes.any { it.type == Type.GROUP }) {
+                        // TODO Copy For Group
+                        menu?.removeItem(R.id.menu_copy)
+                        menu?.removeItem(R.id.menu_move)
+                    }
+
+                    // Deletion
+                    if (readOnly
+                            || (database.isRecycleBinEnabled && nodes.any { it == database.recycleBin })) {
+                        menu?.removeItem(R.id.menu_delete)
+                    }
+                }
+
+                // Add the number of items selected in title
+                mode?.title = nodes.size.toString()
+
+                return actionModeCallback.onPrepareActionMode(mode, menu)
+            }
+
+            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+                if (menuListener == null)
+                    return false
+                return when (item?.itemId) {
+                    R.id.menu_open -> menuListener.onOpenMenuClick(nodes[0])
+                    R.id.menu_edit -> menuListener.onEditMenuClick(nodes[0])
+                    R.id.menu_copy -> {
+                        nodeActionPasteMode = PasteMode.PASTE_FROM_COPY
+                        mAdapter?.unselectActionNodes()
+                        val returnValue = menuListener.onCopyMenuClick(nodes)
+                        nodeActionSelectionMode = false
+                        returnValue
+                    }
+                    R.id.menu_move -> {
+                        nodeActionPasteMode = PasteMode.PASTE_FROM_MOVE
+                        mAdapter?.unselectActionNodes()
+                        val returnValue = menuListener.onMoveMenuClick(nodes)
+                        nodeActionSelectionMode = false
+                        returnValue
+                    }
+                    R.id.menu_delete -> menuListener.onDeleteMenuClick(nodes)
+                    R.id.menu_paste -> {
+                        val returnValue = menuListener.onPasteMenuClick(nodeActionPasteMode, nodes)
+                        nodeActionPasteMode = PasteMode.UNDEFINED
+                        nodeActionSelectionMode = false
+                        returnValue
+                    }
+                    else -> actionModeCallback.onActionItemClicked(mode, item)
+                }
+            }
+
+            override fun onDestroyActionMode(mode: ActionMode?) {
+                listActionNodes.clear()
+                listPasteNodes.clear()
+                mAdapter?.unselectActionNodes()
+                nodeActionPasteMode = PasteMode.UNDEFINED
+                nodeActionSelectionMode = false
+                actionModeCallback.onDestroyActionMode(mode)
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        when (requestCode) {
+            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 ->
+                        if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
+                            addNode(changedNode)
+                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE)
+                            mAdapter?.notifyDataSetChanged()
+                    } ?: Log.e(this.javaClass.name, "New node can be retrieve in Activity Result")
+                }
+            }
+        }
+    }
+
+    fun contains(node: Node): Boolean {
+        return mAdapter?.contains(node) ?: false
+    }
+
+    fun addNode(newNode: Node) {
+        mAdapter?.addNode(newNode)
+    }
+
+    fun addNodes(newNodes: List<Node>) {
+        mAdapter?.addNodes(newNodes)
+    }
+
+    fun updateNode(oldNode: Node, newNode: Node? = null) {
+        mAdapter?.updateNode(oldNode, newNode ?: oldNode)
+    }
+
+    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
+        mAdapter?.updateNodes(oldNodes, newNodes)
+    }
+
+    fun removeNode(pwNode: Node) {
+        mAdapter?.removeNode(pwNode)
+    }
+
+    fun removeNodes(nodes: List<Node>) {
+        mAdapter?.removeNodes(nodes)
+    }
+
+    fun removeNodeAt(position: Int) {
+        mAdapter?.removeNodeAt(position)
+    }
+
+    fun removeNodesAt(positions: IntArray) {
+        mAdapter?.removeNodesAt(positions)
+    }
+
+    /**
+     * 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
+    }
+
+    /**
+     * 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
+    }
+
+    enum class PasteMode {
+        UNDEFINED, PASTE_FROM_COPY, PASTE_FROM_MOVE
+    }
+
+    interface OnScrollListener {
+
+        /**
+         * Callback method to be invoked when the RecyclerView has been scrolled. This will be
+         * called after the scroll has completed.
+         *
+         * @param dy The amount of vertical scroll.
+         */
+        fun onScrolled(dy: Int)
+    }
+
+    companion object {
+
+        private val TAG = ListNodesFragment::class.java.name
+
+        private const val GROUP_KEY = "GROUP_KEY"
+        private const val IS_SEARCH = "IS_SEARCH"
+
+        fun newInstance(group: Group?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
+            val bundle = Bundle()
+            if (group != null) {
+                bundle.putParcelable(GROUP_KEY, group)
+            }
+            bundle.putBoolean(IS_SEARCH, isASearch)
+            ReadOnlyHelper.putReadOnlyInBundle(bundle, readOnly)
+            val listNodesFragment = ListNodesFragment()
+            listNodesFragment.arguments = bundle
+            return listNodesFragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/MagikeyboardLauncherActivity.kt
@@ -0,0 +1,48 @@
+/*
+ * 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
@@ -0,0 +1,866 @@
+/*
+ * 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.assist.AssistStructure
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.Log
+import android.view.*
+import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+import android.widget.*
+import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
+import androidx.appcompat.widget.Toolbar
+import androidx.biometric.BiometricManager
+import androidx.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.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
+import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
+import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
+import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.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.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.MenuUtil
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
+import com.kunzisoft.keepass.view.KeyFileSelectionView
+import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
+import kotlinx.android.synthetic.main.activity_password.*
+import java.io.FileNotFoundException
+
+open class PasswordActivity : SpecialModeActivity() {
+
+    // Views
+    private var toolbar: Toolbar? = null
+    private var filenameView: TextView? = null
+    private var passwordView: EditText? = null
+    private var keyFileSelectionView: KeyFileSelectionView? = null
+    private var confirmButtonView: Button? = null
+    private var checkboxPasswordView: CompoundButton? = null
+    private var checkboxKeyFileView: 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 mRememberKeyFile: Boolean = false
+    private var mSelectFileHelper: SelectFileHelper? = 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 advancedUnlockedManager: AdvancedUnlockedManager? = null
+    private var mAllowAutoOpenBiometricPrompt: Boolean = true
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_password)
+
+        toolbar = findViewById(R.id.toolbar)
+        toolbar?.title = getString(R.string.app_name)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        confirmButtonView = findViewById(R.id.activity_password_open_button)
+        filenameView = findViewById(R.id.filename)
+        passwordView = findViewById(R.id.password)
+        keyFileSelectionView = findViewById(R.id.keyfile_selection)
+        checkboxPasswordView = findViewById(R.id.password_checkbox)
+        checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
+        advancedUnlockInfoView = findViewById(R.id.biometric_info)
+        infoContainerView = findViewById(R.id.activity_password_info_container)
+
+        mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
+        readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrPreference(this, savedInstanceState)
+        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
+
+        mSelectFileHelper = SelectFileHelper(this@PasswordActivity)
+        keyFileSelectionView?.apply {
+            mSelectFileHelper?.selectFileOnClickViewListener?.let {
+                setOnClickListener(it)
+                setOnLongClickListener(it)
+            }
+        }
+
+        passwordView?.setOnEditorActionListener(onEditorActionListener)
+        passwordView?.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() && checkboxPasswordView?.isChecked != true)
+                    checkboxPasswordView?.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
+                    }
+
+            // Define title
+            filenameView?.text = databaseFile?.databaseAlias ?: ""
+
+            onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri)
+        })
+
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
+            onActionFinish = { actionTask, result ->
+                when (actionTask) {
+                    ACTION_DATABASE_LOAD_TASK -> {
+                        // Recheck biometric if error
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                            if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
+                                // Stay with the same mode and init it
+                                advancedUnlockedManager?.initBiometricMode()
+                            }
+                        }
+
+                        if (result.isSuccess) {
+                            mDatabaseKeyFileUri = null
+                            clearCredentialsViews(true)
+                            launchGroupActivity()
+                        } else {
+                            var resultError = ""
+                            val resultException = result.exception
+                            val resultMessage = result.message
+
+                            if (resultException != null) {
+                                resultError = resultException.getLocalizedMessage(resources)
+
+                                // Relaunch loading if we need to fix UUID
+                                if (resultException is DuplicateUuidDatabaseException) {
+                                    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)
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError)
+                            Snackbar.make(activity_password_coordinator_layout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    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()
+                    }
+                },
+                {
+                    SearchHelper.checkAutoSearchInfo(this,
+                            Database.getInstance(),
+                            searchInfo,
+                            { items ->
+                                // Response is build
+                                if (items.size == 1) {
+                                    populateKeyboardAndMoveAppToBackground(this@PasswordActivity,
+                                            items[0],
+                                            intent)
+                                } else {
+                                    // Select the one we want
+                                    GroupActivity.launchForEntrySelectionResult(this,
+                                            true,
+                                            searchInfo)
+                                }
+                            },
+                            {
+                                // Here no search info found, disable auto search
+                                GroupActivity.launchForEntrySelectionResult(this@PasswordActivity,
+                                        false,
+                                        searchInfo,
+                                        readOnly)
+                            },
+                            {
+                                // Simply close if database not opened, normally not happened
+                            }
+                    )
+                    // Do not keep history
+                    finish()
+                },
+                { assistStructure ->
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        SearchHelper.checkAutoSearchInfo(this,
+                                Database.getInstance(),
+                                searchInfo,
+                                { items ->
+                                    // Response is build
+                                    AutofillHelper.buildResponse(this, items)
+                                    finish()
+                                },
+                                {
+                                    // Here no search info found, disable auto search
+                                    GroupActivity.launchForAutofillResult(this@PasswordActivity,
+                                            assistStructure,
+                                            false,
+                                            searchInfo,
+                                            readOnly)
+                                },
+                                {
+                                    // Simply close if database not opened, normally not happened
+                                    finish()
+                                }
+                        )
+                    }
+                })
+    }
+
+    private val onEditorActionListener = object : TextView.OnEditorActionListener {
+        override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean {
+            if (actionId == IME_ACTION_DONE) {
+                verifyCheckboxesAndLoadDatabase()
+                return true
+            }
+            return false
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (Database.getInstance().loaded) {
+            launchGroupActivity()
+        } else {
+            mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
+
+            // 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()
+            }
+
+            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()
+        }
+    }
+
+    private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
+        // Define Key File text
+        if (mRememberKeyFile) {
+            populateKeyFileTextView(keyFileUri)
+        }
+
+        // Define listener for validate button
+        confirmButtonView?.setOnClickListener { verifyCheckboxesAndLoadDatabase() }
+
+        // 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)
+        }
+        if (launchImmediately) {
+            verifyCheckboxesAndLoadDatabase(password, keyFileUri)
+        } else {
+            // Init Biometric elements
+            var biometricInitialize = false
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (PreferencesUtil.isBiometricUnlockEnable(this)) {
+                    if (advancedUnlockedManager == null && databaseFileUri != null) {
+                        advancedUnlockedManager = AdvancedUnlockedManager(this,
+                                databaseFileUri,
+                                advancedUnlockInfoView,
+                                checkboxPasswordView,
+                                enableButtonOnCheckedChangeListener,
+                                passwordView,
+                                { passwordEncrypted, ivSpec ->
+                                    // Load the database if password is registered with biometric
+                                    if (passwordEncrypted != null && ivSpec != null) {
+                                        verifyCheckboxesAndLoadDatabase(
+                                                CipherDatabaseEntity(
+                                                    databaseFileUri.toString(),
+                                                    passwordEncrypted,
+                                                    ivSpec)
+                                        )
+                                    }
+                                },
+                                { passwordDecrypted ->
+                                    // Load the database if password is retrieve from biometric
+                                    passwordDecrypted?.let {
+                                        // Retrieve from biometric
+                                        verifyKeyFileCheckboxAndLoadDatabase(it)
+                                    }
+                                })
+                    }
+                    advancedUnlockedManager?.isBiometricPromptAutoOpenEnable = mAllowAutoOpenBiometricPrompt
+                    advancedUnlockedManager?.checkBiometricAvailability()
+                    biometricInitialize = true
+                } else {
+                    advancedUnlockedManager?.destroy()
+                    advancedUnlockInfoView?.visibility = View.GONE
+                }
+            }
+            if (!biometricInitialize) {
+                checkboxPasswordView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
+            }
+            checkboxKeyFileView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
+        }
+
+        enableOrNotTheConfirmationButton()
+    }
+
+    private fun enableOrNotTheConfirmationButton() {
+        // Enable or not the open button if setting is checked
+        if (!PreferencesUtil.emptyPasswordAllowed(this@PasswordActivity)) {
+            checkboxPasswordView?.let {
+                confirmButtonView?.isEnabled = (checkboxPasswordView?.isChecked == true
+                        || checkboxKeyFileView?.isChecked == true)
+            }
+        } else {
+            confirmButtonView?.isEnabled = true
+        }
+    }
+
+    private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile) {
+        populatePasswordTextView(null)
+        if (clearKeyFile) {
+            populateKeyFileTextView(null)
+        }
+    }
+
+    private fun populatePasswordTextView(text: String?) {
+        if (text == null || text.isEmpty()) {
+            passwordView?.setText("")
+            if (checkboxPasswordView?.isChecked == true)
+                checkboxPasswordView?.isChecked = false
+        } else {
+            passwordView?.setText(text)
+            if (checkboxPasswordView?.isChecked != true)
+                checkboxPasswordView?.isChecked = true
+        }
+    }
+
+    private fun populateKeyFileTextView(uri: Uri?) {
+        if (uri == null || uri.toString().isEmpty()) {
+            keyFileSelectionView?.uri = null
+            if (checkboxKeyFileView?.isChecked == true)
+                checkboxKeyFileView?.isChecked = false
+        } else {
+            keyFileSelectionView?.uri = uri
+            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
+        }
+
+        // Reinit locking activity UI variable
+        LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
+        mAllowAutoOpenBiometricPrompt = true
+
+        super.onPause()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(KEY_PERMISSION_ASKED, mPermissionAsked)
+        mDatabaseKeyFileUri?.let {
+            outState.putString(KEY_KEYFILE, it.toString())
+        }
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
+        outState.putBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT, false)
+        super.onSaveInstanceState(outState)
+    }
+
+    private fun verifyCheckboxesAndLoadDatabase(cipherDatabaseEntity: CipherDatabaseEntity? = null) {
+        val password: String? = passwordView?.text?.toString()
+        val keyFile: Uri? = keyFileSelectionView?.uri
+        verifyCheckboxesAndLoadDatabase(password, keyFile, cipherDatabaseEntity)
+    }
+
+    private fun verifyCheckboxesAndLoadDatabase(password: String?,
+                                                keyFile: Uri?,
+                                                cipherDatabaseEntity: CipherDatabaseEntity? = null) {
+        val keyPassword = if (checkboxPasswordView?.isChecked != true) null else password
+        verifyKeyFileCheckbox(keyFile)
+        loadDatabase(mDatabaseFileUri, keyPassword, mDatabaseKeyFileUri, cipherDatabaseEntity)
+    }
+
+    private fun verifyKeyFileCheckboxAndLoadDatabase(password: String?) {
+        val keyFile: Uri? = keyFileSelectionView?.uri
+        verifyKeyFileCheckbox(keyFile)
+        loadDatabase(mDatabaseFileUri, password, mDatabaseKeyFileUri)
+    }
+
+    private fun verifyKeyFileCheckbox(keyFile: Uri?) {
+        mDatabaseKeyFileUri = if (checkboxKeyFileView?.isChecked != true) null else keyFile
+    }
+
+    private fun loadDatabase(databaseFileUri: Uri?,
+                             password: String?,
+                             keyFileUri: Uri?,
+                             cipherDatabaseEntity: CipherDatabaseEntity? = null) {
+
+        if (PreferencesUtil.deletePasswordAfterConnexionAttempt(this)) {
+            clearCredentialsViews()
+        }
+
+        databaseFileUri?.let { databaseUri ->
+            // Show the progress dialog and load the database
+            showProgressDialogAndLoadDatabase(
+                    databaseUri,
+                    password,
+                    keyFileUri,
+                    readOnly,
+                    cipherDatabaseEntity,
+                    false)
+        }
+    }
+
+    private fun showProgressDialogAndLoadDatabase(databaseUri: Uri,
+                                                  password: String?,
+                                                  keyFile: Uri?,
+                                                  readOnly: Boolean,
+                                                  cipherDatabaseEntity: CipherDatabaseEntity?,
+                                                  fixDuplicateUUID: Boolean) {
+        mProgressDatabaseTaskProvider?.startDatabaseLoad(
+                databaseUri,
+                password,
+                keyFile,
+                readOnly,
+                cipherDatabaseEntity,
+                fixDuplicateUUID
+        )
+    }
+
+    private fun showLoadDatabaseDuplicateUuidMessage(loadDatabaseWithFix: (() -> Unit)? = null) {
+        DuplicateUuidDialog().apply {
+            positiveAction = loadDatabaseWithFix
+        }.show(supportFragmentManager, "duplicateUUIDDialog")
+    }
+
+    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))
+        }
+
+        if (!mSelectionMode) {
+            MenuUtil.defaultMenuInflater(inflater, menu)
+        }
+
+        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // biometric menu
+            advancedUnlockedManager?.inflateOptionsMenu(inflater, menu)
+        }
+
+        super.onCreateOptionsMenu(menu)
+
+        launchEducation(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().post { performedNextEducation(PasswordActivityEducation(this), menu) }
+        }
+    }
+
+    private fun performedNextEducation(passwordActivityEducation: PasswordActivityEducation,
+                                       menu: Menu) {
+        val educationToolbar = toolbar
+        val unlockEducationPerformed = educationToolbar != null
+                && passwordActivityEducation.checkAndPerformedUnlockEducation(
+                educationToolbar,
+                        {
+                            performedNextEducation(passwordActivityEducation, menu)
+                        },
+                        {
+                            performedNextEducation(passwordActivityEducation, menu)
+                        })
+        if (!unlockEducationPerformed) {
+            val readOnlyEducationPerformed =
+                    educationToolbar?.findViewById<View>(R.id.menu_open_file_read_mode_key) != null
+                    && passwordActivityEducation.checkAndPerformedReadOnlyEducation(
+                    educationToolbar.findViewById(R.id.menu_open_file_read_mode_key),
+                    {
+                        onOptionsItemSelected(menu.findItem(R.id.menu_open_file_read_mode_key))
+                        performedNextEducation(passwordActivityEducation, menu)
+                    },
+                    {
+                        performedNextEducation(passwordActivityEducation, menu)
+                    })
+
+            if (!readOnlyEducationPerformed) {
+                val biometricCanAuthenticate = BiometricManager.from(this).canAuthenticate()
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                        && PreferencesUtil.isBiometricUnlockEnable(applicationContext)
+                        && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
+                        && advancedUnlockInfoView != null && advancedUnlockInfoView?.unlockIconImageView != null
+                        && passwordActivityEducation.checkAndPerformedBiometricEducation(advancedUnlockInfoView?.unlockIconImageView!!,
+                        {
+                            performedNextEducation(passwordActivityEducation, menu)
+                        },
+                        {
+                            performedNextEducation(passwordActivityEducation, menu)
+                        })
+            }
+        }
+    }
+
+    private fun changeOpenFileReadIcon(togglePassword: MenuItem) {
+        if (readOnly) {
+            togglePassword.setTitle(R.string.menu_file_selection_read_only)
+            togglePassword.setIcon(R.drawable.ic_read_only_white_24dp)
+        } else {
+            togglePassword.setTitle(R.string.menu_open_file_read_and_write)
+            togglePassword.setIcon(R.drawable.ic_read_write_white_24dp)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+
+        when (item.itemId) {
+            android.R.id.home -> finish()
+            R.id.menu_open_file_read_mode_key -> {
+                readOnly = !readOnly
+                changeOpenFileReadIcon(item)
+            }
+            R.id.menu_biometric_remove_key -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                advancedUnlockedManager?.deleteEntryKey()
+            }
+            else -> return MenuUtil.onDefaultMenuOptionsItemSelected(this, item)
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onActivityResult(
+            requestCode: Int,
+            resultCode: Int,
+            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 {
+            keyFileResult = it.onActivityResultCallback(requestCode, resultCode, data
+            ) { uri ->
+                if (uri != null) {
+                    mDatabaseKeyFileUri = uri
+                    populateKeyFileTextView(uri)
+                }
+            }
+        }
+        if (!keyFileResult) {
+            // this block if not a key file response
+            when (resultCode) {
+                LockingActivity.RESULT_EXIT_LOCK -> {
+                    clearCredentialsViews()
+                    Database.getInstance().closeAndClear(applicationContext.filesDir)
+                }
+                Activity.RESULT_CANCELED -> {
+                    clearCredentialsViews()
+                }
+            }
+        }
+    }
+
+    companion object {
+
+        private val TAG = PasswordActivity::class.java.name
+
+        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) {
+            val intent = Intent(activity, PasswordActivity::class.java)
+            intent.putExtra(KEY_FILENAME, databaseFile)
+            if (keyFile != null)
+                intent.putExtra(KEY_KEYFILE, keyFile)
+            intentBuildLauncher.invoke(intent)
+        }
+
+        /*
+         * -------------------------
+         * 		Standard Launch
+         * -------------------------
+         */
+
+        @Throws(FileNotFoundException::class)
+        fun launch(
+                activity: Activity,
+                databaseFile: Uri,
+                keyFile: Uri?,
+                searchInfo: SearchInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                searchInfo?.let {
+                    intent.putExtra(KEY_SEARCH_INFO, it)
+                }
+                activity.startActivity(intent)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Keyboard Launch
+         * -------------------------
+         */
+
+        @Throws(FileNotFoundException::class)
+        fun launchForKeyboardResult(
+                activity: Activity,
+                databaseFile: Uri,
+                keyFile: Uri?,
+                searchInfo: SearchInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                EntrySelectionHelper.startActivityForEntrySelectionResult(
+                        activity,
+                        intent,
+                        searchInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Autofill Launch
+         * -------------------------
+         */
+
+        @RequiresApi(api = Build.VERSION_CODES.O)
+        @Throws(FileNotFoundException::class)
+        fun launchForAutofillResult(
+                activity: Activity,
+                databaseFile: Uri,
+                keyFile: Uri?,
+                assistStructure: AssistStructure?,
+                searchInfo: SearchInfo?) {
+            if (assistStructure != null) {
+                buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                    AutofillHelper.startActivityForAutofillResult(
+                            activity,
+                            intent,
+                            assistStructure,
+                            searchInfo)
+                }
+            } else {
+                launch(activity, databaseFile, keyFile, searchInfo)
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/ReadOnlyHelper.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/ReadOnlyHelper.java
@@ -1,61 +0,0 @@
-package com.kunzisoft.keepass.activities;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.kunzisoft.keepass.settings.PreferencesUtil;
-
-public class ReadOnlyHelper {
-
-    public static final String READ_ONLY_KEY = "READ_ONLY_KEY";
-
-    public static final boolean READ_ONLY_DEFAULT = false;
-
-    public static boolean retrieveReadOnlyFromInstanceStateOrPreference(Context context, Bundle savedInstanceState) {
-        boolean readOnly;
-        if (savedInstanceState != null
-                && savedInstanceState.containsKey(READ_ONLY_KEY)) {
-            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY);
-        } else {
-            readOnly = PreferencesUtil.enableReadOnlyDatabase(context);
-        }
-        return readOnly;
-    }
-
-    public static boolean retrieveReadOnlyFromInstanceStateOrArguments(Bundle savedInstanceState, Bundle arguments) {
-        boolean readOnly = READ_ONLY_DEFAULT;
-        if (savedInstanceState != null
-                && savedInstanceState.containsKey(READ_ONLY_KEY)) {
-            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY);
-        } else if (arguments != null
-                    && arguments.containsKey(READ_ONLY_KEY)) {
-                readOnly = arguments.getBoolean(READ_ONLY_KEY);
-        }
-        return readOnly;
-    }
-
-    public static boolean retrieveReadOnlyFromInstanceStateOrIntent(Bundle savedInstanceState, Intent intent) {
-        boolean readOnly = READ_ONLY_DEFAULT;
-        if (savedInstanceState != null
-                && savedInstanceState.containsKey(READ_ONLY_KEY)) {
-            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY);
-        } else {
-            if (intent != null)
-                readOnly = intent.getBooleanExtra(READ_ONLY_KEY, READ_ONLY_DEFAULT);
-        }
-        return readOnly;
-    }
-
-    public static void putReadOnlyInIntent(Intent intent, boolean readOnly) {
-        intent.putExtra(READ_ONLY_KEY, readOnly);
-    }
-
-    public static void putReadOnlyInBundle(Bundle bundle, boolean readOnly) {
-        bundle.putBoolean(READ_ONLY_KEY, readOnly);
-    }
-
-    public static void onSaveInstanceState(Bundle outState, boolean readOnly) {
-        outState.putBoolean(READ_ONLY_KEY, readOnly);
-    }
-}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt
@@ -0,0 +1,322 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.Editable
+import android.text.SpannableStringBuilder
+import android.text.TextWatcher
+import android.view.View
+import android.widget.CompoundButton
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputLayout
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.view.KeyFileSelectionView
+
+class AssignMasterKeyDialogFragment : DialogFragment() {
+
+    private var mMasterPassword: String? = null
+    private var mKeyFile: Uri? = null
+
+    private var rootView: View? = null
+
+    private var passwordCheckBox: CompoundButton? = null
+
+    private var passwordTextInputLayout: TextInputLayout? = null
+    private var passwordView: TextView? = null
+    private var passwordRepeatTextInputLayout: TextInputLayout? = null
+    private var passwordRepeatView: TextView? = null
+
+    private var keyFileCheckBox: CompoundButton? = null
+    private var keyFileSelectionView: KeyFileSelectionView? = 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 val passwordTextWatcher = object : TextWatcher {
+        override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+
+        override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+
+        override fun afterTextChanged(editable: Editable) {
+            passwordCheckBox?.isChecked = true
+        }
+    }
+
+    interface AssignPasswordDialogListener {
+        fun onAssignKeyDialogPositiveClick(masterPasswordChecked: Boolean, masterPassword: String?,
+                                           keyFileChecked: Boolean, keyFile: Uri?)
+        fun onAssignKeyDialogNegativeClick(masterPasswordChecked: Boolean, masterPassword: String?,
+                                           keyFileChecked: Boolean, keyFile: Uri?)
+    }
+
+    override fun onAttach(activity: Context) {
+        super.onAttach(activity)
+        try {
+            mListener = activity as AssignPasswordDialogListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(activity.toString()
+                    + " must implement " + AssignPasswordDialogListener::class.java.name)
+        }
+    }
+
+    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 ->
+
+            var allowNoMasterKey = false
+            arguments?.apply {
+                if (containsKey(ALLOW_NO_MASTER_KEY_ARG))
+                    allowNoMasterKey = getBoolean(ALLOW_NO_MASTER_KEY_ARG, false)
+            }
+
+            val builder = AlertDialog.Builder(activity)
+            val inflater = activity.layoutInflater
+
+            rootView = inflater.inflate(R.layout.fragment_set_password, null)
+            builder.setView(rootView)
+                    // 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)
+
+            keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
+            keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)
+
+            mSelectFileHelper = SelectFileHelper(this)
+            keyFileSelectionView?.apply {
+                setOnClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
+                setOnLongClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
+            }
+
+            val dialog = builder.create()
+
+            if (passwordCheckBox != null && keyFileCheckBox!= null) {
+                dialog.setOnShowListener { dialog1 ->
+                    val positiveButton = (dialog1 as AlertDialog).getButton(DialogInterface.BUTTON_POSITIVE)
+                    positiveButton.setOnClickListener {
+
+                        mMasterPassword = ""
+                        mKeyFile = null
+
+                        var error = verifyPassword() || verifyKeyFile()
+                        if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
+                            error = true
+                            if (allowNoMasterKey)
+                                showNoKeyConfirmationDialog()
+                            else {
+                                passwordTextInputLayout?.error = getString(R.string.error_disallow_no_credentials)
+                            }
+                        }
+                        if (!error) {
+                            mListener?.onAssignKeyDialogPositiveClick(
+                                    passwordCheckBox!!.isChecked, mMasterPassword,
+                                    keyFileCheckBox!!.isChecked, mKeyFile)
+                            dismiss()
+                        }
+                    }
+                    val negativeButton = dialog1.getButton(DialogInterface.BUTTON_NEGATIVE)
+                    negativeButton.setOnClickListener {
+                        mListener?.onAssignKeyDialogNegativeClick(
+                                passwordCheckBox!!.isChecked, mMasterPassword,
+                                keyFileCheckBox!!.isChecked, mKeyFile)
+                        dismiss()
+                    }
+                }
+            }
+
+            return dialog
+        }
+
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // To check checkboxes if a text is present
+        passwordView?.addTextChangedListener(passwordTextWatcher)
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        passwordView?.removeTextChangedListener(passwordTextWatcher)
+    }
+
+    private fun verifyPassword(): Boolean {
+        var error = false
+        if (passwordCheckBox != null
+                && passwordCheckBox!!.isChecked
+                && passwordView != null
+                && passwordRepeatView != null) {
+            mMasterPassword = passwordView!!.text.toString()
+            val confPassword = passwordRepeatView!!.text.toString()
+
+            // Verify that passwords match
+            if (mMasterPassword != confPassword) {
+                error = true
+                // Passwords do not match
+                passwordRepeatTextInputLayout?.error = getString(R.string.error_pass_match)
+            }
+
+            if (mMasterPassword == null || mMasterPassword!!.isEmpty()) {
+                error = true
+                showEmptyPasswordConfirmationDialog()
+            }
+        }
+
+        return error
+    }
+
+    private fun verifyKeyFile(): Boolean {
+        var error = false
+        if (keyFileCheckBox != null
+                && keyFileCheckBox!!.isChecked) {
+
+            keyFileSelectionView?.uri?.let { uri ->
+                mKeyFile = uri
+            } ?: run {
+                error = true
+                keyFileSelectionView?.error = getString(R.string.error_nokeyfile)
+            }
+        }
+        return error
+    }
+
+    private fun showEmptyPasswordConfirmationDialog() {
+        activity?.let {
+            val builder = AlertDialog.Builder(it)
+            builder.setMessage(R.string.warning_empty_password)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        if (!verifyKeyFile()) {
+                            mListener?.onAssignKeyDialogPositiveClick(
+                                    passwordCheckBox!!.isChecked, mMasterPassword,
+                                    keyFileCheckBox!!.isChecked, mKeyFile)
+                            this@AssignMasterKeyDialogFragment.dismiss()
+                        }
+                    }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            mEmptyPasswordConfirmationDialog = builder.create()
+            mEmptyPasswordConfirmationDialog?.show()
+        }
+    }
+
+    private fun showNoKeyConfirmationDialog() {
+        activity?.let {
+            val builder = AlertDialog.Builder(it)
+            builder.setMessage(R.string.warning_no_encryption_key)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        mListener?.onAssignKeyDialogPositiveClick(
+                                passwordCheckBox!!.isChecked, mMasterPassword,
+                                keyFileCheckBox!!.isChecked, mKeyFile)
+                        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()
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mSelectFileHelper?.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()
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+
+        private const val ALLOW_NO_MASTER_KEY_ARG = "ALLOW_NO_MASTER_KEY_ARG"
+
+        fun getInstance(allowNoMasterKey: Boolean): AssignMasterKeyDialogFragment {
+            val fragment = AssignMasterKeyDialogFragment()
+            val args = Bundle()
+            args.putBoolean(ALLOW_NO_MASTER_KEY_ARG, allowNoMasterKey)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatePickerFragment.kt
@@ -0,0 +1,66 @@
+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
@@ -0,0 +1,98 @@
+/*
+ * 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.yes) { _, _ ->
+                mListener?.permanentlyDeleteNodes(mNodesToDelete)
+            }
+            builder.setNegativeButton(android.R.string.no) { _, _ -> 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
@@ -0,0 +1,54 @@
+/*
+ * 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.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+class DuplicateUuidDialog : DialogFragment() {
+
+    var positiveAction: (() -> Unit)? = null
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = androidx.appcompat.app.AlertDialog.Builder(activity).apply {
+                val message = getString(R.string.contains_duplicate_uuid) +
+                        "\n\n" + getString(R.string.contains_duplicate_uuid_procedure)
+                setMessage(message)
+                setPositiveButton(getString(android.R.string.ok)) { _, _ ->
+                    positiveAction?.invoke()
+                    dismiss()
+                }
+                setNegativeButton(getString(android.R.string.cancel)) { _, _ -> dismiss() }
+            }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        this.dismiss()
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import android.widget.CompoundButton
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputLayout
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.security.ProtectedString
+import com.kunzisoft.keepass.model.Field
+
+
+class EntryCustomFieldDialogFragment: DialogFragment() {
+
+    private var oldField: Field? = null
+
+    private var entryCustomFieldListener: EntryCustomFieldListener? = null
+
+    private var customFieldLabelContainer: TextInputLayout? = null
+    private var customFieldLabel: TextView? = null
+    private var customFieldDeleteButton: ImageView? = null
+    private var customFieldProtectionButton: CompoundButton? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            entryCustomFieldListener = context as EntryCustomFieldListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + EntryCustomFieldListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        entryCustomFieldListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val root = activity.layoutInflater.inflate(R.layout.fragment_entry_new_field, null)
+            customFieldLabelContainer = root?.findViewById(R.id.entry_custom_field_label_container)
+            customFieldLabel = root?.findViewById(R.id.entry_custom_field_label)
+            customFieldDeleteButton = root?.findViewById(R.id.entry_custom_field_delete)
+            customFieldProtectionButton = root?.findViewById(R.id.entry_custom_field_protection)
+
+            oldField = arguments?.getParcelable(KEY_FIELD)
+            oldField?.let { oldCustomField ->
+                customFieldLabel?.text = oldCustomField.name
+                customFieldProtectionButton?.isChecked = oldCustomField.protectedValue.isProtected
+
+                customFieldDeleteButton?.visibility = View.VISIBLE
+                customFieldDeleteButton?.setOnClickListener {
+                    entryCustomFieldListener?.onDeleteCustomFieldApproved(oldCustomField)
+                    (dialog as AlertDialog?)?.dismiss()
+                }
+            } ?: run {
+                customFieldDeleteButton?.visibility = View.GONE
+            }
+
+            val builder = AlertDialog.Builder(activity)
+            builder.setView(root)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            val dialogCreated = builder.create()
+
+            customFieldLabel?.requestFocus()
+            customFieldLabel?.imeOptions = EditorInfo.IME_ACTION_DONE
+            customFieldLabel?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    approveIfValid()
+                }
+                false
+            }
+
+            dialogCreated.window?.setSoftInputMode(SOFT_INPUT_STATE_VISIBLE)
+            return dialogCreated
+
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // To prevent auto dismiss
+        val d = dialog as AlertDialog?
+        if (d != null) {
+            val positiveButton = d.getButton(Dialog.BUTTON_POSITIVE) as Button
+            positiveButton.setOnClickListener {
+                approveIfValid()
+            }
+        }
+    }
+
+    private fun approveIfValid() {
+        if (isValid()) {
+            oldField?.let {
+                // New property with old value
+                entryCustomFieldListener?.onEditCustomFieldApproved(it,
+                        Field(customFieldLabel?.text?.toString() ?: "",
+                                ProtectedString(customFieldProtectionButton?.isChecked == true,
+                                        it.protectedValue.stringValue))
+                )
+            } ?: run {
+                entryCustomFieldListener?.onNewCustomFieldApproved(
+                        Field(customFieldLabel?.text?.toString() ?: "",
+                                ProtectedString(customFieldProtectionButton?.isChecked == true))
+                )
+            }
+            (dialog as AlertDialog?)?.dismiss()
+        }
+    }
+
+    private fun isValid(): Boolean {
+        return if (customFieldLabel?.text?.toString()?.isNotEmpty() != true) {
+            setError(R.string.error_string_key)
+            false
+        } else {
+            setError(null)
+            true
+        }
+    }
+
+    fun setError(@StringRes errorId: Int?) {
+        customFieldLabelContainer?.error = if (errorId == null) null else {
+            requireContext().getString(errorId)
+        }
+    }
+
+    interface EntryCustomFieldListener {
+        fun onNewCustomFieldApproved(newField: Field)
+        fun onEditCustomFieldApproved(oldField: Field, newField: Field)
+        fun onDeleteCustomFieldApproved(oldField: Field)
+    }
+
+    companion object {
+
+        private const val KEY_FIELD = "KEY_FIELD"
+
+        fun getInstance(): EntryCustomFieldDialogFragment {
+            return EntryCustomFieldDialogFragment()
+        }
+
+        fun getInstance(field: Field): EntryCustomFieldDialogFragment {
+            return EntryCustomFieldDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_FIELD, field)
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
@@ -0,0 +1,53 @@
+/*
+ * 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.os.Bundle
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.widget.Button
+import android.widget.TextView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.utils.UriUtil
+
+class FileManagerDialogFragment : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val builder = AlertDialog.Builder(activity)
+            // Get the layout inflater
+            val root = activity.layoutInflater.inflate(R.layout.fragment_browser_install, null)
+            builder.setView(root)
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
+
+            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)
+                dismiss()
+            }
+
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+/**
+ * Custom Dialog to confirm big file to upload
+ */
+class FileTooBigDialogFragment : DialogFragment() {
+
+    private var mActionChooseListener: ActionChooseListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            mActionChooseListener = context as ActionChooseListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + ActionChooseListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+            builder.setMessage(SpannableStringBuilder().apply {
+                append(getString(R.string.warning_file_too_big))
+                append("\n\n")
+                append(getString(R.string.warning_sure_add_file))
+            })
+            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+                mActionChooseListener?.onValidateUploadFileTooBig(
+                        arguments?.getParcelable(KEY_FILE_URI),
+                        arguments?.getString(KEY_FILE_NAME))
+            }
+            builder.setNegativeButton(android.R.string.no) { _, _ ->
+                dismiss()
+            }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    interface ActionChooseListener {
+        fun onValidateUploadFileTooBig(attachmentToUploadUri: Uri?, fileName: String?)
+    }
+
+    companion object {
+        const val MAX_WARNING_BINARY_FILE = 5242880
+
+        private const val KEY_FILE_URI = "KEY_FILE_URI"
+        private const val KEY_FILE_NAME = "KEY_FILE_NAME"
+
+        fun build(attachmentToUploadUri: Uri,
+                  fileName: String): FileTooBigDialogFragment {
+            val fragment = FileTooBigDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(KEY_FILE_URI, attachmentToUploadUri)
+                putString(KEY_FILE_NAME, fileName)
+            }
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt
@@ -0,0 +1,203 @@
+/*
+ * 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 com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.view.View
+import android.widget.Button
+import android.widget.CompoundButton
+import android.widget.EditText
+import android.widget.SeekBar
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.password.PasswordGenerator
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.applyFontVisibility
+
+class GeneratePasswordDialogFragment : DialogFragment() {
+
+    private var mListener: GeneratePasswordListener? = null
+
+    private var root: View? = null
+    private var lengthTextView: EditText? = null
+    private var passwordInputLayoutView: TextInputLayout? = null
+    private var passwordView: EditText? = null
+
+    private var uppercaseBox: CompoundButton? = null
+    private var lowercaseBox: CompoundButton? = null
+    private var digitsBox: CompoundButton? = null
+    private var minusBox: CompoundButton? = null
+    private var underlineBox: CompoundButton? = null
+    private var spaceBox: CompoundButton? = null
+    private var specialsBox: CompoundButton? = null
+    private var bracketsBox: CompoundButton? = null
+    private var extendedBox: CompoundButton? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as GeneratePasswordListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + GeneratePasswordListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val builder = AlertDialog.Builder(activity)
+            val inflater = activity.layoutInflater
+            root = inflater.inflate(R.layout.fragment_generate_password, null)
+
+            passwordInputLayoutView = root?.findViewById(R.id.password_input_layout)
+            passwordView = root?.findViewById(R.id.password)
+            passwordView?.applyFontVisibility()
+
+            lengthTextView = root?.findViewById(R.id.length)
+
+            uppercaseBox = root?.findViewById(R.id.cb_uppercase)
+            lowercaseBox = root?.findViewById(R.id.cb_lowercase)
+            digitsBox = root?.findViewById(R.id.cb_digits)
+            minusBox = root?.findViewById(R.id.cb_minus)
+            underlineBox = root?.findViewById(R.id.cb_underline)
+            spaceBox = root?.findViewById(R.id.cb_space)
+            specialsBox = root?.findViewById(R.id.cb_specials)
+            bracketsBox = root?.findViewById(R.id.cb_brackets)
+            extendedBox = root?.findViewById(R.id.cb_extended)
+
+            assignDefaultCharacters()
+
+            val seekBar = root?.findViewById<SeekBar>(R.id.seekbar_length)
+            seekBar?.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+                override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                    lengthTextView?.setText(progress.toString())
+                }
+
+                override fun onStartTrackingTouch(seekBar: SeekBar) {}
+
+                override fun onStopTrackingTouch(seekBar: SeekBar) {}
+            })
+
+            context?.let { context ->
+                seekBar?.progress = PreferencesUtil.getDefaultPasswordLength(context)
+            }
+
+            root?.findViewById<Button>(R.id.generate_password_button)
+                    ?.setOnClickListener { fillPassword() }
+
+            builder.setView(root)
+                    .setPositiveButton(R.string.accept) { _, _ ->
+                        val bundle = Bundle()
+                        bundle.putString(KEY_PASSWORD_ID, passwordView!!.text.toString())
+                        mListener?.acceptPassword(bundle)
+
+                        dismiss()
+                    }
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        val bundle = Bundle()
+                        mListener?.cancelPassword(bundle)
+
+                        dismiss()
+                    }
+
+            // Pre-populate a password to possibly save the user a few clicks
+            fillPassword()
+
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    private fun assignDefaultCharacters() {
+        uppercaseBox?.isChecked = false
+        lowercaseBox?.isChecked = false
+        digitsBox?.isChecked = false
+        minusBox?.isChecked = false
+        underlineBox?.isChecked = false
+        spaceBox?.isChecked = false
+        specialsBox?.isChecked = false
+        bracketsBox?.isChecked = false
+        extendedBox?.isChecked = false
+
+        context?.let { context ->
+            PreferencesUtil.getDefaultPasswordCharacters(context)?.let { charSet ->
+                for (passwordChar in charSet) {
+                    when (passwordChar) {
+                        getString(R.string.value_password_uppercase) -> uppercaseBox?.isChecked = true
+                        getString(R.string.value_password_lowercase) -> lowercaseBox?.isChecked = true
+                        getString(R.string.value_password_digits) -> digitsBox?.isChecked = true
+                        getString(R.string.value_password_minus) -> minusBox?.isChecked = true
+                        getString(R.string.value_password_underline) -> underlineBox?.isChecked = true
+                        getString(R.string.value_password_space) -> spaceBox?.isChecked = true
+                        getString(R.string.value_password_special) -> specialsBox?.isChecked = true
+                        getString(R.string.value_password_brackets) -> bracketsBox?.isChecked = true
+                        getString(R.string.value_password_extended) -> extendedBox?.isChecked = true
+                    }
+                }
+            }
+        }
+    }
+
+    private fun fillPassword() {
+        root?.findViewById<EditText>(R.id.password)?.setText(generatePassword())
+    }
+
+    fun generatePassword(): String {
+        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,
+                    digitsBox?.isChecked == true,
+                    minusBox?.isChecked == true,
+                    underlineBox?.isChecked == true,
+                    spaceBox?.isChecked == true,
+                    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) {
+            passwordInputLayoutView?.error = e.message
+        }
+
+        return password
+    }
+
+    interface GeneratePasswordListener {
+        fun acceptPassword(bundle: Bundle)
+        fun cancelPassword(bundle: Bundle)
+    }
+
+    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
@@ -0,0 +1,221 @@
+/*
+ * 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.graphics.Color
+import android.os.Bundle
+import com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+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.icons.assignDatabaseIcon
+
+class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {
+
+    private var mDatabase: Database? = null
+
+    private var editGroupListener: EditGroupListener? = null
+
+    private var editGroupDialogAction: EditGroupDialogAction? = null
+    private var nameGroup: String? = null
+    private var iconGroup: IconImage? = null
+
+    private var nameTextLayoutView: TextInputLayout? = null
+    private var nameTextView: TextView? = null
+    private var iconButtonView: ImageView? = null
+    private var iconColor: Int = 0
+
+    enum class EditGroupDialogAction {
+        CREATION, UPDATE, NONE;
+
+        companion object {
+            fun getActionFromOrdinal(ordinal: Int): EditGroupDialogAction {
+                return values()[ordinal]
+            }
+        }
+    }
+
+    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
+            editGroupListener = context as EditGroupListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + GroupEditDialogFragment::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        editGroupListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val root = activity.layoutInflater.inflate(R.layout.fragment_group_edit, null)
+            nameTextLayoutView = root?.findViewById(R.id.group_edit_name_container)
+            nameTextView = root?.findViewById(R.id.group_edit_name)
+            iconButtonView = root?.findViewById(R.id.group_edit_icon_button)
+
+            // Retrieve the textColor to tint the icon
+            val ta = activity.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+            iconColor = ta.getColor(0, Color.WHITE)
+            ta.recycle()
+
+            // Init elements
+            mDatabase = Database.getInstance()
+            editGroupDialogAction = EditGroupDialogAction.NONE
+            nameGroup = ""
+            iconGroup = mDatabase?.iconFactory?.folderIcon
+
+            if (savedInstanceState != null
+                    && savedInstanceState.containsKey(KEY_ACTION_ID)
+                    && savedInstanceState.containsKey(KEY_NAME)
+                    && savedInstanceState.containsKey(KEY_ICON)) {
+                editGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(savedInstanceState.getInt(KEY_ACTION_ID))
+                nameGroup = savedInstanceState.getString(KEY_NAME)
+                iconGroup = savedInstanceState.getParcelable(KEY_ICON)
+
+            } else {
+                arguments?.apply {
+                    if (containsKey(KEY_ACTION_ID))
+                        editGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(getInt(KEY_ACTION_ID))
+
+                    if (containsKey(KEY_NAME) && containsKey(KEY_ICON)) {
+                        nameGroup = getString(KEY_NAME)
+                        iconGroup = getParcelable(KEY_ICON)
+                    }
+                }
+            }
+
+            // populate the name
+            nameTextView?.text = nameGroup
+            // populate the icon
+            assignIconView()
+
+            val builder = AlertDialog.Builder(activity)
+            builder.setView(root)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        editGroupListener?.cancelEditGroup(
+                                editGroupDialogAction,
+                                nameTextView?.text?.toString(),
+                                iconGroup)
+                    }
+
+            iconButtonView?.setOnClickListener { _ ->
+                IconPickerDialogFragment().show(parentFragmentManager, "IconPickerDialogFragment")
+            }
+
+            return builder.create()
+        }
+        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 {
+                if (isValid()) {
+                    editGroupListener?.approveEditGroup(
+                            editGroupDialogAction,
+                            nameTextView?.text?.toString(),
+                            iconGroup)
+                    d.dismiss()
+                }
+            }
+        }
+    }
+
+    private fun assignIconView() {
+        if (mDatabase?.drawFactory != null && iconGroup != null) {
+            iconButtonView?.assignDatabaseIcon(mDatabase?.drawFactory!!, iconGroup!!, iconColor)
+        }
+    }
+
+    override fun iconPicked(bundle: Bundle) {
+        iconGroup = IconPickerDialogFragment.getIconStandardFromBundle(bundle)
+        assignIconView()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putInt(KEY_ACTION_ID, editGroupDialogAction!!.ordinal)
+        outState.putString(KEY_NAME, nameGroup)
+        outState.putParcelable(KEY_ICON, iconGroup)
+        super.onSaveInstanceState(outState)
+    }
+
+    private fun isValid(): Boolean {
+        if (nameTextView?.text?.toString()?.isNotEmpty() != true) {
+            nameTextLayoutView?.error = getString(R.string.error_no_name)
+            return false
+        }
+        return true
+    }
+
+    interface EditGroupListener {
+        fun approveEditGroup(action: EditGroupDialogAction?, name: String?, icon: IconImage?)
+        fun cancelEditGroup(action: EditGroupDialogAction?, name: String?, icon: IconImage?)
+    }
+
+    companion object {
+
+        const val TAG_CREATE_GROUP = "TAG_CREATE_GROUP"
+
+        const val KEY_NAME = "KEY_NAME"
+        const val KEY_ICON = "KEY_ICON"
+        const val KEY_ACTION_ID = "KEY_ACTION_ID"
+
+        fun build(): GroupEditDialogFragment {
+            val bundle = Bundle()
+            bundle.putInt(KEY_ACTION_ID, CREATION.ordinal)
+            val fragment = GroupEditDialogFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+
+        fun build(group: Group): GroupEditDialogFragment {
+            val bundle = Bundle()
+            bundle.putString(KEY_NAME, group.title)
+            bundle.putParcelable(KEY_ICON, group.icon)
+            bundle.putInt(KEY_ACTION_ID, UPDATE.ordinal)
+            val fragment = GroupEditDialogFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.GridView
+import android.widget.ImageView
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.ImageViewCompat
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentActivity
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.icons.IconPack
+import com.kunzisoft.keepass.icons.IconPackChooser
+
+
+class IconPickerDialogFragment : DialogFragment() {
+
+    private var iconPickerListener: IconPickerListener? = null
+    private var iconPack: IconPack? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            iconPickerListener = context as IconPickerListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + IconPickerListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        iconPickerListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val builder = AlertDialog.Builder(activity)
+
+            iconPack = IconPackChooser.getSelectedIconPack(requireContext())
+
+            // Inflate and set the layout for the dialog
+            // Pass null as the parent view because its going in the dialog layout
+            val root = activity.layoutInflater.inflate(R.layout.fragment_icon_picker, null)
+            builder.setView(root)
+
+            val currIconGridView = root.findViewById<GridView>(R.id.IconGridView)
+            currIconGridView.adapter = ImageAdapter(activity)
+
+            currIconGridView.setOnItemClickListener { _, _, position, _ ->
+                val bundle = Bundle()
+                bundle.putParcelable(KEY_ICON_STANDARD, IconImageStandard(position))
+                iconPickerListener?.iconPicked(bundle)
+                dismiss()
+            }
+
+            builder.setNegativeButton(android.R.string.cancel) { _, _ -> this@IconPickerDialogFragment.dialog?.cancel() }
+
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    inner class ImageAdapter internal constructor(private val context: Context) : BaseAdapter() {
+
+        override fun getCount(): Int {
+            return iconPack?.numberOfIcons() ?: 0
+        }
+
+        override fun getItem(position: Int): Any? {
+            return null
+        }
+
+        override fun getItemId(position: Int): Long {
+            return 0
+        }
+
+        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+            val currentView: View = convertView
+                    ?: (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater)
+                        .inflate(R.layout.item_icon, parent, false)
+
+            iconPack?.let { iconPack ->
+                val iconImageView = currentView.findViewById<ImageView>(R.id.icon_image)
+                iconImageView.setImageResource(iconPack.iconToResId(position))
+
+                // Assign color if icons are tintable
+                if (iconPack.tintable()) {
+                    // Retrieve the textColor to tint the icon
+                    val ta = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+                    ImageViewCompat.setImageTintList(iconImageView, ColorStateList.valueOf(ta.getColor(0, Color.BLACK)))
+                    ta.recycle()
+                }
+            }
+
+            return currentView
+        }
+    }
+
+    interface IconPickerListener {
+        fun iconPicked(bundle: Bundle)
+    }
+
+    companion object {
+
+        private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD"
+
+        fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? {
+            return bundle.getParcelable(KEY_ICON_STANDARD)
+        }
+
+        fun launch(activity: FragmentActivity) {
+            // Create an instance of the dialog fragment and show it
+            val dialog = IconPickerDialogFragment()
+            dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
@@ -0,0 +1,108 @@
+/*
+ * 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.AlertDialog
+import android.app.Dialog
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+class PasswordEncodingDialogFragment : DialogFragment() {
+
+    private var mListener: Listener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as Listener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + Listener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        val databaseUri: Uri? = savedInstanceState?.getParcelable(DATABASE_URI_KEY)
+        val masterPasswordChecked: Boolean = savedInstanceState?.getBoolean(MASTER_PASSWORD_CHECKED_KEY) ?: false
+        val masterPassword: String? = savedInstanceState?.getString(MASTER_PASSWORD_KEY)
+        val keyFileChecked: Boolean = savedInstanceState?.getBoolean(KEY_FILE_CHECKED_KEY) ?: false
+        val keyFile: Uri? = savedInstanceState?.getParcelable(KEY_FILE_URI_KEY)
+
+        activity?.let { activity ->
+            val builder = AlertDialog.Builder(activity)
+            builder.setMessage(activity.getString(R.string.warning_password_encoding)).setTitle(R.string.warning)
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                mListener?.onPasswordEncodingValidateListener(
+                        databaseUri,
+                        masterPasswordChecked,
+                        masterPassword,
+                        keyFileChecked,
+                        keyFile
+                )
+            }
+            builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() }
+
+            return builder.create()
+        }
+        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
@@ -0,0 +1,64 @@
+/*
+ * 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.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.core.text.HtmlCompat
+import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.BuildConfig
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.utils.UriUtil
+
+/**
+ * Custom Dialog that asks the user to download the pro version or make a donation.
+ */
+class ProFeatureDialogFragment : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+
+            val stringBuilder = SpannableStringBuilder()
+            if (BuildConfig.CLOSED_STORE) {
+                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)
+                }
+            } 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)
+                }
+            }
+            builder.setMessage(stringBuilder)
+            builder.setNegativeButton(android.R.string.cancel) { _, _ -> 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
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Attachment
+
+/**
+ * Custom Dialog to confirm big file to upload
+ */
+class ReplaceFileDialogFragment : DialogFragment() {
+
+    private var mActionChooseListener: ActionChooseListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            mActionChooseListener = context as ActionChooseListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + ActionChooseListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+            builder.setMessage(SpannableStringBuilder().apply {
+                append(getString(R.string.warning_replace_file))
+                append("\n\n")
+                append(getString(R.string.warning_sure_add_file))
+            })
+            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+                mActionChooseListener?.onValidateReplaceFile(
+                        arguments?.getParcelable(KEY_FILE_URI),
+                        arguments?.getParcelable(KEY_ENTRY_ATTACHMENT))
+            }
+            builder.setNegativeButton(android.R.string.no) { _, _ ->
+                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
@@ -0,0 +1,441 @@
+/*
+ * 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
@@ -0,0 +1,200 @@
+/*
+ * 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.annotation.IdRes
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.view.View
+import android.widget.CompoundButton
+import android.widget.RadioGroup
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.SortNodeEnum
+
+class SortDialogFragment : DialogFragment() {
+
+    private var mListener: SortSelectionListener? = null
+
+    private var mSortNodeEnum: SortNodeEnum = SortNodeEnum.DB
+    @IdRes
+    private var mCheckedId: Int = 0
+    private var mGroupsBefore: Boolean = true
+    private var mAscending: Boolean = true
+    private var mRecycleBinBottom: Boolean = true
+
+    private var recycleBinBottomView: CompoundButton? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as SortSelectionListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + SortSelectionListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            val builder = AlertDialog.Builder(activity)
+
+            var recycleBinAllowed = false
+
+            arguments?.apply {
+                if (containsKey(SORT_NODE_ENUM_BUNDLE_KEY))
+                    getString(SORT_NODE_ENUM_BUNDLE_KEY)?.let {
+                        mSortNodeEnum = SortNodeEnum.valueOf(it)
+                    }
+                if (containsKey(SORT_ASCENDING_BUNDLE_KEY))
+                    mAscending = getBoolean(SORT_ASCENDING_BUNDLE_KEY)
+                if (containsKey(SORT_GROUPS_BEFORE_BUNDLE_KEY))
+                    mGroupsBefore = getBoolean(SORT_GROUPS_BEFORE_BUNDLE_KEY)
+                if (containsKey(SORT_RECYCLE_BIN_BOTTOM_BUNDLE_KEY)) {
+                    recycleBinAllowed = true
+                    mRecycleBinBottom = getBoolean(SORT_RECYCLE_BIN_BOTTOM_BUNDLE_KEY)
+                }
+            }
+
+            mCheckedId = retrieveViewFromEnum(mSortNodeEnum)
+
+            val rootView = activity.layoutInflater.inflate(R.layout.fragment_sort_selection, null)
+            builder.setTitle(R.string.sort_menu)
+            builder.setView(rootView)
+                    // Add action buttons
+                    .setPositiveButton(android.R.string.ok
+                    ) { _, _ -> mListener?.onSortSelected(mSortNodeEnum,
+                            SortNodeEnum.SortNodeParameters(mAscending, mGroupsBefore, mRecycleBinBottom))
+                    }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
+
+            val ascendingView = rootView.findViewById<CompoundButton>(R.id.sort_selection_ascending)
+            // Check if is ascending or descending
+            ascendingView.isChecked = mAscending
+            ascendingView.setOnCheckedChangeListener { _, isChecked -> mAscending = isChecked }
+
+            val groupsBeforeView = rootView.findViewById<CompoundButton>(R.id.sort_selection_groups_before)
+            // Check if groups before
+            groupsBeforeView.isChecked = mGroupsBefore
+            groupsBeforeView.setOnCheckedChangeListener { _, isChecked -> mGroupsBefore = isChecked }
+
+            recycleBinBottomView = rootView.findViewById(R.id.sort_selection_recycle_bin_bottom)
+            if (!recycleBinAllowed) {
+                recycleBinBottomView?.visibility = View.GONE
+            } else {
+                // Check if recycle bin at the bottom
+                recycleBinBottomView?.isChecked = mRecycleBinBottom
+                recycleBinBottomView?.setOnCheckedChangeListener { _, isChecked -> mRecycleBinBottom = isChecked }
+
+                disableRecycleBinBottomOptionIfNaturalOrder()
+            }
+
+            val sortSelectionRadioGroupView = rootView.findViewById<RadioGroup>(R.id.sort_selection_radio_group)
+            // Check value by default
+            sortSelectionRadioGroupView.check(mCheckedId)
+            sortSelectionRadioGroupView.setOnCheckedChangeListener { _, checkedId ->
+                mSortNodeEnum = retrieveSortEnumFromViewId(checkedId)
+                disableRecycleBinBottomOptionIfNaturalOrder()
+            }
+
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    private fun disableRecycleBinBottomOptionIfNaturalOrder() {
+        // Disable recycle bin if natural order
+        recycleBinBottomView?.isEnabled = mSortNodeEnum != SortNodeEnum.DB
+    }
+
+    @IdRes
+    private fun retrieveViewFromEnum(sortNodeEnum: SortNodeEnum): Int {
+        return when (sortNodeEnum) {
+            SortNodeEnum.DB -> R.id.sort_selection_db
+            SortNodeEnum.TITLE -> R.id.sort_selection_title
+            SortNodeEnum.USERNAME -> R.id.sort_selection_username
+            SortNodeEnum.CREATION_TIME -> R.id.sort_selection_creation_time
+            SortNodeEnum.LAST_MODIFY_TIME -> R.id.sort_selection_last_modify_time
+            SortNodeEnum.LAST_ACCESS_TIME -> R.id.sort_selection_last_access_time
+        }
+    }
+
+    private fun retrieveSortEnumFromViewId(@IdRes checkedId: Int): SortNodeEnum {
+        // Change enum
+        return when (checkedId) {
+            R.id.sort_selection_db -> SortNodeEnum.DB
+            R.id.sort_selection_title -> SortNodeEnum.TITLE
+            R.id.sort_selection_username -> SortNodeEnum.USERNAME
+            R.id.sort_selection_creation_time -> SortNodeEnum.CREATION_TIME
+            R.id.sort_selection_last_modify_time -> SortNodeEnum.LAST_MODIFY_TIME
+            R.id.sort_selection_last_access_time -> SortNodeEnum.LAST_ACCESS_TIME
+            else -> SortNodeEnum.TITLE
+        }
+    }
+
+    interface SortSelectionListener {
+        fun onSortSelected(sortNodeEnum: SortNodeEnum, sortNodeParameters: SortNodeEnum.SortNodeParameters)
+    }
+
+    companion object {
+
+        private const val SORT_NODE_ENUM_BUNDLE_KEY = "SORT_NODE_ENUM_BUNDLE_KEY"
+        private const val SORT_ASCENDING_BUNDLE_KEY = "SORT_ASCENDING_BUNDLE_KEY"
+        private const val SORT_GROUPS_BEFORE_BUNDLE_KEY = "SORT_GROUPS_BEFORE_BUNDLE_KEY"
+        private const val SORT_RECYCLE_BIN_BOTTOM_BUNDLE_KEY = "SORT_RECYCLE_BIN_BOTTOM_BUNDLE_KEY"
+
+        private fun buildBundle(sortNodeEnum: SortNodeEnum,
+                                ascending: Boolean,
+                                groupsBefore: Boolean): Bundle {
+            val bundle = Bundle()
+            bundle.putString(SORT_NODE_ENUM_BUNDLE_KEY, sortNodeEnum.name)
+            bundle.putBoolean(SORT_ASCENDING_BUNDLE_KEY, ascending)
+            bundle.putBoolean(SORT_GROUPS_BEFORE_BUNDLE_KEY, groupsBefore)
+            return bundle
+        }
+
+        fun getInstance(sortNodeEnum: SortNodeEnum,
+                        ascending: Boolean,
+                        groupsBefore: Boolean): SortDialogFragment {
+            val bundle = buildBundle(sortNodeEnum, ascending, groupsBefore)
+            val fragment = SortDialogFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+
+        fun getInstance(sortNodeEnum: SortNodeEnum,
+                        ascending: Boolean,
+                        groupsBefore: Boolean,
+                        recycleBinBottom: Boolean): SortDialogFragment {
+            val bundle = buildBundle(sortNodeEnum, ascending, groupsBefore)
+            bundle.putBoolean(SORT_RECYCLE_BIN_BOTTOM_BUNDLE_KEY, recycleBinBottom)
+            val fragment = SortDialogFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/TimePickerFragment.kt
@@ -0,0 +1,62 @@
+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
@@ -0,0 +1,125 @@
+/*
+ * 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.os.Build
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
+import android.text.SpannableStringBuilder
+import android.text.method.LinkMovementMethod
+import android.widget.TextView
+import androidx.core.text.HtmlCompat
+import com.kunzisoft.keepass.R
+
+class UnavailableFeatureDialogFragment : DialogFragment() {
+    private var minVersionRequired = Build.VERSION_CODES.M
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            arguments?.apply {
+                if (containsKey(MIN_REQUIRED_VERSION_ARG))
+                    minVersionRequired = getInt(MIN_REQUIRED_VERSION_ARG)
+            }
+
+            val rootView = activity.layoutInflater.inflate(R.layout.fragment_unavailable_feature, null)
+            val messageView = rootView.findViewById<TextView>(R.id.unavailable_feature_message)
+
+            val builder = AlertDialog.Builder(activity)
+
+            val message = SpannableStringBuilder()
+            message.append(getString(R.string.unavailable_feature_text))
+                    .append("\n\n")
+            if (Build.VERSION.SDK_INT < minVersionRequired) {
+                message.append(getString(R.string.unavailable_feature_version,
+                        androidNameFromApiNumber(Build.VERSION.SDK_INT, Build.VERSION.RELEASE),
+                        androidNameFromApiNumber(minVersionRequired)))
+                message.append("\n\n")
+                        .append(HtmlCompat.fromHtml("<a href=\"https://source.android.com/setup/build-numbers\">CodeNames</a>", HtmlCompat.FROM_HTML_MODE_LEGACY))
+            } else
+                message.append(getString(R.string.unavailable_feature_hardware))
+
+            messageView.text = message
+            messageView.movementMethod = LinkMovementMethod.getInstance()
+
+            builder.setView(rootView)
+                    .setPositiveButton(android.R.string.ok) { _, _ -> }
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    private fun androidNameFromApiNumber(apiNumber: Int, releaseVersion: String = ""): String {
+        var version = releaseVersion
+        val builder = StringBuilder()
+        val fields = Build.VERSION_CODES::class.java.fields
+        var apiName = ""
+        for (field in fields) {
+            val fieldName = field.name
+            var fieldValue = -1
+            try {
+                fieldValue = field.getInt(Any())
+            } catch (e: IllegalArgumentException) {
+                e.printStackTrace()
+            } catch (e: IllegalAccessException) {
+                e.printStackTrace()
+            } catch (e: NullPointerException) {
+                e.printStackTrace()
+            }
+
+            if (fieldValue == apiNumber) {
+                apiName = fieldName
+            }
+        }
+        if (apiName.isEmpty()) {
+            val mapper = arrayOf("ANDROID BASE", "ANDROID BASE 1.1", "CUPCAKE", "DONUT", "ECLAIR", "ECLAIR_0_1", "ECLAIR_MR1", "FROYO", "GINGERBREAD", "GINGERBREAD_MR1", "HONEYCOMB", "HONEYCOMB_MR1", "HONEYCOMB_MR2", "ICE_CREAM_SANDWICH", "ICE_CREAM_SANDWICH_MR1", "JELLY_BEAN", "JELLY_BEAN", "JELLY_BEAN", "KITKAT", "KITKAT", "LOLLIPOOP", "LOLLIPOOP_MR1", "MARSHMALLOW", "NOUGAT", "NOUGAT", "OREO", "OREO")
+            val index = apiNumber - 1
+            apiName = if (index < mapper.size) mapper[index] else "UNKNOWN_VERSION"
+        }
+        if (version.isEmpty()) {
+            val versions = arrayOf("1.0", "1.1", "1.5", "1.6", "2.0", "2.0.1", "2.1", "2.2.X", "2.3", "2.3.3", "3.0", "3.1", "3.2.0", "4.0.1", "4.0.3", "4.1.0", "4.2.0", "4.3.0", "4.4", "4.4", "5.0", "5.1", "6.0", "7.0", "7.1", "8.0.0", "8.1.0")
+            val index = apiNumber - 1
+            version = if (index < versions.size) versions[index] else "UNKNOWN_VERSION"
+        }
+
+        builder.append("\n\t")
+        if (apiName.isNotEmpty())
+            builder.append(apiName).append(" ")
+        if (version.isNotEmpty())
+            builder.append(version).append(" ")
+        builder.append("(API ").append(apiNumber).append(")")
+        builder.append("\n")
+        return builder.toString()
+    }
+
+    companion object {
+
+        private const val MIN_REQUIRED_VERSION_ARG = "MIN_REQUIRED_VERSION_ARG"
+
+        fun getInstance(minVersionRequired: Int): UnavailableFeatureDialogFragment {
+            val fragment = UnavailableFeatureDialogFragment()
+            val args = Bundle()
+            args.putInt(MIN_REQUIRED_VERSION_ARG, minVersionRequired)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
@@ -0,0 +1,74 @@
+/*
+ * 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.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.core.text.HtmlCompat
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.BuildConfig
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.utils.UriUtil
+
+/**
+ * Custom Dialog that asks the user to download the pro version or make a donation.
+ */
+class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+
+            val stringBuilder = SpannableStringBuilder()
+            if (BuildConfig.CLOSED_STORE) {
+                if (BuildConfig.FULL_VERSION) {
+                    stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_thanks), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_rose), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_work_hard), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_upgrade), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
+                    builder.setPositiveButton(android.R.string.ok) { _, _ -> dismiss() }
+                } else {
+                    stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_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)
+                    }
+                    builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
+                }
+            } else {
+                stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
+                        .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
+                builder.setPositiveButton(R.string.contribute) { _, _ ->
+                    UriUtil.gotoUrl(requireContext(), R.string.contribution_url)
+                }
+                builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
+            }
+            builder.setMessage(stringBuilder)
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt
@@ -0,0 +1,78 @@
+/*
+ * 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
+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?) {
+        addEntrySelectionModeExtraInIntent(intent)
+        searchInfo?.let {
+            intent.putExtra(KEY_SEARCH_INFO, it)
+        }
+        context.startActivity(intent)
+    }
+
+    fun addEntrySelectionModeExtraInIntent(intent: Intent) {
+        intent.putExtra(EXTRA_ENTRY_SELECTION_MODE, true)
+    }
+
+    fun removeEntrySelectionModeFromIntent(intent: Intent) {
+        intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
+    }
+
+    fun retrieveEntrySelectionModeFromIntent(intent: Intent): Boolean {
+        return intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)
+    }
+
+    fun doEntrySelectionAction(intent: Intent,
+                               standardAction: () -> Unit,
+                               keyboardAction: () -> Unit,
+                               autofillAction: (assistStructure: AssistStructure) -> Unit) {
+        var assistStructureInit = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillHelper.retrieveAssistStructure(intent)?.let { assistStructure ->
+                autofillAction.invoke(assistStructure)
+                assistStructureInit = true
+            }
+        }
+        if (!assistStructureInit) {
+            if (intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)) {
+                intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
+                keyboardAction.invoke()
+            } else {
+                standardAction.invoke()
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More