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,35 @@
+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

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

@@ -12,8 +12,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 31
-        versionCode = 97
-        versionName = "3.2.0"
+        versionCode = 105
+        versionName = "3.3.3"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -43,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", "{}"
@@ -82,7 +76,6 @@ android {
 
     sourceSets {
         libre.res.srcDir 'src/libre/res'
-        pro.res.srcDir 'src/pro/res'
         free.res.srcDir 'src/free/res'
     }
 
@@ -100,21 +93,22 @@ 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

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">
-            <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>
-        </group>
-        <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
-            <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">
-            <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:translateX="6"
+        android:translateY="8">
+        <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:translateX="6"
+        android:translateY="6">
+        <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/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">
-            <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>
-        </group>
-        <group
-            android:scaleX="0.3939503"
-            android:scaleY="0.3939503"
-            android:translateX="33.66343"
-            android:translateY="233.998">
-            <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">
-            <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:translateX="6"
+        android:translateY="8">
+        <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:translateX="6"
+        android:translateY="6">
+        <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/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

@@ -44,6 +44,7 @@ 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
@@ -66,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
@@ -84,6 +84,7 @@ class EntryActivity : DatabaseLockActivity() {
     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
@@ -92,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
@@ -132,6 +135,7 @@ class EntryActivity : DatabaseLockActivity() {
         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)
@@ -161,6 +165,19 @@ class EntryActivity : DatabaseLockActivity() {
             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 ->
@@ -192,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
@@ -370,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)
@@ -381,11 +401,7 @@ class EntryActivity : DatabaseLockActivity() {
 
             // Show education views
             Handler(Looper.getMainLooper()).post {
-                performedNextEducation(
-                    EntryActivityEducation(
-                        this
-                    ), menu
-                )
+                performedNextEducation(menu)
             }
         }
         return true
@@ -411,31 +427,30 @@ class EntryActivity : DatabaseLockActivity() {
         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)
                     }
             )
         }
@@ -443,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 ->

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)
-                }
+            Handler(Looper.getMainLooper()).post {
+                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()
-                            }
+                            FileDatabaseSelectActivity.launchForSaveResult(this,
+                                    searchInfo)
                         } 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(
-                    openDatabaseButtonView!!,
-                    { tapTargetView ->
-                        tapTargetView?.let {
-                            mExternalFileHelper?.openDocument()
-                        }
-                    },
-                    {}
-            )
+            && 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,10 +166,11 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
         }
 
         // Listen password checkbox to init advanced unlock and confirmation button
-        checkboxPasswordView?.setOnCheckedChangeListener { _, _ ->
-            mAdvancedUnlockViewModel.checkUnlockAvailability()
-            enableOrNotTheConfirmationButton()
-        }
+        mainCredentialView?.onPasswordChecked =
+            CompoundButton.OnCheckedChangeListener { _, _ ->
+                mAdvancedUnlockViewModel.checkUnlockAvailability()
+                enableConfirmationButton()
+            }
 
         // Observe if default database
         mDatabaseFileViewModel.isDefaultDatabase.observe(this) { isDefaultDatabase ->
@@ -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()
+        }
+
+        override fun keyfileToStore(keyfile: Uri?): ByteArray? {
+            // TODO create byte array to store keyfile
+            return null
+        }
+
+        override fun hardwareKeyToStore(): ByteArray? {
+            // TODO create byte array to store hardware key
+            return null
+        }
     }
 
-    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 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
             }
-            return false
         }
+        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()
@@ -556,11 +518,12 @@ class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderL
             databaseFileUri?.let { databaseUri ->
                 // Show the progress dialog and load the database
                 showProgressDialogAndLoadDatabase(
-                        databaseUri,
-                        MainCredential(password, keyFileUri),
-                        mReadOnly,
-                        cipherDatabaseEntity,
-                        false)
+                    databaseUri,
+                    mainCredential ?: MainCredential(),
+                    mReadOnly,
+                    cipherEncryptDatabase,
+                    false
+                )
             }
         }
     }
@@ -568,14 +531,14 @@ 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,
-                fixDuplicateUUID
+            databaseUri,
+            mainCredential,
+            readOnly,
+            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,20 +603,29 @@ 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) {}
         }
     }
 
@@ -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

@@ -53,6 +53,10 @@ class GroupDialogFragment : DatabaseDialogFragment() {
     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
 
@@ -62,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 {
@@ -75,6 +98,10 @@ class GroupDialogFragment : DatabaseDialogFragment() {
             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)
 
@@ -123,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
@@ -143,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,9 +23,8 @@ 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
@@ -37,6 +36,7 @@ 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
@@ -58,6 +58,12 @@ 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
 
@@ -118,11 +124,24 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         }
         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 {
@@ -134,6 +153,12 @@ 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
@@ -211,6 +236,11 @@ 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("")
@@ -229,6 +259,9 @@ 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()
     }
 

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) {
-                    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() }
-                }
+            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_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")

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

@@ -29,6 +29,7 @@ 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
@@ -55,6 +56,7 @@ 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
 
@@ -89,6 +91,7 @@ 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())
@@ -157,11 +160,11 @@ class EntryEditFragment: DatabaseFragment() {
             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)
         }
 
@@ -287,6 +290,7 @@ class EntryEditFragment: DatabaseFragment() {
             threshold = 1
             setAdapter(tagsAdapter)
         }
+        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
     }
 
     private fun assignEntryInfo(entryInfo: 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

@@ -88,8 +88,8 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
             mDatabaseTaskProvider?.startDatabaseSave(save)
         }
 
-        mDatabaseViewModel.mergeDatabase.observe(this) { fixDuplicateUuid ->
-            mDatabaseTaskProvider?.startDatabaseMerge(fixDuplicateUuid)
+        mDatabaseViewModel.mergeDatabase.observe(this) {
+            mDatabaseTaskProvider?.startDatabaseMerge()
         }
 
         mDatabaseViewModel.reloadDatabase.observe(this) { fixDuplicateUuid ->
@@ -263,8 +263,16 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
         mDatabaseTaskProvider?.startDatabaseSave(true)
     }
 
+    fun saveDatabaseTo(uri: Uri) {
+        mDatabaseTaskProvider?.startDatabaseSave(true, uri)
+    }
+
     fun mergeDatabase() {
-        mDatabaseTaskProvider?.startDatabaseMerge(false)
+        mDatabaseTaskProvider?.startDatabaseMerge()
+    }
+
+    fun mergeDatabaseFrom(uri: Uri, mainCredential: MainCredential) {
+        mDatabaseTaskProvider?.startDatabaseMerge(uri, mainCredential)
     }
 
     fun reloadDatabase() {

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

@@ -29,7 +29,6 @@ import android.widget.ImageView
 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
@@ -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 mTextColorSelected: 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.colorOnAccentColor))
-        this.mTextColorSelected = 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() {
@@ -352,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
@@ -396,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
@@ -457,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)
@@ -473,12 +453,12 @@ class NodesAdapter (private val context: Context,
                     holder.meta.setTextColor(mTextColor)
                 }
             } else {
-                holder.text.setTextColor(mTextColorSelected)
-                holder.subText?.setTextColor(mTextColorSelected)
-                holder.otpToken?.setTextColor(mTextColorSelected)
-                holder.otpProgress?.setIndicatorColor(mTextColorSelected)
-                holder.attachmentIcon?.setColorFilter(mTextColorSelected)
-                holder.meta.setTextColor(mTextColorSelected)
+                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)
@@ -499,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,189 +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.database.MatrixCursor
-import android.graphics.Color
-import android.provider.BaseColumns
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.cursoradapter.widget.CursorAdapter
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.node.NodeId
-import com.kunzisoft.keepass.database.element.node.NodeIdUUID
-import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.strikeOut
-import java.util.*
-
-class SearchEntryCursorAdapter(private val context: Context,
-                               private val database: Database)
-    : 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)
-        viewHolder.textViewPath = view.findViewById(R.id.entry_path)
-        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)
-            }
-
-            viewHolder.textViewPath?.apply {
-                text = currentEntry.getPathString()
-            }
-        }
-    }
-
-    private fun getEntryFrom(cursor: Cursor?): Entry? {
-        val entryCursor = cursor as? EntryCursor?
-        entryCursor?.getNodeId()?.let {
-            return database.getEntryById(it)
-        }
-        return null
-    }
-
-    override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor? {
-        return searchEntries(context, constraint.toString())
-    }
-
-    private fun searchEntries(context: Context, query: String): Cursor {
-        val cursor = EntryCursor()
-        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)
-                cursor.addEntry(entry)
-                database.stopManageEntry(entry)
-            }
-        }
-        return cursor
-    }
-
-    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
-        var textViewPath: TextView? = null
-    }
-
-    private class EntryCursor : MatrixCursor(arrayOf(
-        ID,
-        COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS,
-        COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS
-    )) {
-
-        private var entryId: Long = 0
-
-        fun addEntry(entry: Entry) {
-            addRow(arrayOf(
-                entryId,
-                entry.nodeId.id.mostSignificantBits,
-                entry.nodeId.id.leastSignificantBits
-            ))
-            entryId++
-        }
-
-        fun getNodeId(): NodeId<UUID> {
-            return NodeIdUUID(
-                UUID(getLong(getColumnIndex(COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
-                    getLong(getColumnIndex(COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS)))
-            )
-        }
-
-        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"
-        }
-    }
-}

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,18 +177,27 @@ class CipherDatabaseAction(context: Context) {
         }
     }
 
-    fun addOrUpdateCipherDatabase(cipherDatabaseEntity: CipherDatabaseEntity,
+    fun addOrUpdateCipherDatabase(cipherEncryptDatabase: CipherEncryptDatabase,
                                   cipherDatabaseResultListener: (() -> Unit)? = null) {
-        if (useTempDao) {
-            // The only case to create service (not needed to get an info)
-            serviceActionTask(true) {
-                mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
-                cipherDatabaseResultListener?.invoke()
-            }
-        } else {
-            IOActionTask(
+        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) {
+                    mBinder?.addOrUpdateCipherDatabase(cipherDatabaseEntity)
+                    cipherDatabaseResultListener?.invoke()
+                }
+            } 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)
@@ -171,7 +208,8 @@ class CipherDatabaseAction(context: Context) {
                     {
                         cipherDatabaseResultListener?.invoke()
                     }
-            ).execute()
+                ).execute()
+            }
         }
     }
 

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

@@ -377,9 +377,11 @@ class StructureParser(private val structure: AssistStructure) {
                 when {
                     inputIsVariationType(inputType,
                             InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
-                        usernameIdCandidate = autofillId
-                        usernameValueCandidate = node.autofillValue
-                        Log.d(TAG, "Autofill username candidate android number type: ${showHexInputType(inputType)}")
+                        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) -> {

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,

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

@@ -33,7 +33,6 @@ 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
@@ -43,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
@@ -84,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,
@@ -344,21 +343,23 @@ 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(fixDuplicateUuid: Boolean) {
+    fun startDatabaseMerge(fromDatabaseUri: Uri? = null,
+                           mainCredential: MainCredential? = null) {
         start(Bundle().apply {
-            putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
+            putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, fromDatabaseUri)
+            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
         }
             , ACTION_DATABASE_MERGE_TASK)
     }
@@ -693,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)?)
@@ -76,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

@@ -20,17 +20,19 @@
 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.element.binary.LoadedKey
 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
-import com.kunzisoft.keepass.utils.UriUtil
 
 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() {
@@ -41,11 +43,14 @@ class MergeDatabaseRunnable(private val context: Context,
 
     override fun onActionRun() {
         try {
-            mDatabase.mergeData(context.contentResolver,
-                    { memoryWanted ->
-                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
-                    },
-                    progressTaskUpdater)
+            mDatabase.mergeData(mDatabaseToMergeUri,
+                mDatabaseToMergeMainCredential,
+                context.contentResolver,
+                { memoryWanted ->
+                    BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                },
+                progressTaskUpdater
+            )
         } catch (e: LoadDatabaseException) {
             setError(e)
         }

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
@@ -37,7 +39,7 @@ open class SaveDatabaseRunnable(protected var context: Context,
         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/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

@@ -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 {
@@ -275,6 +274,9 @@ class Database {
         }
     }
 
+    val defaultFileExtension: String
+        get() = mDatabaseKDB?.defaultFileExtension ?: mDatabaseKDBX?.defaultFileExtension ?: ".bin"
+
     val type: Class<*>?
         get() = mDatabaseKDB?.javaClass ?: mDatabaseKDBX?.javaClass
 
@@ -496,7 +498,7 @@ class Database {
      * 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
@@ -635,9 +637,13 @@ class Database {
                         }
                         DatabaseInputKDB(databaseKDB)
                             .openDatabase(databaseInputStream,
-                                mainCredential.masterPassword,
-                                keyFileInputStream,
-                                progressTaskUpdater)
+                                progressTaskUpdater
+                            ) {
+                                databaseKDB.retrieveMasterKey(
+                                    mainCredential.masterPassword,
+                                    keyFileInputStream
+                                )
+                            }
                         databaseKDB
                     },
                     { databaseInputStream ->
@@ -648,9 +654,12 @@ class Database {
                         DatabaseInputKDBX(databaseKDBX).apply {
                             setMethodToCheckIfRAMIsSufficient(isRAMSufficient)
                             openDatabase(databaseInputStream,
-                                mainCredential.masterPassword,
-                                keyFileInputStream,
-                                progressTaskUpdater)
+                                progressTaskUpdater) {
+                                databaseKDBX.retrieveMasterKey(
+                                    mainCredential.masterPassword,
+                                    keyFileInputStream,
+                                )
+                            }
                         }
                         databaseKDBX
                     }
@@ -672,7 +681,9 @@ class Database {
     }
 
     @Throws(LoadDatabaseException::class)
-    fun mergeData(contentResolver: ContentResolver,
+    fun mergeData(databaseToMergeUri: Uri?,
+                  databaseToMergeMainCredential: MainCredential?,
+                  contentResolver: ContentResolver,
                   isRAMSufficient: (memoryWanted: Long) -> Boolean,
                   progressTaskUpdater: ProgressTaskUpdater?) {
 
@@ -682,30 +693,52 @@ class Database {
 
         // New database instance to get new changes
         val databaseToMerge = Database()
-        databaseToMerge.fileUri = this.fileUri
+        databaseToMerge.fileUri = databaseToMergeUri ?: this.fileUri
 
+        // Pass KeyFile Uri as InputStreams
+        var keyFileInputStream: InputStream? = null
         try {
-            databaseToMerge.fileUri?.let { databaseUri ->
-
-                val databaseKDB = DatabaseKDB()
-                val databaseKDBX = DatabaseKDBX()
+            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 ->
-                        DatabaseInputKDB(databaseKDB)
-                            .openDatabase(databaseInputStream,
-                                masterKey,
-                                progressTaskUpdater)
-                        databaseKDB
+                        val databaseToMergeKDB = DatabaseKDB()
+                        DatabaseInputKDB(databaseToMergeKDB)
+                            .openDatabase(databaseInputStream, progressTaskUpdater) {
+                                if (databaseToMergeMainCredential != null) {
+                                    databaseToMergeKDB.retrieveMasterKey(
+                                        databaseToMergeMainCredential.masterPassword,
+                                        keyFileInputStream,
+                                    )
+                                } else {
+                                    databaseToMergeKDB.masterKey = masterKey
+                                }
+                            }
+                        databaseToMergeKDB
                     },
                     { databaseInputStream ->
-                        DatabaseInputKDBX(databaseKDBX).apply {
+                        val databaseToMergeKDBX = DatabaseKDBX()
+                        DatabaseInputKDBX(databaseToMergeKDBX).apply {
                             setMethodToCheckIfRAMIsSufficient(isRAMSufficient)
-                            openDatabase(databaseInputStream,
-                                masterKey,
-                                progressTaskUpdater)
+                            openDatabase(databaseInputStream, progressTaskUpdater) {
+                                if (databaseToMergeMainCredential != null) {
+                                    databaseToMergeKDBX.retrieveMasterKey(
+                                        databaseToMergeMainCredential.masterPassword,
+                                        keyFileInputStream,
+                                    )
+                                } else {
+                                    databaseToMergeKDBX.masterKey = masterKey
+                                }
+                            }
                         }
-                        databaseKDBX
+                        databaseToMergeKDBX
                     }
                 )
 
@@ -715,13 +748,19 @@ class Database {
                     }
                     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
+                        }
                     }
                 }
-            } ?: run {
-                throw IODatabaseException("Database URI is null, database cannot be reloaded")
+            } else {
+                throw IODatabaseException("Database URI is null, database cannot be merged")
             }
         } catch (e: FileNotFoundException) {
             throw FileNotFoundDatabaseException("Unable to load the keyfile")
@@ -730,6 +769,7 @@ class Database {
         } catch (e: Exception) {
             throw LoadDatabaseException(e)
         } finally {
+            keyFileInputStream?.close()
             databaseToMerge.clearAndClose()
         }
     }
@@ -741,7 +781,8 @@ class Database {
 
         // Retrieve the stream from the old database URI
         try {
-            fileUri?.let { oldDatabaseUri ->
+            val oldDatabaseUri = fileUri
+            if (oldDatabaseUri != null) {
                 readDatabaseStream(contentResolver, oldDatabaseUri,
                     { databaseInputStream ->
                         val databaseKDB = DatabaseKDB()
@@ -749,9 +790,9 @@ class Database {
                             databaseKDB.binaryCache = it.binaryCache
                         }
                         DatabaseInputKDB(databaseKDB)
-                            .openDatabase(databaseInputStream,
-                                masterKey,
-                                progressTaskUpdater)
+                            .openDatabase(databaseInputStream, progressTaskUpdater) {
+                                databaseKDB.masterKey = masterKey
+                            }
                         databaseKDB
                     },
                     { databaseInputStream ->
@@ -761,14 +802,14 @@ class Database {
                         }
                         DatabaseInputKDBX(databaseKDBX).apply {
                             setMethodToCheckIfRAMIsSufficient(isRAMSufficient)
-                            openDatabase(databaseInputStream,
-                                masterKey,
-                                progressTaskUpdater)
+                            openDatabase(databaseInputStream, progressTaskUpdater) {
+                                databaseKDBX.masterKey = masterKey
+                            }
                         }
                         databaseKDBX
                     }
                 )
-            } ?: run {
+            } else {
                 throw IODatabaseException("Database URI is null, database cannot be reloaded")
             }
         } catch (e: FileNotFoundException) {
@@ -782,29 +823,39 @@ class Database {
         }
     }
 
-    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
@@ -812,8 +863,11 @@ class Database {
                     searchInOther = true
                     searchInUUIDs = false
                     searchInTags = false
+                    searchInCurrentGroup = false
+                    searchInSearchableGroup = true
+                    searchInRecycleBin = false
                     searchInTemplates = false
-                }, omitBackup, max)
+                }, null, max)
     }
 
     val tagPool: Tags
@@ -855,10 +909,61 @@ class Database {
     }
 
     @Throws(DatabaseOutputException::class)
-    fun saveData(contentResolver: ContentResolver) {
+    fun saveData(databaseCopyUri: Uri?, contentResolver: ContentResolver) {
         try {
-            this.fileUri?.let {
-                saveData(contentResolver, it)
+            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
+                        try {
+                            fileOutputStream = FileOutputStream(tempFile)
+                            val pmo = mDatabaseKDB?.let { DatabaseOutputKDB(it, fileOutputStream) }
+                                ?: mDatabaseKDBX?.let { DatabaseOutputKDBX(it, fileOutputStream) }
+                            pmo?.output()
+                        } catch (e: Exception) {
+                            throw IOException(e)
+                        } finally {
+                            fileOutputStream?.close()
+                        }
+
+                        // Force data to disk before continuing
+                        try {
+                            fileOutputStream?.fd?.sync()
+                        } catch (e: SyncFailedException) {
+                            // Ignore if fsync fails. We tried.
+                        }
+
+                        if (!tempFile.renameTo(File(filename))) {
+                            throw IOException()
+                        }
+                    }
+                } else {
+                    var outputStream: OutputStream? = null
+                    try {
+                        outputStream = contentResolver.openOutputStream(saveUri, "rwt")
+                        outputStream?.let { definedOutputStream ->
+                            val databaseOutput =
+                                mDatabaseKDB?.let { DatabaseOutputKDB(it, definedOutputStream) }
+                                    ?: mDatabaseKDBX?.let {
+                                        DatabaseOutputKDBX(
+                                            it,
+                                            definedOutputStream
+                                        )
+                                    }
+                            databaseOutput?.output()
+                        }
+                    } catch (e: Exception) {
+                        throw IOException(e)
+                    } finally {
+                        outputStream?.close()
+                    }
+                }
+                if (databaseCopyUri == null) {
+                    this.dataModifiedSinceLastLoading = false
+                }
             }
         } catch (e: Exception) {
             Log.e(TAG, "Unable to save database", e)
@@ -866,55 +971,6 @@ class Database {
         }
     }
 
-    @Throws(IOException::class, DatabaseOutputException::class)
-    private fun saveData(contentResolver: ContentResolver, uri: Uri) {
-
-        if (uri.scheme == "file") {
-            uri.path?.let { filename ->
-                val tempFile = File("$filename.tmp")
-
-                var fileOutputStream: FileOutputStream? = null
-                try {
-                    fileOutputStream = FileOutputStream(tempFile)
-                    val pmo = mDatabaseKDB?.let { DatabaseOutputKDB(it, fileOutputStream) }
-                            ?: mDatabaseKDBX?.let { DatabaseOutputKDBX(it, fileOutputStream) }
-                    pmo?.output()
-                } catch (e: Exception) {
-                    throw IOException(e)
-                } finally {
-                    fileOutputStream?.close()
-                }
-
-                // Force data to disk before continuing
-                try {
-                    fileOutputStream?.fd?.sync()
-                } catch (e: SyncFailedException) {
-                    // Ignore if fsync fails. We tried.
-                }
-    
-                if (!tempFile.renameTo(File(filename))) {
-                    throw IOException()
-                }
-            }
-        } else {
-            var outputStream: OutputStream? = null
-            try {
-                outputStream = contentResolver.openOutputStream(uri, "rwt")
-                outputStream?.let { definedOutputStream ->
-                    val databaseOutput = mDatabaseKDB?.let { DatabaseOutputKDB(it, definedOutputStream) }
-                                    ?: mDatabaseKDBX?.let { DatabaseOutputKDBX(it, definedOutputStream) }
-                    databaseOutput?.output()
-                }
-            } catch (e: Exception) {
-                throw IOException(e)
-            } finally {
-                outputStream?.close()
-            }
-        }
-        this.fileUri = uri
-        this.dataModifiedSinceLastLoading = false
-    }
-
     fun clearIndexesAndBinaries(filesDirectory: File? = null) {
         this.mDatabaseKDB?.clearIndexes()
         this.mDatabaseKDBX?.clearIndexes()
@@ -1245,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/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()
     }
@@ -460,6 +473,8 @@ class Entry : Node, EntryVersionedInterface<Group> {
             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
@@ -497,6 +512,8 @@ class Entry : Node, EntryVersionedInterface<Group> {
         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

@@ -262,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)
@@ -434,13 +440,36 @@ 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 isSearchable(): Boolean {
+        val searchableGroup = searchable
+        if (searchableGroup == null) {
+            val parenGroup = parent
+            if (parenGroup == null)
+                return true
+            else
+                return parenGroup.isSearchable()
+        } else {
+            return searchableGroup
+        }
     }
 
-    fun setEnableSearching(enableSearching: Boolean?) {
-        groupKDBX?.enableSearching = enableSearching
-    }
+    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) {
         groupKDBX?.isExpanded = expanded
@@ -462,7 +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,7 +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

@@ -53,6 +53,10 @@ class Tags: Parcelable {
         return mTags.isEmpty()
     }
 
+    fun isNotEmpty(): Boolean {
+        return !isEmpty()
+    }
+
     fun size(): Int {
         return mTags.size
     }

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/database/DatabaseKDB.kt

@@ -64,6 +64,9 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     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 {

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

@@ -201,6 +201,9 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             return "V2 - KDBX$kdbxStringVersion"
         }
 
+    override val defaultFileExtension: String
+        get() = ".kdbx"
+
     private open class NodeOperationHandler<T: NodeKDBXInterface> : NodeHandler<T>() {
         var containsCustomData = false
         override fun operate(node: T): Boolean {
@@ -224,7 +227,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     private inner class GroupOperationHandler: NodeOperationHandler<GroupKDBX>() {
         var containsTags = false
         override fun operate(node: GroupKDBX): Boolean {
-            if (!node.tags.isEmpty())
+            if (node.tags.isNotEmpty())
                 containsTags = true
             return super.operate(node)
         }

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

@@ -62,6 +62,7 @@ abstract class DatabaseVersioned<
         protected set
 
     abstract val version: String
+    abstract val defaultFileExtension: String
 
     /**
      * To manage binaries in faster way
@@ -325,14 +326,6 @@ abstract class DatabaseVersioned<
 
     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 {

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,9 +94,9 @@ 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)
@@ -111,9 +111,9 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         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/template/TemplateField.kt

@@ -103,7 +103,7 @@ object TemplateField {
             LABEL_SSID.equals(name, true) -> context.getString(R.string.ssid)
             LABEL_TYPE.equals(name, true) -> context.getString(R.string.type)
             LABEL_CRYPTOCURRENCY.equals(name, true) -> context.getString(R.string.cryptocurrency)
-            LABEL_TOKEN.equals(name, true) -> context.getString(R.string.token)
+            LABEL_TOKEN.equals(name, false) -> context.getString(R.string.token)
             LABEL_PUBLIC_KEY.equals(name, true) -> context.getString(R.string.public_key)
             LABEL_PRIVATE_KEY.equals(name, true) -> context.getString(R.string.private_key)
             LABEL_SEED.equals(name, true) -> context.getString(R.string.seed)

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

@@ -43,15 +43,8 @@ abstract class DatabaseInput<D : DatabaseVersioned<*, *, *, *>> (protected var m
 
     @Throws(LoadDatabaseException::class)
     abstract fun openDatabase(databaseInputStream: InputStream,
-                              password: String?,
-                              keyfileInputStream: InputStream?,
-                              progressTaskUpdater: ProgressTaskUpdater?): D
-
-
-    @Throws(LoadDatabaseException::class)
-    abstract fun openDatabase(databaseInputStream: InputStream,
-                              masterKey: ByteArray,
-                              progressTaskUpdater: ProgressTaskUpdater?): D
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              assignMasterKey: (() -> Unit)): D
 
     protected fun startKeyTimer(progressTaskUpdater: ProgressTaskUpdater?) {
         progressTaskUpdater?.updateMessage(R.string.retrieving_db_key)

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

@@ -39,7 +39,6 @@ import java.security.MessageDigest
 import java.util.*
 import javax.crypto.Cipher
 import javax.crypto.CipherInputStream
-import kotlin.collections.HashMap
 
 
 /**
@@ -50,27 +49,8 @@ class DatabaseInputKDB(database: DatabaseKDB)
 
     @Throws(LoadDatabaseException::class)
     override fun openDatabase(databaseInputStream: InputStream,
-                              password: String?,
-                              keyfileInputStream: InputStream?,
-                              progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDB {
-        return openDatabase(databaseInputStream, progressTaskUpdater) {
-            mDatabase.retrieveMasterKey(password, keyfileInputStream)
-        }
-    }
-
-    @Throws(LoadDatabaseException::class)
-    override fun openDatabase(databaseInputStream: InputStream,
-                              masterKey: ByteArray,
-                              progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDB {
-        return openDatabase(databaseInputStream, progressTaskUpdater) {
-            mDatabase.masterKey = masterKey
-        }
-    }
-
-    @Throws(LoadDatabaseException::class)
-    private fun openDatabase(databaseInputStream: InputStream,
-                             progressTaskUpdater: ProgressTaskUpdater?,
-                             assignMasterKey: (() -> Unit)? = null): DatabaseKDB {
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              assignMasterKey: (() -> Unit)): DatabaseKDB {
 
         try {
             startKeyTimer(progressTaskUpdater)
@@ -96,7 +76,7 @@ class DatabaseInputKDB(database: DatabaseKDB)
                 throw VersionDatabaseException()
             }
 
-            assignMasterKey?.invoke()
+            assignMasterKey.invoke()
 
             // Select algorithm
             when {

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

@@ -101,27 +101,8 @@ class DatabaseInputKDBX(database: DatabaseKDBX)
 
     @Throws(LoadDatabaseException::class)
     override fun openDatabase(databaseInputStream: InputStream,
-                              password: String?,
-                              keyfileInputStream: InputStream?,
-                              progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDBX {
-        return openDatabase(databaseInputStream, progressTaskUpdater) {
-            mDatabase.retrieveMasterKey(password, keyfileInputStream)
-        }
-    }
-
-    @Throws(LoadDatabaseException::class)
-    override fun openDatabase(databaseInputStream: InputStream,
-                              masterKey: ByteArray,
-                              progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDBX {
-        return openDatabase(databaseInputStream, progressTaskUpdater) {
-            mDatabase.masterKey = masterKey
-        }
-    }
-
-    @Throws(LoadDatabaseException::class)
-    private fun openDatabase(databaseInputStream: InputStream,
-                             progressTaskUpdater: ProgressTaskUpdater?,
-                             assignMasterKey: (() -> Unit)? = null): DatabaseKDBX {
+                              progressTaskUpdater: ProgressTaskUpdater?,
+                              assignMasterKey: (() -> Unit)): DatabaseKDBX {
         try {
             startKeyTimer(progressTaskUpdater)
 
@@ -133,7 +114,7 @@ class DatabaseInputKDBX(database: DatabaseKDBX)
             hashOfHeader = headerAndHash.hash
             val pbHeader = headerAndHash.header
 
-            assignMasterKey?.invoke()
+            assignMasterKey.invoke()
             mDatabase.makeFinalKey(header.masterSeed)
 
             stopKeyTimer()

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

@@ -663,7 +663,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
 
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
     private fun writeTags(tags: Tags) {
-        if (!tags.isEmpty()) {
+        if (tags.isNotEmpty()) {
             writeString(DatabaseKDBXXML.ElemTags, tags.toString())
         }
     }

app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt

@@ -30,6 +30,7 @@ import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDB
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdInt
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.utils.readAllBytes
 import java.io.IOException
@@ -43,7 +44,6 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
      * Merge a KDB database in a KDBX database, by default all data are copied from the KDB
      */
     fun merge(databaseToMerge: DatabaseKDB) {
-        // TODO Test KDB merge
         val rootGroup = database.rootGroup
         val rootGroupId = rootGroup?.nodeId
         val rootGroupToMerge = databaseToMerge.rootGroup
@@ -53,6 +53,11 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
             throw IOException("Database is not open")
         }
 
+        // Replace the UUID of the KDB root group to init seed
+        databaseToMerge.removeGroupIndex(rootGroupToMerge)
+        rootGroupToMerge.nodeId = NodeIdInt(0)
+        databaseToMerge.addGroupIndex(rootGroupToMerge)
+
         // Merge children
         rootGroupToMerge.doForEachChild(
             object : NodeHandler<EntryKDB>() {
@@ -87,31 +92,57 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
         val entry = database.getEntryById(entryId)
 
         databaseToMerge.getEntryById(entryId)?.let { srcEntryToMerge ->
-            // Retrieve parent in current database
-            var parentEntryToMerge: GroupKDBX? = null
-            srcEntryToMerge.parent?.nodeId?.let {
-                val parentGroupIdToMerge = getNodeIdUUIDFrom(seed, it)
-                parentEntryToMerge = database.getGroupById(parentGroupIdToMerge)
-            }
-            val entryToMerge = EntryKDBX().apply {
-                this.nodeId = srcEntryToMerge.nodeId
-                this.icon = srcEntryToMerge.icon
-                this.creationTime = DateInstant(srcEntryToMerge.creationTime)
-                this.lastModificationTime = DateInstant(srcEntryToMerge.lastModificationTime)
-                this.lastAccessTime = DateInstant(srcEntryToMerge.lastAccessTime)
-                this.expiryTime = DateInstant(srcEntryToMerge.expiryTime)
-                this.expires = srcEntryToMerge.expires
-                this.title = srcEntryToMerge.title
-                this.username = srcEntryToMerge.username
-                this.password = srcEntryToMerge.password
-                this.url = srcEntryToMerge.url
-                this.notes = srcEntryToMerge.notes
-                // TODO attachment
-            }
-            if (entry != null) {
-                entry.updateWith(entryToMerge, false)
-            } else if (parentEntryToMerge != null) {
-                database.addEntryTo(entryToMerge, parentEntryToMerge)
+            // Do not merge meta stream elements
+            if (!srcEntryToMerge.isMetaStream()) {
+                // Retrieve parent in current database
+                var parentEntryToMerge: GroupKDBX? = null
+                srcEntryToMerge.parent?.nodeId?.let {
+                    val parentGroupIdToMerge = getNodeIdUUIDFrom(seed, it)
+                    parentEntryToMerge = database.getGroupById(parentGroupIdToMerge)
+                }
+                // Copy attachment
+                var newAttachment: Attachment? = null
+                srcEntryToMerge.getAttachment(databaseToMerge.attachmentPool)?.let { attachment ->
+                    val binarySize = attachment.binaryData.getSize()
+                    val binaryData = database.buildNewBinaryAttachment(
+                        isRAMSufficient.invoke(binarySize),
+                        attachment.binaryData.isCompressed,
+                        attachment.binaryData.isProtected
+                    )
+                    attachment.binaryData.getInputDataStream(databaseToMerge.binaryCache)
+                        .use { inputStream ->
+                            binaryData.getOutputDataStream(database.binaryCache)
+                                .use { outputStream ->
+                                    inputStream.readAllBytes { buffer ->
+                                        outputStream.write(buffer)
+                                    }
+                                }
+                        }
+                    newAttachment = Attachment(attachment.name, binaryData)
+                }
+                // Create new entry format
+                val entryToMerge = EntryKDBX().apply {
+                    this.nodeId = srcEntryToMerge.nodeId
+                    this.icon = srcEntryToMerge.icon
+                    this.creationTime = DateInstant(srcEntryToMerge.creationTime)
+                    this.lastModificationTime = DateInstant(srcEntryToMerge.lastModificationTime)
+                    this.lastAccessTime = DateInstant(srcEntryToMerge.lastAccessTime)
+                    this.expiryTime = DateInstant(srcEntryToMerge.expiryTime)
+                    this.expires = srcEntryToMerge.expires
+                    this.title = srcEntryToMerge.title
+                    this.username = srcEntryToMerge.username
+                    this.password = srcEntryToMerge.password
+                    this.url = srcEntryToMerge.url
+                    this.notes = srcEntryToMerge.notes
+                    newAttachment?.let {
+                        this.putAttachment(it, database.attachmentPool)
+                    }
+                }
+                if (entry != null) {
+                    entry.updateWith(entryToMerge, false)
+                } else if (parentEntryToMerge != null) {
+                    database.addEntryTo(entryToMerge, parentEntryToMerge)
+                }
             }
         }
     }

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

@@ -24,6 +24,7 @@ import com.kunzisoft.keepass.database.action.node.NodeHandler
 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.node.NodeId
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.otp.OtpEntryFields.OTP_FIELD
@@ -37,7 +38,7 @@ class SearchHelper {
 
     fun createVirtualGroupWithSearchResult(database: Database,
                                            searchParameters: SearchParameters,
-                                           omitBackup: Boolean,
+                                           fromGroup: NodeId<*>? = null,
                                            max: Int): Group? {
 
         val searchGroup = database.createGroup(virtual = true)
@@ -45,7 +46,15 @@ class SearchHelper {
 
         // Search all entries
         incrementEntry = 0
-        database.rootGroup?.doForEachChild(
+
+        val allowCustomSearchable = database.allowCustomSearchableGroup()
+        val startGroup = if (searchParameters.searchInCurrentGroup && fromGroup != null) {
+            database.getGroupById(fromGroup) ?: database.rootGroup
+        } else {
+            database.rootGroup
+        }
+        if (groupConditions(database, startGroup, searchParameters, allowCustomSearchable, max)) {
+            startGroup?.doForEachChild(
                 object : NodeHandler<Entry>() {
                     override fun operate(node: Entry): Boolean {
                         if (incrementEntry >= max)
@@ -62,19 +71,43 @@ class SearchHelper {
                 },
                 object : NodeHandler<Group>() {
                     override fun operate(node: Group): Boolean {
-                        return when {
-                            incrementEntry >= max -> false
-                            database.isGroupSearchable(node, omitBackup) -> true
-                            else -> false
-                        }
+                        return groupConditions(database,
+                            node,
+                            searchParameters,
+                            allowCustomSearchable,
+                            max
+                        )
                     }
                 },
-                false)
+                false
+            )
+        }
 
         searchGroup?.refreshNumberOfChildEntries()
         return searchGroup
     }
 
+    private fun groupConditions(database: Database,
+                                group: Group?,
+                                searchParameters: SearchParameters,
+                                allowCustomSearchable: Boolean,
+                                max: Int): Boolean {
+        return if (group == null)
+            false
+        else if (incrementEntry >= max)
+            false
+        else if (database.groupIsInRecycleBin(group))
+            searchParameters.searchInRecycleBin
+        else if (database.groupIsInTemplates(group))
+            searchParameters.searchInTemplates
+        else if (!allowCustomSearchable)
+            true
+        else if (searchParameters.searchInSearchableGroup)
+            group.isSearchable()
+        else
+            true
+    }
+
     private fun entryContainsString(database: Database,
                                     entry: Entry,
                                     searchParameters: SearchParameters): Boolean {
@@ -88,7 +121,18 @@ class SearchHelper {
     }
 
     companion object {
-        const val MAX_SEARCH_ENTRY = 10
+        const val MAX_SEARCH_ENTRY = 1000
+
+        /**
+         * Method to show the number of search results with max results
+         */
+        fun showNumberOfSearchResults(number: Int): String {
+            return if (number >= MAX_SEARCH_ENTRY) {
+                (MAX_SEARCH_ENTRY-1).toString() + "+"
+            } else {
+                number.toString()
+            }
+        }
 
         /**
          * Utility method to perform actions if item is found or not after an auto search in [database]
@@ -110,7 +154,6 @@ class SearchHelper {
                     // If search provide results
                     database.createVirtualGroupFromSearchInfo(
                             searchInfo.toString(),
-                            PreferencesUtil.omitBackup(context),
                             MAX_SEARCH_ENTRY
                     )?.let { searchGroup ->
                         if (searchGroup.numberOfChildEntries > 0) {
@@ -132,16 +175,23 @@ class SearchHelper {
         fun searchInEntry(entry: Entry,
                           searchParameters: SearchParameters): Boolean {
             val searchQuery = searchParameters.searchQuery
-            // Entry don't contains string if the search string is empty
+
+            // Not found if the search string is empty
             if (searchQuery.isEmpty())
                 return false
 
+            // Exclude entry expired
+            if (searchParameters.excludeExpired) {
+                if (entry.isCurrentlyExpires)
+                    return false
+            }
+
             // Search all strings in the KDBX entry
             if (searchParameters.searchInTitles) {
                 if (checkSearchQuery(entry.title, searchParameters))
                     return true
             }
-            if (searchParameters.searchInUserNames) {
+            if (searchParameters.searchInUsernames) {
                 if (checkSearchQuery(entry.username, searchParameters))
                     return true
             }
@@ -158,8 +208,8 @@ class SearchHelper {
                     return true
             }
             if (searchParameters.searchInUUIDs) {
-                val hexString = UuidUtil.toHexString(entry.nodeId.id)
-                if (hexString != null && hexString.contains(searchQuery, true))
+                val hexString = UuidUtil.toHexString(entry.nodeId.id) ?: ""
+                if (checkSearchQuery(hexString, searchParameters))
                     return true
             }
             if (searchParameters.searchInOther) {
@@ -171,21 +221,31 @@ class SearchHelper {
                     }
                 }
             }
+            if (searchParameters.searchInTags) {
+                if (checkSearchQuery(entry.tags.toString(), searchParameters))
+                    return true
+            }
             return false
         }
 
         private fun checkSearchQuery(stringToCheck: String, searchParameters: SearchParameters): Boolean {
             /*
             // TODO Search settings
-            var regularExpression = false
-            var ignoreCase = true
             var removeAccents = true <- Too much time, to study
-            var excludeExpired = false
-            var searchOnlyInCurrentGroup = false
             */
-            return stringToCheck.isNotEmpty()
-                    && stringToCheck.contains(
-                        searchParameters.searchQuery, true)
+            if (stringToCheck.isEmpty())
+                return false
+            return if (searchParameters.isRegex) {
+                val regex = if (searchParameters.caseSensitive) {
+                    searchParameters.searchQuery.toRegex(RegexOption.DOT_MATCHES_ALL)
+                } else {
+                    searchParameters.searchQuery
+                        .toRegex(setOf(RegexOption.DOT_MATCHES_ALL, RegexOption.IGNORE_CASE))
+                }
+                regex.matches(stringToCheck)
+            } else {
+                stringToCheck.contains(searchParameters.searchQuery, !searchParameters.caseSensitive)
+            }
         }
     }
 }

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

@@ -19,21 +19,82 @@
  */
 package com.kunzisoft.keepass.database.search
 
+import android.os.Parcel
+import android.os.Parcelable
+
 /**
  * Parameters for searching strings in the database.
  */
-class SearchParameters {
+class SearchParameters() : Parcelable{
     var searchQuery: String = ""
+    var caseSensitive = false
+    var isRegex = false
 
     var searchInTitles = true
-    var searchInUserNames = true
+    var searchInUsernames = true
     var searchInPasswords = false
     var searchInUrls = true
+    var excludeExpired = false
     var searchInNotes = true
     var searchInOTP = false
     var searchInOther = true
     var searchInUUIDs = false
-    var searchInTags = true
+    var searchInTags = false
 
+    var searchInCurrentGroup = false
+    var searchInSearchableGroup = true
+    var searchInRecycleBin = false
     var searchInTemplates = false
+
+    constructor(parcel: Parcel) : this() {
+        searchQuery = parcel.readString() ?: searchQuery
+        caseSensitive = parcel.readByte() != 0.toByte()
+        searchInTitles = parcel.readByte() != 0.toByte()
+        searchInUsernames = parcel.readByte() != 0.toByte()
+        searchInPasswords = parcel.readByte() != 0.toByte()
+        searchInUrls = parcel.readByte() != 0.toByte()
+        excludeExpired = parcel.readByte() != 0.toByte()
+        searchInNotes = parcel.readByte() != 0.toByte()
+        searchInOTP = parcel.readByte() != 0.toByte()
+        searchInOther = parcel.readByte() != 0.toByte()
+        searchInUUIDs = parcel.readByte() != 0.toByte()
+        searchInTags = parcel.readByte() != 0.toByte()
+        searchInCurrentGroup = parcel.readByte() != 0.toByte()
+        searchInSearchableGroup = parcel.readByte() != 0.toByte()
+        searchInRecycleBin = parcel.readByte() != 0.toByte()
+        searchInTemplates = parcel.readByte() != 0.toByte()
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(searchQuery)
+        parcel.writeByte(if (caseSensitive) 1 else 0)
+        parcel.writeByte(if (searchInTitles) 1 else 0)
+        parcel.writeByte(if (searchInUsernames) 1 else 0)
+        parcel.writeByte(if (searchInPasswords) 1 else 0)
+        parcel.writeByte(if (searchInUrls) 1 else 0)
+        parcel.writeByte(if (excludeExpired) 1 else 0)
+        parcel.writeByte(if (searchInNotes) 1 else 0)
+        parcel.writeByte(if (searchInOTP) 1 else 0)
+        parcel.writeByte(if (searchInOther) 1 else 0)
+        parcel.writeByte(if (searchInUUIDs) 1 else 0)
+        parcel.writeByte(if (searchInTags) 1 else 0)
+        parcel.writeByte(if (searchInCurrentGroup) 1 else 0)
+        parcel.writeByte(if (searchInSearchableGroup) 1 else 0)
+        parcel.writeByte(if (searchInRecycleBin) 1 else 0)
+        parcel.writeByte(if (searchInTemplates) 1 else 0)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<SearchParameters> {
+        override fun createFromParcel(parcel: Parcel): SearchParameters {
+            return SearchParameters(parcel)
+        }
+
+        override fun newArray(size: Int): Array<SearchParameters?> {
+            return arrayOfNulls(size)
+        }
+    }
 }

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

@@ -31,23 +31,45 @@ import com.kunzisoft.keepass.R
 
 open class Education(val activity: Activity) {
 
+    private var mOneEducationHintOpen = false
     /**
      * Utility method to save preference after an education action
      */
     protected fun checkAndPerformedEducation(isEducationAlreadyPerformed: Boolean,
-                                   tapTarget: TapTarget,
-                                   listener: TapTargetView.Listener,
-                                   saveEducationStringId: Int): Boolean {
+                                             tapTarget: TapTarget,
+                                             listener: TapTargetView.Listener,
+                                             saveEducationStringId: Int): Boolean {
         var doEducation = false
-        if (isEducationScreensEnabled()) {
-            if (isEducationAlreadyPerformed) {
-                try {
-                    TapTargetView.showFor(activity, tapTarget, listener)
-                    saveEducationPreference(activity, saveEducationStringId)
-                    doEducation = true
-                } catch (e: Exception) {
-                    Log.w(Education::class.java.name, "Can't performed education " + e.message)
-                }
+        if (isEducationScreensEnabled()
+            && !mOneEducationHintOpen
+            && !isEducationAlreadyPerformed) {
+            try {
+                TapTargetView.showFor(activity, tapTarget, object : TapTargetView.Listener() {
+                    override fun onTargetClick(view: TapTargetView) {
+                        mOneEducationHintOpen = false
+                        saveEducationPreference(activity, saveEducationStringId)
+                        super.onTargetClick(view)
+                        listener.onTargetClick(view)
+                    }
+
+                    override fun onOuterCircleClick(view: TapTargetView?) {
+                        mOneEducationHintOpen = false
+                        saveEducationPreference(activity, saveEducationStringId)
+                        super.onOuterCircleClick(view)
+                        listener.onOuterCircleClick(view)
+                        view?.dismiss(false)
+                    }
+
+                    override fun onTargetCancel(view: TapTargetView?) {
+                        mOneEducationHintOpen = false
+                        saveEducationPreference(activity, saveEducationStringId)
+                        super.onTargetCancel(view)
+                    }
+                })
+                mOneEducationHintOpen = true
+                doEducation = true
+            } catch (e: Exception) {
+                Log.w(Education::class.java.name, "Can't performed education " + e.message)
             }
         }
         return doEducation
@@ -117,6 +139,29 @@ open class Education(val activity: Activity) {
                 R.string.education_add_attachment_key,
                 R.string.education_setup_OTP_key)
 
+        fun putPropertiesInEducationPreferences(context: Context,
+                                                editor: SharedPreferences.Editor,
+                                                name: String,
+                                                value: String) {
+            when (name) {
+                context.getString(R.string.education_create_db_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_select_db_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_unlock_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_read_only_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_biometric_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_search_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_new_node_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_sort_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_lock_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_copy_username_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_entry_edit_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_password_generator_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_entry_new_field_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_add_attachment_key) -> editor.putBoolean(name, value.toBoolean())
+                context.getString(R.string.education_setup_OTP_key) -> editor.putBoolean(name, value.toBoolean())
+            }
+        }
+
         /**
          * Get preferences bundle for education
          */
@@ -315,6 +360,13 @@ open class Education(val activity: Activity) {
                     context.resources.getBoolean(R.bool.education_setup_OTP_default))
         }
 
+        fun setEducationScreenReclickedPerformed(context: Context) {
+            getEducationSharedPreferences(context)
+                .edit()
+                .putBoolean(context.getString(R.string.education_screen_reclicked_key), true)
+                .apply()
+        }
+
         /**
          * Defines if the reset education preference has been reclicked
          *

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

@@ -32,8 +32,7 @@ class EntryActivityEducation(activity: Activity)
     fun checkAndPerformedEntryCopyEducation(educationView: View,
                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(
-                !isEducationCopyUsernamePerformed(activity),
+        return checkAndPerformedEducation(isEducationCopyUsernamePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_field_copy_title),
                         activity.getString(R.string.education_field_copy_summary))
@@ -64,8 +63,7 @@ class EntryActivityEducation(activity: Activity)
     fun checkAndPerformedEntryEditEducation(educationView: View,
                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(
-                !isEducationEntryEditPerformed(activity),
+        return checkAndPerformedEducation(isEducationEntryEditPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_entry_edit_title),
                         activity.getString(R.string.education_entry_edit_summary))

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

@@ -35,7 +35,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedGeneratePasswordEducation(educationView: View,
                                                    onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                    onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationPasswordGeneratorPerformed(activity),
+        return checkAndPerformedEducation(isEducationPasswordGeneratorPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_generate_password_title),
                         activity.getString(R.string.education_generate_password_summary))
@@ -66,7 +66,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedEntryNewFieldEducation(educationView: View,
                                                 onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                 onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationEntryNewFieldPerformed(activity),
+        return checkAndPerformedEducation(isEducationEntryNewFieldPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_entry_new_field_title),
                         activity.getString(R.string.education_entry_new_field_summary))
@@ -97,7 +97,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedAttachmentEducation(educationView: View,
                                              onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                              onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationAddAttachmentPerformed(activity),
+        return checkAndPerformedEducation(isEducationAddAttachmentPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_add_attachment_title),
                         activity.getString(R.string.education_add_attachment_summary))
@@ -128,7 +128,7 @@ class EntryEditActivityEducation(activity: Activity)
     fun checkAndPerformedSetUpOTPEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSetupOTPPerformed(activity),
+        return checkAndPerformedEducation(isEducationSetupOTPPerformed(activity),
                 TapTarget.forView(educationView,
                                 activity.getString(R.string.education_setup_OTP_title),
                                 activity.getString(R.string.education_setup_OTP_summary))

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

@@ -39,7 +39,7 @@ class FileDatabaseSelectActivityEducation(activity: Activity)
                                                  onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
 
         // Try to open the creation base education
-        return checkAndPerformedEducation(!isEducationCreateDatabasePerformed(activity),
+        return checkAndPerformedEducation(isEducationCreateDatabasePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_create_database_title),
                         activity.getString(R.string.education_create_database_summary))
@@ -71,7 +71,7 @@ class FileDatabaseSelectActivityEducation(activity: Activity)
     fun checkAndPerformedSelectDatabaseEducation(educationView: View,
                                                  onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                  onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSelectDatabasePerformed(activity),
+        return checkAndPerformedEducation(isEducationSelectDatabasePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_select_database_title),
                         activity.getString(R.string.education_select_database_summary))

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

@@ -31,7 +31,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedAddNodeButtonEducation(educationView: View,
                                                 onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                                 onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationNewNodePerformed(activity),
+        return checkAndPerformedEducation(isEducationNewNodePerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_new_node_title),
                         activity.getString(R.string.education_new_node_summary))
@@ -58,7 +58,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedSearchMenuEducation(educationView: View,
                                              onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                              onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSearchPerformed(activity),
+        return checkAndPerformedEducation(isEducationSearchPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_search_title),
                         activity.getString(R.string.education_search_summary))
@@ -85,7 +85,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedSortMenuEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationSortPerformed(activity),
+        return checkAndPerformedEducation(isEducationSortPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_sort_title),
                         activity.getString(R.string.education_sort_summary))
@@ -112,7 +112,7 @@ class GroupActivityEducation(activity: Activity)
     fun checkAndPerformedLockMenuEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationLockPerformed(activity),
+        return checkAndPerformedEducation(isEducationLockPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_lock_title),
                         activity.getString(R.string.education_lock_summary))

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

@@ -32,7 +32,7 @@ class PasswordActivityEducation(activity: Activity)
     fun checkAndPerformedUnlockEducation(educationView: View,
                                          onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                          onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationUnlockPerformed(activity),
+        return checkAndPerformedEducation(isEducationUnlockPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_unlock_title),
                         activity.getString(R.string.education_unlock_summary))
@@ -60,7 +60,7 @@ class PasswordActivityEducation(activity: Activity)
     fun checkAndPerformedReadOnlyEducation(educationView: View,
                                            onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                            onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationReadOnlyPerformed(activity),
+        return checkAndPerformedEducation(isEducationReadOnlyPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_read_only_title),
                         activity.getString(R.string.education_read_only_summary))
@@ -87,7 +87,7 @@ class PasswordActivityEducation(activity: Activity)
     fun checkAndPerformedBiometricEducation(educationView: View,
                                             onEducationViewClick: ((TapTargetView?) -> Unit)? = null,
                                             onOuterViewClick: ((TapTargetView?) -> Unit)? = null): Boolean {
-        return checkAndPerformedEducation(!isEducationBiometricPerformed(activity),
+        return checkAndPerformedEducation(isEducationBiometricPerformed(activity),
                 TapTarget.forView(educationView,
                         activity.getString(R.string.education_advanced_unlock_title),
                         activity.getString(R.string.education_advanced_unlock_summary))

app/src/main/java/com/kunzisoft/keepass/magikeyboard/KeyboardView.java

@@ -18,6 +18,8 @@ package com.kunzisoft.keepass.magikeyboard;
 
 import static com.kunzisoft.keepass.magikeyboard.MagikeyboardService.KEY_BACK_KEYBOARD;
 import static com.kunzisoft.keepass.magikeyboard.MagikeyboardService.KEY_CHANGE_KEYBOARD;
+import static com.kunzisoft.keepass.magikeyboard.MagikeyboardService.KEY_OTP;
+import static com.kunzisoft.keepass.magikeyboard.MagikeyboardService.KEY_OTP_ALT;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -1047,6 +1049,9 @@ public class KeyboardView extends View implements View.OnClickListener {
         if (popupKey.codes[0] == KEY_BACK_KEYBOARD) {
             mKeyboardActionListener.onKey(KEY_CHANGE_KEYBOARD, popupKey.codes);
             return true;
+        } else if (popupKey.codes[0] == KEY_OTP) {
+            mKeyboardActionListener.onKey(KEY_OTP_ALT, popupKey.codes);
+            return true;
         } else {
             int popupKeyboardId = popupKey.popupResId;
             if (popupKeyboardId != 0) {

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

@@ -245,35 +245,52 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
                 dismissCustomKeys()
             }
             KEY_USERNAME -> {
-                if (entryInfoKey != null) {
-                    currentInputConnection.commitText(entryInfoKey!!.username, 1)
+                entryInfoKey?.username?.let { username ->
+                    currentInputConnection.commitText(username, 1)
                 }
                 actionTabAutomatically()
             }
             KEY_PASSWORD -> {
-                if (entryInfoKey != null) {
-                    currentInputConnection.commitText(entryInfoKey!!.password, 1)
+                entryInfoKey?.password?.let { password ->
+                    currentInputConnection.commitText(password, 1)
                 }
                 val otpFieldExists = entryInfoKey?.containsCustomField(OTP_TOKEN_FIELD) ?: false
                 actionGoAutomatically(!otpFieldExists)
             }
             KEY_OTP -> {
-                if (entryInfoKey != null) {
+                entryInfoKey?.let { entryInfo ->
                     currentInputConnection.commitText(
-                            entryInfoKey!!.getGeneratedFieldValue(OTP_TOKEN_FIELD), 1)
+                        entryInfo.getGeneratedFieldValue(OTP_TOKEN_FIELD), 1)
+                }
+                actionGoAutomatically()
+            }
+            KEY_OTP_ALT -> {
+                entryInfoKey?.let { entryInfo ->
+                    val otpToken = entryInfo.getGeneratedFieldValue(OTP_TOKEN_FIELD)
+                    if (otpToken.isNotEmpty()) {
+                        // Cut to fill each digit separatelyKeyEvent.KEYCODE_TAB
+                        val otpTokenChars = otpToken.chunked(1)
+                        otpTokenChars.forEachIndexed { index, char ->
+                            currentInputConnection.commitText(char, 1)
+                            if (index < (otpTokenChars.size-1))
+                                currentInputConnection.sendKeyEvent(
+                                    KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_TAB)
+                                )
+                        }
+                    }
                 }
                 actionGoAutomatically()
             }
             KEY_URL -> {
-                if (entryInfoKey != null) {
-                    currentInputConnection.commitText(entryInfoKey!!.url, 1)
+                entryInfoKey?.url?.let { url ->
+                    currentInputConnection.commitText(url, 1)
                 }
                 actionGoAutomatically()
             }
             KEY_FIELDS -> {
-                if (entryInfoKey != null) {
+                entryInfoKey?.customFields?.let { customFields ->
                     fieldsAdapter?.apply {
-                        setFields(entryInfoKey!!.customFields.filter { it.name != OTP_TOKEN_FIELD})
+                        setFields(customFields.filter { it.name != OTP_TOKEN_FIELD})
                         notifyDataSetChanged()
                     }
                 }
@@ -347,7 +364,8 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
         private const val KEY_ENTRY = 620
         private const val KEY_USERNAME = 500
         private const val KEY_PASSWORD = 510
-        private const val KEY_OTP = 515
+        const val KEY_OTP = 515
+        const val KEY_OTP_ALT = 516
         private const val KEY_URL = 520
         private const val KEY_FIELDS = 530
 

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

@@ -0,0 +1,80 @@
+/*
+ * 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.model
+
+import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable
+import com.kunzisoft.keepass.utils.readEnum
+import com.kunzisoft.keepass.utils.writeEnum
+
+class CipherDecryptDatabase(): Parcelable {
+
+    var databaseUri: Uri? = null
+    var credentialStorage: CredentialStorage = CredentialStorage.DEFAULT
+    var decryptedValue: ByteArray = byteArrayOf()
+
+    constructor(parcel: Parcel): this() {
+        databaseUri = parcel.readParcelable(Uri::class.java.classLoader)
+        credentialStorage = parcel.readEnum<CredentialStorage>() ?: credentialStorage
+        decryptedValue = ByteArray(parcel.readInt())
+        parcel.readByteArray(decryptedValue)
+    }
+
+    fun replaceContent(copy: CipherDecryptDatabase) {
+        this.decryptedValue = copy.decryptedValue
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(databaseUri, flags)
+        parcel.writeEnum(credentialStorage)
+        parcel.writeInt(decryptedValue.size)
+        parcel.writeByteArray(decryptedValue)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<CipherDecryptDatabase> {
+        override fun createFromParcel(parcel: Parcel): CipherDecryptDatabase {
+            return CipherDecryptDatabase(parcel)
+        }
+
+        override fun newArray(size: Int): Array<CipherDecryptDatabase?> {
+            return arrayOfNulls(size)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as CipherDecryptDatabase
+
+        if (databaseUri != other.databaseUri) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return databaseUri.hashCode()
+    }
+}

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

@@ -0,0 +1,86 @@
+/*
+ * 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.model
+
+import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable
+import com.kunzisoft.keepass.utils.readEnum
+import com.kunzisoft.keepass.utils.writeEnum
+
+class CipherEncryptDatabase(): Parcelable {
+
+    var databaseUri: Uri? = null
+    var credentialStorage: CredentialStorage = CredentialStorage.DEFAULT
+    var encryptedValue: ByteArray = byteArrayOf()
+    var specParameters: ByteArray = byteArrayOf()
+
+    constructor(parcel: Parcel): this() {
+        databaseUri = parcel.readParcelable(Uri::class.java.classLoader)
+        credentialStorage = parcel.readEnum<CredentialStorage>() ?: credentialStorage
+        encryptedValue = ByteArray(parcel.readInt())
+        parcel.readByteArray(encryptedValue)
+        specParameters = ByteArray(parcel.readInt())
+        parcel.readByteArray(specParameters)
+    }
+
+    fun replaceContent(copy: CipherEncryptDatabase) {
+        this.encryptedValue = copy.encryptedValue
+        this.specParameters = copy.specParameters
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(databaseUri, flags)
+        parcel.writeEnum(credentialStorage)
+        parcel.writeInt(encryptedValue.size)
+        parcel.writeByteArray(encryptedValue)
+        parcel.writeInt(specParameters.size)
+        parcel.writeByteArray(specParameters)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<CipherEncryptDatabase> {
+        override fun createFromParcel(parcel: Parcel): CipherEncryptDatabase {
+            return CipherEncryptDatabase(parcel)
+        }
+
+        override fun newArray(size: Int): Array<CipherEncryptDatabase?> {
+            return arrayOfNulls(size)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as CipherEncryptDatabase
+
+        if (databaseUri != other.databaseUri) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return databaseUri.hashCode()
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+ * 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.model
+
+enum class CredentialStorage {
+    PASSWORD, KEY_FILE, HARDWARE_KEY;
+
+    companion object {
+        fun getFromOrdinal(ordinal: Int): CredentialStorage {
+            return when (ordinal) {
+                0 -> PASSWORD
+                1 -> KEY_FILE
+                2 -> HARDWARE_KEY
+                else -> DEFAULT
+            }
+        }
+
+        val DEFAULT: CredentialStorage
+            get() = PASSWORD
+    }
+}

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

@@ -23,6 +23,7 @@ import android.os.Parcel
 import android.os.ParcelUuid
 import android.os.Parcelable
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.entry.AutoType
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.element.template.TemplateField
 import com.kunzisoft.keepass.otp.OtpElement
@@ -42,6 +43,7 @@ class EntryInfo : NodeInfo {
     var foregroundColor: Int? = null
     var customFields: MutableList<Field> = mutableListOf()
     var attachments: MutableList<Attachment> = mutableListOf()
+    var autoType: AutoType = AutoType()
     var otpModel: OtpModel? = null
     var isTemplate: Boolean = false
 
@@ -60,6 +62,7 @@ class EntryInfo : NodeInfo {
         foregroundColor = if (readFgColor == -1) null else readFgColor
         parcel.readList(customFields, Field::class.java.classLoader)
         parcel.readList(attachments, Attachment::class.java.classLoader)
+        autoType = parcel.readParcelable(AutoType::class.java.classLoader) ?: autoType
         otpModel = parcel.readParcelable(OtpModel::class.java.classLoader) ?: otpModel
         isTemplate = parcel.readByte().toInt() != 0
     }
@@ -80,6 +83,7 @@ class EntryInfo : NodeInfo {
         parcel.writeInt(foregroundColor ?: -1)
         parcel.writeList(customFields)
         parcel.writeList(attachments)
+        parcel.writeParcelable(autoType, flags)
         parcel.writeParcelable(otpModel, flags)
         parcel.writeByte((if (isTemplate) 1 else 0).toByte())
     }
@@ -105,6 +109,7 @@ class EntryInfo : NodeInfo {
         return customFields.lastOrNull { it.name == label }?.protectedValue?.toString() ?: ""
     }
 
+    // Return true if modified
     private fun addUniqueField(field: Field, number: Int = 0) {
         var sameName = false
         var sameValue = false
@@ -126,7 +131,19 @@ class EntryInfo : NodeInfo {
             (customFields as ArrayList<Field>).add(Field(field.name + suffix, field.protectedValue))
     }
 
-    fun saveSearchInfo(database: Database?, searchInfo: SearchInfo) {
+    private fun containsDomainOrApplicationId(search: String): Boolean {
+        if (url.contains(search))
+            return true
+        return customFields.find {
+            it.protectedValue.stringValue.contains(search)
+        } != null
+    }
+
+    /**
+     * Add searchInfo to current EntryInfo, return true if new data, false if no modification
+     */
+    fun saveSearchInfo(database: Database?, searchInfo: SearchInfo): Boolean {
+        var modification = false
         searchInfo.otpString?.let { otpString ->
             // Replace the OTP field
             OtpEntryFields.parseOTPUri(otpString)?.let { otpElement ->
@@ -141,31 +158,45 @@ class EntryInfo : NodeInfo {
                     mutableCustomFields.remove(otpField)
                 }
                 mutableCustomFields.add(otpField)
+                modification = true
             }
         } ?: searchInfo.webDomain?.let { webDomain ->
             // If unable to save web domain in custom field or URL not populated, save in URL
             val scheme = searchInfo.webScheme
-            val webScheme = if (scheme.isNullOrEmpty()) "http" else scheme
+            val webScheme = if (scheme.isNullOrEmpty()) "https" else scheme
             val webDomainToStore = "$webScheme://$webDomain"
-            if (database?.allowEntryCustomFields() != true || url.isEmpty()) {
-                url = webDomainToStore
-            } else if (url != webDomainToStore) {
-                // Save web domain in custom field
-                addUniqueField(Field(WEB_DOMAIN_FIELD_NAME,
-                        ProtectedString(false, webDomainToStore)),
+            if (!containsDomainOrApplicationId(webDomain)) {
+                if (database?.allowEntryCustomFields() != true || url.isEmpty()) {
+                    url = webDomainToStore
+                } else {
+                    // Save web domain in custom field
+                    addUniqueField(
+                        Field(
+                            WEB_DOMAIN_FIELD_NAME,
+                            ProtectedString(false, webDomainToStore)
+                        ),
                         1 // Start to one because URL is a standard field name
-                )
+                    )
+                }
+                modification = true
             }
         } ?: run {
             // Save application id in custom field
             if (database?.allowEntryCustomFields() == true) {
                 searchInfo.applicationId?.let { applicationId ->
-                    addUniqueField(Field(APPLICATION_ID_FIELD_NAME,
-                            ProtectedString(false, applicationId))
-                    )
+                    if (!containsDomainOrApplicationId(applicationId)) {
+                        addUniqueField(
+                            Field(
+                                APPLICATION_ID_FIELD_NAME,
+                                ProtectedString(false, applicationId)
+                            )
+                        )
+                        modification = true
+                    }
                 }
             }
         }
+        return modification
     }
 
     fun saveRegisterInfo(database: Database?, registerInfo: RegisterInfo) {
@@ -209,6 +240,7 @@ class EntryInfo : NodeInfo {
         if (foregroundColor != other.foregroundColor) return false
         if (customFields != other.customFields) return false
         if (attachments != other.attachments) return false
+        if (autoType != other.autoType) return false
         if (otpModel != other.otpModel) return false
         if (isTemplate != other.isTemplate) return false
 
@@ -227,6 +259,7 @@ class EntryInfo : NodeInfo {
         result = 31 * result + foregroundColor.hashCode()
         result = 31 * result + customFields.hashCode()
         result = 31 * result + attachments.hashCode()
+        result = 31 * result + autoType.hashCode()
         result = 31 * result + (otpModel?.hashCode() ?: 0)
         result = 31 * result + isTemplate.hashCode()
         return result

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

@@ -12,6 +12,9 @@ class GroupInfo : NodeInfo {
 
     var id: UUID? = null
     var notes: String? = null
+    var searchable: Boolean? = null
+    var enableAutoType: Boolean? = null
+    var defaultAutoTypeSequence: String = ""
     var tags: Tags = Tags()
 
     init {
@@ -23,6 +26,11 @@ class GroupInfo : NodeInfo {
     constructor(parcel: Parcel): super(parcel) {
         id = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: id
         notes = parcel.readString()
+        val isSearchingEnabled = parcel.readInt()
+        searchable = if (isSearchingEnabled == -1) null else isSearchingEnabled == 1
+        val isAutoTypeEnabled = parcel.readInt()
+        enableAutoType = if (isAutoTypeEnabled == -1) null else isAutoTypeEnabled == 1
+        defaultAutoTypeSequence = parcel.readString() ?: defaultAutoTypeSequence
         tags = parcel.readParcelable(Tags::class.java.classLoader) ?: tags
     }
 
@@ -31,6 +39,9 @@ class GroupInfo : NodeInfo {
         val uuid = if (id != null) ParcelUuid(id) else null
         parcel.writeParcelable(uuid, flags)
         parcel.writeString(notes)
+        parcel.writeInt(if (searchable == null) -1 else if (searchable!!) 1 else 0)
+        parcel.writeInt(if (enableAutoType == null) -1 else if (enableAutoType!!) 1 else 0)
+        parcel.writeString(defaultAutoTypeSequence)
         parcel.writeParcelable(tags, flags)
     }
 
@@ -41,6 +52,9 @@ class GroupInfo : NodeInfo {
 
         if (id != other.id) return false
         if (notes != other.notes) return false
+        if (searchable != other.searchable) return false
+        if (enableAutoType != other.enableAutoType) return false
+        if (defaultAutoTypeSequence != other.defaultAutoTypeSequence) return false
         if (tags != other.tags) return false
 
         return true
@@ -50,6 +64,9 @@ class GroupInfo : NodeInfo {
         var result = super.hashCode()
         result = 31 * result + (id?.hashCode() ?: 0)
         result = 31 * result + (notes?.hashCode() ?: 0)
+        result = 31 * result + searchable.hashCode()
+        result = 31 * result + enableAutoType.hashCode()
+        result = 31 * result + defaultAutoTypeSequence.hashCode()
         result = 31 * result + tags.hashCode()
         return result
     }