Merge branch 'release/3.3.3'

Currently translated at 100.0% (595 of 595 strings)

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

CHANGELOG

@@ -1,3 +1,44 @@
+KeePassDX(3.3.3)
+ * Fix shared otpauth link if database not open #1274
+ * Ellipsize attachment name #1253
+ * Add a warning to inform about KeyStore usage #1269
+ * Fingerprint unlock no more by default #1273
+ * Tabs to show main and advanced content separately
+ * Fix URL color
+
+KeePassDX(3.3.2)
+ * Merge KeePassDX & KeePassDX Pro #1257
+ * Create new Contributor Pro app
+
+KeePassDX(3.3.1)
+ * Fix Japanese keyboard in search #1248
+ * Better OOM management #256
+ * Fix filters #1249
+ * Fix temp advanced unlocking #1245
+ * Best autofill recognition #1250
+ * Workaround to fill OTP token in multiple fields with Magikeyboard (long press) #1158
+
+KeePassDX(3.3.0)
+ * Quick search and dynamic filters #163 #462 #521
+ * Keep search context #1141
+ * Add searchable groups #905 #1006
+ * Search with regular expression #175
+ * Merge from file and save as copy #1221 #1204 #840
+ * Fix custom data #1236
+ * Fix education hints #1192
+ * Fix save and app instance in selection mode
+ * New UI and fix styles
+ * Add "Simple" and "Reply" themes
+
+KeePassDX(3.2.0)
+ * Manage data merge #840 #977
+ * Manage Tags #633
+ * Inherit colors and icon from template #1213 #1130
+ * Entry colors setting #1207
+ * Setting to keep the screen on when watching the entry #1119
+ * Add path in quick search
+ * Small fixes
+
 KeePassDX(3.1.0)
  * Add breadcrumb
  * Add path in search results #1148

README.md

@@ -43,7 +43,7 @@ Optional visual styles are accessible after a contribution (and a congratulatory
 
 * Add features by making a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
 * Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** KeePassDX to your language (on [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or by sending a [pull request](https://help.github.com/articles/about-pull-requests/)).
-* **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
+* **[Donate](https://www.keepassdx.com/#donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
 * Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePassDX.
 
 ## Download

app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 
 android {
@@ -11,8 +12,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 31
-        versionCode = 92
-        versionName = "3.1.0"
+        versionCode = 105
+        versionName = "3.3.3"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -42,36 +43,30 @@ android {
             dimension "version"
             applicationIdSuffix = ".libre"
             buildConfigField "String", "BUILD_VERSION", "\"libre\""
-            buildConfigField "boolean", "FULL_VERSION", "true"
             buildConfigField "boolean", "CLOSED_STORE", "false"
             buildConfigField "String[]", "STYLES_DISABLED",
                             "{\"KeepassDXStyle_Red\"," +
                             "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Reply\"," +
+                            "\"KeepassDXStyle_Reply_Night\"," +
                             "\"KeepassDXStyle_Purple\"," +
                             "\"KeepassDXStyle_Purple_Dark\"}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
         }
-        pro {
-            dimension "version"
-            applicationIdSuffix = ".pro"
-            buildConfigField "String", "BUILD_VERSION", "\"pro\""
-            buildConfigField "boolean", "FULL_VERSION", "true"
-            buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{}"
-            buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
-            manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIZiXvrQCzSV9LNI6-p7cjTKENZLHIrz_zaqZuQQ" ]
-        }
         free {
             dimension "version"
             applicationIdSuffix = ".free"
             buildConfigField "String", "BUILD_VERSION", "\"free\""
-            buildConfigField "boolean", "FULL_VERSION", "false"
             buildConfigField "boolean", "CLOSED_STORE", "true"
             buildConfigField "String[]", "STYLES_DISABLED",
-                            "{\"KeepassDXStyle_Blue\"," +
+                            "{\"KeepassDXStyle_Simple\"," +
+                            "\"KeepassDXStyle_Simple_Night\"," +
+                            "\"KeepassDXStyle_Blue\"," +
                             "\"KeepassDXStyle_Blue_Night\"," +
                             "\"KeepassDXStyle_Red\"," +
                             "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Reply\"," +
+                            "\"KeepassDXStyle_Reply_Night\"," +
                             "\"KeepassDXStyle_Purple\"," +
                             "\"KeepassDXStyle_Purple_Dark\"}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
@@ -81,7 +76,6 @@ android {
 
     sourceSets {
         libre.res.srcDir 'src/libre/res'
-        pro.res.srcDir 'src/pro/res'
         free.res.srcDir 'src/free/res'
     }
 
@@ -99,22 +93,26 @@ android {
     }
 }
 
-def room_version = "2.4.1"
+def room_version = "2.4.2"
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "com.android.support:multidex:1.0.3"
     implementation "androidx.appcompat:appcompat:$android_appcompat_version"
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.biometric:biometric:1.1.0'
-    implementation 'androidx.media:media:1.4.3'
+    implementation 'androidx.media:media:1.5.0'
     // Lifecycle - LiveData - ViewModel - Coroutines
     implementation "androidx.core:core-ktx:$android_core_version"
-    implementation 'androidx.fragment:fragment-ktx:1.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation "com.google.android.material:material:$android_material_version"
+    // Token auto complete
+    // From sources until https://github.com/splitwise/TokenAutoComplete/pull/422 fixed
+    // implementation "com.splitwise:tokenautocomplete:4.0.0-beta04"
     // Database
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"

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

@@ -1,61 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
     android:width="108dp"
-    android:height="108dp">
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
     <group
-        android:translateY="-332">
-        <group
-            android:translateY="332">
+        android:translateX="6"
+        android:translateY="8">
         <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:strokeLineJoin="round"
-                android:strokeLineCap="round"
-                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>
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+        <path
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
     </group>
     <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
+        android:translateX="6"
+        android:translateY="6">
         <path
-                android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
-                android:fillColor="#eaeaea"
-                android:strokeWidth="1"
-                android:strokeColor="#58000000" />
-        </group>
-        <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
+            android:fillColor="#ffa726"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
         <path
-                android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
-                android:fillColor="#81c784" />
-        </group>
-        <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
-            <path
-                android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
-                android:fillColor="#eaeaea"
-                android:strokeWidth="1"
-                android:strokeColor="#58000000" />
-        </group>
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
     </group>
 </vector>

app/src/free/res/drawable/ic_app_white_24dp.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffa726"
+        android:strokeWidth="1.99999297"
+        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+  </group>
+</vector>

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

@@ -1,61 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
     android:width="108dp"
-    android:height="108dp">
+    android:height="108dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
     <group
-        android:translateY="-332">
-        <group
-            android:translateY="332">
+        android:translateX="6"
+        android:translateY="8">
         <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:strokeLineJoin="round"
-                android:strokeLineCap="round"
-                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>
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+        <path
+            android:fillColor="#24000000"
+            android:strokeWidth="1.99999297"
+            android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
     </group>
     <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
+        android:translateX="6"
+        android:translateY="6">
         <path
-                android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
-                android:fillColor="#eaeaea"
-                android:strokeWidth="1"
-                android:strokeColor="#58000000"/>
-        </group>
-        <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
+            android:fillColor="#ffa726"
+            android:strokeWidth="1.99999297"
+            android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
         <path
-                android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
-                android:fillColor="#64b5f6" />
-        </group>
-        <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
-            <path
-                android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
-                android:fillColor="#eaeaea"
-                android:strokeWidth="1"
-                android:strokeColor="#58000000" />
-        </group>
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.99999297"
+            android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
     </group>
 </vector>

app/src/libre/res/drawable/ic_app_white_24dp.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="84"
+    android:viewportHeight="84">
+  <group
+      android:translateX="-12"
+      android:translateY="-12">
+    <path
+        android:fillColor="#ffa726"
+        android:strokeWidth="1.99999297"
+        android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1.99999297"
+        android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
+  </group>
+</vector>

app/src/libre/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/green" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/libre/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/green" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -40,7 +40,6 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.FileDatabaseSelectActivity"
             android:theme="@style/KeepassDXStyle.SplashScreen"
-            android:label="@string/app_name"
             android:launchMode="singleTop"
             android:exported="true"
             android:configChanges="keyboardHidden"
@@ -51,7 +50,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.kunzisoft.keepass.activities.PasswordActivity"
+            android:name="com.kunzisoft.keepass.activities.MainCredentialActivity"
             android:exported="true"
             android:configChanges="keyboardHidden"
             android:windowSoftInputMode="adjustResize|stateUnchanged">

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

@@ -36,17 +36,21 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.core.graphics.ColorUtils
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.google.android.material.tabs.TabLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.fragments.EntryFragment
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.adapters.TagsAdapter
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
@@ -63,7 +67,6 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.utils.UuidUtil
 import com.kunzisoft.keepass.view.changeControlColor
@@ -80,6 +83,9 @@ class EntryActivity : DatabaseLockActivity() {
     private var appBarLayout: AppBarLayout? = null
     private var titleIconView: ImageView? = null
     private var historyView: View? = null
+    private var tagsListView: RecyclerView? = null
+    private var entryContentTab: TabLayout? = null
+    private var tagsAdapter: TagsAdapter? = null
     private var entryProgress: LinearProgressIndicator? = null
     private var lockView: View? = null
     private var toolbar: Toolbar? = null
@@ -87,6 +93,8 @@ class EntryActivity : DatabaseLockActivity() {
 
     private val mEntryViewModel: EntryViewModel by viewModels()
 
+    private val mEntryActivityEducation = EntryActivityEducation(this)
+
     private var mMainEntryId: NodeId<UUID>? = null
     private var mHistoryPosition: Int = -1
     private var mEntryIsHistory: Boolean = false
@@ -126,6 +134,8 @@ class EntryActivity : DatabaseLockActivity() {
         appBarLayout = findViewById(R.id.app_bar)
         titleIconView = findViewById(R.id.entry_icon)
         historyView = findViewById(R.id.history_container)
+        tagsListView = findViewById(R.id.entry_tags_list_view)
+        entryContentTab = findViewById(R.id.entry_content_tab)
         entryProgress = findViewById(R.id.entry_progress)
         lockView = findViewById(R.id.lock_button)
         loadingView = findViewById(R.id.loading)
@@ -148,6 +158,26 @@ class EntryActivity : DatabaseLockActivity() {
         taColorPrimary.recycle()
         taColorBackground.recycle()
 
+        // Init Tags adapter
+        tagsAdapter = TagsAdapter(this)
+        tagsListView?.apply {
+            layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+            adapter = tagsAdapter
+        }
+
+        // Init content tab
+        entryContentTab?.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
+            override fun onTabSelected(tab: TabLayout.Tab?) {
+                mEntryViewModel.selectSection(EntryViewModel.EntrySection.
+                    getEntrySectionByPosition(tab?.position ?: 0)
+                )
+            }
+
+            override fun onTabUnselected(tab: TabLayout.Tab?) {}
+
+            override fun onTabReselected(tab: TabLayout.Tab?) {}
+        })
+
         // Get Entry from UUID
         try {
             intent.getParcelableExtra<NodeId<UUID>?>(KEY_ENTRY)?.let { mainEntryId ->
@@ -179,6 +209,10 @@ class EntryActivity : DatabaseLockActivity() {
             lockAndExit()
         }
 
+        mEntryViewModel.sectionSelected.observe(this) { entrySection ->
+            entryContentTab?.getTabAt(entrySection.position)?.select()
+        }
+
         mEntryViewModel.entryInfoHistory.observe(this) { entryInfoHistory ->
             if (entryInfoHistory != null) {
                 this.mMainEntryId = entryInfoHistory.mainEntryId
@@ -213,9 +247,14 @@ class EntryActivity : DatabaseLockActivity() {
                 collapsingToolbarLayout?.title = entryTitle
                 toolbar?.title = entryTitle
                 mUrl = entryInfo.url
+                // Assign tags
+                val tags = entryInfo.tags
+                tagsListView?.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
+                tagsAdapter?.setTags(tags)
                 // Assign colors
-                mBackgroundColor = entryInfo.backgroundColor
-                mForegroundColor = entryInfo.foregroundColor
+                val showEntryColors = PreferencesUtil.showEntryColors(this)
+                mBackgroundColor = if (showEntryColors) entryInfo.backgroundColor else null
+                mForegroundColor = if (showEntryColors) entryInfo.foregroundColor else null
 
                 loadingView?.hideByFading()
                 mEntryLoaded = true
@@ -312,6 +351,11 @@ class EntryActivity : DatabaseLockActivity() {
                 }
             }
         }
+
+        // Keep the screen on
+        if (PreferencesUtil.isKeepScreenOnEnabled(this)) {
+            window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
     }
 
     override fun onPause() {
@@ -347,7 +391,6 @@ class EntryActivity : DatabaseLockActivity() {
         super.onCreateOptionsMenu(menu)
         if (mEntryLoaded) {
             val inflater = menuInflater
-            MenuUtil.contributionMenuInflater(inflater, menu)
 
             inflater.inflate(R.menu.entry, menu)
             inflater.inflate(R.menu.database, menu)
@@ -358,11 +401,7 @@ class EntryActivity : DatabaseLockActivity() {
 
             // Show education views
             Handler(Looper.getMainLooper()).post {
-                performedNextEducation(
-                    EntryActivityEducation(
-                        this
-                    ), menu
-                )
+                performedNextEducation(menu)
             }
         }
         return true
@@ -374,40 +413,44 @@ class EntryActivity : DatabaseLockActivity() {
         }
         if (mEntryIsHistory || mDatabaseReadOnly) {
             menu?.findItem(R.id.menu_save_database)?.isVisible = false
+            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
             menu?.findItem(R.id.menu_edit)?.isVisible = false
         }
+        if (!mMergeDataAllowed) {
+            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
+        }
         if (mSpecialMode != SpecialMode.DEFAULT) {
+            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
             menu?.findItem(R.id.menu_reload_database)?.isVisible = false
         }
         applyToolbarColors()
         return super.onPrepareOptionsMenu(menu)
     }
 
-    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
-                                       menu: Menu) {
+    private fun performedNextEducation(menu: Menu) {
         val entryFragment = supportFragmentManager.findFragmentByTag(ENTRY_FRAGMENT_TAG)
                 as? EntryFragment?
         val entryFieldCopyView: View? = entryFragment?.firstEntryFieldCopyView()
         val entryCopyEducationPerformed = entryFieldCopyView != null
-                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
+                && mEntryActivityEducation.checkAndPerformedEntryCopyEducation(
                 entryFieldCopyView,
                 {
                     entryFragment.launchEntryCopyEducationAction()
                 },
                 {
-                    performedNextEducation(entryActivityEducation, menu)
+                    performedNextEducation(menu)
                 })
 
         if (!entryCopyEducationPerformed) {
             val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
             // entryEditEducationPerformed
-            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
+            menuEditView != null && mEntryActivityEducation.checkAndPerformedEntryEditEducation(
                     menuEditView,
                     {
                         onOptionsItemSelected(menu.findItem(R.id.menu_edit))
                     },
                     {
-                        performedNextEducation(entryActivityEducation, menu)
+                        performedNextEducation(menu)
                     }
             )
         }
@@ -415,10 +458,6 @@ class EntryActivity : DatabaseLockActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_contribute -> {
-                MenuUtil.onContributionItemSelected(this)
-                return true
-            }
             R.id.menu_edit -> {
                 mDatabase?.let { database ->
                     mMainEntryId?.let { entryId ->
@@ -455,6 +494,9 @@ class EntryActivity : DatabaseLockActivity() {
             R.id.menu_save_database -> {
                 saveDatabase()
             }
+            R.id.menu_merge_database -> {
+                mergeDatabase()
+            }
             R.id.menu_reload_database -> {
                 reloadDatabase()
             }

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

@@ -113,7 +113,7 @@ class EntryEditActivity : DatabaseLockActivity(),
     private var mExternalFileHelper: ExternalFileHelper? = null
     private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
     // Education
-    private var entryEditActivityEducation: EntryEditActivityEducation? = null
+    private var mEntryEditActivityEducation = EntryEditActivityEducation(this)
 
     private var mIconSelectionActivityResultLauncher = IconPickerActivity.registerIconSelectionForResult(this) { icon ->
         mEntryEditViewModel.selectIcon(icon)
@@ -183,8 +183,6 @@ class EntryEditActivity : DatabaseLockActivity(),
         }
 
         mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
-        // Verify the education views
-        entryEditActivityEducation = EntryEditActivityEducation(this)
 
         // Lock button
         lockView?.setOnClickListener { lockAndExit() }
@@ -538,10 +536,8 @@ class EntryEditActivity : DatabaseLockActivity(),
         super.onCreateOptionsMenu(menu)
         if (mEntryLoaded) {
             menuInflater.inflate(R.menu.entry_edit, menu)
-            entryEditActivityEducation?.let {
             Handler(Looper.getMainLooper()).post {
-                    performedNextEducation(it)
-                }
+                performedNextEducation()
             }
         }
         return true
@@ -568,19 +564,19 @@ class EntryEditActivity : DatabaseLockActivity(),
         return super.onPrepareOptionsMenu(menu)
     }
 
-    private fun performedNextEducation(entryEditActivityEducation: EntryEditActivityEducation) {
+    private fun performedNextEducation() {
 
         val entryEditFragment = supportFragmentManager.findFragmentById(R.id.entry_edit_content)
                 as? EntryEditFragment?
         val generatePasswordView = entryEditFragment?.getActionImageView()
         val generatePasswordEductionPerformed = generatePasswordView != null
-                && entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+                && mEntryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
             generatePasswordView,
             {
                 entryEditFragment.launchGeneratePasswordEductionAction()
             },
             {
-                performedNextEducation(entryEditActivityEducation)
+                performedNextEducation()
             }
         )
 
@@ -589,33 +585,33 @@ class EntryEditActivity : DatabaseLockActivity(),
             val addNewFieldEducationPerformed = mAllowCustomFields
                     && addNewFieldView != null
                     && addNewFieldView.isVisible
-                    && entryEditActivityEducation.checkAndPerformedEntryNewFieldEducation(
+                    && mEntryEditActivityEducation.checkAndPerformedEntryNewFieldEducation(
                     addNewFieldView,
                     {
                         addNewCustomField()
                     },
                     {
-                        performedNextEducation(entryEditActivityEducation)
+                        performedNextEducation()
                     }
             )
             if (!addNewFieldEducationPerformed) {
                 val attachmentView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_attachment)
                 val addAttachmentEducationPerformed = attachmentView != null
                         && attachmentView.isVisible
-                        && entryEditActivityEducation.checkAndPerformedAttachmentEducation(
+                        && mEntryEditActivityEducation.checkAndPerformedAttachmentEducation(
                         attachmentView,
                         {
                             addNewAttachment()
                         },
                         {
-                            performedNextEducation(entryEditActivityEducation)
+                            performedNextEducation()
                         }
                 )
                 if (!addAttachmentEducationPerformed) {
                     val setupOtpView: View? = entryEditAddToolBar?.findViewById(R.id.menu_add_otp)
                     setupOtpView != null
                             && setupOtpView.isVisible
-                            && entryEditActivityEducation.checkAndPerformedSetUpOTPEducation(
+                            && mEntryEditActivityEducation.checkAndPerformedSetUpOTPEducation(
                             setupOtpView,
                             {
                                 setupOtp()
@@ -662,8 +658,8 @@ class EntryEditActivity : DatabaseLockActivity(),
 
     override fun acceptPassword(passwordField: Field) {
         mEntryEditViewModel.selectPassword(passwordField)
-        entryEditActivityEducation?.let {
-            Handler(Looper.getMainLooper()).post { performedNextEducation(it) }
+        Handler(Looper.getMainLooper()).post {
+            performedNextEducation()
         }
     }
 

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

@@ -165,15 +165,8 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                     {
                         // If database not open
                         if (searchInfo.otpString != null) {
-                            if (!readOnly) {
                             FileDatabaseSelectActivity.launchForSaveResult(this,
                                     searchInfo)
-                            } else {
-                                Toast.makeText(applicationContext,
-                                        R.string.autofill_read_only_save,
-                                        Toast.LENGTH_LONG)
-                                        .show()
-                            }
                         } else if (searchShareForMagikeyboard) {
                             FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this,
                                     searchInfo)

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

@@ -31,18 +31,20 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.TextView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.SetMainCredentialDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
@@ -69,15 +71,18 @@ import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import java.io.FileNotFoundException
 
 class FileDatabaseSelectActivity : DatabaseModeActivity(),
-        AssignMasterKeyDialogFragment.AssignPasswordDialogListener {
+        SetMainCredentialDialogFragment.AssignMainCredentialDialogListener {
 
     // Views
     private lateinit var coordinatorLayout: CoordinatorLayout
+    private var specialTitle: View? = null
     private var createDatabaseButtonView: View? = null
     private var openDatabaseButtonView: View? = null
 
     private val databaseFilesViewModel: DatabaseFilesViewModel by viewModels()
 
+    private val mFileDatabaseSelectActivityEducation = FileDatabaseSelectActivityEducation(this)
+
     // Adapter to manage database history list
     private var mAdapterDatabaseHistory: FileDatabaseHistoryAdapter? = null
 
@@ -110,6 +115,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         toolbar.title = ""
         setSupportActionBar(toolbar)
 
+        // Special title
+        specialTitle = findViewById(R.id.file_selection_title_part_3)
+
         // Create database button
         createDatabaseButtonView = findViewById(R.id.create_database_button)
         createDatabaseButtonView?.setOnClickListener { createNewFile() }
@@ -124,7 +132,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         mExternalFileHelper?.buildCreateDocument("application/x-keepass") { databaseFileCreatedUri ->
             mDatabaseFileUri = databaseFileCreatedUri
             if (mDatabaseFileUri != null) {
-                AssignMasterKeyDialogFragment.getInstance(true)
+                SetMainCredentialDialogFragment.getInstance(true)
                     .show(supportFragmentManager, "passwordDialog")
             } else {
                 val error = getString(R.string.error_create_database)
@@ -132,7 +140,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                 Log.e(TAG, error)
             }
         }
-        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
+        openDatabaseButtonView = findViewById(R.id.open_database_button)
         openDatabaseButtonView?.setOpenDocumentClickListener(mExternalFileHelper)
 
         // History list
@@ -291,7 +299,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     }
 
     private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
-        PasswordActivity.launch(this,
+        MainCredentialActivity.launch(this,
                 databaseUri,
                 keyFile,
                 { exception ->
@@ -333,6 +341,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     override fun onResume() {
         super.onResume()
 
+        // Define special title
+        specialTitle?.isVisible = UriUtil.contributingUser(this)
+
         // Show open and create button or special mode
         when (mSpecialMode) {
             SpecialMode.DEFAULT -> {
@@ -389,42 +400,43 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         super.onCreateOptionsMenu(menu)
 
         if (mSpecialMode == SpecialMode.DEFAULT) {
-            MenuUtil.defaultMenuInflater(menuInflater, menu)
+            MenuUtil.defaultMenuInflater(this, menuInflater, menu)
         }
 
-        Handler(Looper.getMainLooper()).post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
+        Handler(Looper.getMainLooper()).post {
+            performedNextEducation()
+        }
 
         return true
     }
 
-    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
+    private fun performedNextEducation() {
         // If no recent files
         val createDatabaseEducationPerformed =
                 createDatabaseButtonView != null
                 && createDatabaseButtonView!!.visibility == View.VISIBLE
-                && mAdapterDatabaseHistory != null
-                && mAdapterDatabaseHistory!!.itemCount == 0
-                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
+                && mFileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
                         createDatabaseButtonView!!,
                 {
                     createNewFile()
                 },
                 {
                     // But if the user cancel, it can also select a database
-                    performedNextEducation(fileDatabaseSelectActivityEducation)
+                    performedNextEducation()
                 })
         if (!createDatabaseEducationPerformed) {
             // selectDatabaseEducationPerformed
             openDatabaseButtonView != null
-                    && fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
+            && mFileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
                 openDatabaseButtonView!!,
             { tapTargetView ->
                 tapTargetView?.let {
                     mExternalFileHelper?.openDocument()
                 }
             },
-                    {}
-            )
+            {
+
+            })
         }
     }
 

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

@@ -26,65 +26,66 @@ 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.KeyEvent.KEYCODE_ENTER
-import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
-import android.view.inputmethod.InputMethodManager
-import android.widget.*
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.CompoundButton
+import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.biometric.BiometricManager
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.commit
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
-import com.kunzisoft.keepass.activities.helpers.*
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
 import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
-import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.biometric.AdvancedUnlockFragment
+import com.kunzisoft.keepass.biometric.AdvancedUnlockManager
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.model.RegisterInfo
-import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.model.*
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.CIPHER_ENTITY_KEY
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.CIPHER_DATABASE_KEY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.MAIN_CREDENTIAL_KEY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.READ_ONLY_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity
 import com.kunzisoft.keepass.tasks.ActionRunnable
 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.KeyFileSelectionView
+import com.kunzisoft.keepass.view.MainCredentialView
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
 import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
 import java.io.FileNotFoundException
 
 
-class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener {
+class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener {
 
     // Views
     private var toolbar: Toolbar? = null
     private var filenameView: TextView? = null
-    private var passwordView: EditText? = null
-    private var keyFileSelectionView: KeyFileSelectionView? = null
+    private var advancedUnlockButton: View? = null
+    private var mainCredentialView: MainCredentialView? = null
     private var confirmButtonView: Button? = null
-    private var checkboxPasswordView: CompoundButton? = null
-    private var checkboxKeyFileView: CompoundButton? = null
     private var infoContainerView: ViewGroup? = null
     private lateinit var coordinatorLayout: CoordinatorLayout
     private var advancedUnlockFragment: AdvancedUnlockFragment? = null
@@ -92,9 +93,10 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
     private val mDatabaseFileViewModel: DatabaseFileViewModel by viewModels()
     private val mAdvancedUnlockViewModel: AdvancedUnlockViewModel by viewModels()
 
+    private val mPasswordActivityEducation = PasswordActivityEducation(this)
+
     private var mDefaultDatabase: Boolean = false
     private var mDatabaseFileUri: Uri? = null
-    private var mDatabaseKeyFileUri: Uri? = null
 
     private var mRememberKeyFile: Boolean = false
     private var mExternalFileHelper: ExternalFileHelper? = null
@@ -110,7 +112,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.activity_password)
+        setContentView(R.layout.activity_main_credential)
 
         toolbar = findViewById(R.id.toolbar)
         toolbar?.title = getString(R.string.app_name)
@@ -118,12 +120,10 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        confirmButtonView = findViewById(R.id.activity_password_open_button)
         filenameView = findViewById(R.id.filename)
-        passwordView = findViewById(R.id.password)
-        keyFileSelectionView = findViewById(R.id.keyfile_selection)
-        checkboxPasswordView = findViewById(R.id.password_checkbox)
-        checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
+        advancedUnlockButton = findViewById(R.id.activity_password_advanced_unlock_button)
+        mainCredentialView = findViewById(R.id.activity_password_credentials)
+        confirmButtonView = findViewById(R.id.activity_password_open_button)
         infoContainerView = findViewById(R.id.activity_password_info_container)
         coordinatorLayout = findViewById(R.id.activity_password_coordinator_layout)
 
@@ -134,43 +134,26 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         }
         mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
 
-        mExternalFileHelper = ExternalFileHelper(this@PasswordActivity)
+        mExternalFileHelper = ExternalFileHelper(this@MainCredentialActivity)
         mExternalFileHelper?.buildOpenDocument { uri ->
             if (uri != null) {
-                mDatabaseKeyFileUri = uri
-                populateKeyFileTextView(uri)
+                mainCredentialView?.populateKeyFileTextView(uri)
             }
         }
-        keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)
-
-        passwordView?.setOnEditorActionListener(onEditorActionListener)
-        passwordView?.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-
-            override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-
-            override fun afterTextChanged(editable: Editable) {
-                if (editable.toString().isNotEmpty() && checkboxPasswordView?.isChecked != true)
-                    checkboxPasswordView?.isChecked = true
-            }
-        })
-        passwordView?.setOnKeyListener { _, _, keyEvent ->
-            var handled = false
-            if (keyEvent.action == KeyEvent.ACTION_DOWN
-                && keyEvent?.keyCode == KEYCODE_ENTER) {
-                verifyCheckboxesAndLoadDatabase()
-                handled = true
-            }
-            handled
+        mainCredentialView?.setOpenKeyfileClickListener(mExternalFileHelper)
+        mainCredentialView?.onValidateListener = {
+            loadDatabase()
         }
 
         // If is a view intent
         getUriFromIntent(intent)
-        if (savedInstanceState?.containsKey(KEY_KEYFILE) == true) {
-            mDatabaseKeyFileUri = UriUtil.parse(savedInstanceState.getString(KEY_KEYFILE))
-        }
 
         // Init Biometric elements
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            advancedUnlockButton?.setOnClickListener {
+                startActivity(Intent(this, SettingsAdvancedUnlockActivity::class.java))
+            }
+        }
         advancedUnlockFragment = supportFragmentManager
                 .findFragmentByTag(UNLOCK_FRAGMENT_TAG) as? AdvancedUnlockFragment?
         if (advancedUnlockFragment == null) {
@@ -183,9 +166,10 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         }
 
         // Listen password checkbox to init advanced unlock and confirmation button
-        checkboxPasswordView?.setOnCheckedChangeListener { _, _ ->
+        mainCredentialView?.onPasswordChecked =
+            CompoundButton.OnCheckedChangeListener { _, _ ->
                 mAdvancedUnlockViewModel.checkUnlockAvailability()
-            enableOrNotTheConfirmationButton()
+                enableConfirmationButton()
             }
 
         // Observe if default database
@@ -211,12 +195,13 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
             invalidateOptionsMenu()
 
             // Post init uri with KeyFile only if needed
+            val databaseKeyFileUri = mainCredentialView?.getMainCredential()?.keyFileUri
             val keyFileUri =
                     if (mRememberKeyFile
-                            && (mDatabaseKeyFileUri == null || mDatabaseKeyFileUri.toString().isEmpty())) {
+                            && (databaseKeyFileUri == null || databaseKeyFileUri.toString().isEmpty())) {
                         databaseFile?.keyFileUri
                     } else {
-                        mDatabaseKeyFileUri
+                        databaseKeyFileUri
                     }
 
             // Define title
@@ -229,10 +214,10 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
     override fun onResume() {
         super.onResume()
 
-        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this@PasswordActivity)
+        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this@MainCredentialActivity)
 
         // Back to previous keyboard is setting activated
-        if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this@PasswordActivity)) {
+        if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this@MainCredentialActivity)) {
             sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
         }
 
@@ -253,6 +238,15 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
     override fun onDatabaseRetrieved(database: Database?) {
         super.onDatabaseRetrieved(database)
         if (database != null) {
+            // Trying to load another database
+            if (mDatabaseFileUri != null
+                && database.fileUri != null
+                && mDatabaseFileUri != database.fileUri) {
+                Toast.makeText(this,
+                    R.string.warning_database_already_opened,
+                    Toast.LENGTH_LONG
+                ).show()
+            }
             launchGroupActivityIfLoaded(database)
         }
     }
@@ -271,7 +265,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                 if (result.isSuccess) {
                     launchGroupActivityIfLoaded(database)
                 } else {
-                    passwordView?.requestFocusFromTouch()
+                    mainCredentialView?.requestPasswordFocus()
 
                     var resultError = ""
                     val resultException = result.exception
@@ -288,7 +282,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                                     var databaseUri: Uri? = null
                                     var mainCredential = MainCredential()
                                     var readOnly = true
-                                    var cipherEntity: CipherDatabaseEntity? = null
+                                    var cipherEncryptDatabase: CipherEncryptDatabase? = null
 
                                     result.data?.let { resultData ->
                                         databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
@@ -296,8 +290,8 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                                             resultData.getParcelable(MAIN_CREDENTIAL_KEY)
                                                 ?: mainCredential
                                         readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                        cipherEntity =
-                                            resultData.getParcelable(CIPHER_ENTITY_KEY)
+                                        cipherEncryptDatabase =
+                                            resultData.getParcelable(CIPHER_DATABASE_KEY)
                                     }
 
                                     databaseUri?.let { databaseFileUri ->
@@ -305,7 +299,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                                             databaseFileUri,
                                             mainCredential,
                                             readOnly,
-                                            cipherEntity,
+                                            cipherEncryptDatabase,
                                             true
                                         )
                                     }
@@ -341,11 +335,16 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         if (action != null
                 && action == VIEW_INTENT) {
             mDatabaseFileUri = intent.data
-            mDatabaseKeyFileUri = UriUtil.getUriFromIntent(intent, KEY_KEYFILE)
+            mainCredentialView?.populateKeyFileTextView(UriUtil.getUriFromIntent(intent, KEY_KEYFILE))
         } else {
             mDatabaseFileUri = intent?.getParcelableExtra(KEY_FILENAME)
-            mDatabaseKeyFileUri = intent?.getParcelableExtra(KEY_KEYFILE)
+            intent?.getParcelableExtra<Uri?>(KEY_KEYFILE)?.let {
+                mainCredentialView?.populateKeyFileTextView(it)
             }
+        }
+        try {
+            intent?.removeExtra(KEY_KEYFILE)
+        } catch (e: Exception) {}
         mDatabaseFileUri?.let {
             mDatabaseFileViewModel.checkIfIsDefaultDatabase(it)
         }
@@ -380,51 +379,68 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         finish()
     }
 
-    override fun retrieveCredentialForEncryption(): String {
-        return passwordView?.text?.toString() ?: ""
+    override fun retrieveCredentialForEncryption(): ByteArray {
+        return mainCredentialView?.retrieveCredentialForStorage(credentialStorageListener)
+            ?: byteArrayOf()
     }
 
     override fun conditionToStoreCredential(): Boolean {
-        return checkboxPasswordView?.isChecked == true
+        return mainCredentialView?.conditionToStoreCredential() == true
     }
 
-    override fun onCredentialEncrypted(databaseUri: Uri,
-                                       encryptedCredential: String,
-                                       ivSpec: String) {
+    override fun onCredentialEncrypted(cipherEncryptDatabase: CipherEncryptDatabase) {
         // Load the database if password is registered with biometric
-        verifyCheckboxesAndLoadDatabase(
-                CipherDatabaseEntity(
-                        databaseUri.toString(),
-                        encryptedCredential,
-                        ivSpec)
+        loadDatabase(mDatabaseFileUri,
+            mainCredentialView?.getMainCredential(),
+            cipherEncryptDatabase
         )
     }
 
-    override fun onCredentialDecrypted(databaseUri: Uri,
-                                       decryptedCredential: String) {
-        // Load the database if password is retrieve from biometric
-        // Retrieve from biometric
-        verifyKeyFileCheckboxAndLoadDatabase(decryptedCredential)
+    private val credentialStorageListener = object: MainCredentialView.CredentialStorageListener {
+        override fun passwordToStore(password: String?): ByteArray? {
+            return password?.toByteArray()
         }
 
-    private val onEditorActionListener = object : TextView.OnEditorActionListener {
-        override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean {
-            if (actionId == IME_ACTION_DONE) {
-                verifyCheckboxesAndLoadDatabase()
-                return true
+        override fun keyfileToStore(keyfile: Uri?): ByteArray? {
+            // TODO create byte array to store keyfile
+            return null
         }
-            return false
+
+        override fun hardwareKeyToStore(): ByteArray? {
+            // TODO create byte array to store hardware key
+            return null
         }
     }
 
+    override fun onCredentialDecrypted(cipherDecryptDatabase: CipherDecryptDatabase) {
+        // Load the database if password is retrieve from biometric
+        // Retrieve from biometric
+        val mainCredential = mainCredentialView?.getMainCredential() ?: MainCredential()
+        when (cipherDecryptDatabase.credentialStorage) {
+            CredentialStorage.PASSWORD -> {
+                mainCredential.masterPassword = String(cipherDecryptDatabase.decryptedValue)
+            }
+            CredentialStorage.KEY_FILE -> {
+                // TODO advanced unlock key file
+            }
+            CredentialStorage.HARDWARE_KEY -> {
+                // TODO advanced unlock hardware key
+            }
+        }
+        loadDatabase(mDatabaseFileUri,
+            mainCredential,
+            null
+        )
+    }
+
     private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) {
         // Define Key File text
         if (mRememberKeyFile) {
-            populateKeyFileTextView(keyFileUri)
+            mainCredentialView?.populateKeyFileTextView(keyFileUri)
         }
 
         // Define listener for validate button
-        confirmButtonView?.setOnClickListener { verifyCheckboxesAndLoadDatabase() }
+        confirmButtonView?.setOnClickListener { loadDatabase() }
 
         // If Activity is launch with a password and want to open directly
         val intent = intent
@@ -433,66 +449,33 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         intent.removeExtra(KEY_PASSWORD)
         val launchImmediately = intent.getBooleanExtra(KEY_LAUNCH_IMMEDIATELY, false)
         if (password != null) {
-            populatePasswordTextView(password)
+            mainCredentialView?.populatePasswordTextView(password)
         }
         if (launchImmediately) {
-            verifyCheckboxesAndLoadDatabase(password, keyFileUri)
+            loadDatabase()
         } else {
             // Init Biometric elements
             mAdvancedUnlockViewModel.databaseFileLoaded(databaseFileUri)
         }
 
-        enableOrNotTheConfirmationButton()
+        enableConfirmationButton()
 
-        // Auto select the password field and open keyboard
-        passwordView?.postDelayed({
-            passwordView?.requestFocusFromTouch()
-            val inputMethodManager = getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager?
-            inputMethodManager?.showSoftInput(passwordView, InputMethodManager.SHOW_IMPLICIT)
-        }, 100)
+        mainCredentialView?.focusPasswordFieldAndOpenKeyboard()
     }
 
-    private fun enableOrNotTheConfirmationButton() {
+    private fun enableConfirmationButton() {
         // Enable or not the open button if setting is checked
-        if (!PreferencesUtil.emptyPasswordAllowed(this@PasswordActivity)) {
-            checkboxPasswordView?.let {
-                confirmButtonView?.isEnabled = (checkboxPasswordView?.isChecked == true
-                        || checkboxKeyFileView?.isChecked == true)
-            }
+        if (!PreferencesUtil.emptyPasswordAllowed(this@MainCredentialActivity)) {
+            confirmButtonView?.isEnabled = mainCredentialView?.isFill() ?: false
         } else {
             confirmButtonView?.isEnabled = true
         }
     }
 
     private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile) {
-        populatePasswordTextView(null)
+        mainCredentialView?.populatePasswordTextView(null)
         if (clearKeyFile) {
-            mDatabaseKeyFileUri = null
-            populateKeyFileTextView(null)
-        }
-    }
-
-    private fun populatePasswordTextView(text: String?) {
-        if (text == null || text.isEmpty()) {
-            passwordView?.setText("")
-            if (checkboxPasswordView?.isChecked == true)
-                checkboxPasswordView?.isChecked = false
-        } else {
-            passwordView?.setText(text)
-            if (checkboxPasswordView?.isChecked != true)
-                checkboxPasswordView?.isChecked = true
-        }
-    }
-
-    private fun populateKeyFileTextView(uri: Uri?) {
-        if (uri == null || uri.toString().isEmpty()) {
-            keyFileSelectionView?.uri = null
-            if (checkboxKeyFileView?.isChecked == true)
-                checkboxKeyFileView?.isChecked = false
-        } else {
-            keyFileSelectionView?.uri = uri
-            if (checkboxKeyFileView?.isChecked != true)
-                checkboxKeyFileView?.isChecked = true
+            mainCredentialView?.populateKeyFileTextView(null)
         }
     }
 
@@ -504,41 +487,20 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        mDatabaseKeyFileUri?.let {
-            outState.putString(KEY_KEYFILE, it.toString())
-        }
         outState.putBoolean(KEY_READ_ONLY, mReadOnly)
         super.onSaveInstanceState(outState)
     }
 
-    private fun verifyCheckboxesAndLoadDatabase(cipherDatabaseEntity: CipherDatabaseEntity? = null) {
-        val password: String? = passwordView?.text?.toString()
-        val keyFile: Uri? = keyFileSelectionView?.uri
-        verifyCheckboxesAndLoadDatabase(password, keyFile, cipherDatabaseEntity)
-    }
-
-    private fun verifyCheckboxesAndLoadDatabase(password: String?,
-                                                keyFile: Uri?,
-                                                cipherDatabaseEntity: CipherDatabaseEntity? = null) {
-        val keyPassword = if (checkboxPasswordView?.isChecked != true) null else password
-        verifyKeyFileCheckbox(keyFile)
-        loadDatabase(mDatabaseFileUri, keyPassword, mDatabaseKeyFileUri, cipherDatabaseEntity)
-    }
-
-    private fun verifyKeyFileCheckboxAndLoadDatabase(password: String?) {
-        val keyFile: Uri? = keyFileSelectionView?.uri
-        verifyKeyFileCheckbox(keyFile)
-        loadDatabase(mDatabaseFileUri, password, mDatabaseKeyFileUri)
-    }
-
-    private fun verifyKeyFileCheckbox(keyFile: Uri?) {
-        mDatabaseKeyFileUri = if (checkboxKeyFileView?.isChecked != true) null else keyFile
+    private fun loadDatabase() {
+        loadDatabase(mDatabaseFileUri,
+            mainCredentialView?.getMainCredential(),
+            null
+        )
     }
 
     private fun loadDatabase(databaseFileUri: Uri?,
-                             password: String?,
-                             keyFileUri: Uri?,
-                             cipherDatabaseEntity: CipherDatabaseEntity? = null) {
+                             mainCredential: MainCredential?,
+                             cipherEncryptDatabase: CipherEncryptDatabase?) {
 
         if (PreferencesUtil.deletePasswordAfterConnexionAttempt(this)) {
             clearCredentialsViews()
@@ -557,10 +519,11 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                 // Show the progress dialog and load the database
                 showProgressDialogAndLoadDatabase(
                     databaseUri,
-                        MainCredential(password, keyFileUri),
+                    mainCredential ?: MainCredential(),
                     mReadOnly,
-                        cipherDatabaseEntity,
-                        false)
+                    cipherEncryptDatabase,
+                    false
+                )
             }
         }
     }
@@ -568,13 +531,13 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
     private fun showProgressDialogAndLoadDatabase(databaseUri: Uri,
                                                   mainCredential: MainCredential,
                                                   readOnly: Boolean,
-                                                  cipherDatabaseEntity: CipherDatabaseEntity?,
+                                                  cipherEncryptDatabase: CipherEncryptDatabase?,
                                                   fixDuplicateUUID: Boolean) {
         loadDatabase(
             databaseUri,
             mainCredential,
             readOnly,
-                cipherDatabaseEntity,
+            cipherEncryptDatabase,
             fixDuplicateUUID
         )
     }
@@ -596,7 +559,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         }
 
         if (mSpecialMode == SpecialMode.DEFAULT) {
-            MenuUtil.defaultMenuInflater(inflater, menu)
+            MenuUtil.defaultMenuInflater(this, inflater, menu)
         }
 
         super.onCreateOptionsMenu(menu)
@@ -612,26 +575,27 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         if (!performedEductionInProgress) {
             performedEductionInProgress = true
             // Show education views
-            Handler(Looper.getMainLooper()).post { performedNextEducation(PasswordActivityEducation(this), menu) }
+            Handler(Looper.getMainLooper()).post {
+                performedNextEducation(menu)
+            }
         }
     }
 
-    private fun performedNextEducation(passwordActivityEducation: PasswordActivityEducation,
-                                       menu: Menu) {
+    private fun performedNextEducation(menu: Menu) {
         val educationToolbar = toolbar
         val unlockEducationPerformed = educationToolbar != null
-                && passwordActivityEducation.checkAndPerformedUnlockEducation(
+                && mPasswordActivityEducation.checkAndPerformedUnlockEducation(
                 educationToolbar,
                         {
-                            performedNextEducation(passwordActivityEducation, menu)
+                            performedNextEducation(menu)
                         },
                         {
-                            performedNextEducation(passwordActivityEducation, menu)
+                            performedNextEducation(menu)
                         })
         if (!unlockEducationPerformed) {
             val readOnlyEducationPerformed =
                     educationToolbar?.findViewById<View>(R.id.menu_open_file_read_mode_key) != null
-                    && passwordActivityEducation.checkAndPerformedReadOnlyEducation(
+                    && mPasswordActivityEducation.checkAndPerformedReadOnlyEducation(
                     educationToolbar.findViewById(R.id.menu_open_file_read_mode_key),
                     {
                         try {
@@ -639,21 +603,30 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                         } catch (e: Exception) {
                             Log.e(TAG, "Unable to find read mode menu")
                         }
-                        performedNextEducation(passwordActivityEducation, menu)
+                        performedNextEducation(menu)
                     },
                     {
-                        performedNextEducation(passwordActivityEducation, menu)
+                        performedNextEducation(menu)
                     })
+            try {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    && !readOnlyEducationPerformed) {
+                    val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(this)
+                    val biometricPerformed =
+                            (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
+                            || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
+                            && advancedUnlockButton != null
+                            && mPasswordActivityEducation.checkAndPerformedBiometricEducation(
+                        advancedUnlockButton!!,
+                        {
+                            startActivity(Intent(this, SettingsAdvancedUnlockActivity::class.java))
+                        },
+                        {
 
-            advancedUnlockFragment?.performEducation(passwordActivityEducation,
-                    readOnlyEducationPerformed,
-                    {
-                        performedNextEducation(passwordActivityEducation, menu)
-                    },
-                    {
-                        performedNextEducation(passwordActivityEducation, menu)
                         })
                 }
+            } catch (ignored: Exception) {}
+        }
     }
 
     private fun changeOpenFileReadIcon(togglePassword: MenuItem) {
@@ -682,7 +655,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
 
     companion object {
 
-        private val TAG = PasswordActivity::class.java.name
+        private val TAG = MainCredentialActivity::class.java.name
 
         private const val UNLOCK_FRAGMENT_TAG = "UNLOCK_FRAGMENT_TAG"
 
@@ -696,7 +669,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
 
         private fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?,
                                          intentBuildLauncher: (Intent) -> Unit) {
-            val intent = Intent(activity, PasswordActivity::class.java)
+            val intent = Intent(activity, MainCredentialActivity::class.java)
             intent.putExtra(KEY_FILENAME, databaseFile)
             if (keyFile != null)
                 intent.putExtra(KEY_KEYFILE, keyFile)
@@ -832,30 +805,30 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
             try {
                 EntrySelectionHelper.doSpecialAction(activity.intent,
                         {
-                            PasswordActivity.launch(activity,
+                            MainCredentialActivity.launch(activity,
                                     databaseUri, keyFile)
                         },
                         { searchInfo -> // Search Action
-                            PasswordActivity.launchForSearchResult(activity,
+                            MainCredentialActivity.launchForSearchResult(activity,
                                     databaseUri, keyFile,
                                     searchInfo)
                             onLaunchActivitySpecialMode()
                         },
                         { searchInfo -> // Save Action
-                            PasswordActivity.launchForSaveResult(activity,
+                            MainCredentialActivity.launchForSaveResult(activity,
                                     databaseUri, keyFile,
                                     searchInfo)
                             onLaunchActivitySpecialMode()
                         },
                         { searchInfo -> // Keyboard Selection Action
-                            PasswordActivity.launchForKeyboardResult(activity,
+                            MainCredentialActivity.launchForKeyboardResult(activity,
                                     databaseUri, keyFile,
                                     searchInfo)
                             onLaunchActivitySpecialMode()
                         },
                         { searchInfo, autofillComponent -> // Autofill Selection Action
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                PasswordActivity.launchForAutofillResult(activity,
+                                MainCredentialActivity.launchForAutofillResult(activity,
                                         databaseUri, keyFile,
                                         autofillActivityResultLauncher,
                                         autofillComponent,
@@ -866,7 +839,7 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
                             }
                         },
                         { registerInfo -> // Registration Action
-                            PasswordActivity.launchForRegistration(activity,
+                            MainCredentialActivity.launchForRegistration(activity,
                                     databaseUri, keyFile,
                                     registerInfo)
                             onLaunchActivitySpecialMode()

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

@@ -27,7 +27,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.adapters.TagsAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
@@ -43,11 +46,17 @@ class GroupDialogFragment : DatabaseDialogFragment() {
     private lateinit var iconView: ImageView
     private var mIconColor: Int = 0
     private lateinit var nameTextView: TextView
+    private lateinit var tagsListView: RecyclerView
+    private var tagsAdapter: TagsAdapter? = null
     private lateinit var notesTextLabelView: TextView
     private lateinit var notesTextView: TextView
     private lateinit var expirationView: DateTimeFieldView
     private lateinit var creationView: TextView
     private lateinit var modificationView: TextView
+    private lateinit var searchableLabelView: TextView
+    private lateinit var searchableView: TextView
+    private lateinit var autoTypeLabelView: TextView
+    private lateinit var autoTypeView: TextView
     private lateinit var uuidContainerView: ViewGroup
     private lateinit var uuidReferenceView: TextView
 
@@ -57,6 +66,25 @@ class GroupDialogFragment : DatabaseDialogFragment() {
             database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
         }
         mPopulateIconMethod?.invoke(iconView, mGroupInfo.icon)
+
+        if (database?.allowCustomSearchableGroup() == true) {
+            searchableLabelView.visibility = View.VISIBLE
+            searchableView.visibility = View.VISIBLE
+        } else {
+            searchableLabelView.visibility = View.GONE
+            searchableView.visibility = View.GONE
+        }
+
+        // TODO Auto-Type
+        /*
+        if (database?.allowAutoType() == true) {
+            autoTypeLabelView.visibility = View.VISIBLE
+            autoTypeView.visibility = View.VISIBLE
+        } else {
+            autoTypeLabelView.visibility = View.GONE
+            autoTypeView.visibility = View.GONE
+        }
+         */
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -64,11 +92,16 @@ class GroupDialogFragment : DatabaseDialogFragment() {
             val root = activity.layoutInflater.inflate(R.layout.fragment_group, null)
             iconView = root.findViewById(R.id.group_icon)
             nameTextView = root.findViewById(R.id.group_name)
+            tagsListView = root.findViewById(R.id.group_tags_list_view)
             notesTextLabelView = root.findViewById(R.id.group_note_label)
             notesTextView = root.findViewById(R.id.group_note)
             expirationView = root.findViewById(R.id.group_expiration)
             creationView = root.findViewById(R.id.group_created)
             modificationView = root.findViewById(R.id.group_modified)
+            searchableLabelView = root.findViewById(R.id.group_searchable_label)
+            searchableView = root.findViewById(R.id.group_searchable)
+            autoTypeLabelView = root.findViewById(R.id.group_auto_type_label)
+            autoTypeView = root.findViewById(R.id.group_auto_type)
             uuidContainerView = root.findViewById(R.id.group_UUID_container)
             uuidReferenceView = root.findViewById(R.id.group_UUID_reference)
 
@@ -96,6 +129,14 @@ class GroupDialogFragment : DatabaseDialogFragment() {
                 nameTextView.text = title
                 nameTextView.visibility = View.VISIBLE
             }
+            tagsAdapter = TagsAdapter(activity)
+            tagsListView.apply {
+                layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+                adapter = tagsAdapter
+            }
+            val tags = mGroupInfo.tags
+            tagsListView.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
+            tagsAdapter?.setTags(tags)
             val notes = mGroupInfo.notes
             if (notes == null || notes.isEmpty()) {
                 notesTextLabelView.visibility = View.GONE
@@ -109,6 +150,9 @@ class GroupDialogFragment : DatabaseDialogFragment() {
             expirationView.dateTime = mGroupInfo.expiryTime
             creationView.text = mGroupInfo.creationTime.getDateTimeString(resources)
             modificationView.text = mGroupInfo.lastModificationTime.getDateTimeString(resources)
+            searchableView.text = stringFromInheritableBoolean(mGroupInfo.searchable)
+            autoTypeView.text = stringFromInheritableBoolean(mGroupInfo.enableAutoType,
+                mGroupInfo.defaultAutoTypeSequence)
             val uuid = UuidUtil.toHexString(mGroupInfo.id)
             if (uuid == null || uuid.isEmpty()) {
                 uuidContainerView.visibility = View.GONE
@@ -129,6 +173,15 @@ class GroupDialogFragment : DatabaseDialogFragment() {
         return super.onCreateDialog(savedInstanceState)
     }
 
+    private fun stringFromInheritableBoolean(enable: Boolean?, value: String? = null): String {
+        val valueString = if (value != null && value.isNotEmpty()) " [$value]" else ""
+        return when {
+            enable == null -> getString(R.string.inherited) + valueString
+            enable -> getString(R.string.enable) + valueString
+            else -> getString(R.string.disable)
+        }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         outState.putParcelable(KEY_GROUP_INFO, mGroupInfo)
         super.onSaveInstanceState(outState)

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

@@ -23,20 +23,23 @@ import android.app.Dialog
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.TextView
+import android.view.ViewGroup
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.*
+import com.kunzisoft.keepass.adapters.TagsProposalAdapter
 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.model.GroupInfo
 import com.kunzisoft.keepass.view.DateTimeEditFieldView
+import com.kunzisoft.keepass.view.InheritedCompletionView
+import com.kunzisoft.keepass.view.TagsCompletionView
 import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
+import com.tokenautocomplete.FilteredArrayAdapter
 import org.joda.time.DateTime
 
 class GroupEditDialogFragment : DatabaseDialogFragment() {
@@ -55,6 +58,14 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
     private lateinit var notesTextLayoutView: TextInputLayout
     private lateinit var notesTextView: TextView
     private lateinit var expirationView: DateTimeEditFieldView
+    private lateinit var searchableContainerView: TextInputLayout
+    private lateinit var searchableView: InheritedCompletionView
+    private lateinit var autoTypeContainerView: ViewGroup
+    private lateinit var autoTypeInheritedView: InheritedCompletionView
+    private lateinit var autoTypeSequenceView: TextView
+    private lateinit var tagsContainerView: TextInputLayout
+    private lateinit var tagsCompletionView: TagsCompletionView
+    private var tagsAdapter: FilteredArrayAdapter<String>? = null
 
     enum class EditGroupDialogAction {
         CREATION, UPDATE, NONE;
@@ -107,10 +118,30 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
 
     override fun onDatabaseRetrieved(database: Database?) {
         super.onDatabaseRetrieved(database)
+
         mPopulateIconMethod = { imageView, icon ->
             database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
         }
         mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
+
+        searchableContainerView.visibility = if (database?.allowCustomSearchableGroup() == true) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+
+        if (database?.allowAutoType() == true) {
+            autoTypeContainerView.visibility = View.VISIBLE
+        } else {
+            autoTypeContainerView.visibility = View.GONE
+        }
+
+        tagsAdapter = TagsProposalAdapter(requireContext(), database?.tagPool)
+        tagsCompletionView.apply {
+            threshold = 1
+            setAdapter(tagsAdapter)
+        }
+        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -122,6 +153,13 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
             notesTextLayoutView = root.findViewById(R.id.group_edit_note_container)
             notesTextView = root.findViewById(R.id.group_edit_note)
             expirationView = root.findViewById(R.id.group_edit_expiration)
+            searchableContainerView = root.findViewById(R.id.group_edit_searchable_container)
+            searchableView = root.findViewById(R.id.group_edit_searchable)
+            autoTypeContainerView = root.findViewById(R.id.group_edit_auto_type_container)
+            autoTypeInheritedView = root.findViewById(R.id.group_edit_auto_type_inherited)
+            autoTypeSequenceView = root.findViewById(R.id.group_edit_auto_type_sequence)
+            tagsContainerView = root.findViewById(R.id.group_tags_label)
+            tagsCompletionView = root.findViewById(R.id.group_tags_completion_view)
 
             // Retrieve the textColor to tint the icon
             val ta = activity.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
@@ -197,6 +235,19 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         }
         expirationView.activation = groupInfo.expires
         expirationView.dateTime = groupInfo.expiryTime
+
+        // Set searchable
+        searchableView.setValue(groupInfo.searchable)
+        // Set auto-type
+        autoTypeInheritedView.setValue(groupInfo.enableAutoType)
+        autoTypeSequenceView.text = groupInfo.defaultAutoTypeSequence
+        // Set Tags
+        groupInfo.tags.let { tags ->
+            tagsCompletionView.setText("")
+            for (i in 0 until tags.size()) {
+                tagsCompletionView.addObjectSync(tags.get(i))
+            }
+        }
     }
 
     private fun retrieveGroupInfoFromViews() {
@@ -208,6 +259,10 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         }
         mGroupInfo.expires = expirationView.activation
         mGroupInfo.expiryTime = expirationView.dateTime
+        mGroupInfo.searchable = searchableView.getValue()
+        mGroupInfo.enableAutoType = autoTypeInheritedView.getValue()
+        mGroupInfo.defaultAutoTypeSequence = autoTypeSequenceView.text.toString()
+        mGroupInfo.tags = tagsCompletionView.getTags()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

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

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2022 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.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.model.MainCredential
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.view.MainCredentialView
+
+class MainCredentialDialogFragment : DatabaseDialogFragment() {
+
+    private var mainCredentialView: MainCredentialView? = null
+
+    private var mListener: AskMainCredentialDialogListener? = null
+
+    private var mExternalFileHelper: ExternalFileHelper? = null
+
+    interface AskMainCredentialDialogListener {
+        fun onAskMainCredentialDialogPositiveClick(databaseUri: Uri?, mainCredential: MainCredential)
+        fun onAskMainCredentialDialogNegativeClick(databaseUri: Uri?, mainCredential: MainCredential)
+    }
+
+    override fun onAttach(activity: Context) {
+        super.onAttach(activity)
+        try {
+            mListener = activity as AskMainCredentialDialogListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(activity.toString()
+                    + " must implement " + AskMainCredentialDialogListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+
+            var databaseUri: Uri? = null
+            arguments?.apply {
+                if (containsKey(KEY_ASK_CREDENTIAL_URI))
+                    databaseUri = getParcelable(KEY_ASK_CREDENTIAL_URI)
+            }
+
+            val builder = AlertDialog.Builder(activity)
+
+            val root = activity.layoutInflater.inflate(R.layout.fragment_main_credential, null)
+            mainCredentialView = root.findViewById(R.id.main_credential_view)
+            databaseUri?.let {
+                root.findViewById<TextView>(R.id.title_database)?.text =
+                    UriUtil.getFileData(requireContext(), it)?.name
+            }
+            builder.setView(root)
+                    // Add action buttons
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        mListener?.onAskMainCredentialDialogPositiveClick(
+                            databaseUri,
+                            retrieveMainCredential()
+                        )
+                    }
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        mListener?.onAskMainCredentialDialogNegativeClick(
+                            databaseUri,
+                            retrieveMainCredential()
+                        )
+                    }
+
+
+            mExternalFileHelper = ExternalFileHelper(this)
+            mExternalFileHelper?.buildOpenDocument { uri ->
+                if (uri != null) {
+                    mainCredentialView?.populateKeyFileTextView(uri)
+                }
+            }
+            mainCredentialView?.setOpenKeyfileClickListener(mExternalFileHelper)
+
+            return builder.create()
+        }
+
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    private fun retrieveMainCredential(): MainCredential {
+        return mainCredentialView?.getMainCredential() ?: MainCredential()
+    }
+
+    companion object {
+
+        private const val KEY_ASK_CREDENTIAL_URI = "KEY_ASK_CREDENTIAL_URI"
+        const val TAG_ASK_MAIN_CREDENTIAL = "TAG_ASK_MAIN_CREDENTIAL"
+
+        fun getInstance(uri: Uri?): MainCredentialDialogFragment {
+            val fragment = MainCredentialDialogFragment()
+            val args = Bundle()
+            args.putParcelable(KEY_ASK_CREDENTIAL_URI, uri)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}

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

@@ -39,7 +39,7 @@ import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 
-class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
+class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
 
     private var mMasterPassword: String? = null
     private var mKeyFile: Uri? = null
@@ -56,7 +56,7 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
     private var keyFileCheckBox: CompoundButton? = null
     private var keyFileSelectionView: KeyFileSelectionView? = null
 
-    private var mListener: AssignPasswordDialogListener? = null
+    private var mListener: AssignMainCredentialDialogListener? = null
 
     private var mExternalFileHelper: ExternalFileHelper? = null
 
@@ -74,7 +74,7 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
         }
     }
 
-    interface AssignPasswordDialogListener {
+    interface AssignMainCredentialDialogListener {
         fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential)
         fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential)
     }
@@ -82,10 +82,10 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
     override fun onAttach(activity: Context) {
         super.onAttach(activity)
         try {
-            mListener = activity as AssignPasswordDialogListener
+            mListener = activity as AssignMainCredentialDialogListener
         } catch (e: ClassCastException) {
             throw ClassCastException(activity.toString()
-                    + " must implement " + AssignPasswordDialogListener::class.java.name)
+                    + " must implement " + AssignMainCredentialDialogListener::class.java.name)
         }
     }
 
@@ -112,7 +112,7 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
             val builder = AlertDialog.Builder(activity)
             val inflater = activity.layoutInflater
 
-            rootView = inflater.inflate(R.layout.fragment_set_password, null)
+            rootView = inflater.inflate(R.layout.fragment_set_main_credential, null)
             builder.setView(rootView)
                     // Add action buttons
                     .setPositiveButton(android.R.string.ok) { _, _ -> }
@@ -254,7 +254,7 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
                     .setPositiveButton(android.R.string.ok) { _, _ ->
                         if (!verifyKeyFile()) {
                             mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                            this@AssignMasterKeyDialogFragment.dismiss()
+                            this@SetMainCredentialDialogFragment.dismiss()
                         }
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
@@ -269,7 +269,7 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
             builder.setMessage(R.string.warning_no_encryption_key)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
                         mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                        this@AssignMasterKeyDialogFragment.dismiss()
+                        this@SetMainCredentialDialogFragment.dismiss()
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
             mNoKeyConfirmationDialog = builder.create()
@@ -301,8 +301,8 @@ class AssignMasterKeyDialogFragment : DatabaseDialogFragment() {
 
         private const val ALLOW_NO_MASTER_KEY_ARG = "ALLOW_NO_MASTER_KEY_ARG"
 
-        fun getInstance(allowNoMasterKey: Boolean): AssignMasterKeyDialogFragment {
-            val fragment = AssignMasterKeyDialogFragment()
+        fun getInstance(allowNoMasterKey: Boolean): SetMainCredentialDialogFragment {
+            val fragment = SetMainCredentialDialogFragment()
             val args = Bundle()
             args.putBoolean(ALLOW_NO_MASTER_KEY_ARG, allowNoMasterKey)
             fragment.arguments = args

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

@@ -204,9 +204,10 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
                     android.R.layout.simple_spinner_item, mHotpTokenTypeArray!!).apply {
                 setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
             }
-            // Proprietary only on closed and full version
+            // Proprietary only on full version
             mTotpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
-                    BuildConfig.CLOSED_STORE && BuildConfig.FULL_VERSION)
+                UriUtil.contributingUser(activity)
+            )
             totpTokenTypeAdapter = ArrayAdapter(activity,
                     android.R.layout.simple_spinner_item, mTotpTokenTypeArray!!).apply {
                 setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)

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

@@ -25,7 +25,6 @@ import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
-import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.utils.UriUtil
 
@@ -40,22 +39,12 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
             val builder = AlertDialog.Builder(activity)
 
             val stringBuilder = SpannableStringBuilder()
-            if (BuildConfig.CLOSED_STORE) {
-                if (BuildConfig.FULL_VERSION) {
+            if (UriUtil.contributingUser(activity)) {
                 stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_thanks), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                         .append(HtmlCompat.fromHtml(getString(R.string.html_rose), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                         .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_work_hard), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
                         .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_upgrade), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
                 builder.setPositiveButton(android.R.string.ok) { _, _ -> dismiss() }
-                } else {
-                    stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
-                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_buy_pro), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
-                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
-                    builder.setPositiveButton(R.string.download) { _, _ ->
-                        UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
-                    }
-                    builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
-                }
             } else {
                 stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                         .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")

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

@@ -29,10 +29,12 @@ import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.ReplaceFileDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
 import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
+import com.kunzisoft.keepass.adapters.TagsProposalAdapter
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.template.Template
@@ -40,11 +42,10 @@ import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.StreamDirection
-import com.kunzisoft.keepass.view.TemplateEditView
-import com.kunzisoft.keepass.view.collapse
-import com.kunzisoft.keepass.view.expand
-import com.kunzisoft.keepass.view.showByFading
+import com.kunzisoft.keepass.view.*
 import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
+import com.tokenautocomplete.FilteredArrayAdapter
+
 
 class EntryEditFragment: DatabaseFragment() {
 
@@ -55,6 +56,9 @@ class EntryEditFragment: DatabaseFragment() {
     private lateinit var attachmentsContainerView: ViewGroup
     private lateinit var attachmentsListView: RecyclerView
     private var attachmentsAdapter: EntryAttachmentsItemsAdapter? = null
+    private lateinit var tagsContainerView: TextInputLayout
+    private lateinit var tagsCompletionView: TagsCompletionView
+    private var tagsAdapter: FilteredArrayAdapter<String>? = null
 
     private var mTemplate: Template? = null
     private var mAllowMultipleAttachments: Boolean = false
@@ -87,6 +91,8 @@ class EntryEditFragment: DatabaseFragment() {
         templateView = view.findViewById(R.id.template_view)
         attachmentsContainerView = view.findViewById(R.id.entry_attachments_container)
         attachmentsListView = view.findViewById(R.id.entry_attachments_list)
+        tagsContainerView = view.findViewById(R.id.entry_tags_label)
+        tagsCompletionView = view.findViewById(R.id.entry_tags_completion_view)
 
         attachmentsAdapter = EntryAttachmentsItemsAdapter(requireContext())
         attachmentsListView.apply {
@@ -146,18 +152,19 @@ class EntryEditFragment: DatabaseFragment() {
         }
 
         mEntryEditViewModel.requestEntryInfoUpdate.observe(viewLifecycleOwner) {
-            mEntryEditViewModel.saveEntryInfo(it.database, it.entry, it.parent, retrieveEntryInfo())
+            val entryInfo = retrieveEntryInfo()
+            mEntryEditViewModel.saveEntryInfo(it.database, it.entry, it.parent, entryInfo)
         }
 
         mEntryEditViewModel.onIconSelected.observe(viewLifecycleOwner) { iconImage ->
             templateView.setIcon(iconImage)
         }
 
-        mEntryEditViewModel.onBackgroundColorSelected.observe(this) { color ->
+        mEntryEditViewModel.onBackgroundColorSelected.observe(viewLifecycleOwner) { color ->
             templateView.setBackgroundColor(color)
         }
 
-        mEntryEditViewModel.onForegroundColorSelected.observe(this) { color ->
+        mEntryEditViewModel.onForegroundColorSelected.observe(viewLifecycleOwner) { color ->
             templateView.setForegroundColor(color)
         }
 
@@ -277,18 +284,34 @@ class EntryEditFragment: DatabaseFragment() {
                 attachmentsContainerView.expand(true)
             }
         }
+
+        tagsAdapter = TagsProposalAdapter(requireContext(), database?.tagPool)
+        tagsCompletionView.apply {
+            threshold = 1
+            setAdapter(tagsAdapter)
+        }
+        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
     }
 
     private fun assignEntryInfo(entryInfo: EntryInfo?) {
         // Populate entry views
         templateView.setEntryInfo(entryInfo)
 
+        // Set Tags
+        entryInfo?.tags?.let { tags ->
+            tagsCompletionView.setText("")
+            for (i in 0 until tags.size()) {
+                tagsCompletionView.addObjectSync(tags.get(i))
+            }
+        }
+
         // Manage attachments
         setAttachments(entryInfo?.attachments ?: listOf())
     }
 
     private fun retrieveEntryInfo(): EntryInfo {
         val entryInfo = templateView.getEntryInfo()
+        entryInfo.tags = tagsCompletionView.getTags()
         entryInfo.attachments = getAttachments().toMutableList()
         return entryInfo
     }

app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt

@@ -16,7 +16,6 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.template.TemplateField
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.EntryInfo
@@ -25,6 +24,7 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.utils.UuidUtil
 import com.kunzisoft.keepass.view.TemplateView
+import com.kunzisoft.keepass.view.hideByFading
 import com.kunzisoft.keepass.view.showByFading
 import com.kunzisoft.keepass.viewmodels.EntryViewModel
 import java.util.*
@@ -32,6 +32,9 @@ import java.util.*
 class EntryFragment: DatabaseFragment() {
 
     private lateinit var rootView: View
+    private lateinit var mainSection: View
+    private lateinit var advancedSection: View
+
     private lateinit var templateView: TemplateView
 
     private lateinit var creationDateView: TextView
@@ -41,6 +44,8 @@ class EntryFragment: DatabaseFragment() {
     private lateinit var attachmentsListView: RecyclerView
     private var attachmentsAdapter: EntryAttachmentsItemsAdapter? = null
 
+    private lateinit var customDataView: TextView
+
     private lateinit var uuidContainerView: View
     private lateinit var uuidReferenceView: TextView
 
@@ -70,6 +75,10 @@ class EntryFragment: DatabaseFragment() {
         if (savedInstanceState == null) {
             view.isVisible = false
         }
+
+        mainSection = view.findViewById(R.id.entry_section_main)
+        advancedSection = view.findViewById(R.id.entry_section_advanced)
+
         templateView = view.findViewById(R.id.entry_template)
         loadTemplateSettings()
 
@@ -83,6 +92,9 @@ class EntryFragment: DatabaseFragment() {
         creationDateView = view.findViewById(R.id.entry_created)
         modificationDateView = view.findViewById(R.id.entry_modified)
 
+        // TODO Custom data
+        // customDataView = view.findViewById(R.id.entry_custom_data)
+
         uuidContainerView = view.findViewById(R.id.entry_UUID_container)
         uuidContainerView.apply {
             visibility = if (PreferencesUtil.showUUID(context)) View.VISIBLE else View.GONE
@@ -106,6 +118,19 @@ class EntryFragment: DatabaseFragment() {
                 }
             }
         }
+
+        mEntryViewModel.sectionSelected.observe(viewLifecycleOwner) { entrySection ->
+            when (entrySection ?: EntryViewModel.EntrySection.MAIN) {
+                EntryViewModel.EntrySection.MAIN -> {
+                    mainSection.showByFading()
+                    advancedSection.hideByFading()
+                }
+                EntryViewModel.EntrySection.ADVANCED -> {
+                    mainSection.hideByFading()
+                    advancedSection.showByFading()
+                }
+            }
+        }
     }
 
     override fun onDatabaseRetrieved(database: Database?) {
@@ -154,11 +179,14 @@ class EntryFragment: DatabaseFragment() {
         assignAttachments(entryInfo?.attachments ?: listOf())
 
         // Assign dates
-        assignCreationDate(entryInfo?.creationTime)
-        assignModificationDate(entryInfo?.lastModificationTime)
+        creationDateView.text = entryInfo?.creationTime?.getDateTimeString(resources)
+        modificationDateView.text = entryInfo?.lastModificationTime?.getDateTimeString(resources)
+
+        // TODO Custom data
+        // customDataView.text = entryInfo?.customData?.toString()
 
         // Assign special data
-        assignUUID(entryInfo?.id)
+        uuidReferenceView.text = UuidUtil.toHexString(entryInfo?.id)
     }
 
     private fun showClipboardDialog() {
@@ -189,18 +217,6 @@ class EntryFragment: DatabaseFragment() {
         templateView.reload()
     }
 
-    private fun assignCreationDate(date: DateInstant?) {
-        creationDateView.text = date?.getDateTimeString(resources)
-    }
-
-    private fun assignModificationDate(date: DateInstant?) {
-        modificationDateView.text = date?.getDateTimeString(resources)
-    }
-
-    private fun assignUUID(uuid: UUID?) {
-        uuidReferenceView.text = UuidUtil.toHexString(uuid)
-    }
-
     /* -------------
      * Attachments
      * -------------

app/src/main/java/com/kunzisoft/keepass/activities/fragments/GroupFragment.kt

@@ -152,7 +152,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                 mAdapter = NodesAdapter(context, database).apply {
                     setOnNodeClickListener(object : NodesAdapter.NodeClickCallback {
                         override fun onNodeClick(database: Database, node: Node) {
-                            if (nodeActionSelectionMode) {
+                            if (mCurrentGroup?.isVirtual == false
+                                && nodeActionSelectionMode) {
                                 if (listActionNodes.contains(node)) {
                                     // Remove selected item if already selected
                                     listActionNodes.remove(node)
@@ -169,7 +170,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                         }
 
                         override fun onNodeLongClick(database: Database, node: Node): Boolean {
-                            if (nodeActionPasteMode == PasteMode.UNDEFINED) {
+                            if (mCurrentGroup?.isVirtual == false
+                                && nodeActionPasteMode == PasteMode.UNDEFINED) {
                                 // Select the first item after a long click
                                 if (!listActionNodes.contains(node))
                                     listActionNodes.add(node)
@@ -257,9 +259,9 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
     private fun rebuildList() {
         try {
             // Add elements to the list
-            mCurrentGroup?.let { mainGroup ->
+            mCurrentGroup?.let { currentGroup ->
                 // Thrown an exception when sort cannot be performed
-                mAdapter?.rebuildList(mainGroup)
+                mAdapter?.rebuildList(currentGroup)
             }
         } catch (e:Exception) {
             Log.e(TAG, "Unable to rebuild the list", e)

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt

@@ -4,9 +4,9 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.viewModels
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.database.action.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
@@ -59,9 +59,9 @@ abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval {
     fun loadDatabase(databaseUri: Uri,
                      mainCredential: MainCredential,
                      readOnly: Boolean,
-                     cipherEntity: CipherDatabaseEntity?,
+                     cipherEncryptDatabase: CipherEncryptDatabase?,
                      fixDuplicateUuid: Boolean) {
-        mDatabaseTaskProvider?.startDatabaseLoad(databaseUri, mainCredential, readOnly, cipherEntity, fixDuplicateUuid)
+        mDatabaseTaskProvider?.startDatabaseLoad(databaseUri, mainCredential, readOnly, cipherEncryptDatabase, fixDuplicateUuid)
     }
 
     protected fun closeDatabase() {

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt

@@ -62,6 +62,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
     private var mExitLock: Boolean = false
 
     protected var mDatabaseReadOnly: Boolean = true
+    protected var mMergeDataAllowed: Boolean = false
     private var mAutoSaveEnable: Boolean = true
 
     protected var mIconDrawableFactory: IconDrawableFactory? = null
@@ -87,9 +88,15 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
             mDatabaseTaskProvider?.startDatabaseSave(save)
         }
 
+        mDatabaseViewModel.mergeDatabase.observe(this) {
+            mDatabaseTaskProvider?.startDatabaseMerge()
+        }
+
         mDatabaseViewModel.reloadDatabase.observe(this) { fixDuplicateUuid ->
+            mDatabaseTaskProvider?.askToStartDatabaseReload(mDatabase?.dataModifiedSinceLastLoading != false) {
                 mDatabaseTaskProvider?.startDatabaseReload(fixDuplicateUuid)
             }
+        }
 
         mDatabaseViewModel.saveName.observe(this) {
             mDatabaseTaskProvider?.startDatabaseSaveName(it.oldValue, it.newValue, it.save)
@@ -197,6 +204,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
             }
 
             mDatabaseReadOnly = database.isReadOnly
+            mMergeDataAllowed = database.isMergeDataAllowed()
             mIconDrawableFactory = database.iconDrawableFactory
 
             checkRegister()
@@ -212,6 +220,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
     ) {
         super.onDatabaseActionFinished(database, actionTask, result)
         when (actionTask) {
+            DatabaseTaskNotificationService.ACTION_DATABASE_MERGE_TASK,
             DatabaseTaskNotificationService.ACTION_DATABASE_RELOAD_TASK -> {
                 // Reload the current activity
                 if (result.isSuccess) {
@@ -254,9 +263,23 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
         mDatabaseTaskProvider?.startDatabaseSave(true)
     }
 
+    fun saveDatabaseTo(uri: Uri) {
+        mDatabaseTaskProvider?.startDatabaseSave(true, uri)
+    }
+
+    fun mergeDatabase() {
+        mDatabaseTaskProvider?.startDatabaseMerge()
+    }
+
+    fun mergeDatabaseFrom(uri: Uri, mainCredential: MainCredential) {
+        mDatabaseTaskProvider?.startDatabaseMerge(uri, mainCredential)
+    }
+
     fun reloadDatabase() {
+        mDatabaseTaskProvider?.askToStartDatabaseReload(mDatabase?.dataModifiedSinceLastLoading != false) {
             mDatabaseTaskProvider?.startDatabaseReload(false)
         }
+    }
 
     fun createEntry(newEntry: Entry,
                     parent: Group) {

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt

@@ -1,6 +1,8 @@
 package com.kunzisoft.keepass.activities.legacy
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.view.View
 import android.widget.Toast
 import com.kunzisoft.keepass.R
@@ -11,6 +13,7 @@ import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.SpecialModeView
 
+
 /**
  * Activity to manage database special mode (ie: selection mode)
  */
@@ -63,8 +66,7 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
             EntrySelectionHelper.removeModesFromIntent(intent)
             EntrySelectionHelper.removeInfoFromIntent(intent)
             if (mSpecialMode != SpecialMode.DEFAULT) {
-                // To move the app in background
-                moveTaskToBack(true)
+                backToTheMainAppAndFinish()
             }
         }
     }
@@ -77,8 +79,7 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
             EntrySelectionHelper.removeModesFromIntent(intent)
             EntrySelectionHelper.removeInfoFromIntent(intent)
             if (mSpecialMode != SpecialMode.DEFAULT) {
-                // To move the app in background
-                moveTaskToBack(true)
+                backToTheMainAppAndFinish()
             }
         }
     }
@@ -88,11 +89,19 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
             // To get the app caller, only for IntentSender
             super.onBackPressed()
         } else {
-            // To move the app in background
-            moveTaskToBack(true)
+            backToTheMainAppAndFinish()
         }
     }
 
+    private fun backToTheMainAppAndFinish() {
+        // To move the app in background and return to the main app
+        moveTaskToBack(true)
+        // To remove this instance in the OS app selector
+        Handler(Looper.getMainLooper()).postDelayed({
+            finish()
+        }, 500)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -160,12 +169,17 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
         }
 
         // To hide home button from the regular toolbar in special mode
-        if (mSpecialMode != SpecialMode.DEFAULT) {
+        if (mSpecialMode != SpecialMode.DEFAULT
+            && hideHomeButtonIfModeIsNotDefault()) {
             supportActionBar?.setDisplayHomeAsUpEnabled(false)
             supportActionBar?.setDisplayShowHomeEnabled(false)
         }
     }
 
+    open fun hideHomeButtonIfModeIsNotDefault(): Boolean {
+        return true
+    }
+
     private fun blockAutofill(searchInfo: SearchInfo?) {
         val webDomain = searchInfo?.webDomain
         val applicationId = searchInfo?.applicationId

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

@@ -69,8 +69,10 @@ object Stylish {
             context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light)
             context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white)
             context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear)
+            context.getString(R.string.list_style_name_simple_night) -> context.getString(R.string.list_style_name_simple)
             context.getString(R.string.list_style_name_blue_night) -> context.getString(R.string.list_style_name_blue)
             context.getString(R.string.list_style_name_red_night) -> context.getString(R.string.list_style_name_red)
+            context.getString(R.string.list_style_name_reply_night) -> context.getString(R.string.list_style_name_reply)
             context.getString(R.string.list_style_name_purple_dark) -> context.getString(R.string.list_style_name_purple)
             else -> styleString
         }
@@ -81,8 +83,10 @@ object Stylish {
             context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night)
             context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black)
             context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark)
+            context.getString(R.string.list_style_name_simple) -> context.getString(R.string.list_style_name_simple_night)
             context.getString(R.string.list_style_name_blue) -> context.getString(R.string.list_style_name_blue_night)
             context.getString(R.string.list_style_name_red) -> context.getString(R.string.list_style_name_red_night)
+            context.getString(R.string.list_style_name_reply) -> context.getString(R.string.list_style_name_reply_night)
             context.getString(R.string.list_style_name_purple) -> context.getString(R.string.list_style_name_purple_dark)
             else -> styleString
         }
@@ -113,10 +117,14 @@ object Stylish {
             context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black
             context.getString(R.string.list_style_name_clear) -> R.style.KeepassDXStyle_Clear
             context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark
+            context.getString(R.string.list_style_name_simple) -> R.style.KeepassDXStyle_Simple
+            context.getString(R.string.list_style_name_simple_night) -> R.style.KeepassDXStyle_Simple_Night
             context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue
             context.getString(R.string.list_style_name_blue_night) -> R.style.KeepassDXStyle_Blue_Night
             context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red
             context.getString(R.string.list_style_name_red_night) -> R.style.KeepassDXStyle_Red_Night
+            context.getString(R.string.list_style_name_reply) -> R.style.KeepassDXStyle_Reply
+            context.getString(R.string.list_style_name_reply_night) -> R.style.KeepassDXStyle_Reply_Night
             context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple
             context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark
             else -> R.style.KeepassDXStyle_Light

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

@@ -23,11 +23,13 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 
 abstract class StylishFragment : Fragment() {
@@ -47,27 +49,41 @@ abstract class StylishFragment : Fragment() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             val window = requireActivity().window
             val defaultColor = Color.BLACK
-
+            val windowInset = WindowInsetsControllerCompat(window, window.decorView)
             try {
                 val taStatusBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
                 window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
                 taStatusBarColor?.recycle()
-            } catch (e: Exception) {}
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to retrieve theme : status bar color", e)
+            }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 try {
                     val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
-                    if (taWindowStatusLight?.getBoolean(0, false) == true) {
-                        @Suppress("DEPRECATION")
-                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                    }
+                    windowInset.isAppearanceLightStatusBars = taWindowStatusLight
+                            ?.getBoolean(0, false) == true
                     taWindowStatusLight?.recycle()
-                } catch (e: Exception) {}
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to retrieve theme : window light status bar", e)
+                }
             }
             try {
                 val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
                 window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
                 taNavigationBarColor?.recycle()
-            } catch (e: Exception) {}
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to retrieve theme : navigation bar color", e)
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+                try {
+                    val taWindowLightNavigationBar = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightNavigationBar))
+                    windowInset.isAppearanceLightNavigationBars = taWindowLightNavigationBar
+                        ?.getBoolean(0, false) == true
+                    taWindowLightNavigationBar?.recycle()
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to retrieve theme : navigation light navigation bar", e)
+                }
+            }
         }
         return super.onCreateView(inflater, container, savedInstanceState)
     }
@@ -76,4 +92,8 @@ abstract class StylishFragment : Fragment() {
         contextThemed = null
         super.onDetach()
     }
+
+    companion object {
+        private val TAG = StylishFragment::class.java.simpleName
+    }
 }

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

@@ -26,11 +26,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -75,6 +73,7 @@ class NodesAdapter (private val context: Context,
     private var mNumberChildrenTextDefaultDimension: Float = 0F
     private var mIconDefaultDimension: Float = 0F
 
+    private var mShowEntryColors: Boolean = true
     private var mShowUserNames: Boolean = true
     private var mShowNumberEntries: Boolean = true
     private var mShowOTP: Boolean = false
@@ -87,8 +86,6 @@ class NodesAdapter (private val context: Context,
     private var mNodeClickCallback: NodeClickCallback? = null
     private var mClipboardHelper = ClipboardHelper(context)
 
-    @ColorInt
-    private val mContentSelectionColor: Int
     @ColorInt
     private val mTextColorPrimary: Int
     @ColorInt
@@ -98,7 +95,7 @@ class NodesAdapter (private val context: Context,
     @ColorInt
     private val mColorAccentLight: Int
     @ColorInt
-    private val mTextColorInverse: Int
+    private val mColorOnAccentColor: Int
 
     /**
      * Determine if the adapter contains or not any element
@@ -115,8 +112,6 @@ class NodesAdapter (private val context: Context,
         this.mNodeSortedListCallback = NodeSortedListCallback()
         this.mNodeSortedList = SortedList(Node::class.java, mNodeSortedListCallback)
 
-        // Color of content selection
-        this.mContentSelectionColor = ContextCompat.getColor(context, R.color.white)
         // Retrieve the color to tint the icon
         val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
         this.mTextColorPrimary = taTextColorPrimary.getColor(0, Color.BLACK)
@@ -130,13 +125,13 @@ class NodesAdapter (private val context: Context,
         this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK)
         taTextColorSecondary.recycle()
         // To get background color for selection
-        val taSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight))
-        this.mColorAccentLight = taSelectionColor.getColor(0, Color.GRAY)
-        taSelectionColor.recycle()
+        val taColorAccentLight = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccentLight))
+        this.mColorAccentLight = taColorAccentLight.getColor(0, Color.GRAY)
+        taColorAccentLight.recycle()
         // To get text color for selection
-        val taSelectionTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        this.mTextColorInverse = taSelectionTextColor.getColor(0, Color.WHITE)
-        taSelectionTextColor.recycle()
+        val taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
+        this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE)
+        taColorOnAccentColor.recycle()
     }
 
     private fun assignPreferences() {
@@ -151,6 +146,7 @@ class NodesAdapter (private val context: Context,
                         )
                 )
 
+        this.mShowEntryColors = PreferencesUtil.showEntryColors(context)
         this.mShowUserNames = PreferencesUtil.showUsernamesListEntries(context)
         this.mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
         this.mShowOTP = PreferencesUtil.showOTPToken(context)
@@ -351,23 +347,6 @@ class NodesAdapter (private val context: Context,
             isSelected = mActionNodesList.contains(subNode)
         }
 
-        // Assign image
-        val iconColor = if (holder.container.isSelected)
-            mContentSelectionColor
-        else when (subNode.type) {
-            Type.GROUP -> mTextColorPrimary
-            Type.ENTRY -> mTextColor
-        }
-        holder.imageIdentifier?.setColorFilter(iconColor)
-        holder.icon.apply {
-            database.iconDrawableFactory.assignDatabaseIcon(this, subNode.icon, iconColor)
-            // Relative size of the icon
-            layoutParams?.apply {
-                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
-                width = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
-            }
-        }
-
         // Assign text
         holder.text.apply {
             text = subNode.title
@@ -395,6 +374,14 @@ class NodesAdapter (private val context: Context,
             holder.path?.visibility = View.GONE
         }
 
+        // Assign icon colors
+        var iconColor = if (holder.container.isSelected)
+            mColorOnAccentColor
+        else when (subNode.type) {
+            Type.GROUP -> mTextColorPrimary
+            Type.ENTRY -> mTextColor
+        }
+
         // Specific elements for entry
         if (subNode.type == Type.ENTRY) {
             val entry = subNode as Entry
@@ -437,7 +424,7 @@ class NodesAdapter (private val context: Context,
                     if (entry.containsAttachment()) View.VISIBLE else View.GONE
 
             // Assign colors
-            val backgroundColor = entry.backgroundColor
+            val backgroundColor = if (mShowEntryColors) entry.backgroundColor else null
             if (!holder.container.isSelected) {
                 if (backgroundColor != null) {
                     holder.container.setBackgroundColor(backgroundColor)
@@ -447,7 +434,7 @@ class NodesAdapter (private val context: Context,
             } else {
                 holder.container.setBackgroundColor(mColorAccentLight)
             }
-            val foregroundColor = entry.foregroundColor
+            val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
             if (!holder.container.isSelected) {
                 if (foregroundColor != null) {
                     holder.text.setTextColor(foregroundColor)
@@ -456,13 +443,7 @@ class NodesAdapter (private val context: Context,
                     holder.otpProgress?.setIndicatorColor(foregroundColor)
                     holder.attachmentIcon?.setColorFilter(foregroundColor)
                     holder.meta.setTextColor(foregroundColor)
-                    holder.icon.apply {
-                        database.iconDrawableFactory.assignDatabaseIcon(
-                            this,
-                            subNode.icon,
-                            foregroundColor
-                        )
-                    }
+                    iconColor = foregroundColor
                 } else {
                     holder.text.setTextColor(mTextColor)
                     holder.subText?.setTextColor(mTextColorSecondary)
@@ -472,12 +453,12 @@ class NodesAdapter (private val context: Context,
                     holder.meta.setTextColor(mTextColor)
                 }
             } else {
-                holder.text.setTextColor(mTextColorInverse)
-                holder.subText?.setTextColor(mTextColorInverse)
-                holder.otpToken?.setTextColor(mTextColorInverse)
-                holder.otpProgress?.setIndicatorColor(mTextColorInverse)
-                holder.attachmentIcon?.setColorFilter(mTextColorInverse)
-                holder.meta.setTextColor(mTextColorInverse)
+                holder.text.setTextColor(mColorOnAccentColor)
+                holder.subText?.setTextColor(mColorOnAccentColor)
+                holder.otpToken?.setTextColor(mColorOnAccentColor)
+                holder.otpProgress?.setIndicatorColor(mColorOnAccentColor)
+                holder.attachmentIcon?.setColorFilter(mColorOnAccentColor)
+                holder.meta.setTextColor(mColorOnAccentColor)
             }
 
             database.stopManageEntry(entry)
@@ -498,6 +479,17 @@ class NodesAdapter (private val context: Context,
             }
         }
 
+        // Assign image
+        holder.imageIdentifier?.setColorFilter(iconColor)
+        holder.icon.apply {
+            database.iconDrawableFactory.assignDatabaseIcon(this, subNode.icon, iconColor)
+            // Relative size of the icon
+            layoutParams?.apply {
+                height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
+                width = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()
+            }
+        }
+
         // Assign click
         holder.container.setOnClickListener {
             mNodeClickCallback?.onNodeClick(database, subNode)

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

@@ -1,180 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import android.database.Cursor
-import android.graphics.Color
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.cursor.EntryCursorKDB
-import com.kunzisoft.keepass.database.cursor.EntryCursorKDBX
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.database.DatabaseKDB
-import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
-import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.strikeOut
-
-class SearchEntryCursorAdapter(private val context: Context,
-                               private val database: Database)
-    : androidx.cursoradapter.widget.CursorAdapter(context, null, FLAG_REGISTER_CONTENT_OBSERVER) {
-
-    private val cursorInflater: LayoutInflater? = context.getSystemService(
-            Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
-    private var mDisplayUsername: Boolean = false
-    private var mOmitBackup: Boolean = true
-    private val iconColor: Int
-
-    init {
-        // Get the icon color
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        this.iconColor = taTextColor.getColor(0, Color.WHITE)
-        taTextColor.recycle()
-
-        reInit(context)
-    }
-
-    fun reInit(context: Context) {
-        this.mDisplayUsername = PreferencesUtil.showUsernamesListEntries(context)
-        this.mOmitBackup = PreferencesUtil.omitBackup(context)
-    }
-
-    override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
-
-        val view = cursorInflater!!.inflate(R.layout.item_search_entry, parent, false)
-        val viewHolder = ViewHolder()
-        viewHolder.imageViewIcon = view.findViewById(R.id.entry_icon)
-        viewHolder.textViewTitle = view.findViewById(R.id.entry_text)
-        viewHolder.textViewSubTitle = view.findViewById(R.id.entry_subtext)
-        view.tag = viewHolder
-
-        return view
-    }
-
-    override fun bindView(view: View, context: Context, cursor: Cursor) {
-        getEntryFrom(cursor)?.let { currentEntry ->
-            val viewHolder = view.tag as ViewHolder
-
-            // Assign image
-            viewHolder.imageViewIcon?.let { iconView ->
-                database.iconDrawableFactory.assignDatabaseIcon(iconView, currentEntry.icon, iconColor)
-            }
-
-            // Assign title
-            viewHolder.textViewTitle?.apply {
-                text = currentEntry.getVisualTitle()
-                strikeOut(currentEntry.isCurrentlyExpires)
-            }
-
-            // Assign subtitle
-            viewHolder.textViewSubTitle?.apply {
-                val entryUsername = currentEntry.username
-                text = if (mDisplayUsername && entryUsername.isNotEmpty()) {
-                    String.format("(%s)", entryUsername)
-                } else {
-                    ""
-                }
-                visibility = if (text.isEmpty()) View.GONE else View.VISIBLE
-                strikeOut(currentEntry.isCurrentlyExpires)
-            }
-        }
-    }
-
-    private fun getEntryFrom(cursor: Cursor): Entry? {
-        return database.createEntry()?.apply {
-            entryKDB?.let { entryKDB ->
-                (cursor as EntryCursorKDB).populateEntry(entryKDB,
-                        { standardIconId ->
-                            database.getStandardIcon(standardIconId)
-                        },
-                        { customIconId ->
-                            database.getCustomIcon(customIconId)
-                        }
-                )
-            }
-            entryKDBX?.let { entryKDBX ->
-                (cursor as EntryCursorKDBX).populateEntry(entryKDBX,
-                        { standardIconId ->
-                            database.getStandardIcon(standardIconId)
-                        },
-                        { customIconId ->
-                            database.getCustomIcon(customIconId)
-                        }
-                )
-            }
-        }
-    }
-
-    override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor? {
-        return searchEntries(context, constraint.toString())
-    }
-
-    private fun searchEntries(context: Context, query: String): Cursor? {
-        var cursorKDB: EntryCursorKDB? = null
-        var cursorKDBX: EntryCursorKDBX? = null
-
-        if (database.type == DatabaseKDB.TYPE)
-            cursorKDB = EntryCursorKDB()
-        if (database.type == DatabaseKDBX.TYPE)
-            cursorKDBX = EntryCursorKDBX()
-
-        val searchGroup = database.createVirtualGroupFromSearch(query,
-                mOmitBackup,
-                SearchHelper.MAX_SEARCH_ENTRY)
-        if (searchGroup != null) {
-            // Search in hide entries but not meta-stream
-            for (entry in searchGroup.getFilteredChildEntries(Group.ChildFilter.getDefaults(context))) {
-                database.startManageEntry(entry)
-                entry.entryKDB?.let {
-                    cursorKDB?.addEntry(it)
-                }
-                entry.entryKDBX?.let {
-                    cursorKDBX?.addEntry(it)
-                }
-                database.stopManageEntry(entry)
-            }
-        }
-
-        return cursorKDB ?: cursorKDBX
-    }
-
-    fun getEntryFromPosition(position: Int): Entry? {
-        var pwEntry: Entry? = null
-
-        val cursor = this.cursor
-        if (cursor.moveToFirst() && cursor.move(position)) {
-            pwEntry = getEntryFrom(cursor)
-        }
-        return pwEntry
-    }
-
-    private class ViewHolder {
-        var imageViewIcon: ImageView? = null
-        var textViewTitle: TextView? = null
-        var textViewSubTitle: TextView? = null
-    }
-}

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

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Tags
+
+class TagsAdapter(context: Context) : RecyclerView.Adapter<TagsAdapter.TagViewHolder>() {
+
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private var mTags: Tags = Tags()
+    var onItemClickListener: OnItemClickListener? = null
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TagViewHolder {
+        val view = inflater.inflate(R.layout.item_tag, parent, false)
+        return TagViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TagViewHolder, position: Int) {
+        val field = mTags.get(position)
+        holder.name.text = field
+        holder.bind(field, onItemClickListener)
+    }
+
+    override fun getItemCount(): Int {
+        return mTags.size()
+    }
+
+    fun setTags(tags: Tags) {
+        mTags.setTags(tags)
+        notifyDataSetChanged()
+    }
+
+    fun clear() {
+        mTags.clear()
+    }
+
+    interface OnItemClickListener {
+        fun onItemClick(item: String)
+    }
+
+    inner class TagViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        var name: TextView = itemView.findViewById(R.id.tag_name)
+
+        fun bind(item: String, listener: OnItemClickListener?) {
+            itemView.setOnClickListener { listener?.onItemClick(item) }
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import com.kunzisoft.keepass.database.element.Tags
+import com.tokenautocomplete.FilteredArrayAdapter
+
+class TagsProposalAdapter(context: Context, proposal: Tags?)
+    : FilteredArrayAdapter<String>(
+    context,
+    android.R.layout.simple_list_item_1,
+    (proposal ?: Tags()).toList()
+) {
+
+    override fun keepObject(obj: String, mask: String?): Boolean {
+        if (mask == null)
+            return false
+        return obj.contains(mask, true)
+    }
+}

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

@@ -9,23 +9,23 @@ import android.widget.BaseAdapter
 import android.widget.ImageView
 import android.widget.TextView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.template.Template
 import com.kunzisoft.keepass.database.element.template.TemplateField
 import com.kunzisoft.keepass.icons.IconDrawableFactory
 
 
-class TemplatesSelectorAdapter(private val context: Context,
+class TemplatesSelectorAdapter(
+    context: Context,
     private var templates: List<Template>): BaseAdapter() {
 
     var iconDrawableFactory: IconDrawableFactory? = null
     private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var mIconColor = Color.BLACK
+    private var mTextColor = Color.BLACK
 
     init {
-        val taIconColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        mIconColor = taIconColor.getColor(0, Color.BLACK)
-        taIconColor.recycle()
+        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        mTextColor = taTextColor.getColor(0, Color.BLACK)
+        taTextColor.recycle()
     }
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
@@ -36,6 +36,7 @@ class TemplatesSelectorAdapter(private val context: Context,
         if (templateView == null) {
             holder = TemplateSelectorViewHolder()
             templateView = inflater.inflate(R.layout.item_template, parent, false)
+            holder.background = templateView?.findViewById(R.id.template_background)
             holder.icon = templateView?.findViewById(R.id.template_image)
             holder.name = templateView?.findViewById(R.id.template_name)
             templateView?.tag = holder
@@ -43,10 +44,15 @@ class TemplatesSelectorAdapter(private val context: Context,
             holder = templateView.tag as TemplateSelectorViewHolder
         }
 
+        holder.background?.setBackgroundColor(template.backgroundColor ?: Color.TRANSPARENT)
+        val textColor = template.foregroundColor ?: mTextColor
         holder.icon?.let { icon ->
-            iconDrawableFactory?.assignDatabaseIcon(icon, template.icon, mIconColor)
+            iconDrawableFactory?.assignDatabaseIcon(icon, template.icon, textColor)
+        }
+        holder.name?.apply {
+            setTextColor(textColor)
+            text = TemplateField.getLocalizedName(context, template.title)
         }
-        holder.name?.text = TemplateField.getLocalizedName(context, template.title)
 
         return templateView!!
     }
@@ -64,6 +70,7 @@ class TemplatesSelectorAdapter(private val context: Context,
     }
 
     inner class TemplateSelectorViewHolder {
+        var background: View? = null
         var icon: ImageView? = null
         var name: TextView? = null
     }

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

@@ -22,7 +22,9 @@ package com.kunzisoft.keepass.app.database
 import android.content.*
 import android.net.Uri
 import android.os.IBinder
+import android.util.Base64
 import android.util.Log
+import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
@@ -125,15 +127,41 @@ class CipherDatabaseAction(context: Context) {
     }
 
     fun getCipherDatabase(databaseUri: Uri,
-                          cipherDatabaseResultListener: (CipherDatabaseEntity?) -> Unit) {
+                          cipherDatabaseResultListener: (CipherEncryptDatabase?) -> Unit) {
         if (useTempDao) {
             serviceActionTask {
-                cipherDatabaseResultListener.invoke(mBinder?.getCipherDatabase(databaseUri))
+                var cipherDatabase: CipherEncryptDatabase? = null
+                mBinder?.getCipherDatabase(databaseUri)?.let { cipherDatabaseEntity ->
+                    cipherDatabase = CipherEncryptDatabase().apply {
+                        this.databaseUri = Uri.parse(cipherDatabaseEntity.databaseUri)
+                        this.encryptedValue = Base64.decode(
+                            cipherDatabaseEntity.encryptedValue,
+                            Base64.NO_WRAP
+                        )
+                        this.specParameters = Base64.decode(
+                            cipherDatabaseEntity.specParameters,
+                            Base64.NO_WRAP
+                        )
+                    }
+                }
+                cipherDatabaseResultListener.invoke(cipherDatabase)
             }
         } else {
             IOActionTask(
                     {
-                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())
+                        cipherDatabaseDao.getByDatabaseUri(databaseUri.toString())?.let { cipherDatabaseEntity ->
+                            CipherEncryptDatabase().apply {
+                                this.databaseUri = Uri.parse(cipherDatabaseEntity.databaseUri)
+                                this.encryptedValue = Base64.decode(
+                                    cipherDatabaseEntity.encryptedValue,
+                                    Base64.NO_WRAP
+                                )
+                                this.specParameters = Base64.decode(
+                                    cipherDatabaseEntity.specParameters,
+                                    Base64.NO_WRAP
+                                )
+                            }
+                        }
                     },
                     {
                         cipherDatabaseResultListener.invoke(it)
@@ -149,8 +177,16 @@ class CipherDatabaseAction(context: Context) {
         }
     }
 
-    fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
+    fun addOrUpdateCipherDatabase(cipherEncryptDatabase: CipherEncryptDatabase,
                                   cipherDatabaseResultListener: (() -> Unit)? = null) {
+        cipherEncryptDatabase.databaseUri?.let { databaseUri ->
+
+            val cipherDatabaseEntity = CipherDatabaseEntity(
+                databaseUri.toString(),
+                Base64.encodeToString(cipherEncryptDatabase.encryptedValue, Base64.NO_WRAP),
+                Base64.encodeToString(cipherEncryptDatabase.specParameters, Base64.NO_WRAP),
+            )
+
             if (useTempDao) {
                 // The only case to create service (not needed to get an info)
                 serviceActionTask(true) {
@@ -160,7 +196,8 @@ class CipherDatabaseAction(context: Context) {
             } else {
                 IOActionTask(
                     {
-                        val cipherDatabaseRetrieve = cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
+                        val cipherDatabaseRetrieve =
+                            cipherDatabaseDao.getByDatabaseUri(cipherDatabaseEntity.databaseUri)
                         // Update values if element not yet in the database
                         if (cipherDatabaseRetrieve == null) {
                             cipherDatabaseDao.add(cipherDatabaseEntity)
@@ -174,6 +211,7 @@ class CipherDatabaseAction(context: Context) {
                 ).execute()
             }
         }
+    }
 
     fun deleteByDatabaseUri(databaseUri: Uri,
                             cipherDatabaseResultListener: (() -> Unit)? = null) {

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

@@ -377,10 +377,12 @@ class StructureParser(private val structure: AssistStructure) {
                 when {
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
+                        if (usernameIdCandidate == null) {
                             usernameIdCandidate = autofillId
                             usernameValueCandidate = node.autofillValue
                             Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
                         }
+                    }
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
                         result?.passwordId = autofillId

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

@@ -40,8 +40,13 @@ import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.database.exception.IODatabaseException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
+import com.kunzisoft.keepass.model.CipherDecryptDatabase
+import com.kunzisoft.keepass.model.CipherEncryptDatabase
+import com.kunzisoft.keepass.model.CredentialStorage
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
+import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.view.showByFading
 import com.kunzisoft.keepass.viewmodels.AdvancedUnlockViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -60,6 +65,9 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
     var databaseFileUri: Uri? = null
         private set
 
+    // TODO Retrieve credential storage from app database
+    var credentialDatabaseStorage: CredentialStorage = CredentialStorage.DEFAULT
+
     /**
      * Manage setting to auto open biometric prompt
      */
@@ -477,6 +485,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
         } ?: checkUnlockAvailability()
     }
 
+    @RequiresApi(Build.VERSION_CODES.M)
     override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
         lifecycleScope.launch(Dispatchers.Main) {
             Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
@@ -528,16 +537,29 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
         }
     }
 
-    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {
+    override fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray) {
         databaseFileUri?.let { databaseUri ->
-            mBuilderListener?.onCredentialEncrypted(databaseUri, encryptedValue, ivSpec)
+            mBuilderListener?.onCredentialEncrypted(
+                CipherEncryptDatabase().apply {
+                    this.databaseUri = databaseUri
+                    this.credentialStorage = credentialDatabaseStorage
+                    this.encryptedValue = encryptedValue
+                    this.specParameters = ivSpec
+                }
+            )
         }
     }
 
-    override fun handleDecryptedResult(decryptedValue: String) {
+    override fun handleDecryptedResult(decryptedValue: ByteArray) {
         // Load database directly with password retrieve
-        databaseFileUri?.let {
-            mBuilderListener?.onCredentialDecrypted(it, decryptedValue)
+        databaseFileUri?.let { databaseUri ->
+            mBuilderListener?.onCredentialDecrypted(
+                CipherDecryptDatabase().apply {
+                    this.databaseUri = databaseUri
+                    this.credentialStorage = credentialDatabaseStorage
+                    this.decryptedValue = decryptedValue
+                }
+            )
         }
     }
 
@@ -551,6 +573,7 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
         setAdvancedUnlockedMessageView(R.string.advanced_unlock_invalid_key)
     }
 
+    @RequiresApi(Build.VERSION_CODES.M)
     override fun onGenericException(e: Exception) {
         val errorMessage = e.cause?.localizedMessage ?: e.localizedMessage ?: ""
         setAdvancedUnlockedMessageView(errorMessage)
@@ -558,10 +581,13 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
 
     private fun showViews(show: Boolean) {
         lifecycleScope.launch(Dispatchers.Main) {
-            mAdvancedUnlockInfoView?.visibility = if (show)
-                View.VISIBLE
+            if (show) {
+                if (mAdvancedUnlockInfoView?.visibility != View.VISIBLE)
+                    mAdvancedUnlockInfoView?.showByFading()
+            }
             else {
-                View.GONE
+                if (mAdvancedUnlockInfoView?.visibility == View.VISIBLE)
+                    mAdvancedUnlockInfoView?.hideByFading()
             }
         }
     }
@@ -580,32 +606,13 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.M)
     private fun setAdvancedUnlockedMessageView(text: CharSequence) {
         lifecycleScope.launch(Dispatchers.Main) {
             mAdvancedUnlockInfoView?.message = text
         }
     }
 
-    fun performEducation(passwordActivityEducation: PasswordActivityEducation,
-                         readOnlyEducationPerformed: Boolean,
-                         onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
-                         onOuterViewClick: ((TapTargetView?) -> Unit)? = null) {
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                    && !readOnlyEducationPerformed) {
-                val biometricCanAuthenticate = AdvancedUnlockManager.canAuthenticate(requireContext())
-                PreferencesUtil.isAdvancedUnlockEnable(requireContext())
-                        && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
-                        || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
-                        && mAdvancedUnlockInfoView != null && mAdvancedUnlockInfoView?.visibility == View.VISIBLE
-                        && mAdvancedUnlockInfoView?.unlockIconImageView != null
-                        && passwordActivityEducation.checkAndPerformedBiometricEducation(mAdvancedUnlockInfoView!!.unlockIconImageView!!,
-                        onEducationViewClick,
-                        onOuterViewClick)
-            }
-        } catch (ignored: Exception) {}
-    }
-
     enum class Mode {
         BIOMETRIC_UNAVAILABLE,
         BIOMETRIC_SECURITY_UPDATE_REQUIRED,
@@ -617,10 +624,10 @@ class AdvancedUnlockFragment: StylishFragment(), AdvancedUnlockManager.AdvancedU
     }
 
     interface BuilderListener {
-        fun retrieveCredentialForEncryption(): String
+        fun retrieveCredentialForEncryption(): ByteArray
         fun conditionToStoreCredential(): Boolean
-        fun onCredentialEncrypted(databaseUri: Uri, encryptedCredential: String, ivSpec: String)
-        fun onCredentialDecrypted(databaseUri: Uri, decryptedCredential: String)
+        fun onCredentialEncrypted(cipherEncryptDatabase: CipherEncryptDatabase)
+        fun onCredentialDecrypted(cipherDecryptDatabase: CipherDecryptDatabase)
     }
 
     override fun onPause() {

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

@@ -27,7 +27,6 @@ import android.os.Build
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyPermanentlyInvalidatedException
 import android.security.keystore.KeyProperties
-import android.util.Base64
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
@@ -125,7 +124,7 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    private fun getSecretKey(): SecretKey? {
+    @Synchronized private fun getSecretKey(): SecretKey? {
         if (!isKeyManagerInitialized) {
             return null
         }
@@ -142,8 +141,8 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
                                 KeyGenParameterSpec.Builder(
                                     ADVANCED_UNLOCK_KEYSTORE_KEY,
                                     KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
-                                    .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
-                                    .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
+                                    .setBlockModes(ADVANCED_UNLOCK_BLOCKS_MODES)
+                                    .setEncryptionPaddings(ADVANCED_UNLOCK_ENCRYPTION_PADDING)
                                     .apply {
                                         // Require the user to authenticate with a fingerprint to authorize every use
                                         // of the key, don't use it for device credential because it's the user authentication
@@ -174,11 +173,11 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         return null
     }
 
-    fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,) {
+    @Synchronized fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,) {
         initEncryptData(actionIfCypherInit, true)
     }
 
-    private fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
+    @Synchronized private fun initEncryptData(actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
                                 firstLaunch: Boolean) {
         if (!isKeyManagerInitialized) {
             return
@@ -214,18 +213,15 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    fun encryptData(value: String) {
+    @Synchronized fun encryptData(value: ByteArray) {
         if (!isKeyManagerInitialized) {
             return
         }
         try {
-            val encrypted = cipher?.doFinal(value.toByteArray())
-            val encryptedBase64 = Base64.encodeToString(encrypted, Base64.NO_WRAP)
-
+            val encrypted = cipher?.doFinal(value) ?: byteArrayOf()
             // passes updated iv spec on to callback so this can be stored for decryption
             cipher?.parameters?.getParameterSpec(IvParameterSpec::class.java)?.let{ spec ->
-                val ivSpecValue = Base64.encodeToString(spec.iv, Base64.NO_WRAP)
-                advancedUnlockCallback?.handleEncryptedResult(encryptedBase64, ivSpecValue)
+                advancedUnlockCallback?.handleEncryptedResult(encrypted, spec.iv)
             }
         } catch (e: Exception) {
             Log.e(TAG, "Unable to encrypt data", e)
@@ -233,12 +229,12 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    fun initDecryptData(ivSpecValue: String,
+    @Synchronized fun initDecryptData(ivSpecValue: ByteArray,
                         actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit) {
         initDecryptData(ivSpecValue, actionIfCypherInit, true)
     }
 
-    private fun initDecryptData(ivSpecValue: String,
+    @Synchronized private fun initDecryptData(ivSpecValue: ByteArray,
                         actionIfCypherInit: (cryptoPrompt: AdvancedUnlockCryptoPrompt) -> Unit,
                         firstLaunch: Boolean = true) {
         if (!isKeyManagerInitialized) {
@@ -246,9 +242,7 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
         try {
             // important to restore spec here that was used for decryption
-            val iv = Base64.decode(ivSpecValue, Base64.NO_WRAP)
-            val spec = IvParameterSpec(iv)
-
+            val spec = IvParameterSpec(ivSpecValue)
             getSecretKey()?.let { secretKey ->
                 cipher?.let { cipher ->
                     cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
@@ -284,15 +278,14 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    fun decryptData(encryptedValue: String) {
+    @Synchronized fun decryptData(encryptedValue: ByteArray) {
         if (!isKeyManagerInitialized) {
             return
         }
         try {
             // actual decryption here
-            val encrypted = Base64.decode(encryptedValue, Base64.NO_WRAP)
-            cipher?.doFinal(encrypted)?.let { decrypted ->
-                advancedUnlockCallback?.handleDecryptedResult(String(decrypted))
+            cipher?.doFinal(encryptedValue)?.let { decrypted ->
+                advancedUnlockCallback?.handleDecryptedResult(decrypted)
             }
         } catch (badPaddingException: BadPaddingException) {
             Log.e(TAG, "Unable to decrypt data", badPaddingException)
@@ -303,7 +296,7 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    fun deleteKeystoreKey() {
+    @Synchronized fun deleteKeystoreKey() {
         try {
             keyStore?.load(null)
             keyStore?.deleteEntry(ADVANCED_UNLOCK_KEYSTORE_KEY)
@@ -313,7 +306,7 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt,
+    @Synchronized fun openAdvancedUnlockPrompt(cryptoPrompt: AdvancedUnlockCryptoPrompt,
                                  deviceCredentialResultLauncher: ActivityResultLauncher<Intent>
     ) {
         // Init advanced unlock prompt
@@ -353,7 +346,7 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         }
     }
 
-    fun closeBiometricPrompt() {
+    @Synchronized fun closeBiometricPrompt() {
         biometricPrompt?.cancelAuthentication()
     }
 
@@ -367,8 +360,8 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
         fun onAuthenticationSucceeded()
         fun onAuthenticationFailed()
         fun onAuthenticationError(errorCode: Int, errString: CharSequence)
-        fun handleEncryptedResult(encryptedValue: String, ivSpec: String)
-        fun handleDecryptedResult(decryptedValue: String)
+        fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray)
+        fun handleDecryptedResult(decryptedValue: ByteArray)
     }
 
     companion object {
@@ -469,9 +462,9 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
 
                     override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {}
 
-                    override fun handleEncryptedResult(encryptedValue: String, ivSpec: String) {}
+                    override fun handleEncryptedResult(encryptedValue: ByteArray, ivSpec: ByteArray) {}
 
-                    override fun handleDecryptedResult(decryptedValue: String) {}
+                    override fun handleDecryptedResult(decryptedValue: ByteArray) {}
 
                     override fun onUnrecoverableKeyException(e: Exception) {
                         advancedCallback.onUnrecoverableKeyException(e)

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

@@ -27,7 +27,7 @@ import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil
 
-open class AssignPasswordInDatabaseRunnable (
+open class AssignMainCredentialInDatabaseRunnable (
         context: Context,
         database: Database,
         protected val mDatabaseUri: Uri,
@@ -43,7 +43,7 @@ open class AssignPasswordInDatabaseRunnable (
             System.arraycopy(database.masterKey, 0, mBackupKey!!, 0, mBackupKey!!.size)
 
             val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mMainCredential.keyFileUri)
-            database.retrieveMasterKey(mMainCredential.masterPassword, uriInputStream)
+            database.assignMasterKey(mMainCredential.masterPassword, uriInputStream)
         } catch (e: Exception) {
             erase(mBackupKey)
             setError(e)

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

@@ -35,7 +35,7 @@ class CreateDatabaseRunnable(context: Context,
                              private val templateGroupName: String?,
                              mainCredential: MainCredential,
                              private val createDatabaseResult: ((Result) -> Unit)?)
-    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {
+    : AssignMainCredentialInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {
 
     override fun onStartRun() {
         try {

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

@@ -27,12 +27,12 @@ import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
-import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
 import com.kunzisoft.keepass.database.element.Database
@@ -42,6 +42,7 @@ import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 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.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
@@ -53,6 +54,7 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MERGE_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK
@@ -82,7 +84,6 @@ import com.kunzisoft.keepass.utils.DATABASE_START_TASK_ACTION
 import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
 import kotlinx.coroutines.launch
 import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * Utility class to connect an activity or a service to the DatabaseTaskNotificationService,
@@ -342,18 +343,27 @@ class DatabaseTaskProvider {
     fun startDatabaseLoad(databaseUri: Uri,
                           mainCredential: MainCredential,
                           readOnly: Boolean,
-                          cipherEntity: CipherDatabaseEntity?,
+                          cipherEncryptDatabase: CipherEncryptDatabase?,
                           fixDuplicateUuid: Boolean) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
             putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
             putBoolean(DatabaseTaskNotificationService.READ_ONLY_KEY, readOnly)
-            putParcelable(DatabaseTaskNotificationService.CIPHER_ENTITY_KEY, cipherEntity)
+            putParcelable(DatabaseTaskNotificationService.CIPHER_DATABASE_KEY, cipherEncryptDatabase)
             putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
         }
                 , ACTION_DATABASE_LOAD_TASK)
     }
 
+    fun startDatabaseMerge(fromDatabaseUri: Uri? = null,
+                           mainCredential: MainCredential? = null) {
+        start(Bundle().apply {
+            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, fromDatabaseUri)
+            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
+        }
+            , ACTION_DATABASE_MERGE_TASK)
+    }
+
     fun startDatabaseReload(fixDuplicateUuid: Boolean) {
         start(Bundle().apply {
             putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
@@ -361,6 +371,19 @@ class DatabaseTaskProvider {
                 , ACTION_DATABASE_RELOAD_TASK)
     }
 
+    fun askToStartDatabaseReload(conditionToAsk: Boolean, approved: () -> Unit) {
+        if (conditionToAsk) {
+            AlertDialog.Builder(context)
+                .setMessage(R.string.warning_database_info_reloaded)
+                .setNegativeButton(android.R.string.cancel, null)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    approved.invoke()
+                }.create().show()
+        } else {
+            approved.invoke()
+        }
+    }
+
     fun startDatabaseAssignPassword(databaseUri: Uri,
                                     mainCredential: MainCredential) {
 
@@ -671,9 +694,10 @@ class DatabaseTaskProvider {
     /**
      * Save Database without parameter
      */
-    fun startDatabaseSave(save: Boolean) {
+    fun startDatabaseSave(save: Boolean, saveToUri: Uri? = null) {
         start(Bundle().apply {
             putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
+            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, saveToUri)
         }
                 , ACTION_DATABASE_SAVE)
     }

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

@@ -22,12 +22,11 @@ package com.kunzisoft.keepass.database.action
 import android.content.Context
 import android.net.Uri
 import com.kunzisoft.keepass.app.database.CipherDatabaseAction
-import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.element.binary.LoadedKey
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
+import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
@@ -39,7 +38,7 @@ class LoadDatabaseRunnable(private val context: Context,
                            private val mUri: Uri,
                            private val mMainCredential: MainCredential,
                            private val mReadonly: Boolean,
-                           private val mCipherEntity: CipherDatabaseEntity?,
+                           private val mCipherEncryptDatabase: CipherEncryptDatabase?,
                            private val mFixDuplicateUUID: Boolean,
                            private val progressTaskUpdater: ProgressTaskUpdater?,
                            private val mLoadDatabaseResult: ((Result) -> Unit)?)
@@ -60,7 +59,6 @@ class LoadDatabaseRunnable(private val context: Context,
                     { memoryWanted ->
                         BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
                     },
-                    LoadedKey.generateNewCipherKey(),
                     mFixDuplicateUUID,
                     progressTaskUpdater)
         }
@@ -77,9 +75,9 @@ class LoadDatabaseRunnable(private val context: Context,
             }
 
             // Register the biometric
-            mCipherEntity?.let { cipherDatabaseEntity ->
+            mCipherEncryptDatabase?.let { cipherDatabase ->
                 CipherDatabaseAction.getInstance(context)
-                        .addOrUpdateCipherDatabase(cipherDatabaseEntity) // return value not called
+                        .addOrUpdateCipherDatabase(cipherDatabase) // return value not called
             }
 
             // Register the current time to init the lock timer

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

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

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

@@ -22,7 +22,6 @@ package com.kunzisoft.keepass.database.action
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.element.binary.LoadedKey
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
@@ -35,23 +34,18 @@ class ReloadDatabaseRunnable(private val context: Context,
                              private val mLoadDatabaseResult: ((Result) -> Unit)?)
     : ActionRunnable() {
 
-    private var tempCipherKey: LoadedKey? = null
-
     override fun onStartRun() {
-        tempCipherKey = mDatabase.binaryCache.loadedCipherKey
         // Clear before we load
-        mDatabase.clear(UriUtil.getBinaryDir(context))
+        mDatabase.clearIndexesAndBinaries(UriUtil.getBinaryDir(context))
         mDatabase.wasReloaded = true
     }
 
     override fun onActionRun() {
         try {
             mDatabase.reloadData(context.contentResolver,
-                    UriUtil.getBinaryDir(context),
                     { memoryWanted ->
                         BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
                     },
-                    tempCipherKey ?: LoadedKey.generateNewCipherKey(),
                     progressTaskUpdater)
         } catch (e: LoadDatabaseException) {
             setError(e)
@@ -61,7 +55,6 @@ class ReloadDatabaseRunnable(private val context: Context,
             // Register the current time to init the lock timer
             PreferencesUtil.saveCurrentTime(context)
         } else {
-            tempCipherKey = null
             mDatabase.clearAndClose(context)
         }
     }

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

@@ -20,13 +20,15 @@
 package com.kunzisoft.keepass.database.action
 
 import android.content.Context
+import android.net.Uri
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DatabaseException
 import com.kunzisoft.keepass.tasks.ActionRunnable
 
 open class SaveDatabaseRunnable(protected var context: Context,
                                 protected var database: Database,
-                                private var saveDatabase: Boolean)
+                                private var saveDatabase: Boolean,
+                                private var databaseCopyUri: Uri? = null)
     : ActionRunnable() {
 
     var mAfterSaveDatabase: ((Result) -> Unit)? = null
@@ -34,9 +36,10 @@ open class SaveDatabaseRunnable(protected var context: Context,
     override fun onStartRun() {}
 
     override fun onActionRun() {
+        database.checkVersion()
         if (saveDatabase && result.isSuccess) {
             try {
-                database.saveData(context.contentResolver)
+                database.saveData(databaseCopyUri, context.contentResolver)
             } catch (e: DatabaseException) {
                 setError(e)
             }

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

@@ -40,7 +40,7 @@ class DeleteNodesRunnable(context: Context,
 
         foreachNode@ for(nodeToDelete in mNodesToDelete) {
             mOldParent = nodeToDelete.parent
-            mOldParent?.touch(modified = false, touchParents = true)
+            nodeToDelete.touch(modified = true, touchParents = true)
 
             when (nodeToDelete.type) {
                 Type.GROUP -> {
@@ -50,9 +50,9 @@ class DeleteNodesRunnable(context: Context,
                     // Remove Node from parent
                     mCanRecycle = database.canRecycle(groupToDelete)
                     if (mCanRecycle) {
-                        groupToDelete.touch(modified = false, touchParents = true)
                         database.recycle(groupToDelete, context.resources)
                         groupToDelete.setPreviousParentGroup(mOldParent)
+                        groupToDelete.touch(modified = true, touchParents = true)
                     } else {
                         database.deleteGroup(groupToDelete)
                     }
@@ -64,9 +64,9 @@ class DeleteNodesRunnable(context: Context,
                     // Remove Node from parent
                     mCanRecycle = database.canRecycle(entryToDelete)
                     if (mCanRecycle) {
-                        entryToDelete.touch(modified = false, touchParents = true)
                         database.recycle(entryToDelete, context.resources)
                         entryToDelete.setPreviousParentGroup(mOldParent)
+                        entryToDelete.touch(modified = true, touchParents = true)
                     } else {
                         database.deleteEntry(entryToDelete)
                     }

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

@@ -43,6 +43,7 @@ class MoveNodesRunnable constructor(
         foreachNode@ for(nodeToMove in mNodesToMove) {
             // Move node in new parent
             mOldParent = nodeToMove.parent
+            nodeToMove.touch(modified = true, touchParents = true)
 
             when (nodeToMove.type) {
                 Type.GROUP -> {
@@ -52,9 +53,9 @@ class MoveNodesRunnable constructor(
                             // and if not in the current group
                             && groupToMove != mNewParent
                             && !mNewParent.isContainedIn(groupToMove)) {
-                        groupToMove.touch(modified = true, touchParents = true)
                         database.moveGroupTo(groupToMove, mNewParent)
                         groupToMove.setPreviousParentGroup(mOldParent)
+                        groupToMove.touch(modified = true, touchParents = true)
                     } else {
                         // Only finish thread
                         setError(MoveGroupDatabaseException())
@@ -67,9 +68,9 @@ class MoveNodesRunnable constructor(
                     if (mOldParent != mNewParent
                             // and root can contains entry
                             && (mNewParent != database.rootGroup || database.rootCanContainsEntry())) {
-                        entryToMove.touch(modified = true, touchParents = true)
                         database.moveEntryTo(entryToMove, mNewParent)
                         entryToMove.setPreviousParentGroup(mOldParent)
+                        entryToMove.touch(modified = true, touchParents = true)
                     } else {
                         // Only finish thread
                         setError(MoveEntryDatabaseException())

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt

@@ -1,89 +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.database.cursor
-
-import android.database.MatrixCursor
-import android.provider.BaseColumns
-import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.database.element.entry.EntryVersioned
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
-import com.kunzisoft.keepass.database.element.node.NodeId
-import java.util.*
-
-abstract class EntryCursor<EntryId, PwEntryV : EntryVersioned<*, EntryId, *, *>> : MatrixCursor(arrayOf(
-        _ID,
-        COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS,
-        COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS,
-        COLUMN_INDEX_TITLE,
-        COLUMN_INDEX_ICON_STANDARD,
-        COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS,
-        COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS,
-        COLUMN_INDEX_USERNAME,
-        COLUMN_INDEX_PASSWORD,
-        COLUMN_INDEX_URL,
-        COLUMN_INDEX_NOTES,
-        COLUMN_INDEX_EXPIRY_TIME,
-        COLUMN_INDEX_EXPIRES
-    )) {
-
-    protected var entryId: Long = 0
-
-    abstract fun addEntry(entry: PwEntryV)
-
-    abstract fun getPwNodeId(): NodeId<EntryId>
-
-    open fun populateEntry(pwEntry: PwEntryV,
-                           retrieveStandardIcon: (Int) -> IconImageStandard,
-                           retrieveCustomIcon: (UUID) -> IconImageCustom) {
-        pwEntry.nodeId = getPwNodeId()
-        pwEntry.title = getString(getColumnIndex(COLUMN_INDEX_TITLE))
-
-        val iconStandard = retrieveStandardIcon.invoke(getInt(getColumnIndex(COLUMN_INDEX_ICON_STANDARD)))
-        val iconCustom = retrieveCustomIcon.invoke(UUID(getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
-                getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))))
-        pwEntry.icon = IconImage(iconStandard, iconCustom)
-
-        pwEntry.username = getString(getColumnIndex(COLUMN_INDEX_USERNAME))
-        pwEntry.password = getString(getColumnIndex(COLUMN_INDEX_PASSWORD))
-        pwEntry.url = getString(getColumnIndex(COLUMN_INDEX_URL))
-        pwEntry.notes = getString(getColumnIndex(COLUMN_INDEX_NOTES))
-        pwEntry.expiryTime = DateInstant(getString(getColumnIndex(COLUMN_INDEX_EXPIRY_TIME)))
-        pwEntry.expires = getString(getColumnIndex(COLUMN_INDEX_EXPIRES))
-                                        .lowercase(Locale.ENGLISH) != "false"
-    }
-
-    companion object {
-        const val _ID = BaseColumns._ID
-        const val COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS = "UUID_most_significant_bits"
-        const val COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS = "UUID_least_significant_bits"
-        const val COLUMN_INDEX_TITLE = "title"
-        const val COLUMN_INDEX_ICON_STANDARD = "icon_standard"
-        const val COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS = "icon_custom_UUID_most_significant_bits"
-        const val COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS = "icon_custom_UUID_least_significant_bits"
-        const val COLUMN_INDEX_USERNAME = "username"
-        const val COLUMN_INDEX_PASSWORD = "password"
-        const val COLUMN_INDEX_URL = "URL"
-        const val COLUMN_INDEX_NOTES = "notes"
-        const val COLUMN_INDEX_EXPIRY_TIME = "expiry_time"
-        const val COLUMN_INDEX_EXPIRES = "expires"
-    }
-}

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.cursor
-
-import com.kunzisoft.keepass.database.element.entry.EntryKDB
-
-class EntryCursorKDB : EntryCursorUUID<EntryKDB>() {
-
-    override fun addEntry(entry: EntryKDB) {
-        addRow(arrayOf(
-                entryId,
-                entry.id.mostSignificantBits,
-                entry.id.leastSignificantBits,
-                entry.title,
-                entry.icon.standard.id,
-                entry.icon.custom.uuid.mostSignificantBits,
-                entry.icon.custom.uuid.leastSignificantBits,
-                entry.username,
-                entry.password,
-                entry.url,
-                entry.notes,
-                entry.expiryTime,
-                entry.expires
-        ))
-        entryId++
-    }
-
-}

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt

@@ -1,73 +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.database.cursor
-
-import com.kunzisoft.keepass.database.element.entry.EntryKDBX
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
-import java.util.*
-
-class EntryCursorKDBX : EntryCursorUUID<EntryKDBX>() {
-
-    private val extraFieldCursor: ExtraFieldCursor = ExtraFieldCursor()
-
-    override fun addEntry(entry: EntryKDBX) {
-        addRow(arrayOf(
-                entryId,
-                entry.id.mostSignificantBits,
-                entry.id.leastSignificantBits,
-                entry.title,
-                entry.icon.standard.id,
-                entry.icon.custom.uuid.mostSignificantBits,
-                entry.icon.custom.uuid.leastSignificantBits,
-                entry.username,
-                entry.password,
-                entry.url,
-                entry.notes,
-                entry.expiryTime,
-                entry.expires
-        ))
-
-        entry.doForEachDecodedCustomField { field ->
-            extraFieldCursor.addExtraField(entryId, field)
-        }
-
-        entryId++
-    }
-
-    override fun populateEntry(pwEntry: EntryKDBX,
-                               retrieveStandardIcon: (Int) -> IconImageStandard,
-                               retrieveCustomIcon: (UUID) -> IconImageCustom) {
-        super.populateEntry(pwEntry, retrieveStandardIcon, retrieveCustomIcon)
-
-        // Retrieve extra fields
-        if (extraFieldCursor.moveToFirst()) {
-            while (!extraFieldCursor.isAfterLast) {
-                // Add a new extra field only if entryId is the one we want
-                if (extraFieldCursor.getLong(extraFieldCursor
-                                .getColumnIndex(ExtraFieldCursor.FOREIGN_KEY_ENTRY_ID))
-                        == getLong(getColumnIndex(_ID))) {
-                    extraFieldCursor.populateExtraFieldInEntry(pwEntry)
-                }
-                extraFieldCursor.moveToNext()
-            }
-        }
-    }
-}

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorUUID.kt

@@ -1,34 +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.database.cursor
-
-import com.kunzisoft.keepass.database.element.entry.EntryVersioned
-import com.kunzisoft.keepass.database.element.node.NodeId
-import com.kunzisoft.keepass.database.element.node.NodeIdUUID
-import java.util.*
-
-abstract class EntryCursorUUID<EntryV: EntryVersioned<*, UUID, *, *>>: EntryCursor<UUID, EntryV>() {
-
-    override fun getPwNodeId(): NodeId<UUID> {
-        return NodeIdUUID(
-                UUID(getLong(getColumnIndex(COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
-                        getLong(getColumnIndex(COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS))))
-    }
-}

app/src/main/java/com/kunzisoft/keepass/database/cursor/ExtraFieldCursor.kt

@@ -1,62 +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.database.cursor
-
-import android.database.MatrixCursor
-import android.provider.BaseColumns
-import com.kunzisoft.keepass.database.element.Field
-
-import com.kunzisoft.keepass.database.element.entry.EntryKDBX
-import com.kunzisoft.keepass.database.element.security.ProtectedString
-
-class ExtraFieldCursor : MatrixCursor(arrayOf(
-        _ID,
-        FOREIGN_KEY_ENTRY_ID,
-        COLUMN_LABEL,
-        COLUMN_PROTECTION,
-        COLUMN_VALUE
-    )) {
-
-    private var fieldId: Long = 0
-
-    @Synchronized
-    fun addExtraField(entryId: Long, field: Field) {
-        addRow(arrayOf(fieldId,
-                entryId,
-                field.name,
-                if (field.protectedValue.isProtected) 1 else 0,
-                field.protectedValue.toString()))
-        fieldId++
-    }
-
-    fun populateExtraFieldInEntry(pwEntry: EntryKDBX) {
-        pwEntry.putField(getString(getColumnIndex(COLUMN_LABEL)),
-                ProtectedString(getInt(getColumnIndex(COLUMN_PROTECTION)) > 0,
-                        getString(getColumnIndex(COLUMN_VALUE))))
-    }
-
-    companion object {
-        const val _ID = BaseColumns._ID
-        const val FOREIGN_KEY_ENTRY_ID = "entry_id"
-        const val COLUMN_LABEL = "label"
-        const val COLUMN_PROTECTION = "protection"
-        const val COLUMN_VALUE = "value"
-    }
-}

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

@@ -1,3 +1,22 @@
+/*
+ * 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.element
 
 import android.os.Parcel
@@ -17,7 +36,10 @@ class CustomData : Parcelable {
     }
 
     constructor(parcel: Parcel) {
-        ParcelableUtil.readStringParcelableMap(parcel, CustomDataItem::class.java)
+        mCustomDataItems.clear()
+        mCustomDataItems.putAll(ParcelableUtil
+            .readStringParcelableMap(parcel, CustomDataItem::class.java)
+        )
     }
 
     fun get(key: String): CustomDataItem? {
@@ -46,6 +68,10 @@ class CustomData : Parcelable {
         }
     }
 
+    override fun toString(): String {
+        return mCustomDataItems.toString()
+    }
+
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         ParcelableUtil.writeStringParcelableMap(parcel, flags, mCustomDataItems)
     }

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

@@ -21,6 +21,10 @@ class CustomDataItem : Parcelable {
         this.lastModificationTime = lastModificationTime
     }
 
+    override fun toString(): String {
+        return value
+    }
+
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(key)
         parcel.writeString(value)

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

@@ -32,7 +32,6 @@ import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
 import com.kunzisoft.keepass.database.element.binary.AttachmentPool
 import com.kunzisoft.keepass.database.element.binary.BinaryCache
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.database.element.binary.LoadedKey
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
@@ -52,6 +51,7 @@ import com.kunzisoft.keepass.database.file.input.DatabaseInputKDB
 import com.kunzisoft.keepass.database.file.input.DatabaseInputKDBX
 import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDB
 import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDBX
+import com.kunzisoft.keepass.database.merge.DatabaseKDBXMerger
 import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.database.search.SearchParameters
 import com.kunzisoft.keepass.icons.IconDrawableFactory
@@ -62,7 +62,6 @@ import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.utils.readBytes4ToUInt
 import java.io.*
 import java.util.*
-import kotlin.collections.ArrayList
 
 
 class Database {
@@ -94,6 +93,8 @@ class Database {
      */
     var wasReloaded = false
 
+    var dataModifiedSinceLastLoading = false
+
     var loadTimestamp: Long? = null
         private set
 
@@ -112,7 +113,7 @@ class Database {
 
     private val iconsManager: IconsManager
         get() {
-            return mDatabaseKDB?.iconsManager ?: mDatabaseKDBX?.iconsManager ?: IconsManager(binaryCache)
+            return mDatabaseKDB?.iconsManager ?: mDatabaseKDBX?.iconsManager ?: IconsManager()
         }
 
     fun doForEachStandardIcons(action: (IconImageStandard) -> Unit) {
@@ -130,7 +131,7 @@ class Database {
         return iconsManager.doForEachCustomIcon(action)
     }
 
-    fun getCustomIcon(iconId: UUID): IconImageCustom {
+    fun getCustomIcon(iconId: UUID): IconImageCustom? {
         return iconsManager.getIcon(iconId)
     }
 
@@ -144,11 +145,12 @@ class Database {
 
     fun removeCustomIcon(customIcon: IconImageCustom) {
         iconDrawableFactory.clearFromCache(customIcon)
-        iconsManager.removeCustomIcon(binaryCache, customIcon.uuid)
+        iconsManager.removeCustomIcon(customIcon.uuid, binaryCache)
+        mDatabaseKDBX?.addDeletedObject(customIcon.uuid)
     }
 
     fun updateCustomIcon(customIcon: IconImageCustom) {
-        iconsManager.getIcon(customIcon.uuid).updateWith(customIcon)
+        iconsManager.getIcon(customIcon.uuid)?.updateWith(customIcon)
     }
 
     fun getTemplates(templateCreation: Boolean): List<Template> {
@@ -212,6 +214,7 @@ class Database {
         set(name) {
             mDatabaseKDBX?.name = name
             mDatabaseKDBX?.nameChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     val allowDescription: Boolean
@@ -224,6 +227,7 @@ class Database {
         set(description) {
             mDatabaseKDBX?.description = description
             mDatabaseKDBX?.descriptionChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var defaultUsername: String
@@ -234,6 +238,7 @@ class Database {
             mDatabaseKDB?.defaultUserName = username
             mDatabaseKDBX?.defaultUserName = username
             mDatabaseKDBX?.defaultUserNameChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var customColor: Int?
@@ -253,6 +258,8 @@ class Database {
             } else {
                 ChromaUtil.getFormattedColorString(value, false)
             }
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     val allowOTP: Boolean
@@ -261,6 +268,15 @@ class Database {
     val version: String
         get() = mDatabaseKDB?.version ?: mDatabaseKDBX?.version ?: "-"
 
+    fun checkVersion() {
+        mDatabaseKDBX?.getMinKdbxVersion()?.let {
+            mDatabaseKDBX?.kdbxVersion = it
+        }
+    }
+
+    val defaultFileExtension: String
+        get() = mDatabaseKDB?.defaultFileExtension ?: mDatabaseKDBX?.defaultFileExtension ?: ".bin"
+
     val type: Class<*>?
         get() = mDatabaseKDB?.javaClass ?: mDatabaseKDBX?.javaClass
 
@@ -276,6 +292,8 @@ class Database {
             value?.let {
                 mDatabaseKDBX?.compressionAlgorithm = it
             }
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     fun compressionForNewEntry(): Boolean {
@@ -292,6 +310,7 @@ class Database {
     fun updateDataBinaryCompression(oldCompression: CompressionAlgorithm,
                                     newCompression: CompressionAlgorithm) {
         mDatabaseKDBX?.changeBinaryCompression(oldCompression, newCompression)
+        dataModifiedSinceLastLoading = true
     }
 
     val allowNoMasterKey: Boolean
@@ -311,8 +330,6 @@ class Database {
         set(algorithm) {
             algorithm?.let {
                 mDatabaseKDBX?.encryptionAlgorithm = algorithm
-                mDatabaseKDBX?.setDataEngine(algorithm.cipherEngine)
-                mDatabaseKDBX?.cipherUuid = algorithm.uuid
             }
         }
 
@@ -325,13 +342,10 @@ class Database {
     var kdfEngine: KdfEngine?
         get() = mDatabaseKDB?.kdfEngine ?: mDatabaseKDBX?.kdfEngine
         set(kdfEngine) {
-            kdfEngine?.let {
-                if (mDatabaseKDBX?.kdfParameters?.uuid != kdfEngine.defaultParameters.uuid)
-                    mDatabaseKDBX?.kdfParameters = kdfEngine.defaultParameters
-                numberKeyEncryptionRounds = kdfEngine.defaultKeyRounds
-                memoryUsage = kdfEngine.defaultMemoryUsage
-                parallelism = kdfEngine.defaultParallelism
-            }
+            mDatabaseKDB?.kdfEngine = kdfEngine
+            mDatabaseKDBX?.kdfEngine = kdfEngine
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     fun getKeyDerivationName(): String {
@@ -343,6 +357,8 @@ class Database {
         set(numberRounds) {
             mDatabaseKDB?.numberKeyEncryptionRounds = numberRounds
             mDatabaseKDBX?.numberKeyEncryptionRounds = numberRounds
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var memoryUsage: Long
@@ -351,12 +367,16 @@ class Database {
         }
         set(memory) {
             mDatabaseKDBX?.memoryUsage = memory
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var parallelism: Long
         get() = mDatabaseKDBX?.parallelism ?: KdfEngine.UNKNOWN_VALUE
         set(parallelism) {
             mDatabaseKDBX?.parallelism = parallelism
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var masterKey: ByteArray
@@ -364,6 +384,8 @@ class Database {
         set(masterKey) {
             mDatabaseKDB?.masterKey = masterKey
             mDatabaseKDBX?.masterKey = masterKey
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var rootGroup: Group?
@@ -414,6 +436,8 @@ class Database {
         }
         set(value) {
             mDatabaseKDBX?.historyMaxItems = value
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     var historyMaxSize: Long
@@ -422,6 +446,8 @@ class Database {
         }
         set(value) {
             mDatabaseKDBX?.historyMaxSize = value
+            mDatabaseKDBX?.settingsChanged = DateInstant()
+            dataModifiedSinceLastLoading = true
         }
 
     /**
@@ -442,15 +468,17 @@ class Database {
         } else {
             mDatabaseKDBX?.removeRecycleBin()
         }
+        mDatabaseKDBX?.recycleBinChanged = DateInstant()
+        dataModifiedSinceLastLoading = true
     }
 
     val recycleBin: Group?
         get() {
             mDatabaseKDB?.backupGroup?.let {
-                return Group(it)
+                return getGroupById(it.nodeId) ?: Group(it)
             }
             mDatabaseKDBX?.recycleBin?.let {
-                return Group(it)
+                return getGroupById(it.nodeId) ?: Group(it)
             }
             return null
         }
@@ -460,15 +488,17 @@ class Database {
         if (group != null) {
             mDatabaseKDBX?.recycleBinUUID = group.nodeIdKDBX.id
         } else {
-            mDatabaseKDBX?.removeTemplatesGroup()
+            mDatabaseKDBX?.removeRecycleBin()
         }
+        mDatabaseKDBX?.recycleBinChanged = DateInstant()
+        dataModifiedSinceLastLoading = true
     }
 
     /**
      * Determine if a configurable templates group is available or not for this version of database
      * @return true if a configurable templates group available
      */
-    val allowConfigurableTemplatesGroup: Boolean
+    val allowTemplatesGroup: Boolean
         get() = mDatabaseKDBX != null
 
     // Maybe another templates method with KDBX5
@@ -477,6 +507,8 @@ class Database {
 
     fun enableTemplates(enable: Boolean, templatesGroupName: String) {
         mDatabaseKDBX?.enableTemplatesGroup(enable, templatesGroupName)
+        mDatabaseKDBX?.entryTemplatesGroupChanged = DateInstant()
+        dataModifiedSinceLastLoading = true
     }
 
     val templatesGroup: Group?
@@ -492,8 +524,10 @@ class Database {
         if (group != null) {
             mDatabaseKDBX?.entryTemplatesGroup = group.nodeIdKDBX.id
         } else {
-            mDatabaseKDBX?.entryTemplatesGroup
+            mDatabaseKDBX?.removeTemplatesGroup()
         }
+        mDatabaseKDBX?.entryTemplatesGroupChanged = DateInstant()
+        dataModifiedSinceLastLoading = true
     }
 
     val groupNamesNotAllowed: List<String>
@@ -520,6 +554,7 @@ class Database {
         this.fileUri = databaseUri
         // Set Database state
         this.loaded = true
+        this.dataModifiedSinceLastLoading = false
     }
 
     @Throws(LoadDatabaseException::class)
@@ -576,7 +611,6 @@ class Database {
                  contentResolver: ContentResolver,
                  cacheDirectory: File,
                  isRAMSufficient: (memoryWanted: Long) -> Boolean,
-                 tempCipherKey: LoadedKey,
                  fixDuplicateUUID: Boolean,
                  progressTaskUpdater: ProgressTaskUpdater?) {
 
@@ -597,99 +631,231 @@ class Database {
             // Read database stream for the first time
             readDatabaseStream(contentResolver, uri,
                     { databaseInputStream ->
-                        DatabaseInputKDB(cacheDirectory, isRAMSufficient)
+                        val databaseKDB = DatabaseKDB().apply {
+                            binaryCache.cacheDirectory = cacheDirectory
+                            changeDuplicateId = fixDuplicateUUID
+                        }
+                        DatabaseInputKDB(databaseKDB)
                             .openDatabase(databaseInputStream,
+                                progressTaskUpdater
+                            ) {
+                                databaseKDB.retrieveMasterKey(
                                     mainCredential.masterPassword,
-                                        keyFileInputStream,
-                                        tempCipherKey,
-                                        progressTaskUpdater,
-                                        fixDuplicateUUID)
+                                    keyFileInputStream
+                                )
+                            }
+                        databaseKDB
                     },
                     { databaseInputStream ->
-                        DatabaseInputKDBX(cacheDirectory, isRAMSufficient)
-                                .openDatabase(databaseInputStream,
+                        val databaseKDBX = DatabaseKDBX().apply {
+                            binaryCache.cacheDirectory = cacheDirectory
+                            changeDuplicateId = fixDuplicateUUID
+                        }
+                        DatabaseInputKDBX(databaseKDBX).apply {
+                            setMethodToCheckIfRAMIsSufficient(isRAMSufficient)
+                            openDatabase(databaseInputStream,
+                                progressTaskUpdater) {
+                                databaseKDBX.retrieveMasterKey(
                                     mainCredential.masterPassword,
                                     keyFileInputStream,
-                                        tempCipherKey,
-                                        progressTaskUpdater,
-                                        fixDuplicateUUID)
+                                )
+                            }
+                        }
+                        databaseKDBX
                     }
             )
         } catch (e: FileNotFoundException) {
-            Log.e(TAG, "Unable to load keyfile", e)
-            throw FileNotFoundDatabaseException()
+            throw FileNotFoundDatabaseException("Unable to load the keyfile")
         } catch (e: LoadDatabaseException) {
             throw e
         } catch (e: Exception) {
             throw LoadDatabaseException(e)
         } finally {
             keyFileInputStream?.close()
+            dataModifiedSinceLastLoading = false
+        }
+    }
+
+    fun isMergeDataAllowed(): Boolean {
+        return mDatabaseKDBX != null
+    }
+
+    @Throws(LoadDatabaseException::class)
+    fun mergeData(databaseToMergeUri: Uri?,
+                  databaseToMergeMainCredential: MainCredential?,
+                  contentResolver: ContentResolver,
+                  isRAMSufficient: (memoryWanted: Long) -> Boolean,
+                  progressTaskUpdater: ProgressTaskUpdater?) {
+
+        mDatabaseKDB?.let {
+            throw IODatabaseException("Unable to merge from a database V1")
+        }
+
+        // New database instance to get new changes
+        val databaseToMerge = Database()
+        databaseToMerge.fileUri = databaseToMergeUri ?: this.fileUri
+
+        // Pass KeyFile Uri as InputStreams
+        var keyFileInputStream: InputStream? = null
+        try {
+            val databaseUri = databaseToMerge.fileUri
+            if (databaseUri != null) {
+                if (databaseToMergeMainCredential != null) {
+                    // Get keyFile inputStream
+                    databaseToMergeMainCredential.keyFileUri?.let { keyFile ->
+                        keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyFile)
+                    }
+                }
+
+                databaseToMerge.readDatabaseStream(contentResolver, databaseUri,
+                    { databaseInputStream ->
+                        val databaseToMergeKDB = DatabaseKDB()
+                        DatabaseInputKDB(databaseToMergeKDB)
+                            .openDatabase(databaseInputStream, progressTaskUpdater) {
+                                if (databaseToMergeMainCredential != null) {
+                                    databaseToMergeKDB.retrieveMasterKey(
+                                        databaseToMergeMainCredential.masterPassword,
+                                        keyFileInputStream,
+                                    )
+                                } else {
+                                    databaseToMergeKDB.masterKey = masterKey
+                                }
+                            }
+                        databaseToMergeKDB
+                    },
+                    { databaseInputStream ->
+                        val databaseToMergeKDBX = DatabaseKDBX()
+                        DatabaseInputKDBX(databaseToMergeKDBX).apply {
+                            setMethodToCheckIfRAMIsSufficient(isRAMSufficient)
+                            openDatabase(databaseInputStream, progressTaskUpdater) {
+                                if (databaseToMergeMainCredential != null) {
+                                    databaseToMergeKDBX.retrieveMasterKey(
+                                        databaseToMergeMainCredential.masterPassword,
+                                        keyFileInputStream,
+                                    )
+                                } else {
+                                    databaseToMergeKDBX.masterKey = masterKey
+                                }
+                            }
+                        }
+                        databaseToMergeKDBX
+                    }
+                )
+
+                mDatabaseKDBX?.let { currentDatabaseKDBX ->
+                    val databaseMerger = DatabaseKDBXMerger(currentDatabaseKDBX).apply {
+                        this.isRAMSufficient = isRAMSufficient
+                    }
+                    databaseToMerge.mDatabaseKDB?.let { databaseKDBToMerge ->
+                        databaseMerger.merge(databaseKDBToMerge)
+                        if (databaseToMergeUri != null) {
+                            this.dataModifiedSinceLastLoading = true
+                        }
+                    }
+                    databaseToMerge.mDatabaseKDBX?.let { databaseKDBXToMerge ->
+                        databaseMerger.merge(databaseKDBXToMerge)
+                        if (databaseToMergeUri != null) {
+                            this.dataModifiedSinceLastLoading = true
+                        }
+                    }
+                }
+            } else {
+                throw IODatabaseException("Database URI is null, database cannot be merged")
+            }
+        } catch (e: FileNotFoundException) {
+            throw FileNotFoundDatabaseException("Unable to load the keyfile")
+        } catch (e: LoadDatabaseException) {
+            throw e
+        } catch (e: Exception) {
+            throw LoadDatabaseException(e)
+        } finally {
+            keyFileInputStream?.close()
+            databaseToMerge.clearAndClose()
         }
     }
 
     @Throws(LoadDatabaseException::class)
     fun reloadData(contentResolver: ContentResolver,
-                   cacheDirectory: File,
                    isRAMSufficient: (memoryWanted: Long) -> Boolean,
-                   tempCipherKey: LoadedKey,
                    progressTaskUpdater: ProgressTaskUpdater?) {
 
         // Retrieve the stream from the old database URI
         try {
-            fileUri?.let { oldDatabaseUri ->
+            val oldDatabaseUri = fileUri
+            if (oldDatabaseUri != null) {
                 readDatabaseStream(contentResolver, oldDatabaseUri,
                     { databaseInputStream ->
-                            DatabaseInputKDB(cacheDirectory, isRAMSufficient)
-                                    .openDatabase(databaseInputStream,
-                                            masterKey,
-                                            tempCipherKey,
-                                            progressTaskUpdater)
+                        val databaseKDB = DatabaseKDB()
+                        mDatabaseKDB?.let {
+                            databaseKDB.binaryCache = it.binaryCache
+                        }
+                        DatabaseInputKDB(databaseKDB)
+                            .openDatabase(databaseInputStream, progressTaskUpdater) {
+                                databaseKDB.masterKey = masterKey
+                            }
+                        databaseKDB
                     },
                     { databaseInputStream ->
-                            DatabaseInputKDBX(cacheDirectory, isRAMSufficient)
-                                    .openDatabase(databaseInputStream,
-                                            masterKey,
-                                            tempCipherKey,
-                                            progressTaskUpdater)
+                        val databaseKDBX = DatabaseKDBX()
+                        mDatabaseKDBX?.let {
+                            databaseKDBX.binaryCache = it.binaryCache
+                        }
+                        DatabaseInputKDBX(databaseKDBX).apply {
+                            setMethodToCheckIfRAMIsSufficient(isRAMSufficient)
+                            openDatabase(databaseInputStream, progressTaskUpdater) {
+                                databaseKDBX.masterKey = masterKey
+                            }
+                        }
+                        databaseKDBX
                     }
                 )
-            } ?: run {
-                Log.e(TAG, "Database URI is null, database cannot be reloaded")
-                throw IODatabaseException()
+            } else {
+                throw IODatabaseException("Database URI is null, database cannot be reloaded")
             }
         } catch (e: FileNotFoundException) {
-            Log.e(TAG, "Unable to load keyfile", e)
-            throw FileNotFoundDatabaseException()
+            throw FileNotFoundDatabaseException("Unable to load the keyfile")
         } catch (e: LoadDatabaseException) {
             throw e
         } catch (e: Exception) {
             throw LoadDatabaseException(e)
+        } finally {
+            dataModifiedSinceLastLoading = false
         }
     }
 
-    fun isGroupSearchable(group: Group, omitBackup: Boolean): Boolean {
-        return mDatabaseKDB?.isGroupSearchable(group.groupKDB, omitBackup) ?:
-        mDatabaseKDBX?.isGroupSearchable(group.groupKDBX, omitBackup) ?:
-        false
+    fun groupIsInRecycleBin(group: Group): Boolean {
+        val groupKDB = group.groupKDB
+        val groupKDBX = group.groupKDBX
+        if (groupKDB != null) {
+            return mDatabaseKDB?.isInRecycleBin(groupKDB) ?: false
+        } else if (groupKDBX != null) {
+            return mDatabaseKDBX?.isInRecycleBin(groupKDBX) ?: false
+        }
+        return false
     }
 
-    fun createVirtualGroupFromSearch(searchQuery: String,
-                                     omitBackup: Boolean,
+    fun groupIsInTemplates(group: Group): Boolean {
+        val groupKDBX = group.groupKDBX
+        if (groupKDBX != null) {
+            return mDatabaseKDBX?.getTemplatesGroup() == groupKDBX
+        }
+        return false
+    }
+
+    fun createVirtualGroupFromSearch(searchParameters: SearchParameters,
+                                     fromGroup: NodeId<*>? = null,
                                      max: Int = Integer.MAX_VALUE): Group? {
         return mSearchHelper?.createVirtualGroupWithSearchResult(this,
-                SearchParameters().apply {
-                    this.searchQuery = searchQuery
-                }, omitBackup, max)
+            searchParameters, fromGroup, max)
     }
 
     fun createVirtualGroupFromSearchInfo(searchInfoString: String,
-                                         omitBackup: Boolean,
                                          max: Int = Integer.MAX_VALUE): Group? {
         return mSearchHelper?.createVirtualGroupWithSearchResult(this,
                 SearchParameters().apply {
                     searchQuery = searchInfoString
                     searchInTitles = true
-                    searchInUserNames = false
+                    searchInUsernames = false
                     searchInPasswords = false
                     searchInUrls = true
                     searchInNotes = true
@@ -697,13 +863,21 @@ class Database {
                     searchInOther = true
                     searchInUUIDs = false
                     searchInTags = false
+                    searchInCurrentGroup = false
+                    searchInSearchableGroup = true
+                    searchInRecycleBin = false
                     searchInTemplates = false
-                }, omitBackup, max)
+                }, null, max)
+    }
+
+    val tagPool: Tags
+        get() {
+            return mDatabaseKDBX?.tagPool ?: Tags()
         }
 
     val attachmentPool: AttachmentPool
         get() {
-            return mDatabaseKDB?.attachmentPool ?: mDatabaseKDBX?.attachmentPool ?: AttachmentPool(binaryCache)
+            return mDatabaseKDB?.attachmentPool ?: mDatabaseKDBX?.attachmentPool ?: AttachmentPool()
         }
 
     val allowMultipleAttachments: Boolean
@@ -716,8 +890,8 @@ class Database {
         }
 
     fun buildNewBinaryAttachment(): BinaryData? {
-        return mDatabaseKDB?.buildNewAttachment()
-                ?: mDatabaseKDBX?.buildNewAttachment( false,
+        return mDatabaseKDB?.buildNewBinaryAttachment()
+                ?: mDatabaseKDBX?.buildNewBinaryAttachment( false,
                         compressionForNewEntry(),
                         false)
     }
@@ -731,25 +905,16 @@ class Database {
     fun removeUnlinkedAttachments() {
         // No check in database KDB because unique attachment by entry
         mDatabaseKDBX?.removeUnlinkedAttachments(true)
+        dataModifiedSinceLastLoading = true
     }
 
     @Throws(DatabaseOutputException::class)
-    fun saveData(contentResolver: ContentResolver) {
+    fun saveData(databaseCopyUri: Uri?, contentResolver: ContentResolver) {
         try {
-            this.fileUri?.let {
-                saveData(contentResolver, it)
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to save database", e)
-            throw DatabaseOutputException(e)
-        }
-    }
-
-    @Throws(IOException::class, DatabaseOutputException::class)
-    private fun saveData(contentResolver: ContentResolver, uri: Uri) {
-
-        if (uri.scheme == "file") {
-            uri.path?.let { filename ->
+            val saveUri = databaseCopyUri ?: this.fileUri
+            if (saveUri != null) {
+                if (saveUri.scheme == "file") {
+                    saveUri.path?.let { filename ->
                         val tempFile = File("$filename.tmp")
 
                         var fileOutputStream: FileOutputStream? = null
@@ -778,10 +943,16 @@ class Database {
                 } else {
                     var outputStream: OutputStream? = null
                     try {
-                outputStream = contentResolver.openOutputStream(uri, "rwt")
+                        outputStream = contentResolver.openOutputStream(saveUri, "rwt")
                         outputStream?.let { definedOutputStream ->
-                    val databaseOutput = mDatabaseKDB?.let { DatabaseOutputKDB(it, definedOutputStream) }
-                                    ?: mDatabaseKDBX?.let { DatabaseOutputKDBX(it, definedOutputStream) }
+                            val databaseOutput =
+                                mDatabaseKDB?.let { DatabaseOutputKDB(it, definedOutputStream) }
+                                    ?: mDatabaseKDBX?.let {
+                                        DatabaseOutputKDBX(
+                                            it,
+                                            definedOutputStream
+                                        )
+                                    }
                             databaseOutput?.output()
                         }
                     } catch (e: Exception) {
@@ -790,17 +961,32 @@ class Database {
                         outputStream?.close()
                     }
                 }
-        this.fileUri = uri
+                if (databaseCopyUri == null) {
+                    this.dataModifiedSinceLastLoading = false
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to save database", e)
+            throw DatabaseOutputException(e)
+        }
     }
 
-    fun clear(filesDirectory: File? = null) {
-        binaryCache.clear()
-        iconsManager.clearCache()
+    fun clearIndexesAndBinaries(filesDirectory: File? = null) {
+        this.mDatabaseKDB?.clearIndexes()
+        this.mDatabaseKDBX?.clearIndexes()
+
+        this.mDatabaseKDB?.clearIconsCache()
+        this.mDatabaseKDBX?.clearIconsCache()
+
+        this.mDatabaseKDB?.clearAttachmentsCache()
+        this.mDatabaseKDBX?.clearAttachmentsCache()
+
+        this.mDatabaseKDB?.clearBinaries()
+        this.mDatabaseKDBX?.clearBinaries()
+
         iconDrawableFactory.clearCache()
-        // Delete the cache of the database if present
-        mDatabaseKDB?.clearCache()
-        mDatabaseKDBX?.clearCache()
-        // In all cases, delete all the files in the temp dir
+
+        // delete all the files in the temp dir if allowed
         try {
             filesDirectory?.let { directory ->
                 cleanDirectory(directory)
@@ -811,7 +997,7 @@ class Database {
     }
 
     fun clearAndClose(context: Context? = null) {
-        clear(context?.let { UriUtil.getBinaryDir(context) })
+        clearIndexesAndBinaries(context?.let { UriUtil.getBinaryDir(context) })
         this.mDatabaseKDB = null
         this.mDatabaseKDBX = null
         this.fileUri = null
@@ -838,9 +1024,10 @@ class Database {
     }
 
     @Throws(IOException::class)
-    fun retrieveMasterKey(key: String?, keyInputStream: InputStream?) {
+    fun assignMasterKey(key: String?, keyInputStream: InputStream?) {
         mDatabaseKDB?.retrieveMasterKey(key, keyInputStream)
         mDatabaseKDBX?.retrieveMasterKey(key, keyInputStream)
+        mDatabaseKDBX?.keyLastChanged = DateInstant()
     }
 
     fun rootCanContainsEntry(): Boolean {
@@ -848,6 +1035,7 @@ class Database {
     }
 
     fun createEntry(): Entry? {
+        dataModifiedSinceLastLoading = true
         mDatabaseKDB?.let { database ->
             return Entry(database.createEntry()).apply {
                 nodeId = database.newEntryId()
@@ -862,19 +1050,25 @@ class Database {
         return null
     }
 
-    fun createGroup(): Group? {
+    fun createGroup(virtual: Boolean = false): Group? {
+        if (!virtual) {
+            dataModifiedSinceLastLoading = true
+        }
+        var group: Group? = null
         mDatabaseKDB?.let { database ->
-            return Group(database.createGroup()).apply {
+            group = Group(database.createGroup()).apply {
                 setNodeId(database.newGroupId())
             }
         }
         mDatabaseKDBX?.let { database ->
-            return Group(database.createGroup()).apply {
+            group = Group(database.createGroup()).apply {
                 setNodeId(database.newGroupId())
             }
         }
+        if (virtual)
+            group?.isVirtual = virtual
 
-        return null
+        return group
     }
 
     fun getEntryById(id: NodeId<UUID>): Entry? {
@@ -900,6 +1094,7 @@ class Database {
     }
 
     fun addEntryTo(entry: Entry, parent: Group) {
+        dataModifiedSinceLastLoading = true
         entry.entryKDB?.let { entryKDB ->
             mDatabaseKDB?.addEntryTo(entryKDB, parent.groupKDB)
         }
@@ -910,6 +1105,7 @@ class Database {
     }
 
     fun updateEntry(entry: Entry) {
+        dataModifiedSinceLastLoading = true
         entry.entryKDB?.let { entryKDB ->
             mDatabaseKDB?.updateEntry(entryKDB)
         }
@@ -919,6 +1115,7 @@ class Database {
     }
 
     fun removeEntryFrom(entry: Entry, parent: Group) {
+        dataModifiedSinceLastLoading = true
         entry.entryKDB?.let { entryKDB ->
             mDatabaseKDB?.removeEntryFrom(entryKDB, parent.groupKDB)
         }
@@ -929,6 +1126,7 @@ class Database {
     }
 
     fun addGroupTo(group: Group, parent: Group) {
+        dataModifiedSinceLastLoading = true
         group.groupKDB?.let { groupKDB ->
             mDatabaseKDB?.addGroupTo(groupKDB, parent.groupKDB)
         }
@@ -939,6 +1137,7 @@ class Database {
     }
 
     fun updateGroup(group: Group) {
+        dataModifiedSinceLastLoading = true
         group.groupKDB?.let { entryKDB ->
             mDatabaseKDB?.updateGroup(entryKDB)
         }
@@ -948,6 +1147,7 @@ class Database {
     }
 
     fun removeGroupFrom(group: Group, parent: Group) {
+        dataModifiedSinceLastLoading = true
         group.groupKDB?.let { groupKDB ->
             mDatabaseKDB?.removeGroupFrom(groupKDB, parent.groupKDB)
         }
@@ -986,12 +1186,17 @@ class Database {
     }
 
     fun deleteEntry(entry: Entry) {
+        dataModifiedSinceLastLoading = true
+        entry.entryKDBX?.id?.let { entryId ->
+            mDatabaseKDBX?.addDeletedObject(entryId)
+        }
         entry.parent?.let {
             removeEntryFrom(entry, it)
         }
     }
 
     fun deleteGroup(group: Group) {
+        dataModifiedSinceLastLoading = true
         group.doForEachChildAndForIt(
                 object : NodeHandler<Entry>() {
                     override fun operate(node: Entry): Boolean {
@@ -1001,6 +1206,9 @@ class Database {
                 },
                 object : NodeHandler<Group>() {
                     override fun operate(node: Group): Boolean {
+                        node.groupKDBX?.id?.let { groupId ->
+                            mDatabaseKDBX?.addDeletedObject(groupId)
+                        }
                         node.parent?.let {
                             removeGroupFrom(node, it)
                         }
@@ -1009,24 +1217,6 @@ class Database {
                 })
     }
 
-    fun undoDeleteEntry(entry: Entry, parent: Group) {
-        entry.entryKDB?.let {
-            mDatabaseKDB?.undoDeleteEntryFrom(it, parent.groupKDB)
-        }
-        entry.entryKDBX?.let {
-            mDatabaseKDBX?.undoDeleteEntryFrom(it, parent.groupKDBX)
-        }
-    }
-
-    fun undoDeleteGroup(group: Group, parent: Group) {
-        group.groupKDB?.let {
-            mDatabaseKDB?.undoDeleteGroupFrom(it, parent.groupKDB)
-        }
-        group.groupKDBX?.let {
-            mDatabaseKDBX?.undoDeleteGroupFrom(it, parent.groupKDBX)
-        }
-    }
-
     fun ensureRecycleBinExists(resources: Resources) {
         mDatabaseKDB?.ensureBackupExists()
         mDatabaseKDBX?.ensureRecycleBinExists(resources)
@@ -1055,47 +1245,41 @@ class Database {
     }
 
     fun recycle(entry: Entry, resources: Resources) {
-        entry.entryKDB?.let {
-            mDatabaseKDB?.recycle(it)
+        ensureRecycleBinExists(resources)
+        entry.parent?.let { parent ->
+            removeEntryFrom(entry, parent)
         }
-        entry.entryKDBX?.let {
-            mDatabaseKDBX?.recycle(it, resources)
+        recycleBin?.let {
+            addEntryTo(entry, it)
         }
+        entry.afterAssignNewParent()
     }
 
     fun recycle(group: Group, resources: Resources) {
-        group.groupKDB?.let {
-            mDatabaseKDB?.recycle(it)
+        ensureRecycleBinExists(resources)
+        group.parent?.let { parent ->
+            removeGroupFrom(group, parent)
         }
-        group.groupKDBX?.let {
-            mDatabaseKDBX?.recycle(it, resources)
+        recycleBin?.let {
+            addGroupTo(group, it)
         }
+        group.afterAssignNewParent()
     }
 
     fun undoRecycle(entry: Entry, parent: Group) {
-        entry.entryKDB?.let { entryKDB ->
-            parent.groupKDB?.let { parentKDB ->
-                mDatabaseKDB?.undoRecycle(entryKDB, parentKDB)
-            }
-        }
-        entry.entryKDBX?.let { entryKDBX ->
-            parent.groupKDBX?.let { parentKDBX ->
-                mDatabaseKDBX?.undoRecycle(entryKDBX, parentKDBX)
-            }
+        recycleBin?.let { it ->
+            removeEntryFrom(entry, it)
         }
+        addEntryTo(entry, parent)
+        entry.afterAssignNewParent()
     }
 
     fun undoRecycle(group: Group, parent: Group) {
-        group.groupKDB?.let { groupKDB ->
-            parent.groupKDB?.let { parentKDB ->
-                mDatabaseKDB?.undoRecycle(groupKDB, parentKDB)
-            }
-        }
-        group.groupKDBX?.let { entryKDBX ->
-            parent.groupKDBX?.let { parentKDBX ->
-                mDatabaseKDBX?.undoRecycle(entryKDBX, parentKDBX)
-            }
+        recycleBin?.let {
+            removeGroupFrom(group, it)
         }
+        addGroupTo(group, parent)
+        group.afterAssignNewParent()
     }
 
     fun startManageEntry(entry: Entry?) {
@@ -1117,6 +1301,18 @@ class Database {
         return mDatabaseKDBX != null
     }
 
+    fun allowCustomSearchableGroup(): Boolean {
+        return mDatabaseKDBX != null
+    }
+
+    fun allowAutoType(): Boolean {
+        return mDatabaseKDBX != null
+    }
+
+    fun allowTags(): Boolean {
+        return mDatabaseKDBX != null
+    }
+
     /**
      * Remove oldest history for each entry if more than max items or max memory
      */

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

@@ -28,29 +28,18 @@ import java.util.*
 class DeletedObject : Parcelable {
 
     var uuid: UUID = DatabaseVersioned.UUID_ZERO
-    private var mDeletionTime: DateInstant? = null
+    var deletionTime: DateInstant = DateInstant()
 
     constructor()
 
     constructor(uuid: UUID, deletionTime: DateInstant = DateInstant()) {
         this.uuid = uuid
-        this.mDeletionTime = deletionTime
+        this.deletionTime = deletionTime
     }
 
     constructor(parcel: Parcel) {
         uuid = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: DatabaseVersioned.UUID_ZERO
-        mDeletionTime = parcel.readParcelable(DateInstant::class.java.classLoader)
-    }
-
-    fun getDeletionTime(): DateInstant {
-        if (mDeletionTime == null) {
-            mDeletionTime = DateInstant(System.currentTimeMillis())
-        }
-        return mDeletionTime!!
-    }
-
-    fun setDeletionTime(deletionTime: DateInstant) {
-        this.mDeletionTime = deletionTime
+        deletionTime = parcel.readParcelable(DateInstant::class.java.classLoader) ?: deletionTime
     }
 
     override fun equals(other: Any?): Boolean {
@@ -69,7 +58,7 @@ class DeletedObject : Parcelable {
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeParcelable(ParcelUuid(uuid), flags)
-        parcel.writeParcelable(mDeletionTime, flags)
+        parcel.writeParcelable(deletionTime, flags)
     }
 
     override fun describeContents(): Int {

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

@@ -26,6 +26,7 @@ import com.kunzisoft.androidclearchroma.ChromaUtil
 import com.kunzisoft.keepass.database.element.binary.AttachmentPool
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
+import com.kunzisoft.keepass.database.element.entry.AutoType
 import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.entry.EntryVersionedInterface
@@ -276,6 +277,18 @@ class Entry : Node, EntryVersionedInterface<Group> {
             }
         }
 
+    var customData: CustomData
+        get() = entryKDBX?.customData ?: CustomData()
+        set(value) {
+            entryKDBX?.customData = value
+        }
+
+    var autoType: AutoType
+        get() = entryKDBX?.autoType ?: AutoType()
+        set(value) {
+            entryKDBX?.autoType = value
+        }
+
     private fun isTan(): Boolean {
         return title == PMS_TAN_ENTRY && username.isNotEmpty()
     }
@@ -457,8 +470,11 @@ class Entry : Node, EntryVersionedInterface<Group> {
             entryInfo.expiryTime = expiryTime
             entryInfo.url = url
             entryInfo.notes = notes
+            entryInfo.tags = tags
             entryInfo.backgroundColor = backgroundColor
             entryInfo.foregroundColor = foregroundColor
+            entryInfo.customData = customData
+            entryInfo.autoType = autoType
             entryInfo.customFields = getExtraFields().toMutableList()
             // Add otpElement to generate token
             entryInfo.otpModel = getOtpElement()?.otpModel
@@ -493,8 +509,11 @@ class Entry : Node, EntryVersionedInterface<Group> {
         expiryTime = newEntryInfo.expiryTime
         url = newEntryInfo.url
         notes = newEntryInfo.notes
+        tags = newEntryInfo.tags
         backgroundColor = newEntryInfo.backgroundColor
         foregroundColor = newEntryInfo.foregroundColor
+        customData = newEntryInfo.customData
+        autoType = newEntryInfo.autoType
         addExtraFields(newEntryInfo.customFields)
         database?.attachmentPool?.let { binaryPool ->
             newEntryInfo.attachments.forEach { attachment ->

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

@@ -31,7 +31,6 @@ import com.kunzisoft.keepass.database.element.node.*
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.GroupInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.utils.UuidUtil
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -263,6 +262,12 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
             }
         }
 
+    var customData: CustomData
+        get() = groupKDBX?.customData ?: CustomData()
+        set(value) {
+            groupKDBX?.customData = value
+        }
+
     override fun getChildGroups(): List<Group> {
         return groupKDB?.getChildGroups()?.map {
             Group(it)
@@ -435,12 +440,35 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
         groupKDBX?.nodeId = id
     }
 
-    fun setEnableAutoType(enableAutoType: Boolean?) {
-        groupKDBX?.enableAutoType = enableAutoType
+    var searchable: Boolean?
+        get() = groupKDBX?.enableSearching
+        set(value) {
+            groupKDBX?.enableSearching = value
         }
 
-    fun setEnableSearching(enableSearching: Boolean?) {
-        groupKDBX?.enableSearching = enableSearching
+    fun isSearchable(): Boolean {
+        val searchableGroup = searchable
+        if (searchableGroup == null) {
+            val parenGroup = parent
+            if (parenGroup == null)
+                return true
+            else
+                return parenGroup.isSearchable()
+        } else {
+            return searchableGroup
+        }
+    }
+
+    var enableAutoType: Boolean?
+        get() = groupKDBX?.enableAutoType
+        set(value) {
+            groupKDBX?.enableAutoType = value
+        }
+
+    var defaultAutoTypeSequence: String
+        get() = groupKDBX?.defaultAutoTypeSequence ?: ""
+        set(value) {
+            groupKDBX?.defaultAutoTypeSequence = value
         }
 
     fun setExpanded(expanded: Boolean) {
@@ -463,6 +491,11 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
         groupInfo.expires = expires
         groupInfo.expiryTime = expiryTime
         groupInfo.notes = notes
+        groupInfo.searchable = searchable
+        groupInfo.enableAutoType = enableAutoType
+        groupInfo.defaultAutoTypeSequence = defaultAutoTypeSequence
+        groupInfo.tags = tags
+        groupInfo.customData = customData
         return groupInfo
     }
 
@@ -475,6 +508,11 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
         expires = groupInfo.expires
         expiryTime = groupInfo.expiryTime
         notes = groupInfo.notes
+        searchable = groupInfo.searchable
+        enableAutoType = groupInfo.enableAutoType
+        defaultAutoTypeSequence = groupInfo.defaultAutoTypeSequence
+        tags = groupInfo.tags
+        customData = groupInfo.customData
     }
 
     override fun equals(other: Any?): Boolean {

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

@@ -2,15 +2,19 @@ package com.kunzisoft.keepass.database.element
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.utils.StringUtil.removeSpaceChars
 
 class Tags: Parcelable {
 
-    private val mTags = ArrayList<String>()
+    private val mTags = mutableListOf<String>()
 
     constructor()
 
     constructor(values: String): this() {
-        mTags.addAll(values.split(';'))
+        mTags.addAll(values
+            .split(DELIMITER, DELIMITER1)
+            .filter { it.removeSpaceChars().isNotEmpty() }
+        )
     }
 
     constructor(parcel: Parcel) : this() {
@@ -25,15 +29,55 @@ class Tags: Parcelable {
         return 0
     }
 
+    fun setTags(tags: Tags) {
+        mTags.clear()
+        mTags.addAll(tags.mTags)
+    }
+
+    fun get(position: Int): String {
+        return mTags[position]
+    }
+
+    fun put(tag: String) {
+        if (tag.removeSpaceChars().isNotEmpty() && !mTags.contains(tag))
+            mTags.add(tag)
+    }
+
+    fun put(tags: Tags) {
+        tags.mTags.forEach {
+            put(it)
+        }
+    }
+
     fun isEmpty(): Boolean {
         return mTags.isEmpty()
     }
 
+    fun isNotEmpty(): Boolean {
+        return !isEmpty()
+    }
+
+    fun size(): Int {
+        return mTags.size
+    }
+
+    fun clear() {
+        mTags.clear()
+    }
+
+    fun toList(): List<String> {
+        return mTags
+    }
+
     override fun toString(): String {
-        return mTags.joinToString(";")
+        return mTags.joinToString(DELIMITER.toString())
     }
 
     companion object CREATOR : Parcelable.Creator<Tags> {
+        const val DELIMITER= ','
+        const val DELIMITER1= ';'
+        val DELIMITERS = listOf(',', ';')
+
         override fun createFromParcel(parcel: Parcel): Tags {
             return Tags(parcel)
         }

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

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.element.binary
 
-class AttachmentPool(binaryCache: BinaryCache) : BinaryPool<Int>(binaryCache) {
+class AttachmentPool : BinaryPool<Int>() {
 
     /**
      * Utility method to find an unused key in the pool

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

@@ -180,12 +180,16 @@ abstract class BinaryData : Parcelable {
 
     companion object {
         private val TAG = BinaryData::class.java.name
+        private const val MAX_BINARY_BYTE = 10485760 // 10 MB
 
         fun canMemoryBeAllocatedInRAM(context: Context, memoryWanted: Long): Boolean {
+            if (memoryWanted > MAX_BINARY_BYTE)
+                return false
             val memoryInfo = ActivityManager.MemoryInfo()
-            (context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).getMemoryInfo(memoryInfo)
+            (context.getSystemService(Context.ACTIVITY_SERVICE)
+                    as? ActivityManager?)?.getMemoryInfo(memoryInfo)
             val availableMemory = memoryInfo.availMem
-            return availableMemory > memoryWanted * 3
+            return availableMemory > (memoryWanted * 5)
         }
     }
 

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

@@ -23,7 +23,7 @@ import android.util.Log
 import java.io.IOException
 import kotlin.math.abs
 
-abstract class BinaryPool<T>(private val mBinaryCache: BinaryCache) {
+abstract class BinaryPool<T> {
 
     protected val pool = LinkedHashMap<T, BinaryData>()
 
@@ -225,9 +225,6 @@ abstract class BinaryPool<T>(private val mBinaryCache: BinaryCache) {
 
     @Throws(IOException::class)
     fun clear() {
-        doForEachBinary { _, binary ->
-            binary.clear(mBinaryCache)
-        }
         pool.clear()
     }
 

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

@@ -4,19 +4,16 @@ import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 import java.util.*
 
-class CustomIconPool(private val binaryCache: BinaryCache) : BinaryPool<UUID>(binaryCache) {
+class CustomIconPool : BinaryPool<UUID>() {
 
     private val customIcons = HashMap<UUID, IconImageCustom>()
 
     fun put(key: UUID? = null,
             name: String,
             lastModificationTime: DateInstant?,
-            smallSize: Boolean,
+            builder: (uniqueBinaryId: String) -> BinaryData,
             result: (IconImageCustom, BinaryData?) -> Unit) {
-        val keyBinary = super.put(key) { uniqueBinaryId ->
-            // Create a byte array for better performance with small data
-            binaryCache.getBinaryData(uniqueBinaryId, smallSize)
-        }
+        val keyBinary = super.put(key, builder)
         val uuid = keyBinary.keys.first()
         val customIcon = IconImageCustom(uuid, name, lastModificationTime)
         customIcons[uuid] = customIcon

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

@@ -34,21 +34,44 @@ import com.kunzisoft.keepass.database.element.node.NodeVersioned
 import java.io.IOException
 import java.io.InputStream
 import java.util.*
-import kotlin.collections.ArrayList
 
 class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
 
-    private var kdfListV3: MutableList<KdfEngine> = ArrayList()
+    override var encryptionAlgorithm: EncryptionAlgorithm = EncryptionAlgorithm.AESRijndael
+
+    override val availableEncryptionAlgorithms: List<EncryptionAlgorithm> = listOf(
+        EncryptionAlgorithm.AESRijndael,
+        EncryptionAlgorithm.Twofish
+    )
+
+    override var kdfEngine: KdfEngine?
+        get() = kdfAvailableList[0]
+        set(value) {
+            value?.let {
+                numberKeyEncryptionRounds = value.defaultKeyRounds
+            }
+        }
+
+    override val kdfAvailableList: List<KdfEngine> = listOf(
+        KdfFactory.aesKdf
+    )
+
+    override val passwordEncoding: String
+        get() = "ISO-8859-1"
+
+    override var numberKeyEncryptionRounds = 300L
 
     override val version: String
         get() = "V1"
 
+    override val defaultFileExtension: String
+        get() = ".kdb"
+
     init {
         // New manual root because KDB contains multiple root groups (here available with getRootGroups())
         rootGroup = createGroup().apply {
             icon.standard = getStandardIcon(IconImageStandard.DATABASE_ID)
         }
-        kdfListV3.add(KdfFactory.aesKdf)
     }
 
     val backupGroup: GroupKDB?
@@ -65,29 +88,6 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
 
     var color: Int? = null
 
-    override val kdfEngine: KdfEngine
-        get() = kdfListV3[0]
-
-    override val kdfAvailableList: List<KdfEngine>
-        get() = kdfListV3
-
-    override val availableEncryptionAlgorithms: List<EncryptionAlgorithm>
-        get() {
-            val list = ArrayList<EncryptionAlgorithm>()
-            list.add(EncryptionAlgorithm.AESRijndael)
-            list.add(EncryptionAlgorithm.Twofish)
-            return list
-        }
-
-    override val passwordEncoding: String
-        get() = "ISO-8859-1"
-
-    override var numberKeyEncryptionRounds = 300L
-
-    init {
-        algorithm = EncryptionAlgorithm.AESRijndael
-    }
-
     /**
      * Generates an unused random tree id
      *
@@ -212,29 +212,7 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         return true
     }
 
-    fun recycle(group: GroupKDB) {
-        removeGroupFrom(group, group.parent)
-        addGroupTo(group, backupGroup)
-        group.afterAssignNewParent()
-    }
-
-    fun recycle(entry: EntryKDB) {
-        removeEntryFrom(entry, entry.parent)
-        addEntryTo(entry, backupGroup)
-        entry.afterAssignNewParent()
-    }
-
-    fun undoRecycle(group: GroupKDB, origParent: GroupKDB) {
-        removeGroupFrom(group, backupGroup)
-        addGroupTo(group, origParent)
-    }
-
-    fun undoRecycle(entry: EntryKDB, origParent: GroupKDB) {
-        removeEntryFrom(entry, backupGroup)
-        addEntryTo(entry, origParent)
-    }
-
-    fun buildNewAttachment(): BinaryData {
+    fun buildNewBinaryAttachment(): BinaryData {
         // Generate an unique new file
         return attachmentPool.put { uniqueBinaryId ->
             binaryCache.getBinaryData(uniqueBinaryId, false)

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

@@ -25,16 +25,16 @@ import android.util.Log
 import com.kunzisoft.encrypt.HashManager
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.action.node.NodeHandler
-import com.kunzisoft.keepass.database.crypto.AesEngine
-import com.kunzisoft.keepass.database.crypto.CipherEngine
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.crypto.VariantDictionary
+import com.kunzisoft.keepass.database.crypto.kdf.AesKdf
 import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
 import com.kunzisoft.keepass.database.crypto.kdf.KdfFactory
 import com.kunzisoft.keepass.database.crypto.kdf.KdfParameters
 import com.kunzisoft.keepass.database.element.CustomData
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.DeletedObject
+import com.kunzisoft.keepass.database.element.Tags
 import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
@@ -42,12 +42,13 @@ import com.kunzisoft.keepass.database.element.entry.FieldReferencesEngine
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+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.NodeVersioned
 import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.element.template.Template
 import com.kunzisoft.keepass.database.element.template.TemplateEngineCompatible
-import com.kunzisoft.keepass.database.exception.UnknownKDF
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_31
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_40
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_41
@@ -66,6 +67,7 @@ import javax.crypto.Mac
 import javax.xml.XMLConstants
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.parsers.ParserConfigurationException
+import kotlin.collections.HashSet
 import kotlin.math.min
 
 
@@ -73,27 +75,70 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     var hmacKey: ByteArray? = null
         private set
-    var cipherUuid = EncryptionAlgorithm.AESRijndael.uuid
-    private var dataEngine: CipherEngine = AesEngine()
-    var compressionAlgorithm = CompressionAlgorithm.GZip
+
+    override var encryptionAlgorithm: EncryptionAlgorithm = EncryptionAlgorithm.AESRijndael
+
+    fun setEncryptionAlgorithmFromUUID(uuid: UUID) {
+        encryptionAlgorithm = EncryptionAlgorithm.getFrom(uuid)
+    }
+
+    override val availableEncryptionAlgorithms: List<EncryptionAlgorithm> = listOf(
+        EncryptionAlgorithm.AESRijndael,
+        EncryptionAlgorithm.Twofish,
+        EncryptionAlgorithm.ChaCha20
+    )
+
     var kdfParameters: KdfParameters? = null
-    private var kdfList: MutableList<KdfEngine> = ArrayList()
-    private var numKeyEncRounds: Long = 0
-    var publicCustomData = VariantDictionary()
+
+    override var kdfEngine: KdfEngine?
+        get() = getKdfEngineFromParameters(kdfParameters)
+        set(value) {
+            value?.let {
+                if (kdfParameters?.uuid != value.defaultParameters.uuid)
+                    kdfParameters = value.defaultParameters
+                numberKeyEncryptionRounds = value.defaultKeyRounds
+                memoryUsage = value.defaultMemoryUsage
+                parallelism = value.defaultParallelism
+            }
+        }
+
+    private fun getKdfEngineFromParameters(kdfParameters: KdfParameters?): KdfEngine? {
+        if (kdfParameters == null) {
+            return null
+        }
+        for (engine in kdfAvailableList) {
+            if (engine.uuid == kdfParameters.uuid) {
+                return engine
+            }
+        }
+        return null
+    }
+
+    fun randomizeKdfParameters() {
+        kdfParameters?.let {
+            kdfEngine?.randomize(it)
+        }
+    }
+
+    override val kdfAvailableList: List<KdfEngine> = listOf(
+        KdfFactory.aesKdf,
+        KdfFactory.argon2dKdf,
+        KdfFactory.argon2idKdf
+    )
+
+    var compressionAlgorithm = CompressionAlgorithm.GZip
+
     private val mFieldReferenceEngine = FieldReferencesEngine(this)
     private val mTemplateEngine = TemplateEngineCompatible(this)
 
     var kdbxVersion = UnsignedInt(0)
     var name = ""
     var nameChanged = DateInstant()
-    // TODO change setting date
-    var settingsChanged = DateInstant()
     var description = ""
     var descriptionChanged = DateInstant()
     var defaultUserName = ""
     var defaultUserNameChanged = DateInstant()
-
-    // TODO last change date
+    var settingsChanged = DateInstant()
     var keyLastChanged = DateInstant()
     var keyChangeRecDays: Long = -1
     var keyChangeForceDays: Long = 1
@@ -115,16 +160,13 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     var lastSelectedGroupUUID = UUID_ZERO
     var lastTopVisibleGroupUUID = UUID_ZERO
     var memoryProtection = MemoryProtectionConfig()
-    val deletedObjects = ArrayList<DeletedObject>()
+    val deletedObjects = HashSet<DeletedObject>()
+    var publicCustomData = VariantDictionary()
     val customData = CustomData()
 
-    var localizedAppName = "KeePassDX"
+    val tagPool = Tags()
 
-    init {
-        kdfList.add(KdfFactory.aesKdf)
-        kdfList.add(KdfFactory.argon2dKdf)
-        kdfList.add(KdfFactory.argon2idKdf)
-    }
+    var localizedAppName = "KeePassDX"
 
     constructor()
 
@@ -159,38 +201,75 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             return "V2 - KDBX$kdbxStringVersion"
         }
 
-    override val kdfEngine: KdfEngine?
-        get() = try {
-            getEngineKDBX4(kdfParameters)
-        } catch (unknownKDF: UnknownKDF) {
-            Log.i(TAG, "Unable to retrieve KDF engine", unknownKDF)
-            null
+    override val defaultFileExtension: String
+        get() = ".kdbx"
+
+    private open class NodeOperationHandler<T: NodeKDBXInterface> : NodeHandler<T>() {
+        var containsCustomData = false
+        override fun operate(node: T): Boolean {
+            if (node.customData.isNotEmpty()) {
+                containsCustomData = true
+            }
+            return true
+        }
     }
 
-    override val kdfAvailableList: List<KdfEngine>
-        get() = kdfList
-
-    @Throws(UnknownKDF::class)
-    fun getEngineKDBX4(kdfParameters: KdfParameters?): KdfEngine {
-        val unknownKDFException = UnknownKDF()
-        if (kdfParameters == null) {
-            throw unknownKDFException
+    private inner class EntryOperationHandler: NodeOperationHandler<EntryKDBX>() {
+        var passwordQualityEstimationDisabled = false
+        override fun operate(node: EntryKDBX): Boolean {
+            if (!node.qualityCheck) {
+                passwordQualityEstimationDisabled = true
             }
-        for (engine in kdfList) {
-            if (engine.uuid == kdfParameters.uuid) {
-                return engine
+            return super.operate(node)
         }
     }
-        throw unknownKDFException
-    }
 
-    val availableCompressionAlgorithms: List<CompressionAlgorithm>
-        get() {
-            val list = ArrayList<CompressionAlgorithm>()
-            list.add(CompressionAlgorithm.None)
-            list.add(CompressionAlgorithm.GZip)
-            return list
+    private inner class GroupOperationHandler: NodeOperationHandler<GroupKDBX>() {
+        var containsTags = false
+        override fun operate(node: GroupKDBX): Boolean {
+            if (node.tags.isNotEmpty())
+                containsTags = true
+            return super.operate(node)
         }
+    }
+
+    fun getMinKdbxVersion(): UnsignedInt {
+        val entryHandler = EntryOperationHandler()
+        val groupHandler = GroupOperationHandler()
+        rootGroup?.doForEachChildAndForIt(entryHandler, groupHandler)
+
+        // https://keepass.info/help/kb/kdbx_4.1.html
+        val containsGroupWithTag = groupHandler.containsTags
+        val containsEntryWithPasswordQualityEstimationDisabled = entryHandler.passwordQualityEstimationDisabled
+        val containsCustomIconWithNameOrLastModificationTime = iconsManager.containsCustomIconWithNameOrLastModificationTime()
+        val containsHeaderCustomDataWithLastModificationTime = customData.containsItemWithLastModificationTime()
+
+        // https://keepass.info/help/kb/kdbx_4.html
+        // If AES is not use, it's at least 4.0
+        val keyDerivationFunction = kdfEngine
+        val kdfIsNotAes = keyDerivationFunction != null && keyDerivationFunction.uuid != AesKdf.CIPHER_UUID
+        val containsHeaderCustomData = customData.isNotEmpty()
+        val containsNodeCustomData = entryHandler.containsCustomData || groupHandler.containsCustomData
+
+        // Check each condition to determine version
+        return if (containsGroupWithTag
+            || containsEntryWithPasswordQualityEstimationDisabled
+            || containsCustomIconWithNameOrLastModificationTime
+            || containsHeaderCustomDataWithLastModificationTime) {
+            FILE_VERSION_41
+        } else if (kdfIsNotAes
+            || containsHeaderCustomData
+            || containsNodeCustomData) {
+            FILE_VERSION_40
+        } else {
+            FILE_VERSION_31
+        }
+    }
+
+    val availableCompressionAlgorithms: List<CompressionAlgorithm> = listOf(
+        CompressionAlgorithm.None,
+        CompressionAlgorithm.GZip
+    )
 
     fun changeBinaryCompression(oldCompression: CompressionAlgorithm,
                                 newCompression: CompressionAlgorithm) {
@@ -245,18 +324,10 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         }
     }
 
-    override val availableEncryptionAlgorithms: List<EncryptionAlgorithm>
-        get() {
-            val list = ArrayList<EncryptionAlgorithm>()
-            list.add(EncryptionAlgorithm.AESRijndael)
-            list.add(EncryptionAlgorithm.Twofish)
-            list.add(EncryptionAlgorithm.ChaCha20)
-            return list
-        }
-
     override var numberKeyEncryptionRounds: Long
         get() {
             val kdfEngine = kdfEngine
+            var numKeyEncRounds: Long = 0
             if (kdfEngine != null && kdfParameters != null)
                 numKeyEncRounds = kdfEngine.getKeyRounds(kdfParameters!!)
             return numKeyEncRounds
@@ -265,7 +336,6 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             val kdfEngine = kdfEngine
             if (kdfEngine != null && kdfParameters != null)
                 kdfEngine.setKeyRounds(kdfParameters!!, rounds)
-            numKeyEncRounds = rounds
         }
 
     var memoryUsage: Long
@@ -305,7 +375,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     // Retrieve recycle bin in index
     val recycleBin: GroupKDBX?
-        get() = if (recycleBinUUID == UUID_ZERO) null else getGroupByUUID(recycleBinUUID)
+        get() = getGroupByUUID(recycleBinUUID)
 
     val lastSelectedGroup: GroupKDBX?
         get() = getGroupByUUID(lastSelectedGroupUUID)
@@ -313,17 +383,14 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     val lastTopVisibleGroup: GroupKDBX?
         get() = getGroupByUUID(lastTopVisibleGroupUUID)
 
-    fun setDataEngine(dataEngine: CipherEngine) {
-        this.dataEngine = dataEngine
-    }
-
     override fun getStandardIcon(iconId: Int): IconImageStandard {
         return this.iconsManager.getIcon(iconId)
     }
 
     fun buildNewCustomIcon(customIconId: UUID? = null,
                            result: (IconImageCustom, BinaryData?) -> Unit) {
-        iconsManager.buildNewCustomIcon(customIconId, result)
+        // Create a binary file for a brand new custom icon
+        addCustomIcon(customIconId, "", null, false, result)
     }
 
     fun addCustomIcon(customIconId: UUID? = null,
@@ -331,14 +398,21 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
                       lastModificationTime: DateInstant?,
                       smallSize: Boolean,
                       result: (IconImageCustom, BinaryData?) -> Unit) {
-        iconsManager.addCustomIcon(customIconId, name, lastModificationTime, smallSize, result)
+        iconsManager.addCustomIcon(customIconId, name, lastModificationTime, { uniqueBinaryId ->
+            // Create a byte array for better performance with small data
+            binaryCache.getBinaryData(uniqueBinaryId, smallSize)
+        }, result)
+    }
+
+    fun removeCustomIcon(iconUuid: UUID) {
+        iconsManager.removeCustomIcon(iconUuid, binaryCache)
     }
 
     fun isCustomIconBinaryDuplicate(binary: BinaryData): Boolean {
         return iconsManager.isCustomIconBinaryDuplicate(binary)
     }
 
-    fun getCustomIcon(iconUuid: UUID): IconImageCustom {
+    fun getCustomIcon(iconUuid: UUID): IconImageCustom? {
         return this.iconsManager.getIcon(iconUuid)
     }
 
@@ -355,7 +429,6 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             val templatesGroup = firstGroupWithValidName
                 ?: mTemplateEngine.createNewTemplatesGroup(templatesGroupName)
             entryTemplatesGroup = templatesGroup.id
-            entryTemplatesGroupChanged = templatesGroup.lastModificationTime
         } else {
             removeTemplatesGroup()
         }
@@ -363,7 +436,6 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     fun removeTemplatesGroup() {
         entryTemplatesGroup = UUID_ZERO
-        entryTemplatesGroupChanged = DateInstant()
         mTemplateEngine.clearCache()
     }
 
@@ -476,7 +548,8 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     fun makeFinalKey(masterSeed: ByteArray) {
 
         kdfParameters?.let { keyDerivationFunctionParameters ->
-            val kdfEngine = getEngineKDBX4(keyDerivationFunctionParameters)
+            val kdfEngine = getKdfEngineFromParameters(keyDerivationFunctionParameters)
+                ?: throw IOException("Unknown key derivation function")
 
             var transformedMasterKey = kdfEngine.transform(masterKey, keyDerivationFunctionParameters)
             if (transformedMasterKey.size != 32) {
@@ -486,7 +559,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             val cmpKey = ByteArray(65)
             System.arraycopy(masterSeed, 0, cmpKey, 0, 32)
             System.arraycopy(transformedMasterKey, 0, cmpKey, 32, 32)
-            finalKey = resizeKey(cmpKey, dataEngine.keyLength())
+            finalKey = resizeKey(cmpKey, encryptionAlgorithm.cipherEngine.keyLength())
 
             val messageDigest: MessageDigest
             try {
@@ -724,14 +797,13 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
                 firstGroupWithValidName
             }
             recycleBinUUID = recycleBinGroup.id
-            recycleBinChanged = recycleBinGroup.lastModificationTime
+            recycleBinChanged = DateInstant()
         }
     }
 
     fun removeRecycleBin() {
         if (recycleBin != null) {
             recycleBinUUID = UUID_ZERO
-            recycleBinChanged = DateInstant()
         }
     }
 
@@ -753,64 +825,41 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         return false
     }
 
-    fun recycle(group: GroupKDBX, resources: Resources) {
-        ensureRecycleBinExists(resources)
-        removeGroupFrom(group, group.parent)
-        addGroupTo(group, recycleBin)
-        group.afterAssignNewParent()
-    }
-
-    fun recycle(entry: EntryKDBX, resources: Resources) {
-        ensureRecycleBinExists(resources)
-        removeEntryFrom(entry, entry.parent)
-        addEntryTo(entry, recycleBin)
-        entry.afterAssignNewParent()
-    }
-
-    fun undoRecycle(group: GroupKDBX, origParent: GroupKDBX) {
-        removeGroupFrom(group, recycleBin)
-        addGroupTo(group, origParent)
-    }
-
-    fun undoRecycle(entry: EntryKDBX, origParent: GroupKDBX) {
-        removeEntryFrom(entry, recycleBin)
-        addEntryTo(entry, origParent)
-    }
-
-    fun getDeletedObjects(): List<DeletedObject> {
-        return deletedObjects
+    fun getDeletedObject(nodeId: NodeId<UUID>): DeletedObject? {
+        return deletedObjects.find { it.uuid == nodeId.id }
     }
 
     fun addDeletedObject(deletedObject: DeletedObject) {
         this.deletedObjects.add(deletedObject)
     }
 
+    fun addDeletedObject(objectId: UUID) {
+        addDeletedObject(DeletedObject(objectId))
+    }
+
     override fun addEntryTo(newEntry: EntryKDBX, parent: GroupKDBX?) {
         super.addEntryTo(newEntry, parent)
+        tagPool.put(newEntry.tags)
         mFieldReferenceEngine.clear()
     }
 
     override fun updateEntry(entry: EntryKDBX) {
         super.updateEntry(entry)
+        tagPool.put(entry.tags)
         mFieldReferenceEngine.clear()
     }
 
     override fun removeEntryFrom(entryToRemove: EntryKDBX, parent: GroupKDBX?) {
         super.removeEntryFrom(entryToRemove, parent)
-        deletedObjects.add(DeletedObject(entryToRemove.id))
+        // Do not remove tags from pool, it's only in temp memory
         mFieldReferenceEngine.clear()
     }
 
-    override fun undoDeleteEntryFrom(entry: EntryKDBX, origParent: GroupKDBX?) {
-        super.undoDeleteEntryFrom(entry, origParent)
-        deletedObjects.remove(DeletedObject(entry.id))
-    }
-
     fun containsPublicCustomData(): Boolean {
         return publicCustomData.size() > 0
     }
 
-    fun buildNewAttachment(smallSize: Boolean,
+    fun buildNewBinaryAttachment(smallSize: Boolean,
                                  compression: Boolean,
                                  protection: Boolean,
                                  binaryPoolId: Int? = null): BinaryData {
@@ -830,6 +879,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     }
 
     private fun removeUnlinkedAttachments(binaries: List<BinaryData>, clear: Boolean) {
+        // TODO check in icon pool
         // Build binaries to remove with all binaries known
         val binariesToRemove = ArrayList<BinaryData>()
         if (binaries.isEmpty()) {
@@ -866,11 +916,10 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         return super.validatePasswordEncoding(password, containsKeyFile)
     }
 
-    override fun clearCache() {
+    override fun clearIndexes() {
         try {
-            super.clearCache()
+            super.clearIndexes()
             mFieldReferenceEngine.clear()
-            attachmentPool.clear()
         } catch (e: Exception) {
             Log.e(TAG, "Unable to clear cache", e)
         }

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

@@ -19,8 +19,10 @@
  */
 package com.kunzisoft.keepass.database.element.database
 
+import android.util.Log
 import com.kunzisoft.encrypt.HashManager
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
 import com.kunzisoft.keepass.database.element.binary.AttachmentPool
 import com.kunzisoft.keepass.database.element.binary.BinaryCache
 import com.kunzisoft.keepass.database.element.entry.EntryVersioned
@@ -44,47 +46,38 @@ abstract class DatabaseVersioned<
         Entry : EntryVersioned<GroupId, EntryId, Group, Entry>
         > {
 
+
     // Algorithm used to encrypt the database
-    protected var algorithm: EncryptionAlgorithm? = null
+    abstract var encryptionAlgorithm: EncryptionAlgorithm
+    abstract val availableEncryptionAlgorithms: List<EncryptionAlgorithm>
 
-    abstract val kdfEngine: com.kunzisoft.keepass.database.crypto.kdf.KdfEngine?
+    abstract var kdfEngine: KdfEngine?
+    abstract val kdfAvailableList: List<KdfEngine>
+    abstract var numberKeyEncryptionRounds: Long
 
-    abstract val kdfAvailableList: List<com.kunzisoft.keepass.database.crypto.kdf.KdfEngine>
+    protected abstract val passwordEncoding: String
 
     var masterKey = ByteArray(32)
     var finalKey: ByteArray? = null
         protected set
 
+    abstract val version: String
+    abstract val defaultFileExtension: String
+
     /**
      * To manage binaries in faster way
      * Cipher key generated when the database is loaded, and destroyed when the database is closed
      * Can be used to temporarily store database elements
      */
     var binaryCache = BinaryCache()
-    val iconsManager = IconsManager(binaryCache)
-    var attachmentPool = AttachmentPool(binaryCache)
+    var iconsManager = IconsManager()
+    var attachmentPool = AttachmentPool()
 
     var changeDuplicateId = false
 
     private var groupIndexes = LinkedHashMap<NodeId<GroupId>, Group>()
     private var entryIndexes = LinkedHashMap<NodeId<EntryId>, Entry>()
 
-    abstract val version: String
-
-    protected abstract val passwordEncoding: String
-
-    abstract var numberKeyEncryptionRounds: Long
-
-    var encryptionAlgorithm: EncryptionAlgorithm
-        get() {
-            return algorithm ?: EncryptionAlgorithm.AESRijndael
-        }
-        set(algorithm) {
-            this.algorithm = algorithm
-        }
-
-    abstract val availableEncryptionAlgorithms: List<EncryptionAlgorithm>
-
     var rootGroup: Group? = null
         set(value) {
             field = value
@@ -274,7 +267,7 @@ abstract class DatabaseVersioned<
         this.entryIndexes.remove(entry.nodeId)
     }
 
-    open fun clearCache() {
+    open fun clearIndexes() {
         this.groupIndexes.clear()
         this.entryIndexes.clear()
     }
@@ -304,7 +297,7 @@ abstract class DatabaseVersioned<
         }
     }
 
-    fun removeGroupFrom(groupToRemove: Group, parent: Group?) {
+    open fun removeGroupFrom(groupToRemove: Group, parent: Group?) {
         // Remove tree from parent tree
         parent?.removeChildGroup(groupToRemove)
         removeGroupIndex(groupToRemove)
@@ -331,23 +324,39 @@ abstract class DatabaseVersioned<
         removeEntryIndex(entryToRemove)
     }
 
-    // TODO Delete group
-    fun undoDeleteGroupFrom(group: Group, origParent: Group?) {
-        addGroupTo(group, origParent)
-    }
-
-    open fun undoDeleteEntryFrom(entry: Entry, origParent: Group?) {
-        addEntryTo(entry, origParent)
-    }
-
     abstract fun isInRecycleBin(group: Group): Boolean
 
-    fun isGroupSearchable(group: Group?, omitBackup: Boolean): Boolean {
-        if (group == null)
-            return false
-        if (omitBackup && isInRecycleBin(group))
-            return false
-        return true
+    fun clearIconsCache() {
+        iconsManager.doForEachCustomIcon { _, binary ->
+            try {
+                binary.clear(binaryCache)
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to clear icon binary cache", e)
+            }
+        }
+        iconsManager.clear()
+    }
+
+    fun clearAttachmentsCache() {
+        attachmentPool.doForEachBinary { _, binary ->
+            try {
+                binary.clear(binaryCache)
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to clear attachment binary cache", e)
+            }
+        }
+        attachmentPool.clear()
+    }
+
+    fun clearBinaries() {
+        binaryCache.clear()
+    }
+
+    fun clearAll() {
+        clearIndexes()
+        clearIconsCache()
+        clearAttachmentsCache()
+        clearBinaries()
     }
 
     companion object {

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

@@ -139,8 +139,9 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         dest.writeInt(binaryDataId ?: -1)
     }
 
-    fun updateWith(source: EntryKDB) {
-        super.updateWith(source)
+    fun updateWith(source: EntryKDB,
+                   updateParents: Boolean = true) {
+        super.updateWith(source, updateParents)
         title = source.title
         username = source.username
         password = source.password

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

@@ -110,8 +110,10 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
      * Update with deep copy of each entry element
      * @param source
      */
-    fun updateWith(source: EntryKDBX, copyHistory: Boolean = true) {
-        super.updateWith(source)
+    fun updateWith(source: EntryKDBX,
+                   copyHistory: Boolean = true,
+                   updateParents: Boolean = true) {
+        super.updateWith(source, updateParents)
         usageCount = source.usageCount
         locationChanged = DateInstant(source.locationChanged)
         customData = CustomData(source.customData)

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

@@ -53,8 +53,9 @@ class GroupKDB : GroupVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         dest.writeInt(groupFlags)
     }
 
-    fun updateWith(source: GroupKDB) {
-        super.updateWith(source)
+    fun updateWith(source: GroupKDB,
+                   updateParents: Boolean = true) {
+        super.updateWith(source, updateParents)
         groupFlags = source.groupFlags
     }
 

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

@@ -41,9 +41,9 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     override var customData = CustomData()
     var notes = ""
     var isExpanded = true
-    var defaultAutoTypeSequence = ""
-    var enableAutoType: Boolean? = null
     var enableSearching: Boolean? = null
+    var enableAutoType: Boolean? = null
+    var defaultAutoTypeSequence: String = ""
     var lastTopVisibleEntry: UUID = DatabaseVersioned.UUID_ZERO
     override var tags = Tags()
     override var previousParentGroup: UUID = DatabaseVersioned.UUID_ZERO
@@ -69,11 +69,11 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         customData = parcel.readParcelable(CustomData::class.java.classLoader) ?: CustomData()
         notes = parcel.readString() ?: notes
         isExpanded = parcel.readByte().toInt() != 0
-        defaultAutoTypeSequence = parcel.readString() ?: defaultAutoTypeSequence
-        val isAutoTypeEnabled = parcel.readInt()
-        enableAutoType = if (isAutoTypeEnabled == -1) null else isAutoTypeEnabled == 1
         val isSearchingEnabled = parcel.readInt()
         enableSearching = if (isSearchingEnabled == -1) null else isSearchingEnabled == 1
+        val isAutoTypeEnabled = parcel.readInt()
+        enableAutoType = if (isAutoTypeEnabled == -1) null else isAutoTypeEnabled == 1
+        defaultAutoTypeSequence = parcel.readString() ?: defaultAutoTypeSequence
         lastTopVisibleEntry = parcel.readSerializable() as UUID
         tags = parcel.readParcelable(Tags::class.java.classLoader) ?: tags
         previousParentGroup = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: DatabaseVersioned.UUID_ZERO
@@ -94,25 +94,26 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         dest.writeParcelable(customData, flags)
         dest.writeString(notes)
         dest.writeByte((if (isExpanded) 1 else 0).toByte())
-        dest.writeString(defaultAutoTypeSequence)
-        dest.writeInt(if (enableAutoType == null) -1 else if (enableAutoType!!) 1 else 0)
         dest.writeInt(if (enableSearching == null) -1 else if (enableSearching!!) 1 else 0)
+        dest.writeInt(if (enableAutoType == null) -1 else if (enableAutoType!!) 1 else 0)
+        dest.writeString(defaultAutoTypeSequence)
         dest.writeSerializable(lastTopVisibleEntry)
         dest.writeParcelable(tags, flags)
         dest.writeParcelable(ParcelUuid(previousParentGroup), flags)
     }
 
-    fun updateWith(source: GroupKDBX) {
-        super.updateWith(source)
+    fun updateWith(source: GroupKDBX,
+                   updateParents: Boolean = true) {
+        super.updateWith(source, updateParents)
         usageCount = source.usageCount
         locationChanged = DateInstant(source.locationChanged)
         // Add all custom elements in map
         customData = CustomData(source.customData)
         notes = source.notes
         isExpanded = source.isExpanded
-        defaultAutoTypeSequence = source.defaultAutoTypeSequence
-        enableAutoType = source.enableAutoType
         enableSearching = source.enableSearching
+        enableAutoType = source.enableAutoType
+        defaultAutoTypeSequence = source.defaultAutoTypeSequence
         lastTopVisibleEntry = source.lastTopVisibleEntry
         tags = source.tags
         previousParentGroup = source.previousParentGroup

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

@@ -51,13 +51,16 @@ abstract class GroupVersioned
         dest.writeString(titleGroup)
     }
 
-    protected fun updateWith(source: GroupVersioned<GroupId, EntryId, Group, Entry>) {
-        super.updateWith(source)
+    protected fun updateWith(source: GroupVersioned<GroupId, EntryId, Group, Entry>,
+                             updateParents: Boolean = true) {
+        super.updateWith(source, updateParents)
         titleGroup = source.titleGroup
+        if (updateParents) {
             removeChildren()
             childGroups.addAll(source.childGroups)
             childEntries.addAll(source.childEntries)
         }
+    }
 
     override var title: String
         get() = titleGroup

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

@@ -28,12 +28,12 @@ import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.K
 import com.kunzisoft.keepass.icons.IconPack.Companion.NB_ICONS
 import java.util.*
 
-class IconsManager(binaryCache: BinaryCache) {
+class IconsManager {
 
     private val standardCache = List(NB_ICONS) {
         IconImageStandard(it)
     }
-    private val customCache = CustomIconPool(binaryCache)
+    private val customCache = CustomIconPool()
 
     fun getIcon(iconId: Int): IconImageStandard {
         val searchIconId = if (IconImageStandard.isCorrectIconId(iconId)) iconId else KEY_ID
@@ -50,29 +50,23 @@ class IconsManager(binaryCache: BinaryCache) {
      *  Custom
      */
 
-    fun buildNewCustomIcon(key: UUID? = null,
-                           result: (IconImageCustom, BinaryData?) -> Unit) {
-        // Create a binary file for a brand new custom icon
-        addCustomIcon(key, "", null, false, result)
-    }
-
     fun addCustomIcon(key: UUID? = null,
                       name: String,
                       lastModificationTime: DateInstant?,
-                      smallSize: Boolean,
+                      builder: (uniqueBinaryId: String) -> BinaryData,
                       result: (IconImageCustom, BinaryData?) -> Unit) {
-        customCache.put(key, name, lastModificationTime, smallSize, result)
+        customCache.put(key, name, lastModificationTime, builder, result)
     }
 
-    fun getIcon(iconUuid: UUID): IconImageCustom {
-        return customCache.getCustomIcon(iconUuid) ?: IconImageCustom(iconUuid)
+    fun getIcon(iconUuid: UUID): IconImageCustom? {
+        return customCache.getCustomIcon(iconUuid)
     }
 
     fun isCustomIconBinaryDuplicate(binaryData: BinaryData): Boolean {
         return customCache.isBinaryDuplicate(binaryData)
     }
 
-    fun removeCustomIcon(binaryCache: BinaryCache, iconUuid: UUID) {
+    fun removeCustomIcon(iconUuid: UUID, binaryCache: BinaryCache) {
         val binary = customCache[iconUuid]
         customCache.remove(iconUuid)
         try {
@@ -99,12 +93,8 @@ class IconsManager(binaryCache: BinaryCache) {
     /**
      * Clear the cache of icons
      */
-    fun clearCache() {
-        try {
+    fun clear() {
         customCache.clear()
-        } catch(e: Exception) {
-            Log.e(TAG, "Unable to clear cache", e)
-        }
     }
 
     companion object {

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

@@ -68,9 +68,12 @@ abstract class NodeVersioned<IdType, Parent : GroupVersionedInterface<Parent, En
         return 0
     }
 
-    protected fun updateWith(source: NodeVersioned<IdType, Parent, Entry>) {
+    protected fun updateWith(source: NodeVersioned<IdType, Parent, Entry>,
+                             updateParents: Boolean = true) {
         this.nodeId = copyNodeId(source.nodeId)
+        if (updateParents) {
             this.parent = source.parent
+        }
         this.icon = source.icon
         this.creationTime = DateInstant(source.creationTime)
         this.lastModificationTime = DateInstant(source.lastModificationTime)