Merge branch 'release/2.9.1'

2.9

CHANGELOG

@@ -1,3 +1,63 @@
+KeePassDX(2.9.1)
+ * Copy password from generator #697
+ * Fix Magikeyboard not fully visible #772
+ * Fix change font size #770
+ * Fix crash #774
+ * Small fixes #771
+
+KeePassDX(2.9)
+ * Upgrade to Android API 30 #723
+ * Save new credentials with Autofill #524
+ * Setting to close database after Autofill selection #755
+ * Setting to switch keyboard when database is locked #625
+ * Fix biometric issues #724 #740 #731
+ * Fix autofill #725 #551
+ * Fix subdomain search #728
+ * Fix backup search #759
+ * Small fixes and translations #732 #736 #737 #738 #742 #767
+
+KeePassDX(2.8.7)
+ * Downgrade to Android API 29 (crash on startup with API 30 on some devices)
+ Sorry for the inconvenience
+
+KeePassDX(2.8.6)
+ * Fix Autofill recognition #712
+ * Keep value after renaming custom field #709
+ * Prevent random binary bug #713
+ * Fix dialog background #717
+ * Better domain recognition for autofill #702
+ * Write custom data #651
+ * Fix autolink #720
+
+KeePassDX(2.8.5)
+ * Fix Base 64 #708
+
+KeePassDX(2.8.4)
+ * Fix incomplete attachment deletion #684
+ * Fix opening database v1 without backup folder #692
+ * Fix ANR during first entry education #685
+ * Entry edition as fragment and manual views to fix focus #686
+ * Fix opening database with corrupted attachment #691
+ * Manage empty keyfile #679
+
+KeePassDX(2.8.3)
+ * Upload attachments
+ * Visibility button for each hidden field
+ * Fix read header file
+ * Fix deletion in KDB database
+ * Fix minor issues
+
+KeePassDX(2.8.2)
+ * Fix themes / new UI
+ * Fix multiples notifications
+ * Fix entry in Magikeyboard memory
+ * Fix biometric view visibility
+ * Fix fields order
+ * Upgrade code with ViewModel and LiveData
+
+KeePassDX(2.8.1)
+ * Capture exceptions in coroutines
+
 KeePassDX(2.8)
  * Fix TOTP period (> 60s)
  * Fix searching in recycle bin

LICENSES/LICENSE_MOZILLA_COMPONENTS

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

app/build.gradle

@@ -4,15 +4,15 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
-        targetSdkVersion 29
-        versionCode = 36
-        versionName = "2.8"
+        targetSdkVersion 30
+        versionCode = 45
+        versionName = "2.9.1"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -50,7 +50,7 @@ android {
             buildConfigField "String", "BUILD_VERSION", "\"libre\""
             buildConfigField "boolean", "FULL_VERSION", "true"
             buildConfigField "boolean", "CLOSED_STORE", "false"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
         }
         pro {
@@ -69,7 +69,7 @@ android {
             buildConfigField "String", "BUILD_VERSION", "\"free\""
             buildConfigField "boolean", "FULL_VERSION", "false"
             buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
             manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
         }
@@ -95,17 +95,16 @@ def room_version = "2.2.5"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    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.constraintlayout:constraintlayout:2.0.3'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.0.1'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
-    // TODO #538 implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
-    // To upgrade with style
+    implementation 'androidx.biometric:biometric:1.1.0-beta01'
+    // Lifecycle - LiveData - ViewModel - Coroutines
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    // WARNING: To upgrade with style, bug in edit text
     implementation 'com.google.android.material:material:1.0.0'
     // Database
     implementation "androidx.room:room-runtime:$room_version"
@@ -115,7 +114,7 @@ dependencies {
     // Time
     implementation 'joda-time:joda-time:2.10.6'
     // Color
-    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.3'
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.4'
     // Education
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     // Apache Commons Collections

app/src/free/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:viewportWidth="108"
-android:viewportHeight="108"
-android:width="108dp"
-android:height="108dp">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:width="108dp"
+    android:height="108dp">
     <group
         android:translateY="-332">
         <group
             android:translateY="332">
             <path
                 android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
-                android:fillColor="@color/long_shadow"
                 android:strokeLineJoin="round"
                 android:strokeLineCap="round"
-                android:strokeMiterLimit="4" />
+                android:strokeMiterLimit="4" >
+                <aapt:attr name="android:fillColor">
+                    <gradient
+                        android:endColor="#0000"
+                        android:endX="80"
+                        android:endY="80"
+                        android:startColor="#4e000000"
+                        android:startX="0"
+                        android:startY="0"
+                        android:type="linear"/>
+                </aapt:attr>
+            </path>
         </group>
         <group
             android:scaleX="0.3939503"

app/src/libre/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:viewportWidth="108"
-android:viewportHeight="108"
-android:width="108dp"
-android:height="108dp">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:width="108dp"
+    android:height="108dp">
     <group
         android:translateY="-332">
         <group
             android:translateY="332">
             <path
                 android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
-                android:fillColor="@color/long_shadow"
                 android:strokeLineJoin="round"
                 android:strokeLineCap="round"
-                android:strokeMiterLimit="4" />
+                android:strokeMiterLimit="4" >
+                <aapt:attr name="android:fillColor">
+                    <gradient
+                        android:endColor="#0000"
+                        android:endX="80"
+                        android:endY="80"
+                        android:startColor="#4e000000"
+                        android:startX="0"
+                        android:startY="0"
+                        android:type="linear"/>
+                </aapt:attr>
+            </path>
         </group>
         <group
             android:scaleX="0.3939503"

app/src/main/AndroidManifest.xml

@@ -16,6 +16,8 @@
         android:name="android.permission.VIBRATE"/>
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
     <application
         android:label="@string/app_name"
@@ -47,7 +49,7 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.PasswordActivity"
             android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize|stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -124,8 +126,7 @@
             android:configChanges="keyboardHidden" />
         <activity
             android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
-            android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <!-- About and Settings -->
         <activity
             android:name="com.kunzisoft.keepass.activities.AboutActivity"
@@ -161,10 +162,6 @@
             </intent-filter>
         </activity>
 
-        <service
-            android:name="com.kunzisoft.keepass.notifications.DatabaseOpenNotificationService"
-            android:enabled="true"
-            android:exported="false" />
         <service
             android:name="com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService"
             android:enabled="true"

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

@@ -30,39 +30,75 @@ import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.autofill.KeeAutofillService
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.LOCK_ACTION
+import com.kunzisoft.keepass.utils.UriUtil
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 class AutofillLauncherActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
 
-        // Build search param
-        val searchInfo = SearchInfo().apply {
-            applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
-            webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+        // Retrieve selection mode
+        EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode ->
+            when (specialMode) {
+                SpecialMode.SELECTION -> {
+                    // Build search param
+                    val searchInfo = SearchInfo().apply {
+                        applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
+                        webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+                        webScheme = intent.getStringExtra(KEY_SEARCH_SCHEME)
+                    }
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                        searchInfo.webDomain = concreteWebDomain
+                        launchSelection(searchInfo)
+                    }
+                }
+                SpecialMode.REGISTRATION -> {
+                    // To register info
+                    val registerInfo = intent.getParcelableExtra<RegisterInfo>(KEY_REGISTER_INFO)
+                    val searchInfo = SearchInfo(registerInfo?.searchInfo)
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                        searchInfo.webDomain = concreteWebDomain
+                        launchRegistration(searchInfo, registerInfo)
+                    }
+                }
+                else -> {
+                    // Not an autofill call
+                    setResult(Activity.RESULT_CANCELED)
+                    finish()
+                }
+            }
         }
 
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun launchSelection(searchInfo: SearchInfo) {
         // 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,
+        } else if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
                         PreferencesUtil.applicationIdBlocklist(this))
-                || !KeeAutofillService.searchAllowedFor(searchInfo.webDomain,
+                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
                         PreferencesUtil.webDomainBlocklist(this))) {
-            // If item not allowed, show a toast
-            Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
+            showBlockRestartMessage()
             setResult(Activity.RESULT_CANCELED)
             finish()
         } else {
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
             // If database is open
             SearchHelper.checkAutoSearchInfo(this,
                     Database.getInstance(),
@@ -75,9 +111,10 @@ class AutofillLauncherActivity : AppCompatActivity() {
                     {
                         // Show the database UI to select the entry
                         GroupActivity.launchForAutofillResult(this,
+                                readOnly,
                                 assistStructure,
-                                false,
-                                searchInfo)
+                                searchInfo,
+                                false)
                     },
                     {
                         // If database not open
@@ -87,12 +124,66 @@ class AutofillLauncherActivity : AppCompatActivity() {
                     }
             )
         }
+    }
 
-        super.onCreate(savedInstanceState)
+    private fun launchRegistration(searchInfo: SearchInfo, registerInfo: RegisterInfo?) {
+        if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
+                        PreferencesUtil.applicationIdBlocklist(this))
+                || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
+                        PreferencesUtil.webDomainBlocklist(this))) {
+            showBlockRestartMessage()
+            setResult(Activity.RESULT_CANCELED)
+        } else {
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
+            SearchHelper.checkAutoSearchInfo(this,
+                    database,
+                    searchInfo,
+                    { _ ->
+                        if (!readOnly) {
+                            // Show the database UI to select the entry
+                            GroupActivity.launchForRegistration(this,
+                                    registerInfo)
+                        } else {
+                            showReadOnlySaveMessage()
+                        }
+                    },
+                    {
+                        if (!readOnly) {
+                            // Show the database UI to select the entry
+                            GroupActivity.launchForRegistration(this,
+                                    registerInfo)
+                        } else {
+                            showReadOnlySaveMessage()
+                        }
+                    },
+                    {
+                        // If database not open
+                        FileDatabaseSelectActivity.launchForRegistration(this,
+                                registerInfo)
+                    }
+            )
+        }
+        finish()
+    }
+
+    private fun showBlockRestartMessage() {
+        // If item not allowed, show a toast
+        Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
+    }
+
+    private fun showReadOnlySaveMessage() {
+        Toast.makeText(this.applicationContext, R.string.autofill_read_only_save, Toast.LENGTH_LONG).show()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+
+        if (PreferencesUtil.isAutofillCloseDatabaseEnable(this)) {
+            // Close the database
+            sendBroadcast(Intent(LOCK_ACTION))
+        }
+
         super.onActivityResult(requestCode, resultCode, data)
     }
 
@@ -100,18 +191,41 @@ class AutofillLauncherActivity : AppCompatActivity() {
 
         private const val KEY_SEARCH_APPLICATION_ID = "KEY_SEARCH_APPLICATION_ID"
         private const val KEY_SEARCH_DOMAIN = "KEY_SEARCH_DOMAIN"
+        private const val KEY_SEARCH_SCHEME = "KEY_SEARCH_SCHEME"
 
-        fun getAuthIntentSenderForResponse(context: Context,
-                                           searchInfo: SearchInfo? = null): IntentSender {
+        private const val KEY_REGISTER_INFO = "KEY_REGISTER_INFO"
+
+        fun getAuthIntentSenderForSelection(context: Context,
+                                            searchInfo: SearchInfo? = null): IntentSender {
             return PendingIntent.getActivity(context, 0,
                     // Doesn't work with Parcelable (don't know why?)
                     Intent(context, AutofillLauncherActivity::class.java).apply {
                         searchInfo?.let {
                             putExtra(KEY_SEARCH_APPLICATION_ID, it.applicationId)
                             putExtra(KEY_SEARCH_DOMAIN, it.webDomain)
+                            putExtra(KEY_SEARCH_SCHEME, it.webScheme)
                         }
                     },
                     PendingIntent.FLAG_CANCEL_CURRENT).intentSender
         }
+
+        fun getAuthIntentSenderForRegistration(context: Context,
+                                               registerInfo: RegisterInfo): IntentSender {
+            return PendingIntent.getActivity(context, 0,
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
+                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
+                        putExtra(KEY_REGISTER_INFO, registerInfo)
+                    },
+                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
+        }
+
+        fun launchForRegistration(context: Context,
+                                  registerInfo: RegisterInfo) {
+            val intent = Intent(context, AutofillLauncherActivity::class.java)
+            EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.REGISTRATION)
+            intent.putExtra(KEY_REGISTER_INFO, registerInfo)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
     }
 }

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

@@ -25,6 +25,7 @@ import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
@@ -39,14 +40,15 @@ 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.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachment
+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
@@ -86,7 +88,7 @@ class EntryActivity : LockingActivity() {
     private var mShowPassword: Boolean = false
 
     private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
-    private var mAttachmentsToDownload: HashMap<Int, EntryAttachment> = HashMap()
+    private var mAttachmentsToDownload: HashMap<Int, Attachment> = HashMap()
 
     private var clipboardHelper: ClipboardHelper? = null
     private var mFirstLaunchOfActivity: Boolean = false
@@ -140,7 +142,7 @@ class EntryActivity : LockingActivity() {
         // Init attachment service binder manager
         mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
 
-        mProgressDialogThread?.onActionFinish = { actionTask, result ->
+        mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
             when (actionTask) {
                 ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
                 ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
@@ -212,8 +214,8 @@ class EntryActivity : LockingActivity() {
         mAttachmentFileBinderManager?.apply {
             registerProgressTask()
             onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
-                override fun onAttachmentProgress(fileUri: Uri, attachment: EntryAttachment) {
-                    entryContentsView?.updateAttachmentDownloadProgress(attachment)
+                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
+                    entryContentsView?.putAttachment(entryAttachmentState)
                 }
             }
         }
@@ -240,14 +242,13 @@ class EntryActivity : LockingActivity() {
         toolbar?.title = entryTitle
 
         // Assign basic fields
-        entryContentsView?.assignUserName(entry.username)
-        entryContentsView?.assignUserNameCopyListener(View.OnClickListener {
+        entryContentsView?.assignUserName(entry.username) {
             database.startManageEntry(entry)
             clipboardHelper?.timeoutCopyToClipboard(entry.username,
-                            getString(R.string.copy_field,
+                    getString(R.string.copy_field,
                             getString(R.string.entry_user_name)))
             database.stopManageEntry(entry)
-        })
+        }
 
         val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
                 PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)
@@ -274,23 +275,25 @@ class EntryActivity : LockingActivity() {
                     }
         }
 
-        entryContentsView?.assignPassword(entry.password, allowCopyPasswordAndProtectedFields)
-        if (allowCopyPasswordAndProtectedFields) {
-            entryContentsView?.assignPasswordCopyListener(View.OnClickListener {
+        val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
+            View.OnClickListener {
                 database.startManageEntry(entry)
                 clipboardHelper?.timeoutCopyToClipboard(entry.password,
-                                getString(R.string.copy_field,
+                        getString(R.string.copy_field,
                                 getString(R.string.entry_password)))
                 database.stopManageEntry(entry)
-            })
+            }
         } else {
             // If dialog not already shown
             if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
-                entryContentsView?.assignPasswordCopyListener(showWarningClipboardDialogOnClickListener)
+                showWarningClipboardDialogOnClickListener
             } else {
-                entryContentsView?.assignPasswordCopyListener(null)
+                null
             }
         }
+        entryContentsView?.assignPassword(entry.password,
+                allowCopyPasswordAndProtectedFields,
+                onPasswordCopyClickListener)
 
         //Assign OTP field
         entryContentsView?.assignOtp(entry.getOtpElement(), entryProgress,
@@ -304,24 +307,22 @@ class EntryActivity : LockingActivity() {
         })
 
         entryContentsView?.assignURL(entry.url)
-        entryContentsView?.assignComment(entry.notes)
+        entryContentsView?.assignNotes(entry.notes)
 
         // Assign custom fields
-        if (entry.allowCustomFields()) {
+        if (mDatabase?.allowEntryCustomFields() == true) {
             entryContentsView?.clearExtraFields()
-
-            for (element in entry.customFields.entries) {
-                val label = element.key
-                val value = element.value
-
+            entry.getExtraFields().forEach { field ->
+                val label = field.name
+                val value = field.protectedValue
                 val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
                 if (allowCopyProtectedField) {
-                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField, View.OnClickListener {
+                    entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
                         clipboardHelper?.timeoutCopyToClipboard(
                                 value.toString(),
                                 getString(R.string.copy_field, label)
                         )
-                    })
+                    }
                 } else {
                     // If dialog not already shown
                     if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
@@ -332,28 +333,16 @@ class EntryActivity : LockingActivity() {
                 }
             }
         }
-        entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
+        entryContentsView?.setHiddenProtectedValue(!mShowPassword)
 
         // Manage attachments
-        val attachments = entry.getAttachments()
-        val showAttachmentsView = attachments.isNotEmpty()
-        entryContentsView?.showAttachments(showAttachmentsView)
-        if (showAttachmentsView) {
-            entryContentsView?.assignAttachments(attachments)
-            entryContentsView?.onAttachmentClick { attachmentItem, _ ->
-                when (attachmentItem.downloadState) {
-                    AttachmentState.NULL, AttachmentState.ERROR, AttachmentState.COMPLETE -> {
-                        createDocument(this, attachmentItem.name)?.let { requestCode ->
-                            mAttachmentsToDownload[requestCode] = attachmentItem
-                        }
-                    }
-                    else -> {
-                        // TODO Stop download
-                    }
+        mDatabase?.binaryPool?.let { binaryPool ->
+            entryContentsView?.assignAttachments(entry.getAttachments(binaryPool).toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
+                createDocument(this, attachmentItem.name)?.let { requestCode ->
+                    mAttachmentsToDownload[requestCode] = attachmentItem
                 }
             }
         }
-        entryContentsView?.refreshAttachments()
 
         // Assign dates
         entryContentsView?.assignCreationDate(entry.creationTime)
@@ -373,16 +362,9 @@ class EntryActivity : LockingActivity() {
             collapsingToolbarLayout?.contentScrim = ColorDrawable(taColorAccent.getColor(0, Color.BLACK))
             taColorAccent.recycle()
         }
-        val entryHistory = entry.getHistory()
-        val showHistoryView = entryHistory.isNotEmpty()
-        entryContentsView?.showHistory(showHistoryView)
-        if (showHistoryView) {
-            entryContentsView?.assignHistory(entryHistory)
-            entryContentsView?.onHistoryClick { historyItem, position ->
-                launch(this, historyItem, mReadOnly, position)
-            }
+        entryContentsView?.assignHistory(entry.getHistory()) { historyItem, position ->
+            launch(this, historyItem, mReadOnly, position)
         }
-        entryContentsView?.refreshHistory()
 
         // Assign special data
         entryContentsView?.assignUUID(entry.nodeId.id)
@@ -411,16 +393,6 @@ class EntryActivity : LockingActivity() {
         }
     }
 
-    private fun changeShowPasswordIcon(togglePassword: MenuItem?) {
-        if (mShowPassword) {
-            togglePassword?.setTitle(R.string.menu_hide_password)
-            togglePassword?.setIcon(R.drawable.ic_visibility_off_white_24dp)
-        } else {
-            togglePassword?.setTitle(R.string.menu_showpass)
-            togglePassword?.setIcon(R.drawable.ic_visibility_white_24dp)
-        }
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
 
@@ -436,15 +408,6 @@ class EntryActivity : LockingActivity() {
             menu.findItem(R.id.menu_edit)?.isVisible = false
         }
 
-        val togglePassword = menu.findItem(R.id.menu_toggle_pass)
-        entryContentsView?.let {
-            if (it.isPasswordPresent || it.atLeastOneFieldProtectedPresent()) {
-                changeShowPasswordIcon(togglePassword)
-            } else {
-                togglePassword?.isVisible = false
-            }
-        }
-
         val gotoUrl = menu.findItem(R.id.menu_goto_url)
         gotoUrl?.apply {
             // In API >= 11 onCreateOptionsMenu may be called before onCreate completes
@@ -460,35 +423,38 @@ class EntryActivity : LockingActivity() {
         }
 
         // Show education views
-        Handler().post { performedNextEducation(EntryActivityEducation(this), menu) }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(EntryActivityEducation(this), menu) }
 
         return true
     }
 
     private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
                                        menu: Menu) {
-        val entryCopyEducationPerformed = entryContentsView?.isUserNamePresent == true
+        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
+        val entryCopyEducationPerformed = entryFieldCopyView != null
                 && entryActivityEducation.checkAndPerformedEntryCopyEducation(
-                        findViewById(R.id.entry_user_name_action_image),
+                        entryFieldCopyView,
                         {
-                            clipboardHelper?.timeoutCopyToClipboard(mEntry!!.username,
-                                    getString(R.string.copy_field,
-                                            getString(R.string.entry_user_name)))
+                            val appNameString = getString(R.string.app_name)
+                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
+                                    getString(R.string.copy_field, appNameString))
                         },
                         {
                             performedNextEducation(entryActivityEducation, menu)
                         })
 
         if (!entryCopyEducationPerformed) {
+            val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
             // entryEditEducationPerformed
-            toolbar?.findViewById<View>(R.id.menu_edit) != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
-                            toolbar!!.findViewById(R.id.menu_edit),
-                            {
-                                onOptionsItemSelected(menu.findItem(R.id.menu_edit))
-                            },
-                            {
-                                performedNextEducation(entryActivityEducation, menu)
-                            })
+            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
+                    menuEditView,
+                    {
+                        onOptionsItemSelected(menu.findItem(R.id.menu_edit))
+                    },
+                    {
+                        performedNextEducation(entryActivityEducation, menu)
+                    }
+            )
         }
     }
 
@@ -498,12 +464,6 @@ class EntryActivity : LockingActivity() {
                 MenuUtil.onContributionItemSelected(this)
                 return true
             }
-            R.id.menu_toggle_pass -> {
-                mShowPassword = !mShowPassword
-                changeShowPasswordIcon(item)
-                entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
-                return true
-            }
             R.id.menu_edit -> {
                 mEntry?.let {
                     EntryEditActivity.launch(this@EntryActivity, it)
@@ -523,7 +483,7 @@ class EntryActivity : LockingActivity() {
             }
             R.id.menu_restore_entry_history -> {
                 mEntryLastVersion?.let { mainEntry ->
-                    mProgressDialogThread?.startDatabaseRestoreEntryHistory(
+                    mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory(
                             mainEntry,
                             mEntryHistoryPosition,
                             !mReadOnly && mAutoSaveEnable)
@@ -531,14 +491,14 @@ class EntryActivity : LockingActivity() {
             }
             R.id.menu_delete_entry_history -> {
                 mEntryLastVersion?.let { mainEntry ->
-                    mProgressDialogThread?.startDatabaseDeleteEntryHistory(
+                    mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(
                             mainEntry,
                             mEntryHistoryPosition,
                             !mReadOnly && mAutoSaveEnable)
                 }
             }
             R.id.menu_save_database -> {
-                mProgressDialogThread?.startDatabaseSave(!mReadOnly)
+                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
             }
             android.R.id.home -> finish() // close this activity and return to preview activity (if there is any)
         }

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

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

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

@@ -24,7 +24,6 @@ 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
@@ -32,6 +31,7 @@ import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.UriUtil
 
 /**
  * Activity to search or select entry in database,
@@ -55,17 +55,27 @@ class EntrySelectionLauncherActivity : AppCompatActivity() {
             else -> {}
         }
 
-        // Setting to integrate Magikeyboard
-        val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
-
         // Build search param
         val searchInfo = SearchInfo().apply {
             webDomain = sharedWebDomain
         }
+        SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+            searchInfo.webDomain = concreteWebDomain
+            launch(searchInfo)
+        }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    private fun launch(searchInfo: SearchInfo) {
+        // Setting to integrate Magikeyboard
+        val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
 
         // If database is open
+        val database = Database.getInstance()
+        val readOnly = database.isReadOnly
         SearchHelper.checkAutoSearchInfo(this,
-                Database.getInstance(),
+                database,
                 searchInfo,
                 { items ->
                     // Items found
@@ -78,43 +88,43 @@ class EntrySelectionLauncherActivity : AppCompatActivity() {
                                     intent)
                         } else {
                             // Select the one we want
-                            GroupActivity.launchForEntrySelectionResult(this,
-                                    true,
-                                    searchInfo)
+                            GroupActivity.launchForKeyboardSelectionResult(this,
+                                    readOnly,
+                                    searchInfo,
+                                    true)
                         }
                     } else {
-                        GroupActivity.launch(this,
-                                true,
-                                searchInfo)
+                        GroupActivity.launchForSearchResult(this,
+                                readOnly,
+                                searchInfo,
+                                true)
                     }
                 },
                 {
                     // Show the database UI to select the entry
-                    if (searchShareForMagikeyboard) {
-                        GroupActivity.launchForEntrySelectionResult(this,
-                                false,
-                                searchInfo)
+                    if (readOnly || searchShareForMagikeyboard) {
+                        GroupActivity.launchForKeyboardSelectionResult(this,
+                                readOnly,
+                                searchInfo,
+                                false)
                     } else {
-                        GroupActivity.launch(this,
-                                false,
-                                searchInfo)
+                        GroupActivity.launchForSaveResult(this,
+                                searchInfo,
+                                false)
                     }
                 },
                 {
                     // If database not open
                     if (searchShareForMagikeyboard) {
-                        FileDatabaseSelectActivity.launchForEntrySelectionResult(this,
+                        FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this,
                                 searchInfo)
                     } else {
-                        FileDatabaseSelectActivity.launch(this,
+                        FileDatabaseSelectActivity.launchForSearchResult(this,
                                 searchInfo)
                     }
                 }
         )
-
         finish()
-
-        super.onCreate(savedInstanceState)
     }
 }
 
@@ -125,6 +135,6 @@ fun populateKeyboardAndMoveAppToBackground(activity: Activity,
     // Populate Magikeyboard with entry
     MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
     // Consume the selection mode
-    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
+    EntrySelectionHelper.removeModesFromIntent(intent)
     activity.moveTaskToBack(true)
 }

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

@@ -19,7 +19,6 @@
  */
 package com.kunzisoft.keepass.activities
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.assist.AssistStructure
 import android.content.Context
@@ -28,13 +27,16 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
@@ -42,20 +44,25 @@ import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
-import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 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
 
@@ -64,10 +71,11 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
 
     // Views
     private var coordinatorLayout: CoordinatorLayout? = null
-    private var fileManagerExplanationButton: View? = 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
 
@@ -75,9 +83,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
 
     private var mDatabaseFileUri: Uri? = null
 
-    private var mOpenFileHelper: OpenFileHelper? = null
+    private var mSelectFileHelper: SelectFileHelper? = null
 
-    private var mProgressDialogThread: ProgressDialogThread? = null
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -91,20 +99,15 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         toolbar.title = ""
         setSupportActionBar(toolbar)
 
-        fileManagerExplanationButton = findViewById(R.id.file_manager_explanation_button)
-        fileManagerExplanationButton?.setOnClickListener {
-            UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
-        }
-
         // Create database button
         createDatabaseButtonView = findViewById(R.id.create_database_button)
         createDatabaseButtonView?.setOnClickListener { createNewFile() }
 
         // Open database button
-        mOpenFileHelper = OpenFileHelper(this)
+        mSelectFileHelper = SelectFileHelper(this)
         openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
         openDatabaseButtonView?.apply {
-            mOpenFileHelper?.openFileOnClickViewListener?.let {
+            mSelectFileHelper?.selectFileOnClickViewListener?.let {
                 setOnClickListener(it)
                 setOnLongClickListener(it)
             }
@@ -117,26 +120,25 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         (fileDatabaseHistoryRecyclerView.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
         // Construct adapter with listeners
         mAdapterDatabaseHistory = FileDatabaseHistoryAdapter(this)
+        mAdapterDatabaseHistory?.setOnDefaultDatabaseListener { databaseFile ->
+            databaseFilesViewModel.setDefaultDatabase(databaseFile)
+        }
         mAdapterDatabaseHistory?.setOnFileDatabaseHistoryOpenListener { fileDatabaseHistoryEntityToOpen ->
-            UriUtil.parse(fileDatabaseHistoryEntityToOpen.databaseUri)?.let { databaseFileUri ->
+            fileDatabaseHistoryEntityToOpen.databaseUri?.let { databaseFileUri ->
                 launchPasswordActivity(
                         databaseFileUri,
-                        UriUtil.parse(fileDatabaseHistoryEntityToOpen.keyFileUri))
+                        fileDatabaseHistoryEntityToOpen.keyFileUri
+                )
             }
         }
         mAdapterDatabaseHistory?.setOnFileDatabaseHistoryDeleteListener { fileDatabaseHistoryToDelete ->
             // Remove from app database
-            mFileDatabaseHistoryAction?.deleteFileDatabaseHistory(fileDatabaseHistoryToDelete) { fileHistoryDeleted ->
-                // Remove from adapter
-                fileHistoryDeleted?.let { databaseFileHistoryDeleted ->
-                    mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileHistoryDeleted)
-                    mAdapterDatabaseHistory?.notifyDataSetChanged()
-                }
-            }
+            databaseFilesViewModel.deleteDatabaseFile(fileDatabaseHistoryToDelete)
             true
         }
         mAdapterDatabaseHistory?.setOnSaveAliasListener { fileDatabaseHistoryWithNewAlias ->
-            mFileDatabaseHistoryAction?.addOrUpdateFileDatabaseHistory(fileDatabaseHistoryWithNewAlias)
+            // Update in app database
+            databaseFilesViewModel.updateDatabaseFile(fileDatabaseHistoryWithNewAlias)
         }
         fileDatabaseHistoryRecyclerView.adapter = mAdapterDatabaseHistory
 
@@ -159,12 +161,66 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
             mDatabaseFileUri = savedInstanceState.getParcelable(EXTRA_DATABASE_URI)
         }
 
+        // Observe list of databases
+        databaseFilesViewModel.databaseFilesLoaded.observe(this, Observer { databaseFiles ->
+            when (databaseFiles.databaseFileAction) {
+                DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
+                    mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
+                        mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
+                    }
+                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                            PreferencesUtil.enableReadOnlyDatabase(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
-        mProgressDialogThread = ProgressDialogThread(this).apply {
-            onActionFinish = { actionTask, _ ->
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
+            onActionFinish = { actionTask, result ->
                 when (actionTask) {
                     ACTION_DATABASE_CREATE_TASK -> {
-                        GroupActivity.launch(this@FileDatabaseSelectActivity)
+                        result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
+                            val keyFileUri = result.data?.getParcelable<Uri?>(KEY_FILE_URI_KEY)
+                            databaseFilesViewModel.addDatabaseFile(databaseUri, keyFileUri)
+                        }
+                    }
+                    ACTION_DATABASE_LOAD_TASK -> {
+                        val database = Database.getInstance()
+                        if (result.isSuccess
+                                && database.loaded) {
+                            launchGroupActivity(database)
+                        } else {
+                            var resultError = ""
+                            val resultMessage = result.message
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError)
+                            Snackbar.make(activity_file_selection_coordinator_layout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
+                        }
                     }
                 }
             }
@@ -174,7 +230,6 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     /**
      * Create a new file by calling the content provider
      */
-    @SuppressLint("InlinedApi")
     private fun createNewFile() {
         createDocument(this, getString(R.string.database_file_name_default) +
                 getString(R.string.database_file_extension_default), "application/x-keepass")
@@ -189,71 +244,32 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     }
 
     private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-        EntrySelectionHelper.doEntrySelectionAction(intent,
-                {
-                    try {
-                        PasswordActivity.launch(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile,
-                                searchInfo)
-                    } catch (e: FileNotFoundException) {
-                        fileNoFoundAction(e)
-                    }
-                    // Remove the search info from intent
-                    if (searchInfo != null) {
-                        finish()
-                    }
+        PasswordActivity.launch(this,
+                databaseUri,
+                keyFile,
+                { exception ->
+                    fileNoFoundAction(exception)
                 },
-                {
-                    try {
-                        PasswordActivity.launchForKeyboardResult(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile,
-                                searchInfo)
-                    } catch (e: FileNotFoundException) {
-                        fileNoFoundAction(e)
-                    }
-                    finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        try {
-                            PasswordActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
-                                    databaseUri, keyFile,
-                                    assistStructure,
-                                    searchInfo)
-                        } catch (e: FileNotFoundException) {
-                            fileNoFoundAction(e)
-                        }
-                    }
-                })
+                { onCancelSpecialMode() },
+                { onLaunchActivitySpecialMode() })
     }
 
-    private fun launchGroupActivity(readOnly: Boolean) {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-        EntrySelectionHelper.doEntrySelectionAction(intent,
-                {
-                    GroupActivity.launch(this@FileDatabaseSelectActivity,
-                            false,
-                            searchInfo,
-                            readOnly)
-                },
-                {
-                    GroupActivity.launchForEntrySelectionResult(this@FileDatabaseSelectActivity,
-                            false,
-                            searchInfo,
-                            readOnly)
-                    // Do not keep history
-                    finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
-                                assistStructure,
-                                false,
-                                searchInfo,
-                                readOnly)
-                    }
-                })
+    private fun launchGroupActivity(database: Database) {
+        GroupActivity.launch(this,
+                database.isReadOnly,
+                { onValidateSpecialMode() },
+                { onCancelSpecialMode() },
+                { onLaunchActivitySpecialMode() })
+    }
+
+    override fun onValidateSpecialMode() {
+        super.onValidateSpecialMode()
+        finish()
+    }
+
+    override fun onCancelSpecialMode() {
+        super.onCancelSpecialMode()
+        finish()
     }
 
     private fun launchPasswordActivityWithPath(databaseUri: Uri) {
@@ -267,53 +283,42 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
         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.
+        when (mSpecialMode) {
+            SpecialMode.DEFAULT -> {
+                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
+                }
+            }
+            else -> {
+                // Disable create button if in selection mode or request for autofill
                 createDatabaseButtonView?.visibility = View.GONE
             }
         }
 
         val database = Database.getInstance()
         if (database.loaded) {
-            launchGroupActivity(database.isReadOnly)
+            launchGroupActivity(database)
         } else {
             // Construct adapter with listeners
             if (PreferencesUtil.showRecentFiles(this)) {
-                mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
-                    databaseFileHistoryList?.let { historyList ->
-                        val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(this@FileDatabaseSelectActivity)
-                        mAdapterDatabaseHistory?.addDatabaseFileHistoryList(
-                                // Show only uri accessible
-                                historyList.filter {
-                                    if (hideBrokenLocations) {
-                                        FileDatabaseInfo(this@FileDatabaseSelectActivity,
-                                                it.databaseUri).exists
-                                    } else
-                                        true
-                                })
-                        mAdapterDatabaseHistory?.notifyDataSetChanged()
-                    }
-                }
+                databaseFilesViewModel.loadListOfDatabases()
             } else {
                 mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
                 mAdapterDatabaseHistory?.notifyDataSetChanged()
             }
 
             // Register progress task
-            mProgressDialogThread?.registerProgressTask()
+            mProgressDatabaseTaskProvider?.registerProgressTask()
         }
     }
 
     override fun onPause() {
         // Unregister progress task
-        mProgressDialogThread?.unregisterProgressTask()
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
 
         super.onPause()
     }
@@ -334,7 +339,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
             mDatabaseFileUri?.let { databaseUri ->
 
                 // Create the new database
-                mProgressDialogThread?.startDatabaseCreate(
+                mProgressDatabaseTaskProvider?.startDatabaseCreate(
                         databaseUri,
                         masterPasswordChecked,
                         masterPassword,
@@ -362,8 +367,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
             AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
         }
 
-        mOpenFileHelper?.onActivityResultCallback(requestCode, resultCode, data
-        ) { uri ->
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
             if (uri != null) {
                 launchPasswordActivityWithPath(uri)
             }
@@ -388,11 +392,11 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
 
-        if (!mSelectionMode) {
+        if (mSpecialMode == SpecialMode.DEFAULT) {
             MenuUtil.defaultMenuInflater(menuInflater, menu)
         }
 
-        Handler().post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
 
         return true
     }
@@ -419,7 +423,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                     openDatabaseButtonView!!,
                     {tapTargetView ->
                         tapTargetView?.let {
-                            mOpenFileHelper?.openFileOnClickViewListener?.onClick(it)
+                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
                         }
                     },
                     {}
@@ -428,6 +432,10 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
+        }
+
         return MenuUtil.onDefaultMenuOptionsItemSelected(this, item) && super.onOptionsItemSelected(item)
     }
 
@@ -439,17 +447,25 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
 
         /*
          * -------------------------
-         * Launch only to standard search, else pass by PasswordActivity
+         * 		Standard Launch
          * -------------------------
          */
 
-        fun launch(context: Context,
-                   searchInfo: SearchInfo? = null) {
-            val intent = Intent(context, FileDatabaseSelectActivity::class.java)
-            searchInfo?.let {
-                intent.putExtra(KEY_SEARCH_INFO, it)
-            }
-            context.startActivity(intent)
+        fun launch(context: Context) {
+            context.startActivity(Intent(context, FileDatabaseSelectActivity::class.java))
+        }
+
+        /*
+         * -------------------------
+         * 		Search Launch
+         * -------------------------
+         */
+
+        fun launchForSearchResult(context: Context,
+                                  searchInfo: SearchInfo) {
+            EntrySelectionHelper.startActivityForSearchModeResult(context,
+                    Intent(context, FileDatabaseSelectActivity::class.java),
+                    searchInfo)
         }
 
         /*
@@ -458,9 +474,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
          * -------------------------
          */
 
-        fun launchForEntrySelectionResult(activity: Activity,
-                                          searchInfo: SearchInfo? = null) {
-            EntrySelectionHelper.startActivityForEntrySelectionResult(activity,
+        fun launchForKeyboardSelectionResult(activity: Activity,
+                                             searchInfo: SearchInfo? = null) {
+            EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(activity,
                     Intent(activity, FileDatabaseSelectActivity::class.java),
                     searchInfo)
         }
@@ -480,5 +496,17 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                     assistStructure,
                     searchInfo)
         }
+
+        /*
+         * -------------------------
+         * 		Registration Launch
+         * -------------------------
+         */
+        fun launchForRegistration(context: Context,
+                                  registerInfo: RegisterInfo? = null) {
+            EntrySelectionHelper.startActivityForRegistrationModeResult(context,
+                    Intent(context, FileDatabaseSelectActivity::class.java),
+                    registerInfo)
+        }
     }
 }

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

@@ -28,6 +28,7 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
@@ -35,6 +36,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
@@ -43,13 +45,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.*
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter
 import com.kunzisoft.keepass.autofill.AutofillHelper
@@ -61,14 +60,16 @@ import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.education.GroupActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.model.getSearchString
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.NEW_NODES_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.OLD_NODES_KEY
@@ -76,10 +77,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.MenuUtil
-import com.kunzisoft.keepass.view.AddNodeButtonView
-import com.kunzisoft.keepass.view.ToolbarAction
-import com.kunzisoft.keepass.view.asError
-import com.kunzisoft.keepass.view.showActionError
+import com.kunzisoft.keepass.view.*
 
 class GroupActivity : LockingActivity(),
         GroupEditDialogFragment.EditGroupListener,
@@ -108,6 +106,8 @@ class GroupActivity : LockingActivity(),
     private var mCurrentGroupIsASearch: Boolean = false
     private var mRequestStartupSearch = true
 
+    private var actionNodeMode: ActionMode? = null
+
     // To manage history in selection mode
     private var mSelectionModeCountBackStack = 0
 
@@ -123,9 +123,6 @@ class GroupActivity : LockingActivity(),
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (isFinishing) {
-            return
-        }
         mDatabase = Database.getInstance()
 
         // Construct main view
@@ -206,23 +203,55 @@ class GroupActivity : LockingActivity(),
         }
 
         // Add listeners to the add buttons
-        addNodeButtonView?.setAddGroupClickListener(View.OnClickListener {
+        addNodeButtonView?.setAddGroupClickListener {
             GroupEditDialogFragment.build()
                     .show(supportFragmentManager,
                             GroupEditDialogFragment.TAG_CREATE_GROUP)
-        })
-        addNodeButtonView?.setAddEntryClickListener(View.OnClickListener {
+        }
+        addNodeButtonView?.setAddEntryClickListener {
             mCurrentGroup?.let { currentGroup ->
-                EntryEditActivity.launch(this@GroupActivity, currentGroup)
+                EntrySelectionHelper.doSpecialAction(intent,
+                        {
+                            EntryEditActivity.launch(this@GroupActivity, currentGroup)
+                        },
+                        {
+                            // Search not used
+                        },
+                        { searchInfo ->
+                            EntryEditActivity.launchForSave(this@GroupActivity,
+                                    currentGroup, searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo ->
+                            EntryEditActivity.launchForKeyboardSelectionResult(this@GroupActivity,
+                                    currentGroup, searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo, assistStructure ->
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                EntryEditActivity.launchForAutofillResult(this@GroupActivity,
+                                        assistStructure,
+                                        currentGroup, searchInfo)
+                                onLaunchActivitySpecialMode()
+                            } else {
+                                onCancelSpecialMode()
+                            }
+                        },
+                        { searchInfo ->
+                            EntryEditActivity.launchForRegistration(this@GroupActivity,
+                                    currentGroup, searchInfo)
+                            onLaunchActivitySpecialMode()
+                        }
+                )
             }
-        })
+        }
 
         mDatabase?.let { database ->
             // Search suggestion
             mSearchSuggestionAdapter = SearchEntryCursorAdapter(this, database)
 
             // Init dialog thread
-            mProgressDialogThread?.onActionFinish = { actionTask, result ->
+            mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
 
                 var oldNodes: List<Node> = ArrayList()
                 result.data?.getBundle(OLD_NODES_KEY)?.let { oldNodesBundle ->
@@ -236,6 +265,41 @@ class GroupActivity : LockingActivity(),
                 refreshSearchGroup()
 
                 when (actionTask) {
+                    ACTION_DATABASE_UPDATE_ENTRY_TASK -> {
+                        if (result.isSuccess) {
+                            mListNodesFragment?.updateNodes(oldNodes, newNodes)
+                            EntrySelectionHelper.doSpecialAction(intent,
+                                    {
+                                        // Standard not used after task
+                                    },
+                                    {
+                                        // Search not used
+                                    },
+                                    {
+                                        // Save not used
+                                    },
+                                    {
+                                        try {
+                                            val entry = newNodes[0] as Entry
+                                            entrySelectedForKeyboardSelection(entry)
+                                        } catch (e: Exception) {
+                                            Log.e(TAG, "Unable to perform action for keyboard selection after entry update", e)
+                                        }
+                                    },
+                                    { _, _ ->
+                                        try {
+                                            val entry = newNodes[0] as Entry
+                                            entrySelectedForAutofillSelection(entry)
+                                        } catch (e: Exception) {
+                                            Log.e(TAG, "Unable to perform action for autofill selection after entry update", e)
+                                        }
+                                    },
+                                    {
+                                        // Not use
+                                    }
+                            )
+                        }
+                    }
                     ACTION_DATABASE_UPDATE_GROUP_TASK -> {
                         if (result.isSuccess) {
                             mListNodesFragment?.updateNodes(oldNodes, newNodes)
@@ -309,11 +373,11 @@ class GroupActivity : LockingActivity(),
      */
     private fun manageSearchInfoIntent(intent: Intent): Boolean {
         // To relaunch the activity as ACTION_SEARCH
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        val searchInfo: SearchInfo? = EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
         val autoSearch = intent.getBooleanExtra(AUTO_SEARCH_KEY, false)
         if (searchInfo != null && autoSearch) {
             intent.action = Intent.ACTION_SEARCH
-            intent.putExtra(SearchManager.QUERY, searchInfo.getSearchString(this))
+            intent.putExtra(SearchManager.QUERY, searchInfo.toString())
             return true
         }
         return false
@@ -358,7 +422,7 @@ class GroupActivity : LockingActivity(),
             fragmentTransaction.addToBackStack(fragmentTag)
             fragmentTransaction.commit()
 
-            if (mSelectionMode)
+            if (mSpecialMode != SpecialMode.DEFAULT)
                 mSelectionModeCountBackStack++
 
             // Update last access time.
@@ -481,24 +545,11 @@ class GroupActivity : LockingActivity(),
             enableAddGroup(addGroupEnabled)
             enableAddEntry(addEntryEnabled)
 
-            showButton()
+            if (actionNodeMode == null)
+                showButton()
         }
     }
 
-    override fun onCancelSpecialMode() {
-        // To remove the navigation history and
-        EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
-        val fragmentManager = supportFragmentManager
-        if (mSelectionModeCountBackStack > 0) {
-            for (selectionMode in 0 .. mSelectionModeCountBackStack) {
-                fragmentManager.popBackStack()
-            }
-        }
-        // Reinit the counter for navigation history
-        mSelectionModeCountBackStack = 0
-        backToTheAppCaller()
-    }
-
     private fun refreshNumberOfChildren() {
         numberChildrenView?.apply {
             if (PreferencesUtil.showNumberEntries(context)) {
@@ -511,7 +562,8 @@ class GroupActivity : LockingActivity(),
     }
 
     override fun onScrolled(dy: Int) {
-        addNodeButtonView?.hideButtonOnScrollListener(dy)
+        if (actionNodeMode == null)
+            addNodeButtonView?.hideOrShowButtonOnScrollListener(dy)
     }
 
     override fun onNodeClick(node: Node) {
@@ -525,28 +577,42 @@ class GroupActivity : LockingActivity(),
 
             Type.ENTRY -> try {
                 val entryVersioned = node as Entry
-                EntrySelectionHelper.doEntrySelectionAction(intent,
+                EntrySelectionHelper.doSpecialAction(intent,
                         {
                             EntryActivity.launch(this@GroupActivity, entryVersioned, mReadOnly)
                         },
                         {
-                            rebuildListNodes()
-                            // Populate Magikeyboard with entry
-                            mDatabase?.let { database ->
-                                populateKeyboardAndMoveAppToBackground(this@GroupActivity,
-                                        entryVersioned.getEntryInfo(database),
-                                        intent)
+                            // Nothing here, a search is simply performed
+                        },
+                        { searchInfo ->
+                            if (!mReadOnly)
+                                entrySelectedForSave(entryVersioned, searchInfo)
+                            else
+                                finish()
+                        },
+                        { searchInfo ->
+                            if (!mReadOnly
+                                    && searchInfo != null
+                                    && PreferencesUtil.isKeyboardSaveSearchInfoEnable(this@GroupActivity)) {
+                                updateEntryWithSearchInfo(entryVersioned, searchInfo)
+                            } else {
+                                entrySelectedForKeyboardSelection(entryVersioned)
                             }
                         },
-                        {
-                            // Build response with the entry selected
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && mDatabase != null) {
-                                mDatabase?.let { database ->
-                                    AutofillHelper.buildResponse(this@GroupActivity,
-                                            entryVersioned.getEntryInfo(database))
-                                }
+                        { searchInfo, _ ->
+                            if (!mReadOnly
+                                    && searchInfo != null
+                                    && PreferencesUtil.isAutofillSaveSearchInfoEnable(this@GroupActivity)) {
+                                updateEntryWithSearchInfo(entryVersioned, searchInfo)
+                            } else {
+                                entrySelectedForAutofillSelection(entryVersioned)
                             }
-                            finish()
+                        },
+                        { registerInfo ->
+                            if (!mReadOnly)
+                                entrySelectedForRegistration(entryVersioned, registerInfo)
+                            else
+                                finish()
                         })
             } catch (e: ClassCastException) {
                 Log.e(TAG, "Node can't be cast in Entry")
@@ -554,18 +620,79 @@ class GroupActivity : LockingActivity(),
         }
     }
 
-    private var actionNodeMode: ActionMode? = null
+    private fun entrySelectedForSave(entry: Entry, searchInfo: SearchInfo) {
+        rebuildListNodes()
+        // Save to update the entry
+        EntryEditActivity.launchForSave(this@GroupActivity,
+                entry, searchInfo)
+        onLaunchActivitySpecialMode()
+    }
+
+    private fun entrySelectedForKeyboardSelection(entry: Entry) {
+        rebuildListNodes()
+        // Populate Magikeyboard with entry
+        mDatabase?.let { database ->
+            populateKeyboardAndMoveAppToBackground(this,
+                    entry.getEntryInfo(database),
+                    intent)
+        }
+        onValidateSpecialMode()
+    }
+
+    private fun entrySelectedForAutofillSelection(entry: Entry) {
+        // Build response with the entry selected
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && mDatabase != null) {
+            mDatabase?.let { database ->
+                AutofillHelper.buildResponse(this,
+                        entry.getEntryInfo(database))
+            }
+        }
+        onValidateSpecialMode()
+    }
+
+    private fun entrySelectedForRegistration(entry: Entry, registerInfo: RegisterInfo?) {
+        rebuildListNodes()
+        // Registration to update the entry
+        EntryEditActivity.launchForRegistration(this@GroupActivity,
+                entry, registerInfo)
+        onLaunchActivitySpecialMode()
+    }
+
+    private fun updateEntryWithSearchInfo(entry: Entry, searchInfo: SearchInfo) {
+        val newEntry = Entry(entry)
+        newEntry.setEntryInfo(mDatabase, newEntry.getEntryInfo(mDatabase).apply {
+            saveSearchInfo(mDatabase, searchInfo)
+        })
+        // In selection mode, it's forced read-only, so update not allowed
+        mProgressDatabaseTaskProvider?.startDatabaseUpdateEntry(
+                entry,
+                newEntry,
+                !mReadOnly && mAutoSaveEnable
+        )
+    }
 
     private fun finishNodeAction() {
         actionNodeMode?.finish()
-        actionNodeMode = null
-        addNodeButtonView?.showButton()
     }
 
     override fun onNodeSelected(nodes: List<Node>): Boolean {
         if (nodes.isNotEmpty()) {
             if (actionNodeMode == null || toolbarAction?.getSupportActionModeCallback() == null) {
-                mListNodesFragment?.actionNodesCallback(nodes, this)?.let {
+                mListNodesFragment?.actionNodesCallback(nodes, this, object: ActionMode.Callback {
+                    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                        return true
+                    }
+                    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                        return true
+                    }
+                    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+                        return false
+                    }
+                    override fun onDestroyActionMode(mode: ActionMode?) {
+                        actionNodeMode = null
+                        addNodeButtonView?.showButton()
+                    }
+                })?.let {
                     actionNodeMode = toolbarAction?.startSupportActionMode(it)
                 }
             } else {
@@ -622,7 +749,7 @@ class GroupActivity : LockingActivity(),
                 ListNodesFragment.PasteMode.PASTE_FROM_COPY -> {
                     // Copy
                     mCurrentGroup?.let { newParent ->
-                        mProgressDialogThread?.startDatabaseCopyNodes(
+                        mProgressDatabaseTaskProvider?.startDatabaseCopyNodes(
                                 nodes,
                                 newParent,
                                 !mReadOnly && mAutoSaveEnable
@@ -632,7 +759,7 @@ class GroupActivity : LockingActivity(),
                 ListNodesFragment.PasteMode.PASTE_FROM_MOVE -> {
                     // Move
                     mCurrentGroup?.let { newParent ->
-                        mProgressDialogThread?.startDatabaseMoveNodes(
+                        mProgressDatabaseTaskProvider?.startDatabaseMoveNodes(
                                 nodes,
                                 newParent,
                                 !mReadOnly && mAutoSaveEnable
@@ -653,7 +780,7 @@ class GroupActivity : LockingActivity(),
         return true
     }
 
-    override fun onDeleteMenuClick(nodes: List<Node>): Boolean {
+    private fun deleteNodes(nodes: List<Node>, recycleBin: Boolean = false): Boolean {
         val database = mDatabase
 
         // If recycle bin enabled, ensure it exists
@@ -666,22 +793,31 @@ class GroupActivity : LockingActivity(),
                 && database.isRecycleBinEnabled
                 && database.recycleBin != mCurrentGroup) {
 
-            mProgressDialogThread?.startDatabaseDeleteNodes(
+            mProgressDatabaseTaskProvider?.startDatabaseDeleteNodes(
                     nodes,
                     !mReadOnly && mAutoSaveEnable
             )
         }
         // else open the dialog to confirm deletion
         else {
-            DeleteNodesDialogFragment.getInstance(nodes)
-                    .show(supportFragmentManager, "deleteNodesDialogFragment")
+            val deleteNodesDialogFragment: DeleteNodesDialogFragment =
+            if (recycleBin) {
+                EmptyRecycleBinDialogFragment.getInstance(nodes)
+            } else {
+                DeleteNodesDialogFragment.getInstance(nodes)
+            }
+            deleteNodesDialogFragment.show(supportFragmentManager, "deleteNodesDialogFragment")
         }
         finishNodeAction()
         return true
     }
 
+    override fun onDeleteMenuClick(nodes: List<Node>): Boolean {
+        return deleteNodes(nodes)
+    }
+
     override fun permanentlyDeleteNodes(nodes: List<Node>) {
-        mProgressDialogThread?.startDatabaseDeleteNodes(
+        mProgressDatabaseTaskProvider?.startDatabaseDeleteNodes(
                 nodes,
                 !mReadOnly && mAutoSaveEnable
         )
@@ -700,6 +836,8 @@ class GroupActivity : LockingActivity(),
         assignGroupViewElements()
         // Refresh suggestions to change preferences
         mSearchSuggestionAdapter?.reInit(this)
+        // Padding if lock button visible
+        toolbarAction?.updateLockPaddingLeft()
     }
 
     override fun onPause() {
@@ -716,7 +854,7 @@ class GroupActivity : LockingActivity(),
         if (mReadOnly) {
             menu.findItem(R.id.menu_save_database)?.isVisible = false
         }
-        if (!mSelectionMode) {
+        if (mSpecialMode == SpecialMode.DEFAULT) {
             MenuUtil.defaultMenuInflater(inflater, menu)
         }
 
@@ -766,7 +904,7 @@ class GroupActivity : LockingActivity(),
         super.onCreateOptionsMenu(menu)
 
         // Launch education screen
-        Handler().post { performedNextEducation(GroupActivityEducation(this), menu) }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(GroupActivityEducation(this), menu) }
 
         return true
     }
@@ -840,13 +978,13 @@ class GroupActivity : LockingActivity(),
                 //onSearchRequested();
                 return true
             R.id.menu_save_database -> {
-                mProgressDialogThread?.startDatabaseSave(!mReadOnly)
+                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
                 return true
             }
             R.id.menu_empty_recycle_bin -> {
                 mCurrentGroup?.getChildren()?.let { listChildren ->
                     // Automatically delete all elements
-                    onDeleteMenuClick(listChildren)
+                    deleteNodes(listChildren, true)
                 }
                 return true
             }
@@ -874,7 +1012,7 @@ class GroupActivity : LockingActivity(),
                             // Not really needed here because added in runnable but safe
                             newGroup.parent = currentGroup
 
-                            mProgressDialogThread?.startDatabaseCreateGroup(
+                            mProgressDatabaseTaskProvider?.startDatabaseCreateGroup(
                                     newGroup,
                                     currentGroup,
                                     !mReadOnly && mAutoSaveEnable
@@ -896,7 +1034,7 @@ class GroupActivity : LockingActivity(),
                             }
                         }
                         // If group updated save it in the database
-                        mProgressDialogThread?.startDatabaseUpdateGroup(
+                        mProgressDatabaseTaskProvider?.startDatabaseUpdateGroup(
                                 oldGroupToUpdate,
                                 updateGroup,
                                 !mReadOnly && mAutoSaveEnable
@@ -982,41 +1120,51 @@ class GroupActivity : LockingActivity(),
         assignGroupViewElements()
     }
 
-    private fun backToTheAppCaller() {
-        if (mAutofillSelection) {
-            // To get the app caller, only for autofill
-            super.onBackPressed()
-        } else {
-            // To move the app in background
-            moveTaskToBack(true)
-        }
-    }
-
     override fun onBackPressed() {
         if (mListNodesFragment?.nodeActionSelectionMode == true) {
             finishNodeAction()
         } else {
             // Normal way when we are not in root
             if (mRootGroup != null && mRootGroup != mCurrentGroup) {
-                super.onBackPressed()
+                super.onRegularBackPressed()
                 rebuildListNodes()
             }
             // Else in root, lock if needed
             else {
                 intent.removeExtra(AUTO_SEARCH_KEY)
-                intent.removeExtra(KEY_SEARCH_INFO)
+                EntrySelectionHelper.removeModesFromIntent(intent)
+                EntrySelectionHelper.removeInfoFromIntent(intent)
                 if (PreferencesUtil.isLockDatabaseWhenBackButtonOnRootClicked(this)) {
                     lockAndExit()
-                    super.onBackPressed()
+                    super.onRegularBackPressed()
                 } else {
-                    // To restore standard mode
-                    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
                     backToTheAppCaller()
                 }
             }
         }
     }
 
+    private fun removeFragmentHistory() {
+        val fragmentManager = supportFragmentManager
+        if (mSelectionModeCountBackStack > 0) {
+            for (selectionMode in 0 .. mSelectionModeCountBackStack) {
+                fragmentManager.popBackStack()
+            }
+        }
+        // Reinit the counter for navigation history
+        mSelectionModeCountBackStack = 0
+    }
+
+    override fun onValidateSpecialMode() {
+        removeFragmentHistory()
+        super.onValidateSpecialMode()
+    }
+
+    override fun onCancelSpecialMode() {
+        removeFragmentHistory()
+        super.onCancelSpecialMode()
+    }
+
     companion object {
 
         private val TAG = GroupActivity::class.java.name
@@ -1064,30 +1212,62 @@ class GroupActivity : LockingActivity(),
          * -------------------------
          */
         fun launch(context: Context,
-                   autoSearch: Boolean = false,
-                   searchInfo: SearchInfo? = null,
-                   readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
+                   readOnly: Boolean,
+                   autoSearch: Boolean = false) {
             checkTimeAndBuildIntent(context, null, readOnly) { intent ->
-                searchInfo?.let {
-                    intent.putExtra(KEY_SEARCH_INFO, it)
-                }
                 intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
                 context.startActivity(intent)
             }
         }
 
+        /*
+         * -------------------------
+         * 		Search Launch
+         * -------------------------
+         */
+        fun launchForSearchResult(context: Context,
+                                  readOnly: Boolean,
+                                  searchInfo: SearchInfo,
+                                  autoSearch: Boolean = false) {
+            checkTimeAndBuildIntent(context, null, readOnly) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
+                EntrySelectionHelper.addSearchInfoInIntent(
+                        intent,
+                        searchInfo)
+                context.startActivity(intent)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Search save Launch
+         * -------------------------
+         */
+        fun launchForSaveResult(context: Context,
+                                searchInfo: SearchInfo,
+                                autoSearch: Boolean = false) {
+            checkTimeAndBuildIntent(context, null, false) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
+                EntrySelectionHelper.startActivityForSaveModeResult(context,
+                        intent,
+                        searchInfo)
+            }
+        }
+
         /*
          * -------------------------
          * 		Keyboard Launch
          * -------------------------
          */
-        fun launchForEntrySelectionResult(context: Context,
-                                          autoSearch: Boolean = false,
-                                          searchInfo: SearchInfo? = null,
-                                          readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
+        fun launchForKeyboardSelectionResult(context: Context,
+                                             readOnly: Boolean,
+                                             searchInfo: SearchInfo? = null,
+                                             autoSearch: Boolean = false) {
             checkTimeAndBuildIntent(context, null, readOnly) { intent ->
                 intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
-                EntrySelectionHelper.startActivityForEntrySelectionResult(context, intent, searchInfo)
+                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(context,
+                        intent,
+                        searchInfo)
             }
         }
 
@@ -1098,14 +1278,177 @@ class GroupActivity : LockingActivity(),
          */
         @RequiresApi(api = Build.VERSION_CODES.O)
         fun launchForAutofillResult(activity: Activity,
+                                    readOnly: Boolean,
                                     assistStructure: AssistStructure,
-                                    autoSearch: Boolean = false,
                                     searchInfo: SearchInfo? = null,
-                                    readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(activity)) {
+                                    autoSearch: Boolean = false) {
             checkTimeAndBuildIntent(activity, null, readOnly) { intent ->
                 intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
-                AutofillHelper.startActivityForAutofillResult(activity, intent, assistStructure, searchInfo)
+                AutofillHelper.startActivityForAutofillResult(activity,
+                        intent,
+                        assistStructure,
+                        searchInfo)
             }
         }
+
+        /*
+         * -------------------------
+         * 		Registration Launch
+         * -------------------------
+         */
+        fun launchForRegistration(context: Context,
+                                  registerInfo: RegisterInfo? = null) {
+            checkTimeAndBuildIntent(context, null, false) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, false)
+                EntrySelectionHelper.startActivityForRegistrationModeResult(context,
+                        intent,
+                        registerInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Global Launch
+         * -------------------------
+         */
+        fun launch(activity: Activity,
+                   readOnly: Boolean,
+                   onValidateSpecialMode: () -> Unit,
+                   onCancelSpecialMode: () -> Unit,
+                   onLaunchActivitySpecialMode: () -> Unit) {
+            EntrySelectionHelper.doSpecialAction(activity.intent,
+                    {
+                        GroupActivity.launch(activity,
+                                readOnly,
+                                true)
+                    },
+                    { searchInfo ->
+                        SearchHelper.checkAutoSearchInfo(activity,
+                                Database.getInstance(),
+                                searchInfo,
+                                { _ ->
+                                    // Response is build
+                                    GroupActivity.launchForSearchResult(activity,
+                                            readOnly,
+                                            searchInfo,
+                                            true)
+                                    onLaunchActivitySpecialMode()
+                                },
+                                {
+                                    // Here no search info found
+                                    if (readOnly) {
+                                        GroupActivity.launchForSearchResult(activity,
+                                                readOnly,
+                                                searchInfo,
+                                                false)
+                                    } else {
+                                        GroupActivity.launchForSaveResult(activity,
+                                                searchInfo,
+                                                false)
+                                    }
+                                    onLaunchActivitySpecialMode()
+                                },
+                                {
+                                    // Simply close if database not opened, normally not happened
+                                    onCancelSpecialMode()
+                                }
+                        )
+                    },
+                    {
+                        // Nothing with Save Info, only pass by search first
+                    },
+                    { searchInfo ->
+                        SearchHelper.checkAutoSearchInfo(activity,
+                                Database.getInstance(),
+                                searchInfo,
+                                { items ->
+                                    // Response is build
+                                    if (items.size == 1) {
+                                        populateKeyboardAndMoveAppToBackground(activity,
+                                                items[0],
+                                                activity.intent)
+                                        onValidateSpecialMode()
+                                    } else {
+                                        // Select the one we want
+                                        GroupActivity.launchForKeyboardSelectionResult(activity,
+                                                readOnly,
+                                                searchInfo,
+                                                true)
+                                        onLaunchActivitySpecialMode()
+                                    }
+                                },
+                                {
+                                    // Here no search info found, disable auto search
+                                    GroupActivity.launchForKeyboardSelectionResult(activity,
+                                            readOnly,
+                                            searchInfo,
+                                            false)
+                                    onLaunchActivitySpecialMode()
+                                },
+                                {
+                                    // Simply close if database not opened, normally not happened
+                                    onCancelSpecialMode()
+                                }
+                        )
+                    },
+                    { searchInfo, assistStructure ->
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                            SearchHelper.checkAutoSearchInfo(activity,
+                                    Database.getInstance(),
+                                    searchInfo,
+                                    { items ->
+                                        // Response is build
+                                        AutofillHelper.buildResponse(activity, items)
+                                        onValidateSpecialMode()
+                                    },
+                                    {
+                                        // Here no search info found, disable auto search
+                                        GroupActivity.launchForAutofillResult(activity,
+                                                readOnly,
+                                                assistStructure,
+                                                searchInfo,
+                                                false)
+                                        onLaunchActivitySpecialMode()
+                                    },
+                                    {
+                                        // Simply close if database not opened, normally not happened
+                                        onCancelSpecialMode()
+                                    }
+                            )
+                        } else {
+                            onCancelSpecialMode()
+                        }
+                    },
+                    { registerInfo ->
+                        if (!readOnly) {
+                            SearchHelper.checkAutoSearchInfo(activity,
+                                    Database.getInstance(),
+                                    registerInfo?.searchInfo,
+                                    { _ ->
+                                        // No auto search, it's a registration
+                                        GroupActivity.launchForRegistration(activity,
+                                                registerInfo)
+                                        onLaunchActivitySpecialMode()
+                                    },
+                                    {
+                                        // Here no search info found, disable auto search
+                                        GroupActivity.launchForRegistration(activity,
+                                                registerInfo)
+                                        onLaunchActivitySpecialMode()
+                                    },
+                                    {
+                                        // Simply close if database not opened, normally not happened
+                                        onCancelSpecialMode()
+                                    }
+                            )
+                        } else {
+                            Toast.makeText(activity.applicationContext,
+                                    R.string.autofill_read_only_save,
+                                    Toast.LENGTH_LONG)
+                                    .show()
+                            onCancelSpecialMode()
+                        }
+                    })
+        }
     }
 }

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

@@ -43,6 +43,7 @@ import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.node.Type
 import java.util.*
@@ -69,10 +70,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
 
 
     private var readOnly: Boolean = false
-        get() {
-            return field || selectionMode
-        }
-    private var selectionMode: Boolean = false
+    private var specialMode: SpecialMode = SpecialMode.DEFAULT
 
     val isEmpty: Boolean
         get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0
@@ -97,6 +95,12 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         }
     }
 
+    override fun onDetach() {
+        nodeClickListener = null
+        onScrollListener = null
+        super.onDetach()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -189,7 +193,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         super.onResume()
 
         activity?.intent?.let {
-            selectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(it)
+            specialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(it)
         }
 
         // Refresh data
@@ -266,14 +270,15 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
     }
 
     fun actionNodesCallback(nodes: List<Node>,
-                            menuListener: NodesActionMenuListener?) : ActionMode.Callback {
+                            menuListener: NodesActionMenuListener?,
+                            actionModeCallback: ActionMode.Callback) : ActionMode.Callback {
 
         return object : ActionMode.Callback {
 
             override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
                 nodeActionSelectionMode = false
                 nodeActionPasteMode = PasteMode.UNDEFINED
-                return true
+                return actionModeCallback.onCreateActionMode(mode, menu)
             }
 
             override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
@@ -318,7 +323,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                 // Add the number of items selected in title
                 mode?.title = nodes.size.toString()
 
-                return true
+                return actionModeCallback.onPrepareActionMode(mode, menu)
             }
 
             override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
@@ -348,7 +353,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                         nodeActionSelectionMode = false
                         returnValue
                     }
-                    else -> false
+                    else -> actionModeCallback.onActionItemClicked(mode, item)
                 }
             }
 
@@ -358,6 +363,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                 mAdapter?.unselectActionNodes()
                 nodeActionPasteMode = PasteMode.UNDEFINED
                 nodeActionSelectionMode = false
+                actionModeCallback.onDestroyActionMode(mode)
             }
         }
     }

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

@@ -30,16 +30,22 @@ import com.kunzisoft.keepass.database.search.SearchHelper
 class MagikeyboardLauncherActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        val database = Database.getInstance()
+        val readOnly = database.isReadOnly
         SearchHelper.checkAutoSearchInfo(this,
-                Database.getInstance(),
+                database,
                 null,
-                {},
                 {
-                    GroupActivity.launchForEntrySelectionResult(this)
+                    // Not called
+                    // if items found directly returns before calling this activity
+                },
+                {
+                    // Select if not found
+                    GroupActivity.launchForKeyboardSelectionResult(this, readOnly)
                 },
                 {
                     // Pass extra to get entry
-                    FileDatabaseSelectActivity.launchForEntrySelectionResult(this)
+                    FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this)
                 }
         )
         finish()

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

@@ -21,53 +21,58 @@ package com.kunzisoft.keepass.activities
 
 import android.app.Activity
 import android.app.assist.AssistStructure
-import android.app.backup.BackupManager
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
 import android.view.*
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.widget.*
+import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.biometric.BiometricManager
 import androidx.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.OpenFileHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.biometric.BiometricUnlockDatabaseHelper
+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.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.CIPHER_ENTITY_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_KEY
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.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.*
+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
 
@@ -81,16 +86,17 @@ open class PasswordActivity : SpecialModeActivity() {
     private var confirmButtonView: Button? = null
     private var checkboxPasswordView: CompoundButton? = null
     private var checkboxKeyFileView: CompoundButton? = null
-    private var checkboxDefaultDatabaseView: CompoundButton? = null
     private var advancedUnlockInfoView: AdvancedUnlockInfoView? = null
     private var infoContainerView: ViewGroup? = null
     private var enableButtonOnCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null
 
+    private val databaseFileViewModel: DatabaseFileViewModel by viewModels()
+
     private var mDatabaseFileUri: Uri? = null
     private var mDatabaseKeyFileUri: Uri? = null
 
     private var mRememberKeyFile: Boolean = false
-    private var mOpenFileHelper: OpenFileHelper? = null
+    private var mSelectFileHelper: SelectFileHelper? = null
 
     private var mPermissionAsked = false
     private var readOnly: Boolean = false
@@ -105,7 +111,7 @@ open class PasswordActivity : SpecialModeActivity() {
             field = value
         }
 
-    private var mProgressDialogThread: ProgressDialogThread? = null
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
 
     private var advancedUnlockedManager: AdvancedUnlockedManager? = null
     private var mAllowAutoOpenBiometricPrompt: Boolean = true
@@ -127,16 +133,16 @@ open class PasswordActivity : SpecialModeActivity() {
         keyFileSelectionView = findViewById(R.id.keyfile_selection)
         checkboxPasswordView = findViewById(R.id.password_checkbox)
         checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
-        checkboxDefaultDatabaseView = findViewById(R.id.default_database)
         advancedUnlockInfoView = findViewById(R.id.biometric_info)
         infoContainerView = findViewById(R.id.activity_password_info_container)
 
         mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
         readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrPreference(this, savedInstanceState)
+        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
 
-        mOpenFileHelper = OpenFileHelper(this@PasswordActivity)
+        mSelectFileHelper = SelectFileHelper(this@PasswordActivity)
         keyFileSelectionView?.apply {
-            mOpenFileHelper?.openFileOnClickViewListener?.let {
+            mSelectFileHelper?.selectFileOnClickViewListener?.let {
                 setOnClickListener(it)
                 setOnLongClickListener(it)
             }
@@ -163,12 +169,34 @@ open class PasswordActivity : SpecialModeActivity() {
         if (savedInstanceState?.containsKey(KEY_KEYFILE) == true) {
             mDatabaseKeyFileUri = UriUtil.parse(savedInstanceState.getString(KEY_KEYFILE))
         }
-
         if (savedInstanceState?.containsKey(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT) == true) {
             mAllowAutoOpenBiometricPrompt = savedInstanceState.getBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT)
         }
 
-        mProgressDialogThread = ProgressDialogThread(this).apply {
+        // 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 -> {
@@ -205,7 +233,7 @@ open class PasswordActivity : SpecialModeActivity() {
                                         result.data?.let { resultData ->
                                             databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
                                             masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
-                                            keyFileUri = resultData.getParcelable(KEY_FILE_KEY)
+                                            keyFileUri = resultData.getParcelable(KEY_FILE_URI_KEY)
                                             readOnly = resultData.getBoolean(READ_ONLY_KEY)
                                             cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
                                         }
@@ -227,7 +255,7 @@ open class PasswordActivity : SpecialModeActivity() {
                             if (resultMessage != null && resultMessage.isNotEmpty()) {
                                 resultError = "$resultError $resultMessage"
                             }
-                            Log.e(TAG, resultError, resultException)
+                            Log.e(TAG, resultError)
                             Snackbar.make(activity_password_coordinator_layout,
                                     resultError,
                                     Snackbar.LENGTH_LONG).asError().show()
@@ -257,74 +285,22 @@ open class PasswordActivity : SpecialModeActivity() {
     }
 
     private fun launchGroupActivity() {
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-        EntrySelectionHelper.doEntrySelectionAction(intent,
-                {
-                    GroupActivity.launch(this@PasswordActivity,
-                            true,
-                            searchInfo,
-                            readOnly)
-                    // Finish activity if no search info
-                    if (searchInfo != null) {
-                        finish()
-                    }
-                },
-                {
-                    SearchHelper.checkAutoSearchInfo(this,
-                            Database.getInstance(),
-                            searchInfo,
-                            { items ->
-                                // Response is build
-                                if (items.size == 1) {
-                                    populateKeyboardAndMoveAppToBackground(this@PasswordActivity,
-                                            items[0],
-                                            intent)
-                                } else {
-                                    // Select the one we want
-                                    GroupActivity.launchForEntrySelectionResult(this,
-                                            true,
-                                            searchInfo)
-                                }
-                            },
-                            {
-                                // Here no search info found, disable auto search
-                                GroupActivity.launchForEntrySelectionResult(this@PasswordActivity,
-                                        false,
-                                        searchInfo,
-                                        readOnly)
-                            },
-                            {
-                                // Simply close if database not opened, normally not happened
-                            }
-                    )
-                    // Do not keep history
-                    finish()
-                },
-                { assistStructure ->
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        SearchHelper.checkAutoSearchInfo(this,
-                                Database.getInstance(),
-                                searchInfo,
-                                { items ->
-                                    // Response is build
-                                    AutofillHelper.buildResponse(this, items)
-                                    finish()
-                                },
-                                {
-                                    // Here no search info found, disable auto search
-                                    GroupActivity.launchForAutofillResult(this@PasswordActivity,
-                                            assistStructure,
-                                            false,
-                                            searchInfo,
-                                            readOnly)
-                                },
-                                {
-                                    // Simply close if database not opened, normally not happened
-                                    finish()
-                                }
-                        )
-                    }
-                })
+        GroupActivity.launch(this,
+                readOnly,
+                { onValidateSpecialMode() },
+                { onCancelSpecialMode() },
+                { onLaunchActivitySpecialMode() }
+        )
+    }
+
+    override fun onValidateSpecialMode() {
+        super.onValidateSpecialMode()
+        finish()
+    }
+
+    override fun onCancelSpecialMode() {
+        super.onCancelSpecialMode()
+        finish()
     }
 
     private val onEditorActionListener = object : TextView.OnEditorActionListener {
@@ -351,7 +327,7 @@ open class PasswordActivity : SpecialModeActivity() {
                 clearCredentialsViews()
             }
 
-            mProgressDialogThread?.registerProgressTask()
+            mProgressDatabaseTaskProvider?.registerProgressTask()
 
             // Back to previous keyboard is setting activated
             if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this)) {
@@ -363,73 +339,23 @@ open class PasswordActivity : SpecialModeActivity() {
                 false
             else
                 mAllowAutoOpenBiometricPrompt
-
-            initUriFromIntent()
+            mDatabaseFileUri?.let { databaseFileUri ->
+                databaseFileViewModel.loadDatabaseFile(databaseFileUri)
+            }
 
             checkPermission()
         }
     }
 
-    private fun initUriFromIntent() {
-        /*
-        // "canXrite" doesn't work with Google Drive, don't really know why?
-        mForceReadOnly = mDatabaseFileUri?.let {
-            !FileDatabaseInfo(this, it).canWrite
-        } ?: false
-        */
-        mForceReadOnly = mDatabaseFileUri?.let {
-            !FileDatabaseInfo(this, it).exists
-        } ?: true
-
-        // Post init uri with KeyFile if needed
-        if (mRememberKeyFile && (mDatabaseKeyFileUri == null || mDatabaseKeyFileUri.toString().isEmpty())) {
-            // Retrieve KeyFile in a thread
-            mDatabaseFileUri?.let { databaseUri ->
-                FileDatabaseHistoryAction.getInstance(applicationContext)
-                        .getKeyFileUriByDatabaseUri(databaseUri)  {
-                            onPostInitUri(databaseUri, it)
-                        }
-            }
-        } else {
-            onPostInitUri(mDatabaseFileUri, mDatabaseKeyFileUri)
-        }
-    }
-
-    private fun onPostInitUri(databaseFileUri: Uri?, keyFileUri: Uri?) {
-        // Define title
-        databaseFileUri?.let {
-            FileDatabaseInfo(this, it).retrieveDatabaseTitle { title ->
-                filenameView?.text = title
-            }
-        }
-
+    private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
         // Define Key File text
         if (mRememberKeyFile) {
             populateKeyFileTextView(keyFileUri)
         }
 
-        // Define listeners for default database checkbox and validate button
-        checkboxDefaultDatabaseView?.setOnCheckedChangeListener { _, isChecked ->
-            var newDefaultFileUri: Uri? = null
-            if (isChecked) {
-                newDefaultFileUri = databaseFileUri ?: newDefaultFileUri
-            }
-
-            PreferencesUtil.saveDefaultDatabasePath(this, newDefaultFileUri)
-
-            val backupManager = BackupManager(this@PasswordActivity)
-            backupManager.dataChanged()
-        }
+        // Define listener for validate button
         confirmButtonView?.setOnClickListener { verifyCheckboxesAndLoadDatabase() }
 
-        // Retrieve settings for default database
-        val defaultFilename = PreferencesUtil.getDefaultDatabasePath(this)
-        if (databaseFileUri != null
-                && databaseFileUri.path != null && databaseFileUri.path!!.isNotEmpty()
-                && databaseFileUri == UriUtil.parse(defaultFilename)) {
-            checkboxDefaultDatabaseView?.isChecked = true
-        }
-
         // If Activity is launch with a password and want to open directly
         val intent = intent
         val password = intent.getStringExtra(KEY_PASSWORD)
@@ -443,11 +369,10 @@ open class PasswordActivity : SpecialModeActivity() {
             verifyCheckboxesAndLoadDatabase(password, keyFileUri)
         } else {
             // Init Biometric elements
-            var biometricInitialize = false
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 if (PreferencesUtil.isBiometricUnlockEnable(this)) {
-
-                    if (advancedUnlockedManager == null && databaseFileUri != null) {
+                    if (advancedUnlockedManager == null
+                            && databaseFileUri != null) {
                         advancedUnlockedManager = AdvancedUnlockedManager(this,
                                 databaseFileUri,
                                 advancedUnlockInfoView,
@@ -473,14 +398,16 @@ open class PasswordActivity : SpecialModeActivity() {
                                     }
                                 })
                     }
-                    advancedUnlockedManager?.isBiometricPromptAutoOpenEnable = mAllowAutoOpenBiometricPrompt
+                    advancedUnlockedManager?.isBiometricPromptAutoOpenEnable =
+                            mAllowAutoOpenBiometricPrompt && mProgressDatabaseTaskProvider?.isBinded() != true
                     advancedUnlockedManager?.checkBiometricAvailability()
-                    biometricInitialize = true
                 } else {
+                    advancedUnlockInfoView?.visibility = View.GONE
                     advancedUnlockedManager?.destroy()
+                    advancedUnlockedManager = null
                 }
             }
-            if (!biometricInitialize) {
+            if (advancedUnlockedManager == null) {
                 checkboxPasswordView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
             }
             checkboxKeyFileView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
@@ -533,7 +460,7 @@ open class PasswordActivity : SpecialModeActivity() {
     }
 
     override fun onPause() {
-        mProgressDialogThread?.unregisterProgressTask()
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             advancedUnlockedManager?.destroy()
@@ -590,15 +517,25 @@ open class PasswordActivity : SpecialModeActivity() {
             clearCredentialsViews()
         }
 
-        databaseFileUri?.let { databaseUri ->
-            // Show the progress dialog and load the database
-            showProgressDialogAndLoadDatabase(
-                    databaseUri,
-                    password,
-                    keyFileUri,
-                    readOnly,
-                    cipherDatabaseEntity,
-                    false)
+        if (readOnly && (
+                mSpecialMode == SpecialMode.SAVE
+                || mSpecialMode == SpecialMode.REGISTRATION)
+        ) {
+            Log.e(TAG, getString(R.string.autofill_read_only_save))
+            Snackbar.make(activity_password_coordinator_layout,
+                    R.string.autofill_read_only_save,
+                    Snackbar.LENGTH_LONG).asError().show()
+        } else {
+            databaseFileUri?.let { databaseUri ->
+                // Show the progress dialog and load the database
+                showProgressDialogAndLoadDatabase(
+                        databaseUri,
+                        password,
+                        keyFileUri,
+                        readOnly,
+                        cipherDatabaseEntity,
+                        false)
+            }
         }
     }
 
@@ -608,7 +545,7 @@ open class PasswordActivity : SpecialModeActivity() {
                                                   readOnly: Boolean,
                                                   cipherDatabaseEntity: CipherDatabaseEntity?,
                                                   fixDuplicateUUID: Boolean) {
-        mProgressDialogThread?.startDatabaseLoad(
+        mProgressDatabaseTaskProvider?.startDatabaseLoad(
                 databaseUri,
                 password,
                 keyFile,
@@ -628,13 +565,13 @@ open class PasswordActivity : SpecialModeActivity() {
         val inflater = menuInflater
         // Read menu
         inflater.inflate(R.menu.open_file, menu)
-        if (mSelectionMode || mForceReadOnly) {
+        if (mForceReadOnly) {
             menu.removeItem(R.id.menu_open_file_read_mode_key)
         } else {
             changeOpenFileReadIcon(menu.findItem(R.id.menu_open_file_read_mode_key))
         }
 
-        if (!mSelectionMode) {
+        if (mSpecialMode == SpecialMode.DEFAULT) {
             MenuUtil.defaultMenuInflater(inflater, menu)
         }
 
@@ -685,7 +622,7 @@ open class PasswordActivity : SpecialModeActivity() {
         if (!performedEductionInProgress) {
             performedEductionInProgress = true
             // Show education views
-            Handler().post { performedNextEducation(PasswordActivityEducation(this), menu) }
+            Handler(Looper.getMainLooper()).post { performedNextEducation(PasswordActivityEducation(this), menu) }
         }
     }
 
@@ -707,19 +644,24 @@ open class PasswordActivity : SpecialModeActivity() {
                     && passwordActivityEducation.checkAndPerformedReadOnlyEducation(
                     educationToolbar.findViewById(R.id.menu_open_file_read_mode_key),
                     {
-                        onOptionsItemSelected(menu.findItem(R.id.menu_open_file_read_mode_key))
+                        try {
+                            menu.findItem(R.id.menu_open_file_read_mode_key)
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Unable to find read mode menu")
+                        }
                         performedNextEducation(passwordActivityEducation, menu)
                     },
                     {
                         performedNextEducation(passwordActivityEducation, menu)
                     })
 
-            if (!readOnlyEducationPerformed) {
-                val biometricCanAuthenticate = BiometricManager.from(this).canAuthenticate()
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                        && PreferencesUtil.isBiometricUnlockEnable(applicationContext)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    && !readOnlyEducationPerformed) {
+                val biometricCanAuthenticate = BiometricUnlockDatabaseHelper.canAuthenticate(this)
+                PreferencesUtil.isBiometricUnlockEnable(applicationContext)
                         && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
-                        && advancedUnlockInfoView != null && advancedUnlockInfoView?.unlockIconImageView != null
+                        && advancedUnlockInfoView != null && advancedUnlockInfoView?.visibility == View.VISIBLE
+                        && advancedUnlockInfoView?.unlockIconImageView != null
                         && passwordActivityEducation.checkAndPerformedBiometricEducation(advancedUnlockInfoView?.unlockIconImageView!!,
                         {
                             performedNextEducation(passwordActivityEducation, menu)
@@ -772,7 +714,7 @@ open class PasswordActivity : SpecialModeActivity() {
         }
 
         var keyFileResult = false
-        mOpenFileHelper?.let {
+        mSelectFileHelper?.let {
             keyFileResult = it.onActivityResultCallback(requestCode, resultCode, data
             ) { uri ->
                 if (uri != null) {
@@ -786,7 +728,7 @@ open class PasswordActivity : SpecialModeActivity() {
             when (resultCode) {
                 LockingActivity.RESULT_EXIT_LOCK -> {
                     clearCredentialsViews()
-                    Database.getInstance().closeAndClear(applicationContext.filesDir)
+                    Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this))
                 }
                 Activity.RESULT_CANCELED -> {
                     clearCredentialsViews()
@@ -826,19 +768,33 @@ open class PasswordActivity : SpecialModeActivity() {
          */
 
         @Throws(FileNotFoundException::class)
-        fun launch(
-                activity: Activity,
-                databaseFile: Uri,
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
+        fun launch(activity: Activity,
+                   databaseFile: Uri,
+                   keyFile: Uri?) {
             buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                searchInfo?.let {
-                    intent.putExtra(KEY_SEARCH_INFO, it)
-                }
                 activity.startActivity(intent)
             }
         }
 
+        /*
+         * -------------------------
+         * 		Share Launch
+         * -------------------------
+         */
+
+        @Throws(FileNotFoundException::class)
+        fun launchForSearchResult(activity: Activity,
+                                  databaseFile: Uri,
+                                  keyFile: Uri?,
+                                  searchInfo: SearchInfo) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                EntrySelectionHelper.startActivityForSearchModeResult(
+                        activity,
+                        intent,
+                        searchInfo)
+            }
+        }
+
         /*
          * -------------------------
          * 		Keyboard Launch
@@ -846,13 +802,12 @@ open class PasswordActivity : SpecialModeActivity() {
          */
 
         @Throws(FileNotFoundException::class)
-        fun launchForKeyboardResult(
-                activity: Activity,
-                databaseFile: Uri,
-                keyFile: Uri?,
-                searchInfo: SearchInfo?) {
+        fun launchForKeyboardResult(activity: Activity,
+                                    databaseFile: Uri,
+                                    keyFile: Uri?,
+                                    searchInfo: SearchInfo?) {
             buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                EntrySelectionHelper.startActivityForEntrySelectionResult(
+                EntrySelectionHelper.startActivityForKeyboardSelectionModeResult(
                         activity,
                         intent,
                         searchInfo)
@@ -867,22 +822,90 @@ open class PasswordActivity : SpecialModeActivity() {
 
         @RequiresApi(api = Build.VERSION_CODES.O)
         @Throws(FileNotFoundException::class)
-        fun launchForAutofillResult(
-                activity: Activity,
-                databaseFile: Uri,
-                keyFile: Uri?,
-                assistStructure: AssistStructure?,
-                searchInfo: SearchInfo?) {
-            if (assistStructure != null) {
-                buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                    AutofillHelper.startActivityForAutofillResult(
-                            activity,
-                            intent,
-                            assistStructure,
-                            searchInfo)
-                }
-            } else {
-                launch(activity, databaseFile, keyFile, searchInfo)
+        fun launchForAutofillResult(activity: Activity,
+                                    databaseFile: Uri,
+                                    keyFile: Uri?,
+                                    assistStructure: AssistStructure,
+                                    searchInfo: SearchInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                AutofillHelper.startActivityForAutofillResult(
+                        activity,
+                        intent,
+                        assistStructure,
+                        searchInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Registration Launch
+         * -------------------------
+         */
+        fun launchForRegistration(activity: Activity,
+                                  databaseFile: Uri,
+                                  keyFile: Uri?,
+                                  registerInfo: RegisterInfo?) {
+            buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                EntrySelectionHelper.startActivityForRegistrationModeResult(
+                        activity,
+                        intent,
+                        registerInfo)
+            }
+        }
+
+        /*
+         * -------------------------
+         * 		Global Launch
+         * -------------------------
+         */
+        fun launch(activity: Activity,
+                   databaseUri: Uri,
+                   keyFile: Uri?,
+                   fileNoFoundAction: (exception: FileNotFoundException) -> Unit,
+                   onCancelSpecialMode: () -> Unit,
+                   onLaunchActivitySpecialMode: () -> Unit) {
+
+            try {
+                EntrySelectionHelper.doSpecialAction(activity.intent,
+                        {
+                            PasswordActivity.launch(activity,
+                                    databaseUri, keyFile)
+                        },
+                        { searchInfo -> // Search Action
+                            PasswordActivity.launchForSearchResult(activity,
+                                    databaseUri, keyFile,
+                                    searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { // Save Action
+                            // Not directly used, a search is performed before
+                        },
+                        { searchInfo -> // Keyboard Selection Action
+                            PasswordActivity.launchForKeyboardResult(activity,
+                                    databaseUri, keyFile,
+                                    searchInfo)
+                            onLaunchActivitySpecialMode()
+                        },
+                        { searchInfo, assistStructure -> // Autofill Selection Action
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                PasswordActivity.launchForAutofillResult(activity,
+                                        databaseUri, keyFile,
+                                        assistStructure,
+                                        searchInfo)
+                                onLaunchActivitySpecialMode()
+                            } else {
+                                onCancelSpecialMode()
+                            }
+                        },
+                        { registerInfo -> // Registration Action
+                            PasswordActivity.launchForRegistration(activity,
+                                    databaseUri, keyFile,
+                                    registerInfo)
+                            onLaunchActivitySpecialMode()
+                        }
+                )
+            } catch (e: FileNotFoundException) {
+                fileNoFoundAction(e)
             }
         }
     }

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

@@ -25,16 +25,19 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import com.google.android.material.textfield.TextInputLayout
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.text.Editable
+import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.View
 import android.widget.CompoundButton
+import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 
 class AssignMasterKeyDialogFragment : DialogFragment() {
@@ -56,7 +59,11 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
 
     private var mListener: AssignPasswordDialogListener? = null
 
-    private var mOpenFileHelper: OpenFileHelper? = 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) {}
@@ -85,6 +92,17 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mListener = null
+        mEmptyPasswordConfirmationDialog?.dismiss()
+        mEmptyPasswordConfirmationDialog = null
+        mNoKeyConfirmationDialog?.dismiss()
+        mNoKeyConfirmationDialog = null
+        mEmptyKeyFileConfirmationDialog?.dismiss()
+        mEmptyKeyFileConfirmationDialog = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
 
@@ -99,11 +117,15 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
 
             rootView = inflater.inflate(R.layout.fragment_set_password, null)
             builder.setView(rootView)
-                    .setTitle(R.string.assign_master_key)
                     // Add action buttons
                     .setPositiveButton(android.R.string.ok) { _, _ -> }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
+            val credentialsInfo: ImageView? = rootView?.findViewById(R.id.credentials_information)
+            credentialsInfo?.setOnClickListener {
+                UriUtil.gotoUrl(activity, R.string.credentials_explanation_url)
+            }
+
             passwordCheckBox = rootView?.findViewById(R.id.password_checkbox)
             passwordTextInputLayout = rootView?.findViewById(R.id.password_input_layout)
             passwordView = rootView?.findViewById(R.id.pass_password)
@@ -113,10 +135,10 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
             keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
             keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)
 
-            mOpenFileHelper = OpenFileHelper(this)
+            mSelectFileHelper = SelectFileHelper(this)
             keyFileSelectionView?.apply {
-                setOnClickListener(mOpenFileHelper?.openFileOnClickViewListener)
-                setOnLongClickListener(mOpenFileHelper?.openFileOnClickViewListener)
+                setOnClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
+                setOnLongClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
             }
 
             val dialog = builder.create()
@@ -129,7 +151,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                         mMasterPassword = ""
                         mKeyFile = null
 
-                        var error = verifyPassword() || verifyFile()
+                        var error = verifyPassword() || verifyKeyFile()
                         if (!passwordCheckBox!!.isChecked && !keyFileCheckBox!!.isChecked) {
                             error = true
                             if (allowNoMasterKey)
@@ -199,7 +221,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
         return error
     }
 
-    private fun verifyFile(): Boolean {
+    private fun verifyKeyFile(): Boolean {
         var error = false
         if (keyFileCheckBox != null
                 && keyFileCheckBox!!.isChecked) {
@@ -219,7 +241,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
             val builder = AlertDialog.Builder(it)
             builder.setMessage(R.string.warning_empty_password)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
-                        if (!verifyFile()) {
+                        if (!verifyKeyFile()) {
                             mListener?.onAssignKeyDialogPositiveClick(
                                     passwordCheckBox!!.isChecked, mMasterPassword,
                                     keyFileCheckBox!!.isChecked, mKeyFile)
@@ -227,7 +249,8 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                         }
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            builder.create().show()
+            mEmptyPasswordConfirmationDialog = builder.create()
+            mEmptyPasswordConfirmationDialog?.show()
         }
     }
 
@@ -242,18 +265,44 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                         this@AssignMasterKeyDialogFragment.dismiss()
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            builder.create().show()
+            mNoKeyConfirmationDialog = builder.create()
+            mNoKeyConfirmationDialog?.show()
+        }
+    }
+
+    private fun showEmptyKeyFileConfirmationDialog() {
+        activity?.let {
+            val builder = AlertDialog.Builder(it)
+            builder.setMessage(SpannableStringBuilder().apply {
+                append(getString(R.string.warning_empty_keyfile))
+                append("\n\n")
+                append(getString(R.string.warning_empty_keyfile_explanation))
+                append("\n\n")
+                append(getString(R.string.warning_sure_add_file))
+                })
+                    .setPositiveButton(android.R.string.ok) { _, _ -> }
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        keyFileCheckBox?.isChecked = false
+                        keyFileSelectionView?.uri = null
+                    }
+            mEmptyKeyFileConfirmationDialog = builder.create()
+            mEmptyKeyFileConfirmationDialog?.show()
         }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
-        mOpenFileHelper?.onActivityResultCallback(requestCode, resultCode, data
-        ) { uri ->
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
             uri?.let { pathUri ->
-                keyFileCheckBox?.isChecked = true
-                keyFileSelectionView?.uri = pathUri
+                UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
+                    keyFileSelectionView?.error = null
+                    keyFileCheckBox?.isChecked = true
+                    keyFileSelectionView?.uri = pathUri
+                    if (lengthFile <= 0L) {
+                        showEmptyKeyFileConfirmationDialog()
+                    }
+                }
             }
         }
     }

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

@@ -24,6 +24,11 @@ class DatePickerFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Create a new instance of DatePickerDialog and return it
         return context?.let {

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

@@ -31,7 +31,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
 
-class DeleteNodesDialogFragment : DialogFragment() {
+open class DeleteNodesDialogFragment : DialogFragment() {
 
     private var mNodesToDelete: List<Node> = ArrayList()
     private var mListener: DeleteNodeListener? = null
@@ -46,6 +46,15 @@ class DeleteNodesDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    protected open fun retrieveMessage(): String {
+        return getString(R.string.warning_permanently_delete_nodes)
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 
         arguments?.apply {
@@ -63,11 +72,11 @@ class DeleteNodesDialogFragment : DialogFragment() {
             // Use the Builder class for convenient dialog construction
             val builder = AlertDialog.Builder(activity)
 
-            builder.setMessage(getString(R.string.warning_permanently_delete_nodes))
-            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+            builder.setMessage(retrieveMessage())
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
                 mListener?.permanentlyDeleteNodes(mNodesToDelete)
             }
-            builder.setNegativeButton(android.R.string.no) { _, _ -> dismiss() }
+            builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
             // Create the AlertDialog object and return it
             return builder.create()
         }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+
+class EmptyRecycleBinDialogFragment : DeleteNodesDialogFragment() {
+
+    override fun retrieveMessage(): String {
+        return getString(R.string.warning_empty_recycle_bin)
+    }
+
+    companion object {
+        fun getInstance(nodesToDelete: List<Node>): EmptyRecycleBinDialogFragment {
+            return EmptyRecycleBinDialogFragment().apply {
+                arguments = getBundleFromListNodes(nodesToDelete)
+            }
+        }
+    }
+}

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

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

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+/**
+ * Custom Dialog to confirm big file to upload
+ */
+class FileTooBigDialogFragment : DialogFragment() {
+
+    private var mActionChooseListener: ActionChooseListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            mActionChooseListener = context as ActionChooseListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + ActionChooseListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mActionChooseListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+            builder.setMessage(SpannableStringBuilder().apply {
+                append(getString(R.string.warning_file_too_big))
+                append("\n\n")
+                append(getString(R.string.warning_sure_add_file))
+            })
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                mActionChooseListener?.onValidateUploadFileTooBig(
+                        arguments?.getParcelable(KEY_FILE_URI),
+                        arguments?.getString(KEY_FILE_NAME))
+            }
+            builder.setNegativeButton(android.R.string.cancel) { _, _ ->
+                dismiss()
+            }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    interface ActionChooseListener {
+        fun onValidateUploadFileTooBig(attachmentToUploadUri: Uri?, fileName: String?)
+    }
+
+    companion object {
+        const val MAX_WARNING_BINARY_FILE = 5242880
+
+        private const val KEY_FILE_URI = "KEY_FILE_URI"
+        private const val KEY_FILE_NAME = "KEY_FILE_NAME"
+
+        fun build(attachmentToUploadUri: Uri,
+                  fileName: String): FileTooBigDialogFragment {
+            val fragment = FileTooBigDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(KEY_FILE_URI, attachmentToUploadUri)
+                putString(KEY_FILE_NAME, fileName)
+            }
+            return fragment
+        }
+    }
+}

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

@@ -26,13 +26,11 @@ import com.google.android.material.textfield.TextInputLayout
 import androidx.fragment.app.DialogFragment
 import androidx.appcompat.app.AlertDialog
 import android.view.View
-import android.widget.Button
-import android.widget.CompoundButton
-import android.widget.EditText
-import android.widget.SeekBar
+import android.widget.*
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.view.applyFontVisibility
 
 class GeneratePasswordDialogFragment : DialogFragment() {
@@ -64,6 +62,11 @@ class GeneratePasswordDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
             val builder = AlertDialog.Builder(activity)
@@ -73,6 +76,15 @@ class GeneratePasswordDialogFragment : DialogFragment() {
             passwordInputLayoutView = root?.findViewById(R.id.password_input_layout)
             passwordView = root?.findViewById(R.id.password)
             passwordView?.applyFontVisibility()
+            val passwordCopyView: ImageView? = root?.findViewById(R.id.password_copy_button)
+            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyPasswordAndProtectedFields(activity))
+                View.VISIBLE else View.GONE
+            val clipboardHelper = ClipboardHelper(activity)
+            passwordCopyView?.setOnClickListener {
+                clipboardHelper.timeoutCopyToClipboard(passwordView!!.text.toString(),
+                        getString(R.string.copy_field,
+                                getString(R.string.entry_password)))
+            }
 
             lengthTextView = root?.findViewById(R.id.length)
 

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

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

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

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

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

@@ -21,20 +21,51 @@ package com.kunzisoft.keepass.activities.dialogs
 
 import android.app.AlertDialog
 import android.app.Dialog
-import android.content.DialogInterface
+import android.content.Context
+import android.net.Uri
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 
 class PasswordEncodingDialogFragment : DialogFragment() {
 
-    var positiveButtonClickListener: DialogInterface.OnClickListener? = null
+    private var mListener: Listener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as Listener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + Listener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        val databaseUri: Uri? = savedInstanceState?.getParcelable(DATABASE_URI_KEY)
+        val masterPasswordChecked: Boolean = savedInstanceState?.getBoolean(MASTER_PASSWORD_CHECKED_KEY) ?: false
+        val masterPassword: String? = savedInstanceState?.getString(MASTER_PASSWORD_KEY)
+        val keyFileChecked: Boolean = savedInstanceState?.getBoolean(KEY_FILE_CHECKED_KEY) ?: false
+        val keyFile: Uri? = savedInstanceState?.getParcelable(KEY_FILE_URI_KEY)
+
         activity?.let { activity ->
             val builder = AlertDialog.Builder(activity)
             builder.setMessage(activity.getString(R.string.warning_password_encoding)).setTitle(R.string.warning)
-            builder.setPositiveButton(android.R.string.ok, positiveButtonClickListener)
+            builder.setPositiveButton(android.R.string.ok) { _, _ ->
+                mListener?.onPasswordEncodingValidateListener(
+                        databaseUri,
+                        masterPasswordChecked,
+                        masterPassword,
+                        keyFileChecked,
+                        keyFile
+                )
+            }
             builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() }
 
             return builder.create()
@@ -42,5 +73,36 @@ class PasswordEncodingDialogFragment : DialogFragment() {
         return super.onCreateDialog(savedInstanceState)
     }
 
+    interface Listener {
+        fun onPasswordEncodingValidateListener(databaseUri: Uri?,
+                                               masterPasswordChecked: Boolean,
+                                               masterPassword: String?,
+                                               keyFileChecked: Boolean,
+                                               keyFile: Uri?)
+    }
 
+    companion object {
+
+        private const val DATABASE_URI_KEY = "DATABASE_URI_KEY"
+        private const val MASTER_PASSWORD_CHECKED_KEY = "MASTER_PASSWORD_CHECKED_KEY"
+        private const val MASTER_PASSWORD_KEY = "MASTER_PASSWORD_KEY"
+        private const val KEY_FILE_CHECKED_KEY = "KEY_FILE_CHECKED_KEY"
+        private const val KEY_FILE_URI_KEY = "KEY_FILE_URI_KEY"
+
+        fun getInstance(databaseUri: Uri,
+                        masterPasswordChecked: Boolean,
+                        masterPassword: String?,
+                        keyFileChecked: Boolean,
+                        keyFile: Uri?): SortDialogFragment {
+            val fragment = SortDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(DATABASE_URI_KEY, databaseUri)
+                putBoolean(MASTER_PASSWORD_CHECKED_KEY, masterPasswordChecked)
+                putString(MASTER_PASSWORD_KEY, masterPassword)
+                putBoolean(KEY_FILE_CHECKED_KEY, keyFileChecked)
+                putParcelable(KEY_FILE_URI_KEY, keyFile)
+            }
+            return fragment
+        }
+    }
 }

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

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

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

@@ -28,6 +28,7 @@ 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
@@ -106,6 +107,11 @@ class SetOTPDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mCreateOTPElementListener = null
+        super.onDetach()
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 
@@ -152,6 +158,28 @@ class SetOTPDialogFragment : DialogFragment() {
             otpCounterTextView?.setOnTouchListener(mOnTouchListener)
             otpDigitsTextView?.setOnTouchListener(mOnTouchListener)
 
+            // To manage focus
+            otpPeriodTextView?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                    otpDigitsTextView?.requestFocus()
+                    true
+                } else
+                    false
+            }
+            otpCounterTextView?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                    otpDigitsTextView?.requestFocus()
+                    true
+                } else
+                    false
+            }
+            otpCounterTextView?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                    root?.requestFocus(View.FOCUS_DOWN)
+                    true
+                } else
+                    false
+            }
 
             // HOTP / TOTP Type selection
             val otpTypeArray = OtpType.values()

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

@@ -54,6 +54,11 @@ class SortDialogFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
             val builder = AlertDialog.Builder(activity)

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

@@ -25,6 +25,11 @@ class TimePickerFragment : DialogFragment() {
         }
     }
 
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Create a new instance of DatePickerDialog and return it
         return context?.let {

app/src/main/java/com/kunzisoft/keepass/activities/helpers/EntrySelectionHelper.kt

@@ -24,54 +24,186 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
+import java.io.Serializable
 
 object EntrySelectionHelper {
 
-    private const val EXTRA_ENTRY_SELECTION_MODE = "com.kunzisoft.keepass.extra.ENTRY_SELECTION_MODE"
-    private const val DEFAULT_ENTRY_SELECTION_MODE = false
-    // Key to retrieve search in intent
-    const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
+    private const val KEY_SPECIAL_MODE = "com.kunzisoft.keepass.extra.SPECIAL_MODE"
+    private const val KEY_TYPE_MODE = "com.kunzisoft.keepass.extra.TYPE_MODE"
+    private const val KEY_SEARCH_INFO = "com.kunzisoft.keepass.extra.SEARCH_INFO"
+    private const val KEY_REGISTER_INFO = "com.kunzisoft.keepass.extra.REGISTER_INFO"
 
-    fun startActivityForEntrySelectionResult(context: Context,
-                                             intent: Intent,
-                                             searchInfo: SearchInfo?) {
-        addEntrySelectionModeExtraInIntent(intent)
-        searchInfo?.let {
-            intent.putExtra(KEY_SEARCH_INFO, it)
-        }
+    fun startActivityForSearchModeResult(context: Context,
+                                         intent: Intent,
+                                         searchInfo: SearchInfo) {
+        addSpecialModeInIntent(intent, SpecialMode.SEARCH)
+        addSearchInfoInIntent(intent, searchInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
         context.startActivity(intent)
     }
 
-    fun addEntrySelectionModeExtraInIntent(intent: Intent) {
-        intent.putExtra(EXTRA_ENTRY_SELECTION_MODE, true)
+    fun startActivityForSaveModeResult(context: Context,
+                                             intent: Intent,
+                                             searchInfo: SearchInfo) {
+        addSpecialModeInIntent(intent, SpecialMode.SAVE)
+        addTypeModeInIntent(intent, TypeMode.DEFAULT)
+        addSearchInfoInIntent(intent, searchInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        context.startActivity(intent)
     }
 
-    fun removeEntrySelectionModeFromIntent(intent: Intent) {
-        intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
+    fun startActivityForKeyboardSelectionModeResult(context: Context,
+                                                    intent: Intent,
+                                                    searchInfo: SearchInfo?) {
+        addSpecialModeInIntent(intent, SpecialMode.SELECTION)
+        addTypeModeInIntent(intent, TypeMode.MAGIKEYBOARD)
+        addSearchInfoInIntent(intent, searchInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        context.startActivity(intent)
     }
 
-    fun retrieveEntrySelectionModeFromIntent(intent: Intent): Boolean {
-        return intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)
+    fun startActivityForRegistrationModeResult(context: Context,
+                                               intent: Intent,
+                                               registerInfo: RegisterInfo?) {
+        addSpecialModeInIntent(intent, SpecialMode.REGISTRATION)
+        // At the moment, only autofill for registration
+        addTypeModeInIntent(intent, TypeMode.AUTOFILL)
+        addRegisterInfoInIntent(intent, registerInfo)
+        intent.flags = intent.flags or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        context.startActivity(intent)
     }
 
-    fun doEntrySelectionAction(intent: Intent,
-                               standardAction: () -> Unit,
-                               keyboardAction: () -> Unit,
-                               autofillAction: (assistStructure: AssistStructure) -> Unit) {
-        var assistStructureInit = false
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AutofillHelper.retrieveAssistStructure(intent)?.let { assistStructure ->
-                autofillAction.invoke(assistStructure)
-                assistStructureInit = true
-            }
+    fun addSearchInfoInIntent(intent: Intent, searchInfo: SearchInfo?) {
+        searchInfo?.let {
+            intent.putExtra(KEY_SEARCH_INFO, it)
         }
-        if (!assistStructureInit) {
-            if (intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)) {
-                intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
-                keyboardAction.invoke()
-            } else {
-                standardAction.invoke()
+    }
+
+    fun retrieveSearchInfoFromIntent(intent: Intent): SearchInfo? {
+        return intent.getParcelableExtra(KEY_SEARCH_INFO)
+    }
+
+    fun addRegisterInfoInIntent(intent: Intent, registerInfo: RegisterInfo?) {
+        registerInfo?.let {
+            intent.putExtra(KEY_REGISTER_INFO, it)
+        }
+    }
+
+    fun retrieveRegisterInfoFromIntent(intent: Intent): RegisterInfo? {
+        return intent.getParcelableExtra(KEY_REGISTER_INFO)
+    }
+
+    fun removeInfoFromIntent(intent: Intent) {
+        intent.removeExtra(KEY_SEARCH_INFO)
+        intent.removeExtra(KEY_REGISTER_INFO)
+    }
+
+    fun addSpecialModeInIntent(intent: Intent, specialMode: SpecialMode) {
+        intent.putExtra(KEY_SPECIAL_MODE, specialMode as Serializable)
+    }
+
+    fun retrieveSpecialModeFromIntent(intent: Intent): SpecialMode {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (AutofillHelper.retrieveAssistStructure(intent) != null)
+                return SpecialMode.SELECTION
+        }
+        return intent.getSerializableExtra(KEY_SPECIAL_MODE) as SpecialMode?
+                ?: SpecialMode.DEFAULT
+    }
+
+    fun addTypeModeInIntent(intent: Intent, typeMode: TypeMode) {
+        intent.putExtra(KEY_TYPE_MODE, typeMode as Serializable)
+    }
+
+    fun retrieveTypeModeFromIntent(intent: Intent): TypeMode {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (AutofillHelper.retrieveAssistStructure(intent) != null)
+                return TypeMode.AUTOFILL
+        }
+        return intent.getSerializableExtra(KEY_TYPE_MODE) as TypeMode? ?: TypeMode.DEFAULT
+    }
+
+    fun removeModesFromIntent(intent: Intent) {
+        intent.removeExtra(KEY_SPECIAL_MODE)
+        intent.removeExtra(KEY_TYPE_MODE)
+    }
+
+    fun doSpecialAction(intent: Intent,
+                        defaultAction: () -> Unit,
+                        searchAction: (searchInfo: SearchInfo) -> Unit,
+                        saveAction: (searchInfo: SearchInfo) -> Unit,
+                        keyboardSelectionAction: (searchInfo: SearchInfo?) -> Unit,
+                        autofillSelectionAction: (searchInfo: SearchInfo?,
+                                                  assistStructure: AssistStructure) -> Unit,
+                        autofillRegistrationAction: (registerInfo: RegisterInfo?) -> Unit) {
+
+        when (retrieveSpecialModeFromIntent(intent)) {
+            SpecialMode.DEFAULT -> {
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                defaultAction.invoke()
+            }
+            SpecialMode.SEARCH -> {
+                val searchInfo = retrieveSearchInfoFromIntent(intent)
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                if (searchInfo != null)
+                    searchAction.invoke(searchInfo)
+                else {
+                    defaultAction.invoke()
+                }
+            }
+            SpecialMode.SAVE -> {
+                val searchInfo = retrieveSearchInfoFromIntent(intent)
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                if (searchInfo != null)
+                    saveAction.invoke(searchInfo)
+                else {
+                    defaultAction.invoke()
+                }
+            }
+            SpecialMode.SELECTION -> {
+                val searchInfo: SearchInfo? = retrieveSearchInfoFromIntent(intent)
+                var assistStructureInit = false
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    AutofillHelper.retrieveAssistStructure(intent)?.let { assistStructure ->
+                        autofillSelectionAction.invoke(searchInfo, assistStructure)
+                        assistStructureInit = true
+                    }
+                }
+                if (!assistStructureInit) {
+                    if (intent.getSerializableExtra(KEY_SPECIAL_MODE) != null) {
+                        when (retrieveTypeModeFromIntent(intent)) {
+                            TypeMode.DEFAULT -> {
+                                removeModesFromIntent(intent)
+                                if (searchInfo != null)
+                                    searchAction.invoke(searchInfo)
+                                else
+                                    defaultAction.invoke()
+                            }
+                            TypeMode.MAGIKEYBOARD -> keyboardSelectionAction.invoke(searchInfo)
+                            else -> {
+                                // In this case, error
+                                removeModesFromIntent(intent)
+                                removeInfoFromIntent(intent)
+                            }
+                        }
+                    } else {
+                        if (searchInfo != null)
+                            searchAction.invoke(searchInfo)
+                        else
+                            defaultAction.invoke()
+                    }
+                }
+            }
+            SpecialMode.REGISTRATION -> {
+                val registerInfo: RegisterInfo? = retrieveRegisterInfoFromIntent(intent)
+                removeModesFromIntent(intent)
+                removeInfoFromIntent(intent)
+                autofillRegistrationAction.invoke(registerInfo)
             }
         }
     }

app/src/main/java/com/kunzisoft/keepass/activities/helpers/SelectFileHelper.kt

@@ -28,19 +28,20 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.util.Log
+import android.view.MenuItem
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
 import com.kunzisoft.keepass.utils.UriUtil
 
-class OpenFileHelper {
+class SelectFileHelper {
 
     private var activity: Activity? = null
     private var fragment: Fragment? = null
 
-    val openFileOnClickViewListener: OpenFileOnClickViewListener
-        get() = OpenFileOnClickViewListener()
+    val selectFileOnClickViewListener: SelectFileOnClickViewListener
+        get() = SelectFileOnClickViewListener()
 
     constructor(context: Activity) {
         this.activity = context
@@ -52,7 +53,10 @@ class OpenFileHelper {
         this.fragment = context
     }
 
-    inner class OpenFileOnClickViewListener : View.OnClickListener, View.OnLongClickListener {
+    inner class SelectFileOnClickViewListener :
+            View.OnClickListener,
+            View.OnLongClickListener,
+            MenuItem.OnMenuItemClickListener {
 
         private fun onAbstractClick(longClick: Boolean = false) {
             try {
@@ -85,6 +89,11 @@ class OpenFileHelper {
             onAbstractClick(true)
             return true
         }
+
+        override fun onMenuItemClick(item: MenuItem?): Boolean {
+            onAbstractClick()
+            return true
+        }
     }
 
     @SuppressLint("InlinedApi")

app/src/main/java/com/kunzisoft/keepass/activities/helpers/SpecialMode.kt

@@ -0,0 +1,9 @@
+package com.kunzisoft.keepass.activities.helpers
+
+enum class SpecialMode {
+    DEFAULT,
+    SEARCH,
+    SAVE,
+    SELECTION,
+    REGISTRATION;
+}

app/src/main/java/com/kunzisoft/keepass/activities/helpers/TypeMode.kt

@@ -0,0 +1,5 @@
+package com.kunzisoft.keepass.activities.helpers
+
+enum class TypeMode {
+    DEFAULT, MAGIKEYBOARD, AUTOFILL
+}

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

@@ -25,9 +25,13 @@ import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
@@ -43,7 +47,7 @@ abstract class LockingActivity : SpecialModeActivity() {
     // Force readOnly if Entry Selection mode
     protected var mReadOnly: Boolean
         get() {
-            return mReadOnlyToSave || mSelectionMode
+            return mReadOnlyToSave
         }
         set(value) {
             mReadOnlyToSave = value
@@ -51,7 +55,7 @@ abstract class LockingActivity : SpecialModeActivity() {
     private var mReadOnlyToSave: Boolean = false
     protected var mAutoSaveEnable: Boolean = true
 
-    var mProgressDialogThread: ProgressDialogThread? = null
+    var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
         private set
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -80,7 +84,7 @@ abstract class LockingActivity : SpecialModeActivity() {
 
         mExitLock = false
 
-        mProgressDialogThread = ProgressDialogThread(this)
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -96,7 +100,16 @@ abstract class LockingActivity : SpecialModeActivity() {
     override fun onResume() {
         super.onResume()
 
-        mProgressDialogThread?.registerProgressTask()
+        // If in ave or registration mode, don't allow read only
+        if ((mSpecialMode == SpecialMode.SAVE
+                        || mSpecialMode == SpecialMode.REGISTRATION)
+                && mReadOnly) {
+            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            finish()
+        }
+
+        mProgressDatabaseTaskProvider?.registerProgressTask()
 
         // To refresh when back to normal workflow from selection workflow
         mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent)
@@ -131,7 +144,7 @@ abstract class LockingActivity : SpecialModeActivity() {
     override fun onPause() {
         LOCKING_ACTIVITY_UI_VISIBLE = false
 
-        mProgressDialogThread?.unregisterProgressTask()
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
 
         super.onPause()
 

app/src/main/java/com/kunzisoft/keepass/activities/selection/SpecialModeActivity.kt

@@ -1,12 +1,13 @@
 package com.kunzisoft.keepass.activities.selection
 
-import android.os.Build
+import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
+import com.kunzisoft.keepass.activities.helpers.TypeMode
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.SpecialModeView
@@ -16,40 +17,128 @@ import com.kunzisoft.keepass.view.SpecialModeView
  */
 abstract class SpecialModeActivity : StylishActivity() {
 
-    protected var mSelectionMode: Boolean = false
+    protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
+    protected var mTypeMode: TypeMode = TypeMode.DEFAULT
 
-    protected var mAutofillSelection: Boolean = false
+    private var mSpecialModeView: SpecialModeView? = null
 
-    private var specialModeView: SpecialModeView? = null
+    override fun onBackPressed() {
+        if (mSpecialMode != SpecialMode.DEFAULT)
+            onCancelSpecialMode()
+        else
+            super.onBackPressed()
+    }
+
+    /**
+     * To call the regular onBackPressed() method in special mode
+     */
+    protected fun onRegularBackPressed() {
+        super.onBackPressed()
+    }
+
+    /**
+     * Intent sender uses special retains data in callback
+     */
+    private fun isIntentSender(): Boolean {
+        return (mSpecialMode == SpecialMode.SELECTION
+                && mTypeMode == TypeMode.AUTOFILL)
+                /* TODO Registration callback #765
+                || (mSpecialMode == SpecialMode.REGISTRATION
+                && mTypeMode == TypeMode.AUTOFILL
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+                */
+    }
+
+    fun onLaunchActivitySpecialMode() {
+        if (!isIntentSender()) {
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            EntrySelectionHelper.removeInfoFromIntent(intent)
+            finish()
+        }
+    }
+
+    open fun onValidateSpecialMode() {
+        if (isIntentSender()) {
+            super.finish()
+        } else {
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            EntrySelectionHelper.removeInfoFromIntent(intent)
+            if (mSpecialMode != SpecialMode.DEFAULT) {
+                // To move the app in background
+                moveTaskToBack(true)
+            }
+        }
+    }
 
     open fun onCancelSpecialMode() {
-        onBackPressed()
+        if (isIntentSender()) {
+            // To get the app caller, only for IntentSender
+            super.onBackPressed()
+        } else {
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            EntrySelectionHelper.removeInfoFromIntent(intent)
+            if (mSpecialMode != SpecialMode.DEFAULT) {
+                // To move the app in background
+                moveTaskToBack(true)
+            }
+        }
+    }
+
+    protected fun backToTheAppCaller() {
+        if (isIntentSender()) {
+            // To get the app caller, only for IntentSender
+            super.onBackPressed()
+        } else {
+            // To move the app in background
+            moveTaskToBack(true)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        mSpecialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(intent)
+        mTypeMode = EntrySelectionHelper.retrieveTypeModeFromIntent(intent)
     }
 
     override fun onResume() {
         super.onResume()
 
-        mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mAutofillSelection = AutofillHelper.retrieveAssistStructure(intent) != null
-        }
-
-        val searchInfo: SearchInfo? = intent.getParcelableExtra(EntrySelectionHelper.KEY_SEARCH_INFO)
+        mSpecialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(intent)
+        mTypeMode = EntrySelectionHelper.retrieveTypeModeFromIntent(intent)
+        val searchInfo: SearchInfo? = EntrySelectionHelper.retrieveRegisterInfoFromIntent(intent)?.searchInfo
+                ?: EntrySelectionHelper.retrieveSearchInfoFromIntent(intent)
 
         // To show the selection mode
-        specialModeView = findViewById(R.id.special_mode_view)
-        specialModeView?.apply {
+        mSpecialModeView = findViewById(R.id.special_mode_view)
+        mSpecialModeView?.apply {
             // Populate title
-            val typeModeId = if (mAutofillSelection)
-                R.string.autofill
-            else
-                R.string.magic_keyboard_title
-            title = "${resources.getString(R.string.selection_mode)} (${getString(typeModeId)})"
+            val selectionModeStringId = when (mSpecialMode) {
+                SpecialMode.DEFAULT, // Not important because hidden
+                SpecialMode.SEARCH -> R.string.search_mode
+                SpecialMode.SAVE -> R.string.save_mode
+                SpecialMode.SELECTION -> R.string.selection_mode
+                SpecialMode.REGISTRATION -> R.string.registration_mode
+            }
+            val typeModeStringId = when (mTypeMode) {
+                TypeMode.DEFAULT, // Not important because hidden
+                TypeMode.MAGIKEYBOARD -> R.string.magic_keyboard_title
+                TypeMode.AUTOFILL -> R.string.autofill
+            }
+            title = getString(selectionModeStringId)
+            if (mTypeMode != TypeMode.DEFAULT)
+                title = "$title (${getString(typeModeStringId)})"
             // Populate subtitle
             subtitle = searchInfo?.getName(resources)
 
             // Show the toolbar or not
-            visible = mSelectionMode
+            visible = when (mSpecialMode) {
+                SpecialMode.DEFAULT -> false
+                SpecialMode.SEARCH -> true
+                SpecialMode.SAVE -> true
+                SpecialMode.SELECTION -> true
+                SpecialMode.REGISTRATION -> true
+            }
 
             // Add back listener
             onCancelButtonClickListener = View.OnClickListener {
@@ -58,7 +147,7 @@ abstract class SpecialModeActivity : StylishActivity() {
 
             // Create menu
             menu.clear()
-            if (mAutofillSelection) {
+            if (mTypeMode == TypeMode.AUTOFILL) {
                 menuInflater.inflate(R.menu.autofill, menu)
                 setOnMenuItemClickListener {  menuItem ->
                     when (menuItem.itemId) {
@@ -70,9 +159,15 @@ abstract class SpecialModeActivity : StylishActivity() {
                 }
             }
         }
+
+        // To hide home button from the regular toolbar in special mode
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            supportActionBar?.setDisplayHomeAsUpEnabled(false)
+            supportActionBar?.setDisplayShowHomeEnabled(false)
+        }
     }
 
-    fun blockAutofill(searchInfo: SearchInfo?) {
+    private fun blockAutofill(searchInfo: SearchInfo?) {
         val webDomain = searchInfo?.webDomain
         val applicationId = searchInfo?.applicationId
         if (webDomain != null) {

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

@@ -46,12 +46,19 @@ abstract class StylishFragment : Fragment() {
         // To fix status bar color
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             val window = requireActivity().window
-
-            val attrColorPrimaryDark = intArrayOf(android.R.attr.colorPrimaryDark)
-            val taColorPrimaryDark = contextThemed?.theme?.obtainStyledAttributes(attrColorPrimaryDark)
             val defaultColor = Color.BLACK
-            window.statusBarColor = taColorPrimaryDark?.getColor(0, defaultColor) ?: defaultColor
-            taColorPrimaryDark?.recycle()
+
+            try {
+                val taStatusBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
+                window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
+                taStatusBarColor?.recycle()
+            } catch (e: Exception) {}
+
+            try {
+                val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
+                window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
+                taNavigationBarColor?.recycle()
+            } catch (e: Exception) {}
         }
 
         return super.onCreateView(inflater, container, savedInstanceState)

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

@@ -0,0 +1,126 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.view.collapse
+
+abstract class AnimatedItemsAdapter<Item, T: RecyclerView.ViewHolder>(val context: Context)
+    : RecyclerView.Adapter<T>() {
+
+    protected val inflater: LayoutInflater = LayoutInflater.from(context)
+    var itemsList: MutableList<Item> = ArrayList()
+        private set
+
+    var onDeleteButtonClickListener: ((item: Item)->Unit)? = null
+    private var mItemToRemove: Item? = null
+
+    var onListSizeChangedListener: ((previousSize: Int, newSize: Int)->Unit)? = null
+
+    override fun getItemCount(): Int {
+        return itemsList.size
+    }
+
+    open fun assignItems(items: List<Item>) {
+        val previousSize = itemsList.size
+        itemsList.apply {
+            clear()
+            addAll(items)
+        }
+        notifyDataSetChanged()
+        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
+    }
+
+    open fun isEmpty(): Boolean {
+        return itemsList.isEmpty()
+    }
+
+    open fun contains(item: Item): Boolean {
+        return itemsList.contains(item)
+    }
+
+    open fun indexOf(item: Item): Int {
+        return itemsList.indexOf(item)
+    }
+
+    open fun putItem(item: Item) {
+        val previousSize = itemsList.size
+        if (itemsList.contains(item)) {
+            val index = itemsList.indexOf(item)
+            itemsList.removeAt(index)
+            itemsList.add(index, item)
+            notifyItemChanged(index)
+        } else {
+            itemsList.add(item)
+            notifyItemInserted(itemsList.indexOf(item))
+        }
+        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
+    }
+
+    /**
+     * Only replace [oldItem] by [newItem] if [oldItem] exists
+     */
+    open fun replaceItem(oldItem: Item, newItem: Item) {
+        if (itemsList.contains(oldItem)) {
+            val index = itemsList.indexOf(oldItem)
+            itemsList.removeAt(index)
+            itemsList.add(index, newItem)
+            notifyItemChanged(index)
+        }
+    }
+
+    /**
+     * Only remove [item] if doesn't exists
+     */
+    open fun removeItem(item: Item) {
+        if (itemsList.contains(item)) {
+            mItemToRemove = item
+            notifyItemChanged(itemsList.indexOf(item))
+        }
+    }
+
+    protected fun performDeletion(holder: T, item: Item): Boolean {
+        val effectivelyDeletionPerformed = mItemToRemove == item
+        if (effectivelyDeletionPerformed) {
+            holder.itemView.collapse(true) {
+                deleteItem(item)
+            }
+        }
+        return effectivelyDeletionPerformed
+    }
+
+    protected fun onBindDeleteButton(holder: T, deleteButton: View, item: Item, position: Int) {
+        deleteButton.apply {
+            visibility = View.VISIBLE
+            if (performDeletion(holder, item)) {
+                setOnClickListener(null)
+            } else {
+                setOnClickListener {
+                    onDeleteButtonClickListener?.invoke(item)
+                    mItemToRemove = item
+                    notifyItemChanged(position)
+                }
+            }
+        }
+    }
+
+    private fun deleteItem(item: Item) {
+        val previousSize = itemsList.size
+        val position = itemsList.indexOf(item)
+        if (position >= 0) {
+            itemsList.removeAt(position)
+            notifyItemRemoved(position)
+            mItemToRemove = null
+            for (i in 0 until itemsList.size) {
+                notifyItemChanged(i)
+            }
+        }
+        onListSizeChangedListener?.invoke(previousSize, itemsList.size)
+    }
+
+    fun clear() {
+        itemsList.clear()
+        notifyDataSetChanged()
+    }
+}

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

@@ -1,100 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import android.text.format.Formatter
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
-import com.kunzisoft.keepass.model.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachment
-
-class EntryAttachmentsAdapter(val context: Context) : RecyclerView.Adapter<EntryAttachmentsAdapter.EntryBinariesViewHolder>() {
-
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryAttachmentsList: MutableList<EntryAttachment> = ArrayList()
-    var onItemClickListener: ((item: EntryAttachment, position: Int)->Unit)? = null
-
-    private val mDatabase = Database.getInstance()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryBinariesViewHolder {
-        return EntryBinariesViewHolder(inflater.inflate(R.layout.item_attachment, parent, false))
-    }
-
-    override fun onBindViewHolder(holder: EntryBinariesViewHolder, position: Int) {
-        val entryAttachment = entryAttachmentsList[position]
-
-        holder.binaryFileTitle.text = entryAttachment.name
-        holder.binaryFileSize.text = Formatter.formatFileSize(context,
-                entryAttachment.binaryAttachment.length())
-        holder.binaryFileCompression.apply {
-            if (mDatabase.compressionAlgorithm == CompressionAlgorithm.GZip
-                    || entryAttachment.binaryAttachment.isCompressed == true) {
-                text = CompressionAlgorithm.GZip.getName(context.resources)
-                visibility = View.VISIBLE
-            } else {
-                text = ""
-                visibility = View.GONE
-            }
-        }
-        holder.binaryFileProgress.apply {
-            visibility = when (entryAttachment.downloadState) {
-                AttachmentState.NULL, AttachmentState.COMPLETE, AttachmentState.ERROR -> View.GONE
-                AttachmentState.START, AttachmentState.IN_PROGRESS -> View.VISIBLE
-            }
-            progress = entryAttachment.downloadProgression
-        }
-
-        holder.itemView.setOnClickListener {
-            onItemClickListener?.invoke(entryAttachment, position)
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return entryAttachmentsList.size
-    }
-
-    fun updateProgress(entryAttachment: EntryAttachment) {
-        val indexEntryAttachment = entryAttachmentsList.indexOfLast { current -> current.name == entryAttachment.name }
-        if (indexEntryAttachment != -1) {
-            entryAttachmentsList[indexEntryAttachment] = entryAttachment
-            notifyItemChanged(indexEntryAttachment)
-        }
-    }
-
-    fun clear() {
-        entryAttachmentsList.clear()
-    }
-
-    inner class EntryBinariesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-        var binaryFileTitle: TextView = itemView.findViewById(R.id.item_attachment_title)
-        var binaryFileSize: TextView = itemView.findViewById(R.id.item_attachment_size)
-        var binaryFileCompression: TextView = itemView.findViewById(R.id.item_attachment_compression)
-        var binaryFileProgress: ProgressBar = itemView.findViewById(R.id.item_attachment_progress)
-    }
-}

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

@@ -0,0 +1,148 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.text.format.Formatter
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.model.AttachmentState
+import com.kunzisoft.keepass.model.EntryAttachmentState
+import com.kunzisoft.keepass.model.StreamDirection
+
+
+class EntryAttachmentsItemsAdapter(context: Context)
+    : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {
+
+    var onItemClickListener: ((item: EntryAttachmentState)->Unit)? = null
+
+    private var mTitleColor: Int
+
+    init {
+        // Get the primary text color of the theme
+        val typedValue = TypedValue()
+        context.theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true)
+        val typedArray: TypedArray = context.obtainStyledAttributes(typedValue.data, intArrayOf(
+                android.R.attr.textColor))
+        mTitleColor = typedArray.getColor(0, -1)
+        typedArray.recycle()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryBinariesViewHolder {
+        return EntryBinariesViewHolder(inflater.inflate(R.layout.item_attachment, parent, false))
+    }
+
+    override fun onBindViewHolder(holder: EntryBinariesViewHolder, position: Int) {
+        val entryAttachmentState = itemsList[position]
+
+        holder.itemView.visibility = View.VISIBLE
+        holder.binaryFileBroken.apply {
+            setColorFilter(Color.RED)
+            visibility = if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+        }
+        holder.binaryFileTitle.text = entryAttachmentState.attachment.name
+        if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+            holder.binaryFileTitle.setTextColor(Color.RED)
+        } else {
+            holder.binaryFileTitle.setTextColor(mTitleColor)
+        }
+        holder.binaryFileSize.text = Formatter.formatFileSize(context,
+                entryAttachmentState.attachment.binaryAttachment.length())
+        holder.binaryFileCompression.apply {
+            if (entryAttachmentState.attachment.binaryAttachment.isCompressed) {
+                text = CompressionAlgorithm.GZip.getName(context.resources)
+                visibility = View.VISIBLE
+            } else {
+                text = ""
+                visibility = View.GONE
+            }
+        }
+        when (entryAttachmentState.streamDirection) {
+            StreamDirection.UPLOAD -> {
+                holder.binaryFileProgressIcon.isActivated = true
+                when (entryAttachmentState.downloadState) {
+                    AttachmentState.START,
+                    AttachmentState.IN_PROGRESS -> {
+                        holder.binaryFileProgressContainer.visibility = View.VISIBLE
+                        holder.binaryFileProgress.apply {
+                            visibility = View.VISIBLE
+                            progress = entryAttachmentState.downloadProgression
+                        }
+                        holder.binaryFileDeleteButton.apply {
+                            visibility = View.GONE
+                            setOnClickListener(null)
+                        }
+                    }
+                    AttachmentState.NULL,
+                    AttachmentState.ERROR,
+                    AttachmentState.COMPLETE -> {
+                        holder.binaryFileProgressContainer.visibility = View.GONE
+                        holder.binaryFileProgress.visibility = View.GONE
+                        holder.binaryFileDeleteButton.apply {
+                            visibility = View.VISIBLE
+                            onBindDeleteButton(holder, this, entryAttachmentState, position)
+                        }
+                    }
+                }
+                holder.itemView.setOnClickListener(null)
+            }
+            StreamDirection.DOWNLOAD -> {
+                holder.binaryFileProgressIcon.isActivated = false
+                holder.binaryFileProgressContainer.visibility = View.VISIBLE
+                holder.binaryFileDeleteButton.visibility = View.GONE
+                holder.binaryFileProgress.apply {
+                    visibility = when (entryAttachmentState.downloadState) {
+                        AttachmentState.NULL, AttachmentState.COMPLETE, AttachmentState.ERROR -> View.GONE
+                        AttachmentState.START, AttachmentState.IN_PROGRESS -> View.VISIBLE
+                    }
+                    progress = entryAttachmentState.downloadProgression
+                }
+                holder.itemView.setOnClickListener {
+                    onItemClickListener?.invoke(entryAttachmentState)
+                }
+            }
+        }
+    }
+
+    class EntryBinariesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        var binaryFileBroken: ImageView = itemView.findViewById(R.id.item_attachment_broken)
+        var binaryFileTitle: TextView = itemView.findViewById(R.id.item_attachment_title)
+        var binaryFileSize: TextView = itemView.findViewById(R.id.item_attachment_size)
+        var binaryFileCompression: TextView = itemView.findViewById(R.id.item_attachment_compression)
+        var binaryFileProgressContainer: View = itemView.findViewById(R.id.item_attachment_progress_container)
+        var binaryFileProgressIcon: ImageView = itemView.findViewById(R.id.item_attachment_icon)
+        var binaryFileProgress: ProgressBar = itemView.findViewById(R.id.item_attachment_progress)
+        var binaryFileDeleteButton: View = itemView.findViewById(R.id.item_attachment_delete_button)
+    }
+}

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

@@ -22,31 +22,33 @@ package com.kunzisoft.keepass.adapters
 import android.content.Context
 import android.graphics.Color
 import android.graphics.PorterDuff
+import android.net.Uri
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
-import android.util.TypedValue
-import android.view.*
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.TextView
-import android.widget.ViewSwitcher
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryEntity
-import com.kunzisoft.keepass.utils.FileDatabaseInfo
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.model.DatabaseFile
+import com.kunzisoft.keepass.view.collapse
+import com.kunzisoft.keepass.view.expand
 
-class FileDatabaseHistoryAdapter(private val context: Context)
+class FileDatabaseHistoryAdapter(context: Context)
     : RecyclerView.Adapter<FileDatabaseHistoryAdapter.FileDatabaseHistoryViewHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var fileItemOpenListener: ((FileDatabaseHistoryEntity)->Unit)? = null
-    private var fileSelectClearListener: ((FileDatabaseHistoryEntity)->Boolean)? = null
-    private var saveAliasListener: ((FileDatabaseHistoryEntity)->Unit)? = null
+    private var defaultDatabaseListener: ((DatabaseFile?) -> Unit)? = null
+    private var fileItemOpenListener: ((DatabaseFile)->Unit)? = null
+    private var fileSelectClearListener: ((DatabaseFile)->Boolean)? = null
+    private var saveAliasListener: ((DatabaseFile)->Unit)? = null
 
-    private val listDatabaseFiles = ArrayList<FileDatabaseHistoryEntity>()
+    private val listDatabaseFiles = ArrayList<DatabaseFile>()
 
-    private var mExpandedPosition = -1
-    private var mPreviousExpandedPosition = -1
+    private var mDefaultDatabaseFile: DatabaseFile? = null
+    private var mExpandedDatabaseFile: DatabaseFile? = null
+    private var mPreviousExpandedDatabaseFile: DatabaseFile? = null
 
     @ColorInt
     private val defaultColor: Int
@@ -63,43 +65,49 @@ class FileDatabaseHistoryAdapter(private val context: Context)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FileDatabaseHistoryViewHolder {
-        val view = inflater.inflate(R.layout.item_file_row, parent, false)
+        val view = inflater.inflate(R.layout.item_file_info, parent, false)
         return FileDatabaseHistoryViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: FileDatabaseHistoryViewHolder, position: Int) {
         // Get info from position
-        val fileHistoryEntity = listDatabaseFiles[position]
-        val fileDatabaseInfo = FileDatabaseInfo(context, fileHistoryEntity.databaseUri)
+        val databaseFile = listDatabaseFiles[position]
 
         // Click item to open file
-        if (fileItemOpenListener != null)
-            holder.fileContainer.setOnClickListener {
-                fileItemOpenListener?.invoke(fileHistoryEntity)
+        holder.fileContainer.setOnClickListener {
+            fileItemOpenListener?.invoke(databaseFile)
+        }
+
+        // Default database
+        holder.defaultFileButton.apply {
+            this.isChecked = mDefaultDatabaseFile == databaseFile
+            setOnClickListener {
+                defaultDatabaseListener?.invoke(if (isChecked) databaseFile else null)
             }
+        }
 
         // File alias
-        holder.fileAlias.text = fileDatabaseInfo.retrieveDatabaseAlias(fileHistoryEntity.databaseAlias)
+        holder.fileAlias.text = databaseFile.databaseAlias
 
         // File path
-        holder.filePath.text = UriUtil.decode(fileDatabaseInfo.fileUri?.toString())
+        holder.filePath.text = databaseFile.databaseDecodedPath
 
-        if (fileDatabaseInfo.exists) {
-            holder.fileInformation.clearColorFilter()
+        if (databaseFile.databaseFileExists) {
+            holder.fileInformationButton.clearColorFilter()
         } else {
-            holder.fileInformation.setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY)
+            holder.fileInformationButton.setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY)
         }
 
         // Modification
-        fileDatabaseInfo.getModificationString()?.let {
+        databaseFile.databaseLastModified?.let {
             holder.fileModification.text = it
-            holder.fileModification.visibility = View.VISIBLE
+            holder.fileModificationContainer.visibility = View.VISIBLE
         } ?: run {
-            holder.fileModification.visibility = View.GONE
+            holder.fileModificationContainer.visibility = View.GONE
         }
 
         // Size
-        fileDatabaseInfo.getSizeString()?.let {
+        databaseFile.databaseSize?.let {
             holder.fileSize.text = it
             holder.fileSize.visibility = View.VISIBLE
         } ?: run {
@@ -107,15 +115,24 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         }
 
         // Click on information
-        val isExpanded = position == mExpandedPosition
-        //This line hides or shows the layout in question
-        holder.fileExpandContainer.visibility = if (isExpanded) View.VISIBLE else View.GONE
+        val isExpanded = databaseFile == mExpandedDatabaseFile
+        // Hides or shows info
+        holder.fileExpandContainer.apply {
+            if (isExpanded) {
+                if (visibility != View.VISIBLE) {
+                    visibility = View.VISIBLE
+                    expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height))
+                }
+            } else {
+                collapse(true)
+            }
+        }
 
         // Save alias modification
         holder.fileAliasCloseButton.setOnClickListener {
             // Change the alias
-            fileHistoryEntity.databaseAlias = holder.fileAliasEdit.text.toString()
-            saveAliasListener?.invoke(fileHistoryEntity)
+            databaseFile.databaseAlias = holder.fileAliasEdit.text.toString()
+            saveAliasListener?.invoke(databaseFile)
 
             // Finish save mode
             holder.fileMainSwitcher.showPrevious()
@@ -130,20 +147,22 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         }
 
         holder.fileDeleteButton.setOnClickListener {
-            fileSelectClearListener?.invoke(fileHistoryEntity)
+            fileSelectClearListener?.invoke(databaseFile)
         }
 
         if (isExpanded) {
-            mPreviousExpandedPosition = position
+            mPreviousExpandedDatabaseFile = databaseFile
         }
-
-        holder.fileInformation.setOnClickListener {
-            mExpandedPosition = if (isExpanded) -1 else position
-
-            // Notify change
-            if (mPreviousExpandedPosition < itemCount)
-                notifyItemChanged(mPreviousExpandedPosition)
-            notifyItemChanged(position)
+        holder.fileInformationButton.apply {
+            animate().rotation(if (isExpanded) 180F else 0F).start()
+            setOnClickListener {
+                mExpandedDatabaseFile = if (isExpanded) null else databaseFile
+                // Notify change
+                val previousExpandedPosition = listDatabaseFiles.indexOf(mPreviousExpandedDatabaseFile)
+                notifyItemChanged(previousExpandedPosition)
+                val expandedPosition = listDatabaseFiles.indexOf(mExpandedDatabaseFile)
+                notifyItemChanged(expandedPosition)
+            }
         }
 
         // Refresh View / Close alias modification if not contains fileAlias
@@ -160,33 +179,68 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         listDatabaseFiles.clear()
     }
 
-    fun addDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<FileDatabaseHistoryEntity>) {
-        listDatabaseFiles.clear()
-        listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
+    fun addDatabaseFileHistory(fileDatabaseHistoryToAdd: DatabaseFile) {
+        listDatabaseFiles.add(0, fileDatabaseHistoryToAdd)
+        notifyItemInserted(0)
     }
 
-    fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: FileDatabaseHistoryEntity) {
-        listDatabaseFiles.remove(fileDatabaseHistoryToDelete)
+    fun updateDatabaseFileHistory(fileDatabaseHistoryToUpdate: DatabaseFile) {
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToUpdate)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToUpdate)) {
+            listDatabaseFiles.add(index, fileDatabaseHistoryToUpdate)
+            notifyItemChanged(index)
+        }
     }
 
-    fun setOnFileDatabaseHistoryOpenListener(listener : ((FileDatabaseHistoryEntity)->Unit)?) {
+    fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: DatabaseFile) {
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToDelete)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToDelete)) {
+            notifyItemRemoved(index)
+        }
+    }
+
+    fun replaceAllDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<DatabaseFile>) {
+        if (listDatabaseFiles.isEmpty()) {
+            listFileDatabaseHistoryToAdd.forEach {
+                listDatabaseFiles.add(it)
+                notifyItemInserted(listDatabaseFiles.size)
+            }
+        } else {
+            listDatabaseFiles.clear()
+            listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun setDefaultDatabase(databaseUri: Uri?) {
+        val defaultDatabaseFile = listDatabaseFiles.firstOrNull { it.databaseUri == databaseUri }
+        mDefaultDatabaseFile = defaultDatabaseFile
+        notifyDataSetChanged()
+    }
+
+    fun setOnDefaultDatabaseListener(listener: ((DatabaseFile?) -> Unit)?) {
+        this.defaultDatabaseListener = listener
+    }
+
+    fun setOnFileDatabaseHistoryOpenListener(listener : ((DatabaseFile)->Unit)?) {
         this.fileItemOpenListener = listener
     }
 
-    fun setOnFileDatabaseHistoryDeleteListener(listener : ((FileDatabaseHistoryEntity)->Boolean)?) {
+    fun setOnFileDatabaseHistoryDeleteListener(listener : ((DatabaseFile)->Boolean)?) {
         this.fileSelectClearListener = listener
     }
 
-    fun setOnSaveAliasListener(listener : ((FileDatabaseHistoryEntity)->Unit)?) {
+    fun setOnSaveAliasListener(listener : ((DatabaseFile)->Unit)?) {
         this.saveAliasListener = listener
     }
 
-    inner class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         var fileContainer: ViewGroup = itemView.findViewById(R.id.file_container_basic_info)
 
+        var defaultFileButton: CompoundButton = itemView.findViewById(R.id.default_file_button)
         var fileAlias: TextView = itemView.findViewById(R.id.file_alias)
-        var fileInformation: ImageView = itemView.findViewById(R.id.file_information)
+        var fileInformationButton: ImageView = itemView.findViewById(R.id.file_information_button)
 
         var fileMainSwitcher: ViewSwitcher = itemView.findViewById(R.id.file_main_switcher)
         var fileAliasEdit: EditText = itemView.findViewById(R.id.file_alias_edit)
@@ -196,6 +250,7 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         var fileModifyButton: ImageView = itemView.findViewById(R.id.file_modify_button)
         var fileDeleteButton: ImageView = itemView.findViewById(R.id.file_delete_button)
         var filePath: TextView = itemView.findViewById(R.id.file_path)
+        var fileModificationContainer: ViewGroup = itemView.findViewById(R.id.file_modification_container)
         var fileModification: TextView = itemView.findViewById(R.id.file_modification)
         var fileSize: TextView = itemView.findViewById(R.id.file_size)
     }

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

@@ -52,72 +52,69 @@ import java.util.*
 class NodeAdapter (private val context: Context)
     : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {
 
-    private var nodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
-    private val nodeSortedListCallback: NodeSortedListCallback
-    private val nodeSortedList: SortedList<Node>
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
+    private val mNodeSortedListCallback: NodeSortedListCallback
+    private val mNodeSortedList: SortedList<Node>
+    private val mInflater: LayoutInflater = LayoutInflater.from(context)
 
-    private var calculateViewTypeTextSize = Array(2) { true} // number of view type
-    private var textSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
-    private var prefSizeMultiplier: Float = 0F
-    private var subtextDefaultDimension: Float = 0F
-    private var infoTextDefaultDimension: Float = 0F
-    private var numberChildrenTextDefaultDimension: Float = 0F
-    private var iconDefaultDimension: Float = 0F
+    private var mCalculateViewTypeTextSize = Array(2) { true} // number of view type
+    private var mTextSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
+    private var mPrefSizeMultiplier: Float = 0F
+    private var mSubtextDefaultDimension: Float = 0F
+    private var mInfoTextDefaultDimension: Float = 0F
+    private var mNumberChildrenTextDefaultDimension: Float = 0F
+    private var mIconDefaultDimension: Float = 0F
 
-    private var showUserNames: Boolean = true
-    private var showNumberEntries: Boolean = true
-    private var entryFilters = arrayOf<Group.ChildFilter>()
+    private var mShowUserNames: Boolean = true
+    private var mShowNumberEntries: Boolean = true
+    private var mEntryFilters = arrayOf<Group.ChildFilter>()
 
-    private var actionNodesList = LinkedList<Node>()
-    private var nodeClickCallback: NodeClickCallback? = null
+    private var mActionNodesList = LinkedList<Node>()
+    private var mNodeClickCallback: NodeClickCallback? = null
 
     private val mDatabase: Database
 
     @ColorInt
-    private val contentSelectionColor: Int
+    private val mContentSelectionColor: Int
     @ColorInt
-    private val iconGroupColor: Int
+    private val mIconGroupColor: Int
     @ColorInt
-    private val iconEntryColor: Int
+    private val mIconEntryColor: Int
 
     /**
      * Determine if the adapter contains or not any element
      * @return true if the list is empty
      */
     val isEmpty: Boolean
-        get() = nodeSortedList.size() <= 0
+        get() = mNodeSortedList.size() <= 0
 
     init {
-        this.infoTextDefaultDimension = context.resources.getDimension(R.dimen.list_medium_size_default)
-        this.subtextDefaultDimension = context.resources.getDimension(R.dimen.list_small_size_default)
-        this.numberChildrenTextDefaultDimension = context.resources.getDimension(R.dimen.list_tiny_size_default)
-        this.iconDefaultDimension = context.resources.getDimension(R.dimen.list_icon_size_default)
+        this.mIconDefaultDimension = context.resources.getDimension(R.dimen.list_icon_size_default)
 
         assignPreferences()
 
-        this.nodeSortedListCallback = NodeSortedListCallback()
-        this.nodeSortedList = SortedList(Node::class.java, nodeSortedListCallback)
+        this.mNodeSortedListCallback = NodeSortedListCallback()
+        this.mNodeSortedList = SortedList(Node::class.java, mNodeSortedListCallback)
 
         // Database
         this.mDatabase = Database.getInstance()
 
         // Color of content selection
         val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        this.contentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
+        this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
         taContentSelectionColor.recycle()
         // Retrieve the color to tint the icon
         val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
-        this.iconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
+        this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
         taTextColorPrimary.recycle()
         // In two times to fix bug compilation
         val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        this.iconEntryColor = taTextColor.getColor(0, Color.BLACK)
+        this.mIconEntryColor = taTextColor.getColor(0, Color.BLACK)
         taTextColor.recycle()
     }
 
     fun assignPreferences() {
-        this.prefSizeMultiplier = PreferencesUtil.getListTextSize(context)
+        this.mPrefSizeMultiplier = PreferencesUtil.getListTextSize(context)
 
         notifyChangeSort(
                 PreferencesUtil.getListSort(context),
@@ -128,13 +125,13 @@ class NodeAdapter (private val context: Context)
                         )
                 )
 
-        this.showUserNames = PreferencesUtil.showUsernamesListEntries(context)
-        this.showNumberEntries = PreferencesUtil.showNumberEntries(context)
+        this.mShowUserNames = PreferencesUtil.showUsernamesListEntries(context)
+        this.mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
 
-        this.entryFilters = Group.ChildFilter.getDefaults(context)
+        this.mEntryFilters = Group.ChildFilter.getDefaults(context)
 
         // Reinit textSize for all view type
-        calculateViewTypeTextSize.forEachIndexed { index, _ -> calculateViewTypeTextSize[index] = true }
+        mCalculateViewTypeTextSize.forEachIndexed { index, _ -> mCalculateViewTypeTextSize[index] = true }
     }
 
     /**
@@ -142,12 +139,12 @@ class NodeAdapter (private val context: Context)
      */
     fun rebuildList(group: Group) {
         assignPreferences()
-        nodeSortedList.replaceAll(group.getFilteredChildren(entryFilters))
+        mNodeSortedList.replaceAll(group.getFilteredChildren(mEntryFilters))
     }
 
     private inner class NodeSortedListCallback: SortedListAdapterCallback<Node>(this) {
         override fun compare(item1: Node, item2: Node): Int {
-            return nodeComparator!!.compare(item1, item2)
+            return mNodeComparator!!.compare(item1, item2)
         }
 
         override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
@@ -162,7 +159,7 @@ class NodeAdapter (private val context: Context)
     }
 
     fun contains(node: Node): Boolean {
-        return nodeSortedList.indexOf(node) != SortedList.INVALID_POSITION
+        return mNodeSortedList.indexOf(node) != SortedList.INVALID_POSITION
     }
 
     /**
@@ -170,7 +167,7 @@ class NodeAdapter (private val context: Context)
      * @param node Node to add
      */
     fun addNode(node: Node) {
-        nodeSortedList.add(node)
+        mNodeSortedList.add(node)
     }
 
     /**
@@ -178,7 +175,7 @@ class NodeAdapter (private val context: Context)
      * @param nodes Nodes to add
      */
     fun addNodes(nodes: List<Node>) {
-        nodeSortedList.addAll(nodes)
+        mNodeSortedList.addAll(nodes)
     }
 
     /**
@@ -186,7 +183,7 @@ class NodeAdapter (private val context: Context)
      * @param node Node to delete
      */
     fun removeNode(node: Node) {
-        nodeSortedList.remove(node)
+        mNodeSortedList.remove(node)
     }
 
     /**
@@ -195,7 +192,7 @@ class NodeAdapter (private val context: Context)
      */
     fun removeNodes(nodes: List<Node>) {
         nodes.forEach { node ->
-            nodeSortedList.remove(node)
+            mNodeSortedList.remove(node)
         }
     }
 
@@ -203,9 +200,9 @@ class NodeAdapter (private val context: Context)
      * Remove a node at [position] in the list
      */
     fun removeNodeAt(position: Int) {
-        nodeSortedList.removeItemAt(position)
+        mNodeSortedList.removeItemAt(position)
         // Refresh all the next items
-        notifyItemRangeChanged(position, nodeSortedList.size() - position)
+        notifyItemRangeChanged(position, mNodeSortedList.size() - position)
     }
 
     /**
@@ -226,10 +223,10 @@ class NodeAdapter (private val context: Context)
      * @param newNode Node after the update
      */
     fun updateNode(oldNode: Node, newNode: Node) {
-        nodeSortedList.beginBatchedUpdates()
-        nodeSortedList.remove(oldNode)
-        nodeSortedList.add(newNode)
-        nodeSortedList.endBatchedUpdates()
+        mNodeSortedList.beginBatchedUpdates()
+        mNodeSortedList.remove(oldNode)
+        mNodeSortedList.add(newNode)
+        mNodeSortedList.endBatchedUpdates()
     }
 
     /**
@@ -238,30 +235,30 @@ class NodeAdapter (private val context: Context)
      * @param newNodes Node after the update
      */
     fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
-        nodeSortedList.beginBatchedUpdates()
+        mNodeSortedList.beginBatchedUpdates()
         oldNodes.forEach { oldNode ->
-            nodeSortedList.remove(oldNode)
+            mNodeSortedList.remove(oldNode)
         }
-        nodeSortedList.addAll(newNodes)
-        nodeSortedList.endBatchedUpdates()
+        mNodeSortedList.addAll(newNodes)
+        mNodeSortedList.endBatchedUpdates()
     }
 
     fun notifyNodeChanged(node: Node) {
-        notifyItemChanged(nodeSortedList.indexOf(node))
+        notifyItemChanged(mNodeSortedList.indexOf(node))
     }
 
     fun setActionNodes(actionNodes: List<Node>) {
-        this.actionNodesList.apply {
+        this.mActionNodesList.apply {
             clear()
             addAll(actionNodes)
         }
     }
 
     fun unselectActionNodes() {
-        actionNodesList.forEach {
-            notifyItemChanged(nodeSortedList.indexOf(it))
+        mActionNodesList.forEach {
+            notifyItemChanged(mNodeSortedList.indexOf(it))
         }
-        this.actionNodesList.apply {
+        this.mActionNodesList.apply {
             clear()
         }
     }
@@ -271,49 +268,55 @@ class NodeAdapter (private val context: Context)
      */
     fun notifyChangeSort(sortNodeEnum: SortNodeEnum,
                          sortNodeParameters: SortNodeEnum.SortNodeParameters) {
-        this.nodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
+        this.mNodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
     }
 
     override fun getItemViewType(position: Int): Int {
-        return nodeSortedList.get(position).type.ordinal
+        return mNodeSortedList.get(position).type.ordinal
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NodeViewHolder {
         val view: View = if (viewType == Type.GROUP.ordinal) {
-            inflater.inflate(R.layout.item_list_nodes_group, parent, false)
+            mInflater.inflate(R.layout.item_list_nodes_group, parent, false)
         } else {
-            inflater.inflate(R.layout.item_list_nodes_entry, parent, false)
+            mInflater.inflate(R.layout.item_list_nodes_entry, parent, false)
         }
-        return NodeViewHolder(view)
+        val nodeViewHolder = NodeViewHolder(view)
+        mInfoTextDefaultDimension = nodeViewHolder.text.textSize
+        mSubtextDefaultDimension = nodeViewHolder.subText.textSize
+        nodeViewHolder.numberChildren?.let {
+            mNumberChildrenTextDefaultDimension = it.textSize
+        }
+        return nodeViewHolder
     }
 
     override fun onBindViewHolder(holder: NodeViewHolder, position: Int) {
-        val subNode = nodeSortedList.get(position)
+        val subNode = mNodeSortedList.get(position)
 
         // Node selection
-        holder.container.isSelected = actionNodesList.contains(subNode)
+        holder.container.isSelected = mActionNodesList.contains(subNode)
 
         // Assign image
         val iconColor = if (holder.container.isSelected)
-            contentSelectionColor
+            mContentSelectionColor
         else when (subNode.type) {
-            Type.GROUP -> iconGroupColor
-            Type.ENTRY -> iconEntryColor
+            Type.GROUP -> mIconGroupColor
+            Type.ENTRY -> mIconEntryColor
         }
         holder.imageIdentifier?.setColorFilter(iconColor)
         holder.icon.apply {
             assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor)
             // Relative size of the icon
             layoutParams?.apply {
-                height = (iconDefaultDimension * prefSizeMultiplier).toInt()
-                width = (iconDefaultDimension * prefSizeMultiplier).toInt()
+                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
+                width = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
             }
         }
 
         // Assign text
         holder.text.apply {
             text = subNode.title
-            setTextSize(textSizeUnit, infoTextDefaultDimension, prefSizeMultiplier)
+            setTextSize(mTextSizeUnit, mInfoTextDefaultDimension, mPrefSizeMultiplier)
             strikeOut(subNode.isCurrentlyExpires)
         }
         // Add subText with username
@@ -331,24 +334,27 @@ class NodeAdapter (private val context: Context)
             holder.text.text = entry.getVisualTitle()
             holder.subText.apply {
                 val username = entry.username
-                if (showUserNames && username.isNotEmpty()) {
+                if (mShowUserNames && username.isNotEmpty()) {
                     visibility = View.VISIBLE
                     text = username
-                    setTextSize(textSizeUnit, subtextDefaultDimension, prefSizeMultiplier)
+                    setTextSize(mTextSizeUnit, mSubtextDefaultDimension, mPrefSizeMultiplier)
                 }
             }
 
+            holder.attachmentIcon?.visibility =
+                    if (entry.containsAttachment()) View.VISIBLE else View.GONE
+
             mDatabase.stopManageEntry(entry)
         }
 
         // Add number of entries in groups
         if (subNode.type == Type.GROUP) {
-            if (showNumberEntries) {
+            if (mShowNumberEntries) {
                 holder.numberChildren?.apply {
                     text = (subNode as Group)
-                            .getNumberOfChildEntries(entryFilters)
+                            .getNumberOfChildEntries(mEntryFilters)
                             .toString()
-                    setTextSize(textSizeUnit, numberChildrenTextDefaultDimension, prefSizeMultiplier)
+                    setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                     visibility = View.VISIBLE
                 }
             } else {
@@ -358,22 +364,22 @@ class NodeAdapter (private val context: Context)
 
         // Assign click
         holder.container.setOnClickListener {
-            nodeClickCallback?.onNodeClick(subNode)
+            mNodeClickCallback?.onNodeClick(subNode)
         }
         holder.container.setOnLongClickListener {
-            nodeClickCallback?.onNodeLongClick(subNode) ?: false
+            mNodeClickCallback?.onNodeLongClick(subNode) ?: false
         }
     }
     
     override fun getItemCount(): Int {
-        return nodeSortedList.size()
+        return mNodeSortedList.size()
     }
 
     /**
      * Assign a listener when a node is clicked
      */
     fun setOnNodeClickListener(nodeClickCallback: NodeClickCallback?) {
-        this.nodeClickCallback = nodeClickCallback
+        this.mNodeClickCallback = nodeClickCallback
     }
 
     /**
@@ -391,6 +397,7 @@ class NodeAdapter (private val context: Context)
         var text: TextView = itemView.findViewById(R.id.node_text)
         var subText: TextView = itemView.findViewById(R.id.node_subtext)
         var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
+        var attachmentIcon: ImageView? = itemView.findViewById(R.id.node_attachment_icon)
     }
 
     companion object {

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

@@ -22,6 +22,7 @@ package com.kunzisoft.keepass.app
 import androidx.multidex.MultiDexApplication
 import com.kunzisoft.keepass.activities.stylish.Stylish
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.utils.UriUtil
 
 class App : MultiDexApplication() {
 
@@ -33,7 +34,7 @@ class App : MultiDexApplication() {
     }
 
     override fun onTerminate() {
-        Database.getInstance().closeAndClear(applicationContext.filesDir)
+        Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this))
         super.onTerminate()
     }
 }

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

@@ -32,7 +32,7 @@ class CipherDatabaseAction(applicationContext: Context) {
 
     fun getCipherDatabase(databaseUri: Uri,
                           cipherDatabaseResultListener: (CipherDatabaseEntity?) -> Unit) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
                 },
@@ -51,7 +51,7 @@ class CipherDatabaseAction(applicationContext: Context) {
 
     fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
                                   cipherDatabaseResultListener: (() -> Unit)? = null) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
 
@@ -70,7 +70,7 @@ class CipherDatabaseAction(applicationContext: Context) {
 
     fun deleteByDatabaseUri(databaseUri: Uri,
                             cipherDatabaseResultListener: (() -> Unit)? = null) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     cipherDatabaseDao.deleteByDatabaseUri(databaseUri.toString())
                 },
@@ -81,7 +81,7 @@ class CipherDatabaseAction(applicationContext: Context) {
     }
 
     fun deleteAll() {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     cipherDatabaseDao.deleteAll()
                 }

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

@@ -21,31 +21,45 @@ package com.kunzisoft.keepass.app.database
 
 import android.content.Context
 import android.net.Uri
+import android.util.Log
+import com.kunzisoft.keepass.model.DatabaseFile
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
 import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.viewmodels.FileDatabaseInfo
 
-class FileDatabaseHistoryAction(applicationContext: Context) {
+class FileDatabaseHistoryAction(private val applicationContext: Context) {
 
     private val databaseFileHistoryDao =
             AppDatabase
                 .getDatabase(applicationContext)
                 .fileDatabaseHistoryDao()
 
-    fun getFileDatabaseHistory(databaseUri: Uri,
-                               fileHistoryResultListener: (fileDatabaseHistoryResult: FileDatabaseHistoryEntity?) -> Unit) {
-        ActionDatabaseAsyncTask(
+    fun getDatabaseFile(databaseUri: Uri,
+                        databaseFileResult: (DatabaseFile?) -> Unit) {
+        IOActionTask(
                 {
-                    databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                    val fileDatabaseHistoryEntity = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+                    val fileDatabaseInfo = FileDatabaseInfo(applicationContext, databaseUri)
+                    DatabaseFile(
+                            databaseUri,
+                            UriUtil.parse(fileDatabaseHistoryEntity?.keyFileUri),
+                            UriUtil.decode(fileDatabaseHistoryEntity?.databaseUri),
+                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias ?: ""),
+                            fileDatabaseInfo.exists,
+                            fileDatabaseInfo.getModificationString(),
+                            fileDatabaseInfo.getSizeString()
+                    )
                 },
                 {
-                    fileHistoryResultListener.invoke(it)
+                    databaseFileResult.invoke(it)
                 }
         ).execute()
     }
 
     fun getKeyFileUriByDatabaseUri(databaseUri: Uri,
                                    keyFileUriResultListener: (Uri?) -> Unit) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
                 },
@@ -59,61 +73,124 @@ class FileDatabaseHistoryAction(applicationContext: Context) {
         ).execute()
     }
 
-    fun getAllFileDatabaseHistories(fileHistoryResultListener: (fileDatabaseHistoryResult: List<FileDatabaseHistoryEntity>?) -> Unit) {
-        ActionDatabaseAsyncTask(
+    fun getDatabaseFileList(databaseFileListResult: (List<DatabaseFile>) -> Unit) {
+        IOActionTask(
                 {
-                    databaseFileHistoryDao.getAll()
+                    val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(applicationContext)
+                    // Show only uri accessible
+                    val databaseFileListLoaded = ArrayList<DatabaseFile>()
+                    databaseFileHistoryDao.getAll().forEach { fileDatabaseHistoryEntity ->
+                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext, fileDatabaseHistoryEntity.databaseUri)
+                        if (hideBrokenLocations && fileDatabaseInfo.exists
+                                || !hideBrokenLocations) {
+                            databaseFileListLoaded.add(
+                                    DatabaseFile(
+                                            UriUtil.parse(fileDatabaseHistoryEntity.databaseUri),
+                                            UriUtil.parse(fileDatabaseHistoryEntity.keyFileUri),
+                                            UriUtil.decode(fileDatabaseHistoryEntity.databaseUri),
+                                            fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias),
+                                            fileDatabaseInfo.exists,
+                                            fileDatabaseInfo.getModificationString(),
+                                            fileDatabaseInfo.getSizeString()
+                                    )
+                            )
+                        }
+                    }
+                    databaseFileListLoaded
                 },
                 {
-                    fileHistoryResultListener.invoke(it)
-                }
-        ).execute()
-    }
-
-    fun addOrUpdateDatabaseUri(databaseUri: Uri, keyFileUri: Uri? = null) {
-        addOrUpdateFileDatabaseHistory(FileDatabaseHistoryEntity(
-                databaseUri.toString(),
-                "",
-                keyFileUri?.toString(),
-                System.currentTimeMillis()
-        ), true)
-    }
-
-    fun addOrUpdateFileDatabaseHistory(fileDatabaseHistory: FileDatabaseHistoryEntity, unmodifiedAlias: Boolean = false) {
-        ActionDatabaseAsyncTask(
-                {
-                    val fileDatabaseHistoryRetrieve = databaseFileHistoryDao.getByDatabaseUri(fileDatabaseHistory.databaseUri)
-
-                    if (unmodifiedAlias) {
-                        fileDatabaseHistory.databaseAlias = fileDatabaseHistoryRetrieve?.databaseAlias ?: ""
-                    }
-                    // Update values if history element not yet in the database
-                    if (fileDatabaseHistoryRetrieve == null) {
-                        databaseFileHistoryDao.add(fileDatabaseHistory)
-                    } else {
-                        databaseFileHistoryDao.update(fileDatabaseHistory)
+                    databaseFileList ->
+                    databaseFileList?.let {
+                        databaseFileListResult.invoke(it)
                     }
                 }
         ).execute()
     }
 
-    fun deleteFileDatabaseHistory(fileDatabaseHistory: FileDatabaseHistoryEntity,
-                                  fileHistoryDeletedResult: (FileDatabaseHistoryEntity?) -> Unit) {
-        ActionDatabaseAsyncTask(
+    fun addOrUpdateDatabaseUri(databaseUri: Uri, keyFileUri: Uri? = null,
+                               databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
+        addOrUpdateDatabaseFile(DatabaseFile(
+                databaseUri,
+                keyFileUri
+        ), databaseFileAddedOrUpdatedResult)
+    }
+
+    fun addOrUpdateDatabaseFile(databaseFileToAddOrUpdate: DatabaseFile,
+                                databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) {
+        IOActionTask(
                 {
-                    databaseFileHistoryDao.delete(fileDatabaseHistory)
+                    databaseFileToAddOrUpdate.databaseUri?.let { databaseUri ->
+                        // Try to get info in database first
+                        val fileDatabaseHistoryRetrieve = databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())
+
+                        // Complete alias if not exists
+                        val fileDatabaseHistory = FileDatabaseHistoryEntity(
+                                databaseUri.toString(),
+                                databaseFileToAddOrUpdate.databaseAlias
+                                        ?: fileDatabaseHistoryRetrieve?.databaseAlias
+                                        ?: "",
+                                databaseFileToAddOrUpdate.keyFileUri?.toString(),
+                                System.currentTimeMillis()
+                        )
+
+                        // Update values if history element not yet in the database
+                        try {
+                            if (fileDatabaseHistoryRetrieve == null) {
+                                    databaseFileHistoryDao.add(fileDatabaseHistory)
+                            } else {
+                                databaseFileHistoryDao.update(fileDatabaseHistory)
+                            }
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Unable to add or update database history", e)
+                        }
+
+                        val fileDatabaseInfo = FileDatabaseInfo(applicationContext,
+                                fileDatabaseHistory.databaseUri)
+                        DatabaseFile(
+                                UriUtil.parse(fileDatabaseHistory.databaseUri),
+                                UriUtil.parse(fileDatabaseHistory.keyFileUri),
+                                UriUtil.decode(fileDatabaseHistory.databaseUri),
+                                fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias),
+                                fileDatabaseInfo.exists,
+                                fileDatabaseInfo.getModificationString(),
+                                fileDatabaseInfo.getSizeString()
+                        )
+                    }
                 },
                 {
-                    if (it != null && it > 0)
-                        fileHistoryDeletedResult.invoke(fileDatabaseHistory)
-                    else
-                        fileHistoryDeletedResult.invoke(null)
+                    databaseFileAddedOrUpdatedResult?.invoke(it)
+                }
+        ).execute()
+    }
+
+    fun deleteDatabaseFile(databaseFileToDelete: DatabaseFile,
+                           databaseFileDeletedResult: (DatabaseFile?) -> Unit) {
+        IOActionTask(
+                {
+                    databaseFileToDelete.databaseUri?.let { databaseUri ->
+                        databaseFileHistoryDao.getByDatabaseUri(databaseUri.toString())?.let { fileDatabaseHistory ->
+                            val returnValue = databaseFileHistoryDao.delete(fileDatabaseHistory)
+                            if (returnValue > 0) {
+                                DatabaseFile(
+                                        UriUtil.parse(fileDatabaseHistory.databaseUri),
+                                        UriUtil.parse(fileDatabaseHistory.keyFileUri),
+                                        UriUtil.decode(fileDatabaseHistory.databaseUri),
+                                        databaseFileToDelete.databaseAlias
+                                )
+                            } else {
+                                null
+                            }
+                        }
+                    }
+                },
+                {
+                    databaseFileDeletedResult.invoke(it)
                 }
         ).execute()
     }
 
     fun deleteKeyFileByDatabaseUri(databaseUri: Uri) {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     databaseFileHistoryDao.deleteKeyFileByDatabaseUri(databaseUri.toString())
                 }
@@ -121,7 +198,7 @@ class FileDatabaseHistoryAction(applicationContext: Context) {
     }
 
     fun deleteAllKeyFiles() {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     databaseFileHistoryDao.deleteAllKeyFiles()
                 }
@@ -129,12 +206,14 @@ class FileDatabaseHistoryAction(applicationContext: Context) {
     }
 
     fun deleteAll() {
-        ActionDatabaseAsyncTask(
+        IOActionTask(
                 {
                     databaseFileHistoryDao.deleteAll()
                 }
         ).execute()
     }
 
-    companion object : SingletonHolderParameter<FileDatabaseHistoryAction, Context>(::FileDatabaseHistoryAction)
+    companion object : SingletonHolderParameter<FileDatabaseHistoryAction, Context>(::FileDatabaseHistoryAction) {
+        private val TAG = FileDatabaseHistoryAction::class.java.name
+    }
 }

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

@@ -19,21 +19,27 @@
  */
 package com.kunzisoft.keepass.app.database
 
-import android.os.AsyncTask
+import kotlinx.coroutines.*
 
 /**
- * Private class to invoke each method in a separate thread
+ * Class to invoke action in a separate IO thread
  */
-class ActionDatabaseAsyncTask<T>(
+class IOActionTask<T>(
         private val action: () -> T ,
-        private val afterActionDatabaseListener: ((T?) -> Unit)? = null
-) : AsyncTask<Void, Void, T>() {
+        private val afterActionDatabaseListener: ((T?) -> Unit)? = null) {
 
-    override fun doInBackground(vararg args: Void?): T? {
-        return action.invoke()
-    }
+    private val mainScope = CoroutineScope(Dispatchers.Main)
 
-    override fun onPostExecute(result: T?) {
-        afterActionDatabaseListener?.invoke(result)
+    fun execute() {
+        mainScope.launch {
+            withContext(Dispatchers.IO) {
+                val asyncResult: Deferred<T?> = async {
+                    action.invoke()
+                }
+                withContext(Dispatchers.Main) {
+                    afterActionDatabaseListener?.invoke(asyncResult.await())
+                }
+            }
+        }
     }
 }

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

@@ -34,7 +34,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
@@ -157,11 +157,9 @@ object AutofillHelper {
                                        intent: Intent,
                                        assistStructure: AssistStructure,
                                        searchInfo: SearchInfo?) {
-        EntrySelectionHelper.addEntrySelectionModeExtraInIntent(intent)
+        EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.SELECTION)
         intent.putExtra(ASSIST_STRUCTURE, assistStructure)
-        searchInfo?.let {
-            intent.putExtra(KEY_SEARCH_INFO, it)
-        }
+        EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo)
         activity.startActivityForResult(intent, AUTOFILL_RESPONSE_REQUEST_CODE)
     }
 

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

@@ -23,72 +23,91 @@ import android.os.Build
 import android.os.CancellationSignal
 import android.service.autofill.*
 import android.util.Log
+import android.view.autofill.AutofillId
 import android.widget.RemoteViews
 import androidx.annotation.RequiresApi
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.AutofillLauncherActivity
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.UriUtil
+import java.util.concurrent.atomic.AtomicBoolean
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 class KeeAutofillService : AutofillService() {
 
     var applicationIdBlocklist: Set<String>? = null
     var webDomainBlocklist: Set<String>? = null
+    var askToSaveData: Boolean = false
+    private var mLock = AtomicBoolean()
 
     override fun onCreate() {
         super.onCreate()
 
         applicationIdBlocklist = PreferencesUtil.applicationIdBlocklist(this)
         webDomainBlocklist = PreferencesUtil.webDomainBlocklist(this)
+        askToSaveData = PreferencesUtil.askToSaveAutofillData(this) // TODO apply when changed
     }
 
     override fun onFillRequest(request: FillRequest,
                                cancellationSignal: CancellationSignal,
                                callback: FillCallback) {
-        val fillContexts = request.fillContexts
-        val latestStructure = fillContexts[fillContexts.size - 1].structure
 
         cancellationSignal.setOnCancelListener { Log.w(TAG, "Cancel autofill.") }
 
-        // Check user's settings for authenticating Responses and Datasets.
-        StructureParser(latestStructure).parse()?.let { parseResult ->
+        // Lock
+        if (!mLock.get()) {
+            mLock.set(true)
+            // Check user's settings for authenticating Responses and Datasets.
+            val latestStructure = request.fillContexts.last().structure
+            StructureParser(latestStructure).parse()?.let { parseResult ->
 
-            // Build search info only if applicationId or webDomain are not blocked
-            if (searchAllowedFor(parseResult.applicationId, applicationIdBlocklist)
-                    && searchAllowedFor(parseResult.domain, webDomainBlocklist)) {
-                val searchInfo = SearchInfo().apply {
-                    applicationId = parseResult.applicationId
-                    webDomain = parseResult.domain
+                // Build search info only if applicationId or webDomain are not blocked
+                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+                    val searchInfo = SearchInfo().apply {
+                        applicationId = parseResult.applicationId
+                        webDomain = parseResult.webDomain
+                        webScheme = parseResult.webScheme
+                    }
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { webDomainWithoutSubDomain ->
+                        searchInfo.webDomain = webDomainWithoutSubDomain
+                        launchSelection(searchInfo, parseResult, callback)
+                    }
                 }
-
-                SearchHelper.checkAutoSearchInfo(this,
-                        Database.getInstance(),
-                        searchInfo,
-                        { items ->
-                            val responseBuilder = FillResponse.Builder()
-                            AutofillHelper.addHeader(responseBuilder, packageName,
-                                    parseResult.domain, parseResult.applicationId)
-                            items.forEach {
-                                responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
-                            }
-                            callback.onSuccess(responseBuilder.build())
-                        },
-                        {
-                            // Show UI if no search result
-                            showUIForEntrySelection(parseResult, searchInfo, callback)
-                        },
-                        {
-                            // Show UI if database not open
-                            showUIForEntrySelection(parseResult, searchInfo, callback)
-                        }
-                )
             }
         }
     }
 
+    private fun launchSelection(searchInfo: SearchInfo,
+                                parseResult: StructureParser.Result,
+                                callback: FillCallback) {
+        SearchHelper.checkAutoSearchInfo(this,
+                Database.getInstance(),
+                searchInfo,
+                { items ->
+                    val responseBuilder = FillResponse.Builder()
+                    AutofillHelper.addHeader(responseBuilder, packageName,
+                            parseResult.webDomain, parseResult.applicationId)
+                    items.forEach {
+                        responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
+                    }
+                    callback.onSuccess(responseBuilder.build())
+                },
+                {
+                    // Show UI if no search result
+                    showUIForEntrySelection(parseResult, searchInfo, callback)
+                },
+                {
+                    // Show UI if database not open
+                    showUIForEntrySelection(parseResult, searchInfo, callback)
+                }
+        )
+    }
+
     private fun showUIForEntrySelection(parseResult: StructureParser.Result,
                                         searchInfo: SearchInfo,
                                         callback: FillCallback) {
@@ -96,12 +115,12 @@ class KeeAutofillService : AutofillService() {
             if (autofillIds.isNotEmpty()) {
                 // If the entire Autofill Response is authenticated, AuthActivity is used
                 // to generate Response.
-                val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this,
+                val intentSender = AutofillLauncherActivity.getAuthIntentSenderForSelection(this,
                         searchInfo)
                 val responseBuilder = FillResponse.Builder()
-                val remoteViewsUnlock: RemoteViews = if (!parseResult.domain.isNullOrEmpty()) {
+                val remoteViewsUnlock: RemoteViews = if (!parseResult.webDomain.isNullOrEmpty()) {
                     RemoteViews(packageName, R.layout.item_autofill_unlock_web_domain).apply {
-                        setTextViewText(R.id.autofill_web_domain_text, parseResult.domain)
+                        setTextViewText(R.id.autofill_web_domain_text, parseResult.webDomain)
                     }
                 } else if (!parseResult.applicationId.isNullOrEmpty()) {
                     RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
@@ -110,15 +129,63 @@ class KeeAutofillService : AutofillService() {
                 } else {
                     RemoteViews(packageName, R.layout.item_autofill_unlock)
                 }
-                responseBuilder.setAuthentication(autofillIds, sender, remoteViewsUnlock)
+
+                // Tell to service the interest to save credentials
+                if (askToSaveData) {
+                    var types: Int = SaveInfo.SAVE_DATA_TYPE_GENERIC
+                    val info = ArrayList<AutofillId>()
+                    // Only if at least a password
+                    parseResult.passwordId?.let { passwordInfo ->
+                        parseResult.usernameId?.let { usernameInfo ->
+                            types = types or SaveInfo.SAVE_DATA_TYPE_USERNAME
+                            info.add(usernameInfo)
+                        }
+                        types = types or SaveInfo.SAVE_DATA_TYPE_PASSWORD
+                        info.add(passwordInfo)
+                    }
+                    if (info.isNotEmpty()) {
+                        responseBuilder.setSaveInfo(
+                                SaveInfo.Builder(types, info.toTypedArray()).build()
+                        )
+                    }
+                }
+                // Build response
+                responseBuilder.setAuthentication(autofillIds, intentSender, remoteViewsUnlock)
                 callback.onSuccess(responseBuilder.build())
             }
         }
     }
 
     override fun onSaveRequest(request: SaveRequest, callback: SaveCallback) {
-        // TODO Save autofill
-        //callback.onFailure(getString(R.string.autofill_not_support_save));
+        if (askToSaveData) {
+            val latestStructure = request.fillContexts.last().structure
+            StructureParser(latestStructure).parse(true)?.let { parseResult ->
+
+                if (autofillAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                        && autofillAllowedFor(parseResult.webDomain, webDomainBlocklist)) {
+                    Log.d(TAG, "autofill onSaveRequest password")
+
+                    // Show UI to save data
+                    val registerInfo = RegisterInfo(SearchInfo().apply {
+                        applicationId = parseResult.applicationId
+                        webDomain = parseResult.webDomain
+                        webScheme = parseResult.webScheme
+                    },
+                            parseResult.usernameValue?.textValue?.toString(),
+                            parseResult.passwordValue?.textValue?.toString())
+                    // TODO Callback in each activity #765
+                    //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    //    callback.onSuccess(AutofillLauncherActivity.getAuthIntentSenderForRegistration(this,
+                    //            registerInfo))
+                    //} else {
+                        AutofillLauncherActivity.launchForRegistration(this, registerInfo)
+                        callback.onSuccess()
+                    //}
+                    return
+                }
+            }
+        }
+        callback.onFailure("Saving form values is not allowed")
     }
 
     override fun onConnected() {
@@ -126,13 +193,14 @@ class KeeAutofillService : AutofillService() {
     }
 
     override fun onDisconnected() {
+        mLock.set(false)
         Log.d(TAG, "onDisconnected")
     }
 
     companion object {
         private val TAG = KeeAutofillService::class.java.name
 
-        fun searchAllowedFor(element: String?, blockList: Set<String>?): Boolean {
+        fun autofillAllowedFor(element: String?, blockList: Set<String>?): Boolean {
             element?.let { elementNotNull ->
                 if (blockList?.any { appIdBlocked ->
                             elementNotNull.contains(appIdBlocked)

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

@@ -25,6 +25,7 @@ import androidx.annotation.RequiresApi
 import android.util.Log
 import android.view.View
 import android.view.autofill.AutofillId
+import android.view.autofill.AutofillValue
 import java.util.*
 
 
@@ -34,14 +35,19 @@ import java.util.*
 @RequiresApi(api = Build.VERSION_CODES.O)
 internal class StructureParser(private val structure: AssistStructure) {
     private var result: Result? = null
-    private var usernameCandidate: AutofillId? = null
+
     private var usernameNeeded = true
 
-    fun parse(): Result? {
+    private var usernameCandidate: AutofillId? = null
+    private var usernameValueCandidate: AutofillValue? = null
+
+    fun parse(saveValue: Boolean = false): Result? {
         try {
             result = Result()
             result?.apply {
+                allowSaveValues = saveValue
                 usernameCandidate = null
+                usernameValueCandidate = null
                 mainLoop@ for (i in 0 until structure.windowNodeCount) {
                     val windowNode = structure.getWindowNodeAt(i)
                     applicationId = windowNode.title.toString().split("/")[0]
@@ -51,8 +57,12 @@ internal class StructureParser(private val structure: AssistStructure) {
                         break@mainLoop
                 }
                 // If not explicit username field found, add the field just before password field.
-                if (usernameId == null && passwordId != null && usernameCandidate != null)
+                if (usernameId == null && passwordId != null && usernameCandidate != null) {
                     usernameId = usernameCandidate
+                    if (allowSaveValues) {
+                        usernameValue = usernameValueCandidate
+                    }
+                }
             }
 
             // Return the result only if password field is retrieved
@@ -68,11 +78,23 @@ internal class StructureParser(private val structure: AssistStructure) {
 
     private fun parseViewNode(node: AssistStructure.ViewNode): Boolean {
         // Get the domain of a web app
-        node.webDomain?.let {
-            result?.domain = it
-            Log.d(TAG, "Autofill domain: $it")
+        node.webDomain?.let { webDomain ->
+            if (webDomain.isNotEmpty()) {
+                result?.webDomain = webDomain
+                Log.d(TAG, "Autofill domain: $webDomain")
+            }
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            node.webScheme?.let { webScheme ->
+                if (webScheme.isNotEmpty()) {
+                    result?.webScheme = webScheme
+                    Log.d(TAG, "Autofill scheme: $webScheme")
+                }
+            }
+        }
+        val domainNotEmpty = result?.webDomain?.isNotEmpty() == true
 
+        var returnValue = false
         // Only parse visible nodes
         if (node.visibility == View.VISIBLE) {
             if (node.autofillId != null
@@ -81,39 +103,41 @@ internal class StructureParser(private val structure: AssistStructure) {
                 val hints = node.autofillHints
                 if (hints != null && hints.isNotEmpty()) {
                     if (parseNodeByAutofillHint(node))
-                        return true
+                        returnValue = true
                 } else if (parseNodeByHtmlAttributes(node))
-                    return true
+                    returnValue = true
                 else if (parseNodeByAndroidInput(node))
-                    return true
+                    returnValue = true
             }
+            // Optimized return but only if domain not empty
+            if (domainNotEmpty && returnValue)
+                return true
             // Recursive method to process each node
             for (i in 0 until node.childCount) {
                 if (parseViewNode(node.getChildAt(i)))
+                    returnValue = true
+                if (domainNotEmpty && returnValue)
                     return true
             }
         }
-        return false
+        return returnValue
     }
 
     private fun parseNodeByAutofillHint(node: AssistStructure.ViewNode): Boolean {
         val autofillId = node.autofillId
         node.autofillHints?.forEach {
             when {
-                it.equals(View.AUTOFILL_HINT_USERNAME, true)
-                        || it.equals(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
-                        || it.equals("email", true)
-                        || it.equals(View.AUTOFILL_HINT_PHONE, true)
-                        || it.contains("OrUsername", true)
-                        || it.contains("OrEmailAddress", true)
-                        || it.contains("OrEmail", true)
-                        || it.contains("OrPhone", true)-> {
+                it.contains(View.AUTOFILL_HINT_USERNAME, true)
+                        || it.contains(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
+                        || it.contains("email", true)
+                        || it.contains(View.AUTOFILL_HINT_PHONE, true)-> {
                     result?.usernameId = autofillId
+                    result?.usernameValue = node.autofillValue
                     Log.d(TAG, "Autofill username hint")
                 }
-                it.equals(View.AUTOFILL_HINT_PASSWORD, true)
-                        || it.contains("password", true) -> {
+                it.contains(View.AUTOFILL_HINT_PASSWORD, true) -> {
                     result?.passwordId = autofillId
+                    result?.passwordValue = node.autofillValue
                     Log.d(TAG, "Autofill password hint")
                     // Username not needed in this case
                     usernameNeeded = false
@@ -143,14 +167,17 @@ internal class StructureParser(private val structure: AssistStructure) {
                             when (pairAttribute.second.toLowerCase(Locale.ENGLISH)) {
                                 "tel", "email" -> {
                                     result?.usernameId = autofillId
+                                    result?.usernameValue = node.autofillValue
                                     Log.d(TAG, "Autofill username web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                 }
                                 "text" -> {
                                     usernameCandidate = autofillId
+                                    usernameValueCandidate = node.autofillValue
                                     Log.d(TAG, "Autofill username candidate web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                 }
                                 "password" -> {
                                     result?.passwordId = autofillId
+                                    result?.passwordValue = node.autofillValue
                                     Log.d(TAG, "Autofill password web type: ${node.htmlInfo?.tag} ${node.htmlInfo?.attributes}")
                                     return true
                                 }
@@ -185,6 +212,7 @@ internal class StructureParser(private val structure: AssistStructure) {
                             InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
                             InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS) -> {
                         result?.usernameId = autofillId
+                        result?.usernameValue = node.autofillValue
                         Log.d(TAG, "Autofill username android text type: ${showHexInputType(inputType)}")
                     }
                     inputIsVariationType(inputType,
@@ -192,6 +220,7 @@ internal class StructureParser(private val structure: AssistStructure) {
                             InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
                             InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
                         usernameCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
                         Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
                     }
                     inputIsVariationType(inputType,
@@ -199,6 +228,7 @@ internal class StructureParser(private val structure: AssistStructure) {
                             InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
                             InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
                         result?.passwordId = autofillId
+                        result?.passwordValue = node.autofillValue
                         Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
                         usernameNeeded = false
                         return true
@@ -223,11 +253,13 @@ internal class StructureParser(private val structure: AssistStructure) {
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
                         usernameCandidate = autofillId
+                        usernameValueCandidate = node.autofillValue
                         Log.d(TAG, "Autofill usernale candidate android number type: ${showHexInputType(inputType)}")
                     }
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
                         result?.passwordId = autofillId
+                        result?.passwordValue = node.autofillValue
                         Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
                         usernameNeeded = false
                         return true
@@ -244,7 +276,14 @@ internal class StructureParser(private val structure: AssistStructure) {
     @RequiresApi(api = Build.VERSION_CODES.O)
     internal class Result {
         var applicationId: String? = null
-        var domain: String? = null
+
+        var webDomain: String? = null
+            set(value) {
+                if (field == null)
+                    field = value
+            }
+
+        var webScheme: String? = null
             set(value) {
                 if (field == null)
                     field = value
@@ -272,6 +311,21 @@ internal class StructureParser(private val structure: AssistStructure) {
             }
             return all.toTypedArray()
         }
+
+        // Only in registration mode
+        var allowSaveValues = false
+
+        var usernameValue: AutofillValue? = null
+            set(value) {
+                if (allowSaveValues && field == null)
+                    field = value
+            }
+
+        var passwordValue: AutofillValue? = null
+            set(value) {
+                if (allowSaveValues && field == null)
+                    field = value
+            }
     }
 
     companion object {

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

@@ -26,10 +26,10 @@ import android.provider.Settings
 import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
+import android.view.View
 import android.widget.CompoundButton
 import android.widget.TextView
 import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricConstants
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
@@ -50,13 +50,17 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     : BiometricUnlockDatabaseHelper.BiometricUnlockCallback {
 
     private var biometricUnlockDatabaseHelper: BiometricUnlockDatabaseHelper? = null
-    private var biometricMode: Mode = Mode.UNAVAILABLE
+    private var biometricMode: Mode = Mode.BIOMETRIC_UNAVAILABLE
+
+    // Only to fix multiple fingerprint menu #332
+    private var mAllowAdvancedUnlockMenu = false
+    private var mAddBiometricMenuInProgress = false
 
     /**
      * Manage setting to auto open biometric prompt
      */
     private var biometricPromptAutoOpenPreference = PreferencesUtil.isBiometricPromptAutoOpenEnable(context)
-    var isBiometricPromptAutoOpenEnable: Boolean = true
+    var isBiometricPromptAutoOpenEnable: Boolean = false
         get() {
             return field && biometricPromptAutoOpenPreference
         }
@@ -83,13 +87,15 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
 
         // biometric not supported (by API level or hardware) so keep option hidden
         // or manually disable
-        val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate()
+        val biometricCanAuthenticate = BiometricUnlockDatabaseHelper.canAuthenticate(context)
         allowOpenBiometricPrompt = true
 
         if (!PreferencesUtil.isBiometricUnlockEnable(context)
                 || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
                 || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
-            toggleMode(Mode.UNAVAILABLE)
+            toggleMode(Mode.BIOMETRIC_UNAVAILABLE)
+        } else if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED){
+            toggleMode(Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED)
         } else {
             // biometric is available but not configured, show icon but in disabled state with some information
             if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
@@ -113,7 +119,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
                     } else {
                         cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { containsCipher ->
                             // biometric available but no stored password found yet for this DB so show info don't listen
-                            toggleMode( if (containsCipher) {
+                            toggleMode(if (containsCipher) {
                                 // listen for decryption
                                 Mode.EXTRACT_CREDENTIAL
                             } else {
@@ -155,10 +161,16 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
             context.runOnUiThread {
                 when (biometricMode) {
-                    Mode.UNAVAILABLE -> {}
-                    Mode.BIOMETRIC_NOT_CONFIGURED -> {}
-                    Mode.KEY_MANAGER_UNAVAILABLE -> {}
-                    Mode.WAIT_CREDENTIAL -> {}
+                    Mode.BIOMETRIC_UNAVAILABLE -> {
+                    }
+                    Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> {
+                    }
+                    Mode.BIOMETRIC_NOT_CONFIGURED -> {
+                    }
+                    Mode.KEY_MANAGER_UNAVAILABLE -> {
+                    }
+                    Mode.WAIT_CREDENTIAL -> {
+                    }
                     Mode.STORE_CREDENTIAL -> {
                         // newly store the entered password in encrypted way
                         biometricUnlockDatabaseHelper?.encryptData(passwordView?.text.toString())
@@ -182,6 +194,15 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         advancedUnlockInfoView?.setIconViewClickListener(false, null)
     }
 
+    private fun initSecurityUpdateRequired() {
+        showFingerPrintViews(true)
+        setAdvancedUnlockedTitleView(R.string.biometric_security_update_required)
+
+        advancedUnlockInfoView?.setIconViewClickListener(false) {
+            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
+        }
+    }
+
     private fun initNotConfigured() {
         showFingerPrintViews(true)
         setAdvancedUnlockedTitleView(R.string.configure_biometric)
@@ -195,7 +216,6 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     private fun initKeyManagerNotAvailable() {
         showFingerPrintViews(true)
         setAdvancedUnlockedTitleView(R.string.keystore_not_accessible)
-        setAdvancedUnlockedMessageView("")
 
         advancedUnlockInfoView?.setIconViewClickListener(false) {
             context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
@@ -208,18 +228,26 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         setAdvancedUnlockedMessageView("")
 
         advancedUnlockInfoView?.setIconViewClickListener(false) {
-            biometricAuthenticationCallback.onAuthenticationError(
-                    BiometricConstants.ERROR_UNABLE_TO_PROCESS
-                    , context.getString(R.string.credential_before_click_biometric_button))
+            biometricAuthenticationCallback.onAuthenticationError(BiometricPrompt.ERROR_UNABLE_TO_PROCESS,
+                    context.getString(R.string.credential_before_click_biometric_button))
         }
     }
 
     private fun openBiometricPrompt(biometricPrompt: BiometricPrompt?,
-                                    cryptoObject: BiometricPrompt.CryptoObject,
+                                    cryptoObject: BiometricPrompt.CryptoObject?,
                                     promptInfo: BiometricPrompt.PromptInfo) {
         context.runOnUiThread {
-            if (allowOpenBiometricPrompt)
-                biometricPrompt?.authenticate(promptInfo, cryptoObject)
+            if (allowOpenBiometricPrompt) {
+                if (biometricPrompt != null) {
+                    if (cryptoObject != null) {
+                        biometricPrompt.authenticate(promptInfo, cryptoObject)
+                    } else  {
+                        setAdvancedUnlockedTitleView(R.string.crypto_object_not_initialized)
+                    }
+                } else  {
+                    setAdvancedUnlockedTitleView(R.string.biometric_prompt_not_initialized)
+                }
+            }
         }
     }
 
@@ -229,14 +257,10 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         setAdvancedUnlockedMessageView("")
 
         biometricUnlockDatabaseHelper?.initEncryptData { biometricPrompt, cryptoObject, promptInfo ->
-
-            cryptoObject?.let { crypto ->
-                // Set listener to open the biometric dialog and save credential
-                advancedUnlockInfoView?.setIconViewClickListener { _ ->
-                    openBiometricPrompt(biometricPrompt, crypto, promptInfo)
-                }
+            // Set listener to open the biometric dialog and save credential
+            advancedUnlockInfoView?.setIconViewClickListener { _ ->
+                openBiometricPrompt(biometricPrompt, cryptoObject, promptInfo)
             }
-
         }
     }
 
@@ -251,19 +275,16 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
                 it?.specParameters?.let { specs ->
                     biometricUnlockDatabaseHelper?.initDecryptData(specs) { biometricPrompt, cryptoObject, promptInfo ->
 
-                        cryptoObject?.let { crypto ->
-                            // Set listener to open the biometric dialog and check credential
-                            advancedUnlockInfoView?.setIconViewClickListener { _ ->
-                                openBiometricPrompt(biometricPrompt, crypto, promptInfo)
-                            }
-
-                            // Auto open the biometric prompt
-                            if (isBiometricPromptAutoOpenEnable) {
-                                isBiometricPromptAutoOpenEnable = false
-                                openBiometricPrompt(biometricPrompt, crypto, promptInfo)
-                            }
+                        // Set listener to open the biometric dialog and check credential
+                        advancedUnlockInfoView?.setIconViewClickListener { _ ->
+                            openBiometricPrompt(biometricPrompt, cryptoObject, promptInfo)
                         }
 
+                        // Auto open the biometric prompt
+                        if (isBiometricPromptAutoOpenEnable) {
+                            isBiometricPromptAutoOpenEnable = false
+                            openBiometricPrompt(biometricPrompt, cryptoObject, promptInfo)
+                        }
                     }
                 }
             }
@@ -272,16 +293,32 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
 
     @Synchronized
     fun initBiometricMode() {
+        mAllowAdvancedUnlockMenu = false
         when (biometricMode) {
-            Mode.UNAVAILABLE -> initNotAvailable()
+            Mode.BIOMETRIC_UNAVAILABLE -> initNotAvailable()
+            Mode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> initSecurityUpdateRequired()
             Mode.BIOMETRIC_NOT_CONFIGURED -> initNotConfigured()
             Mode.KEY_MANAGER_UNAVAILABLE -> initKeyManagerNotAvailable()
             Mode.WAIT_CREDENTIAL -> initWaitData()
             Mode.STORE_CREDENTIAL -> initEncryptData()
             Mode.EXTRACT_CREDENTIAL -> initDecryptData()
         }
+
+        invalidateBiometricMenu()
+    }
+
+    private fun invalidateBiometricMenu() {
         // Show fingerprint key deletion
-        context.invalidateOptionsMenu()
+        if (!mAddBiometricMenuInProgress) {
+            mAddBiometricMenuInProgress = true
+            cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { containsCipher ->
+                mAllowAdvancedUnlockMenu = containsCipher
+                        && (biometricMode != Mode.BIOMETRIC_UNAVAILABLE
+                                && biometricMode != Mode.KEY_MANAGER_UNAVAILABLE)
+                mAddBiometricMenuInProgress = false
+                context.invalidateOptionsMenu()
+            }
+        }
     }
 
     fun destroy() {
@@ -292,26 +329,19 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         checkboxPasswordView?.setOnCheckedChangeListener(onCheckedPasswordChangeListener)
     }
 
-    // Only to fix multiple fingerprint menu #332
-    private var addBiometricMenuInProgress = false
     fun inflateOptionsMenu(menuInflater: MenuInflater, menu: Menu) {
-        if (!addBiometricMenuInProgress) {
-            addBiometricMenuInProgress = true
-            cipherDatabaseAction.containsCipherDatabase(databaseFileUri) {
-                if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.BIOMETRIC_NOT_CONFIGURED)
-                        && it) {
-                    menuInflater.inflate(R.menu.advanced_unlock, menu)
-                    addBiometricMenuInProgress = false
-                }
-            }
-        }
+        if (mAllowAdvancedUnlockMenu)
+            menuInflater.inflate(R.menu.advanced_unlock, menu)
     }
 
     fun deleteEntryKey() {
+        allowOpenBiometricPrompt = false
+        advancedUnlockInfoView?.setIconViewClickListener(false, null)
+        biometricUnlockDatabaseHelper?.closeBiometricPrompt()
         biometricUnlockDatabaseHelper?.deleteEntryKey()
-        cipherDatabaseAction.deleteByDatabaseUri(databaseFileUri)
-        biometricMode = Mode.BIOMETRIC_NOT_CONFIGURED
-        checkBiometricAvailability()
+        cipherDatabaseAction.deleteByDatabaseUri(databaseFileUri) {
+            checkBiometricAvailability()
+        }
     }
 
     override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {
@@ -334,7 +364,9 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     }
 
     private fun showFingerPrintViews(show: Boolean) {
-        context.runOnUiThread { advancedUnlockInfoView?.hide = !show }
+        context.runOnUiThread {
+            advancedUnlockInfoView?.visibility = if (show) View.VISIBLE else View.GONE
+        }
     }
 
     private fun setAdvancedUnlockedTitleView(textId: Int) {
@@ -356,7 +388,13 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     }
 
     enum class Mode {
-        UNAVAILABLE, BIOMETRIC_NOT_CONFIGURED, KEY_MANAGER_UNAVAILABLE, WAIT_CREDENTIAL, STORE_CREDENTIAL, EXTRACT_CREDENTIAL
+        BIOMETRIC_UNAVAILABLE,
+        BIOMETRIC_SECURITY_UPDATE_REQUIRED,
+        BIOMETRIC_NOT_CONFIGURED,
+        KEY_MANAGER_UNAVAILABLE,
+        WAIT_CREDENTIAL,
+        STORE_CREDENTIAL,
+        EXTRACT_CREDENTIAL
     }
 
     companion object {

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

@@ -29,6 +29,8 @@ import android.util.Base64
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
+import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.R
@@ -66,7 +68,7 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
             setDeviceCredentialAllowed(true)
         else
         */
-            setNegativeButtonText(context.getString(android.R.string.cancel))
+        setNegativeButtonText(context.getString(android.R.string.cancel))
     }.build()
 
     private val promptInfoExtractCredential = BiometricPrompt.PromptInfo.Builder().apply {
@@ -78,8 +80,8 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
         if (keyguardManager?.isDeviceSecure == true)
             setDeviceCredentialAllowed(true)
         else
-         */
-            setNegativeButtonText(context.getString(android.R.string.cancel))
+        */
+        setNegativeButtonText(context.getString(android.R.string.cancel))
     }.build()
 
     val isKeyManagerInitialized: Boolean
@@ -91,12 +93,8 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
         }
 
     init {
-        if (BiometricManager.from(context).canAuthenticate() != BiometricManager.BIOMETRIC_SUCCESS) {
-            // really not much to do when no fingerprint support found
-            isKeyManagerInit = false
-        } else {
+        if (allowInitKeyStore(context)) {
             this.keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager?
-
             try {
                 this.keyStore = KeyStore.getInstance(BIOMETRIC_KEYSTORE)
                 this.keyGenerator = KeyGenerator.getInstance(BIOMETRIC_KEY_ALGORITHM, BIOMETRIC_KEYSTORE)
@@ -113,6 +111,9 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
                 isKeyManagerInit = false
                 biometricUnlockCallback?.onBiometricException(e)
             }
+        } else {
+            // really not much to do when no fingerprint support found
+            isKeyManagerInit = false
         }
     }
 
@@ -158,7 +159,7 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
     fun initEncryptData(actionIfCypherInit
                         : (biometricPrompt: BiometricPrompt?,
                            cryptoObject: BiometricPrompt.CryptoObject?,
-                           promptInfo: BiometricPrompt.PromptInfo)->Unit) {
+                           promptInfo: BiometricPrompt.PromptInfo) -> Unit) {
         if (!isKeyManagerInitialized) {
             return
         }
@@ -203,9 +204,9 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
     }
 
     fun initDecryptData(ivSpecValue: String, actionIfCypherInit
-            : (biometricPrompt: BiometricPrompt?,
-               cryptoObject: BiometricPrompt.CryptoObject?,
-               promptInfo: BiometricPrompt.PromptInfo)->Unit) {
+    : (biometricPrompt: BiometricPrompt?,
+       cryptoObject: BiometricPrompt.CryptoObject?,
+       promptInfo: BiometricPrompt.PromptInfo) -> Unit) {
         if (!isKeyManagerInitialized) {
             return
         }
@@ -295,6 +296,37 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
         private const val BIOMETRIC_BLOCKS_MODES = KeyProperties.BLOCK_MODE_CBC
         private const val BIOMETRIC_ENCRYPTION_PADDING = KeyProperties.ENCRYPTION_PADDING_PKCS7
 
+        fun canAuthenticate(context: Context): Int {
+            return try {
+                BiometricManager.from(context).canAuthenticate(BIOMETRIC_STRONG)
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to authenticate with strong biometric.", e)
+                try {
+                    BiometricManager.from(context).canAuthenticate(BIOMETRIC_WEAK)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to authenticate with weak biometric.", e)
+                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE
+                }
+            }
+        }
+
+        fun allowInitKeyStore(context: Context): Boolean {
+            val biometricCanAuthenticate = canAuthenticate(context)
+            return (  biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
+                    )
+        }
+
+        fun unlockSupported(context: Context): Boolean {
+            val biometricCanAuthenticate = canAuthenticate(context)
+            return (  biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
+                    || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED
+                    )
+        }
+
         /**
          * Remove entry key in keystore
          */

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

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

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

@@ -37,7 +37,7 @@ open class AssignPasswordInDatabaseRunnable (
     : SaveDatabaseRunnable(context, database, true) {
 
     private var mMasterPassword: String? = null
-    protected var mKeyFile: Uri? = null
+    protected var mKeyFileUri: Uri? = null
 
     private var mBackupKey: ByteArray? = null
 
@@ -45,7 +45,7 @@ open class AssignPasswordInDatabaseRunnable (
         if (withMasterPassword)
             this.mMasterPassword = masterPassword
         if (withKeyFile)
-            this.mKeyFile = keyFile
+            this.mKeyFileUri = keyFile
     }
 
     override fun onStartRun() {
@@ -55,7 +55,7 @@ open class AssignPasswordInDatabaseRunnable (
             mBackupKey = ByteArray(database.masterKey.size)
             System.arraycopy(database.masterKey, 0, mBackupKey!!, 0, mBackupKey!!.size)
 
-            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mKeyFile)
+            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mKeyFileUri)
             database.retrieveMasterKey(mMasterPassword, uriInputStream)
         } catch (e: Exception) {
             erase(mBackupKey)

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

@@ -25,6 +25,8 @@ import android.util.Log
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.closeDatabase
 
 class CreateDatabaseRunnable(context: Context,
                              private val mDatabase: Database,
@@ -34,7 +36,8 @@ class CreateDatabaseRunnable(context: Context,
                              withMasterPassword: Boolean,
                              masterPassword: String?,
                              withKeyFile: Boolean,
-                             keyFile: Uri?)
+                             keyFile: Uri?,
+                             private val createDatabaseResult: ((Result) -> Unit)?)
     : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, withMasterPassword, masterPassword, withKeyFile, keyFile) {
 
     override fun onStartRun() {
@@ -42,29 +45,36 @@ class CreateDatabaseRunnable(context: Context,
             // Create new database record
             mDatabase.apply {
                 createData(mDatabaseUri, databaseName, rootName)
-                // Set Database state
-                loaded = true
             }
         } catch (e: Exception) {
-            mDatabase.closeAndClear()
+            mDatabase.closeAndClear(UriUtil.getBinaryDir(context))
             setError(e)
         }
 
         super.onStartRun()
     }
 
-    override fun onFinishRun() {
-        super.onFinishRun()
+    override fun onActionRun() {
+        super.onActionRun()
 
         if (result.isSuccess) {
             // Add database to recent files
             if (PreferencesUtil.rememberDatabaseLocations(context)) {
                 FileDatabaseHistoryAction.getInstance(context.applicationContext)
                         .addOrUpdateDatabaseUri(mDatabaseUri,
-                                if (PreferencesUtil.rememberKeyFileLocations(context)) mKeyFile else null)
+                                if (PreferencesUtil.rememberKeyFileLocations(context)) mKeyFileUri else null)
             }
+
+            // Register the current time to init the lock timer
+            PreferencesUtil.saveCurrentTime(context)
         } else {
             Log.e("CreateDatabaseRunnable", "Unable to create the database")
         }
     }
+
+    override fun onFinishRun() {
+        super.onFinishRun()
+
+        createDatabaseResult?.invoke(result)
+    }
 }

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

@@ -30,6 +30,8 @@ import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.closeDatabase
 
 class LoadDatabaseRunnable(private val context: Context,
                            private val mDatabase: Database,
@@ -40,14 +42,12 @@ class LoadDatabaseRunnable(private val context: Context,
                            private val mCipherEntity: CipherDatabaseEntity?,
                            private val mFixDuplicateUUID: Boolean,
                            private val progressTaskUpdater: ProgressTaskUpdater?,
-                           private val mDuplicateUuidAction: ((Result) -> Unit)?)
+                           private val mLoadDatabaseResult: ((Result) -> Unit)?)
     : ActionRunnable() {
 
-    private val cacheDirectory = context.applicationContext.filesDir
-
     override fun onStartRun() {
         // Clear before we load
-        mDatabase.closeAndClear(cacheDirectory)
+        mDatabase.closeAndClear(UriUtil.getBinaryDir(context))
     }
 
     override fun onActionRun() {
@@ -55,20 +55,17 @@ class LoadDatabaseRunnable(private val context: Context,
             mDatabase.loadData(mUri, mPass, mKey,
                     mReadonly,
                     context.contentResolver,
-                    cacheDirectory,
+                    UriUtil.getBinaryDir(context),
                     mFixDuplicateUUID,
                     progressTaskUpdater)
         }
         catch (e: DuplicateUuidDatabaseException) {
-            mDuplicateUuidAction?.invoke(result)
             setError(e)
         }
         catch (e: LoadDatabaseException) {
             setError(e)
         }
-    }
 
-    override fun onFinishRun() {
         if (result.isSuccess) {
             // Save keyFile in app database
             if (PreferencesUtil.rememberDatabaseLocations(context)) {
@@ -86,7 +83,11 @@ class LoadDatabaseRunnable(private val context: Context,
             // Register the current time to init the lock timer
             PreferencesUtil.saveCurrentTime(context)
         } else {
-            mDatabase.closeAndClear(cacheDirectory)
+            mDatabase.closeAndClear(UriUtil.getBinaryDir(context))
         }
     }
+
+    override fun onFinishRun() {
+        mLoadDatabaseResult?.invoke(result)
+    }
 }

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

@@ -23,7 +23,6 @@ import android.content.*
 import android.content.Context.BIND_ABOVE_CLIENT
 import android.content.Context.BIND_NOT_FOREGROUND
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import androidx.fragment.app.FragmentActivity
@@ -46,6 +45,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COLOR_TASK
@@ -71,12 +71,12 @@ import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
 import java.util.*
 import kotlin.collections.ArrayList
 
-class ProgressDialogThread(private val activity: FragmentActivity) {
+class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
 
     var onActionFinish: ((actionTask: String,
                           result: ActionRunnable.Result) -> Unit)? = null
 
-    private var intentDatabaseTask = Intent(activity, DatabaseTaskNotificationService::class.java)
+    private var intentDatabaseTask = Intent(activity.applicationContext, DatabaseTaskNotificationService::class.java)
 
     private var databaseTaskBroadcastReceiver: BroadcastReceiver? = null
     private var mBinder: DatabaseTaskNotificationService.ActionTaskBinder? = null
@@ -169,6 +169,10 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
         serviceConnection = null
     }
 
+    fun isBinded(): Boolean {
+        return mBinder != null
+    }
+
     fun registerProgressTask() {
         stopDialog()
 
@@ -218,12 +222,8 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
         activity.stopService(intentDatabaseTask)
         if (bundle != null)
             intentDatabaseTask.putExtras(bundle)
-            intentDatabaseTask.action = actionTask
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            activity.startForegroundService(intentDatabaseTask)
-        } else {
-            activity.startService(intentDatabaseTask)
-        }
+        intentDatabaseTask.action = actionTask
+        activity.startService(intentDatabaseTask)
     }
 
     /*
@@ -242,7 +242,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
             putBoolean(DatabaseTaskNotificationService.MASTER_PASSWORD_CHECKED_KEY, masterPasswordChecked)
             putString(DatabaseTaskNotificationService.MASTER_PASSWORD_KEY, masterPassword)
             putBoolean(DatabaseTaskNotificationService.KEY_FILE_CHECKED_KEY, keyFileChecked)
-            putParcelable(DatabaseTaskNotificationService.KEY_FILE_KEY, keyFile)
+            putParcelable(DatabaseTaskNotificationService.KEY_FILE_URI_KEY, keyFile)
         }
                 , ACTION_DATABASE_CREATE_TASK)
     }
@@ -256,7 +256,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
             putString(DatabaseTaskNotificationService.MASTER_PASSWORD_KEY, masterPassword)
-            putParcelable(DatabaseTaskNotificationService.KEY_FILE_KEY, keyFile)
+            putParcelable(DatabaseTaskNotificationService.KEY_FILE_URI_KEY, keyFile)
             putBoolean(DatabaseTaskNotificationService.READ_ONLY_KEY, readOnly)
             putParcelable(DatabaseTaskNotificationService.CIPHER_ENTITY_KEY, cipherEntity)
             putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
@@ -275,7 +275,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
             putBoolean(DatabaseTaskNotificationService.MASTER_PASSWORD_CHECKED_KEY, masterPasswordChecked)
             putString(DatabaseTaskNotificationService.MASTER_PASSWORD_KEY, masterPassword)
             putBoolean(DatabaseTaskNotificationService.KEY_FILE_CHECKED_KEY, keyFileChecked)
-            putParcelable(DatabaseTaskNotificationService.KEY_FILE_KEY, keyFile)
+            putParcelable(DatabaseTaskNotificationService.KEY_FILE_URI_KEY, keyFile)
         }
                 , ACTION_DATABASE_ASSIGN_PASSWORD_TASK)
     }
@@ -467,6 +467,13 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
                 , ACTION_DATABASE_UPDATE_COMPRESSION_TASK)
     }
 
+    fun startDatabaseRemoveUnlinkedData(save: Boolean) {
+        start(Bundle().apply {
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
+        }
+                , ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK)
+    }
+
     fun startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems: Int,
                                          newMaxHistoryItems: Int,
                                          save: Boolean) {

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

@@ -0,0 +1,40 @@
+/*
+ * 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.database.action
+
+import android.content.Context
+import com.kunzisoft.keepass.database.element.Database
+
+class RemoveUnlinkedDataDatabaseRunnable (
+        context: Context,
+        database: Database,
+        saveDatabase: Boolean)
+    : SaveDatabaseRunnable(context, database, saveDatabase) {
+
+    override fun onActionRun() {
+        try {
+            database.removeUnlinkedAttachments()
+        } catch (e: Exception) {
+            setError(e)
+        }
+
+        super.onActionRun()
+    }
+}

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

@@ -34,7 +34,7 @@ class DeleteEntryHistoryDatabaseRunnable (
 
     override fun onStartRun() {
         try {
-            mainEntry.removeEntryFromHistory(entryHistoryPosition)
+            database.removeEntryHistory(mainEntry, entryHistoryPosition)
         } catch (e: Exception) {
             setError(e)
         }

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

@@ -64,6 +64,10 @@ class DeleteNodesRunnable(context: Context,
                     } else {
                         database.deleteEntry(currentNode)
                     }
+                    // Remove the oldest attachments
+                    currentNode.getAttachments(database.binaryPool).forEach {
+                        database.removeAttachmentIfNotUsed(it)
+                    }
                 }
             }
         }

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

@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.database.action.node
 
 import android.content.Context
+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.Node
@@ -40,16 +41,34 @@ class UpdateEntryRunnable constructor(
         // WARNING : Re attribute parent removed in entry edit activity to save memory
         mNewEntry.addParentFrom(mOldEntry)
 
+        // Build oldest attachments
+        val oldEntryAttachments = mOldEntry.getAttachments(database.binaryPool, true)
+        val newEntryAttachments = mNewEntry.getAttachments(database.binaryPool, true)
+        val attachmentsToRemove = ArrayList<Attachment>(oldEntryAttachments)
+        // Not use equals because only check name
+        newEntryAttachments.forEach { newAttachment ->
+            oldEntryAttachments.forEach { oldAttachment ->
+                if (oldAttachment.name == newAttachment.name
+                        && oldAttachment.binaryAttachment == newAttachment.binaryAttachment)
+                    attachmentsToRemove.remove(oldAttachment)
+            }
+        }
+
         // Update entry with new values
         mOldEntry.updateWith(mNewEntry)
         mNewEntry.touch(modified = true, touchParents = true)
 
         // Create an entry history (an entry history don't have history)
         mOldEntry.addEntryToHistory(Entry(mBackupEntryHistory, copyHistory = false))
-        database.removeOldestEntryHistory(mOldEntry)
+        database.removeOldestEntryHistory(mOldEntry, database.binaryPool)
 
         // Only change data in index
         database.updateEntry(mOldEntry)
+
+        // Remove oldest attachments
+        attachmentsToRemove.forEach {
+            database.removeAttachmentIfNotUsed(it)
+        }
     }
 
     override fun nodeFinish(): ActionNodesValues {

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
+
+data class Attachment(var name: String,
+                      var binaryAttachment: BinaryAttachment) : Parcelable {
+
+    constructor(parcel: Parcel) : this(
+            parcel.readString() ?: "",
+            parcel.readParcelable(BinaryAttachment::class.java.classLoader) ?: BinaryAttachment()
+    )
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(name)
+        parcel.writeParcelable(binaryAttachment, flags)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun toString(): String {
+        return "$name at $binaryAttachment"
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Attachment) return false
+
+        if (name != other.name) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return name.hashCode()
+    }
+
+    companion object CREATOR : Parcelable.Creator<Attachment> {
+        override fun createFromParcel(parcel: Parcel): Attachment {
+            return Attachment(parcel)
+        }
+
+        override fun newArray(size: Int): Array<Attachment?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

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

@@ -25,9 +25,7 @@ import android.net.Uri
 import android.util.Log
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.database.action.node.NodeHandler
-import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
-import com.kunzisoft.keepass.database.element.database.DatabaseKDB
-import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.database.*
 import com.kunzisoft.keepass.database.element.icon.IconImageFactory
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdInt
@@ -52,6 +50,7 @@ import com.kunzisoft.keepass.utils.SingletonHolder
 import com.kunzisoft.keepass.utils.UriUtil
 import java.io.*
 import java.util.*
+import kotlin.collections.ArrayList
 
 
 class Database {
@@ -70,6 +69,13 @@ class Database {
     val drawFactory = IconDrawableFactory()
 
     var loaded = false
+        set(value) {
+            field = value
+            loadTimestamp = if (field) System.currentTimeMillis() else null
+        }
+
+    var loadTimestamp: Long? = null
+        private set
 
     val iconFactory: IconImageFactory
         get() {
@@ -150,6 +156,17 @@ class Database {
             }
         }
 
+    fun compressionForNewEntry(): Boolean {
+        if (mDatabaseKDB != null)
+            return false
+        // Default compression not necessary if stored in header
+        mDatabaseKDBX?.let {
+            return it.compressionAlgorithm == CompressionAlgorithm.GZip
+                    && it.kdbxVersion.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()
+        }
+        return false
+    }
+
     fun updateDataBinaryCompression(oldCompression: CompressionAlgorithm,
                                     newCompression: CompressionAlgorithm) {
         mDatabaseKDBX?.changeBinaryCompression(oldCompression, newCompression)
@@ -261,14 +278,14 @@ class Database {
         }
 
     /**
-     * Determine if RecycleBin is available or not for this version of database
-     * @return true if RecycleBin available
+     * Determine if a configurable RecycleBin is available or not for this version of database
+     * @return true if a configurable RecycleBin available
      */
-    val allowRecycleBin: Boolean
+    val allowConfigurableRecycleBin: Boolean
         get() = mDatabaseKDBX != null
 
     var isRecycleBinEnabled: Boolean
-        // TODO #394 isRecycleBinEnabled mDatabaseKDB
+        // Backup is always enabled in KDB database
         get() = mDatabaseKDB != null || mDatabaseKDBX?.isRecycleBinEnabled ?: false
         set(value) {
             mDatabaseKDBX?.isRecycleBinEnabled = value
@@ -286,12 +303,12 @@ class Database {
         }
 
     fun ensureRecycleBinExists(resources: Resources) {
-        mDatabaseKDB?.ensureRecycleBinExists()
+        mDatabaseKDB?.ensureBackupExists()
         mDatabaseKDBX?.ensureRecycleBinExists(resources)
     }
 
     fun removeRecycleBin() {
-        // TODO #394 delete backup mDatabaseKDB?.removeRecycleBin()
+        // Don't allow remove backup in KDB
         mDatabaseKDBX?.removeRecycleBin()
     }
 
@@ -308,6 +325,8 @@ class Database {
     fun createData(databaseUri: Uri, databaseName: String, rootName: String) {
         setDatabaseKDBX(DatabaseKDBX(databaseName, rootName))
         this.fileUri = databaseUri
+        // Set Database state
+        this.loaded = true
     }
 
     @Throws(LoadDatabaseException::class)
@@ -380,10 +399,8 @@ class Database {
             loaded = true
 
         } catch (e: LoadDatabaseException) {
-            Log.e("KPD", "Database::loadData", e)
             throw e
         } catch (e: Exception) {
-            Log.e("KPD", "Database::loadData", e)
             throw FileNotFoundDatabaseException()
         } finally {
             keyFileInputStream?.close()
@@ -421,6 +438,38 @@ class Database {
         }, omitBackup, max)
     }
 
+    val binaryPool: BinaryPool
+        get() {
+            return mDatabaseKDBX?.binaryPool ?: BinaryPool()
+        }
+
+    val allowMultipleAttachments: Boolean
+        get() {
+            if (mDatabaseKDB != null)
+                return false
+            if (mDatabaseKDBX != null)
+                return true
+            return false
+        }
+
+    fun buildNewBinary(cacheDirectory: File,
+                       compressed: Boolean = false,
+                       protected: Boolean = false): BinaryAttachment? {
+        return mDatabaseKDB?.buildNewBinary(cacheDirectory)
+                ?: mDatabaseKDBX?.buildNewBinary(cacheDirectory, compressed, protected)
+    }
+
+    fun removeAttachmentIfNotUsed(attachment: Attachment) {
+        // No need in KDB database because unique attachment by entry
+        // Don't clear to fix upload multiple times
+        mDatabaseKDBX?.removeUnlinkedAttachment(attachment.binaryAttachment, false)
+    }
+
+    fun removeUnlinkedAttachments() {
+        // No check in database KDB because unique attachment by entry
+        mDatabaseKDBX?.removeUnlinkedAttachments(true)
+    }
+
     @Throws(DatabaseOutputException::class)
     fun saveData(contentResolver: ContentResolver) {
         try {
@@ -466,7 +515,7 @@ class Database {
         } else {
             var outputStream: OutputStream? = null
             try {
-                outputStream = contentResolver.openOutputStream(uri)
+                outputStream = contentResolver.openOutputStream(uri, "rwt")
                 outputStream?.let { definedOutputStream ->
                     val databaseOutput = mDatabaseKDB?.let { DatabaseOutputKDB(it, definedOutputStream) }
                                     ?: mDatabaseKDBX?.let { DatabaseOutputKDBX(it, definedOutputStream) }
@@ -711,7 +760,7 @@ class Database {
     fun canRecycle(entry: Entry): Boolean {
         var canRecycle: Boolean? = null
         entry.entryKDB?.let {
-            canRecycle = mDatabaseKDB?.canRecycle()
+            canRecycle = mDatabaseKDB?.canRecycle(it)
         }
         entry.entryKDBX?.let {
             canRecycle = mDatabaseKDBX?.canRecycle(it)
@@ -722,7 +771,7 @@ class Database {
     fun canRecycle(group: Group): Boolean {
         var canRecycle: Boolean? = null
         group.groupKDB?.let {
-            canRecycle = mDatabaseKDB?.canRecycle()
+            canRecycle = mDatabaseKDB?.canRecycle(it)
         }
         group.groupKDBX?.let {
             canRecycle = mDatabaseKDBX?.canRecycle(it)
@@ -774,18 +823,25 @@ class Database {
         }
     }
 
-    fun startManageEntry(entry: Entry) {
+    fun startManageEntry(entry: Entry?) {
         mDatabaseKDBX?.let {
-            entry.startToManageFieldReferences(it)
+            entry?.startToManageFieldReferences(it)
         }
     }
 
-    fun stopManageEntry(entry: Entry) {
+    fun stopManageEntry(entry: Entry?) {
         mDatabaseKDBX?.let {
-            entry.stopToManageFieldReferences()
+            entry?.stopToManageFieldReferences()
         }
     }
 
+    /**
+     * @return true if database allows custom field
+     */
+    fun allowEntryCustomFields(): Boolean {
+        return mDatabaseKDBX != null
+    }
+
     /**
      * Remove oldest history for each entry if more than max items or max memory
      */
@@ -793,7 +849,7 @@ class Database {
         rootGroup?.doForEachChildAndForIt(
                 object : NodeHandler<Entry>() {
                     override fun operate(node: Entry): Boolean {
-                        removeOldestEntryHistory(node)
+                        removeOldestEntryHistory(node, binaryPool)
                         return true
                     }
                 },
@@ -801,34 +857,19 @@ class Database {
                     override fun operate(node: Group): Boolean {
                         return true
                     }
-                })
-    }
-
-    fun removeEachEntryHistory() {
-        rootGroup?.doForEachChildAndForIt(
-                object : NodeHandler<Entry>() {
-                    override fun operate(node: Entry): Boolean {
-                        node.removeAllHistory()
-                        return true
-                    }
-                },
-                object : NodeHandler<Group>() {
-                    override fun operate(node: Group): Boolean {
-                        return true
-                    }
-                })
+                }
+        )
     }
 
     /**
      * Remove oldest history if more than max items or max memory
      */
-    fun removeOldestEntryHistory(entry: Entry) {
+    fun removeOldestEntryHistory(entry: Entry, binaryPool: BinaryPool) {
         mDatabaseKDBX?.let {
-
             val maxItems = historyMaxItems
             if (maxItems >= 0) {
                 while (entry.getHistory().size > maxItems) {
-                    entry.removeOldestEntryFromHistory()
+                    removeOldestEntryHistory(entry)
                 }
             }
 
@@ -837,11 +878,10 @@ class Database {
                 while (true) {
                     var historySize: Long = 0
                     for (entryHistory in entry.getHistory()) {
-                        historySize += entryHistory.getSize()
+                        historySize += entryHistory.getSize(binaryPool)
                     }
-
                     if (historySize > maxSize) {
-                        entry.removeOldestEntryFromHistory()
+                        removeOldestEntryHistory(entry)
                     } else {
                         break
                     }
@@ -850,6 +890,22 @@ class Database {
         }
     }
 
+    private fun removeOldestEntryHistory(entry: Entry) {
+        entry.removeOldestEntryFromHistory()?.let {
+            it.getAttachments(binaryPool, false).forEach { attachmentToRemove ->
+                removeAttachmentIfNotUsed(attachmentToRemove)
+            }
+        }
+    }
+
+    fun removeEntryHistory(entry: Entry, entryHistoryPosition: Int) {
+        entry.removeEntryFromHistory(entryHistoryPosition)?.let {
+            it.getAttachments(binaryPool, false).forEach { attachmentToRemove ->
+                removeAttachmentIfNotUsed(attachmentToRemove)
+            }
+        }
+    }
+
     companion object : SingletonHolder<Database>(::Database) {
 
         private val TAG = Database::class.java.name

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

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

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

@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.database.element
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.database.BinaryPool
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
@@ -32,9 +33,6 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
-import com.kunzisoft.keepass.database.element.security.ProtectedString
-import com.kunzisoft.keepass.model.EntryAttachment
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.Field
 import com.kunzisoft.keepass.otp.OtpElement
@@ -285,66 +283,90 @@ class Entry : Node, EntryVersionedInterface<Group> {
         }
 
     /**
-     * Retrieve custom fields to show, key is the label, value is the value of field (protected or not)
+     * Retrieve extra fields to show, key is the label, value is the value of field (protected or not)
      * @return Map of label/value
      */
-    val customFields: HashMap<String, ProtectedString>
-        get() = entryKDBX?.customFields ?: HashMap()
-
-    /**
-     * To redefine if version of entry allow custom field,
-     * @return true if entry allows custom field
-     */
-    fun allowCustomFields(): Boolean {
-        return entryKDBX?.allowCustomFields() ?: false
-    }
-
-    fun removeAllFields() {
-        entryKDBX?.removeAllFields()
+    fun getExtraFields(): List<Field> {
+        val extraFields = ArrayList<Field>()
+        entryKDBX?.let {
+            for (field in it.customFields) {
+                extraFields.add(Field(field.key, field.value))
+            }
+        }
+        return extraFields
     }
 
     /**
      * Update or add an extra field to the list (standard or custom)
-     * @param label Label of field, must be unique
-     * @param value Value of field
      */
-    fun putExtraField(label: String, value: ProtectedString) {
-        entryKDBX?.putExtraField(label, value)
+    fun putExtraField(field: Field) {
+        entryKDBX?.putExtraField(field.name, field.protectedValue)
     }
 
-    fun getOtpElement(): OtpElement? {
-        return OtpEntryFields.parseFields { key ->
-            customFields[key]?.toString()
+    private fun addExtraFields(fields: List<Field>) {
+        fields.forEach {
+            putExtraField(it)
         }
     }
 
-    fun startToManageFieldReferences(db: DatabaseKDBX) {
-        entryKDBX?.startToManageFieldReferences(db)
+    private fun removeAllFields() {
+        entryKDBX?.removeAllFields()
+    }
+
+    fun getOtpElement(): OtpElement? {
+        entryKDBX?.let {
+            return OtpEntryFields.parseFields { key ->
+                it.customFields[key]?.toString()
+            }
+        }
+        return null
+    }
+
+    fun startToManageFieldReferences(database: DatabaseKDBX) {
+        entryKDBX?.startToManageFieldReferences(database)
     }
 
     fun stopToManageFieldReferences() {
         entryKDBX?.stopToManageFieldReferences()
     }
 
-    fun getAttachments(): ArrayList<EntryAttachment> {
-        val attachments = ArrayList<EntryAttachment>()
-
-        val binaryDescriptionKDB = entryKDB?.binaryDescription ?: ""
-        val binaryKDB = entryKDB?.binaryData
-        if (binaryKDB != null) {
-            attachments.add(EntryAttachment(binaryDescriptionKDB, binaryKDB))
+    fun getAttachments(binaryPool: BinaryPool, inHistory: Boolean = false): List<Attachment> {
+        val attachments = ArrayList<Attachment>()
+        entryKDB?.getAttachment()?.let {
+            attachments.add(it)
         }
-
-        val actionEach = object : (Map.Entry<String, BinaryAttachment>)->Unit {
-            override fun invoke(mapEntry: Map.Entry<String, BinaryAttachment>) {
-                attachments.add(EntryAttachment(mapEntry.key, mapEntry.value))
-            }
+        entryKDBX?.getAttachments(binaryPool, inHistory)?.let {
+            attachments.addAll(it)
         }
-        entryKDBX?.binaries?.forEach(actionEach)
-
         return attachments
     }
 
+    fun containsAttachment(): Boolean {
+        return entryKDB?.containsAttachment() == true
+                || entryKDBX?.containsAttachment() == true
+    }
+
+    private fun addAttachments(binaryPool: BinaryPool, attachments: List<Attachment>) {
+        attachments.forEach {
+            putAttachment(it, binaryPool)
+        }
+    }
+
+    private fun removeAttachment(attachment: Attachment) {
+        entryKDB?.removeAttachment(attachment)
+        entryKDBX?.removeAttachment(attachment)
+    }
+
+    private fun removeAllAttachments() {
+        entryKDB?.removeAttachment()
+        entryKDBX?.removeAttachments()
+    }
+
+    private fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
+        entryKDB?.putAttachment(attachment)
+        entryKDBX?.putAttachment(attachment, binaryPool)
+    }
+
     fun getHistory(): ArrayList<Entry> {
         val history = ArrayList<Entry>()
         val entryKDBXHistory = entryKDBX?.history ?: ArrayList()
@@ -360,20 +382,22 @@ class Entry : Node, EntryVersionedInterface<Group> {
         }
     }
 
-    fun removeEntryFromHistory(position: Int) {
-        entryKDBX?.removeEntryFromHistory(position)
+    fun removeEntryFromHistory(position: Int): Entry? {
+        entryKDBX?.removeEntryFromHistory(position)?.let {
+            return Entry(it)
+        }
+        return null
     }
 
-    fun removeAllHistory() {
-        entryKDBX?.removeAllHistory()
+    fun removeOldestEntryFromHistory(): Entry? {
+         entryKDBX?.removeOldestEntryFromHistory()?.let {
+            return Entry(it)
+        }
+        return null
     }
 
-    fun removeOldestEntryFromHistory() {
-        entryKDBX?.removeOldestEntryFromHistory()
-    }
-
-    fun getSize(): Long {
-        return entryKDBX?.size ?: 0L
+    fun getSize(binaryPool: BinaryPool): Long {
+        return entryKDBX?.getSize(binaryPool) ?: 0L
     }
 
     fun containsCustomData(): Boolean {
@@ -396,26 +420,57 @@ class Entry : Node, EntryVersionedInterface<Group> {
             database?.stopManageEntry(this)
         else
             database?.startManageEntry(this)
+
         entryInfo.id = nodeId.toString()
         entryInfo.title = title
         entryInfo.icon = icon
         entryInfo.username = username
         entryInfo.password = password
+        entryInfo.expires = expires
+        entryInfo.expiryTime = expiryTime
         entryInfo.url = url
         entryInfo.notes = notes
-        for (entry in customFields.entries) {
-            entryInfo.customFields.add(
-                    Field(entry.key, entry.value))
-        }
+        entryInfo.customFields = getExtraFields()
         // Add otpElement to generate token
         entryInfo.otpModel = getOtpElement()?.otpModel
-        // Replace parameter fields by generated OTP fields
-        entryInfo.customFields = OtpEntryFields.generateAutoFields(entryInfo.customFields)
+        if (!raw) {
+            // Replace parameter fields by generated OTP fields
+            entryInfo.customFields = OtpEntryFields.generateAutoFields(entryInfo.customFields)
+        }
+        database?.binaryPool?.let { binaryPool ->
+            entryInfo.attachments = getAttachments(binaryPool)
+        }
+
         if (!raw)
             database?.stopManageEntry(this)
         return entryInfo
     }
 
+    fun setEntryInfo(database: Database?, newEntryInfo: EntryInfo) {
+        database?.startManageEntry(this)
+
+        removeAllFields()
+        removeAllAttachments()
+        // NodeId stay as is
+        title = newEntryInfo.title
+        icon = newEntryInfo.icon
+        username = newEntryInfo.username
+        password = newEntryInfo.password
+        expires = newEntryInfo.expires
+        expiryTime = newEntryInfo.expiryTime
+        url = newEntryInfo.url
+        notes = newEntryInfo.notes
+        addExtraFields(newEntryInfo.customFields)
+        database?.binaryPool?.let { binaryPool ->
+            addAttachments(binaryPool, newEntryInfo.attachments)
+        }
+        // Update date time
+        lastAccessTime = DateInstant()
+        lastModificationTime = DateInstant()
+
+        database?.stopManageEntry(this)
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false

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

@@ -17,10 +17,8 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element.security
+package com.kunzisoft.keepass.database.element.database
 
-import android.content.ContentResolver
-import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
 import com.kunzisoft.keepass.stream.readBytes
@@ -30,76 +28,90 @@ import java.util.zip.GZIPOutputStream
 
 class BinaryAttachment : Parcelable {
 
-    var isCompressed: Boolean? = null
+    private var dataFile: File? = null
+    var isCompressed: Boolean = false
         private set
     var isProtected: Boolean = false
         private set
-    private var dataFile: File? = null
+    var isCorrupted: Boolean = false
 
     fun length(): Long {
-        if (dataFile != null)
-            return dataFile!!.length()
-        return 0
+        return dataFile?.length() ?: 0
     }
 
     /**
      * Empty protected binary
      */
-    constructor() {
-        this.isCompressed = null
-        this.isProtected = false
-        this.dataFile = null
-    }
+    constructor()
 
-    constructor(dataFile: File, enableProtection: Boolean = false, compressed: Boolean? = null) {
-        this.isCompressed = compressed
-        this.isProtected = enableProtection
+    constructor(dataFile: File, compressed: Boolean = false, protected: Boolean = false) {
         this.dataFile = dataFile
+        this.isCompressed = compressed
+        this.isProtected = protected
     }
 
     private constructor(parcel: Parcel) {
-        val compressedByte = parcel.readByte().toInt()
-        isCompressed = if (compressedByte == 2) null else compressedByte != 0
-        isProtected = parcel.readByte().toInt() != 0
         parcel.readString()?.let {
             dataFile = File(it)
         }
+        isCompressed = parcel.readByte().toInt() != 0
+        isProtected = parcel.readByte().toInt() != 0
+        isCorrupted = parcel.readByte().toInt() != 0
     }
 
     @Throws(IOException::class)
     fun getInputDataStream(): InputStream {
         return when {
-            dataFile != null -> FileInputStream(dataFile!!)
+            length() > 0 -> FileInputStream(dataFile!!)
             else -> ByteArrayInputStream(ByteArray(0))
         }
     }
 
+    @Throws(IOException::class)
+    fun getUnGzipInputDataStream(): InputStream {
+        return if (isCompressed)
+            GZIPInputStream(getInputDataStream())
+        else
+            getInputDataStream()
+    }
+
+    @Throws(IOException::class)
+    fun getOutputDataStream(): OutputStream {
+        return when {
+            dataFile != null -> FileOutputStream(dataFile!!)
+            else -> throw IOException("Unable to write in an unknown file")
+        }
+    }
+
+    @Throws(IOException::class)
+    fun getGzipOutputDataStream(): OutputStream {
+        return if (isCompressed) {
+            GZIPOutputStream(getOutputDataStream())
+        } else {
+            getOutputDataStream()
+        }
+    }
+
     @Throws(IOException::class)
     fun compress(bufferSize: Int = DEFAULT_BUFFER_SIZE) {
         dataFile?.let { concreteDataFile ->
             // To compress, create a new binary with file
-            if (isCompressed != true) {
+            if (!isCompressed) {
                 val fileBinaryCompress = File(concreteDataFile.parent, concreteDataFile.name + "_temp")
-                var outputStream: GZIPOutputStream? = null
-                var inputStream: InputStream? = null
-                try {
-                    outputStream = GZIPOutputStream(FileOutputStream(fileBinaryCompress))
-                    inputStream = getInputDataStream()
-                    inputStream.readBytes(bufferSize) { buffer ->
-                        outputStream.write(buffer)
-                    }
-                } finally {
-                    inputStream?.close()
-                    outputStream?.close()
-
-                    // Remove unGzip file
-                    if (concreteDataFile.delete()) {
-                        if (fileBinaryCompress.renameTo(concreteDataFile)) {
-                            // Harmonize with database compression
-                            isCompressed = true
+                GZIPOutputStream(FileOutputStream(fileBinaryCompress)).use { outputStream ->
+                    getInputDataStream().use { inputStream ->
+                        inputStream.readBytes(bufferSize) { buffer ->
+                            outputStream.write(buffer)
                         }
                     }
                 }
+                // Remove unGzip file
+                if (concreteDataFile.delete()) {
+                    if (fileBinaryCompress.renameTo(concreteDataFile)) {
+                        // Harmonize with database compression
+                        isCompressed = true
+                    }
+                }
             }
         }
     }
@@ -107,52 +119,20 @@ class BinaryAttachment : Parcelable {
     @Throws(IOException::class)
     fun decompress(bufferSize: Int = DEFAULT_BUFFER_SIZE) {
         dataFile?.let { concreteDataFile ->
-            if (isCompressed != false) {
+            if (isCompressed) {
                 val fileBinaryDecompress = File(concreteDataFile.parent, concreteDataFile.name + "_temp")
-                var outputStream: FileOutputStream? = null
-                var inputStream: GZIPInputStream? = null
-                try {
-                    outputStream = FileOutputStream(fileBinaryDecompress)
-                    inputStream = GZIPInputStream(getInputDataStream())
-                    inputStream.readBytes(bufferSize) { buffer ->
-                        outputStream.write(buffer)
-                    }
-                } finally {
-                    inputStream?.close()
-                    outputStream?.close()
-
-                    // Remove gzip file
-                    if (concreteDataFile.delete()) {
-                        if (fileBinaryDecompress.renameTo(concreteDataFile)) {
-                            // Harmonize with database compression
-                            isCompressed = false
+                FileOutputStream(fileBinaryDecompress).use { outputStream ->
+                    getUnGzipInputDataStream().use { inputStream ->
+                        inputStream.readBytes(bufferSize) { buffer ->
+                            outputStream.write(buffer)
                         }
                     }
                 }
-            }
-        }
-    }
-
-    fun download(createdFileUri: Uri,
-                 contentResolver: ContentResolver,
-                 bufferSize: Int = DEFAULT_BUFFER_SIZE,
-                 update: ((percent: Int)->Unit)? = null) {
-
-        var dataDownloaded = 0
-        contentResolver.openOutputStream(createdFileUri).use { outputStream ->
-            outputStream?.let { fileOutputStream ->
-                if (isCompressed == true) {
-                    GZIPInputStream(getInputDataStream())
-                } else {
-                    getInputDataStream()
-                }.use { inputStream ->
-                    inputStream.readBytes(bufferSize) { buffer ->
-                        fileOutputStream.write(buffer)
-                        dataDownloaded += buffer.size
-                        try {
-                            val percentDownload = (100 * dataDownloaded / length()).toInt()
-                            update?.invoke(percentDownload)
-                        } catch (e: Exception) {}
+                // Remove gzip file
+                if (concreteDataFile.delete()) {
+                    if (fileBinaryDecompress.renameTo(concreteDataFile)) {
+                        // Harmonize with database compression
+                        isCompressed = false
                     }
                 }
             }
@@ -179,26 +159,33 @@ class BinaryAttachment : Parcelable {
 
         return isCompressed == other.isCompressed
                 && isProtected == other.isProtected
+                && isCorrupted == other.isCorrupted
                 && sameData
     }
 
     override fun hashCode(): Int {
 
         var result = 0
-        result = 31 * result + if (isCompressed == null) 2 else if (isCompressed!!) 1 else 0
+        result = 31 * result + if (isCompressed) 1 else 0
         result = 31 * result + if (isProtected) 1 else 0
+        result = 31 * result + if (isCorrupted) 1 else 0
         result = 31 * result + dataFile!!.hashCode()
         return result
     }
 
+    override fun toString(): String {
+        return dataFile.toString()
+    }
+
     override fun describeContents(): Int {
         return 0
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeByte((if (isCompressed == null) 2 else if (isCompressed!!) 1 else 0).toByte())
-        dest.writeByte((if (isProtected) 1 else 0).toByte())
         dest.writeString(dataFile?.absolutePath)
+        dest.writeByte((if (isCompressed) 1 else 0).toByte())
+        dest.writeByte((if (isProtected) 1 else 0).toByte())
+        dest.writeByte((if (isCorrupted) 1 else 0).toByte())
     }
 
     companion object {

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

@@ -19,52 +19,137 @@
  */
 package com.kunzisoft.keepass.database.element.database
 
-import android.util.SparseArray
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
 import java.io.IOException
 
 class BinaryPool {
-    private val pool = SparseArray<BinaryAttachment>()
+    private val pool = LinkedHashMap<Int, BinaryAttachment>()
 
+    /**
+     * To get a binary by the pool key (ref attribute in entry)
+     */
     operator fun get(key: Int): BinaryAttachment? {
         return pool[key]
     }
 
-    fun put(key: Int, value: BinaryAttachment) {
-        pool.put(key, value)
+    /**
+     * To linked a binary with a pool key, if the pool key doesn't exists, create an unused one
+     */
+    fun put(key: Int?, value: BinaryAttachment) {
+        if (key == null)
+            put(value)
+        else
+            pool[key] = value
     }
 
-    fun doForEachBinary(action: (key: Int, binary: BinaryAttachment) -> Unit) {
-        for (i in 0 until pool.size()) {
-            action.invoke(i, pool.get(pool.keyAt(i)))
+    /**
+     * To put a [binaryAttachment] in the pool,
+     * if already exists, replace the current one,
+     * else add it with a new key
+     */
+    fun put(binaryAttachment: BinaryAttachment): Int {
+        var key = findKey(binaryAttachment)
+        if (key == null) {
+            key = findUnusedKey()
         }
+        pool[key] = binaryAttachment
+        return key
     }
 
+    /**
+     * Remove a binary from the pool, the file is not deleted
+     */
     @Throws(IOException::class)
-    fun clear() {
-        doForEachBinary { _, binary ->
-            binary.clear()
+    fun remove(binaryAttachment: BinaryAttachment) {
+        findKey(binaryAttachment)?.let {
+            pool.remove(it)
         }
-        pool.clear()
+        // Don't clear attachment here because a file can be used in many BinaryAttachment
     }
 
-    fun add(fileBinary: BinaryAttachment) {
-        if (findKey(fileBinary) == null) {
-            pool.put(findUnusedKey(), fileBinary)
-        }
-    }
-
-    fun findUnusedKey(): Int {
-        var unusedKey = pool.size()
-        while (get(unusedKey) != null)
+    /**
+     * Utility method to find an unused key in the pool
+     */
+    private fun findUnusedKey(): Int {
+        var unusedKey = 0
+        while (pool[unusedKey] != null)
             unusedKey++
         return unusedKey
     }
 
-    fun findKey(pb: BinaryAttachment): Int? {
-        for (i in 0 until pool.size()) {
-            if (pool.get(pool.keyAt(i)) == pb) return i
+    /**
+     * Return key of [binaryAttachmentToRetrieve] or null if not found
+     */
+    private fun findKey(binaryAttachmentToRetrieve: BinaryAttachment): Int? {
+        val contains = pool.containsValue(binaryAttachmentToRetrieve)
+        return if (!contains)
+            null
+        else {
+            for ((key, binary) in pool) {
+                if (binary == binaryAttachmentToRetrieve) {
+                    return key
+                }
+            }
+            return null
         }
-        return null
     }
+
+    /**
+     * Utility method to order binaries and solve index problem in database v4
+     */
+    private fun orderedBinaries(): List<KeyBinary> {
+        val keyBinaryList = ArrayList<KeyBinary>()
+        for ((key, binary) in pool) {
+            keyBinaryList.add(KeyBinary(key, binary))
+        }
+        return keyBinaryList
+    }
+
+    /**
+     * To register a binary with a ref corresponding to an ordered index
+     */
+    fun getBinaryIndexFromKey(key: Int): Int? {
+        val index = orderedBinaries().indexOfFirst { it.key == key }
+        return if (index < 0)
+            null
+        else
+            index
+    }
+
+    /**
+     * Different from doForEach, provide an ordered index to each binary
+     */
+    fun doForEachOrderedBinary(action: (index: Int, keyBinary: KeyBinary) -> Unit) {
+        orderedBinaries().forEachIndexed(action)
+    }
+
+    /**
+     * To do an action on each binary in the pool
+     */
+    fun doForEachBinary(action: (binary: BinaryAttachment) -> Unit) {
+        pool.values.forEach { action.invoke(it) }
+    }
+
+    @Throws(IOException::class)
+    fun clear() {
+        doForEachBinary {
+            it.clear()
+        }
+        pool.clear()
+    }
+
+    override fun toString(): String {
+        val stringBuffer = StringBuffer()
+        for ((key, value) in pool) {
+            if (stringBuffer.isNotEmpty())
+                stringBuffer.append(", {$key:$value}")
+            else
+                stringBuffer.append("{$key:$value}")
+        }
+        return stringBuffer.toString()
+    }
+
+    /**
+     * Utility data class to order binaries
+     */
+    data class KeyBinary(val key: Int, val binary: BinaryAttachment)
 }

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

@@ -26,8 +26,10 @@ import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.element.group.GroupKDB
 import com.kunzisoft.keepass.database.element.node.NodeIdInt
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeVersioned
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.stream.NullOutputStream
+import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.security.DigestOutputStream
@@ -38,10 +40,12 @@ import kotlin.collections.ArrayList
 
 class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
 
-    var backupGroupId: Int = BACKUP_FOLDER_UNDEFINED_ID
+    private var backupGroupId: Int = BACKUP_FOLDER_UNDEFINED_ID
 
     private var kdfListV3: MutableList<KdfEngine> = ArrayList()
 
+    private var binaryIncrement = 0
+
     override val version: String
         get() = "KeePass 1"
 
@@ -57,7 +61,12 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
 
     // Retrieve backup group in index
     val backupGroup: GroupKDB?
-        get() = if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID) null else getGroupById(backupGroupId)
+        get() {
+            return if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
+                null
+            else
+                getGroupById(backupGroupId)
+        }
 
     override val kdfEngine: KdfEngine?
         get() = kdfListV3[0]
@@ -177,6 +186,13 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     override fun isInRecycleBin(group: GroupKDB): Boolean {
         var currentGroup: GroupKDB? = group
 
+        // Init backup group variable
+        if (backupGroupId == BACKUP_FOLDER_UNDEFINED_ID)
+            findBackupGroupId()
+
+        if (backupGroup == null)
+            return false
+
         if (currentGroup == backupGroup)
             return true
 
@@ -191,17 +207,21 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         return false
     }
 
-    /**
-     * Ensure that the recycle bin tree exists, if enabled and create it
-     * if it doesn't exist
-     */
-    fun ensureRecycleBinExists() {
+    private fun findBackupGroupId() {
         rootGroups.forEach { currentGroup ->
             if (currentGroup.level == 0
                     && currentGroup.title.equals(BACKUP_FOLDER_TITLE, ignoreCase = true)) {
                 backupGroupId = currentGroup.id
             }
         }
+    }
+
+    /**
+     * Ensure that the backup tree exists if enabled, and create it
+     * if it doesn't exist
+     */
+    fun ensureBackupExists() {
+        findBackupGroupId()
 
         if (backupGroup == null) {
             // Create recycle bin
@@ -219,21 +239,25 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
      * @param node Node to remove
      * @return true if node can be recycle, false elsewhere
      */
-    //  TODO #394 Backup KDB
-    //  fun canRecycle(node: NodeVersioned<*, GroupKDB, EntryKDB>): Boolean {
-    fun canRecycle(): Boolean {
+    fun canRecycle(node: NodeVersioned<*, GroupKDB, EntryKDB>): Boolean {
+        if (backupGroup == null)
+            ensureBackupExists()
+        if (node == backupGroup)
+            return false
+        backupGroup?.let {
+            if (node.isContainedIn(it))
+                return false
+        }
         return true
     }
 
     fun recycle(group: GroupKDB) {
-        ensureRecycleBinExists()
         removeGroupFrom(group, group.parent)
         addGroupTo(group, backupGroup)
         group.afterAssignNewParent()
     }
 
     fun recycle(entry: EntryKDB) {
-        ensureRecycleBinExists()
         removeEntryFrom(entry, entry.parent)
         addEntryTo(entry, backupGroup)
         entry.afterAssignNewParent()
@@ -249,6 +273,13 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         addEntryTo(entry, origParent)
     }
 
+    fun buildNewBinary(cacheDirectory: File): BinaryAttachment {
+        // Generate an unique new file
+        val fileInCache = File(cacheDirectory, binaryIncrement.toString())
+        binaryIncrement++
+        return BinaryAttachment(fileInCache)
+    }
+
     companion object {
         val TYPE = DatabaseKDB::class.java
 

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

@@ -29,6 +29,7 @@ import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
+import com.kunzisoft.keepass.database.action.node.NodeHandler
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.DeletedObject
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE
@@ -46,6 +47,7 @@ import com.kunzisoft.keepass.utils.UnsignedInt
 import com.kunzisoft.keepass.utils.VariantDictionary
 import org.w3c.dom.Node
 import org.w3c.dom.Text
+import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.security.MessageDigest
@@ -105,6 +107,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     val customData = HashMap<String, String>()
 
     var binaryPool = BinaryPool()
+    private var binaryIncrement = 0 // Unique id (don't use current time because CPU too fast)
 
     var localizedAppName = "KeePassDX"
 
@@ -173,33 +176,51 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     fun changeBinaryCompression(oldCompression: CompressionAlgorithm,
                                 newCompression: CompressionAlgorithm) {
-        binaryPool.doForEachBinary { key, binary ->
-
-            try {
-                when (oldCompression) {
-                    CompressionAlgorithm.None -> {
-                        when (newCompression) {
-                            CompressionAlgorithm.None -> {
-                            }
-                            CompressionAlgorithm.GZip -> {
-                                // To compress, create a new binary with file
-                                binary.compress(BUFFER_SIZE_BYTES)
-                            }
-                        }
-                    }
+        when (oldCompression) {
+            CompressionAlgorithm.None -> {
+                when (newCompression) {
+                    CompressionAlgorithm.None -> {}
                     CompressionAlgorithm.GZip -> {
-                        when (newCompression) {
-                            CompressionAlgorithm.None -> {
-                                // To decompress, create a new binary with file
-                                binary.decompress(BUFFER_SIZE_BYTES)
-                            }
-                            CompressionAlgorithm.GZip -> {
-                            }
+                        // Only in databaseV3.1, in databaseV4 the header is zipped during the save
+                        if (kdbxVersion.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong()) {
+                            compressAllBinaries()
                         }
                     }
                 }
+            }
+            CompressionAlgorithm.GZip -> {
+                // In databaseV4 the header is zipped during the save, so not necessary here
+                if (kdbxVersion.toKotlinLong() >= FILE_VERSION_32_4.toKotlinLong()) {
+                    decompressAllBinaries()
+                } else {
+                    when (newCompression) {
+                        CompressionAlgorithm.None -> {
+                            decompressAllBinaries()
+                        }
+                        CompressionAlgorithm.GZip -> {}
+                    }
+                }
+            }
+        }
+    }
+
+    private fun compressAllBinaries() {
+        binaryPool.doForEachBinary { binary ->
+            try {
+                // To compress, create a new binary with file
+                binary.compress(BUFFER_SIZE_BYTES)
             } catch (e: Exception) {
-                Log.e(TAG, "Unable to change compression for $key")
+                Log.e(TAG, "Unable to compress $binary", e)
+            }
+        }
+    }
+
+    private fun decompressAllBinaries() {
+        binaryPool.doForEachBinary { binary ->
+            try {
+                binary.decompress(BUFFER_SIZE_BYTES)
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to decompress $binary", e)
             }
         }
     }
@@ -536,6 +557,60 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         return publicCustomData.size() > 0
     }
 
+    fun buildNewBinary(cacheDirectory: File,
+                       compression: Boolean,
+                       protection: Boolean,
+                       binaryPoolId: Int? = null): BinaryAttachment {
+        // New file with current time
+        val fileInCache = File(cacheDirectory, binaryIncrement.toString())
+        binaryIncrement++
+        val binaryAttachment = BinaryAttachment(fileInCache, compression, protection)
+        // add attachment to pool
+        binaryPool.put(binaryPoolId, binaryAttachment)
+        return binaryAttachment
+    }
+
+    fun removeUnlinkedAttachment(binary: BinaryAttachment, clear: Boolean) {
+        val listBinaries = ArrayList<BinaryAttachment>()
+        listBinaries.add(binary)
+        removeUnlinkedAttachments(listBinaries, clear)
+    }
+
+    fun removeUnlinkedAttachments(clear: Boolean) {
+        removeUnlinkedAttachments(emptyList(), clear)
+    }
+
+    private fun removeUnlinkedAttachments(binaries: List<BinaryAttachment>, clear: Boolean) {
+        // Build binaries to remove with all binaries known
+        val binariesToRemove = ArrayList<BinaryAttachment>()
+        if (binaries.isEmpty()) {
+            binaryPool.doForEachBinary { binary ->
+                binariesToRemove.add(binary)
+            }
+        } else {
+            binariesToRemove.addAll(binaries)
+        }
+        // Remove binaries from the list
+        rootGroup?.doForEachChild(object : NodeHandler<EntryKDBX>() {
+            override fun operate(node: EntryKDBX): Boolean {
+                node.getAttachments(binaryPool, true).forEach {
+                    binariesToRemove.remove(it.binaryAttachment)
+                }
+                return binariesToRemove.isNotEmpty()
+            }
+        }, null)
+        // Effective removing
+        binariesToRemove.forEach {
+            try {
+                binaryPool.remove(it)
+                if (clear)
+                    it.clear()
+            } catch (e: Exception) {
+                Log.w(TAG, "Unable to clean binaries", e)
+            }
+        }
+    }
+
     override fun validatePasswordEncoding(password: String?, containsKeyFile: Boolean): Boolean {
         if (password == null)
             return true

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

@@ -27,7 +27,6 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
-import com.kunzisoft.keepass.database.exception.KeyFileEmptyDatabaseException
 import java.io.*
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
@@ -136,7 +135,6 @@ abstract class DatabaseVersioned<
         }
 
         when (keyData.size.toLong()) {
-            0L -> throw KeyFileEmptyDatabaseException()
             32L -> return keyData
             64L -> try {
                 return hexStringToByteArray(String(keyData))

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

@@ -25,14 +25,12 @@ import android.os.Parcelable
 import com.kunzisoft.keepass.utils.ParcelableUtil
 import com.kunzisoft.keepass.utils.UnsignedInt
 
-import java.util.HashMap
-
 class AutoType : Parcelable {
 
     var enabled = true
     var obfuscationOptions = OBF_OPT_NONE
     var defaultSequence = ""
-    private var windowSeqPairs = HashMap<String, String>()
+    private var windowSeqPairs = LinkedHashMap<String, String>()
 
     constructor()
 

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

@@ -26,8 +26,10 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
+import com.kunzisoft.keepass.database.element.Attachment
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * Structure containing information about one entry.
@@ -135,6 +137,29 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
     override val type: Type
         get() = Type.ENTRY
 
+    fun getAttachment(): Attachment? {
+        val binary = binaryData
+        return if (binary != null)
+            Attachment(binaryDescription, binary)
+        else null
+    }
+
+    fun containsAttachment(): Boolean {
+        return binaryData != null
+    }
+
+    fun putAttachment(attachment: Attachment) {
+        this.binaryDescription = attachment.name
+        this.binaryData = attachment.binaryAttachment
+    }
+
+    fun removeAttachment(attachment: Attachment? = null) {
+        if (attachment == null || this.binaryDescription == attachment.name) {
+            this.binaryDescription = ""
+            this.binaryData = null
+        }
+    }
+
     companion object {
 
         /** Size of byte buffer needed to hold this struct.  */

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

@@ -21,7 +21,9 @@ package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.database.BinaryPool
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImage
@@ -31,11 +33,12 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.utils.ParcelableUtil
 import com.kunzisoft.keepass.utils.UnsignedLong
 import java.util.*
+import kotlin.collections.ArrayList
+import kotlin.collections.LinkedHashMap
 
 class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInterface {
 
@@ -58,9 +61,9 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
             super.icon = value
         }
     var iconCustom = IconImageCustom.UNKNOWN_ICON
-    private var customData = HashMap<String, String>()
-    var fields = HashMap<String, ProtectedString>()
-    var binaries = HashMap<String, BinaryAttachment>()
+    var customData = LinkedHashMap<String, String>()
+    var fields = LinkedHashMap<String, ProtectedString>()
+    var binaries = LinkedHashMap<String, Int>() // Map<Label, PoolId>
     var foregroundColor = ""
     var backgroundColor = ""
     var overrideURL = ""
@@ -69,36 +72,32 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     var additional = ""
     var tags = ""
 
-    val size: Long
-        get() {
-            var size = FIXED_LENGTH_SIZE
+    fun getSize(binaryPool: BinaryPool): Long {
+        var size = FIXED_LENGTH_SIZE
 
-            for (entry in fields.entries) {
-                size += entry.key.length.toLong()
-                size += entry.value.length().toLong()
-            }
-
-            for ((key, value) in binaries) {
-                size += key.length.toLong()
-                size += value.length()
-            }
-
-            size += autoType.defaultSequence.length.toLong()
-            for ((key, value) in autoType.entrySet()) {
-                size += key.length.toLong()
-                size += value.length.toLong()
-            }
-
-            for (entry in history) {
-                size += entry.size
-            }
-
-            size += overrideURL.length.toLong()
-            size += tags.length.toLong()
-
-            return size
+        for (entry in fields.entries) {
+            size += entry.key.length.toLong()
+            size += entry.value.length().toLong()
         }
 
+        size += getAttachmentsSize(binaryPool)
+
+        size += autoType.defaultSequence.length.toLong()
+        for ((key, value) in autoType.entrySet()) {
+            size += key.length.toLong()
+            size += value.length.toLong()
+        }
+
+        for (entry in history) {
+            size += entry.getSize(binaryPool)
+        }
+
+        size += overrideURL.length.toLong()
+        size += tags.length.toLong()
+
+        return size
+    }
+
     override var expires: Boolean = false
 
     constructor() : super()
@@ -109,7 +108,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         locationChanged = parcel.readParcelable(DateInstant::class.java.classLoader) ?: locationChanged
         customData = ParcelableUtil.readStringParcelableMap(parcel)
         fields = ParcelableUtil.readStringParcelableMap(parcel, ProtectedString::class.java)
-        binaries = ParcelableUtil.readStringParcelableMap(parcel, BinaryAttachment::class.java)
+        binaries = ParcelableUtil.readStringIntMap(parcel)
         foregroundColor = parcel.readString() ?: foregroundColor
         backgroundColor = parcel.readString() ?: backgroundColor
         overrideURL = parcel.readString() ?: overrideURL
@@ -127,7 +126,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         dest.writeParcelable(locationChanged, flags)
         ParcelableUtil.writeStringParcelableMap(dest, customData)
         ParcelableUtil.writeStringParcelableMap(dest, flags, fields)
-        ParcelableUtil.writeStringParcelableMap(dest, flags, binaries)
+        ParcelableUtil.writeStringIntMap(dest, binaries)
         dest.writeString(foregroundColor)
         dest.writeString(backgroundColor)
         dest.writeString(overrideURL)
@@ -166,8 +165,8 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         tags = source.tags
     }
 
-    fun startToManageFieldReferences(db: DatabaseKDBX) {
-        this.mDatabase = db
+    fun startToManageFieldReferences(database: DatabaseKDBX) {
+        this.mDatabase = database
         this.mDecodeRef = true
     }
 
@@ -260,23 +259,17 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
                 || key == STR_NOTES)
     }
 
-    var customFields = HashMap<String, ProtectedString>()
+    var customFields = LinkedHashMap<String, ProtectedString>()
         get() {
             field.clear()
-            for (entry in fields.entries) {
-                val key = entry.key
-                val value = entry.value
-                if (!isStandardField(entry.key)) {
+            for ((key, value) in fields) {
+                if (!isStandardField(key)) {
                     field[key] = ProtectedString(value.isProtected, decodeRefKey(mDecodeRef, key))
                 }
             }
             return field
         }
 
-    fun allowCustomFields(): Boolean {
-        return true
-    }
-
     fun removeAllFields() {
         fields.clear()
     }
@@ -285,12 +278,47 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         fields[label] = value
     }
 
-    fun putProtectedBinary(key: String, value: BinaryAttachment) {
-        binaries[key] = value
+    /**
+     * It's a list because history labels can be defined multiple times
+     */
+    fun getAttachments(binaryPool: BinaryPool, inHistory: Boolean = false): List<Attachment> {
+        val entryAttachmentList = ArrayList<Attachment>()
+        for ((label, poolId) in binaries) {
+            binaryPool[poolId]?.let { binary ->
+                entryAttachmentList.add(Attachment(label, binary))
+            }
+        }
+        if (inHistory) {
+            history.forEach {
+                entryAttachmentList.addAll(it.getAttachments(binaryPool, false))
+            }
+        }
+        return entryAttachmentList
     }
 
-    fun sizeOfHistory(): Int {
-        return history.size
+    fun containsAttachment(): Boolean {
+        return binaries.isNotEmpty()
+    }
+
+    fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
+        binaries[attachment.name] = binaryPool.put(attachment.binaryAttachment)
+    }
+
+    fun removeAttachment(attachment: Attachment) {
+        binaries.remove(attachment.name)
+    }
+
+    fun removeAttachments() {
+        binaries.clear()
+    }
+
+    private fun getAttachmentsSize(binaryPool: BinaryPool): Long {
+        var size = 0L
+        for ((label, poolId) in binaries) {
+            size += label.length.toLong()
+            size += binaryPool[poolId]?.length() ?: 0
+        }
+        return size
     }
 
     override fun putCustomData(key: String, value: String) {
@@ -305,15 +333,11 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         history.add(entry)
     }
 
-    fun removeEntryFromHistory(position: Int) {
-        history.removeAt(position)
+    fun removeEntryFromHistory(position: Int): EntryKDBX? {
+        return history.removeAt(position)
     }
 
-    fun removeAllHistory() {
-        history.clear()
-    }
-
-    fun removeOldestEntryFromHistory() {
+    fun removeOldestEntryFromHistory(): EntryKDBX? {
         var min: Date? = null
         var index = -1
 
@@ -326,9 +350,9 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
             }
         }
 
-        if (index != -1) {
+        return if (index != -1) {
             history.removeAt(index)
-        }
+        } else null
     }
 
     override fun touch(modified: Boolean, touchParents: Boolean) {

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

@@ -26,7 +26,7 @@ class ProtectedString : Parcelable {
 
     var isProtected: Boolean = false
         private set
-    private var stringValue: String = ""
+    var stringValue: String = ""
 
     constructor(toCopy: ProtectedString) {
         this.isProtected = toCopy.isProtected

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

@@ -116,13 +116,6 @@ class InvalidCredentialsDatabaseException : LoadDatabaseException {
     constructor(exception: Throwable) : super(exception)
 }
 
-class KeyFileEmptyDatabaseException : LoadDatabaseException {
-    @StringRes
-    override var errorId: Int = R.string.keyfile_is_empty
-    constructor() : super()
-    constructor(exception: Throwable) : super(exception)
-}
-
 class NoMemoryDatabaseException: LoadDatabaseException {
     @StringRes
     override var errorId: Int = R.string.error_out_of_memory

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

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

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

@@ -27,14 +27,12 @@ import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.element.group.GroupKDB
 import com.kunzisoft.keepass.database.element.node.NodeIdInt
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DatabaseHeader
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB
 import com.kunzisoft.keepass.stream.*
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-import org.joda.time.Instant
 import java.io.*
 import java.security.*
 import java.util.*
@@ -282,11 +280,9 @@ class DatabaseInputKDB(cacheDirectory: File,
                     0x000E -> {
                         newEntry?.let { entry ->
                             if (fieldSize > 0) {
-                                // Generate an unique new file with timestamp
-                                val binaryFile = File(cacheDirectory,
-                                        Instant.now().millis.toString())
-                                entry.binaryData = BinaryAttachment(binaryFile)
-                                BufferedOutputStream(FileOutputStream(binaryFile)).use { outputStream ->
+                                val binaryAttachment = mDatabaseToOpen.buildNewBinary(cacheDirectory)
+                                entry.binaryData = binaryAttachment
+                                BufferedOutputStream(binaryAttachment.getOutputDataStream()).use { outputStream ->
                                     cipherInputStream.readBytes(fieldSize,
                                             DatabaseKDB.BUFFER_SIZE_BYTES) { buffer ->
                                         outputStream.write(buffer)

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

@@ -20,12 +20,14 @@
 package com.kunzisoft.keepass.database.file.input
 
 import android.util.Base64
+import android.util.Log
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.crypto.CipherFactory
 import com.kunzisoft.keepass.crypto.StreamCipherFactory
 import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.DeletedObject
+import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BASE_64_FLAG
@@ -35,7 +37,7 @@ import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
@@ -49,12 +51,14 @@ import org.bouncycastle.crypto.StreamCipher
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserException
 import org.xmlpull.v1.XmlPullParserFactory
-import java.io.*
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.io.UnsupportedEncodingException
 import java.nio.charset.Charset
 import java.text.ParseException
 import java.util.*
 import java.util.zip.GZIPInputStream
-import java.util.zip.GZIPOutputStream
 import javax.crypto.Cipher
 import javax.crypto.CipherInputStream
 import kotlin.math.min
@@ -68,9 +72,6 @@ class DatabaseInputKDBX(cacheDirectory: File,
 
     private var hashOfHeader: ByteArray? = null
 
-    private val unusedCacheFileName: String
-        get() = mDatabase.binaryPool.findUnusedKey().toString()
-
     private var readNextNode = true
     private val ctxGroups = Stack<GroupKDBX>()
     private var ctxGroup: GroupKDBX? = null
@@ -233,8 +234,10 @@ class DatabaseInputKDBX(cacheDirectory: File,
 
         var data = ByteArray(0)
         if (size > 0) {
-            if (fieldId != DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary)
+            if (fieldId != DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary) {
+                // TODO OOM here
                 data = dataInputStream.readBytes(size)
+            }
         }
 
         var result = true
@@ -249,18 +252,16 @@ class DatabaseInputKDBX(cacheDirectory: File,
                 header.innerRandomStreamKey = data
             }
             DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary -> {
-                val flag = dataInputStream.readBytes(1)[0].toInt() != 0
-                val protectedFlag = flag && DatabaseHeaderKDBX.KdbxBinaryFlags.Protected.toInt() != DatabaseHeaderKDBX.KdbxBinaryFlags.None.toInt()
-                val byteLength = size - 1
                 // Read in a file
-                val file = File(cacheDirectory, unusedCacheFileName)
-                FileOutputStream(file).use { outputStream ->
+                val protectedFlag = dataInputStream.read().toByte() == DatabaseHeaderKDBX.KdbxBinaryFlags.Protected
+                val byteLength = size - 1
+                // No compression at this level
+                val protectedBinary = mDatabase.buildNewBinary(cacheDirectory, false, protectedFlag)
+                protectedBinary.getOutputDataStream().use { outputStream ->
                     dataInputStream.readBytes(byteLength, DatabaseKDBX.BUFFER_SIZE_BYTES) { buffer ->
                         outputStream.write(buffer)
                     }
                 }
-                val protectedBinary = BinaryAttachment(file, protectedFlag)
-                mDatabase.binaryPool.add(protectedBinary)
             }
         }
 
@@ -443,14 +444,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
             }
 
             KdbContext.Binaries -> if (name.equals(DatabaseKDBXXML.ElemBinary, ignoreCase = true)) {
-                val key = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrId)
-                if (key != null) {
-                    val pbData = readBinary(xpp)
-                    val id = Integer.parseInt(key)
-                    mDatabase.binaryPool.put(id, pbData!!)
-                } else {
-                    readUnknown(xpp)
-                }
+                readBinary(xpp)
             } else {
                 readUnknown(xpp)
             }
@@ -749,8 +743,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
             if (entryInHistory) {
                 ctxEntry = ctxHistoryBase
                 return KdbContext.EntryHistory
-            }
-            else if (ctxEntry != null) {
+            } else if (ctxEntry != null) {
                 // Add entry to the index only when close the XML element
                 mDatabase.addEntryIndex(ctxEntry!!)
             }
@@ -766,8 +759,9 @@ class DatabaseInputKDBX(cacheDirectory: File,
 
             return KdbContext.Entry
         } else if (ctx == KdbContext.EntryBinary && name.equals(DatabaseKDBXXML.ElemBinary, ignoreCase = true)) {
-            if (ctxBinaryName != null && ctxBinaryValue != null)
-                ctxEntry?.putProtectedBinary(ctxBinaryName!!, ctxBinaryValue!!)
+            if (ctxBinaryName != null && ctxBinaryValue != null) {
+                ctxEntry?.putAttachment(Attachment(ctxBinaryName!!, ctxBinaryValue!!), mDatabase.binaryPool)
+            }
             ctxBinaryName = null
             ctxBinaryValue = null
 
@@ -885,9 +879,14 @@ class DatabaseInputKDBX(cacheDirectory: File,
         if (encoded.isEmpty()) {
             return DatabaseVersioned.UUID_ZERO
         }
-        val buf = Base64.decode(encoded, BASE_64_FLAG)
 
-        return bytes16ToUuid(buf)
+        return try {
+            val buf = Base64.decode(encoded, BASE_64_FLAG)
+            bytes16ToUuid(buf)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to read base 64 UUID, create a random one", e)
+            UUID.randomUUID()
+        }
     }
 
     @Throws(IOException::class, XmlPullParserException::class)
@@ -947,50 +946,69 @@ class DatabaseInputKDBX(cacheDirectory: File,
 
         // Reference Id to a binary already present in binary pool
         val ref = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrRef)
-        if (ref != null) {
-            xpp.next() // Consume end tag
+        // New id to a binary
+        val key = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrId)
 
-            val id = Integer.parseInt(ref)
-            return mDatabase.binaryPool[id]
-        }
-
-        // New binary to retrieve
-        else {
-            var compressed = false
-            var protected = false
-
-            if (xpp.attributeCount > 0) {
-                val compress = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrCompressed)
-                if (compress != null) {
-                    compressed = compress.equals(DatabaseKDBXXML.ValTrue, ignoreCase = true)
-                }
-
-                val protect = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrProtected)
-                if (protect != null) {
-                    protected = protect.equals(DatabaseKDBXXML.ValTrue, ignoreCase = true)
+        return when {
+            ref != null -> {
+                xpp.next() // Consume end tag
+                val id = Integer.parseInt(ref)
+                // A ref is not necessarily an index in Database V3.1
+                var binaryRetrieve = mDatabase.binaryPool[id]
+                // Create empty binary if not retrieved in pool
+                if (binaryRetrieve == null) {
+                    binaryRetrieve = mDatabase.buildNewBinary(cacheDirectory,
+                            compression = false, protection = true, binaryPoolId = id)
                 }
+                return binaryRetrieve
             }
-
-            val base64 = readString(xpp)
-            if (base64.isEmpty())
-                return BinaryAttachment()
-            val data = Base64.decode(base64, BASE_64_FLAG)
-
-            val file = File(cacheDirectory, unusedCacheFileName)
-            return FileOutputStream(file).use { outputStream ->
-                // Force compression in this specific case
-                if (mDatabase.compressionAlgorithm == CompressionAlgorithm.GZip
-                        && !compressed) {
-                    GZIPOutputStream(outputStream).write(data)
-                    BinaryAttachment(file, protected, true)
-                } else {
-                    outputStream.write(data)
-                    BinaryAttachment(file, protected, compressed)
-                }
+            key != null -> {
+                createBinary(key.toIntOrNull(), xpp)
+            }
+            else -> {
+                // New binary to retrieve
+                createBinary(null, xpp)
             }
         }
     }
 
+    @Throws(IOException::class, XmlPullParserException::class)
+    private fun createBinary(binaryId: Int?, xpp: XmlPullParser): BinaryAttachment? {
+        var compressed = false
+        var protected = true
+
+        if (xpp.attributeCount > 0) {
+            val compress = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrCompressed)
+            if (compress != null) {
+                compressed = compress.equals(DatabaseKDBXXML.ValTrue, ignoreCase = true)
+            }
+
+            val protect = xpp.getAttributeValue(null, DatabaseKDBXXML.AttrProtected)
+            if (protect != null) {
+                protected = protect.equals(DatabaseKDBXXML.ValTrue, ignoreCase = true)
+            }
+        }
+
+        val base64 = readString(xpp)
+        if (base64.isEmpty())
+            return null
+
+        // Build the new binary and compress
+        val binaryAttachment = mDatabase.buildNewBinary(cacheDirectory, compressed, protected, binaryId)
+        try {
+            binaryAttachment.getOutputDataStream().use { outputStream ->
+                outputStream.write(Base64.decode(base64, BASE_64_FLAG))
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to read base 64 attachment", e)
+            binaryAttachment.isCorrupted = true
+            binaryAttachment.getOutputDataStream().use { outputStream ->
+                outputStream.write(base64.toByteArray())
+            }
+        }
+        return binaryAttachment
+    }
+
     @Throws(IOException::class, XmlPullParserException::class)
     private fun readString(xpp: XmlPullParser): String {
         val buf = readProtectedBase64String(xpp)
@@ -1045,6 +1063,8 @@ class DatabaseInputKDBX(cacheDirectory: File,
 
     companion object {
 
+        private val TAG = DatabaseInputKDBX::class.java.name
+
         private val DEFAULT_HISTORY_DAYS = UnsignedInt(365)
 
         @Throws(XmlPullParserException::class)

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

@@ -24,6 +24,7 @@ import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BU
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
 import com.kunzisoft.keepass.stream.LittleEndianDataOutputStream
 import com.kunzisoft.keepass.stream.readBytes
+import com.kunzisoft.keepass.utils.UnsignedInt
 import java.io.IOException
 import java.io.OutputStream
 import kotlin.experimental.or
@@ -36,33 +37,40 @@ class DatabaseInnerHeaderOutputKDBX(private val database: DatabaseKDBX,
 
     @Throws(IOException::class)
     fun output() {
-        dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomStreamID.toInt())
+        dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomStreamID)
         dataOutputStream.writeInt(4)
         if (header.innerRandomStream == null)
             throw IOException("Can't write innerRandomStream")
-        dataOutputStream.writeInt(header.innerRandomStream!!.id.toKotlinInt())
+        dataOutputStream.writeUInt(header.innerRandomStream!!.id)
 
         val streamKeySize = header.innerRandomStreamKey.size
-        dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomstreamKey.toInt())
+        dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomstreamKey)
         dataOutputStream.writeInt(streamKeySize)
         dataOutputStream.write(header.innerRandomStreamKey)
 
-        database.binaryPool.doForEachBinary { _, protectedBinary ->
+        database.binaryPool.doForEachOrderedBinary { _, keyBinary ->
+            val protectedBinary = keyBinary.binary
+            // Force decompression to add binary in header
+            protectedBinary.decompress()
+            // Write type binary
+            dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary)
+            // Write size
+            dataOutputStream.writeUInt(UnsignedInt.fromKotlinLong(protectedBinary.length() + 1))
+            // Write protected flag
             var flag = DatabaseHeaderKDBX.KdbxBinaryFlags.None
             if (protectedBinary.isProtected) {
                 flag = flag or DatabaseHeaderKDBX.KdbxBinaryFlags.Protected
             }
+            dataOutputStream.writeByte(flag)
 
-            dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.Binary.toInt())
-            dataOutputStream.writeInt(protectedBinary.length().toInt() + 1) // TODO verify
-            dataOutputStream.write(flag.toInt())
-
-            protectedBinary.getInputDataStream().readBytes(BUFFER_SIZE_BYTES) { buffer ->
-                dataOutputStream.write(buffer)
+            protectedBinary.getInputDataStream().use { inputStream ->
+                inputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
+                    dataOutputStream.write(buffer)
+                }
             }
         }
 
-        dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.EndOfHeader.toInt())
+        dataOutputStream.writeByte(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.EndOfHeader)
         dataOutputStream.writeInt(0)
     }
 }

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

@@ -38,7 +38,7 @@ import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.exception.DatabaseOutputException
@@ -55,7 +55,6 @@ import java.io.OutputStream
 import java.security.NoSuchAlgorithmException
 import java.security.SecureRandom
 import java.util.*
-import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 import javax.crypto.Cipher
 import javax.crypto.CipherOutputStream
@@ -360,6 +359,9 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
 
         writeFields(entry.fields)
         writeEntryBinaries(entry.binaries)
+        if (entry.containsCustomData()) {
+            writeCustomData(entry.customData)
+        }
         writeAutoType(entry.autoType)
 
         if (!isHistory) {
@@ -422,7 +424,6 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
     private fun writeBinary(binary : BinaryAttachment) {
         val binaryLength = binary.length()
         if (binaryLength > 0) {
-
             if (binary.isProtected) {
                 xml.attribute(null, DatabaseKDBXXML.AttrProtected, DatabaseKDBXXML.ValTrue)
 
@@ -433,21 +434,11 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
                     xml.text(charArray, 0, charArray.size)
                 }
             } else {
-                // Force binary compression from database (compression was harmonized during import)
-                if (mDatabaseKDBX.compressionAlgorithm === CompressionAlgorithm.GZip) {
+                if (binary.isCompressed) {
                     xml.attribute(null, DatabaseKDBXXML.AttrCompressed, DatabaseKDBXXML.ValTrue)
                 }
-
-                // Force decompression in this specific case
-                val binaryInputStream = if (mDatabaseKDBX.compressionAlgorithm == CompressionAlgorithm.None
-                                && binary.isCompressed == true) {
-                    GZIPInputStream(binary.getInputDataStream())
-                } else {
-                    binary.getInputDataStream()
-                }
-
                 // Write the XML
-                binaryInputStream.readBytes(BUFFER_SIZE_BYTES) { buffer ->
+                binary.getInputDataStream().readBytes(BUFFER_SIZE_BYTES) { buffer ->
                     val charArray = String(Base64.encode(buffer, BASE_64_FLAG)).toCharArray()
                     xml.text(charArray, 0, charArray.size)
                 }
@@ -459,10 +450,11 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
     private fun writeMetaBinaries() {
         xml.startTag(null, DatabaseKDBXXML.ElemBinaries)
 
-        mDatabaseKDBX.binaryPool.doForEachBinary { key, binary ->
+        // Use indexes because necessarily in DatabaseV4 (binary header ref is the order)
+        mDatabaseKDBX.binaryPool.doForEachOrderedBinary { index, keyBinary ->
             xml.startTag(null, DatabaseKDBXXML.ElemBinary)
-            xml.attribute(null, DatabaseKDBXXML.AttrId, key.toString())
-            writeBinary(binary)
+            xml.attribute(null, DatabaseKDBXXML.AttrId, index.toString())
+            writeBinary(keyBinary.binary)
             xml.endTag(null, DatabaseKDBXXML.ElemBinary)
         }
 
@@ -559,23 +551,22 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
     }
 
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
-    private fun writeEntryBinaries(binaries: Map<String, BinaryAttachment>) {
-        for ((key, binary) in binaries) {
-            xml.startTag(null, DatabaseKDBXXML.ElemBinary)
-            xml.startTag(null, DatabaseKDBXXML.ElemKey)
-            xml.text(safeXmlString(key))
-            xml.endTag(null, DatabaseKDBXXML.ElemKey)
+    private fun writeEntryBinaries(binaries: LinkedHashMap<String, Int>) {
+        for ((label, poolId) in binaries) {
+            // Retrieve the right index with the poolId, don't use ref because of header in DatabaseV4
+            mDatabaseKDBX.binaryPool.getBinaryIndexFromKey(poolId)?.toString()?.let { indexString ->
+                xml.startTag(null, DatabaseKDBXXML.ElemBinary)
+                xml.startTag(null, DatabaseKDBXXML.ElemKey)
+                xml.text(safeXmlString(label))
+                xml.endTag(null, DatabaseKDBXXML.ElemKey)
 
-            xml.startTag(null, DatabaseKDBXXML.ElemValue)
-            val ref = mDatabaseKDBX.binaryPool.findKey(binary)
-            if (ref != null) {
-                xml.attribute(null, DatabaseKDBXXML.AttrRef, ref.toString())
-            } else {
-                writeBinary(binary)
+                xml.startTag(null, DatabaseKDBXXML.ElemValue)
+                // Use only pool data in Meta to save binaries
+                xml.attribute(null, DatabaseKDBXXML.AttrRef, indexString)
+                xml.endTag(null, DatabaseKDBXXML.ElemValue)
+
+                xml.endTag(null, DatabaseKDBXXML.ElemBinary)
             }
-            xml.endTag(null, DatabaseKDBXXML.ElemValue)
-
-            xml.endTag(null, DatabaseKDBXXML.ElemBinary)
         }
     }
 

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

@@ -28,7 +28,6 @@ import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorK
 import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorKDBX
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.model.getSearchString
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 
@@ -53,7 +52,7 @@ class SearchHelper {
                         && !searchInfo.containsOnlyNullValues()) {
                     // If search provide results
                     database.createVirtualGroupFromSearchInfo(
-                            searchInfo.getSearchString(context),
+                            searchInfo.toString(),
                             PreferencesUtil.omitBackup(context),
                             MAX_SEARCH_ENTRY
                     )?.let { searchGroup ->

app/src/main/java/com/kunzisoft/keepass/education/Education.kt

@@ -95,9 +95,9 @@ open class Education(val activity: Activity) {
                 R.string.education_entry_edit_key,
                 R.string.education_password_generator_key,
                 R.string.education_entry_new_field_key,
+                R.string.education_add_attachment_key,
                 R.string.education_setup_OTP_key)
 
-
         /**
          * Get preferences bundle for education
          */
@@ -272,6 +272,18 @@ open class Education(val activity: Activity) {
                     context.resources.getBoolean(R.bool.education_entry_new_field_default))
         }
 
+        /**
+         * Determines whether the explanatory view of the new attachment button in an entry has already been displayed.
+         *
+         * @param context The context to open the SharedPreferences
+         * @return boolean value of education_add_attachment_key key
+         */
+        fun isEducationAddAttachmentPerformed(context: Context): Boolean {
+            val prefs = getEducationSharedPreferences(context)
+            return prefs.getBoolean(context.getString(R.string.education_add_attachment_key),
+                    context.resources.getBoolean(R.bool.education_add_attachment_default))
+        }
+
         /**
          * Determines whether the explanatory view to setup OTP has already been displayed.
          *

app/src/main/java/com/kunzisoft/keepass/education/EntryEditActivityEducation.kt

@@ -29,6 +29,10 @@ import com.kunzisoft.keepass.R
 class EntryEditActivityEducation(activity: Activity)
     : Education(activity) {
 
+    /**
+     * Check and display learning views
+     * Displays the explanation for the password generator
+     */
     fun checkAndPerformedGeneratePasswordEducation(educationView: View,
                                                    onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                    onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
@@ -56,7 +60,7 @@ class EntryEditActivityEducation(activity: Activity)
 
     /**
      * Check and display learning views
-     * Displays the explanation for the icon selection, the password generator and for a new field
+     * Displays the explanation to create a new field
      */
     fun checkAndPerformedEntryNewFieldEducation(educationView: View,
                                                 onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
@@ -83,6 +87,35 @@ class EntryEditActivityEducation(activity: Activity)
                 R.string.education_entry_new_field_key)
     }
 
+    /**
+     * Check and display learning views
+     * Displays the explanation for to upload attachment
+     */
+    fun checkAndPerformedAttachmentEducation(educationView: View,
+                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
+                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
+        return checkAndPerformedEducation(!isEducationAddAttachmentPerformed(activity),
+                TapTarget.forView(educationView,
+                        activity.getString(R.string.education_add_attachment_title),
+                        activity.getString(R.string.education_add_attachment_summary))
+                        .textColorInt(Color.WHITE)
+                        .tintTarget(true)
+                        .cancelable(true),
+                object : TapTargetView.Listener() {
+                    override fun onTargetClick(view: TapTargetView) {
+                        super.onTargetClick(view)
+                        onEducationViewClick?.invoke(view)
+                    }
+
+                    override fun onOuterCircleClick(view: TapTargetView?) {
+                        super.onOuterCircleClick(view)
+                        view?.dismiss(false)
+                        onOuterViewClick?.invoke(view)
+                    }
+                },
+                R.string.education_add_attachment_key)
+    }
+
     /**
      * Check and display learning views
      * Displays the explanation to setup OTP

app/src/main/java/com/kunzisoft/keepass/icons/IconPack.kt

@@ -23,6 +23,7 @@ import android.content.res.Resources
 import android.util.SparseIntArray
 import com.kunzisoft.keepass.R
 import java.text.DecimalFormat
+import java.util.*
 
 /**
  * Class who construct dynamically database icons contains in a separate library
@@ -35,17 +36,13 @@ import java.text.DecimalFormat
  *
  * See *icon-pack-classic* module as sample
  *
- *
- */
-class IconPack
-/**
  * Construct dynamically the icon pack provide by the string resource id
  *
  * @param packageName Context of the app to retrieve the resources
  * @param packageName Context of the app to retrieve the resources
  * @param resourceId String Id of the pack (ex : com.kunzisoft.keepass.icon.classic.R.string.resource_id)
  */
-internal constructor(packageName: String, resources: Resources, resourceId: Int) {
+class IconPack(packageName: String, resources: Resources, resourceId: Int) {
 
     private val icons: SparseIntArray = SparseIntArray()
     /**
@@ -84,7 +81,7 @@ internal constructor(packageName: String, resources: Resources, resourceId: Int)
         while (num <= NB_ICONS) {
             // To construct the id with name_ic_XX_32dp (ex : classic_ic_08_32dp )
             val resId = resources.getIdentifier(
-                    id + "_" + DecimalFormat("00").format(num.toLong()) + "_32dp",
+                    id + "_" + String.format(Locale.ENGLISH, "%02d", num) + "_32dp",
                     "drawable",
                     packageName)
             icons.put(num, resId)

app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikIME.kt

@@ -108,8 +108,17 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
             val closeView = popupFieldsView.findViewById<View>(R.id.keyboard_popup_close)
             closeView.setOnClickListener { popupCustomKeys?.dismiss() }
 
-            if (!Database.getInstance().loaded)
+            // Remove entry info if the database is not loaded
+            // or if entry info timestamp is before database loaded timestamp
+            val database = Database.getInstance()
+            val databaseTime = database.loadTimestamp
+            val entryTime = entryInfoTimestamp
+            if (!database.loaded
+                    || databaseTime == null
+                    || entryTime == null
+                    || entryTime < databaseTime) {
                 removeEntryInfo()
+            }
             assignKeyboardView()
             keyboardView?.setOnKeyboardActionListener(this)
             keyboardView?.isPreviewEnabled = false
@@ -175,7 +184,6 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
         }
     }
 
-    @Suppress("DEPRECATION")
     private fun switchToPreviousKeyboard() {
         var imeManager: InputMethodManager? = null
         try {
@@ -321,10 +329,13 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
         private const val KEY_URL = 520
         private const val KEY_FIELDS = 530
 
+        // TODO Retrieve entry info from id and service when database is open
         private var entryInfoKey: EntryInfo? = null
+        private var entryInfoTimestamp: Long? = null
 
         private fun removeEntryInfo() {
             entryInfoKey = null
+            entryInfoTimestamp = null
         }
 
         fun removeEntry(context: Context) {
@@ -334,6 +345,7 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
         fun addEntryAndLaunchNotificationIfAllowed(context: Context, entry: EntryInfo, toast: Boolean = false) {
             // Add a new entry
             entryInfoKey = entry
+            entryInfoTimestamp = System.currentTimeMillis()
             // Launch notification if allowed
             KeyboardEntryNotificationService.launchNotificationIfAllowed(context, entry, toast)
         }

app/src/main/java/com/kunzisoft/keepass/model/DatabaseFile.kt

@@ -0,0 +1,26 @@
+package com.kunzisoft.keepass.model
+
+import android.net.Uri
+
+data class DatabaseFile(var databaseUri: Uri? = null,
+                        var keyFileUri: Uri? = null,
+                        var databaseDecodedPath: String? = null,
+                        var databaseAlias: String? = null,
+                        var databaseFileExists: Boolean = false,
+                        var databaseLastModified: String? = null,
+                        var databaseSize: String? = null) {
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is DatabaseFile) return false
+
+        if (databaseUri == null || other.databaseUri == null) return false
+        if (databaseUri != other.databaseUri) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return databaseUri?.hashCode() ?: 0
+    }
+}

app/src/main/java/com/kunzisoft/keepass/model/EntryAttachmentState.kt

@@ -21,24 +21,25 @@ package com.kunzisoft.keepass.model
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.security.BinaryAttachment
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.utils.readEnum
 import com.kunzisoft.keepass.utils.writeEnum
 
-data class EntryAttachment(var name: String,
-                           var binaryAttachment: BinaryAttachment,
-                           var downloadState: AttachmentState = AttachmentState.NULL,
-                           var downloadProgression: Int = 0) : Parcelable {
+data class EntryAttachmentState(var attachment: Attachment,
+                                var streamDirection: StreamDirection,
+                                var downloadState: AttachmentState = AttachmentState.NULL,
+                                var downloadProgression: Int = 0) : Parcelable {
 
     constructor(parcel: Parcel) : this(
-            parcel.readString() ?: "",
-            parcel.readParcelable(BinaryAttachment::class.java.classLoader) ?: BinaryAttachment(),
+            parcel.readParcelable(Attachment::class.java.classLoader) ?: Attachment("", BinaryAttachment()),
+            parcel.readEnum<StreamDirection>() ?: StreamDirection.DOWNLOAD,
             parcel.readEnum<AttachmentState>() ?: AttachmentState.NULL,
             parcel.readInt())
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
-        parcel.writeString(name)
-        parcel.writeParcelable(binaryAttachment, flags)
+        parcel.writeParcelable(attachment, flags)
+        parcel.writeEnum(streamDirection)
         parcel.writeEnum(downloadState)
         parcel.writeInt(downloadProgression)
     }
@@ -47,12 +48,25 @@ data class EntryAttachment(var name: String,
         return 0
     }
 
-    companion object CREATOR : Parcelable.Creator<EntryAttachment> {
-        override fun createFromParcel(parcel: Parcel): EntryAttachment {
-            return EntryAttachment(parcel)
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is EntryAttachmentState) return false
+
+        if (attachment != other.attachment) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return attachment.hashCode()
+    }
+
+    companion object CREATOR : Parcelable.Creator<EntryAttachmentState> {
+        override fun createFromParcel(parcel: Parcel): EntryAttachmentState {
+            return EntryAttachmentState(parcel)
         }
 
-        override fun newArray(size: Int): Array<EntryAttachment?> {
+        override fun newArray(size: Int): Array<EntryAttachmentState?> {
             return arrayOfNulls(size)
         }
     }

app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt

@@ -21,21 +21,29 @@ package com.kunzisoft.keepass.model
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.otp.OtpElement
 import com.kunzisoft.keepass.otp.OtpEntryFields.OTP_TOKEN_FIELD
-import java.util.*
+import kotlin.collections.ArrayList
 
 class EntryInfo : Parcelable {
 
     var id: String = ""
     var title: String = ""
-    var icon: IconImage? = null
+    var icon: IconImage = IconImageStandard()
     var username: String = ""
     var password: String = ""
+    var expires: Boolean = false
+    var expiryTime: DateInstant = DateInstant.IN_ONE_MONTH
     var url: String = ""
     var notes: String = ""
-    var customFields: MutableList<Field> = ArrayList()
+    var customFields: List<Field> = ArrayList()
+    var attachments: List<Attachment> = ArrayList()
     var otpModel: OtpModel? = null
 
     constructor()
@@ -43,12 +51,15 @@ class EntryInfo : Parcelable {
     private constructor(parcel: Parcel) {
         id = parcel.readString() ?: id
         title = parcel.readString() ?: title
-        icon = parcel.readParcelable(IconImage::class.java.classLoader)
+        icon = parcel.readParcelable(IconImage::class.java.classLoader) ?: icon
         username = parcel.readString() ?: username
         password = parcel.readString() ?: password
+        expires = parcel.readInt() != 0
+        expiryTime = parcel.readParcelable(DateInstant::class.java.classLoader) ?: expiryTime
         url = parcel.readString() ?: url
         notes = parcel.readString() ?: notes
-        parcel.readList(customFields as List<Field>, Field::class.java.classLoader)
+        parcel.readList(customFields, Field::class.java.classLoader)
+        parcel.readList(attachments, Attachment::class.java.classLoader)
         otpModel = parcel.readParcelable(OtpModel::class.java.classLoader) ?: otpModel
     }
 
@@ -62,9 +73,12 @@ class EntryInfo : Parcelable {
         parcel.writeParcelable(icon, flags)
         parcel.writeString(username)
         parcel.writeString(password)
+        parcel.writeInt(if (expires) 1 else 0)
+        parcel.writeParcelable(expiryTime, flags)
         parcel.writeString(url)
         parcel.writeString(notes)
         parcel.writeArray(customFields.toTypedArray())
+        parcel.writeArray(attachments.toTypedArray())
         parcel.writeParcelable(otpModel, flags)
     }
 
@@ -89,8 +103,57 @@ class EntryInfo : Parcelable {
         return customFields.lastOrNull { it.name == label }?.protectedValue?.toString() ?: ""
     }
 
+    private fun addUniqueField(field: Field, number: Int = 0) {
+        var exists = false
+        var sameData = false
+        val suffix = if (number > 0) number.toString() else ""
+        customFields.forEach { currentField ->
+            if (currentField.name == field.name + suffix) {
+                exists = true
+                // Not write the same value again
+                if (currentField.protectedValue.stringValue == field.protectedValue.stringValue) {
+                    sameData = true
+                } else {
+                    addUniqueField(field, number + 1)
+                }
+                return
+            }
+        }
+        if (!exists && !sameData)
+            (customFields as ArrayList<Field>).add(Field(field.name + suffix, field.protectedValue))
+    }
+
+    fun saveSearchInfo(database: Database?, searchInfo: SearchInfo) {
+        searchInfo.webDomain?.let { webDomain ->
+            // If unable to save web domain in custom field or URL not populated, save in URL
+            val scheme = searchInfo.webScheme
+            val webScheme = if (scheme.isNullOrEmpty()) "http" else scheme
+            val webDomainToStore = "$webScheme://$webDomain"
+            if (database?.allowEntryCustomFields() != true || url.isEmpty()) {
+                url = webDomainToStore
+            } else {
+                // Save web domain in custom field
+                addUniqueField(Field(WEB_DOMAIN_FIELD_NAME,
+                        ProtectedString(false, webDomainToStore))
+                )
+            }
+        } ?: run {
+            // Save application id in custom field
+            if (database?.allowEntryCustomFields() == true) {
+                searchInfo.applicationId?.let { applicationId ->
+                    addUniqueField(Field(APPLICATION_ID_FIELD_NAME,
+                            ProtectedString(false, applicationId))
+                    )
+                }
+            }
+        }
+    }
+
     companion object {
 
+        const val WEB_DOMAIN_FIELD_NAME = "WebDomain"
+        const val APPLICATION_ID_FIELD_NAME = "ApplicationId"
+
         @JvmField
         val CREATOR: Parcelable.Creator<EntryInfo> = object : Parcelable.Creator<EntryInfo> {
             override fun createFromParcel(parcel: Parcel): EntryInfo {

app/src/main/java/com/kunzisoft/keepass/model/Field.kt

@@ -33,6 +33,11 @@ class Field : Parcelable {
         this.protectedValue = value
     }
 
+    constructor(fieldToCopy: Field) {
+        this.name = fieldToCopy.name
+        this.protectedValue = fieldToCopy.protectedValue
+    }
+
     constructor(parcel: Parcel) {
         this.name = parcel.readString() ?: name
         this.protectedValue = parcel.readParcelable(ProtectedString::class.java.classLoader) ?: protectedValue
@@ -49,9 +54,7 @@ class Field : Parcelable {
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Field
+        if (other !is Field) return false
 
         if (name != other.name) return false
 

app/src/main/java/com/kunzisoft/keepass/model/FocusedEditField.kt

@@ -0,0 +1,56 @@
+package com.kunzisoft.keepass.model
+
+import android.os.Parcel
+import android.os.Parcelable
+
+class FocusedEditField : Parcelable {
+
+    var field: Field? = null
+    var cursorSelectionStart: Int = -1
+    var cursorSelectionEnd: Int = -1
+
+    constructor()
+
+    constructor(parcel: Parcel) {
+        this.field = parcel.readParcelable(Field::class.java.classLoader)
+        this.cursorSelectionStart = parcel.readInt()
+        this.cursorSelectionEnd = parcel.readInt()
+    }
+
+    fun destroy() {
+        this.field = null
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(field, flags)
+        parcel.writeInt(cursorSelectionStart)
+        parcel.writeInt(cursorSelectionEnd)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is FocusedEditField) return false
+
+        if (field != other.field) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return field?.hashCode() ?: 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<FocusedEditField> {
+        override fun createFromParcel(parcel: Parcel): FocusedEditField {
+            return FocusedEditField(parcel)
+        }
+
+        override fun newArray(size: Int): Array<FocusedEditField?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/model/RegisterInfo.kt

@@ -0,0 +1,35 @@
+package com.kunzisoft.keepass.model
+
+import android.os.Parcel
+import android.os.Parcelable
+
+data class RegisterInfo(val searchInfo: SearchInfo,
+                        val username: String?,
+                        val password: String?): Parcelable {
+
+    constructor(parcel: Parcel) : this(
+            parcel.readParcelable(SearchInfo::class.java.classLoader) ?: SearchInfo(),
+            parcel.readString() ?: "",
+            parcel.readString() ?: "") {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(searchInfo, flags)
+        parcel.writeString(username)
+        parcel.writeString(password)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<RegisterInfo> {
+        override fun createFromParcel(parcel: Parcel): RegisterInfo {
+            return RegisterInfo(parcel)
+        }
+
+        override fun newArray(size: Int): Array<RegisterInfo?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt

@@ -6,7 +6,10 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.ObjectNameResource
-import com.kunzisoft.keepass.utils.UriUtil
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 
 class SearchInfo : ObjectNameResource, Parcelable {
 
@@ -18,22 +21,36 @@ class SearchInfo : ObjectNameResource, Parcelable {
                 else -> null
             }
         }
+    // A web domain can also containing an IP
     var webDomain: String? = null
         set(value) {
             field = when {
                 value == null -> null
                 Regex(WEB_DOMAIN_REGEX).matches(value) -> value
+                Regex(WEB_IP_REGEX).matches(value) -> value
                 else -> null
             }
         }
+    var webScheme: String? = null
+        get() {
+            return if (webDomain == null) null else field
+        }
 
     constructor()
 
+    constructor(toCopy: SearchInfo?) {
+        applicationId = toCopy?.applicationId
+        webDomain = toCopy?.webDomain
+        webScheme = toCopy?.webScheme
+    }
+
     private constructor(parcel: Parcel) {
         val readAppId = parcel.readString()
         applicationId =  if (readAppId.isNullOrEmpty()) null else readAppId
         val readDomain = parcel.readString()
         webDomain = if (readDomain.isNullOrEmpty()) null else readDomain
+        val readScheme = parcel.readString()
+        webScheme = if (readScheme.isNullOrEmpty()) null else readScheme
     }
 
     override fun describeContents(): Int {
@@ -43,6 +60,7 @@ class SearchInfo : ObjectNameResource, Parcelable {
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(applicationId ?: "")
         parcel.writeString(webDomain ?: "")
+        parcel.writeString(webScheme ?: "")
     }
 
     override fun getName(resources: Resources): String {
@@ -50,7 +68,7 @@ class SearchInfo : ObjectNameResource, Parcelable {
     }
 
     fun containsOnlyNullValues(): Boolean {
-        return applicationId == null && webDomain == null
+        return applicationId == null && webDomain == null && webScheme == null
     }
 
     override fun equals(other: Any?): Boolean {
@@ -61,6 +79,7 @@ class SearchInfo : ObjectNameResource, Parcelable {
 
         if (applicationId != other.applicationId) return false
         if (webDomain != other.webDomain) return false
+        if (webScheme != other.webScheme) return false
 
         return true
     }
@@ -68,6 +87,7 @@ class SearchInfo : ObjectNameResource, Parcelable {
     override fun hashCode(): Int {
         var result = applicationId?.hashCode() ?: 0
         result = 31 * result + (webDomain?.hashCode() ?: 0)
+        result = 31 * result + (webScheme?.hashCode() ?: 0)
         return result
     }
 
@@ -79,6 +99,7 @@ class SearchInfo : ObjectNameResource, Parcelable {
         // https://gist.github.com/rishabhmhjn/8663966
         const val APPLICATION_ID_REGEX = "^(?:[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)(?:\\.[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)+\$"
         const val WEB_DOMAIN_REGEX = "^(?!://)([a-zA-Z0-9-_]+\\.)*[a-zA-Z0-9][a-zA-Z0-9-_]+\\.[a-zA-Z]{2,11}?\$"
+        const val WEB_IP_REGEX = "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$"
 
         @JvmField
         val CREATOR: Parcelable.Creator<SearchInfo> = object : Parcelable.Creator<SearchInfo> {
@@ -90,16 +111,28 @@ class SearchInfo : ObjectNameResource, Parcelable {
                 return arrayOfNulls(size)
             }
         }
-    }
-}
 
-fun SearchInfo.getSearchString(context: Context): String {
-    return run {
-                if (!PreferencesUtil.searchSubdomains(context))
-                    UriUtil.getWebDomainWithoutSubDomain(webDomain)
-                else
-                    webDomain
+        /**
+         * Get the concrete web domain AKA without sub domain if needed
+         */
+        fun getConcreteWebDomain(context: Context,
+                                 webDomain: String?,
+                                 concreteWebDomain: (String?) -> Unit) {
+            CoroutineScope(Dispatchers.Main).launch {
+                if (webDomain != null) {
+                    // Warning, web domain can contains IP, don't crop in this case
+                    if (PreferencesUtil.searchSubdomains(context)
+                            || Regex(WEB_IP_REGEX).matches(webDomain)) {
+                        concreteWebDomain.invoke(webDomain)
+                    } else {
+                        val publicSuffixList = PublicSuffixList(context)
+                        concreteWebDomain.invoke(publicSuffixList
+                                .getPublicSuffixPlusOne(webDomain).await())
+                    }
+                } else {
+                    concreteWebDomain.invoke(null)
+                }
             }
-            ?: applicationId
-            ?: ""
+        }
+    }
 }

app/src/main/java/com/kunzisoft/keepass/model/StreamDirection.kt

@@ -0,0 +1,5 @@
+package com.kunzisoft.keepass.model
+
+enum class StreamDirection {
+    UPLOAD, DOWNLOAD
+}

app/src/main/java/com/kunzisoft/keepass/notifications/AttachmentFileNotificationService.kt

@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.notifications
 
 import android.app.PendingIntent
+import android.content.ContentResolver
 import android.content.Intent
 import android.net.Uri
 import android.os.Binder
@@ -27,53 +28,55 @@ import android.os.IBinder
 import android.util.Log
 import androidx.documentfile.provider.DocumentFile
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.database.BinaryAttachment
 import com.kunzisoft.keepass.model.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachment
-import com.kunzisoft.keepass.tasks.AttachmentFileAsyncTask
+import com.kunzisoft.keepass.model.EntryAttachmentState
+import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.stream.readBytes
+import com.kunzisoft.keepass.timeout.TimeoutHelper
+import com.kunzisoft.keepass.utils.UriUtil
+import kotlinx.coroutines.*
+import java.io.BufferedInputStream
 import java.util.*
-import kotlin.collections.HashMap
+import java.util.concurrent.CopyOnWriteArrayList
 
 
 class AttachmentFileNotificationService: LockNotificationService() {
 
     override val notificationId: Int = 10000
+    private val attachmentNotificationList = CopyOnWriteArrayList<AttachmentNotification>()
 
     private var mActionTaskBinder = ActionTaskBinder()
     private var mActionTaskListeners = LinkedList<ActionTaskListener>()
 
+    private val mainScope = CoroutineScope(Dispatchers.Main)
+
     inner class ActionTaskBinder: Binder() {
 
         fun getService(): AttachmentFileNotificationService = this@AttachmentFileNotificationService
 
         fun addActionTaskListener(actionTaskListener: ActionTaskListener) {
             mActionTaskListeners.add(actionTaskListener)
-
-            downloadFileUris.forEach(object : (Map.Entry<Uri, AttachmentNotification>) -> Unit {
-                override fun invoke(entry: Map.Entry<Uri, AttachmentNotification>) {
-                    entry.value.attachmentTask?.onUpdate = { uri, attachment, notificationIdAttach ->
-                        newNotification(uri, attachment, notificationIdAttach)
-                        mActionTaskListeners.forEach { actionListener ->
-                            actionListener.onAttachmentProgress(entry.key, attachment)
-                        }
-                    }
-                }
-            })
-
         }
 
         fun removeActionTaskListener(actionTaskListener: ActionTaskListener) {
-            downloadFileUris.forEach(object : (Map.Entry<Uri, AttachmentNotification>) -> Unit {
-                override fun invoke(entry: Map.Entry<Uri, AttachmentNotification>) {
-                    entry.value.attachmentTask?.onUpdate = null
-                }
-            })
-
             mActionTaskListeners.remove(actionTaskListener)
         }
     }
 
+    private val attachmentFileActionListener = object: AttachmentFileAction.AttachmentFileActionListener {
+        override fun onUpdate(attachmentNotification: AttachmentNotification) {
+            newNotification(attachmentNotification)
+            mActionTaskListeners.forEach { actionListener ->
+                actionListener.onAttachmentAction(attachmentNotification.uri,
+                        attachmentNotification.entryAttachmentState)
+            }
+        }
+    }
+
     interface ActionTaskListener {
-        fun onAttachmentProgress(fileUri: Uri, attachment: EntryAttachment)
+        fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState)
     }
 
     override fun onBind(intent: Intent): IBinder? {
@@ -83,46 +86,36 @@ class AttachmentFileNotificationService: LockNotificationService() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
 
-        val downloadFileUri: Uri? = if (intent?.hasExtra(DOWNLOAD_FILE_URI_KEY) == true) {
-            intent.getParcelableExtra(DOWNLOAD_FILE_URI_KEY)
+        val downloadFileUri: Uri? = if (intent?.hasExtra(FILE_URI_KEY) == true) {
+            intent.getParcelableExtra(FILE_URI_KEY)
         } else null
 
         when(intent?.action) {
+            ACTION_ATTACHMENT_FILE_START_UPLOAD -> {
+                actionUploadOrDownload(downloadFileUri,
+                        intent,
+                        StreamDirection.UPLOAD)
+            }
             ACTION_ATTACHMENT_FILE_START_DOWNLOAD -> {
-                if (downloadFileUri != null
-                        && intent.hasExtra(ATTACHMENT_KEY)) {
-
-                    val nextNotificationId = (downloadFileUris.values.maxBy { it.notificationId }
-                            ?.notificationId ?: notificationId) + 1
-
-                    try {
-                        intent.getParcelableExtra<EntryAttachment>(ATTACHMENT_KEY)?.let { entryAttachment ->
-                            val attachmentNotification = AttachmentNotification(nextNotificationId, entryAttachment)
-                            downloadFileUris[downloadFileUri] = attachmentNotification
-                            AttachmentFileAsyncTask(downloadFileUri,
-                                    attachmentNotification,
-                                    contentResolver).apply {
-                                onUpdate = { uri, attachment, notificationIdAttach ->
-                                    newNotification(uri, attachment, notificationIdAttach)
-                                    mActionTaskListeners.forEach { actionListener ->
-                                        actionListener.onAttachmentProgress(downloadFileUri, attachment)
-                                    }
-                                }
-                            }.execute()
-                        }
-                    } catch (e: Exception) {
-                        Log.e(TAG, "Unable to download $downloadFileUri", e)
+                actionUploadOrDownload(downloadFileUri,
+                        intent,
+                        StreamDirection.DOWNLOAD)
+            }
+            ACTION_ATTACHMENT_REMOVE -> {
+                intent.getParcelableExtra<Attachment>(ATTACHMENT_KEY)?.let { entryAttachment ->
+                    attachmentNotificationList.firstOrNull { it.entryAttachmentState.attachment == entryAttachment }?.let { elementToRemove ->
+                        attachmentNotificationList.remove(elementToRemove)
                     }
                 }
             }
             else -> {
                 if (downloadFileUri != null) {
-                    downloadFileUris[downloadFileUri]?.notificationId?.let {
-                        notificationManager?.cancel(it)
-                        downloadFileUris.remove(downloadFileUri)
+                    attachmentNotificationList.firstOrNull { it.uri == downloadFileUri }?.let { elementToRemove ->
+                        notificationManager?.cancel(elementToRemove.notificationId)
+                        attachmentNotificationList.remove(elementToRemove)
                     }
                 }
-                if (downloadFileUris.isEmpty()) {
+                if (attachmentNotificationList.isEmpty()) {
                     stopSelf()
                 }
             }
@@ -131,25 +124,35 @@ class AttachmentFileNotificationService: LockNotificationService() {
         return START_REDELIVER_INTENT
     }
 
+    @Synchronized
     fun checkCurrentAttachmentProgress() {
-        downloadFileUris.forEach(object : (Map.Entry<Uri, AttachmentNotification>) -> Unit {
-            override fun invoke(entry: Map.Entry<Uri, AttachmentNotification>) {
-                mActionTaskListeners.forEach { actionListener ->
-                    actionListener.onAttachmentProgress(entry.key, entry.value.entryAttachment)
-                }
+        attachmentNotificationList.forEach { attachmentNotification ->
+            mActionTaskListeners.forEach { actionListener ->
+                actionListener.onAttachmentAction(
+                        attachmentNotification.uri,
+                        attachmentNotification.entryAttachmentState
+                )
             }
-        })
+        }
     }
 
-    private fun newNotification(downloadFileUri: Uri,
-                                entryAttachment: EntryAttachment,
-                                notificationIdAttachment: Int) {
+    @Synchronized
+    fun removeAttachmentAction(entryAttachment: EntryAttachmentState) {
+        attachmentNotificationList.firstOrNull {
+            it.entryAttachmentState == entryAttachment
+        }?.let {
+            attachmentNotificationList.remove(it)
+        }
+    }
+
+    private fun newNotification(attachmentNotification: AttachmentNotification) {
 
         val pendingContentIntent = PendingIntent.getActivity(this,
                 0,
                 Intent().apply {
                     action = Intent.ACTION_VIEW
-                    setDataAndType(downloadFileUri, contentResolver.getType(downloadFileUri))
+                    setDataAndType(attachmentNotification.uri,
+                            contentResolver.getType(attachmentNotification.uri))
                     addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 }, PendingIntent.FLAG_CANCEL_CURRENT)
 
@@ -157,54 +160,84 @@ class AttachmentFileNotificationService: LockNotificationService() {
                 0,
                 Intent(this, AttachmentFileNotificationService::class.java).apply {
                     // No action to delete the service
-                    putExtra(DOWNLOAD_FILE_URI_KEY, downloadFileUri)
+                    putExtra(FILE_URI_KEY, attachmentNotification.uri)
                 }, PendingIntent.FLAG_CANCEL_CURRENT)
 
-        val fileName = DocumentFile.fromSingleUri(this, downloadFileUri)?.name ?: ""
+        val fileName = DocumentFile.fromSingleUri(this, attachmentNotification.uri)?.name ?: ""
 
         val builder = buildNewNotification().apply {
-            setSmallIcon(R.drawable.ic_file_download_white_24dp)
-            setContentTitle(getString(R.string.download_attachment, fileName))
+            when (attachmentNotification.entryAttachmentState.streamDirection) {
+                StreamDirection.UPLOAD -> {
+                    setSmallIcon(R.drawable.ic_file_upload_white_24dp)
+                    setContentTitle(getString(R.string.upload_attachment, fileName))
+                }
+                StreamDirection.DOWNLOAD -> {
+                    setSmallIcon(R.drawable.ic_file_download_white_24dp)
+                    setContentTitle(getString(R.string.download_attachment, fileName))
+                }
+            }
             setAutoCancel(false)
-            when (entryAttachment.downloadState) {
+            when (attachmentNotification.entryAttachmentState.downloadState) {
                 AttachmentState.NULL, AttachmentState.START -> {
                     setContentText(getString(R.string.download_initialization))
                     setOngoing(true)
                 }
                 AttachmentState.IN_PROGRESS -> {
-                    if (entryAttachment.downloadProgression > 100) {
+                    if (attachmentNotification.entryAttachmentState.downloadProgression > 100) {
                         setContentText(getString(R.string.download_finalization))
                     } else {
-                        setProgress(100, entryAttachment.downloadProgression, false)
-                        setContentText(getString(R.string.download_progression, entryAttachment.downloadProgression))
+                        setProgress(100,
+                                attachmentNotification.entryAttachmentState.downloadProgression,
+                                false)
+                        setContentText(getString(R.string.download_progression,
+                                attachmentNotification.entryAttachmentState.downloadProgression))
                     }
                     setOngoing(true)
                 }
-                AttachmentState.COMPLETE, AttachmentState.ERROR -> {
+                AttachmentState.COMPLETE -> {
                     setContentText(getString(R.string.download_complete))
-                    setContentIntent(pendingContentIntent)
+                    when (attachmentNotification.entryAttachmentState.streamDirection) {
+                        StreamDirection.UPLOAD -> {
+
+                        }
+                        StreamDirection.DOWNLOAD -> {
+                            setContentIntent(pendingContentIntent)
+                        }
+                    }
                     setDeleteIntent(pendingDeleteIntent)
                     setOngoing(false)
                 }
+                AttachmentState.ERROR -> {
+                    setContentText(getString(R.string.error_file_not_create))
+                    setOngoing(false)
+                }
+            }
+        }
+        when (attachmentNotification.entryAttachmentState.downloadState) {
+            AttachmentState.ERROR,
+            AttachmentState.COMPLETE -> {
+                stopForeground(false)
+                notificationManager?.notify(attachmentNotification.notificationId, builder.build())
+            } else -> {
+                startForeground(attachmentNotification.notificationId, builder.build())
             }
         }
-        notificationManager?.notify(notificationIdAttachment, builder.build())
     }
 
     override fun onDestroy() {
-        downloadFileUris.forEach(object : (Map.Entry<Uri, AttachmentNotification>) -> Unit {
-            override fun invoke(entry: Map.Entry<Uri, AttachmentNotification>) {
-                entry.value.attachmentTask?.onUpdate = null
-                notificationManager?.cancel(entry.value.notificationId)
-            }
-        })
+        attachmentNotificationList.forEach { attachmentNotification ->
+            attachmentNotification.attachmentFileAction?.listener = null
+            notificationManager?.cancel(attachmentNotification.notificationId)
+        }
+        attachmentNotificationList.clear()
 
         super.onDestroy()
     }
 
-    data class AttachmentNotification(var notificationId: Int,
-                                      var entryAttachment: EntryAttachment,
-                                      var attachmentTask: AttachmentFileAsyncTask? = null) {
+    private data class AttachmentNotification(var uri: Uri,
+                                              var notificationId: Int,
+                                              var entryAttachmentState: EntryAttachmentState,
+                                              var attachmentFileAction: AttachmentFileAction? = null) {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -221,15 +254,188 @@ class AttachmentFileNotificationService: LockNotificationService() {
         }
     }
 
+    private fun actionUploadOrDownload(downloadFileUri: Uri?,
+                                       intent: Intent,
+                                       streamDirection: StreamDirection) {
+        if (downloadFileUri != null
+                && intent.hasExtra(ATTACHMENT_KEY)) {
+            try {
+                intent.getParcelableExtra<Attachment>(ATTACHMENT_KEY)?.let { entryAttachment ->
+
+                    val nextNotificationId = (attachmentNotificationList.maxByOrNull { it.notificationId }
+                            ?.notificationId ?: notificationId) + 1
+                    val entryAttachmentState = EntryAttachmentState(entryAttachment, streamDirection)
+                    val attachmentNotification = AttachmentNotification(downloadFileUri, nextNotificationId, entryAttachmentState)
+
+                    // Add action to the list on start
+                    attachmentNotificationList.add(attachmentNotification)
+
+                    mainScope.launch {
+                        AttachmentFileAction(attachmentNotification,
+                                contentResolver).apply {
+                            listener = attachmentFileActionListener
+                        }.executeAction()
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to upload/download $downloadFileUri", e)
+            }
+        }
+    }
+
+    private class AttachmentFileAction(
+            private val attachmentNotification: AttachmentNotification,
+            private val contentResolver: ContentResolver) {
+
+        private val updateMinFrequency = 1000
+        private var previousSaveTime = System.currentTimeMillis()
+        var listener: AttachmentFileActionListener? = null
+
+        interface AttachmentFileActionListener {
+            fun onUpdate(attachmentNotification: AttachmentNotification)
+        }
+
+        suspend fun executeAction() {
+
+            // on pre execute
+            CoroutineScope(Dispatchers.Main).launch {
+                TimeoutHelper.temporarilyDisableTimeout()
+
+                attachmentNotification.attachmentFileAction = this@AttachmentFileAction
+                attachmentNotification.entryAttachmentState.apply {
+                    downloadState = AttachmentState.START
+                    downloadProgression = 0
+                }
+                listener?.onUpdate(attachmentNotification)
+            }
+
+            withContext(Dispatchers.IO) {
+                // on Progress with thread
+                val asyncResult: Deferred<Boolean> = async {
+                    var progressResult = true
+                    try {
+                        attachmentNotification.entryAttachmentState.apply {
+                            downloadState = AttachmentState.IN_PROGRESS
+
+                            when (streamDirection) {
+                                StreamDirection.UPLOAD -> {
+                                    uploadToDatabase(
+                                            attachmentNotification.uri,
+                                            attachment.binaryAttachment,
+                                            contentResolver, 1024) { percent ->
+                                        publishProgress(percent)
+                                    }
+                                }
+                                StreamDirection.DOWNLOAD -> {
+                                    downloadFromDatabase(
+                                            attachmentNotification.uri,
+                                            attachment.binaryAttachment,
+                                            contentResolver, 1024) { percent ->
+                                        publishProgress(percent)
+                                    }
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Unable to upload or download file", e)
+                        progressResult = false
+                    }
+                    progressResult
+                }
+
+                // on post execute
+                withContext(Dispatchers.Main) {
+                    val result = asyncResult.await()
+                    attachmentNotification.attachmentFileAction = null
+                    attachmentNotification.entryAttachmentState.apply {
+                        downloadState = if (result) AttachmentState.COMPLETE else AttachmentState.ERROR
+                        downloadProgression = 100
+                    }
+                    listener?.onUpdate(attachmentNotification)
+                    TimeoutHelper.releaseTemporarilyDisableTimeout()
+                }
+
+            }
+        }
+
+        fun downloadFromDatabase(attachmentToUploadUri: Uri,
+                                 binaryAttachment: BinaryAttachment,
+                                 contentResolver: ContentResolver,
+                                 bufferSize: Int = DEFAULT_BUFFER_SIZE,
+                                 update: ((percent: Int)->Unit)? = null) {
+            var dataDownloaded = 0L
+            val fileSize = binaryAttachment.length()
+            UriUtil.getUriOutputStream(contentResolver, attachmentToUploadUri)?.use { outputStream ->
+                binaryAttachment.getUnGzipInputDataStream().use { inputStream ->
+                    inputStream.readBytes(bufferSize) { buffer ->
+                        outputStream.write(buffer)
+                        dataDownloaded += buffer.size
+                        try {
+                            val percentDownload = (100 * dataDownloaded / fileSize).toInt()
+                            update?.invoke(percentDownload)
+                        } catch (e: Exception) {
+                            Log.e(TAG, "", e)
+                        }
+                    }
+                }
+            }
+        }
+
+        fun uploadToDatabase(attachmentFromDownloadUri: Uri,
+                             binaryAttachment: BinaryAttachment,
+                             contentResolver: ContentResolver,
+                             bufferSize: Int = DEFAULT_BUFFER_SIZE,
+                             update: ((percent: Int)->Unit)? = null) {
+            var dataUploaded = 0L
+            val fileSize = contentResolver.openFileDescriptor(attachmentFromDownloadUri, "r")?.statSize ?: 0
+            UriUtil.getUriInputStream(contentResolver, attachmentFromDownloadUri)?.let { inputStream ->
+                binaryAttachment.getGzipOutputDataStream().use { outputStream ->
+                    BufferedInputStream(inputStream).use { attachmentBufferedInputStream ->
+                        attachmentBufferedInputStream.readBytes(bufferSize) { buffer ->
+                            outputStream.write(buffer)
+                            dataUploaded += buffer.size
+                            try {
+                                val percentDownload = (100 * dataUploaded / fileSize).toInt()
+                                update?.invoke(percentDownload)
+                            } catch (e: Exception) {
+                                Log.e(TAG, "", e)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private fun publishProgress(percent: Int) {
+            // Publish progress
+            val currentTime = System.currentTimeMillis()
+            if (previousSaveTime + updateMinFrequency < currentTime) {
+                attachmentNotification.entryAttachmentState.apply {
+                    downloadState = AttachmentState.IN_PROGRESS
+                    downloadProgression = percent
+                }
+                CoroutineScope(Dispatchers.Main).launch {
+                    listener?.onUpdate(attachmentNotification)
+                    Log.d(TAG, "Download file ${attachmentNotification.uri} : $percent%")
+                }
+                previousSaveTime = currentTime
+            }
+        }
+
+        companion object {
+            private val TAG = AttachmentFileAction::class.java.name
+        }
+    }
+
     companion object {
         private val TAG = AttachmentFileNotificationService::javaClass.name
 
+        const val ACTION_ATTACHMENT_FILE_START_UPLOAD = "ACTION_ATTACHMENT_FILE_START_UPLOAD"
         const val ACTION_ATTACHMENT_FILE_START_DOWNLOAD = "ACTION_ATTACHMENT_FILE_START_DOWNLOAD"
+        const val ACTION_ATTACHMENT_REMOVE = "ACTION_ATTACHMENT_REMOVE"
 
-        const val DOWNLOAD_FILE_URI_KEY = "DOWNLOAD_FILE_URI_KEY"
+        const val FILE_URI_KEY = "FILE_URI_KEY"
         const val ATTACHMENT_KEY = "ATTACHMENT_KEY"
-
-        private val downloadFileUris = HashMap<Uri, AttachmentNotification>()
     }
 
 }

app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseOpenNotificationService.kt

@@ -1,109 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.notifications
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.GroupActivity
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.LOCK_ACTION
-import com.kunzisoft.keepass.utils.closeDatabase
-
-class DatabaseOpenNotificationService: LockNotificationService() {
-
-    override val notificationId: Int = 340
-
-    private fun stopNotificationAndSendLock() {
-        // Send lock action
-        sendBroadcast(Intent(LOCK_ACTION))
-    }
-
-    override fun actionOnLock() {
-        closeDatabase()
-        // Remove the lock timer (no more needed if it exists)
-        TimeoutHelper.cancelLockTimer(this)
-        // Service is stopped after receive the broadcast
-        super.actionOnLock()
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
-
-        when(intent?.action) {
-            ACTION_CLOSE_DATABASE -> {
-                stopNotificationAndSendLock()
-            }
-            else -> {
-                val databaseIntent = Intent(this, GroupActivity::class.java)
-                var pendingDatabaseFlag = 0
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    pendingDatabaseFlag = PendingIntent.FLAG_IMMUTABLE
-                }
-                val pendingDatabaseIntent = PendingIntent.getActivity(this, 0, databaseIntent, pendingDatabaseFlag)
-                val deleteIntent = Intent(this, DatabaseOpenNotificationService::class.java).apply {
-                    action = ACTION_CLOSE_DATABASE
-                }
-                val pendingDeleteIntent = PendingIntent.getService(this, 0, deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-                val database = Database.getInstance()
-                if (database.loaded) {
-                    startForeground(notificationId, buildNewNotification().apply {
-                        setSmallIcon(R.drawable.notification_ic_database_open)
-                        setContentTitle(getString(R.string.database_opened))
-                        setContentText(database.name + " (" + database.version + ")")
-                        setAutoCancel(false)
-                        setContentIntent(pendingDatabaseIntent)
-                        // Unfortunately swipe is disabled in lollipop+
-                        setDeleteIntent(pendingDeleteIntent)
-                        addAction(R.drawable.ic_lock_white_24dp, getString(R.string.lock),
-                                pendingDeleteIntent)
-                    }.build())
-                } else {
-                    stopSelf()
-                }
-            }
-        }
-
-        return START_STICKY
-    }
-
-    companion object {
-        const val ACTION_CLOSE_DATABASE = "ACTION_CLOSE_DATABASE"
-
-        fun start(context: Context) {
-            // Start the opening notification, keep it active to receive lock
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                context.startForegroundService(Intent(context, DatabaseOpenNotificationService::class.java))
-            } else {
-                context.startService(Intent(context, DatabaseOpenNotificationService::class.java))
-            }
-        }
-
-        fun stop(context: Context) {
-            // Stop the opening notification
-            context.stopService(Intent(context, DatabaseOpenNotificationService::class.java))
-        }
-    }
-
-}

app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt

@@ -19,12 +19,15 @@
  */
 package com.kunzisoft.keepass.notifications
 
+import android.app.PendingIntent
 import android.content.Intent
 import android.net.Uri
 import android.os.Binder
+import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.GroupActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.database.action.*
 import com.kunzisoft.keepass.database.action.history.DeleteEntryHistoryDatabaseRunnable
@@ -42,22 +45,28 @@ import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.DATABASE_START_TASK_ACTION
 import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
+import com.kunzisoft.keepass.utils.LOCK_ACTION
+import com.kunzisoft.keepass.utils.closeDatabase
 import kotlinx.coroutines.*
 import java.util.*
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.collections.ArrayList
 
-class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdater {
+open class DatabaseTaskNotificationService : LockNotificationService(), ProgressTaskUpdater {
 
     override val notificationId: Int = 575
 
+    private lateinit var mDatabase: Database
+
     private val mainScope = CoroutineScope(Dispatchers.Main)
 
     private var mActionTaskBinder = ActionTaskBinder()
     private var mActionTaskListeners = LinkedList<ActionTaskListener>()
     private var mAllowFinishAction = AtomicBoolean()
+    private var mActionRunning = false
 
-    private var mTitleId: Int? = null
+    private var mIconId: Int = R.drawable.notification_ic_database_load
+    private var mTitleId: Int = R.string.database_opened
     private var mMessageId: Int? = null
     private var mWarningId: Int? = null
 
@@ -66,8 +75,8 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         fun getService(): DatabaseTaskNotificationService = this@DatabaseTaskNotificationService
 
         fun addActionTaskListener(actionTaskListener: ActionTaskListener) {
-            mActionTaskListeners.add(actionTaskListener)
             mAllowFinishAction.set(true)
+            mActionTaskListeners.add(actionTaskListener)
         }
 
         fun removeActionTaskListener(actionTaskListener: ActionTaskListener) {
@@ -84,50 +93,41 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         fun onStopAction(actionTask: String, result: ActionRunnable.Result)
     }
 
+    /**
+     * Force to call [ActionTaskListener.onStartAction] if the action is still running
+     */
     fun checkAction() {
-        mActionTaskListeners.forEach { actionTaskListener ->
-            actionTaskListener.onStartAction(mTitleId, mMessageId, mWarningId)
+        if (mActionRunning) {
+            mActionTaskListeners.forEach { actionTaskListener ->
+                actionTaskListener.onStartAction(mTitleId, mMessageId, mWarningId)
+            }
         }
     }
 
     override fun onBind(intent: Intent): IBinder? {
+        super.onBind(intent)
         return mActionTaskBinder
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
 
-        if (intent == null) return START_REDELIVER_INTENT
+        mDatabase = Database.getInstance()
 
-        val intentAction = intent.action
+        // Create the notification
+        buildMessage(intent)
 
-        var saveAction = true
-        if (intent.hasExtra(SAVE_DATABASE_KEY)) {
-            saveAction = intent.getBooleanExtra(SAVE_DATABASE_KEY, saveAction)
+        val intentAction = intent?.action
+
+        if (intentAction == null && !mDatabase.loaded) {
+            stopSelf()
+        }
+        if (intentAction == ACTION_DATABASE_CLOSE) {
+            // Send lock action
+            sendBroadcast(Intent(LOCK_ACTION))
         }
 
-        val titleId: Int = when (intentAction) {
-            ACTION_DATABASE_CREATE_TASK -> R.string.creating_database
-            ACTION_DATABASE_LOAD_TASK -> R.string.loading_database
-            else -> {
-                if (saveAction)
-                    R.string.saving_database
-                else
-                    R.string.command_execution
-            }
-        }
-        val messageId: Int? = when (intentAction) {
-            ACTION_DATABASE_LOAD_TASK -> null
-            else -> null
-        }
-        val warningId: Int? =
-                if (!saveAction
-                        || intentAction == ACTION_DATABASE_LOAD_TASK)
-                    null
-                else
-                    R.string.do_not_kill_app
-
-        val actionRunnable: ActionRunnable? = when (intentAction) {
+        val actionRunnable: ActionRunnable? =  when (intentAction) {
             ACTION_DATABASE_CREATE_TASK -> buildDatabaseCreateActionTask(intent)
             ACTION_DATABASE_LOAD_TASK -> buildDatabaseLoadActionTask(intent)
             ACTION_DATABASE_ASSIGN_PASSWORD_TASK -> buildDatabaseAssignPasswordActionTask(intent)
@@ -141,6 +141,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
             ACTION_DATABASE_RESTORE_ENTRY_HISTORY -> buildDatabaseRestoreEntryHistoryActionTask(intent)
             ACTION_DATABASE_DELETE_ENTRY_HISTORY -> buildDatabaseDeleteEntryHistoryActionTask(intent)
             ACTION_DATABASE_UPDATE_COMPRESSION_TASK -> buildDatabaseUpdateCompressionActionTask(intent)
+            ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK -> buildDatabaseRemoveUnlinkedDataActionTask(intent)
             ACTION_DATABASE_UPDATE_NAME_TASK,
             ACTION_DATABASE_UPDATE_DESCRIPTION_TASK,
             ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK,
@@ -156,47 +157,179 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
             else -> null
         }
 
-        actionRunnable?.let { actionRunnableNotNull ->
-            // Assign elements for updates
-            mTitleId = titleId
-            mMessageId = messageId
-            mWarningId = warningId
-
-            // Create the notification
-            newNotification(intent.getIntExtra(DATABASE_TASK_TITLE_KEY, titleId))
-
-            // Build and launch the action
+        // Build and launch the action
+        if (actionRunnable != null) {
             mainScope.launch {
                 executeAction(this@DatabaseTaskNotificationService,
                         {
+                            mActionRunning = true
+
                             sendBroadcast(Intent(DATABASE_START_TASK_ACTION).apply {
-                                putExtra(DATABASE_TASK_TITLE_KEY, titleId)
-                                putExtra(DATABASE_TASK_MESSAGE_KEY, messageId)
-                                putExtra(DATABASE_TASK_WARNING_KEY, warningId)
+                                putExtra(DATABASE_TASK_TITLE_KEY, mTitleId)
+                                putExtra(DATABASE_TASK_MESSAGE_KEY, mMessageId)
+                                putExtra(DATABASE_TASK_WARNING_KEY, mWarningId)
                             })
 
                             mActionTaskListeners.forEach { actionTaskListener ->
-                                actionTaskListener.onStartAction(titleId, messageId, warningId)
+                                actionTaskListener.onStartAction(mTitleId, mMessageId, mWarningId)
                             }
 
                         },
                         {
-                            actionRunnableNotNull
+                            actionRunnable
                         },
                         { result ->
-                            mActionTaskListeners.forEach { actionTaskListener ->
-                                actionTaskListener.onStopAction(intentAction!!, result)
+                            try {
+                                mActionTaskListeners.forEach { actionTaskListener ->
+                                    actionTaskListener.onStopAction(intentAction!!, result)
+                                }
+                            } finally {
+                                removeIntentData(intent)
+                                TimeoutHelper.releaseTemporarilyDisableTimeout()
+                                if (TimeoutHelper.checkTimeAndLockIfTimeout(this@DatabaseTaskNotificationService)) {
+                                    if (!mDatabase.loaded) {
+                                        stopSelf()
+                                    } else {
+                                        // Restart the service to open lock notification
+                                        startService(Intent(applicationContext,
+                                                DatabaseTaskNotificationService::class.java))
+                                    }
+                                }
                             }
 
                             sendBroadcast(Intent(DATABASE_STOP_TASK_ACTION))
 
-                            stopSelf()
+                            mActionRunning = false
                         }
                 )
             }
         }
 
-        return START_REDELIVER_INTENT
+        return when (intentAction) {
+            ACTION_DATABASE_LOAD_TASK, null -> {
+                START_STICKY
+            }
+            else -> {
+                // Relaunch action if failed
+                START_REDELIVER_INTENT
+            }
+        }
+    }
+
+    private fun buildMessage(intent: Intent?) {
+        // Assign elements for updates
+        val intentAction = intent?.action
+
+        var saveAction = false
+        if (intent != null && intent.hasExtra(SAVE_DATABASE_KEY)) {
+            saveAction = intent.getBooleanExtra(SAVE_DATABASE_KEY, saveAction)
+        }
+
+        mIconId = if (intentAction == null)
+            R.drawable.notification_ic_database_open
+        else
+            R.drawable.notification_ic_database_load
+
+        mTitleId = when {
+            saveAction -> {
+                R.string.saving_database
+            }
+            intentAction == null -> {
+                R.string.database_opened
+            }
+            else -> {
+                when (intentAction) {
+                    ACTION_DATABASE_CREATE_TASK -> R.string.creating_database
+                    ACTION_DATABASE_LOAD_TASK -> R.string.loading_database
+                    ACTION_DATABASE_SAVE -> R.string.saving_database
+                    else -> {
+                        R.string.command_execution
+                    }
+                }
+            }
+        }
+
+        mMessageId = when (intentAction) {
+            ACTION_DATABASE_LOAD_TASK -> null
+            else -> null
+        }
+
+        mWarningId =
+                if (!saveAction
+                        || intentAction == ACTION_DATABASE_LOAD_TASK)
+                    null
+                else
+                    R.string.do_not_kill_app
+
+        val notificationBuilder =  buildNewNotification().apply {
+            setSmallIcon(mIconId)
+            intent?.let {
+                setContentTitle(getString(intent.getIntExtra(DATABASE_TASK_TITLE_KEY, mTitleId)))
+            }
+            setAutoCancel(false)
+            setContentIntent(null)
+        }
+
+        if (intentAction == null) {
+            // Database is normally open
+            if (mDatabase.loaded) {
+                // Build Intents for notification action
+                var pendingDatabaseFlag = 0
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    pendingDatabaseFlag = PendingIntent.FLAG_IMMUTABLE
+                }
+                val pendingDatabaseIntent = PendingIntent.getActivity(this,
+                        0,
+                        Intent(this, GroupActivity::class.java),
+                        pendingDatabaseFlag)
+                val deleteIntent = Intent(this, DatabaseTaskNotificationService::class.java).apply {
+                    action = ACTION_DATABASE_CLOSE
+                }
+                val pendingDeleteIntent = PendingIntent.getService(this, 0, deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+                // Add actions in notifications
+                notificationBuilder.apply {
+                    setContentText(mDatabase.name + " (" + mDatabase.version + ")")
+                    setContentIntent(pendingDatabaseIntent)
+                    // Unfortunately swipe is disabled in lollipop+
+                    setDeleteIntent(pendingDeleteIntent)
+                    addAction(R.drawable.ic_lock_white_24dp, getString(R.string.lock),
+                            pendingDeleteIntent)
+                }
+            }
+        }
+
+        // Create the notification
+        startForeground(notificationId, notificationBuilder.build())
+    }
+
+    private fun removeIntentData(intent: Intent?) {
+        intent?.action = null
+
+        intent?.removeExtra(DATABASE_TASK_TITLE_KEY)
+        intent?.removeExtra(DATABASE_TASK_MESSAGE_KEY)
+        intent?.removeExtra(DATABASE_TASK_WARNING_KEY)
+
+        intent?.removeExtra(DATABASE_URI_KEY)
+        intent?.removeExtra(MASTER_PASSWORD_CHECKED_KEY)
+        intent?.removeExtra(MASTER_PASSWORD_KEY)
+        intent?.removeExtra(KEY_FILE_CHECKED_KEY)
+        intent?.removeExtra(KEY_FILE_URI_KEY)
+        intent?.removeExtra(READ_ONLY_KEY)
+        intent?.removeExtra(CIPHER_ENTITY_KEY)
+        intent?.removeExtra(FIX_DUPLICATE_UUID_KEY)
+        intent?.removeExtra(GROUP_KEY)
+        intent?.removeExtra(ENTRY_KEY)
+        intent?.removeExtra(GROUP_ID_KEY)
+        intent?.removeExtra(ENTRY_ID_KEY)
+        intent?.removeExtra(GROUPS_ID_KEY)
+        intent?.removeExtra(ENTRIES_ID_KEY)
+        intent?.removeExtra(PARENT_ID_KEY)
+        intent?.removeExtra(ENTRY_HISTORY_POSITION_KEY)
+        intent?.removeExtra(SAVE_DATABASE_KEY)
+        intent?.removeExtra(OLD_NODES_KEY)
+        intent?.removeExtra(NEW_NODES_KEY)
+        intent?.removeExtra(OLD_ELEMENT_KEY)
+        intent?.removeExtra(NEW_ELEMENT_KEY)
     }
 
     /**
@@ -208,8 +341,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                                      onPostExecute: (result: ActionRunnable.Result) -> Unit) {
         mAllowFinishAction.set(false)
 
-        // Stop the opening notification
-        DatabaseOpenNotificationService.stop(this)
         TimeoutHelper.temporarilyDisableTimeout()
         onPreExecute.invoke()
         withContext(Dispatchers.IO) {
@@ -229,26 +360,11 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 }
                 withContext(Dispatchers.Main) {
                     onPostExecute.invoke(asyncResult.await())
-                    TimeoutHelper.releaseTemporarilyDisableTimeout()
-                    // Start the opening notification
-                    if (TimeoutHelper.checkTimeAndLockIfTimeout(this@DatabaseTaskNotificationService)) {
-                        DatabaseOpenNotificationService.start(this@DatabaseTaskNotificationService)
-                    }
                 }
             }
         }
     }
 
-    private fun newNotification(title: Int) {
-
-        val builder = buildNewNotification()
-                .setSmallIcon(R.drawable.notification_ic_database_load)
-                .setContentTitle(getString(title))
-                .setAutoCancel(false)
-                .setContentIntent(null)
-        startForeground(notificationId, builder.build())
-    }
-
     override fun updateMessage(resId: Int) {
         mMessageId = resId
         mActionTaskListeners.forEach { actionTaskListener ->
@@ -256,22 +372,32 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         }
     }
 
+    override fun actionOnLock() {
+        if (!TimeoutHelper.temporarilyDisableTimeout) {
+            closeDatabase()
+            // Remove the lock timer (no more needed if it exists)
+            TimeoutHelper.cancelLockTimer(this)
+            // Service is stopped after receive the broadcast
+            super.actionOnLock()
+        }
+    }
+
     private fun buildDatabaseCreateActionTask(intent: Intent): ActionRunnable? {
 
         if (intent.hasExtra(DATABASE_URI_KEY)
                 && intent.hasExtra(MASTER_PASSWORD_CHECKED_KEY)
                 && intent.hasExtra(MASTER_PASSWORD_KEY)
                 && intent.hasExtra(KEY_FILE_CHECKED_KEY)
-                && intent.hasExtra(KEY_FILE_KEY)
+                && intent.hasExtra(KEY_FILE_URI_KEY)
         ) {
             val databaseUri: Uri? = intent.getParcelableExtra(DATABASE_URI_KEY)
-            val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_KEY)
+            val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_URI_KEY)
 
             if (databaseUri == null)
                 return null
 
             return CreateDatabaseRunnable(this,
-                    Database.getInstance(),
+                    mDatabase,
                     databaseUri,
                     getString(R.string.database_default_name),
                     getString(R.string.database),
@@ -279,7 +405,12 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     intent.getStringExtra(MASTER_PASSWORD_KEY),
                     intent.getBooleanExtra(KEY_FILE_CHECKED_KEY, false),
                     keyFileUri
-            )
+            ) { result ->
+                result.data = Bundle().apply {
+                    putParcelable(DATABASE_URI_KEY, databaseUri)
+                    putParcelable(KEY_FILE_URI_KEY, keyFileUri)
+                }
+            }
         } else {
             return null
         }
@@ -289,15 +420,14 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
 
         if (intent.hasExtra(DATABASE_URI_KEY)
                 && intent.hasExtra(MASTER_PASSWORD_KEY)
-                && intent.hasExtra(KEY_FILE_KEY)
+                && intent.hasExtra(KEY_FILE_URI_KEY)
                 && intent.hasExtra(READ_ONLY_KEY)
                 && intent.hasExtra(CIPHER_ENTITY_KEY)
                 && intent.hasExtra(FIX_DUPLICATE_UUID_KEY)
         ) {
-            val database = Database.getInstance()
             val databaseUri: Uri? = intent.getParcelableExtra(DATABASE_URI_KEY)
             val masterPassword: String? = intent.getStringExtra(MASTER_PASSWORD_KEY)
-            val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_KEY)
+            val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_URI_KEY)
             val readOnly: Boolean = intent.getBooleanExtra(READ_ONLY_KEY, true)
             val cipherEntity: CipherDatabaseEntity? = intent.getParcelableExtra(CIPHER_ENTITY_KEY)
 
@@ -306,7 +436,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
 
             return LoadDatabaseRunnable(
                     this,
-                    database,
+                    mDatabase,
                     databaseUri,
                     masterPassword,
                     keyFileUri,
@@ -319,7 +449,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 result.data = Bundle().apply {
                     putParcelable(DATABASE_URI_KEY, databaseUri)
                     putString(MASTER_PASSWORD_KEY, masterPassword)
-                    putParcelable(KEY_FILE_KEY, keyFileUri)
+                    putParcelable(KEY_FILE_URI_KEY, keyFileUri)
                     putBoolean(READ_ONLY_KEY, readOnly)
                     putParcelable(CIPHER_ENTITY_KEY, cipherEntity)
                 }
@@ -334,16 +464,16 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(MASTER_PASSWORD_CHECKED_KEY)
                 && intent.hasExtra(MASTER_PASSWORD_KEY)
                 && intent.hasExtra(KEY_FILE_CHECKED_KEY)
-                && intent.hasExtra(KEY_FILE_KEY)
+                && intent.hasExtra(KEY_FILE_URI_KEY)
         ) {
             val databaseUri: Uri = intent.getParcelableExtra(DATABASE_URI_KEY) ?: return null
             AssignPasswordInDatabaseRunnable(this,
-                    Database.getInstance(),
+                    mDatabase,
                     databaseUri,
                     intent.getBooleanExtra(MASTER_PASSWORD_CHECKED_KEY, false),
                     intent.getStringExtra(MASTER_PASSWORD_KEY),
                     intent.getBooleanExtra(KEY_FILE_CHECKED_KEY, false),
-                    intent.getParcelableExtra(KEY_FILE_KEY)
+                    intent.getParcelableExtra(KEY_FILE_URI_KEY)
             )
         } else {
             null
@@ -365,7 +495,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(PARENT_ID_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val parentId: NodeId<*>? = intent.getParcelableExtra(PARENT_ID_KEY)
             val newGroup: Group? = intent.getParcelableExtra(GROUP_KEY)
 
@@ -373,9 +502,9 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     || newGroup == null)
                 return null
 
-            database.getGroupById(parentId)?.let { parent ->
+            mDatabase.getGroupById(parentId)?.let { parent ->
                 AddGroupRunnable(this,
-                        database,
+                        mDatabase,
                         newGroup,
                         parent,
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
@@ -391,7 +520,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(GROUP_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val groupId: NodeId<*>? = intent.getParcelableExtra(GROUP_ID_KEY)
             val newGroup: Group? = intent.getParcelableExtra(GROUP_KEY)
 
@@ -399,9 +527,9 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     || newGroup == null)
                 return null
 
-            database.getGroupById(groupId)?.let { oldGroup ->
+            mDatabase.getGroupById(groupId)?.let { oldGroup ->
                 UpdateGroupRunnable(this,
-                        database,
+                        mDatabase,
                         oldGroup,
                         newGroup,
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
@@ -417,7 +545,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(PARENT_ID_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val parentId: NodeId<*>? = intent.getParcelableExtra(PARENT_ID_KEY)
             val newEntry: Entry? = intent.getParcelableExtra(ENTRY_KEY)
 
@@ -425,9 +552,9 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     || newEntry == null)
                 return null
 
-            database.getGroupById(parentId)?.let { parent ->
+            mDatabase.getGroupById(parentId)?.let { parent ->
                 AddEntryRunnable(this,
-                        database,
+                        mDatabase,
                         newEntry,
                         parent,
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
@@ -443,7 +570,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(ENTRY_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val entryId: NodeId<UUID>? = intent.getParcelableExtra(ENTRY_ID_KEY)
             val newEntry: Entry? = intent.getParcelableExtra(ENTRY_KEY)
 
@@ -451,9 +577,9 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     || newEntry == null)
                 return null
 
-            database.getEntryById(entryId)?.let { oldEntry ->
+            mDatabase.getEntryById(entryId)?.let { oldEntry ->
                 UpdateEntryRunnable(this,
-                        database,
+                        mDatabase,
                         oldEntry,
                         newEntry,
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
@@ -470,13 +596,12 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(PARENT_ID_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val parentId: NodeId<*> = intent.getParcelableExtra(PARENT_ID_KEY) ?: return null
 
-            database.getGroupById(parentId)?.let { newParent ->
+            mDatabase.getGroupById(parentId)?.let { newParent ->
                 CopyNodesRunnable(this,
-                        database,
-                        getListNodesFromBundle(database, intent.extras!!),
+                        mDatabase,
+                        getListNodesFromBundle(mDatabase, intent.extras!!),
                         newParent,
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
                         AfterActionNodesRunnable())
@@ -492,13 +617,12 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(PARENT_ID_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val parentId: NodeId<*> = intent.getParcelableExtra(PARENT_ID_KEY) ?: return null
 
-            database.getGroupById(parentId)?.let { newParent ->
+            mDatabase.getGroupById(parentId)?.let { newParent ->
                 MoveNodesRunnable(this,
-                        database,
-                        getListNodesFromBundle(database, intent.extras!!),
+                        mDatabase,
+                        getListNodesFromBundle(mDatabase, intent.extras!!),
                         newParent,
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
                         AfterActionNodesRunnable())
@@ -513,10 +637,9 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(ENTRIES_ID_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
                 DeleteNodesRunnable(this,
-                        database,
-                        getListNodesFromBundle(database, intent.extras!!),
+                        mDatabase,
+                        getListNodesFromBundle(mDatabase, intent.extras!!),
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false),
                         AfterActionNodesRunnable())
         } else {
@@ -529,12 +652,11 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(ENTRY_HISTORY_POSITION_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val entryId: NodeId<UUID> = intent.getParcelableExtra(ENTRY_ID_KEY) ?: return null
 
-            database.getEntryById(entryId)?.let { mainEntry ->
+            mDatabase.getEntryById(entryId)?.let { mainEntry ->
                 RestoreEntryHistoryDatabaseRunnable(this,
-                        database,
+                        mDatabase,
                         mainEntry,
                         intent.getIntExtra(ENTRY_HISTORY_POSITION_KEY, -1),
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false))
@@ -549,12 +671,11 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 && intent.hasExtra(ENTRY_HISTORY_POSITION_KEY)
                 && intent.hasExtra(SAVE_DATABASE_KEY)
         ) {
-            val database = Database.getInstance()
             val entryId: NodeId<UUID> = intent.getParcelableExtra(ENTRY_ID_KEY) ?: return null
 
-            database.getEntryById(entryId)?.let { mainEntry ->
+            mDatabase.getEntryById(entryId)?.let { mainEntry ->
                 DeleteEntryHistoryDatabaseRunnable(this,
-                        database,
+                        mDatabase,
                         mainEntry,
                         intent.getIntExtra(ENTRY_HISTORY_POSITION_KEY, -1),
                         intent.getBooleanExtra(SAVE_DATABASE_KEY, false))
@@ -577,7 +698,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                 return null
 
             return UpdateCompressionBinariesDatabaseRunnable(this,
-                    Database.getInstance(),
+                    mDatabase,
                     oldElement,
                     newElement,
                     intent.getBooleanExtra(SAVE_DATABASE_KEY, false)
@@ -591,10 +712,26 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         }
     }
 
+    private fun buildDatabaseRemoveUnlinkedDataActionTask(intent: Intent): ActionRunnable? {
+        return if (intent.hasExtra(SAVE_DATABASE_KEY)) {
+
+            return RemoveUnlinkedDataDatabaseRunnable(this,
+                    mDatabase,
+                    intent.getBooleanExtra(SAVE_DATABASE_KEY, false)
+            ).apply {
+                mAfterSaveDatabase = { result ->
+                    result.data = intent.extras
+                }
+            }
+        } else {
+            null
+        }
+    }
+
     private fun buildDatabaseUpdateElementActionTask(intent: Intent): ActionRunnable? {
         return if (intent.hasExtra(SAVE_DATABASE_KEY)) {
             return SaveDatabaseRunnable(this,
-                    Database.getInstance(),
+                    mDatabase,
                     intent.getBooleanExtra(SAVE_DATABASE_KEY, false)
             ).apply {
                 mAfterSaveDatabase = { result ->
@@ -612,7 +749,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
     private fun buildDatabaseSave(intent: Intent): ActionRunnable? {
         return if (intent.hasExtra(SAVE_DATABASE_KEY)) {
             SaveDatabaseRunnable(this,
-                    Database.getInstance(),
+                    mDatabase,
                     intent.getBooleanExtra(SAVE_DATABASE_KEY, false))
         } else {
             null
@@ -623,10 +760,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
 
         private val TAG = DatabaseTaskNotificationService::class.java.name
 
-        const val DATABASE_TASK_TITLE_KEY = "DATABASE_TASK_TITLE_KEY"
-        const val DATABASE_TASK_MESSAGE_KEY = "DATABASE_TASK_MESSAGE_KEY"
-        const val DATABASE_TASK_WARNING_KEY = "DATABASE_TASK_WARNING_KEY"
-
         const val ACTION_DATABASE_CREATE_TASK = "ACTION_DATABASE_CREATE_TASK"
         const val ACTION_DATABASE_LOAD_TASK = "ACTION_DATABASE_LOAD_TASK"
         const val ACTION_DATABASE_ASSIGN_PASSWORD_TASK = "ACTION_DATABASE_ASSIGN_PASSWORD_TASK"
@@ -644,6 +777,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         const val ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK = "ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK"
         const val ACTION_DATABASE_UPDATE_COLOR_TASK = "ACTION_DATABASE_UPDATE_COLOR_TASK"
         const val ACTION_DATABASE_UPDATE_COMPRESSION_TASK = "ACTION_DATABASE_UPDATE_COMPRESSION_TASK"
+        const val ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK = "ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK"
         const val ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK = "ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK"
         const val ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK = "ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK"
         const val ACTION_DATABASE_UPDATE_ENCRYPTION_TASK = "ACTION_DATABASE_UPDATE_ENCRYPTION_TASK"
@@ -652,12 +786,17 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         const val ACTION_DATABASE_UPDATE_PARALLELISM_TASK = "ACTION_DATABASE_UPDATE_PARALLELISM_TASK"
         const val ACTION_DATABASE_UPDATE_ITERATIONS_TASK = "ACTION_DATABASE_UPDATE_ITERATIONS_TASK"
         const val ACTION_DATABASE_SAVE = "ACTION_DATABASE_SAVE"
+        const val ACTION_DATABASE_CLOSE = "ACTION_DATABASE_CLOSE"
+
+        const val DATABASE_TASK_TITLE_KEY = "DATABASE_TASK_TITLE_KEY"
+        const val DATABASE_TASK_MESSAGE_KEY = "DATABASE_TASK_MESSAGE_KEY"
+        const val DATABASE_TASK_WARNING_KEY = "DATABASE_TASK_WARNING_KEY"
 
         const val DATABASE_URI_KEY = "DATABASE_URI_KEY"
         const val MASTER_PASSWORD_CHECKED_KEY = "MASTER_PASSWORD_CHECKED_KEY"
         const val MASTER_PASSWORD_KEY = "MASTER_PASSWORD_KEY"
         const val KEY_FILE_CHECKED_KEY = "KEY_FILE_CHECKED_KEY"
-        const val KEY_FILE_KEY = "KEY_FILE_KEY"
+        const val KEY_FILE_URI_KEY = "KEY_FILE_URI_KEY"
         const val READ_ONLY_KEY = "READ_ONLY_KEY"
         const val CIPHER_ENTITY_KEY = "CIPHER_ENTITY_KEY"
         const val FIX_DUPLICATE_UUID_KEY = "FIX_DUPLICATE_UUID_KEY"

app/src/main/java/com/kunzisoft/keepass/notifications/LockNotificationService.kt

@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.notifications
 
 import android.content.Intent
+import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.LockReceiver
 import com.kunzisoft.keepass.utils.registerLockReceiver
 import com.kunzisoft.keepass.utils.unregisterLockReceiver

app/src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt

@@ -347,7 +347,7 @@ object OtpEntryFields {
      * Build new generated fields in a new list from [fieldsToParse] in parameter,
      * Remove parameters fields use to generate auto fields
      */
-    fun generateAutoFields(fieldsToParse: MutableList<Field>): MutableList<Field> {
+    fun generateAutoFields(fieldsToParse: List<Field>): MutableList<Field> {
         val newCustomFields: MutableList<Field> = ArrayList(fieldsToParse)
         // Remove parameter fields
         val otpField = Field(OTP_FIELD)