Add Go lib

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,7 +24,6 @@ A clear and concise description of what you expected to happen.
  - Created with: [e.g Windows KeePass 2.42]
  - Version: [e.g. 2]
  - Location: [e.g. Remote file retrieved with GDrive app]
- - File provider (`content://` URI): [e.g. `content://com.google.android.apps.docs.storage/5`]
  - Size: [e.g. 150Mo]
  - Contains attachment: [e.g. Yes]
 

CHANGELOG

@@ -1,135 +1,6 @@
-KeePassDX(3.3.2)
- * Merge KeePassDX & KeePassDX Pro #1257
- * Create new Contributor Pro app
-
-KeePassDX(3.3.1)
- * Fix Japanese keyboard in search #1248
- * Better OOM management #256
- * Fix filters #1249
- * Fix temp advanced unlocking #1245
- * Best autofill recognition #1250
- * Workaround to fill OTP token in multiple fields with Magikeyboard (long press) #1158
-
-KeePassDX(3.3.0)
- * Quick search and dynamic filters #163 #462 #521
- * Keep search context #1141
- * Add searchable groups #905 #1006
- * Search with regular expression #175
- * Merge from file and save as copy #1221 #1204 #840
- * Fix custom data #1236
- * Fix education hints #1192
- * Fix save and app instance in selection mode
- * New UI and fix styles
- * Add "Simple" and "Reply" themes
-
-KeePassDX(3.2.0)
- * Manage data merge #840 #977
- * Manage Tags #633
- * Inherit colors and icon from template #1213 #1130
- * Entry colors setting #1207
- * Setting to keep the screen on when watching the entry #1119
- * Add path in quick search
- * Small fixes
-
-KeePassDX(3.1.0)
- * Add breadcrumb
- * Add path in search results #1148
- * Add group info dialog #1177
- * Manage colors #64 #913
- * Fix UI in Android 8 #509
- * Upgrade libs and SDK to 31 #833
- * Fix parser of database v1 #1201
- * Stop asking WRITE_EXTERNAL_STORAGE permission
-
-KeePassDX(3.0.4)
- * Fix autofill inline bugs #1173 #1165
- * Small UI change
-
-KeePassDX(3.0.3)
- * Change default Argon2 parameters #1098
- * Add & edit custom icon name #976
- * Fix templates #1128 #1133 #1138
- * Update Autofill compatibility list #725 #1154
- * Improve fingerprint usage #1137 #1145
- * Change backup configuration #1144
- * Add lock button in database notification
-
-KeePassDX(3.0.2)
- * Samsung DeX mode #1114 #245 (Thx @chenxiaolong)
-
-KeePassDX(3.0.1)
- * Fix text size and smallest margin #1085
- * Fix number of lines during an edition #1073
- * Fix Magikeyboard URL auto action #1100
- * Fix exception after group name change and save #1112
- * Fix timeout reset #1107
- * Fix search actions #1091 #1092
- * Small changes #1106 #1085
-
-KeePassDX(3.0.0)
- * Add / Manage dynamic templates #191
- * Manually select RecycleBin group and Templates group #191
- * Setting to display OTP Token in list #655
- * Fix timeout in dialogs #716
- * Check URI permissions #626
- * Better autofill implementation #943 #946 #984 #1070 (Thx @uduerholz)
- * Improvements #680 #1035 #1043 #942 #1021 #1027 #1046 #1082 #1083 (Thx @chenxiaolong)
-
-KeePassDX(2.10.5)
- * Increase the saving speed of database #1028
- * Fix advanced unlocking by device credential #1029
-
-KeePassDX(2.10.4)
- * Hot fix to increase the opening speed of database #1028
-
-KeePassDX(2.10.3)
- * Improve Magikeyboard options description #1022 #1023 (Thx @djibux)
- * Fix database opened without notification (database is now closed when screen is killed in background #1025)
- * Fix biometric prompt #1018
-
-KeePassDX(2.10.2)
- * Fix search fields references #987
- * Fix Auto-Types with same key #997
-
-KeePassDX(2.10.1)
- * Fix parcelable with custom data #986
-
-KeePassDX(2.10.0)
- * Manage new database format 4.1 #956
- * Fix show button consistency #980
- * Fix persistent notification #979
-
-KeePassDX(2.9.20)
- * Fix search with non-latin chars #971
- * Fix action mode with search #972 (rollback ignore accents #945)
- * Fix timeout with 0s #974
-
-KeePassDX(2.9.19)
- * Fix search slowdown #964
- * Fix closing notification after lock request #965
- * Better temp advanced unlocking code implementation #965
- * Fix OTP token generation #967
-
-KeePassDX(2.9.18)
- * Move groups #658
- * Improve autofill recognition #960
- * Remove diacritical marks in search string #945
- * Fix search in references #962
- * Fix themes in Libre version
-
-KeePassDX(2.9.17)
- * Import / Export app properties #839
- * Force twofish padding compatibility #955
- * Better timeout preference #579
-
-KeePassDX(2.9.16)
- * Fix small bugs #948
-
 KeePassDX(2.9.15)
- * Fix themes #935 #926
+ * Fix themes #935
  * Decrease default clipboard time #934
- * Better opening performance #929 #933
- * Fix memory usage setting #941
 
 KeePassDX(2.9.14)
  * Add custom icons #96

README.md

@@ -15,7 +15,6 @@
  - Material design with **themes**.
  - **Auto-Fill** and Integration.
  - Field filling **keyboard**.
- - Dynamic **templates** 
  - **History** of each entry.
  - Precise management of **settings**.
  - Code written in **native languages** *(Kotlin / Java / JNI / C)*.
@@ -43,7 +42,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.keepassdx.com/#donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
+* **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
 * Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePassDX.
 
 ## Download
@@ -72,7 +71,7 @@ Other questions? You can read the [FAQ](https://github.com/Kunzisoft/KeePassDX/w
 
 ## License
 
-  Copyright © 2022 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
+  Copyright © 2020 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
 
   This file is part of KeePassDX.
 

app/build.gradle

@@ -1,19 +1,18 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
     ndkVersion "21.4.7075529"
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
-        targetSdkVersion 31
-        versionCode = 104
-        versionName = "3.3.2"
+        targetSdkVersion 30
+        versionCode = 66
+        versionName = "2.9.15"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -43,30 +42,36 @@ 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_Simple\"," +
-                            "\"KeepassDXStyle_Simple_Night\"," +
-                            "\"KeepassDXStyle_Blue\"," +
+                            "{\"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", "{}"
@@ -76,6 +81,7 @@ android {
 
     sourceSets {
         libre.res.srcDir 'src/libre/res'
+        pro.res.srcDir 'src/pro/res'
         free.res.srcDir 'src/free/res'
     }
 
@@ -93,47 +99,44 @@ android {
     }
 }
 
-def room_version = "2.4.2"
+def room_version = "2.2.6"
 
 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.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.biometric:biometric:1.1.0'
-    implementation 'androidx.media:media:1.5.0'
+    implementation 'androidx.biometric:biometric:1.1.0-rc01'
     // Lifecycle - LiveData - ViewModel - Coroutines
-    implementation "androidx.core:core-ktx:$android_core_version"
-    implementation 'androidx.fragment:fragment-ktx:1.4.1'
-    implementation "com.google.android.material:material:$android_material_version"
-    // Token auto complete
-    // From sources until https://github.com/splitwise/TokenAutoComplete/pull/422 fixed
-    // implementation "com.splitwise:tokenautocomplete:4.0.0-beta04"
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    // WARNING: Don't upgrade because slowdown https://github.com/Kunzisoft/KeePassDX/issues/923
+    implementation 'com.google.android.material:material:1.1.0'
     // Database
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     // Autofill
     implementation "androidx.autofill:autofill:1.1.0"
     // Time
-    implementation 'joda-time:joda-time:2.10.13'
+    implementation 'joda-time:joda-time:2.10.6'
     // Color
-    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.6'
+    implementation 'com.github.Kunzisoft:AndroidClearChroma:2.4'
     // Education
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     // Apache Commons
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'commons-codec:commons-codec:1.15'
     // Encrypt lib
     implementation project(path: ':crypto')
+    implementation fileTree(include: ['encrypt.aar'], dir: 'libs')
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')
 
     // Tests
-    androidTestImplementation "androidx.test:runner:$android_test_version"
-    androidTestImplementation "androidx.test:rules:$android_test_version"
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
 }

app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt

@@ -1,24 +0,0 @@
-package com.kunzisoft.keepass.tests.template
-
-import com.kunzisoft.keepass.database.element.template.TemplateAttributeOption
-import junit.framework.TestCase
-import org.junit.Assert
-
-class TemplateAttributeOptionTest: TestCase() {
-
-    fun testSerializeOptions() {
-        val options = TemplateAttributeOption().apply {
-            put("TestA", "TestB")
-            put("{D", "}C")
-            put("E,gyu", "15,jk")
-            put("ù*:**", "78:96?545")
-        }
-
-        val strings = TemplateAttributeOption.getStringFromOptions(options)
-        val optionsAfterSerialization = TemplateAttributeOption.getOptionsFromString(strings)
-        val otherString = TemplateAttributeOption.getStringFromOptions(optionsAfterSerialization)
-
-        Assert.assertEquals("Output not equal to input", strings, otherString)
-    }
-
-}

app/src/androidTest/java/com/kunzisoft/keepass/tests/utils/UUIDTest.kt

@@ -1,15 +0,0 @@
-package com.kunzisoft.keepass.tests.utils
-
-import com.kunzisoft.keepass.utils.UuidUtil
-import junit.framework.TestCase
-import java.util.*
-
-class UUIDTest: TestCase() {
-
-    fun testUUID() {
-        val randomUUID = UUID.randomUUID()
-        val hexStringUUID = UuidUtil.toHexString(randomUUID)
-        val retrievedUUID = UuidUtil.fromHexString(hexStringUUID)
-        assertEquals(randomUUID, retrievedUUID)
-    }
-}

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

@@ -1,31 +1,61 @@
 <?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:viewportWidth="120"
-    android:viewportHeight="120">
+    android:height="108dp">
     <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" />
+        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>
     </group>
 </vector>

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

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

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

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

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

@@ -1,31 +1,61 @@
 <?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:viewportWidth="120"
-    android:viewportHeight="120">
+    android:height="108dp">
     <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" />
+        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>
     </group>
 </vector>

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

@@ -0,0 +1,5 @@
+<?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

@@ -0,0 +1,5 @@
+<?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

@@ -10,12 +10,15 @@
       android:anyDensity="true" />
     <uses-permission
         android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission
         android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission
         android:name="android.permission.VIBRATE"/>
+    <!-- Write permission until Android 10 -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
     <!-- Open apps from links -->
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
@@ -27,31 +30,29 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:name="com.kunzisoft.keepass.app.App"
         android:allowBackup="true"
-        android:fullBackupContent="@xml/old_backup_rules"
-        android:dataExtractionRules="@xml/backup_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
         android:largeHeap="true"
         android:resizeableActivity="true"
         android:theme="@style/KeepassDXStyle.Night"
-        tools:targetApi="s">
+        tools:targetApi="n">
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="${googleAndroidBackupAPIKey}" />
         <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"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" >
+            android:windowSoftInputMode="stateHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name="com.kunzisoft.keepass.activities.MainCredentialActivity"
-            android:exported="true"
+            android:name="com.kunzisoft.keepass.activities.PasswordActivity"
             android:configChanges="keyboardHidden"
             android:windowSoftInputMode="adjustResize|stateUnchanged">
             <intent-filter>
@@ -110,9 +111,9 @@
         <!-- Main Activity -->
         <activity
             android:name="com.kunzisoft.keepass.activities.GroupActivity"
-            android:exported="false"
             android:configChanges="keyboardHidden"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:launchMode="singleTask">
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="com.kunzisoft.keepass.search.SearchResults"
@@ -154,8 +155,7 @@
             android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
         <activity
             android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
-            android:theme="@style/Theme.Transparent"
-            android:exported="true">
+            android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -174,8 +174,7 @@
             android:theme="@style/Theme.Transparent" />
         <activity
             android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
-            android:label="@string/keyboard_setting_label"
-            android:exported="true">
+            android:label="@string/keyboard_setting_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
@@ -201,7 +200,6 @@
         <service
             android:name="com.kunzisoft.keepass.autofill.KeeAutofillService"
             android:label="@string/autofill_service_name"
-            android:exported="true"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE">
             <meta-data
                 android:name="android.autofill"
@@ -211,9 +209,8 @@
             </intent-filter>
         </service>
         <service
-            android:name="com.kunzisoft.keepass.magikeyboard.MagikeyboardService"
+            android:name="com.kunzisoft.keepass.magikeyboard.MagikIME"
             android:label="@string/keyboard_label"
-            android:exported="true"
             android:permission="android.permission.BIND_INPUT_METHOD" >
             <meta-data android:name="android.view.im"
                 android:resource="@xml/keyboard_method"/>
@@ -225,14 +222,6 @@
             android:name="com.kunzisoft.keepass.services.KeyboardEntryNotificationService"
             android:enabled="true"
             android:exported="false" />
-        <receiver
-            android:name="com.kunzisoft.keepass.receivers.DexModeReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.app.action.ENTER_KNOX_DESKTOP_MODE" />
-                <action android:name="android.app.action.EXIT_KNOX_DESKTOP_MODE" />
-            </intent-filter>
-        </receiver>
 
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
     </application>

app/src/main/java/com/igreenwood/loupe/Loupe.kt

@@ -30,7 +30,6 @@ package com.igreenwood.loupe
 import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
-import android.annotation.SuppressLint
 import android.graphics.Matrix
 import android.graphics.PointF
 import android.graphics.Rect
@@ -109,8 +108,6 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
     var viewDragFriction = DEFAULT_VIEW_DRAG_FRICTION
     // drag distance threshold in dp for swipe to dismiss
     var dragDismissDistanceInDp = DEFAULT_DRAG_DISMISS_DISTANCE_IN_DP
-    // on view touched
-    var onViewTouchedListener: View.OnTouchListener? = null
     // on view translate listener
     var onViewTranslateListener: OnViewTranslateListener? = null
     // on scale changed
@@ -275,10 +272,7 @@ class Loupe(imageView: ImageView, container: ViewGroup) : View.OnTouchListener,
     private var imageViewRef: WeakReference<ImageView> = WeakReference(imageView)
     private var containerRef: WeakReference<ViewGroup> = WeakReference(container)
 
-    @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(view: View?, event: MotionEvent?): Boolean {
-        onViewTouchedListener?.onTouch(view, event)
-
         event ?: return false
         val imageView = imageViewRef.get() ?: return false
         val container = containerRef.get() ?: return false

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

@@ -23,79 +23,45 @@ import android.app.Activity
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.IntentSender
 import android.os.Build
 import android.os.Bundle
+import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
-import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.autofill.CompatInlineSuggestionsRequest
+import com.kunzisoft.keepass.autofill.AutofillHelper.EXTRA_INLINE_SUGGESTIONS_REQUEST
 import com.kunzisoft.keepass.autofill.KeeAutofillService
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.LOCK_ACTION
 
 @RequiresApi(api = Build.VERSION_CODES.O)
-class AutofillLauncherActivity : DatabaseModeActivity() {
+class AutofillLauncherActivity : AppCompatActivity() {
 
-    private var mAutofillActivityResultLauncher: ActivityResultLauncher<Intent>? =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            AutofillHelper.buildActivityResultLauncher(this, true)
-        else null
-
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
+    override fun onCreate(savedInstanceState: Bundle?) {
 
         // Retrieve selection mode
         EntrySelectionHelper.retrieveSpecialModeFromIntent(intent).let { specialMode ->
             when (specialMode) {
                 SpecialMode.SELECTION -> {
-                    intent.getBundleExtra(KEY_SELECTION_BUNDLE)?.let { bundle ->
-                        // To pass extra inline request
-                        var compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            compatInlineSuggestionsRequest = bundle.getParcelable(KEY_INLINE_SUGGESTION)
-                        }
-                        // Build search param
-                        bundle.getParcelable<SearchInfo>(KEY_SEARCH_INFO)?.let { searchInfo ->
-                            SearchInfo.getConcreteWebDomain(
-                                this,
-                                searchInfo.webDomain
-                            ) { concreteWebDomain ->
-                                // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
-                                val assistStructure = AutofillHelper
-                                    .retrieveAutofillComponent(intent)
-                                    ?.assistStructure
-                                val newAutofillComponent = if (assistStructure != null) {
-                                    AutofillComponent(
-                                        assistStructure,
-                                        compatInlineSuggestionsRequest
-                                    )
-                                } else {
-                                    null
-                                }
-                                searchInfo.webDomain = concreteWebDomain
-                                launchSelection(database, newAutofillComponent, searchInfo)
-                            }
-                        }
+                    // Build search param
+                    val searchInfo = SearchInfo().apply {
+                        applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
+                        webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+                        webScheme = intent.getStringExtra(KEY_SEARCH_SCHEME)
+                    }
+                    SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
+                        searchInfo.webDomain = concreteWebDomain
+                        launchSelection(searchInfo)
                     }
-                    // Remove bundle
-                    intent.removeExtra(KEY_SELECTION_BUNDLE)
                 }
                 SpecialMode.REGISTRATION -> {
                     // To register info
@@ -103,7 +69,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                     val searchInfo = SearchInfo(registerInfo?.searchInfo)
                     SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
                         searchInfo.webDomain = concreteWebDomain
-                        launchRegistration(database, searchInfo, registerInfo)
+                        launchRegistration(searchInfo, registerInfo)
                     }
                 }
                 else -> {
@@ -113,11 +79,14 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                 }
             }
         }
+
+        super.onCreate(savedInstanceState)
     }
 
-    private fun launchSelection(database: Database?,
-                                autofillComponent: AutofillComponent?,
-                                searchInfo: SearchInfo) {
+    private fun launchSelection(searchInfo: SearchInfo) {
+        // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
+        val autofillComponent = AutofillHelper.retrieveAutofillComponent(intent)
+
         if (autofillComponent == null) {
             setResult(Activity.RESULT_CANCELED)
             finish()
@@ -129,28 +98,28 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
             setResult(Activity.RESULT_CANCELED)
             finish()
         } else {
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
             // If database is open
             SearchHelper.checkAutoSearchInfo(this,
-                    database,
+                    Database.getInstance(),
                     searchInfo,
-                    { openedDatabase, items ->
+                    { items ->
                         // Items found
-                        AutofillHelper.buildResponseAndSetResult(this, openedDatabase, items)
+                        AutofillHelper.buildResponseAndSetResult(this, items)
                         finish()
                     },
-                    { openedDatabase ->
+                    {
                         // Show the database UI to select the entry
                         GroupActivity.launchForAutofillResult(this,
-                            openedDatabase,
-                            mAutofillActivityResultLauncher,
-                            autofillComponent,
-                            searchInfo,
-                            false)
+                                readOnly,
+                                autofillComponent,
+                                searchInfo,
+                                false)
                     },
                     {
                         // If database not open
                         FileDatabaseSelectActivity.launchForAutofillResult(this,
-                                mAutofillActivityResultLauncher,
                                 autofillComponent,
                                 searchInfo)
                     }
@@ -158,9 +127,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
         }
     }
 
-    private fun launchRegistration(database: Database?,
-                                   searchInfo: SearchInfo,
-                                   registerInfo: RegisterInfo?) {
+    private fun launchRegistration(searchInfo: SearchInfo, registerInfo: RegisterInfo?) {
         if (!KeeAutofillService.autofillAllowedFor(searchInfo.applicationId,
                         PreferencesUtil.applicationIdBlocklist(this))
                 || !KeeAutofillService.autofillAllowedFor(searchInfo.webDomain,
@@ -168,26 +135,25 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
             showBlockRestartMessage()
             setResult(Activity.RESULT_CANCELED)
         } else {
-            val readOnly = database?.isReadOnly != false
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
             SearchHelper.checkAutoSearchInfo(this,
                     database,
                     searchInfo,
-                    { openedDatabase, _ ->
+                    { _ ->
                         if (!readOnly) {
                             // Show the database UI to select the entry
                             GroupActivity.launchForRegistration(this,
-                                openedDatabase,
-                                registerInfo)
+                                    registerInfo)
                         } else {
                             showReadOnlySaveMessage()
                         }
                     },
-                    { openedDatabase ->
+                    {
                         if (!readOnly) {
                             // Show the database UI to select the entry
                             GroupActivity.launchForRegistration(this,
-                                openedDatabase,
-                                registerInfo)
+                                    registerInfo)
                         } else {
                             showReadOnlySaveMessage()
                         }
@@ -211,47 +177,53 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
         Toast.makeText(this.applicationContext, R.string.autofill_read_only_save, Toast.LENGTH_LONG).show()
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+
+        if (PreferencesUtil.isAutofillCloseDatabaseEnable(this)) {
+            // Close the database
+            sendBroadcast(Intent(LOCK_ACTION))
+        }
+
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
     companion object {
 
-        private const val KEY_SELECTION_BUNDLE = "KEY_SELECTION_BUNDLE"
-        private const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
-        private const val KEY_INLINE_SUGGESTION = "KEY_INLINE_SUGGESTION"
+        private const val KEY_SEARCH_APPLICATION_ID = "KEY_SEARCH_APPLICATION_ID"
+        private const val KEY_SEARCH_DOMAIN = "KEY_SEARCH_DOMAIN"
+        private const val KEY_SEARCH_SCHEME = "KEY_SEARCH_SCHEME"
 
         private const val KEY_REGISTER_INFO = "KEY_REGISTER_INFO"
 
-        fun getPendingIntentForSelection(context: Context,
-                                         searchInfo: SearchInfo? = null,
-                                         compatInlineSuggestionsRequest: CompatInlineSuggestionsRequest? = null): PendingIntent {
+        fun getAuthIntentSenderForSelection(context: Context,
+                                            searchInfo: SearchInfo? = null,
+                                            inlineSuggestionsRequest: InlineSuggestionsRequest? = null): IntentSender {
             return PendingIntent.getActivity(context, 0,
-                // Doesn't work with direct extra Parcelable (don't know why?)
-                // Wrap into a bundle to bypass the problem
-                Intent(context, AutofillLauncherActivity::class.java).apply {
-                    putExtra(KEY_SELECTION_BUNDLE, Bundle().apply {
-                        putParcelable(KEY_SEARCH_INFO, searchInfo)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            putParcelable(KEY_INLINE_SUGGESTION, compatInlineSuggestionsRequest)
+                    // Doesn't work with Parcelable (don't know why?)
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
+                        searchInfo?.let {
+                            putExtra(KEY_SEARCH_APPLICATION_ID, it.applicationId)
+                            putExtra(KEY_SEARCH_DOMAIN, it.webDomain)
+                            putExtra(KEY_SEARCH_SCHEME, it.webScheme)
                         }
-                    })
-                },
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
-                } else {
-                    PendingIntent.FLAG_CANCEL_CURRENT
-                })
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                            inlineSuggestionsRequest?.let {
+                                putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+                            }
+                        }
+                    },
+                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
         }
 
-        fun getPendingIntentForRegistration(context: Context,
-                                            registerInfo: RegisterInfo): PendingIntent {
+        fun getAuthIntentSenderForRegistration(context: Context,
+                                               registerInfo: RegisterInfo): IntentSender {
             return PendingIntent.getActivity(context, 0,
-                Intent(context, AutofillLauncherActivity::class.java).apply {
-                    EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
-                    putExtra(KEY_REGISTER_INFO, registerInfo)
-                },
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
-                } else {
-                    PendingIntent.FLAG_CANCEL_CURRENT
-                })
+                    Intent(context, AutofillLauncherActivity::class.java).apply {
+                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
+                        putExtra(KEY_REGISTER_INFO, registerInfo)
+                    },
+                    PendingIntent.FLAG_CANCEL_CURRENT).intentSender
         }
 
         fun launchForRegistration(context: Context,

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

@@ -32,89 +32,68 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.viewModels
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
-import androidx.core.graphics.ColorUtils
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
-import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.fragments.EntryFragment
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
-import com.kunzisoft.keepass.adapters.TagsAdapter
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
-import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
+import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryAttachmentState
-import com.kunzisoft.keepass.otp.OtpType
+import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.services.AttachmentFileNotificationService
 import com.kunzisoft.keepass.services.ClipboardEntryNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
+import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.UriUtil
-import com.kunzisoft.keepass.utils.UuidUtil
-import com.kunzisoft.keepass.view.changeControlColor
-import com.kunzisoft.keepass.view.changeTitleColor
-import com.kunzisoft.keepass.view.hideByFading
+import com.kunzisoft.keepass.utils.*
+import com.kunzisoft.keepass.view.EntryContentsView
 import com.kunzisoft.keepass.view.showActionErrorIfNeeded
-import com.kunzisoft.keepass.viewmodels.EntryViewModel
 import java.util.*
+import kotlin.collections.HashMap
 
-class EntryActivity : DatabaseLockActivity() {
+class EntryActivity : LockingActivity() {
 
     private var coordinatorLayout: CoordinatorLayout? = null
     private var collapsingToolbarLayout: CollapsingToolbarLayout? = null
-    private var appBarLayout: AppBarLayout? = null
     private var titleIconView: ImageView? = null
     private var historyView: View? = null
-    private var tagsListView: RecyclerView? = null
-    private var tagsAdapter: TagsAdapter? = null
-    private var entryProgress: LinearProgressIndicator? = null
+    private var entryContentsView: EntryContentsView? = null
+    private var entryProgress: ProgressBar? = null
     private var lockView: View? = null
     private var toolbar: Toolbar? = null
-    private var loadingView: ProgressBar? = null
 
-    private val mEntryViewModel: EntryViewModel by viewModels()
+    private var mDatabase: Database? = null
 
-    private val mEntryActivityEducation = EntryActivityEducation(this)
+    private var mEntry: Entry? = null
 
-    private var mMainEntryId: NodeId<UUID>? = null
-    private var mHistoryPosition: Int = -1
-    private var mEntryIsHistory: Boolean = false
-    private var mUrl: String? = null
-    private var mEntryLoaded = false
+    private var mIsHistory: Boolean = false
+    private var mEntryLastVersion: Entry? = null
+    private var mEntryHistoryPosition: Int = -1
+
+    private var mShowPassword: Boolean = false
 
     private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
-    private var mExternalFileHelper: ExternalFileHelper? = null
-    private var mAttachmentSelected: Attachment? = null
+    private var mAttachmentsToDownload: HashMap<Int, Attachment> = HashMap()
 
-    private var mEntryActivityResultLauncher = EntryEditActivity.registerForEntryResult(this) {
-        // Reload the current id from database
-        mEntryViewModel.loadDatabase(mDatabase)
-    }
+    private var clipboardHelper: ClipboardHelper? = null
+    private var mFirstLaunchOfActivity: Boolean = false
 
-    private var mIcon: IconImage? = null
-    private var mColorAccent: Int = 0
-    private var mControlColor: Int = 0
-    private var mColorPrimary: Int = 0
-    private var mColorBackground: Int = 0
-    private var mBackgroundColor: Int? = null
-    private var mForegroundColor: Int? = null
+    private var iconColor: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -126,191 +105,60 @@ class EntryActivity : DatabaseLockActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
+        mDatabase = Database.getInstance()
+        mReadOnly = mDatabase!!.isReadOnly || mReadOnly
+
+        mShowPassword = !PreferencesUtil.isPasswordMask(this)
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+        iconColor = taIconColor.getColor(0, Color.BLACK)
+        taIconColor.recycle()
+
+        // Refresh Menu contents in case onCreateMenuOptions was called before mEntry was set
+        invalidateOptionsMenu()
+
         // Get views
         coordinatorLayout = findViewById(R.id.toolbar_coordinator)
         collapsingToolbarLayout = findViewById(R.id.toolbar_layout)
-        appBarLayout = findViewById(R.id.app_bar)
         titleIconView = findViewById(R.id.entry_icon)
         historyView = findViewById(R.id.history_container)
-        tagsListView = findViewById(R.id.entry_tags_list_view)
+        entryContentsView = findViewById(R.id.entry_contents)
+        entryContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
+        entryContentsView?.setAttachmentCipherKey(mDatabase)
         entryProgress = findViewById(R.id.entry_progress)
         lockView = findViewById(R.id.lock_button)
-        loadingView = findViewById(R.id.loading)
-
-        // Empty title
-        collapsingToolbarLayout?.title = " "
-        toolbar?.title = " "
-
-        // Retrieve the textColor to tint the toolbar
-        val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
-        val taControlColor = theme.obtainStyledAttributes(intArrayOf(R.attr.toolbarColorControl))
-        val taColorPrimary = theme.obtainStyledAttributes(intArrayOf(R.attr.colorPrimary))
-        val taColorBackground = theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
-        mColorAccent = taColorAccent.getColor(0, Color.BLACK)
-        mControlColor = taControlColor.getColor(0, Color.BLACK)
-        mColorPrimary = taColorPrimary.getColor(0, Color.BLACK)
-        mColorBackground = taColorBackground.getColor(0, Color.BLACK)
-        taColorAccent.recycle()
-        taControlColor.recycle()
-        taColorPrimary.recycle()
-        taColorBackground.recycle()
-
-        // Init Tags adapter
-        tagsAdapter = TagsAdapter(this)
-        tagsListView?.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-            adapter = tagsAdapter
-        }
-
-        // Get Entry from UUID
-        try {
-            intent.getParcelableExtra<NodeId<UUID>?>(KEY_ENTRY)?.let { mainEntryId ->
-                intent.removeExtra(KEY_ENTRY)
-                val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, -1)
-                intent.removeExtra(KEY_ENTRY_HISTORY_POSITION)
-
-                mEntryViewModel.loadEntry(mDatabase, mainEntryId, historyPosition)
-            }
-        } catch (e: ClassCastException) {
-            Log.e(TAG, "Unable to retrieve the entry key")
-        }
-
-        // Init SAF manager
-        mExternalFileHelper = ExternalFileHelper(this)
-        mExternalFileHelper?.buildCreateDocument { createdFileUri ->
-            mAttachmentSelected?.let { attachment ->
-                if (createdFileUri != null) {
-                    mAttachmentFileBinderManager
-                        ?.startDownloadAttachment(createdFileUri, attachment)
-                }
-                mAttachmentSelected = null
-            }
-        }
-        // Init attachment service binder manager
-        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
 
         lockView?.setOnClickListener {
             lockAndExit()
         }
 
-        mEntryViewModel.entryInfoHistory.observe(this) { entryInfoHistory ->
-            if (entryInfoHistory != null) {
-                this.mMainEntryId = entryInfoHistory.mainEntryId
+        // Focus view to reinitialize timeout
+        coordinatorLayout?.resetAppTimeoutWhenViewFocusedOrChanged(this)
 
-                // Manage history position
-                val historyPosition = entryInfoHistory.historyPosition
-                this.mHistoryPosition = historyPosition
-                val entryIsHistory = historyPosition > -1
-                this.mEntryIsHistory = entryIsHistory
-                // Assign history dedicated view
-                historyView?.visibility = if (entryIsHistory) View.VISIBLE else View.GONE
-                if (entryIsHistory) {
-                    collapsingToolbarLayout?.contentScrim =
-                        ColorDrawable(mColorAccent)
+        // Init the clipboard helper
+        clipboardHelper = ClipboardHelper(this)
+        mFirstLaunchOfActivity = savedInstanceState?.getBoolean(KEY_FIRST_LAUNCH_ACTIVITY) ?: true
+
+        // Init attachment service binder manager
+        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
+
+        mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result ->
+            when (actionTask) {
+                ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
+                ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
+                    // Close the current activity after an history action
+                    if (result.isSuccess)
+                        finish()
                 }
-
-                val entryInfo = entryInfoHistory.entryInfo
-                // Manage entry copy to start notification if allowed (at the first start)
-                if (savedInstanceState == null) {
-                    // Manage entry to launch copying notification if allowed
-                    ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
-                    // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
-                    if (PreferencesUtil.isKeyboardEntrySelectionEnable(this)) {
-                        MagikeyboardService.addEntryAndLaunchNotificationIfAllowed(this, entryInfo)
-                    }
-                }
-                // Assign title icon
-                mIcon = entryInfo.icon
-                // Assign title text
-                val entryTitle =
-                    if (entryInfo.title.isNotEmpty()) entryInfo.title else UuidUtil.toHexString(entryInfo.id)
-                collapsingToolbarLayout?.title = entryTitle
-                toolbar?.title = entryTitle
-                mUrl = entryInfo.url
-                // Assign tags
-                val tags = entryInfo.tags
-                tagsListView?.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
-                tagsAdapter?.setTags(tags)
-                // Assign colors
-                val showEntryColors = PreferencesUtil.showEntryColors(this)
-                mBackgroundColor = if (showEntryColors) entryInfo.backgroundColor else null
-                mForegroundColor = if (showEntryColors) entryInfo.foregroundColor else null
-
-                loadingView?.hideByFading()
-                mEntryLoaded = true
-            } else {
-                finish()
-            }
-            // Refresh Menu
-            invalidateOptionsMenu()
-        }
-
-        mEntryViewModel.onOtpElementUpdated.observe(this) { otpElement ->
-            if (otpElement == null) {
-                entryProgress?.visibility = View.GONE
-            } else when (otpElement.type) {
-                // Only add token if HOTP
-                OtpType.HOTP -> {
-                    entryProgress?.visibility = View.GONE
-                }
-                // Refresh view if TOTP
-                OtpType.TOTP -> {
-                    entryProgress?.apply {
-                        max = otpElement.period
-                        setProgressCompat(otpElement.secondsRemaining, true)
-                        visibility = View.VISIBLE
-                    }
-                }
-            }
-        }
-
-        mEntryViewModel.attachmentSelected.observe(this) { attachmentSelected ->
-            mAttachmentSelected = attachmentSelected
-            mExternalFileHelper?.createDocument(attachmentSelected.name)
-        }
-
-        mEntryViewModel.historySelected.observe(this) { historySelected ->
-            mDatabase?.let { database ->
-                launch(
-                    this,
-                    database,
-                    historySelected.nodeId,
-                    historySelected.historyPosition,
-                    mEntryActivityResultLauncher
-                )
-            }
-        }
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun viewToInvalidateTimeout(): View? {
-        return coordinatorLayout
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        mEntryViewModel.loadDatabase(database)
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-        when (actionTask) {
-            ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
-            ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
-                // Close the current activity after an history action
-                if (result.isSuccess)
+                ACTION_DATABASE_RELOAD_TASK -> {
+                    // Close the current activity
+                    this.showActionErrorIfNeeded(result)
                     finish()
+                }
             }
+            coordinatorLayout?.showActionErrorIfNeeded(result)
         }
-        coordinatorLayout?.showActionErrorIfNeeded(result)
     }
 
     override fun onResume() {
@@ -323,19 +171,63 @@ class EntryActivity : DatabaseLockActivity() {
             View.GONE
         }
 
-        mAttachmentFileBinderManager?.apply {
-            registerProgressTask()
-            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
-                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
-                    mEntryViewModel.onAttachmentAction(entryAttachmentState)
+        // Get Entry from UUID
+        try {
+            val keyEntry: NodeId<UUID>? = intent.getParcelableExtra(KEY_ENTRY)
+            if (keyEntry != null) {
+                mEntry = mDatabase?.getEntryById(keyEntry)
+                mEntryLastVersion = mEntry
+            }
+        } catch (e: ClassCastException) {
+            Log.e(TAG, "Unable to retrieve the entry key")
+        }
+
+        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, mEntryHistoryPosition)
+        mEntryHistoryPosition = historyPosition
+        if (historyPosition >= 0) {
+            mIsHistory = true
+            mEntry = mEntry?.getHistory()?.get(historyPosition)
+        }
+
+        if (mEntry == null) {
+            Toast.makeText(this, R.string.entry_not_found, Toast.LENGTH_LONG).show()
+            finish()
+            return
+        }
+
+        // Update last access time.
+        mEntry?.touch(modified = false, touchParents = false)
+
+        mEntry?.let { entry ->
+            // Fill data in resume to update from EntryEditActivity
+            fillEntryDataInContentsView(entry)
+            // Refresh Menu
+            invalidateOptionsMenu()
+
+            val entryInfo = entry.getEntryInfo(mDatabase)
+            // Manage entry copy to start notification if allowed
+            if (mFirstLaunchOfActivity) {
+                // Manage entry to launch copying notification if allowed
+                ClipboardEntryNotificationService.launchNotificationIfAllowed(this, entryInfo)
+                // Manage entry to populate Magikeyboard and launch keyboard notification if allowed
+                if (PreferencesUtil.isKeyboardEntrySelectionEnable(this)) {
+                    MagikIME.addEntryAndLaunchNotificationIfAllowed(this, entryInfo)
                 }
             }
         }
 
-        // Keep the screen on
-        if (PreferencesUtil.isKeepScreenOnEnabled(this)) {
-            window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        mAttachmentFileBinderManager?.apply {
+            registerProgressTask()
+            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
+                override fun onAttachmentAction(fileUri: Uri, entryAttachmentState: EntryAttachmentState) {
+                    if (entryAttachmentState.streamDirection != StreamDirection.UPLOAD) {
+                        entryContentsView?.putAttachment(entryAttachmentState)
+                    }
+                }
+            }
         }
+
+        mFirstLaunchOfActivity = false
     }
 
     override fun onPause() {
@@ -344,93 +236,223 @@ class EntryActivity : DatabaseLockActivity() {
         super.onPause()
     }
 
-    private fun applyToolbarColors() {
-        appBarLayout?.setBackgroundColor(mBackgroundColor ?: mColorPrimary)
-        collapsingToolbarLayout?.contentScrim = ColorDrawable(mBackgroundColor ?: mColorPrimary)
-        val backgroundDarker = if (mBackgroundColor != null) {
-            ColorUtils.blendARGB(mBackgroundColor!!, Color.WHITE, 0.1f)
-        } else {
-            mColorBackground
+    private fun fillEntryDataInContentsView(entry: Entry) {
+
+        val entryInfo = entry.getEntryInfo(mDatabase)
+
+        // Assign title icon
+        titleIconView?.let { iconView ->
+            mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconView, entryInfo.icon, iconColor)
         }
-        titleIconView?.background?.colorFilter = BlendModeColorFilterCompat
-            .createBlendModeColorFilterCompat(backgroundDarker, BlendModeCompat.SRC_IN)
-        mIcon?.let { icon ->
-            titleIconView?.let { iconView ->
-                mIconDrawableFactory?.assignDatabaseIcon(
-                    iconView,
-                    icon,
-                    mForegroundColor ?: mColorAccent
+
+        // Assign title text
+        val entryTitle = entryInfo.title
+        collapsingToolbarLayout?.title = entryTitle
+        toolbar?.title = entryTitle
+
+        // Assign basic fields
+        entryContentsView?.assignUserName(entryInfo.username) {
+            clipboardHelper?.timeoutCopyToClipboard(entryInfo.username,
+                    getString(R.string.copy_field,
+                            getString(R.string.entry_user_name)))
+        }
+
+        val isFirstTimeAskAllowCopyPasswordAndProtectedFields =
+                PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)
+        val allowCopyPasswordAndProtectedFields =
+                PreferencesUtil.allowCopyPasswordAndProtectedFields(this)
+
+        val showWarningClipboardDialogOnClickListener = View.OnClickListener {
+            AlertDialog.Builder(this@EntryActivity)
+                    .setMessage(getString(R.string.allow_copy_password_warning) +
+                            "\n\n" +
+                            getString(R.string.clipboard_warning))
+                    .create().apply {
+                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
+                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, true)
+                            dialog.dismiss()
+                            fillEntryDataInContentsView(entry)
+                        }
+                        setButton(AlertDialog.BUTTON_NEGATIVE, getText(R.string.disable)) { dialog, _ ->
+                            PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, false)
+                            dialog.dismiss()
+                            fillEntryDataInContentsView(entry)
+                        }
+                        show()
+                    }
+        }
+
+        val onPasswordCopyClickListener: View.OnClickListener? = if (allowCopyPasswordAndProtectedFields) {
+            View.OnClickListener {
+                clipboardHelper?.timeoutCopyToClipboard(entryInfo.password,
+                        getString(R.string.copy_field,
+                                getString(R.string.entry_password)))
+            }
+        } else {
+            // If dialog not already shown
+            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                showWarningClipboardDialogOnClickListener
+            } else {
+                null
+            }
+        }
+        entryContentsView?.assignPassword(entryInfo.password,
+                allowCopyPasswordAndProtectedFields,
+                onPasswordCopyClickListener)
+
+        //Assign OTP field
+        entry.getOtpElement()?.let { otpElement ->
+            entryContentsView?.assignOtp(otpElement, entryProgress) {
+                clipboardHelper?.timeoutCopyToClipboard(
+                        otpElement.token,
+                        getString(R.string.copy_field, getString(R.string.entry_otp))
                 )
             }
         }
-        toolbar?.changeControlColor(mForegroundColor ?: mControlColor)
-        collapsingToolbarLayout?.changeTitleColor(mForegroundColor ?: mControlColor)
+
+        entryContentsView?.assignURL(entryInfo.url)
+        entryContentsView?.assignNotes(entryInfo.notes)
+
+        // Assign custom fields
+        if (mDatabase?.allowEntryCustomFields() == true) {
+            entryContentsView?.clearExtraFields()
+            entryInfo.customFields.forEach { field ->
+                val label = field.name
+                // OTP field is already managed in dedicated view
+                if (label != OtpEntryFields.OTP_TOKEN_FIELD) {
+                    val value = field.protectedValue
+                    val allowCopyProtectedField = !value.isProtected || allowCopyPasswordAndProtectedFields
+                    if (allowCopyProtectedField) {
+                        entryContentsView?.addExtraField(label, value, allowCopyProtectedField) {
+                            clipboardHelper?.timeoutCopyToClipboard(
+                                    value.toString(),
+                                    getString(R.string.copy_field, label)
+                            )
+                        }
+                    } else {
+                        // If dialog not already shown
+                        if (isFirstTimeAskAllowCopyPasswordAndProtectedFields) {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, showWarningClipboardDialogOnClickListener)
+                        } else {
+                            entryContentsView?.addExtraField(label, value, allowCopyProtectedField, null)
+                        }
+                    }
+                }
+            }
+        }
+        entryContentsView?.setHiddenProtectedValue(!mShowPassword)
+
+        // Manage attachments
+        entryContentsView?.assignAttachments(entryInfo.attachments.toSet(), StreamDirection.DOWNLOAD) { attachmentItem ->
+            createDocument(this, attachmentItem.name)?.let { requestCode ->
+                mAttachmentsToDownload[requestCode] = attachmentItem
+            }
+        }
+
+        // Assign dates
+        entryContentsView?.assignCreationDate(entryInfo.creationTime)
+        entryContentsView?.assignModificationDate(entryInfo.lastModificationTime)
+        entryContentsView?.setExpires(entryInfo.expires, entryInfo.expiryTime)
+
+        // Manage history
+        historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
+        if (mIsHistory) {
+            val taColorAccent = theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
+            collapsingToolbarLayout?.contentScrim = ColorDrawable(taColorAccent.getColor(0, Color.BLACK))
+            taColorAccent.recycle()
+        }
+        entryContentsView?.assignHistory(entry.getHistory()) { historyItem, position ->
+            launch(this, historyItem, mReadOnly, position)
+        }
+
+        // Assign special data
+        entryContentsView?.assignUUID(entry.nodeId.id)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        when (requestCode) {
+            EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE ->
+                // Not directly get the entry from intent data but from database
+                mEntry?.let {
+                    fillEntryDataInContentsView(it)
+                }
+        }
+
+        onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
+            if (createdFileUri != null) {
+                mAttachmentsToDownload[requestCode]?.let { attachmentToDownload ->
+                    mAttachmentFileBinderManager
+                            ?.startDownloadAttachment(createdFileUri, attachmentToDownload)
+                }
+            }
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
-        if (mEntryLoaded) {
-            val inflater = menuInflater
 
-            inflater.inflate(R.menu.entry, menu)
-            inflater.inflate(R.menu.database, menu)
+        val inflater = menuInflater
+        MenuUtil.contributionMenuInflater(inflater, menu)
+        inflater.inflate(R.menu.entry, menu)
+        inflater.inflate(R.menu.database, menu)
+        if (mIsHistory && !mReadOnly) {
+            inflater.inflate(R.menu.entry_history, menu)
+        }
+        if (mIsHistory || mReadOnly) {
+            menu.findItem(R.id.menu_save_database)?.isVisible = false
+            menu.findItem(R.id.menu_edit)?.isVisible = false
+        }
+        if (mSpecialMode != SpecialMode.DEFAULT) {
+            menu.findItem(R.id.menu_reload_database)?.isVisible = false
+        }
 
-            if (mEntryIsHistory && !mDatabaseReadOnly) {
-                inflater.inflate(R.menu.entry_history, menu)
-            }
-
-            // Show education views
-            Handler(Looper.getMainLooper()).post {
-                performedNextEducation(menu)
+        val gotoUrl = menu.findItem(R.id.menu_goto_url)
+        gotoUrl?.apply {
+            // In API >= 11 onCreateOptionsMenu may be called before onCreate completes
+            // so mEntry may not be set
+            if (mEntry == null) {
+                isVisible = false
+            } else {
+                if (mEntry?.url?.isEmpty() != false) {
+                    // disable button if url is not available
+                    isVisible = false
+                }
             }
         }
+
+        // Show education views
+        Handler(Looper.getMainLooper()).post { performedNextEducation(EntryActivityEducation(this), menu) }
+
         return true
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        if (mUrl?.isEmpty() != false) {
-            menu?.findItem(R.id.menu_goto_url)?.isVisible = false
-        }
-        if (mEntryIsHistory || mDatabaseReadOnly) {
-            menu?.findItem(R.id.menu_save_database)?.isVisible = false
-            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
-            menu?.findItem(R.id.menu_edit)?.isVisible = false
-        }
-        if (!mMergeDataAllowed) {
-            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
-        }
-        if (mSpecialMode != SpecialMode.DEFAULT) {
-            menu?.findItem(R.id.menu_merge_database)?.isVisible = false
-            menu?.findItem(R.id.menu_reload_database)?.isVisible = false
-        }
-        applyToolbarColors()
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    private fun performedNextEducation(menu: Menu) {
-        val entryFragment = supportFragmentManager.findFragmentByTag(ENTRY_FRAGMENT_TAG)
-                as? EntryFragment?
-        val entryFieldCopyView: View? = entryFragment?.firstEntryFieldCopyView()
+    private fun performedNextEducation(entryActivityEducation: EntryActivityEducation,
+                                       menu: Menu) {
+        val entryFieldCopyView = entryContentsView?.firstEntryFieldCopyView()
         val entryCopyEducationPerformed = entryFieldCopyView != null
-                && mEntryActivityEducation.checkAndPerformedEntryCopyEducation(
-                entryFieldCopyView,
-                {
-                    entryFragment.launchEntryCopyEducationAction()
-                },
-                {
-                    performedNextEducation(menu)
-                })
+                && entryActivityEducation.checkAndPerformedEntryCopyEducation(
+                        entryFieldCopyView,
+                        {
+                            val appNameString = getString(R.string.app_name)
+                            clipboardHelper?.timeoutCopyToClipboard(appNameString,
+                                    getString(R.string.copy_field, appNameString))
+                        },
+                        {
+                            performedNextEducation(entryActivityEducation, menu)
+                        })
 
         if (!entryCopyEducationPerformed) {
             val menuEditView = toolbar?.findViewById<View>(R.id.menu_edit)
             // entryEditEducationPerformed
-            menuEditView != null && mEntryActivityEducation.checkAndPerformedEntryEditEducation(
+            menuEditView != null && entryActivityEducation.checkAndPerformedEntryEditEducation(
                     menuEditView,
                     {
                         onOptionsItemSelected(menu.findItem(R.id.menu_edit))
                     },
                     {
-                        performedNextEducation(menu)
+                        performedNextEducation(entryActivityEducation, menu)
                     }
             )
         }
@@ -438,58 +460,65 @@ 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 ->
-                        EntryEditActivity.launchToUpdate(
-                            this,
-                            database,
-                            entryId,
-                            mEntryActivityResultLauncher
-                        )
-                    }
+                mEntry?.let {
+                    EntryEditActivity.launch(this@EntryActivity, it)
                 }
                 return true
             }
             R.id.menu_goto_url -> {
-                mUrl?.let { url ->
-                    UriUtil.gotoUrl(this, url)
+                var url: String = mEntry?.url ?: ""
+
+                // Default http:// if no protocol specified
+                if (!url.contains("://")) {
+                    url = "http://$url"
                 }
+
+                UriUtil.gotoUrl(this, url)
                 return true
             }
             R.id.menu_restore_entry_history -> {
-                mMainEntryId?.let { mainEntryId ->
-                    restoreEntryHistory(
-                        mainEntryId,
-                        mHistoryPosition)
+                mEntryLastVersion?.let { mainEntry ->
+                    mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory(
+                            mainEntry,
+                            mEntryHistoryPosition,
+                            !mReadOnly && mAutoSaveEnable)
                 }
             }
             R.id.menu_delete_entry_history -> {
-                mMainEntryId?.let { mainEntryId ->
-                    deleteEntryHistory(
-                        mainEntryId,
-                        mHistoryPosition)
+                mEntryLastVersion?.let { mainEntry ->
+                    mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(
+                            mainEntry,
+                            mEntryHistoryPosition,
+                            !mReadOnly && mAutoSaveEnable)
                 }
             }
             R.id.menu_save_database -> {
-                saveDatabase()
-            }
-            R.id.menu_merge_database -> {
-                mergeDatabase()
+                mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly)
             }
             R.id.menu_reload_database -> {
-                reloadDatabase()
+                mProgressDatabaseTaskProvider?.startDatabaseReload(false)
             }
             android.R.id.home -> finish() // close this activity and return to preview activity (if there is any)
         }
         return super.onOptionsItemSelected(item)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putBoolean(KEY_FIRST_LAUNCH_ACTIVITY, mFirstLaunchOfActivity)
+    }
+
     override fun finish() {
         // Transit data in previous Activity after an update
         Intent().apply {
-            putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mMainEntryId)
-            setResult(Activity.RESULT_OK, this)
+            putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mEntry)
+            setResult(EntryEditActivity.UPDATE_ENTRY_RESULT_CODE, this)
         }
         super.finish()
     }
@@ -497,42 +526,19 @@ class EntryActivity : DatabaseLockActivity() {
     companion object {
         private val TAG = EntryActivity::class.java.name
 
+        private const val KEY_FIRST_LAUNCH_ACTIVITY = "KEY_FIRST_LAUNCH_ACTIVITY"
+
         const val KEY_ENTRY = "KEY_ENTRY"
         const val KEY_ENTRY_HISTORY_POSITION = "KEY_ENTRY_HISTORY_POSITION"
 
-        const val ENTRY_FRAGMENT_TAG = "ENTRY_FRAGMENT_TAG"
-
-        /**
-         * Open standard Entry activity
-         */
-        fun launch(activity: Activity,
-                   database: Database,
-                   entryId: NodeId<UUID>,
-                   activityResultLauncher: ActivityResultLauncher<Intent>) {
-            if (database.loaded) {
-                if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
-                    val intent = Intent(activity, EntryActivity::class.java)
-                    intent.putExtra(KEY_ENTRY, entryId)
-                    activityResultLauncher.launch(intent)
-                }
-            }
-        }
-
-        /**
-         * Open history Entry activity
-         */
-        fun launch(activity: Activity,
-                   database: Database,
-                   entryId: NodeId<UUID>,
-                   historyPosition: Int,
-                   activityResultLauncher: ActivityResultLauncher<Intent>) {
-            if (database.loaded) {
-                if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
-                    val intent = Intent(activity, EntryActivity::class.java)
-                    intent.putExtra(KEY_ENTRY, entryId)
+        fun launch(activity: Activity, entry: Entry, readOnly: Boolean, historyPosition: Int? = null) {
+            if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
+                val intent = Intent(activity, EntryActivity::class.java)
+                intent.putExtra(KEY_ENTRY, entry.nodeId)
+                ReadOnlyHelper.putReadOnlyInIntent(intent, readOnly)
+                if (historyPosition != null)
                     intent.putExtra(KEY_ENTRY_HISTORY_POSITION, historyPosition)
-                    activityResultLauncher.launch(intent)
-                }
+                activity.startActivityForResult(intent, EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE)
             }
         }
     }

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

@@ -22,13 +22,14 @@ package com.kunzisoft.keepass.activities
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
+import android.os.Bundle
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
+import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.otp.OtpEntryFields
@@ -38,18 +39,10 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
  * Activity to search or select entry in database,
  * Commonly used with Magikeyboard
  */
-class EntrySelectionLauncherActivity : DatabaseModeActivity() {
+class EntrySelectionLauncherActivity : AppCompatActivity() {
 
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
+    override fun onCreate(savedInstanceState: Bundle?) {
 
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
         var sharedWebDomain: String? = null
         var otpString: String? = null
 
@@ -75,39 +68,39 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
             else -> {}
         }
 
+
         // Build domain search param
         val searchInfo = SearchInfo().apply {
             this.webDomain = sharedWebDomain
             this.otpString = otpString
         }
-
         SearchInfo.getConcreteWebDomain(this, searchInfo.webDomain) { concreteWebDomain ->
             searchInfo.webDomain = concreteWebDomain
-            launch(database, searchInfo)
+            launch(searchInfo)
         }
+
+        super.onCreate(savedInstanceState)
     }
 
-    private fun launch(database: Database?,
-                       searchInfo: SearchInfo) {
+    private fun launch(searchInfo: SearchInfo) {
 
         if (!searchInfo.containsOnlyNullValues()) {
             // Setting to integrate Magikeyboard
             val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
 
             // If database is open
-            val readOnly = database?.isReadOnly != false
+            val database = Database.getInstance()
+            val readOnly = database.isReadOnly
             SearchHelper.checkAutoSearchInfo(this,
                     database,
                     searchInfo,
-                    { openedDatabase, items ->
+                    { items ->
                         // Items found
                         if (searchInfo.otpString != null) {
                             if (!readOnly) {
-                                GroupActivity.launchForSaveResult(
-                                    this,
-                                    openedDatabase,
-                                    searchInfo,
-                                    false)
+                                GroupActivity.launchForSaveResult(this,
+                                        searchInfo,
+                                        false)
                             } else {
                                 Toast.makeText(applicationContext,
                                         R.string.autofill_read_only_save,
@@ -118,32 +111,30 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                             if (items.size == 1) {
                                 // Automatically populate keyboard
                                 val entryPopulate = items[0]
-                                populateKeyboardAndMoveAppToBackground(
-                                    this,
+                                populateKeyboardAndMoveAppToBackground(this,
                                         entryPopulate,
                                         intent)
                             } else {
                                 // Select the one we want
                                 GroupActivity.launchForKeyboardSelectionResult(this,
-                                    openedDatabase,
-                                    searchInfo,
-                                    true)
+                                        readOnly,
+                                        searchInfo,
+                                        true)
                             }
                         } else {
                             GroupActivity.launchForSearchResult(this,
-                                openedDatabase,
-                                searchInfo,
-                                true)
+                                    readOnly,
+                                    searchInfo,
+                                    true)
                         }
                     },
-                    { openedDatabase ->
+                    {
                         // Show the database UI to select the entry
                         if (searchInfo.otpString != null) {
                             if (!readOnly) {
                                 GroupActivity.launchForSaveResult(this,
-                                    openedDatabase,
-                                    searchInfo,
-                                    false)
+                                        searchInfo,
+                                        false)
                             } else {
                                 Toast.makeText(applicationContext,
                                         R.string.autofill_read_only_save,
@@ -152,14 +143,13 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() {
                             }
                         } else if (readOnly || searchShareForMagikeyboard) {
                             GroupActivity.launchForKeyboardSelectionResult(this,
-                                openedDatabase,
-                                searchInfo,
-                                false)
+                                    readOnly,
+                                    searchInfo,
+                                    false)
                         } else {
                             GroupActivity.launchForSaveResult(this,
-                                openedDatabase,
-                                searchInfo,
-                                false)
+                                    searchInfo,
+                                    false)
                         }
                     },
                     {
@@ -193,7 +183,7 @@ fun populateKeyboardAndMoveAppToBackground(activity: Activity,
                                            intent: Intent,
                                            toast: Boolean = true) {
     // Populate Magikeyboard with entry
-    MagikeyboardService.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
+    MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
     // Consume the selection mode
     EntrySelectionHelper.removeModesFromIntent(intent)
     activity.moveTaskToBack(true)

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

@@ -31,29 +31,25 @@ 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.SetMainCredentialDialogFragment
+import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillComponent
 import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.model.MainCredential
@@ -64,25 +60,21 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
 import java.io.FileNotFoundException
 
-class FileDatabaseSelectActivity : DatabaseModeActivity(),
-        SetMainCredentialDialogFragment.AssignMainCredentialDialogListener {
+class FileDatabaseSelectActivity : SpecialModeActivity(),
+        AssignMasterKeyDialogFragment.AssignPasswordDialogListener {
 
     // 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
 
@@ -90,22 +82,13 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
 
     private var mDatabaseFileUri: Uri? = null
 
-    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mSelectFileHelper: SelectFileHelper? = null
 
-    private var mAutofillActivityResultLauncher: ActivityResultLauncher<Intent>? =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            AutofillHelper.buildActivityResultLauncher(this)
-        else null
+    private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // Enabling/disabling MagikeyboardService is normally done by DexModeReceiver, but this
-        // additional check will allow the keyboard to be reenabled more easily if the app crashes
-        // or is force quit within DeX mode and then the user leaves DeX mode. Without this, the
-        // user would need to enter and exit DeX mode once to reenable the service.
-        MagikeyboardUtil.setEnabled(this, !DexUtil.isDexMode(resources.configuration))
-
         mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(applicationContext)
 
         setContentView(R.layout.activity_file_selection)
@@ -115,33 +98,19 @@ 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() }
 
         // Open database button
-        mExternalFileHelper = ExternalFileHelper(this)
-        mExternalFileHelper?.buildOpenDocument { uri ->
-            uri?.let {
-                launchPasswordActivityWithPath(uri)
+        mSelectFileHelper = SelectFileHelper(this)
+        openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
+        openDatabaseButtonView?.apply {
+            mSelectFileHelper?.selectFileOnClickViewListener?.let {
+                setOnClickListener(it)
+                setOnLongClickListener(it)
             }
         }
-        mExternalFileHelper?.buildCreateDocument("application/x-keepass") { databaseFileCreatedUri ->
-            mDatabaseFileUri = databaseFileCreatedUri
-            if (mDatabaseFileUri != null) {
-                SetMainCredentialDialogFragment.getInstance(true)
-                    .show(supportFragmentManager, "passwordDialog")
-            } else {
-                val error = getString(R.string.error_create_database)
-                Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
-                Log.e(TAG, error)
-            }
-        }
-        openDatabaseButtonView = findViewById(R.id.open_database_button)
-        openDatabaseButtonView?.setOpenDocumentClickListener(mExternalFileHelper)
 
         // History list
         val fileDatabaseHistoryRecyclerView = findViewById<RecyclerView>(R.id.file_list)
@@ -162,6 +131,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             }
         }
         mAdapterDatabaseHistory?.setOnFileDatabaseHistoryDeleteListener { fileDatabaseHistoryToDelete ->
+            // Remove from app database
             databaseFilesViewModel.deleteDatabaseFile(fileDatabaseHistoryToDelete)
             true
         }
@@ -192,31 +162,29 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
 
         // Observe list of databases
         databaseFilesViewModel.databaseFilesLoaded.observe(this) { databaseFiles ->
-            try {
-                when (databaseFiles.databaseFileAction) {
-                    DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
-                        mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+            when (databaseFiles.databaseFileAction) {
+                DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
+                    mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
+                        mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
                     }
-                    DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
-                        databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
-                            mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
-                        }
-                    }
-                    DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
-                        databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
-                            mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
-                        }
-                    }
-                    DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
-                        databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
-                            mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
-                        }
+                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                            PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
+                        mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
+                    }
+                }
+                DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
+                    databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
+                        mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
                     }
                 }
-                databaseFilesViewModel.consumeAction()
-            } catch (e: Exception) {
-                Log.e(TAG, "Unable to observe database action", e)
             }
+            databaseFilesViewModel.consumeAction()
         }
 
         // Observe default database
@@ -224,62 +192,37 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             // Retrieve settings for default database
             mAdapterDatabaseHistory?.setDefaultDatabase(it)
         }
-    }
 
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-        if (database != null) {
-            launchGroupActivityIfLoaded(database)
-        }
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-
-        if (result.isSuccess) {
-            // Update list
-            when (actionTask) {
-                ACTION_DATABASE_CREATE_TASK,
-                ACTION_DATABASE_LOAD_TASK -> {
-                    result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
-                        val mainCredential =
-                            result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
-                                ?: MainCredential()
-                        databaseFilesViewModel.addDatabaseFile(
-                            databaseUri,
-                            mainCredential.keyFileUri
-                        )
+        // Attach the dialog thread to this activity
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply {
+            onActionFinish = { actionTask, result ->
+                when (actionTask) {
+                    ACTION_DATABASE_CREATE_TASK -> {
+                        result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
+                            val mainCredential = result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY) ?: MainCredential()
+                            databaseFilesViewModel.addDatabaseFile(databaseUri, mainCredential.keyFileUri)
+                        }
+                    }
+                    ACTION_DATABASE_LOAD_TASK -> {
+                        val database = Database.getInstance()
+                        if (result.isSuccess
+                                && database.loaded) {
+                            launchGroupActivity(database)
+                        } else {
+                            var resultError = ""
+                            val resultMessage = result.message
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError)
+                            Snackbar.make(coordinatorLayout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
+                        }
                     }
                 }
             }
-            // Launch activity
-            when (actionTask) {
-                ACTION_DATABASE_CREATE_TASK -> {
-                    GroupActivity.launch(
-                        this@FileDatabaseSelectActivity,
-                        database,
-                        PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity)
-                    )
-                }
-                ACTION_DATABASE_LOAD_TASK -> {
-                    launchGroupActivityIfLoaded(database)
-                }
-            }
-        } else {
-            var resultError = ""
-            val resultMessage = result.message
-            // Show error message
-            if (resultMessage != null && resultMessage.isNotEmpty()) {
-                resultError = "$resultError $resultMessage"
-            }
-            Log.e(TAG, resultError)
-            Snackbar.make(coordinatorLayout,
-                resultError,
-                Snackbar.LENGTH_LONG).asError().show()
         }
     }
 
@@ -287,9 +230,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
      * Create a new file by calling the content provider
      */
     private fun createNewFile() {
-        mExternalFileHelper?.createDocument(
-            getString(R.string.database_file_name_default) +
-                getString(R.string.database_file_extension_default))
+        createDocument(this, getString(R.string.database_file_name_default) +
+                getString(R.string.database_file_extension_default), "application/x-keepass")
     }
 
     private fun fileNoFoundAction(e: FileNotFoundException) {
@@ -299,26 +241,22 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     }
 
     private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
-        MainCredentialActivity.launch(this,
+        PasswordActivity.launch(this,
                 databaseUri,
                 keyFile,
                 { exception ->
                     fileNoFoundAction(exception)
                 },
                 { onCancelSpecialMode() },
-                { onLaunchActivitySpecialMode() },
-                mAutofillActivityResultLauncher)
+                { onLaunchActivitySpecialMode() })
     }
 
-    private fun launchGroupActivityIfLoaded(database: Database) {
-        if (database.loaded) {
-            GroupActivity.launch(this,
-                database,
+    private fun launchGroupActivity(database: Database) {
+        GroupActivity.launch(this,
+                database.isReadOnly,
                 { onValidateSpecialMode() },
                 { onCancelSpecialMode() },
-                { onLaunchActivitySpecialMode() },
-                mAutofillActivityResultLauncher)
-        }
+                { onLaunchActivitySpecialMode() })
     }
 
     override fun onValidateSpecialMode() {
@@ -341,13 +279,10 @@ 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 -> {
-                if (ExternalFileHelper.allowCreateDocumentByStorageAccessFramework(packageManager)) {
+                if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
                     // There is an activity which can handle this intent.
                     createDatabaseButtonView?.visibility = View.VISIBLE
                 } else{
@@ -361,18 +296,30 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             }
         }
 
-        mDatabase?.let { database ->
-            launchGroupActivityIfLoaded(database)
-        }
-
-        // Show recent files if allowed
-        if (PreferencesUtil.showRecentFiles(this@FileDatabaseSelectActivity)) {
-            databaseFilesViewModel.loadListOfDatabases()
+        val database = Database.getInstance()
+        if (database.loaded) {
+            launchGroupActivity(database)
         } else {
-            mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+            // Construct adapter with listeners
+            if (PreferencesUtil.showRecentFiles(this)) {
+                databaseFilesViewModel.loadListOfDatabases()
+            } else {
+                mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+                mAdapterDatabaseHistory?.notifyDataSetChanged()
+            }
+
+            // Register progress task
+            mProgressDatabaseTaskProvider?.registerProgressTask()
         }
     }
 
+    override fun onPause() {
+        // Unregister progress task
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         // only to keep the current activity
@@ -382,10 +329,15 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
     }
 
     override fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential) {
+
         try {
             mDatabaseFileUri?.let { databaseUri ->
+
                 // Create the new database
-                createDatabase(databaseUri, mainCredential)
+                mProgressDatabaseTaskProvider?.startDatabaseCreate(
+                        databaseUri,
+                        mainCredential
+                )
             }
         } catch (e: Exception) {
             val error = getString(R.string.error_create_database_file)
@@ -396,47 +348,73 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
 
     override fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential) {}
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
+        }
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            if (uri != null) {
+                launchPasswordActivityWithPath(uri)
+            }
+        }
+
+        // Retrieve the created URI from the file manager
+        onCreateDocumentResult(requestCode, resultCode, data) { databaseFileCreatedUri ->
+            mDatabaseFileUri = databaseFileCreatedUri
+            if (mDatabaseFileUri != null) {
+                AssignMasterKeyDialogFragment.getInstance(true)
+                        .show(supportFragmentManager, "passwordDialog")
+            } else {
+                val error = getString(R.string.error_create_database)
+                Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
+                Log.e(TAG, error)
+            }
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
 
         if (mSpecialMode == SpecialMode.DEFAULT) {
-            MenuUtil.defaultMenuInflater(this, menuInflater, menu)
+            MenuUtil.defaultMenuInflater(menuInflater, menu)
         }
 
-        Handler(Looper.getMainLooper()).post {
-            performedNextEducation()
-        }
+        Handler(Looper.getMainLooper()).post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
 
         return true
     }
 
-    private fun performedNextEducation() {
+    private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
         // If no recent files
         val createDatabaseEducationPerformed =
                 createDatabaseButtonView != null
                 && createDatabaseButtonView!!.visibility == View.VISIBLE
-                && mFileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
+                && mAdapterDatabaseHistory != null
+                && mAdapterDatabaseHistory!!.itemCount == 0
+                && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
                         createDatabaseButtonView!!,
                 {
                     createNewFile()
                 },
                 {
                     // But if the user cancel, it can also select a database
-                    performedNextEducation()
+                    performedNextEducation(fileDatabaseSelectActivityEducation)
                 })
         if (!createDatabaseEducationPerformed) {
             // selectDatabaseEducationPerformed
             openDatabaseButtonView != null
-            && mFileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
-                openDatabaseButtonView!!,
-            { tapTargetView ->
-                tapTargetView?.let {
-                    mExternalFileHelper?.openDocument()
-                }
-            },
-            {
-
-            })
+                    && fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
+                    openDatabaseButtonView!!,
+                    {tapTargetView ->
+                        tapTargetView?.let {
+                            mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+                        }
+                    },
+                    {}
+            )
         }
     }
 
@@ -510,13 +488,11 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
          */
 
         @RequiresApi(api = Build.VERSION_CODES.O)
-        fun launchForAutofillResult(activity: AppCompatActivity,
-                                    activityResultLauncher: ActivityResultLauncher<Intent>?,
+        fun launchForAutofillResult(activity: Activity,
                                     autofillComponent: AutofillComponent,
                                     searchInfo: SearchInfo? = null) {
             AutofillHelper.startActivityForAutofillResult(activity,
                     Intent(activity, FileDatabaseSelectActivity::class.java),
-                    activityResultLauncher,
                     autofillComponent,
                     searchInfo)
         }

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

@@ -27,20 +27,16 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.commit
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.IconEditDialogFragment
 import com.kunzisoft.keepass.activities.fragments.IconPickerFragment
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
-import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
@@ -53,7 +49,7 @@ import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
 import kotlinx.coroutines.*
 
 
-class IconPickerActivity : DatabaseLockActivity() {
+class IconPickerActivity : LockingActivity() {
 
     private lateinit var toolbar: Toolbar
     private lateinit var coordinatorLayout: CoordinatorLayout
@@ -68,13 +64,17 @@ class IconPickerActivity : DatabaseLockActivity() {
     private var mCustomIconsSelectionMode = false
     private var mIconsSelected: List<IconImageCustom> = ArrayList()
 
-    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mDatabase: Database? = null
+
+    private var mSelectFileHelper: SelectFileHelper? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_icon_picker)
 
+        mDatabase = Database.getInstance()
+
         toolbar = findViewById(R.id.toolbar)
         toolbar.title = " "
         setSupportActionBar(toolbar)
@@ -84,12 +84,18 @@ class IconPickerActivity : DatabaseLockActivity() {
 
         coordinatorLayout = findViewById(R.id.icon_picker_coordinator)
 
-        mExternalFileHelper = ExternalFileHelper(this)
-        mExternalFileHelper?.buildOpenDocument { uri ->
-            addCustomIcon(uri)
-        }
-
         uploadButton = findViewById(R.id.icon_picker_upload)
+        if (mDatabase?.allowCustomIcons == true) {
+            uploadButton.setOnClickListener {
+                mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+            }
+            uploadButton.setOnLongClickListener {
+                mSelectFileHelper?.selectFileOnClickViewListener?.onLongClick(it)
+                true
+            }
+        } else {
+            uploadButton.visibility = View.GONE
+        }
 
         lockView = findViewById(R.id.lock_button)
         lockView?.setOnClickListener {
@@ -115,6 +121,11 @@ class IconPickerActivity : DatabaseLockActivity() {
             mIconImage = savedInstanceState.getParcelable(EXTRA_ICON) ?: mIconImage
         }
 
+        // Focus view to reinitialize timeout
+        findViewById<ViewGroup>(R.id.icon_picker_container)?.resetAppTimeoutWhenViewFocusedOrChanged(this)
+
+        mSelectFileHelper = SelectFileHelper(this)
+
         iconPickerViewModel.standardIconPicked.observe(this) { iconStandard ->
             mIconImage.standard = iconStandard
             // Remove the custom icon if a standard one is selected
@@ -146,34 +157,6 @@ class IconPickerActivity : DatabaseLockActivity() {
             }
             uploadButton.isEnabled = true
         }
-        iconPickerViewModel.customIconUpdated.observe(this) { iconCustomUpdated ->
-            if (iconCustomUpdated.error && !iconCustomUpdated.errorConsumed) {
-                Snackbar.make(coordinatorLayout, iconCustomUpdated.errorStringId, Snackbar.LENGTH_LONG).asError().show()
-                iconCustomUpdated.errorConsumed = true
-            }
-            iconCustomUpdated.iconCustom?.let {
-                mDatabase?.updateCustomIcon(it)
-            }
-            iconPickerViewModel.deselectAllCustomIcons()
-        }
-    }
-
-    override fun viewToInvalidateTimeout(): View? {
-        return findViewById<ViewGroup>(R.id.icon_picker_container)
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        if (database?.allowCustomIcons == true) {
-            uploadButton.setOpenDocumentClickListener(mExternalFileHelper)
-        } else {
-            uploadButton.visibility = View.GONE
-        }
     }
 
     private fun updateIconsSelectedViews() {
@@ -209,20 +192,11 @@ class IconPickerActivity : DatabaseLockActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         super.onCreateOptionsMenu(menu)
-        menuInflater.inflate(R.menu.icon, menu)
-        return true
-    }
 
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        menu?.findItem(R.id.menu_edit)?.apply {
-            isEnabled = mIconsSelected.size == 1
-            isVisible = isEnabled
+        if (mCustomIconsSelectionMode) {
+            menuInflater.inflate(R.menu.icon, menu)
         }
-        menu?.findItem(R.id.menu_delete)?.apply {
-            isEnabled = mCustomIconsSelectionMode
-            isVisible = isEnabled
-        }
-        return super.onPrepareOptionsMenu(menu)
+        return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -234,17 +208,11 @@ class IconPickerActivity : DatabaseLockActivity() {
                     onBackPressed()
                 }
             }
-            R.id.menu_edit -> {
-                updateCustomIcon(mIconsSelected[0])
-            }
             R.id.menu_delete -> {
                 mIconsSelected.forEach { iconToRemove ->
                     removeCustomIcon(iconToRemove)
                 }
             }
-            R.id.menu_external_icon -> {
-                UriUtil.gotoUrl(this, R.string.external_icon_url)
-            }
         }
 
         return super.onOptionsItemSelected(item)
@@ -301,11 +269,6 @@ class IconPickerActivity : DatabaseLockActivity() {
         }
     }
 
-    private fun updateCustomIcon(iconImageCustom: IconImageCustom) {
-        IconEditDialogFragment.update(iconImageCustom)
-            .show(supportFragmentManager, IconEditDialogFragment.TAG_UPDATE_ICON)
-    }
-
     private fun removeCustomIcon(iconImageCustom: IconImageCustom) {
         uploadButton.isEnabled = false
         iconPickerViewModel.deselectAllCustomIcons()
@@ -315,6 +278,14 @@ class IconPickerActivity : DatabaseLockActivity() {
         )
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            addCustomIcon(uri)
+        }
+    }
+
     private fun setResult() {
         setResult(Activity.RESULT_OK, Intent().apply {
             putExtra(EXTRA_ICON, mIconImage)
@@ -329,28 +300,30 @@ class IconPickerActivity : DatabaseLockActivity() {
     companion object {
 
         private const val ICON_PICKER_FRAGMENT_TAG = "ICON_PICKER_FRAGMENT_TAG"
+
+        private const val ICON_SELECTED_REQUEST = 15861
         private const val EXTRA_ICON = "EXTRA_ICON"
+
         private const val MAX_ICON_SIZE = 5242880
 
-        fun registerIconSelectionForResult(context: FragmentActivity,
-                                           listener: (icon: IconImage) -> Unit): ActivityResultLauncher<Intent> {
-            return context.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == Activity.RESULT_OK) {
-                    listener.invoke(result.data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
+        fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?, listener: (icon: IconImage) -> Unit) {
+            if (requestCode == ICON_SELECTED_REQUEST) {
+                if (resultCode == Activity.RESULT_OK) {
+                    listener.invoke(data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
                 }
             }
         }
 
-        fun launch(context: FragmentActivity,
-                   previousIcon: IconImage?,
-                   resultLauncher: ActivityResultLauncher<Intent>) {
+        fun launch(context: Activity,
+                   previousIcon: IconImage?) {
             // Create an instance to return the picker icon
-            resultLauncher.launch(
-                Intent(context, IconPickerActivity::class.java).apply {
+            context.startActivityForResult(
+                    Intent(context,
+                    IconPickerActivity::class.java).apply {
                         if (previousIcon != null)
                             putExtra(EXTRA_ICON, previousIcon)
-                    }
-            )
+                    },
+                    ICON_SELECTED_REQUEST)
         }
     }
 }

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

@@ -19,7 +19,6 @@
  */
 package com.kunzisoft.keepass.activities
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -32,19 +31,16 @@ import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.igreenwood.loupe.Loupe
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
+import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import kotlin.math.max
 
-class ImageViewerActivity : DatabaseLockActivity() {
+class ImageViewerActivity : LockingActivity() {
 
-    private var imageContainerView: ViewGroup? = null
-    private lateinit var imageView: ImageView
-    private lateinit var progressView: View
+    private var mDatabase: Database? = null
 
-    @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -54,21 +50,49 @@ class ImageViewerActivity : DatabaseLockActivity() {
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
-        toolbar.setOnTouchListener { _, _ ->
-            resetAppTimeout()
-            false
+
+        val imageContainerView: ViewGroup = findViewById(R.id.image_viewer_container)
+        val imageView: ImageView = findViewById(R.id.image_viewer_image)
+        val progressView: View = findViewById(R.id.image_viewer_progress)
+
+        // Approximately, to not OOM and allow a zoom
+        val mImagePreviewMaxWidth = max(
+                resources.displayMetrics.widthPixels * 2,
+                resources.displayMetrics.heightPixels * 2
+        )
+
+        mDatabase = Database.getInstance()
+
+        try {
+            progressView.visibility = View.VISIBLE
+            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
+
+                supportActionBar?.title = attachment.name
+
+                val size = attachment.binaryData.getSize()
+                supportActionBar?.subtitle = Formatter.formatFileSize(this, size)
+
+                mDatabase?.let { database ->
+                    BinaryDatabaseManager.loadBitmap(
+                            database,
+                            attachment.binaryData,
+                            mImagePreviewMaxWidth
+                    ) { bitmapLoaded ->
+                        if (bitmapLoaded == null) {
+                            finish()
+                        } else {
+                            progressView.visibility = View.GONE
+                            imageView.setImageBitmap(bitmapLoaded)
+                        }
+                    }
+                }
+            } ?: finish()
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to view the binary", e)
+            finish()
         }
 
-        imageContainerView = findViewById(R.id.image_viewer_container)
-        imageView = findViewById(R.id.image_viewer_image)
-        progressView = findViewById(R.id.image_viewer_progress)
-
-        Loupe.create(imageView, imageContainerView!!) {
-            onViewTouchedListener = View.OnTouchListener { _, _ ->
-                // to reset timeout when Loupe image view touched
-                resetAppTimeout()
-                false
-            }
+        Loupe.create(imageView, imageContainerView) {
             onViewTranslateListener = object : Loupe.OnViewTranslateListener {
 
                 override fun onStart(view: ImageView) {
@@ -91,54 +115,6 @@ class ImageViewerActivity : DatabaseLockActivity() {
         }
     }
 
-    override fun viewToInvalidateTimeout(): View? {
-        // Null to manually manage events
-        return null
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        try {
-            progressView.visibility = View.VISIBLE
-            intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
-
-                supportActionBar?.title = attachment.name
-
-                val size = attachment.binaryData.getSize()
-                supportActionBar?.subtitle = Formatter.formatFileSize(this, size)
-
-                // Approximately, to not OOM and allow a zoom
-                val mImagePreviewMaxWidth = max(
-                    resources.displayMetrics.widthPixels * 2,
-                    resources.displayMetrics.heightPixels * 2
-                )
-
-                database?.let { database ->
-                    BinaryDatabaseManager.loadBitmap(
-                        database,
-                        attachment.binaryData,
-                        mImagePreviewMaxWidth
-                    ) { bitmapLoaded ->
-                        if (bitmapLoaded == null) {
-                            finish()
-                        } else {
-                            progressView.visibility = View.GONE
-                            imageView.setImageBitmap(bitmapLoaded)
-                        }
-                    }
-                }
-            } ?: finish()
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to view the binary", e)
-            finish()
-        }
-    }
-
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> finish()

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

@@ -19,41 +19,36 @@
  */
 package com.kunzisoft.keepass.activities
 
-import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.search.SearchHelper
 
 /**
  * Activity to select entry in database and populate it in Magikeyboard
  */
-class MagikeyboardLauncherActivity : DatabaseModeActivity() {
+class MagikeyboardLauncherActivity : AppCompatActivity() {
 
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
-
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val database = Database.getInstance()
+        val readOnly = database.isReadOnly
         SearchHelper.checkAutoSearchInfo(this,
-            database,
-            null,
-            { _, _ ->
-                // Not called
-                // if items found directly returns before calling this activity
-            },
-            { openedDatabase ->
-                // Select if not found
-                GroupActivity.launchForKeyboardSelectionResult(this, openedDatabase)
-            },
-            {
-                // Pass extra to get entry
-                FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this)
-            }
+                database,
+                null,
+                {
+                    // Not called
+                    // if items found directly returns before calling this activity
+                },
+                {
+                    // Select if not found
+                    GroupActivity.launchForKeyboardSelectionResult(this, readOnly)
+                },
+                {
+                    // Pass extra to get entry
+                    FileDatabaseSelectActivity.launchForKeyboardSelectionResult(this)
+                }
         )
         finish()
+        super.onCreate(savedInstanceState)
     }
 }

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

@@ -22,6 +22,7 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
+import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
@@ -29,17 +30,18 @@ import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.View
 import android.widget.CompoundButton
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
-import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 
-class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
+class AssignMasterKeyDialogFragment : DialogFragment() {
 
     private var mMasterPassword: String? = null
     private var mKeyFile: Uri? = null
@@ -56,9 +58,9 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
     private var keyFileCheckBox: CompoundButton? = null
     private var keyFileSelectionView: KeyFileSelectionView? = null
 
-    private var mListener: AssignMainCredentialDialogListener? = null
+    private var mListener: AssignPasswordDialogListener? = null
 
-    private var mExternalFileHelper: ExternalFileHelper? = null
+    private var mSelectFileHelper: SelectFileHelper? = null
 
     private var mEmptyPasswordConfirmationDialog: AlertDialog? = null
     private var mNoKeyConfirmationDialog: AlertDialog? = null
@@ -74,7 +76,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
         }
     }
 
-    interface AssignMainCredentialDialogListener {
+    interface AssignPasswordDialogListener {
         fun onAssignKeyDialogPositiveClick(mainCredential: MainCredential)
         fun onAssignKeyDialogNegativeClick(mainCredential: MainCredential)
     }
@@ -82,10 +84,10 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
     override fun onAttach(activity: Context) {
         super.onAttach(activity)
         try {
-            mListener = activity as AssignMainCredentialDialogListener
+            mListener = activity as AssignPasswordDialogListener
         } catch (e: ClassCastException) {
             throw ClassCastException(activity.toString()
-                    + " must implement " + AssignMainCredentialDialogListener::class.java.name)
+                    + " must implement " + AssignPasswordDialogListener::class.java.name)
         }
     }
 
@@ -112,7 +114,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
             val builder = AlertDialog.Builder(activity)
             val inflater = activity.layoutInflater
 
-            rootView = inflater.inflate(R.layout.fragment_set_main_credential, null)
+            rootView = inflater.inflate(R.layout.fragment_set_password, null)
             builder.setView(rootView)
                     // Add action buttons
                     .setPositiveButton(android.R.string.ok) { _, _ -> }
@@ -131,20 +133,11 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
             keyFileCheckBox = rootView?.findViewById(R.id.keyfile_checkox)
             keyFileSelectionView = rootView?.findViewById(R.id.keyfile_selection)
 
-            mExternalFileHelper = ExternalFileHelper(this)
-            mExternalFileHelper?.buildOpenDocument { uri ->
-                uri?.let { pathUri ->
-                    UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
-                        keyFileSelectionView?.error = null
-                        keyFileCheckBox?.isChecked = true
-                        keyFileSelectionView?.uri = pathUri
-                        if (lengthFile <= 0L) {
-                            showEmptyKeyFileConfirmationDialog()
-                        }
-                    }
-                }
+            mSelectFileHelper = SelectFileHelper(this)
+            keyFileSelectionView?.apply {
+                setOnClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
+                setOnLongClickListener(mSelectFileHelper?.selectFileOnClickViewListener)
             }
-            keyFileSelectionView?.setOpenDocumentClickListener(mExternalFileHelper)
 
             val dialog = builder.create()
 
@@ -219,11 +212,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                 passwordRepeatTextInputLayout?.error = getString(R.string.error_pass_match)
             }
 
-            if ((mMasterPassword == null
-                        || mMasterPassword!!.isEmpty())
-                && (keyFileCheckBox == null
-                        || !keyFileCheckBox!!.isChecked
-                        || keyFileSelectionView?.uri == null)) {
+            if (mMasterPassword == null || mMasterPassword!!.isEmpty()) {
                 error = true
                 showEmptyPasswordConfirmationDialog()
             }
@@ -254,7 +243,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
                     .setPositiveButton(android.R.string.ok) { _, _ ->
                         if (!verifyKeyFile()) {
                             mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                            this@SetMainCredentialDialogFragment.dismiss()
+                            this@AssignMasterKeyDialogFragment.dismiss()
                         }
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
@@ -269,7 +258,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
             builder.setMessage(R.string.warning_no_encryption_key)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
                         mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
-                        this@SetMainCredentialDialogFragment.dismiss()
+                        this@AssignMasterKeyDialogFragment.dismiss()
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
             mNoKeyConfirmationDialog = builder.create()
@@ -297,12 +286,29 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
         }
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            uri?.let { pathUri ->
+                UriUtil.getFileData(requireContext(), uri)?.length()?.let { lengthFile ->
+                    keyFileSelectionView?.error = null
+                    keyFileCheckBox?.isChecked = true
+                    keyFileSelectionView?.uri = pathUri
+                    if (lengthFile <= 0L) {
+                        showEmptyKeyFileConfirmationDialog()
+                    }
+                }
+            }
+        }
+    }
+
     companion object {
 
         private const val ALLOW_NO_MASTER_KEY_ARG = "ALLOW_NO_MASTER_KEY_ARG"
 
-        fun getInstance(allowNoMasterKey: Boolean): SetMainCredentialDialogFragment {
-            val fragment = SetMainCredentialDialogFragment()
+        fun getInstance(allowNoMasterKey: Boolean): AssignMasterKeyDialogFragment {
+            val fragment = AssignMasterKeyDialogFragment()
             val args = Bundle()
             args.putBoolean(ALLOW_NO_MASTER_KEY_ARG, allowNoMasterKey)
             fragment.arguments = args

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

@@ -1,95 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.graphics.Color
-import android.os.Bundle
-import android.widget.CompoundButton
-import androidx.annotation.ColorInt
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
-import com.kunzisoft.androidclearchroma.view.ChromaColorView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel
-
-class ColorPickerDialogFragment : DatabaseDialogFragment() {
-
-    private val mColorPickerViewModel: ColorPickerViewModel by activityViewModels()
-
-    private lateinit var enableSwitchView: CompoundButton
-    private lateinit var chromaColorView: ChromaColorView
-
-    private var mDefaultColor = Color.WHITE
-    private var mActivated = false
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_color_picker, null)
-            enableSwitchView = root.findViewById(R.id.switch_element)
-            chromaColorView = root.findViewById(R.id.chroma_color_view)
-
-            if (savedInstanceState != null) {
-                if (savedInstanceState.containsKey(ARG_INITIAL_COLOR)) {
-                    mDefaultColor = savedInstanceState.getInt(ARG_INITIAL_COLOR)
-                }
-                if (savedInstanceState.containsKey(ARG_ACTIVATED)) {
-                    mActivated = savedInstanceState.getBoolean(ARG_ACTIVATED)
-                }
-            } else {
-                arguments?.apply {
-                    if (containsKey(ARG_INITIAL_COLOR)) {
-                        mDefaultColor = getInt(ARG_INITIAL_COLOR)
-                    }
-                    if (containsKey(ARG_ACTIVATED)) {
-                        mActivated = getBoolean(ARG_ACTIVATED)
-                    }
-                }
-            }
-            enableSwitchView.isChecked = mActivated
-            chromaColorView.currentColor = mDefaultColor
-
-            chromaColorView.setOnColorChangedListener {
-                if (!enableSwitchView.isChecked)
-                    enableSwitchView.isChecked = true
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    val color: Int? = if (enableSwitchView.isChecked)
-                        chromaColorView.currentColor
-                    else
-                        null
-                    mColorPickerViewModel.pickColor(color)
-                }
-                .setNegativeButton(android.R.string.cancel) { _, _ ->
-                    // Do nothing
-                }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putInt(ARG_INITIAL_COLOR, chromaColorView.currentColor)
-        outState.putBoolean(ARG_ACTIVATED, mActivated)
-    }
-
-    companion object {
-        private const val ARG_INITIAL_COLOR = "ARG_INITIAL_COLOR"
-        private const val ARG_ACTIVATED = "ARG_ACTIVATED"
-
-        fun newInstance(
-            @ColorInt initialColor: Int?,
-        ): ColorPickerDialogFragment {
-            return ColorPickerDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putInt(ARG_INITIAL_COLOR, initialColor ?: Color.WHITE)
-                    putBoolean(ARG_ACTIVATED, initialColor != null)
-                }
-            }
-        }
-    }
-}

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

@@ -23,11 +23,12 @@ import android.app.Dialog
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 
 
-class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
+class DatabaseChangedDialogFragment : DialogFragment() {
 
     var actionDatabaseListener: ActionDatabaseChangedListener? = null
 

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

@@ -1,72 +0,0 @@
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
-import com.kunzisoft.keepass.activities.legacy.DatabaseRetrieval
-import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrFocused
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
-
-abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {
-
-    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    private var mDatabase: Database? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        mDatabaseViewModel.database.observe(this) { database ->
-            this.mDatabase = database
-            resetAppTimeoutOnTouchOrFocus()
-            onDatabaseRetrieved(database)
-        }
-
-        mDatabaseViewModel.actionFinished.observe(this) { result ->
-            onDatabaseActionFinished(result.database, result.actionTask, result.result)
-        }
-    }
-
-    @Suppress("DEPRECATION")
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-
-        resetAppTimeoutOnTouchOrFocus()
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        // Can be overridden by a subclass
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        // Can be overridden by a subclass
-    }
-
-    fun resetAppTimeout() {
-        context?.let {
-            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(it,
-                mDatabase?.loaded ?: false)
-        }
-    }
-
-    open fun overrideTimeoutTouchAndFocusEvents(): Boolean {
-        return false
-    }
-
-    private fun resetAppTimeoutOnTouchOrFocus() {
-        if (!overrideTimeoutTouchAndFocusEvents()) {
-            context?.let {
-                dialog?.window?.decorView?.resetAppTimeoutWhenViewTouchedOrFocused(
-                    it,
-                    mDatabase?.loaded
-                )
-            }
-        }
-    }
-}

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 
-// Not as DatabaseDialogFragment because crash on KitKat
 class DatePickerFragment : DialogFragment() {
 
     private var mDefaultYear: Int = 2000

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

@@ -20,38 +20,61 @@
 package com.kunzisoft.keepass.activities.dialogs
 
 import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.viewmodels.NodesViewModel
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
 
-class DeleteNodesDialogFragment : DatabaseDialogFragment() {
+open class DeleteNodesDialogFragment : DialogFragment() {
 
-    private var mNodesToDelete: List<Node> = listOf()
-    private val mNodesViewModel: NodesViewModel by activityViewModels()
+    private var mNodesToDelete: List<Node> = ArrayList()
+    private var mListener: DeleteNodeListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as DeleteNodeListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + DeleteNodeListener::class.java.name)
+        }
+    }
+
+    override fun onDetach() {
+        mListener = null
+        super.onDetach()
+    }
+
+    protected open fun retrieveMessage(): String {
+        return getString(R.string.warning_permanently_delete_nodes)
+    }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        mNodesViewModel.nodesToDelete.observe(this) { nodes ->
-            this.mNodesToDelete = nodes
-        }
-        var recycleBin = false
+
         arguments?.apply {
-            if (containsKey(RECYCLE_BIN_TAG)) {
-                recycleBin = this.getBoolean(RECYCLE_BIN_TAG)
+            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
+                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
+                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), this)
+            }
+        } ?: savedInstanceState?.apply {
+            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
+                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
+                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), savedInstanceState)
             }
         }
         activity?.let { activity ->
             // Use the Builder class for convenient dialog construction
             val builder = AlertDialog.Builder(activity)
 
-            builder.setMessage(if (recycleBin)
-                getString(R.string.warning_empty_recycle_bin)
-            else
-                getString(R.string.warning_permanently_delete_nodes))
+            builder.setMessage(retrieveMessage())
             builder.setPositiveButton(android.R.string.ok) { _, _ ->
-                mNodesViewModel.permanentlyDeleteNodes(mNodesToDelete)
+                mListener?.permanentlyDeleteNodes(mNodesToDelete)
             }
             builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
             // Create the AlertDialog object and return it
@@ -60,14 +83,19 @@ class DeleteNodesDialogFragment : DatabaseDialogFragment() {
         return super.onCreateDialog(savedInstanceState)
     }
 
-    companion object {
-        private const val RECYCLE_BIN_TAG = "RECYCLE_BIN_TAG"
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putAll(getBundleFromListNodes(mNodesToDelete))
+    }
 
-        fun getInstance(recycleBin: Boolean): DeleteNodesDialogFragment {
+    interface DeleteNodeListener {
+        fun permanentlyDeleteNodes(nodes: List<Node>)
+    }
+
+    companion object {
+        fun getInstance(nodesToDelete: List<Node>): DeleteNodesDialogFragment {
             return DeleteNodesDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putBoolean(RECYCLE_BIN_TAG, recycleBin)
-                }
+                arguments = getBundleFromListNodes(nodesToDelete)
             }
         }
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Jeremy Jamet / Kunzisoft.
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
  *
  * This file is part of KeePassDX.
  *
@@ -17,22 +17,23 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.model
+package com.kunzisoft.keepass.activities.dialogs
 
-enum class CredentialStorage {
-    PASSWORD, KEY_FILE, HARDWARE_KEY;
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+
+class EmptyRecycleBinDialogFragment : DeleteNodesDialogFragment() {
+
+    override fun retrieveMessage(): String {
+        return getString(R.string.warning_empty_recycle_bin)
+    }
 
     companion object {
-        fun getFromOrdinal(ordinal: Int): CredentialStorage {
-            return when (ordinal) {
-                0 -> PASSWORD
-                1 -> KEY_FILE
-                2 -> HARDWARE_KEY
-                else -> DEFAULT
+        fun getInstance(nodesToDelete: List<Node>): EmptyRecycleBinDialogFragment {
+            return EmptyRecycleBinDialogFragment().apply {
+                arguments = getBundleFromListNodes(nodesToDelete)
             }
         }
-
-        val DEFAULT: CredentialStorage
-            get() = PASSWORD
     }
-}
+}

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

@@ -31,13 +31,14 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.security.ProtectedString
+import com.kunzisoft.keepass.model.Field
 
 
-class EntryCustomFieldDialogFragment: DatabaseDialogFragment() {
+class EntryCustomFieldDialogFragment: DialogFragment() {
 
     private var oldField: Field? = null
 

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

@@ -22,18 +22,18 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.widget.*
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.password.PasswordGenerator
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.view.applyFontVisibility
 
-class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
+class GeneratePasswordDialogFragment : DialogFragment() {
 
     private var mListener: GeneratePasswordListener? = null
 
@@ -42,8 +42,6 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
     private var passwordInputLayoutView: TextInputLayout? = null
     private var passwordView: EditText? = null
 
-    private var mPasswordField: Field? = null
-
     private var uppercaseBox: CompoundButton? = null
     private var lowercaseBox: CompoundButton? = null
     private var digitsBox: CompoundButton? = null
@@ -79,7 +77,7 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
             passwordView = root?.findViewById(R.id.password)
             passwordView?.applyFontVisibility()
             val passwordCopyView: ImageView? = root?.findViewById(R.id.password_copy_button)
-            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyProtectedFields(activity))
+            passwordCopyView?.visibility = if(PreferencesUtil.allowCopyPasswordAndProtectedFields(activity))
                 View.VISIBLE else View.GONE
             val clipboardHelper = ClipboardHelper(activity)
             passwordCopyView?.setOnClickListener {
@@ -100,8 +98,6 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
             bracketsBox = root?.findViewById(R.id.cb_brackets)
             extendedBox = root?.findViewById(R.id.cb_extended)
 
-            mPasswordField = arguments?.getParcelable(KEY_PASSWORD_FIELD)
-
             assignDefaultCharacters()
 
             val seekBar = root?.findViewById<SeekBar>(R.id.seekbar_length)
@@ -124,18 +120,16 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
 
             builder.setView(root)
                     .setPositiveButton(R.string.accept) { _, _ ->
-                        mPasswordField?.let { passwordField ->
-                            passwordView?.text?.toString()?.let { passwordValue ->
-                                passwordField.protectedValue.stringValue = passwordValue
-                            }
-                            mListener?.acceptPassword(passwordField)
-                        }
+                        val bundle = Bundle()
+                        bundle.putString(KEY_PASSWORD_ID, passwordView!!.text.toString())
+                        mListener?.acceptPassword(bundle)
+
                         dismiss()
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        mPasswordField?.let { passwordField ->
-                            mListener?.cancelPassword(passwordField)
-                        }
+                        val bundle = Bundle()
+                        mListener?.cancelPassword(bundle)
+
                         dismiss()
                     }
 
@@ -206,19 +200,11 @@ class GeneratePasswordDialogFragment : DatabaseDialogFragment() {
     }
 
     interface GeneratePasswordListener {
-        fun acceptPassword(passwordField: Field)
-        fun cancelPassword(passwordField: Field)
+        fun acceptPassword(bundle: Bundle)
+        fun cancelPassword(bundle: Bundle)
     }
 
     companion object {
-        private const val KEY_PASSWORD_FIELD = "KEY_PASSWORD_FIELD"
-
-        fun getInstance(field: Field): GeneratePasswordDialogFragment {
-            return GeneratePasswordDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putParcelable(KEY_PASSWORD_FIELD, field)
-                }
-            }
-        }
+        const val KEY_PASSWORD_ID = "KEY_PASSWORD_ID"
     }
 }

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

@@ -1,204 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.adapters.TagsAdapter
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.utils.UuidUtil
-import com.kunzisoft.keepass.view.DateTimeFieldView
-
-class GroupDialogFragment : DatabaseDialogFragment() {
-
-    private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null
-    private var mGroupInfo = GroupInfo()
-
-    private lateinit var iconView: ImageView
-    private var mIconColor: Int = 0
-    private lateinit var nameTextView: TextView
-    private lateinit var tagsListView: RecyclerView
-    private var tagsAdapter: TagsAdapter? = null
-    private lateinit var notesTextLabelView: TextView
-    private lateinit var notesTextView: TextView
-    private lateinit var expirationView: DateTimeFieldView
-    private lateinit var creationView: TextView
-    private lateinit var modificationView: TextView
-    private lateinit var searchableLabelView: TextView
-    private lateinit var searchableView: TextView
-    private lateinit var autoTypeLabelView: TextView
-    private lateinit var autoTypeView: TextView
-    private lateinit var uuidContainerView: ViewGroup
-    private lateinit var uuidReferenceView: TextView
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-        mPopulateIconMethod = { imageView, icon ->
-            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 {
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_group, null)
-            iconView = root.findViewById(R.id.group_icon)
-            nameTextView = root.findViewById(R.id.group_name)
-            tagsListView = root.findViewById(R.id.group_tags_list_view)
-            notesTextLabelView = root.findViewById(R.id.group_note_label)
-            notesTextView = root.findViewById(R.id.group_note)
-            expirationView = root.findViewById(R.id.group_expiration)
-            creationView = root.findViewById(R.id.group_created)
-            modificationView = root.findViewById(R.id.group_modified)
-            searchableLabelView = root.findViewById(R.id.group_searchable_label)
-            searchableView = root.findViewById(R.id.group_searchable)
-            autoTypeLabelView = root.findViewById(R.id.group_auto_type_label)
-            autoTypeView = root.findViewById(R.id.group_auto_type)
-            uuidContainerView = root.findViewById(R.id.group_UUID_container)
-            uuidReferenceView = root.findViewById(R.id.group_UUID_reference)
-
-            // Retrieve the textColor to tint the icon
-            val ta = activity.theme.obtainStyledAttributes(intArrayOf(R.attr.colorAccent))
-            mIconColor = ta.getColor(0, Color.WHITE)
-            ta.recycle()
-
-            if (savedInstanceState != null
-                    && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
-                mGroupInfo = savedInstanceState.getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
-            } else {
-                arguments?.apply {
-                    if (containsKey(KEY_GROUP_INFO)) {
-                        mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
-                    }
-                }
-            }
-
-            // populate info in views
-            val title = mGroupInfo.title
-            if (title.isEmpty()) {
-                nameTextView.visibility = View.GONE
-            } else {
-                nameTextView.text = title
-                nameTextView.visibility = View.VISIBLE
-            }
-            tagsAdapter = TagsAdapter(activity)
-            tagsListView.apply {
-                layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-                adapter = tagsAdapter
-            }
-            val tags = mGroupInfo.tags
-            tagsListView.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
-            tagsAdapter?.setTags(tags)
-            val notes = mGroupInfo.notes
-            if (notes == null || notes.isEmpty()) {
-                notesTextLabelView.visibility = View.GONE
-                notesTextView.visibility = View.GONE
-            } else {
-                notesTextView.text = notes
-                notesTextLabelView.visibility = View.VISIBLE
-                notesTextView.visibility = View.VISIBLE
-            }
-            expirationView.activation = mGroupInfo.expires
-            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
-            } else {
-                uuidReferenceView.text = uuid
-                uuidContainerView.apply {
-                    visibility = if (PreferencesUtil.showUUID(context)) View.VISIBLE else View.GONE
-                }
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                    .setPositiveButton(android.R.string.ok){ _, _ ->
-                        // Do nothing
-                    }
-            return builder.create()
-        }
-        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)
-    }
-
-    data class Error(val isError: Boolean, val messageId: Int?)
-
-    companion object {
-        const val TAG_SHOW_GROUP = "TAG_SHOW_GROUP"
-        private const val KEY_GROUP_INFO = "KEY_GROUP_INFO"
-
-        fun launch(groupInfo: GroupInfo): GroupDialogFragment {
-            val bundle = Bundle()
-            bundle.putParcelable(KEY_GROUP_INFO, groupInfo)
-            val fragment = GroupDialogFragment()
-            fragment.arguments = bundle
-            return fragment
-        }
-    }
-}

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

@@ -20,52 +20,43 @@
 package com.kunzisoft.keepass.activities.dialogs
 
 import android.app.Dialog
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import android.widget.*
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.*
-import com.kunzisoft.keepass.adapters.TagsProposalAdapter
+import com.kunzisoft.keepass.activities.IconPickerActivity
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
+import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.view.DateTimeEditFieldView
-import com.kunzisoft.keepass.view.InheritedCompletionView
-import com.kunzisoft.keepass.view.TagsCompletionView
-import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
-import com.tokenautocomplete.FilteredArrayAdapter
+import com.kunzisoft.keepass.view.ExpirationView
 import org.joda.time.DateTime
 
-class GroupEditDialogFragment : DatabaseDialogFragment() {
+class GroupEditDialogFragment : DialogFragment() {
 
-    private val mGroupEditViewModel: GroupEditViewModel by activityViewModels()
+    private var mDatabase: Database? = null
 
-    private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null
-    private var mEditGroupDialogAction = NONE
+    private var mEditGroupListener: EditGroupListener? = null
+
+    private var mEditGroupDialogAction = EditGroupDialogAction.NONE
     private var mGroupInfo = GroupInfo()
-    private var mGroupNamesNotAllowed: List<String>? = null
 
     private lateinit var iconButtonView: ImageView
-    private var mIconColor: Int = 0
+    private var iconColor: Int = 0
     private lateinit var nameTextLayoutView: TextInputLayout
     private lateinit var nameTextView: TextView
     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
+    private lateinit var expirationView: ExpirationView
 
     enum class EditGroupDialogAction {
         CREATION, UPDATE, NONE;
@@ -77,71 +68,22 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        mGroupEditViewModel.onIconSelected.observe(this) { iconImage ->
-            mGroupInfo.icon = iconImage
-            mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
-        }
-
-        mGroupEditViewModel.onDateSelected.observe(this) { viewModelDate ->
-            // Save the date
-            mGroupInfo.expiryTime = DateInstant(
-                DateTime(mGroupInfo.expiryTime.date)
-                    .withYear(viewModelDate.year)
-                    .withMonthOfYear(viewModelDate.month + 1)
-                    .withDayOfMonth(viewModelDate.day)
-                    .toDate())
-            expirationView.dateTime = mGroupInfo.expiryTime
-            if (expirationView.dateTime.type == DateInstant.Type.DATE_TIME) {
-                val instantTime = DateInstant(mGroupInfo.expiryTime.date, DateInstant.Type.TIME)
-                // Trick to recall selection with time
-                mGroupEditViewModel.requestDateTimeSelection(instantTime)
-            }
-        }
-
-        mGroupEditViewModel.onTimeSelected.observe(this) { viewModelTime ->
-            // Save the time
-            mGroupInfo.expiryTime = DateInstant(
-                DateTime(mGroupInfo.expiryTime.date)
-                    .withHourOfDay(viewModelTime.hours)
-                    .withMinuteOfHour(viewModelTime.minutes)
-                    .toDate(), mGroupInfo.expiryTime.type)
-            expirationView.dateTime = mGroupInfo.expiryTime
-        }
-
-        mGroupEditViewModel.groupNamesNotAllowed.observe(this) { namesNotAllowed ->
-            this.mGroupNamesNotAllowed = namesNotAllowed
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        // Verify that the host activity implements the callback interface
+        try {
+            // Instantiate the NoticeDialogListener so we can send events to the host
+            mEditGroupListener = context as EditGroupListener
+        } catch (e: ClassCastException) {
+            // The activity doesn't implement the interface, throw exception
+            throw ClassCastException(context.toString()
+                    + " must implement " + GroupEditDialogFragment::class.java.name)
         }
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        mPopulateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
-        }
-        mPopulateIconMethod?.invoke(iconButtonView, mGroupInfo.icon)
-
-        searchableContainerView.visibility = if (database?.allowCustomSearchableGroup() == true) {
-            View.VISIBLE
-        } else {
-            View.GONE
-        }
-
-        if (database?.allowAutoType() == true) {
-            autoTypeContainerView.visibility = View.VISIBLE
-        } else {
-            autoTypeContainerView.visibility = View.GONE
-        }
-
-        tagsAdapter = TagsProposalAdapter(requireContext(), database?.tagPool)
-        tagsCompletionView.apply {
-            threshold = 1
-            setAdapter(tagsAdapter)
-        }
-        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
+    override fun onDetach() {
+        mEditGroupListener = null
+        super.onDetach()
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -153,19 +95,15 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
             notesTextLayoutView = root.findViewById(R.id.group_edit_note_container)
             notesTextView = root.findViewById(R.id.group_edit_note)
             expirationView = root.findViewById(R.id.group_edit_expiration)
-            searchableContainerView = root.findViewById(R.id.group_edit_searchable_container)
-            searchableView = root.findViewById(R.id.group_edit_searchable)
-            autoTypeContainerView = root.findViewById(R.id.group_edit_auto_type_container)
-            autoTypeInheritedView = root.findViewById(R.id.group_edit_auto_type_inherited)
-            autoTypeSequenceView = root.findViewById(R.id.group_edit_auto_type_sequence)
-            tagsContainerView = root.findViewById(R.id.group_tags_label)
-            tagsCompletionView = root.findViewById(R.id.group_tags_completion_view)
 
             // Retrieve the textColor to tint the icon
             val ta = activity.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-            mIconColor = ta.getColor(0, Color.WHITE)
+            iconColor = ta.getColor(0, Color.WHITE)
             ta.recycle()
 
+            // Init elements
+            mDatabase = Database.getInstance()
+
             if (savedInstanceState != null
                     && savedInstanceState.containsKey(KEY_ACTION_ID)
                     && savedInstanceState.containsKey(KEY_GROUP_INFO)) {
@@ -182,22 +120,32 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
             }
 
             // populate info in views
-            populateInfoToViews(mGroupInfo)
-
-            iconButtonView.setOnClickListener { _ ->
-                mGroupEditViewModel.requestIconSelection(mGroupInfo.icon)
-            }
-            expirationView.setOnDateClickListener = { dateInstant ->
-                mGroupEditViewModel.requestDateTimeSelection(dateInstant)
+            populateInfoToViews()
+            expirationView.setOnDateClickListener = {
+                expirationView.expiryTime.date.let { expiresDate ->
+                    val dateTime = DateTime(expiresDate)
+                    val defaultYear = dateTime.year
+                    val defaultMonth = dateTime.monthOfYear-1
+                    val defaultDay = dateTime.dayOfMonth
+                    DatePickerFragment.getInstance(defaultYear, defaultMonth, defaultDay)
+                            .show(parentFragmentManager, "DatePickerFragment")
+                }
             }
 
             val builder = AlertDialog.Builder(activity)
             builder.setView(root)
                     .setPositiveButton(android.R.string.ok, null)
                     .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        // Do nothing
+                        retrieveGroupInfoFromViews()
+                        mEditGroupListener?.cancelEditGroup(
+                                mEditGroupDialogAction,
+                                mGroupInfo)
                     }
 
+            iconButtonView.setOnClickListener { _ ->
+                IconPickerActivity.launch(activity, mGroupInfo.icon)
+            }
+
             return builder.create()
         }
         return super.onCreateDialog(savedInstanceState)
@@ -207,47 +155,40 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         super.onResume()
 
         // To prevent auto dismiss
-        val alertDialog = dialog as AlertDialog?
-        if (alertDialog != null) {
-            val positiveButton = alertDialog.getButton(Dialog.BUTTON_POSITIVE) as Button
+        val d = dialog as AlertDialog?
+        if (d != null) {
+            val positiveButton = d.getButton(Dialog.BUTTON_POSITIVE) as Button
             positiveButton.setOnClickListener {
                 retrieveGroupInfoFromViews()
                 if (isValid()) {
-                    when (mEditGroupDialogAction) {
-                        CREATION ->
-                            mGroupEditViewModel.approveGroupCreation(mGroupInfo)
-                        UPDATE ->
-                            mGroupEditViewModel.approveGroupUpdate(mGroupInfo)
-                        NONE -> {}
-                    }
-                    alertDialog.dismiss()
+                    mEditGroupListener?.approveEditGroup(
+                            mEditGroupDialogAction,
+                            mGroupInfo)
+                    d.dismiss()
                 }
             }
         }
     }
 
-    private fun populateInfoToViews(groupInfo: GroupInfo) {
-        mGroupEditViewModel.selectIcon(groupInfo.icon)
-        nameTextView.text = groupInfo.title
-        notesTextLayoutView.visibility = if (groupInfo.notes == null) View.GONE else View.VISIBLE
-        groupInfo.notes?.let {
+    fun getExpiryTime(): DateInstant {
+        retrieveGroupInfoFromViews()
+        return mGroupInfo.expiryTime
+    }
+
+    fun setExpiryTime(expiryTime: DateInstant) {
+        mGroupInfo.expiryTime = expiryTime
+        populateInfoToViews()
+    }
+
+    private fun populateInfoToViews() {
+        assignIconView()
+        nameTextView.text = mGroupInfo.title
+        notesTextLayoutView.visibility = if (mGroupInfo.notes == null) View.GONE else View.VISIBLE
+        mGroupInfo.notes?.let {
             notesTextView.text = it
         }
-        expirationView.activation = groupInfo.expires
-        expirationView.dateTime = groupInfo.expiryTime
-
-        // Set searchable
-        searchableView.setValue(groupInfo.searchable)
-        // Set auto-type
-        autoTypeInheritedView.setValue(groupInfo.enableAutoType)
-        autoTypeSequenceView.text = groupInfo.defaultAutoTypeSequence
-        // Set Tags
-        groupInfo.tags.let { tags ->
-            tagsCompletionView.setText("")
-            for (i in 0 until tags.size()) {
-                tagsCompletionView.addObjectSync(tags.get(i))
-            }
-        }
+        expirationView.expires = mGroupInfo.expires
+        expirationView.expiryTime = mGroupInfo.expiryTime
     }
 
     private fun retrieveGroupInfoFromViews() {
@@ -257,12 +198,17 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
         if (newNotes.isNotEmpty()) {
             mGroupInfo.notes = newNotes
         }
-        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()
+        mGroupInfo.expires = expirationView.expires
+        mGroupInfo.expiryTime = expirationView.expiryTime
+    }
+
+    private fun assignIconView() {
+        mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconButtonView, mGroupInfo.icon, iconColor)
+    }
+
+    fun setIcon(icon: IconImage) {
+        mGroupInfo.icon = icon
+        assignIconView()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -273,36 +219,25 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
     }
 
     private fun isValid(): Boolean {
-        val name = nameTextView.text.toString()
-        val error = when {
-            name.isEmpty() -> {
-                Error(true, R.string.error_no_name)
-            }
-            mGroupNamesNotAllowed == null -> {
-                Error(true, R.string.error_word_reserved)
-            }
-            mGroupNamesNotAllowed?.find { it.equals(name, ignoreCase = true) } != null -> {
-                Error(true, R.string.error_word_reserved)
-            }
-            else -> {
-                Error(false, null)
-            }
+        if (nameTextView.text.toString().isEmpty()) {
+            nameTextLayoutView.error = getString(R.string.error_no_name)
+            return false
         }
-        error.messageId?.let { messageId ->
-            nameTextLayoutView.error = getString(messageId)
-        } ?: kotlin.run {
-            nameTextLayoutView.error = null
-        }
-        return !error.isError
+        return true
     }
 
-    data class Error(val isError: Boolean, val messageId: Int?)
+    interface EditGroupListener {
+        fun approveEditGroup(action: EditGroupDialogAction,
+                             groupInfo: GroupInfo)
+        fun cancelEditGroup(action: EditGroupDialogAction,
+                            groupInfo: GroupInfo)
+    }
 
     companion object {
 
         const val TAG_CREATE_GROUP = "TAG_CREATE_GROUP"
-        private const val KEY_ACTION_ID = "KEY_ACTION_ID"
-        private const val KEY_GROUP_INFO = "KEY_GROUP_INFO"
+        const val KEY_ACTION_ID = "KEY_ACTION_ID"
+        const val KEY_GROUP_INFO = "KEY_GROUP_INFO"
 
         fun create(groupInfo: GroupInfo): GroupEditDialogFragment {
             val bundle = Bundle()

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

@@ -1,126 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.activityViewModels
-import com.google.android.material.textfield.TextInputLayout
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
-
-class IconEditDialogFragment : DatabaseDialogFragment() {
-
-    private val mIconPickerViewModel: IconPickerViewModel by activityViewModels()
-
-    private var mPopulateIconMethod: ((ImageView, IconImage) -> Unit)? = null
-    private lateinit var iconView: ImageView
-    private lateinit var nameTextLayoutView: TextInputLayout
-    private lateinit var nameTextView: TextView
-
-    private var mCustomIcon: IconImageCustom? = null
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-        mPopulateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon)
-        }
-        mCustomIcon?.let { customIcon ->
-            populateViewsWithCustomIcon(customIcon)
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val root = activity.layoutInflater.inflate(R.layout.fragment_icon_edit, null)
-            iconView = root.findViewById(R.id.icon_edit_image)
-            nameTextLayoutView = root.findViewById(R.id.icon_edit_name_container)
-            nameTextView = root.findViewById(R.id.icon_edit_name)
-
-            if (savedInstanceState != null
-                    && savedInstanceState.containsKey(KEY_CUSTOM_ICON_ID)) {
-                mCustomIcon = savedInstanceState.getParcelable(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
-            } else {
-                arguments?.apply {
-                    if (containsKey(KEY_CUSTOM_ICON_ID)) {
-                        mCustomIcon = getParcelable(KEY_CUSTOM_ICON_ID) ?: mCustomIcon
-                    }
-                }
-            }
-
-            val builder = AlertDialog.Builder(activity)
-            builder.setView(root)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        retrieveIconInfoFromViews()
-                        mCustomIcon?.let { customIcon ->
-                            mIconPickerViewModel.updateCustomIcon(
-                                IconPickerViewModel.IconCustomState(customIcon, false)
-                            )
-                        }
-                    }
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        // Do nothing
-                        mIconPickerViewModel.updateCustomIcon(
-                            IconPickerViewModel.IconCustomState(null, false)
-                        )
-                    }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    private fun populateViewsWithCustomIcon(customIcon: IconImageCustom) {
-        mPopulateIconMethod?.invoke(iconView, customIcon.getIconImageToDraw())
-        nameTextView.text = customIcon.name
-    }
-
-    private fun retrieveIconInfoFromViews() {
-        mCustomIcon?.name = nameTextView.text.toString()
-        mCustomIcon?.lastModificationTime = DateInstant()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        retrieveIconInfoFromViews()
-        outState.putParcelable(KEY_CUSTOM_ICON_ID, mCustomIcon)
-        super.onSaveInstanceState(outState)
-    }
-
-    companion object {
-
-        const val TAG_UPDATE_ICON = "TAG_UPDATE_ICON"
-        const val KEY_CUSTOM_ICON_ID = "KEY_CUSTOM_ICON_ID"
-
-        fun update(customIcon: IconImageCustom): IconEditDialogFragment {
-            val bundle = Bundle()
-            bundle.putParcelable(KEY_CUSTOM_ICON_ID, IconImageCustom(customIcon))
-            val fragment = IconEditDialogFragment()
-            fragment.arguments = bundle
-            return fragment
-        }
-    }
-}

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

@@ -1,126 +0,0 @@
-/*
- * 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/PasswordEncodingDialogFragment.kt

@@ -19,11 +19,11 @@
  */
 package com.kunzisoft.keepass.activities.dialogs
 
+import android.app.AlertDialog
 import android.app.Dialog
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.MainCredential

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

@@ -25,13 +25,14 @@ import android.net.Uri
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Attachment
 
 /**
  * Custom Dialog to confirm big file to upload
  */
-class ReplaceFileDialogFragment : DatabaseDialogFragment() {
+class ReplaceFileDialogFragment : DialogFragment() {
 
     private var mActionChooseListener: ActionChooseListener? = null
 

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

@@ -31,6 +31,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
@@ -48,7 +49,7 @@ import com.kunzisoft.keepass.otp.TokenCalculator
 import com.kunzisoft.keepass.utils.UriUtil
 import java.util.*
 
-class SetOTPDialogFragment : DatabaseDialogFragment() {
+class SetOTPDialogFragment : DialogFragment() {
 
     private var mCreateOTPElementListener: CreateOtpListener? = null
 
@@ -79,15 +80,11 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
     private var mOnFocusChangeListener = View.OnFocusChangeListener { _, isFocus ->
         if (!isFocus)
             mManualEvent = true
-        else
-            resetAppTimeout()
     }
-    @SuppressLint("ClickableViewAccessibility")
     private var mOnTouchListener = View.OnTouchListener { _, event ->
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
                 mManualEvent = true
-                resetAppTimeout()
             }
         }
         false
@@ -98,10 +95,6 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
     private var mPeriodWellFormed = false
     private var mDigitsWellFormed = false
 
-    override fun overrideTimeoutTouchAndFocusEvents(): Boolean {
-        return true
-    }
-
     override fun onAttach(context: Context) {
         super.onAttach(context)
         // Verify that the host activity implements the callback interface
@@ -204,10 +197,9 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
                     android.R.layout.simple_spinner_item, mHotpTokenTypeArray!!).apply {
                 setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
             }
-            // Proprietary only on full version
+            // Proprietary only on closed and full version
             mTotpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
-                UriUtil.contributingUser(activity)
-            )
+                    BuildConfig.CLOSED_STORE && BuildConfig.FULL_VERSION)
             totpTokenTypeAdapter = ArrayAdapter(activity,
                     android.R.layout.simple_spinner_item, mTotpTokenTypeArray!!).apply {
                 setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -233,11 +225,8 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
             val builder = AlertDialog.Builder(activity)
             builder.apply {
                 setView(root)
-                        .setPositiveButton(android.R.string.ok) { _, _ ->
-                            resetAppTimeout()
-                        }
+                        .setPositiveButton(android.R.string.ok) {_, _ -> }
                         .setNegativeButton(android.R.string.cancel) { _, _ ->
-                            resetAppTimeout()
                         }
             }
 
@@ -310,7 +299,7 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
             override fun afterTextChanged(s: Editable?) {
                 s?.toString()?.let { userString ->
                     try {
-                        mOtpElement.setBase32Secret(userString.uppercase(Locale.ENGLISH))
+                        mOtpElement.setBase32Secret(userString.toUpperCase(Locale.ENGLISH))
                         otpSecretContainer?.error = null
                     } catch (exception: Exception) {
                         otpSecretContainer?.error = getString(R.string.error_otp_secret_key)

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

@@ -22,15 +22,16 @@ package com.kunzisoft.keepass.activities.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import androidx.annotation.IdRes
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.widget.CompoundButton
 import android.widget.RadioGroup
-import androidx.annotation.IdRes
-import androidx.appcompat.app.AlertDialog
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.SortNodeEnum
 
-class SortDialogFragment : DatabaseDialogFragment() {
+class SortDialogFragment : DialogFragment() {
 
     private var mListener: SortSelectionListener? = null
 

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

@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.text.format.DateFormat
 import androidx.fragment.app.DialogFragment
 
-// Not as DatabaseDialogFragment because crash on KitKat
 class TimePickerFragment : DialogFragment() {
 
     private var defaultHour: Int = 0

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

@@ -25,6 +25,7 @@ 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
 
@@ -39,12 +40,22 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
             val builder = AlertDialog.Builder(activity)
 
             val stringBuilder = SpannableStringBuilder()
-            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() }
+            if (BuildConfig.CLOSED_STORE) {
+                if (BuildConfig.FULL_VERSION) {
+                    stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_thanks), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_rose), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_work_hard), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_upgrade), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
+                    builder.setPositiveButton(android.R.string.ok) { _, _ -> dismiss() }
+                } else {
+                    stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_buy_pro), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
+                            .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
+                    builder.setPositiveButton(R.string.download) { _, _ ->
+                        UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
+                    }
+                    builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
+                }
             } else {
                 stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
                         .append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")

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

@@ -1,51 +0,0 @@
-package com.kunzisoft.keepass.activities.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.activityViewModels
-import com.kunzisoft.keepass.activities.legacy.DatabaseRetrieval
-import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrFocused
-import com.kunzisoft.keepass.activities.stylish.StylishFragment
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
-
-abstract class DatabaseFragment : StylishFragment(), DatabaseRetrieval {
-
-    private val mDatabaseViewModel: DatabaseViewModel by activityViewModels()
-    protected var mDatabase: Database? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        mDatabaseViewModel.database.observe(viewLifecycleOwner) { database ->
-            if (mDatabase == null || mDatabase != database) {
-                this.mDatabase = database
-                onDatabaseRetrieved(database)
-            }
-        }
-
-        mDatabaseViewModel.actionFinished.observe(viewLifecycleOwner) { result ->
-            onDatabaseActionFinished(result.database, result.actionTask, result.result)
-        }
-    }
-
-    protected fun resetAppTimeoutWhenViewFocusedOrChanged(view: View?) {
-        context?.let {
-            view?.resetAppTimeoutWhenViewTouchedOrFocused(it, mDatabase?.loaded)
-        }
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        // Can be overridden by a subclass
-    }
-
-    protected fun buildNewBinaryAttachment(): BinaryData? {
-        return mDatabase?.buildNewBinaryAttachment()
-    }
-}

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

@@ -19,301 +19,431 @@
  */
 package com.kunzisoft.keepass.activities.fragments
 
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.ImageView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.ReplaceFileDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
+import com.kunzisoft.keepass.activities.EntryEditActivity
+import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
-import com.kunzisoft.keepass.adapters.TagsProposalAdapter
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.template.Template
-import com.kunzisoft.keepass.model.AttachmentState
-import com.kunzisoft.keepass.model.EntryAttachmentState
-import com.kunzisoft.keepass.model.EntryInfo
-import com.kunzisoft.keepass.model.StreamDirection
-import com.kunzisoft.keepass.view.*
-import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
-import com.tokenautocomplete.FilteredArrayAdapter
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.education.EntryEditActivityEducation
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+import com.kunzisoft.keepass.model.*
+import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.ExpirationView
+import com.kunzisoft.keepass.view.applyFontVisibility
+import com.kunzisoft.keepass.view.collapse
+import com.kunzisoft.keepass.view.expand
 
+class EntryEditFragment: StylishFragment() {
 
-class EntryEditFragment: DatabaseFragment() {
-
-    private val mEntryEditViewModel: EntryEditViewModel by activityViewModels()
-
-    private lateinit var rootView: View
-    private lateinit var templateView: TemplateEditView
-    private lateinit var attachmentsContainerView: ViewGroup
+    private lateinit var entryTitleLayoutView: TextInputLayout
+    private lateinit var entryTitleView: EditText
+    private lateinit var entryIconView: ImageView
+    private lateinit var entryUserNameView: EditText
+    private lateinit var entryUrlView: EditText
+    private lateinit var entryPasswordLayoutView: TextInputLayout
+    private lateinit var entryPasswordView: EditText
+    private lateinit var entryPasswordGeneratorView: View
+    private lateinit var entryExpirationView: ExpirationView
+    private lateinit var entryNotesView: EditText
+    private lateinit var extraFieldsContainerView: View
+    private lateinit var extraFieldsListView: ViewGroup
+    private lateinit var attachmentsContainerView: View
     private lateinit var attachmentsListView: RecyclerView
-    private var attachmentsAdapter: EntryAttachmentsItemsAdapter? = null
-    private lateinit var tagsContainerView: TextInputLayout
-    private lateinit var tagsCompletionView: TagsCompletionView
-    private var tagsAdapter: FilteredArrayAdapter<String>? = null
 
-    private var mTemplate: Template? = null
-    private var mAllowMultipleAttachments: Boolean = false
+    private lateinit var attachmentsAdapter: EntryAttachmentsItemsAdapter
 
-    private var mIconColor: Int = 0
+    private var fontInVisibility: Boolean = false
+    private var iconColor: Int = 0
 
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+    var drawFactory: IconDrawableFactory? = null
+    var setOnDateClickListener: (() -> Unit)? = null
+    var setOnPasswordGeneratorClickListener: View.OnClickListener? = null
+    var setOnIconViewClickListener: ((IconImage) -> Unit)? = null
+    var setOnEditCustomField: ((Field) -> Unit)? = null
+    var setOnRemoveAttachment: ((Attachment) -> Unit)? = null
+
+    // Elements to modify the current entry
+    private var mEntryInfo = EntryInfo()
+    private var mLastFocusedEditField: FocusedEditField? = null
+    private var mExtraViewToRequestFocus: EditText? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
 
-        // Retrieve the textColor to tint the icon
-        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        mIconColor = taIconColor?.getColor(0, Color.BLACK) ?: Color.BLACK
-        taIconColor?.recycle()
+        val rootView = inflater.cloneInContext(contextThemed)
+            .inflate(R.layout.fragment_entry_edit_contents, container, false)
 
-        return inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_entry_edit, container, false)
-    }
+        fontInVisibility = PreferencesUtil.fieldFontIsInVisibility(requireContext())
 
-    override fun onViewCreated(view: View,
-                               savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        rootView = view
-        // Hide only the first time
-        if (savedInstanceState == null) {
-            view.isVisible = false
+        entryTitleLayoutView = rootView.findViewById(R.id.entry_edit_container_title)
+        entryTitleView = rootView.findViewById(R.id.entry_edit_title)
+        entryIconView = rootView.findViewById(R.id.entry_edit_icon_button)
+        entryIconView.setOnClickListener {
+            setOnIconViewClickListener?.invoke(mEntryInfo.icon)
         }
-        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)
 
+        entryUserNameView = rootView.findViewById(R.id.entry_edit_user_name)
+        entryUrlView = rootView.findViewById(R.id.entry_edit_url)
+        entryPasswordLayoutView = rootView.findViewById(R.id.entry_edit_container_password)
+        entryPasswordView = rootView.findViewById(R.id.entry_edit_password)
+        entryPasswordGeneratorView = rootView.findViewById(R.id.entry_edit_password_generator_button)
+        entryPasswordGeneratorView.setOnClickListener {
+            setOnPasswordGeneratorClickListener?.onClick(it)
+        }
+        entryExpirationView = rootView.findViewById(R.id.entry_edit_expiration)
+        entryExpirationView.setOnDateClickListener = setOnDateClickListener
+
+        entryNotesView = rootView.findViewById(R.id.entry_edit_notes)
+
+        extraFieldsContainerView = rootView.findViewById(R.id.extra_fields_container)
+        extraFieldsListView = rootView.findViewById(R.id.extra_fields_list)
+
+        attachmentsContainerView = rootView.findViewById(R.id.entry_attachments_container)
+        attachmentsListView = rootView.findViewById(R.id.entry_attachments_list)
         attachmentsAdapter = EntryAttachmentsItemsAdapter(requireContext())
-        attachmentsListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            adapter = attachmentsAdapter
-            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-        }
-
-        templateView.apply {
-            setOnIconClickListener {
-                mEntryEditViewModel.requestIconSelection(templateView.getIcon())
-            }
-            setOnBackgroundColorClickListener {
-                mEntryEditViewModel.requestBackgroundColorSelection(templateView.getBackgroundColor())
-            }
-            setOnForegroundColorClickListener {
-                mEntryEditViewModel.requestForegroundColorSelection(templateView.getForegroundColor())
-            }
-            setOnCustomEditionActionClickListener { field ->
-                mEntryEditViewModel.requestCustomFieldEdition(field)
-            }
-            setOnPasswordGenerationActionClickListener { field ->
-                mEntryEditViewModel.requestPasswordSelection(field)
-            }
-            setOnDateInstantClickListener { dateInstant ->
-                mEntryEditViewModel.requestDateTimeSelection(dateInstant)
-            }
-        }
-
-        if (savedInstanceState != null) {
-            val attachments: List<Attachment> =
-                savedInstanceState.getParcelableArrayList(ATTACHMENTS_TAG) ?: listOf()
-            setAttachments(attachments)
-        }
-
-        mEntryEditViewModel.onTemplateChanged.observe(viewLifecycleOwner) { template ->
-            this.mTemplate = template
-            templateView.setTemplate(template)
-        }
-
-        mEntryEditViewModel.templatesEntry.observe(viewLifecycleOwner) { templateEntry ->
-            if (templateEntry != null) {
-                val selectedTemplate = if (mTemplate != null)
-                    mTemplate
-                else
-                    templateEntry.defaultTemplate
-                templateView.setTemplate(selectedTemplate)
-                // Load entry info only the first time to keep change locally
-                if (savedInstanceState == null) {
-                    assignEntryInfo(templateEntry.entryInfo)
-                }
-                // To prevent flickering
-                rootView.showByFading()
-                // Apply timeout reset
-                resetAppTimeoutWhenViewFocusedOrChanged(rootView)
-            }
-        }
-
-        mEntryEditViewModel.requestEntryInfoUpdate.observe(viewLifecycleOwner) {
-            val entryInfo = retrieveEntryInfo()
-            mEntryEditViewModel.saveEntryInfo(it.database, it.entry, it.parent, entryInfo)
-        }
-
-        mEntryEditViewModel.onIconSelected.observe(viewLifecycleOwner) { iconImage ->
-            templateView.setIcon(iconImage)
-        }
-
-        mEntryEditViewModel.onBackgroundColorSelected.observe(viewLifecycleOwner) { color ->
-            templateView.setBackgroundColor(color)
-        }
-
-        mEntryEditViewModel.onForegroundColorSelected.observe(viewLifecycleOwner) { color ->
-            templateView.setForegroundColor(color)
-        }
-
-        mEntryEditViewModel.onPasswordSelected.observe(viewLifecycleOwner) { passwordField ->
-            templateView.setPasswordField(passwordField)
-        }
-
-        mEntryEditViewModel.onDateSelected.observe(viewLifecycleOwner) { viewModelDate ->
-            // Save the date
-            templateView.setCurrentDateTimeValue(viewModelDate)
-        }
-
-        mEntryEditViewModel.onTimeSelected.observe(viewLifecycleOwner) { viewModelTime ->
-            // Save the time
-            templateView.setCurrentTimeValue(viewModelTime)
-        }
-
-        mEntryEditViewModel.onCustomFieldEdited.observe(viewLifecycleOwner) { fieldAction ->
-            val oldField = fieldAction.oldField
-            val newField = fieldAction.newField
-            // Field to add
-            if (oldField == null) {
-                newField?.let {
-                    if (!templateView.putCustomField(it)) {
-                        mEntryEditViewModel.showCustomFieldEditionError()
-                    }
-                }
-            }
-            // Field to replace
-            oldField?.let {
-                newField?.let {
-                    if (!templateView.replaceCustomField(oldField, newField)) {
-                        mEntryEditViewModel.showCustomFieldEditionError()
-                    }
-                }
-            }
-            // Field to remove
-            if (newField == null) {
-                oldField?.let {
-                    templateView.removeCustomField(it)
-                }
-            }
-        }
-
-        mEntryEditViewModel.requestSetupOtp.observe(viewLifecycleOwner) {
-            // Retrieve the current otpElement if exists
-            // and open the dialog to set up the OTP
-            SetOTPDialogFragment.build(templateView.getEntryInfo().otpModel)
-                .show(parentFragmentManager, "addOTPDialog")
-        }
-
-        mEntryEditViewModel.onOtpCreated.observe(viewLifecycleOwner) {
-            // Update the otp field with otpauth:// url
-            templateView.putOtpElement(it)
-        }
-
-        mEntryEditViewModel.onBuildNewAttachment.observe(viewLifecycleOwner) {
-            val attachmentToUploadUri = it.attachmentToUploadUri
-            val fileName = it.fileName
-
-            buildNewBinaryAttachment()?.let { binaryAttachment ->
-                val entryAttachment = Attachment(fileName, binaryAttachment)
-                // Ask to replace the current attachment
-                if ((!mAllowMultipleAttachments
-                            && containsAttachment()) ||
-                    containsAttachment(EntryAttachmentState(entryAttachment, StreamDirection.UPLOAD))) {
-                    ReplaceFileDialogFragment.build(attachmentToUploadUri, entryAttachment)
-                        .show(parentFragmentManager, "replacementFileFragment")
-                } else {
-                    mEntryEditViewModel.startUploadAttachment(attachmentToUploadUri, entryAttachment)
-                }
-            }
-        }
-
-        mEntryEditViewModel.onAttachmentAction.observe(viewLifecycleOwner) { entryAttachmentState ->
-            when (entryAttachmentState?.downloadState) {
-                AttachmentState.START -> {
-                    putAttachment(entryAttachmentState)
-                    getAttachmentViewPosition(entryAttachmentState) { attachment, position ->
-                        mEntryEditViewModel.binaryPreviewLoaded(attachment, position)
-                    }
-                }
-                AttachmentState.IN_PROGRESS -> {
-                    putAttachment(entryAttachmentState)
-                }
-                AttachmentState.COMPLETE -> {
-                    putAttachment(entryAttachmentState) { entryAttachment ->
-                        getAttachmentViewPosition(entryAttachment) { attachment, position ->
-                            mEntryEditViewModel.binaryPreviewLoaded(attachment, position)
-                        }
-                    }
-                    mEntryEditViewModel.onAttachmentAction(null)
-                }
-                AttachmentState.CANCELED,
-                AttachmentState.ERROR -> {
-                    removeAttachment(entryAttachmentState)
-                    mEntryEditViewModel.onAttachmentAction(null)
-                }
-                else -> {}
-            }
-        }
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-
-        templateView.populateIconMethod = { imageView, icon ->
-            database?.iconDrawableFactory?.assignDatabaseIcon(imageView, icon, mIconColor)
-        }
-
-        mAllowMultipleAttachments = database?.allowMultipleAttachments == true
-
-        attachmentsAdapter?.database = database
-        attachmentsAdapter?.onListSizeChangedListener = { previousSize, newSize ->
+        // TODO retrieve current database with its unique key
+        attachmentsAdapter.database = Database.getInstance()
+        //attachmentsAdapter.database = arguments?.getInt(KEY_DATABASE)
+        attachmentsAdapter.onListSizeChangedListener = { previousSize, newSize ->
             if (previousSize > 0 && newSize == 0) {
                 attachmentsContainerView.collapse(true)
             } else if (previousSize == 0 && newSize == 1) {
                 attachmentsContainerView.expand(true)
             }
         }
-
-        tagsAdapter = TagsProposalAdapter(requireContext(), database?.tagPool)
-        tagsCompletionView.apply {
-            threshold = 1
-            setAdapter(tagsAdapter)
+        attachmentsListView.apply {
+            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            adapter = attachmentsAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
         }
-        tagsContainerView.visibility = if (database?.allowTags() == true) View.VISIBLE else View.GONE
+
+        // Retrieve the textColor to tint the icon
+        val taIconColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        iconColor = taIconColor?.getColor(0, Color.WHITE) ?: Color.WHITE
+        taIconColor?.recycle()
+
+        rootView?.resetAppTimeoutWhenViewFocusedOrChanged(requireContext())
+
+        // Retrieve the new entry after an orientation change
+        if (arguments?.containsKey(KEY_TEMP_ENTRY_INFO) == true)
+            mEntryInfo = arguments?.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        else if (savedInstanceState?.containsKey(KEY_TEMP_ENTRY_INFO) == true) {
+            mEntryInfo = savedInstanceState.getParcelable(KEY_TEMP_ENTRY_INFO) ?: mEntryInfo
+        }
+
+        if (savedInstanceState?.containsKey(KEY_LAST_FOCUSED_FIELD) == true) {
+            mLastFocusedEditField = savedInstanceState.getParcelable(KEY_LAST_FOCUSED_FIELD) ?: mLastFocusedEditField
+        }
+
+        populateViewsWithEntry()
+
+        return rootView
     }
 
-    private fun assignEntryInfo(entryInfo: EntryInfo?) {
-        // Populate entry views
-        templateView.setEntryInfo(entryInfo)
+    override fun onDetach() {
+        super.onDetach()
 
-        // Set Tags
-        entryInfo?.tags?.let { tags ->
-            tagsCompletionView.setText("")
-            for (i in 0 until tags.size()) {
-                tagsCompletionView.addObjectSync(tags.get(i))
+        drawFactory = null
+        setOnDateClickListener = null
+        setOnPasswordGeneratorClickListener = null
+        setOnIconViewClickListener = null
+        setOnRemoveAttachment = null
+        setOnEditCustomField = null
+    }
+
+    fun getEntryInfo(): EntryInfo {
+        populateEntryWithViews()
+        return mEntryInfo
+    }
+
+    fun generatePasswordEducationPerformed(entryEditActivityEducation: EntryEditActivityEducation): Boolean {
+        return entryEditActivityEducation.checkAndPerformedGeneratePasswordEducation(
+                entryPasswordGeneratorView,
+                {
+                    GeneratePasswordDialogFragment().show(parentFragmentManager, "PasswordGeneratorFragment")
+                },
+                {
+                    try {
+                        (activity as? EntryEditActivity?)?.performedNextEducation(entryEditActivityEducation)
+                    } catch (ignore: Exception) {}
+                }
+        )
+    }
+
+    private fun populateViewsWithEntry() {
+        // Set info in view
+        icon = mEntryInfo.icon
+        title = mEntryInfo.title
+        username = mEntryInfo.username
+        url = mEntryInfo.url
+        password = mEntryInfo.password
+        expires = mEntryInfo.expires
+        expiryTime = mEntryInfo.expiryTime
+        notes = mEntryInfo.notes
+        assignExtraFields(mEntryInfo.customFields) { fields ->
+            setOnEditCustomField?.invoke(fields)
+        }
+        assignAttachments(mEntryInfo.attachments, StreamDirection.UPLOAD) { attachment ->
+            setOnRemoveAttachment?.invoke(attachment)
+        }
+    }
+
+    private fun populateEntryWithViews() {
+        // Icon already populate
+        mEntryInfo.title = title
+        mEntryInfo.username = username
+        mEntryInfo.url = url
+        mEntryInfo.password = password
+        mEntryInfo.expires = expires
+        mEntryInfo.expiryTime = expiryTime
+        mEntryInfo.notes = notes
+        mEntryInfo.customFields = getExtraFields()
+        mEntryInfo.otpModel = OtpEntryFields.parseFields { key ->
+            getExtraFields().firstOrNull { it.name == key }?.protectedValue?.toString()
+        }?.otpModel
+        mEntryInfo.attachments = getAttachments()
+    }
+
+    var title: String
+        get() {
+            return entryTitleView.text.toString()
+        }
+        set(value) {
+            entryTitleView.setText(value)
+            if (fontInVisibility)
+                entryTitleView.applyFontVisibility()
+        }
+
+    var icon: IconImage
+        get() {
+            return mEntryInfo.icon
+        }
+        set(value) {
+            mEntryInfo.icon = value
+            drawFactory?.assignDatabaseIcon(entryIconView, value, iconColor)
+        }
+
+    var username: String
+        get() {
+            return entryUserNameView.text.toString()
+        }
+        set(value) {
+            entryUserNameView.setText(value)
+            if (fontInVisibility)
+                entryUserNameView.applyFontVisibility()
+        }
+
+    var url: String
+        get() {
+            return entryUrlView.text.toString()
+        }
+        set(value) {
+            entryUrlView.setText(value)
+            if (fontInVisibility)
+                entryUrlView.applyFontVisibility()
+        }
+
+    var password: String
+        get() {
+            return entryPasswordView.text.toString()
+        }
+        set(value) {
+            entryPasswordView.setText(value)
+            if (fontInVisibility) {
+                entryPasswordView.applyFontVisibility()
             }
         }
 
-        // Manage attachments
-        setAttachments(entryInfo?.attachments ?: listOf())
+    var expires: Boolean
+        get() {
+            return entryExpirationView.expires
+        }
+        set(value) {
+            entryExpirationView.expires = value
+        }
+
+    var expiryTime: DateInstant
+        get() {
+            return entryExpirationView.expiryTime
+        }
+        set(value) {
+            entryExpirationView.expiryTime = value
+        }
+
+    var notes: String
+        get() {
+            return entryNotesView.text.toString()
+        }
+        set(value) {
+            entryNotesView.setText(value)
+            if (fontInVisibility)
+                entryNotesView.applyFontVisibility()
+        }
+
+    /* -------------
+     * Extra Fields
+     * -------------
+     */
+
+    private var mExtraFieldsList: MutableList<Field> = ArrayList()
+    private var mOnEditButtonClickListener: ((item: Field)->Unit)? = null
+
+    private fun buildViewFromField(extraField: Field): View? {
+        val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
+        val itemView: View? = inflater?.inflate(R.layout.item_entry_edit_extra_field, extraFieldsListView, false)
+        itemView?.id = View.NO_ID
+
+        val extraFieldValueContainer: TextInputLayout? = itemView?.findViewById(R.id.entry_extra_field_value_container)
+        extraFieldValueContainer?.endIconMode = if (extraField.protectedValue.isProtected)
+             TextInputLayout.END_ICON_PASSWORD_TOGGLE else TextInputLayout.END_ICON_NONE
+        extraFieldValueContainer?.hint = extraField.name
+        extraFieldValueContainer?.id = View.NO_ID
+
+        val extraFieldValue: TextInputEditText? = itemView?.findViewById(R.id.entry_extra_field_value)
+        extraFieldValue?.apply {
+            if (extraField.protectedValue.isProtected) {
+                inputType = extraFieldValue.inputType or EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
+            }
+            setText(extraField.protectedValue.toString())
+            if (fontInVisibility)
+                applyFontVisibility()
+        }
+        extraFieldValue?.id = View.NO_ID
+        extraFieldValue?.tag = "FIELD_VALUE_TAG"
+        if (mLastFocusedEditField?.field == extraField) {
+            mExtraViewToRequestFocus = extraFieldValue
+        }
+
+        val extraFieldEditButton: View? = itemView?.findViewById(R.id.entry_extra_field_edit)
+        extraFieldEditButton?.setOnClickListener {
+            mOnEditButtonClickListener?.invoke(extraField)
+        }
+        extraFieldEditButton?.id = View.NO_ID
+
+        return itemView
     }
 
-    private fun retrieveEntryInfo(): EntryInfo {
-        val entryInfo = templateView.getEntryInfo()
-        entryInfo.tags = tagsCompletionView.getTags()
-        entryInfo.attachments = getAttachments().toMutableList()
-        return entryInfo
+    fun getExtraFields(): List<Field> {
+        mLastFocusedEditField = null
+        for (index in 0 until extraFieldsListView.childCount) {
+            val extraFieldValue: EditText = extraFieldsListView.getChildAt(index)
+                    .findViewWithTag("FIELD_VALUE_TAG")
+            val extraField = mExtraFieldsList[index]
+            extraField.protectedValue.stringValue = extraFieldValue.text?.toString() ?: ""
+            if (extraFieldValue.isFocused) {
+                mLastFocusedEditField = FocusedEditField().apply {
+                    field = extraField
+                    cursorSelectionStart = extraFieldValue.selectionStart
+                    cursorSelectionEnd = extraFieldValue.selectionEnd
+                }
+            }
+        }
+        return mExtraFieldsList
+    }
+
+    /**
+     * Remove all children and add new views for each field
+     */
+    fun assignExtraFields(fields: List<Field>,
+                          onEditButtonClickListener: ((item: Field)->Unit)?) {
+        extraFieldsContainerView.visibility = if (fields.isEmpty()) View.GONE else View.VISIBLE
+        // Reinit focused field
+        mExtraFieldsList.clear()
+        mExtraFieldsList.addAll(fields)
+        extraFieldsListView.removeAllViews()
+        fields.forEach {
+            extraFieldsListView.addView(buildViewFromField(it))
+        }
+        // Request last focus
+        mLastFocusedEditField?.let { focusField ->
+            mExtraViewToRequestFocus?.apply {
+                requestFocus()
+                setSelection(focusField.cursorSelectionStart,
+                                focusField.cursorSelectionEnd)
+            }
+        }
+        mLastFocusedEditField = null
+        mOnEditButtonClickListener = onEditButtonClickListener
+    }
+
+    /**
+     * Update an extra field or create a new one if doesn't exists, the old value is lost
+     */
+    fun putExtraField(extraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val oldField = mExtraFieldsList.firstOrNull { it.name == extraField.name }
+        oldField?.let {
+            val index = mExtraFieldsList.indexOf(oldField)
+            mExtraFieldsList.removeAt(index)
+            mExtraFieldsList.add(index, extraField)
+            extraFieldsListView.removeViewAt(index)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView, index)
+            newView?.requestFocus()
+        } ?: kotlin.run {
+            mExtraFieldsList.add(extraField)
+            val newView = buildViewFromField(extraField)
+            extraFieldsListView.addView(newView)
+            newView?.requestFocus()
+        }
+    }
+
+    /**
+     * Update an extra field and keep the old value
+     */
+    fun replaceExtraField(oldExtraField: Field, newExtraField: Field) {
+        extraFieldsContainerView.visibility = View.VISIBLE
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        val oldValueEditText: EditText = extraFieldsListView.getChildAt(index)
+                .findViewWithTag("FIELD_VALUE_TAG")
+        val oldValue = oldValueEditText.text.toString()
+        val newExtraFieldWithOldValue = Field(newExtraField).apply {
+            this.protectedValue.stringValue = oldValue
+        }
+        mExtraFieldsList.removeAt(index)
+        mExtraFieldsList.add(index, newExtraFieldWithOldValue)
+        extraFieldsListView.removeViewAt(index)
+        val newView = buildViewFromField(newExtraFieldWithOldValue)
+        extraFieldsListView.addView(newView, index)
+        newView?.requestFocus()
+    }
+
+    fun removeExtraField(oldExtraField: Field) {
+        val previousSize = mExtraFieldsList.size
+        val index = mExtraFieldsList.indexOf(oldExtraField)
+        extraFieldsListView.getChildAt(index)?.let {
+            it.collapse(true) {
+                mExtraFieldsList.removeAt(index)
+                extraFieldsListView.removeViewAt(index)
+                val newSize = mExtraFieldsList.size
+
+                if (previousSize > 0 && newSize == 0) {
+                    extraFieldsContainerView.collapse(true)
+                } else if (previousSize == 0 && newSize == 1) {
+                    extraFieldsContainerView.expand(true)
+                }
+            }
+        }
     }
 
     /* -------------
@@ -321,84 +451,78 @@ class EntryEditFragment: DatabaseFragment() {
      * -------------
      */
 
-    private fun getAttachments(): List<Attachment> {
-        return attachmentsAdapter?.itemsList?.map { it.attachment } ?: listOf()
+    fun getAttachments(): List<Attachment> {
+        return attachmentsAdapter.itemsList.map { it.attachment }
     }
 
-    private fun setAttachments(attachments: List<Attachment>) {
+    fun assignAttachments(attachments: List<Attachment>,
+                          streamDirection: StreamDirection,
+                          onDeleteItem: (attachment: Attachment)->Unit) {
         attachmentsContainerView.visibility = if (attachments.isEmpty()) View.GONE else View.VISIBLE
-        attachmentsAdapter?.assignItems(attachments.map {
-            EntryAttachmentState(it, StreamDirection.UPLOAD)
-        })
-        attachmentsAdapter?.onDeleteButtonClickListener = { item ->
-            val attachment = item.attachment
-            removeAttachment(EntryAttachmentState(attachment, StreamDirection.DOWNLOAD))
-            mEntryEditViewModel.deleteAttachment(attachment)
+        attachmentsAdapter.assignItems(attachments.map { EntryAttachmentState(it, streamDirection) })
+        attachmentsAdapter.onDeleteButtonClickListener = { item ->
+            onDeleteItem.invoke(item.attachment)
         }
     }
 
-    private fun containsAttachment(): Boolean {
-        return attachmentsAdapter?.isEmpty() != true
+    fun containsAttachment(): Boolean {
+        return !attachmentsAdapter.isEmpty()
     }
 
-    private fun containsAttachment(attachment: EntryAttachmentState): Boolean {
-        return attachmentsAdapter?.contains(attachment) ?: false
+    fun containsAttachment(attachment: EntryAttachmentState): Boolean {
+        return attachmentsAdapter.contains(attachment)
     }
 
-    private fun putAttachment(attachment: EntryAttachmentState,
-                              onPreviewLoaded: ((attachment: EntryAttachmentState) -> Unit)? = null) {
-        // When only one attachment is allowed
-        if (!mAllowMultipleAttachments
-            && attachment.downloadState == AttachmentState.START) {
-            attachmentsAdapter?.clear()
-        }
+    fun putAttachment(attachment: EntryAttachmentState,
+                      onPreviewLoaded: (()-> Unit)? = null) {
         attachmentsContainerView.visibility = View.VISIBLE
-        attachmentsAdapter?.putItem(attachment)
-        attachmentsAdapter?.onBinaryPreviewLoaded = {
-            onPreviewLoaded?.invoke(attachment)
+        attachmentsAdapter.putItem(attachment)
+        attachmentsAdapter.onBinaryPreviewLoaded = {
+            onPreviewLoaded?.invoke()
         }
     }
 
-    private fun removeAttachment(attachment: EntryAttachmentState) {
-        attachmentsAdapter?.removeItem(attachment)
+    fun removeAttachment(attachment: EntryAttachmentState) {
+        attachmentsAdapter.removeItem(attachment)
     }
 
-    private fun getAttachmentViewPosition(attachment: EntryAttachmentState,
-                                          position: (attachment: EntryAttachmentState, Float) -> Unit) {
+    fun clearAttachments() {
+        attachmentsAdapter.clear()
+    }
+
+    fun getAttachmentViewPosition(attachment: EntryAttachmentState, position: (Float) -> Unit) {
         attachmentsListView.postDelayed({
-            attachmentsAdapter?.indexOf(attachment)?.let { index ->
-                position.invoke(attachment,
-                    attachmentsContainerView.y
-                        + attachmentsListView.y
-                        + (attachmentsListView.getChildAt(index)?.y
-                        ?: 0F)
-                )
-            }
+            position.invoke(attachmentsContainerView.y
+                    + attachmentsListView.y
+                    + (attachmentsListView.getChildAt(attachmentsAdapter.indexOf(attachment))?.y
+                    ?: 0F)
+            )
         }, 250)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
+        populateEntryWithViews()
+        outState.putParcelable(KEY_TEMP_ENTRY_INFO, mEntryInfo)
+        outState.putParcelable(KEY_LAST_FOCUSED_FIELD, mLastFocusedEditField)
+
         super.onSaveInstanceState(outState)
-        outState.putParcelableArrayList(ATTACHMENTS_TAG, ArrayList(getAttachments()))
-    }
-
-    /* -------------
-     * Education
-     * -------------
-     */
-
-    fun getActionImageView(): View? {
-        return templateView.getActionImageView()
-    }
-
-    fun launchGeneratePasswordEductionAction() {
-        mEntryEditViewModel.requestPasswordSelection(templateView.getPasswordField())
     }
 
     companion object {
-        private val TAG = EntryEditFragment::class.java.name
+        const val KEY_TEMP_ENTRY_INFO = "KEY_TEMP_ENTRY_INFO"
+        const val KEY_DATABASE = "KEY_DATABASE"
+        const val KEY_LAST_FOCUSED_FIELD = "KEY_LAST_FOCUSED_FIELD"
 
-        private const val ATTACHMENTS_TAG = "ATTACHMENTS_TAG"
+        fun getInstance(entryInfo: EntryInfo?): EntryEditFragment {
+                        //database: Database?): EntryEditFragment {
+            return EntryEditFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_TEMP_ENTRY_INFO, entryInfo)
+                    // TODO Unique database key database.key
+                    putInt(KEY_DATABASE, 0)
+                }
+            }
+        }
     }
 
 }

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

@@ -1,246 +0,0 @@
-package com.kunzisoft.keepass.activities.fragments
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.SimpleItemAnimator
-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
-import com.kunzisoft.keepass.model.StreamDirection
-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.showByFading
-import com.kunzisoft.keepass.viewmodels.EntryViewModel
-import java.util.*
-
-class EntryFragment: DatabaseFragment() {
-
-    private lateinit var rootView: View
-    private lateinit var templateView: TemplateView
-
-    private lateinit var creationDateView: TextView
-    private lateinit var modificationDateView: TextView
-
-    private lateinit var attachmentsContainerView: View
-    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
-
-    private var mClipboardHelper: ClipboardHelper? = null
-
-    private val mEntryViewModel: EntryViewModel by activityViewModels()
-
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry, container, false)
-    }
-    
-    override fun onViewCreated(view: View,
-                               savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        context?.let { context ->
-            mClipboardHelper = ClipboardHelper(context)
-        }
-
-        rootView = view
-        // Hide only the first time
-        if (savedInstanceState == null) {
-            view.isVisible = false
-        }
-        templateView = view.findViewById(R.id.entry_template)
-        loadTemplateSettings()
-
-        attachmentsContainerView = view.findViewById(R.id.entry_attachments_container)
-        attachmentsListView = view.findViewById(R.id.entry_attachments_list)
-        attachmentsListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-        }
-
-        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
-        }
-        uuidReferenceView = view.findViewById(R.id.entry_UUID_reference)
-
-        mEntryViewModel.entryInfoHistory.observe(viewLifecycleOwner) { entryInfoHistory ->
-            if (entryInfoHistory != null) {
-                templateView.setTemplate(entryInfoHistory.template)
-                assignEntryInfo(entryInfoHistory.entryInfo)
-                // Smooth appearing
-                rootView.showByFading()
-                resetAppTimeoutWhenViewFocusedOrChanged(rootView)
-            }
-        }
-
-        mEntryViewModel.onAttachmentAction.observe(viewLifecycleOwner) { entryAttachmentState ->
-            entryAttachmentState?.let {
-                if (it.streamDirection != StreamDirection.UPLOAD) {
-                    putAttachment(it)
-                }
-            }
-        }
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        context?.let { context ->
-            attachmentsAdapter = EntryAttachmentsItemsAdapter(context)
-            attachmentsAdapter?.database = database
-        }
-
-        attachmentsListView.adapter = attachmentsAdapter
-    }
-
-    private fun loadTemplateSettings() {
-        context?.let { context ->
-            templateView.setFirstTimeAskAllowCopyProtectedFields(PreferencesUtil.isFirstTimeAskAllowCopyProtectedFields(context))
-            templateView.setAllowCopyProtectedFields(PreferencesUtil.allowCopyProtectedFields(context))
-        }
-    }
-
-    private fun assignEntryInfo(entryInfo: EntryInfo?) {
-        // Set copy buttons
-        templateView.apply {
-            setOnAskCopySafeClickListener {
-                showClipboardDialog()
-            }
-
-            setOnCopyActionClickListener { field ->
-                mClipboardHelper?.timeoutCopyToClipboard(
-                    field.protectedValue.stringValue,
-                    getString(
-                        R.string.copy_field,
-                        TemplateField.getLocalizedName(context, field.name)
-                    )
-                )
-            }
-        }
-
-        // Populate entry views
-        templateView.setEntryInfo(entryInfo)
-
-        // OTP timer updated
-        templateView.setOnOtpElementUpdated { otpElementUpdated ->
-            mEntryViewModel.onOtpElementUpdated(otpElementUpdated)
-        }
-
-        // Manage attachments
-        assignAttachments(entryInfo?.attachments ?: listOf())
-
-        // Assign dates
-        creationDateView.text = entryInfo?.creationTime?.getDateTimeString(resources)
-        modificationDateView.text = entryInfo?.lastModificationTime?.getDateTimeString(resources)
-
-        // TODO Custom data
-        // customDataView.text = entryInfo?.customData?.toString()
-
-        // Assign special data
-        uuidReferenceView.text = UuidUtil.toHexString(entryInfo?.id)
-    }
-
-    private fun showClipboardDialog() {
-        context?.let {
-            AlertDialog.Builder(it)
-                .setMessage(
-                    getString(R.string.allow_copy_password_warning) +
-                            "\n\n" +
-                            getString(R.string.clipboard_warning)
-                )
-                .create().apply {
-                    setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
-                        PreferencesUtil.setAllowCopyPasswordAndProtectedFields(context, true)
-                        finishDialog(dialog)
-                    }
-                    setButton(AlertDialog.BUTTON_NEGATIVE, getText(R.string.disable)) { dialog, _ ->
-                        PreferencesUtil.setAllowCopyPasswordAndProtectedFields(context, false)
-                        finishDialog(dialog)
-                    }
-                    show()
-                }
-        }
-    }
-
-    private fun finishDialog(dialog: DialogInterface) {
-        dialog.dismiss()
-        loadTemplateSettings()
-        templateView.reload()
-    }
-
-    /* -------------
-     * Attachments
-     * -------------
-     */
-
-    private fun assignAttachments(attachments: List<Attachment>) {
-        attachmentsContainerView.visibility = if (attachments.isEmpty()) View.GONE else View.VISIBLE
-        attachmentsAdapter?.assignItems(attachments.map {
-            EntryAttachmentState(it, StreamDirection.DOWNLOAD)
-        })
-        attachmentsAdapter?.onItemClickListener = { item ->
-            mEntryViewModel.onAttachmentSelected(item.attachment)
-        }
-    }
-
-    fun putAttachment(attachmentToDownload: EntryAttachmentState) {
-        attachmentsAdapter?.putItem(attachmentToDownload)
-    }
-
-    /* -------------
-     * Education
-     * -------------
-     */
-
-    fun firstEntryFieldCopyView(): View? {
-        return try {
-            templateView.getActionImageView()
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    fun launchEntryCopyEducationAction() {
-        val appNameString = getString(R.string.app_name)
-        mClipboardHelper?.timeoutCopyToClipboard(appNameString,
-            getString(R.string.copy_field, appNameString))
-    }
-
-    companion object {
-
-        fun getInstance(): EntryFragment {
-            return EntryFragment().apply {
-                arguments = Bundle()
-            }
-        }
-    }
-}

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

@@ -1,72 +0,0 @@
-package com.kunzisoft.keepass.activities.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.stylish.StylishFragment
-import com.kunzisoft.keepass.adapters.EntryHistoryAdapter
-import com.kunzisoft.keepass.model.EntryInfo
-import com.kunzisoft.keepass.viewmodels.EntryViewModel
-
-class EntryHistoryFragment: StylishFragment() {
-
-    private lateinit var historyContainerView: View
-    private lateinit var historyListView: RecyclerView
-    private var historyAdapter: EntryHistoryAdapter? = null
-
-    private val mEntryViewModel: EntryViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-
-        return inflater.cloneInContext(contextThemed)
-            .inflate(R.layout.fragment_entry_history, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        context?.let { context ->
-            historyAdapter = EntryHistoryAdapter(context)
-        }
-
-        historyContainerView = view.findViewById(R.id.entry_history_container)
-        historyListView = view.findViewById(R.id.entry_history_list)
-        historyListView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
-            adapter = historyAdapter
-        }
-
-        mEntryViewModel.entryHistory.observe(viewLifecycleOwner) {
-            assignHistory(it)
-        }
-    }
-
-    /* -------------
-     * History
-     * -------------
-     */
-    private fun assignHistory(history: List<EntryInfo>?) {
-        historyAdapter?.clear()
-        history?.let {
-            historyAdapter?.entryHistoryList?.addAll(history)
-        }
-        historyAdapter?.onItemClickListener = { item, position ->
-            mEntryViewModel.onHistorySelected(item, position)
-        }
-        historyContainerView.visibility = if (historyAdapter?.entryHistoryList?.isEmpty() != false)
-            View.GONE
-        else
-            View.VISIBLE
-        historyAdapter?.notifyDataSetChanged()
-    }
-}

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

@@ -22,7 +22,6 @@ package com.kunzisoft.keepass.activities.fragments
 import android.os.Bundle
 import android.view.View
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
 
 
@@ -32,8 +31,8 @@ class IconCustomFragment : IconFragment<IconImageCustom>() {
         return R.layout.fragment_icon_grid
     }
 
-    override fun defineIconList(database: Database?) {
-        database?.doForEachCustomIcons { customIcon, _ ->
+    override fun defineIconList() {
+        mDatabase?.doForEachCustomIcons { customIcon, _ ->
             iconPickerAdapter.addIcon(customIcon, false)
         }
     }
@@ -55,10 +54,8 @@ class IconCustomFragment : IconFragment<IconImageCustom>() {
                 iconCustomAdded?.iconCustom?.let { icon ->
                     iconPickerAdapter.addIcon(icon)
                     iconCustomAdded.iconCustom = null
-                    try {
-                        iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
-                    } catch (ignore: Exception) {}
                 }
+                iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
             }
         }
         iconPickerViewModel.customIconRemoved.observe(viewLifecycleOwner) { iconCustomRemoved ->
@@ -69,14 +66,6 @@ class IconCustomFragment : IconFragment<IconImageCustom>() {
                 }
             }
         }
-        iconPickerViewModel.customIconUpdated.observe(viewLifecycleOwner) { iconCustomUpdated ->
-            if (!iconCustomUpdated.error) {
-                iconCustomUpdated?.iconCustom?.let { icon ->
-                    iconPickerAdapter.updateIcon(icon)
-                    iconCustomUpdated.iconCustom = null
-                }
-            }
-        }
     }
 
     override fun onIconClickListener(icon: IconImageCustom) {

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

@@ -19,6 +19,7 @@
  */
 package com.kunzisoft.keepass.activities.fragments
 
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -27,6 +28,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.adapters.IconPickerAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImageDraw
@@ -36,48 +38,39 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
+abstract class IconFragment<T: IconImageDraw> : StylishFragment(),
         IconPickerAdapter.IconPickerListener<T> {
 
     protected lateinit var iconsGridView: RecyclerView
     protected lateinit var iconPickerAdapter: IconPickerAdapter<T>
     protected var iconActionSelectionMode = false
 
+    protected var mDatabase: Database? = null
+
     protected val iconPickerViewModel: IconPickerViewModel by activityViewModels()
 
     abstract fun retrieveMainLayoutId(): Int
 
-    abstract fun defineIconList(database: Database?)
+    abstract fun defineIconList()
 
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?): View {
-        return inflater.inflate(retrieveMainLayoutId(), container, false)
-    }
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        mDatabase = Database.getInstance()
 
         // Retrieve the textColor to tint the icon
         val ta = contextThemed?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
         val tintColor = ta?.getColor(0, Color.BLACK) ?: Color.BLACK
         ta?.recycle()
 
-        iconsGridView = view.findViewById(R.id.icons_grid_view)
-        iconPickerAdapter = IconPickerAdapter(requireContext(), tintColor)
-        iconPickerAdapter.iconPickerListener = this
-        iconsGridView.adapter = iconPickerAdapter
-
-        resetAppTimeoutWhenViewFocusedOrChanged(view)
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        iconPickerAdapter.iconDrawableFactory = database?.iconDrawableFactory
+        iconPickerAdapter = IconPickerAdapter<T>(context, tintColor).apply {
+            iconDrawableFactory = mDatabase?.iconDrawableFactory
+        }
 
         CoroutineScope(Dispatchers.IO).launch {
             val populateList = launch {
                 iconPickerAdapter.clear()
-                defineIconList(database)
+                defineIconList()
             }
             withContext(Dispatchers.Main) {
                 populateList.join()
@@ -86,6 +79,21 @@ abstract class IconFragment<T: IconImageDraw> : DatabaseFragment(),
         }
     }
 
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        val root = inflater.inflate(retrieveMainLayoutId(), container, false)
+        iconsGridView = root.findViewById(R.id.icons_grid_view)
+        iconsGridView.adapter = iconPickerAdapter
+        return root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerAdapter.iconPickerListener = this
+    }
+
     fun onIconDeleteClicked() {
         iconActionSelectionMode = false
     }

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

@@ -9,18 +9,20 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.adapters.IconPickerPagerAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
 
-class IconPickerFragment : DatabaseFragment() {
+class IconPickerFragment : StylishFragment() {
 
     private var iconPickerPagerAdapter: IconPickerPagerAdapter? = null
     private lateinit var viewPager: ViewPager2
-    private lateinit var tabLayout: TabLayout
 
     private val iconPickerViewModel: IconPickerViewModel by activityViewModels()
 
+    private var mDatabase: Database? = null
+
     override fun onCreateView(
             inflater: LayoutInflater,
             container: ViewGroup?,
@@ -30,11 +32,19 @@ class IconPickerFragment : DatabaseFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        mDatabase = Database.getInstance()
 
         viewPager = view.findViewById(R.id.icon_picker_pager)
-        tabLayout = view.findViewById(R.id.icon_picker_tabs)
-        resetAppTimeoutWhenViewFocusedOrChanged(view)
+        val tabLayout = view.findViewById<TabLayout>(R.id.icon_picker_tabs)
+        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
+                if (mDatabase?.allowCustomIcons == true) 2 else 1)
+        viewPager.adapter = iconPickerPagerAdapter
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            tab.text = when (position) {
+                1 -> getString(R.string.icon_section_custom)
+                else -> getString(R.string.icon_section_standard)
+            }
+        }.attach()
 
         arguments?.apply {
             if (containsKey(ICON_TAB_ARG)) {
@@ -48,18 +58,6 @@ class IconPickerFragment : DatabaseFragment() {
         }
     }
 
-    override fun onDatabaseRetrieved(database: Database?) {
-        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
-            if (database?.allowCustomIcons == true) 2 else 1)
-        viewPager.adapter = iconPickerPagerAdapter
-        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
-            tab.text = when (position) {
-                1 -> getString(R.string.icon_section_custom)
-                else -> getString(R.string.icon_section_standard)
-            }
-        }.attach()
-    }
-
     enum class IconTab {
         STANDARD, CUSTOM
     }

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

@@ -20,7 +20,6 @@
 package com.kunzisoft.keepass.activities.fragments
 
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 
 
@@ -30,8 +29,8 @@ class IconStandardFragment : IconFragment<IconImageStandard>() {
         return R.layout.fragment_icon_grid
     }
 
-    override fun defineIconList(database: Database?) {
-        database?.doForEachStandardIcons { standardIcon ->
+    override fun defineIconList() {
+        mDatabase?.doForEachStandardIcons { standardIcon ->
             iconPickerAdapter.addIcon(standardIcon, false)
         }
     }

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

@@ -20,43 +20,38 @@
 package com.kunzisoft.keepass.activities.fragments
 
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.*
 import androidx.appcompat.view.ActionMode
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.EntryEditActivity
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
-import com.kunzisoft.keepass.adapters.NodesAdapter
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.NodeAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.viewmodels.GroupViewModel
 import java.util.*
 
-class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListener {
+class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
 
     private var nodeClickListener: NodeClickListener? = null
     private var onScrollListener: OnScrollListener? = null
-    private var groupRefreshed: GroupRefreshedListener? = null
 
     private var mNodesRecyclerView: RecyclerView? = null
-    private var mLayoutManager: LinearLayoutManager? = null
-    private var mAdapter: NodesAdapter? = null
-
-    private val mGroupViewModel: GroupViewModel by activityViewModels()
-
-    private var mCurrentGroup: Group? = null
+    var mainGroup: Group? = null
+        private set
+    private var mAdapter: NodeAdapter? = null
 
     var nodeActionSelectionMode = false
         private set
@@ -68,47 +63,21 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
     private var notFoundView: View? = null
     private var isASearchResult: Boolean = false
 
+
+    private var readOnly: Boolean = false
     private var specialMode: SpecialMode = SpecialMode.DEFAULT
 
-    private var mRecycleBinEnable: Boolean = false
-    private var mRecycleBin: Group? = null
-
-    var mEntryActivityResultLauncher = EntryEditActivity.registerForEntryResult(this) { entryId ->
-        entryId?.let {
-            // Simply refresh the list
-            rebuildList()
-            // Scroll to the new entry
-            mDatabase?.getEntryById(it)?.let { entry ->
-                mAdapter?.indexOf(entry)?.let { position ->
-                    mNodesRecyclerView?.scrollToPosition(position)
-                }
-            }
-        } ?: Log.e(this.javaClass.name, "Entry cannot be retrieved in Activity Result")
-    }
-
-    private var mRecycleViewScrollListener = object : RecyclerView.OnScrollListener() {
-        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-            super.onScrollStateChanged(recyclerView, newState)
-            if (newState == SCROLL_STATE_IDLE) {
-                mGroupViewModel.assignPosition(getFirstVisiblePosition())
-            }
-        }
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-            super.onScrolled(recyclerView, dx, dy)
-            onScrollListener?.onScrolled(dy)
-        }
-    }
+    val isEmpty: Boolean
+        get() = mAdapter == null || mAdapter?.itemCount?:0 <= 0
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-
-        // TODO Change to ViewModel
         try {
             nodeClickListener = context as NodeClickListener
         } catch (e: ClassCastException) {
             // The activity doesn't implement the interface, throw exception
             throw ClassCastException(context.toString()
-                    + " must implement " + NodesAdapter.NodeClickCallback::class.java.name)
+                    + " must implement " + NodeAdapter.NodeClickCallback::class.java.name)
         }
 
         try {
@@ -116,24 +85,14 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
         } catch (e: ClassCastException) {
             onScrollListener = null
             // Context menu can be omit
-            Log.w(
-                TAG, context.toString()
+            Log.w(TAG, context.toString()
                     + " must implement " + RecyclerView.OnScrollListener::class.java.name)
         }
-
-        try {
-            groupRefreshed = context as GroupRefreshedListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + GroupRefreshedListener::class.java.name)
-        }
     }
 
     override fun onDetach() {
         nodeClickListener = null
         onScrollListener = null
-        groupRefreshed = null
         super.onDetach()
     }
 
@@ -141,140 +100,129 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
         super.onCreate(savedInstanceState)
 
         setHasOptionsMenu(true)
-    }
 
-    override fun onDatabaseRetrieved(database: Database?) {
-        mRecycleBinEnable = database?.isRecycleBinEnabled == true
-        mRecycleBin = database?.recycleBin
+        readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState, arguments)
+
+        arguments?.let { args ->
+            // Contains all the group in element
+            if (args.containsKey(GROUP_KEY)) {
+                mainGroup = args.getParcelable(GROUP_KEY)
+            }
+            if (args.containsKey(IS_SEARCH)) {
+                isASearchResult = args.getBoolean(IS_SEARCH)
+            }
+        }
 
         contextThemed?.let { context ->
-            database?.let { database ->
-                mAdapter = NodesAdapter(context, database).apply {
-                    setOnNodeClickListener(object : NodesAdapter.NodeClickCallback {
-                        override fun onNodeClick(database: Database, node: Node) {
-                            if (mCurrentGroup?.isVirtual == false
-                                && nodeActionSelectionMode) {
-                                if (listActionNodes.contains(node)) {
-                                    // Remove selected item if already selected
-                                    listActionNodes.remove(node)
-                                } else {
-                                    // Add selected item if not already selected
-                                    listActionNodes.add(node)
-                                }
-                                nodeClickListener?.onNodeSelected(database, listActionNodes)
-                                setActionNodes(listActionNodes)
-                                notifyNodeChanged(node)
+            mAdapter = NodeAdapter(context)
+            mAdapter?.apply {
+                setOnNodeClickListener(object : NodeAdapter.NodeClickCallback {
+                    override fun onNodeClick(node: Node) {
+                        if (nodeActionSelectionMode) {
+                            if (listActionNodes.contains(node)) {
+                                // Remove selected item if already selected
+                                listActionNodes.remove(node)
                             } else {
-                                nodeClickListener?.onNodeClick(database, node)
+                                // Add selected item if not already selected
+                                listActionNodes.add(node)
                             }
+                            nodeClickListener?.onNodeSelected(listActionNodes)
+                            setActionNodes(listActionNodes)
+                            notifyNodeChanged(node)
+                        } else {
+                            nodeClickListener?.onNodeClick(node)
                         }
+                    }
 
-                        override fun onNodeLongClick(database: Database, node: Node): Boolean {
-                            if (mCurrentGroup?.isVirtual == false
-                                && nodeActionPasteMode == PasteMode.UNDEFINED) {
-                                // Select the first item after a long click
-                                if (!listActionNodes.contains(node))
-                                    listActionNodes.add(node)
+                    override fun onNodeLongClick(node: Node): Boolean {
+                        if (nodeActionPasteMode == PasteMode.UNDEFINED) {
+                            // Select the first item after a long click
+                            if (!listActionNodes.contains(node))
+                                listActionNodes.add(node)
 
-                                nodeClickListener?.onNodeSelected(database, listActionNodes)
+                            nodeClickListener?.onNodeSelected(listActionNodes)
 
-                                setActionNodes(listActionNodes)
-                                notifyNodeChanged(node)
-                            }
-                            return true
+                            setActionNodes(listActionNodes)
+                            notifyNodeChanged(node)
                         }
-                    })
-                }
-                mNodesRecyclerView?.adapter = mAdapter
+                        return true
+                    }
+                })
             }
         }
     }
 
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-
-        // Too many special cases to make specific additions or deletions,
-        // rebuilt the list works well.
-        if (result.isSuccess) {
-            rebuildList()
-        }
+    override fun onSaveInstanceState(outState: Bundle) {
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
+        super.onSaveInstanceState(outState)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
+
         // To apply theme
-        return inflater.cloneInContext(contextThemed)
-                .inflate(R.layout.fragment_nodes, container, false)
-    }
+        val rootView = inflater.cloneInContext(contextThemed)
+                .inflate(R.layout.fragment_list_nodes, container, false)
+        mNodesRecyclerView = rootView.findViewById(R.id.nodes_list)
+        notFoundView = rootView.findViewById(R.id.not_found_container)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        mNodesRecyclerView = view.findViewById(R.id.nodes_list)
-        notFoundView = view.findViewById(R.id.not_found_container)
-
-        mLayoutManager = LinearLayoutManager(context)
         mNodesRecyclerView?.apply {
             scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
-            layoutManager = mLayoutManager
+            layoutManager = LinearLayoutManager(context)
             adapter = mAdapter
         }
-        resetAppTimeoutWhenViewFocusedOrChanged(view)
 
-        mGroupViewModel.group.observe(viewLifecycleOwner) {
-            mCurrentGroup = it.group
-            isASearchResult = it.group.isVirtual
-            rebuildList()
-            it.showFromPosition?.let { position ->
-                mNodesRecyclerView?.scrollToPosition(position)
-            }
+        onScrollListener?.let { onScrollListener ->
+            mNodesRecyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(recyclerView, dx, dy)
+                    onScrollListener.onScrolled(dy)
+                }
+            })
         }
+
+        return rootView
     }
 
     override fun onResume() {
         super.onResume()
 
-        mNodesRecyclerView?.addOnScrollListener(mRecycleViewScrollListener)
         activity?.intent?.let {
             specialMode = EntrySelectionHelper.retrieveSpecialModeFromIntent(it)
         }
 
-        rebuildList()
-    }
-
-    override fun onPause() {
-
-        mNodesRecyclerView?.removeOnScrollListener(mRecycleViewScrollListener)
-        super.onPause()
-    }
-
-    fun getFirstVisiblePosition(): Int {
-        return mLayoutManager?.findFirstVisibleItemPosition() ?: 0
-    }
-
-    private fun rebuildList() {
+        // Refresh data
         try {
-            // Add elements to the list
-            mCurrentGroup?.let { currentGroup ->
-                // Thrown an exception when sort cannot be performed
-                mAdapter?.rebuildList(currentGroup)
-            }
-        } catch (e:Exception) {
-            Log.e(TAG, "Unable to rebuild the list", e)
+            rebuildList()
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to rebuild the list during resume")
+            e.printStackTrace()
         }
 
-        if (isASearchResult && mAdapter != null && mAdapter!!.isEmpty) {
+        if (isASearchResult && mAdapter!= null && mAdapter!!.isEmpty) {
             // To show the " no search entry found "
+            mNodesRecyclerView?.visibility = View.GONE
             notFoundView?.visibility = View.VISIBLE
         } else {
+            mNodesRecyclerView?.visibility = View.VISIBLE
             notFoundView?.visibility = View.GONE
         }
+    }
 
-        groupRefreshed?.onGroupRefreshed()
+    @Throws(IllegalArgumentException::class)
+    fun rebuildList() {
+        // Add elements to the list
+        mainGroup?.let { mainGroup ->
+            mAdapter?.apply {
+                // Thrown an exception when sort cannot be performed
+                rebuildList(mainGroup)
+                // To visually change the elements
+                if (PreferencesUtil.APPEARANCE_CHANGED) {
+                    notifyDataSetChanged()
+                    PreferencesUtil.APPEARANCE_CHANGED = false
+                }
+            }
+        }
     }
 
     override fun onSortSelected(sortNodeEnum: SortNodeEnum,
@@ -289,7 +237,8 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
             mAdapter?.notifyChangeSort(sortNodeEnum, sortNodeParameters)
             rebuildList()
         } catch (e:Exception) {
-            Log.e(TAG, "Unable to sort the list", e)
+            Log.e(TAG, "Unable to rebuild the list with the sort")
+            e.printStackTrace()
         }
     }
 
@@ -305,19 +254,17 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
             R.id.menu_sort -> {
                 context?.let { context ->
                     val sortDialogFragment: SortDialogFragment =
-                            if (mRecycleBinEnable) {
+                            if (Database.getInstance().isRecycleBinEnabled) {
                                 SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(context),
-                                    PreferencesUtil.getAscendingSort(context),
-                                    PreferencesUtil.getGroupsBeforeSort(context),
-                                    PreferencesUtil.getRecycleBinBottomSort(context)
-                                )
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context),
+                                        PreferencesUtil.getRecycleBinBottomSort(context))
                             } else {
                                 SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(context),
-                                    PreferencesUtil.getAscendingSort(context),
-                                    PreferencesUtil.getGroupsBeforeSort(context)
-                                )
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context))
                             }
 
                     sortDialogFragment.show(childFragmentManager, "sortDialog")
@@ -329,32 +276,34 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
         }
     }
 
-    fun actionNodesCallback(database: Database,
-                            nodes: List<Node>,
+    fun actionNodesCallback(nodes: List<Node>,
                             menuListener: NodesActionMenuListener?,
-                            onDestroyActionMode: (mode: ActionMode?) -> Unit) : ActionMode.Callback {
+                            actionModeCallback: ActionMode.Callback) : ActionMode.Callback {
 
         return object : ActionMode.Callback {
 
             override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
                 nodeActionSelectionMode = false
                 nodeActionPasteMode = PasteMode.UNDEFINED
-                return true
+                return actionModeCallback.onCreateActionMode(mode, menu)
             }
 
             override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
                 menu?.clear()
+
                 if (nodeActionPasteMode != PasteMode.UNDEFINED) {
                     mode?.menuInflater?.inflate(R.menu.node_paste_menu, menu)
                 } else {
                     nodeActionSelectionMode = true
                     mode?.menuInflater?.inflate(R.menu.node_menu, menu)
 
+                    val database = Database.getInstance()
+
                     // Open and Edit for a single item
                     if (nodes.size == 1) {
                         // Edition
-                        if (database.isReadOnly
-                                || (mRecycleBinEnable && nodes[0] == mRecycleBin)) {
+                        if (readOnly
+                                || (database.isRecycleBinEnabled && nodes[0] == database.recycleBin)) {
                             menu?.removeItem(R.id.menu_edit)
                         }
                     } else {
@@ -362,59 +311,56 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                         menu?.removeItem(R.id.menu_edit)
                     }
 
-                    // Move
-                    if (database.isReadOnly
-                            || isASearchResult) {
+                    // Copy and Move (not for groups)
+                    if (readOnly
+                            || isASearchResult
+                            || nodes.any { it.type == Type.GROUP }) {
+                        // TODO Copy For Group
+                        menu?.removeItem(R.id.menu_copy)
                         menu?.removeItem(R.id.menu_move)
                     }
 
-                    // Copy (not allowed for group)
-                    if (database.isReadOnly
-                            || isASearchResult
-                            || nodes.any { it.type == Type.GROUP }) {
-                        menu?.removeItem(R.id.menu_copy)
-                    }
-
                     // Deletion
-                    if (database.isReadOnly
-                            || (mRecycleBinEnable && nodes.any { it == mRecycleBin })) {
+                    if (readOnly
+                            || (database.isRecycleBinEnabled && nodes.any { it == database.recycleBin })) {
                         menu?.removeItem(R.id.menu_delete)
                     }
                 }
 
                 // Add the number of items selected in title
                 mode?.title = nodes.size.toString()
-                return true
+
+                return actionModeCallback.onPrepareActionMode(mode, menu)
             }
 
             override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
                 if (menuListener == null)
                     return false
                 return when (item?.itemId) {
-                    R.id.menu_open -> menuListener.onOpenMenuClick(database, nodes[0])
-                    R.id.menu_edit -> menuListener.onEditMenuClick(database, nodes[0])
+                    R.id.menu_open -> menuListener.onOpenMenuClick(nodes[0])
+                    R.id.menu_edit -> menuListener.onEditMenuClick(nodes[0])
                     R.id.menu_copy -> {
                         nodeActionPasteMode = PasteMode.PASTE_FROM_COPY
                         mAdapter?.unselectActionNodes()
-                        val returnValue = menuListener.onCopyMenuClick(database, nodes)
+                        val returnValue = menuListener.onCopyMenuClick(nodes)
                         nodeActionSelectionMode = false
                         returnValue
                     }
                     R.id.menu_move -> {
                         nodeActionPasteMode = PasteMode.PASTE_FROM_MOVE
                         mAdapter?.unselectActionNodes()
-                        val returnValue = menuListener.onMoveMenuClick(database, nodes)
+                        val returnValue = menuListener.onMoveMenuClick(nodes)
                         nodeActionSelectionMode = false
                         returnValue
                     }
-                    R.id.menu_delete -> menuListener.onDeleteMenuClick(database, nodes)
+                    R.id.menu_delete -> menuListener.onDeleteMenuClick(nodes)
                     R.id.menu_paste -> {
-                        val returnValue = menuListener.onPasteMenuClick(database, nodeActionPasteMode, nodes)
+                        val returnValue = menuListener.onPasteMenuClick(nodeActionPasteMode, nodes)
                         nodeActionPasteMode = PasteMode.UNDEFINED
                         nodeActionSelectionMode = false
                         returnValue
                     }
-                    else -> false
+                    else -> actionModeCallback.onActionItemClicked(mode, item)
                 }
             }
 
@@ -424,29 +370,83 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
                 mAdapter?.unselectActionNodes()
                 nodeActionPasteMode = PasteMode.UNDEFINED
                 nodeActionSelectionMode = false
-                onDestroyActionMode(mode)
+                actionModeCallback.onDestroyActionMode(mode)
             }
         }
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        when (requestCode) {
+            EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE -> {
+                if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE
+                        || resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
+                    data?.getParcelableExtra<Node>(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY)?.let { changedNode ->
+                        if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
+                            addNode(changedNode)
+                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE)
+                            mAdapter?.notifyDataSetChanged()
+                    } ?: Log.e(this.javaClass.name, "New node can be retrieve in Activity Result")
+                }
+            }
+        }
+    }
+
+    fun contains(node: Node): Boolean {
+        return mAdapter?.contains(node) ?: false
+    }
+
+    fun addNode(newNode: Node) {
+        mAdapter?.addNode(newNode)
+    }
+
+    fun addNodes(newNodes: List<Node>) {
+        mAdapter?.addNodes(newNodes)
+    }
+
+    fun updateNode(oldNode: Node, newNode: Node? = null) {
+        mAdapter?.updateNode(oldNode, newNode ?: oldNode)
+    }
+
+    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
+        mAdapter?.updateNodes(oldNodes, newNodes)
+    }
+
+    fun removeNode(pwNode: Node) {
+        mAdapter?.removeNode(pwNode)
+    }
+
+    fun removeNodes(nodes: List<Node>) {
+        mAdapter?.removeNodes(nodes)
+    }
+
+    fun removeNodeAt(position: Int) {
+        mAdapter?.removeNodeAt(position)
+    }
+
+    fun removeNodesAt(positions: IntArray) {
+        mAdapter?.removeNodesAt(positions)
+    }
+
     /**
      * Callback listener to redefine to do an action when a node is click
      */
     interface NodeClickListener {
-        fun onNodeClick(database: Database, node: Node)
-        fun onNodeSelected(database: Database, nodes: List<Node>): Boolean
+        fun onNodeClick(node: Node)
+        fun onNodeSelected(nodes: List<Node>): Boolean
     }
 
     /**
      * Menu listener to redefine to do an action in menu
      */
     interface NodesActionMenuListener {
-        fun onOpenMenuClick(database: Database, node: Node): Boolean
-        fun onEditMenuClick(database: Database, node: Node): Boolean
-        fun onCopyMenuClick(database: Database, nodes: List<Node>): Boolean
-        fun onMoveMenuClick(database: Database, nodes: List<Node>): Boolean
-        fun onDeleteMenuClick(database: Database, nodes: List<Node>): Boolean
-        fun onPasteMenuClick(database: Database, pasteMode: PasteMode?, nodes: List<Node>): Boolean
+        fun onOpenMenuClick(node: Node): Boolean
+        fun onEditMenuClick(node: Node): Boolean
+        fun onCopyMenuClick(nodes: List<Node>): Boolean
+        fun onMoveMenuClick(nodes: List<Node>): Boolean
+        fun onDeleteMenuClick(nodes: List<Node>): Boolean
+        fun onPasteMenuClick(pasteMode: PasteMode?, nodes: List<Node>): Boolean
     }
 
     enum class PasteMode {
@@ -464,11 +464,23 @@ class GroupFragment : DatabaseFragment(), SortDialogFragment.SortSelectionListen
         fun onScrolled(dy: Int)
     }
 
-    interface GroupRefreshedListener {
-        fun onGroupRefreshed()
-    }
-
     companion object {
-        private val TAG = GroupFragment::class.java.name
+
+        private val TAG = ListNodesFragment::class.java.name
+
+        private const val GROUP_KEY = "GROUP_KEY"
+        private const val IS_SEARCH = "IS_SEARCH"
+
+        fun newInstance(group: Group?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
+            val bundle = Bundle()
+            if (group != null) {
+                bundle.putParcelable(GROUP_KEY, group)
+            }
+            bundle.putBoolean(IS_SEARCH, isASearch)
+            ReadOnlyHelper.putReadOnlyInBundle(bundle, readOnly)
+            val listNodesFragment = ListNodesFragment()
+            listNodesFragment.arguments = bundle
+            return listNodesFragment
+        }
     }
 }

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

@@ -1,225 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.helpers
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.util.Log
-import android.view.View
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
-import com.kunzisoft.keepass.utils.UriUtil
-
-class ExternalFileHelper {
-
-    private var activity: FragmentActivity? = null
-    private var fragment: Fragment? = null
-
-    private var getContentResultLauncher: ActivityResultLauncher<String>? = null
-    private var openDocumentResultLauncher: ActivityResultLauncher<Array<String>>? = null
-    private var createDocumentResultLauncher: ActivityResultLauncher<String>? = null
-
-    constructor(context: FragmentActivity) {
-        this.activity = context
-        this.fragment = null
-    }
-
-    constructor(context: Fragment) {
-        this.activity = context.activity
-        this.fragment = context
-    }
-
-    fun buildOpenDocument(onFileSelected: ((uri: Uri?) -> Unit)?) {
-
-        val resultCallback = ActivityResultCallback<Uri> { result ->
-            result?.let { uri ->
-                UriUtil.takeUriPermission(activity?.contentResolver, uri)
-                onFileSelected?.invoke(uri)
-            }
-        }
-
-        getContentResultLauncher = if (fragment != null) {
-            fragment?.registerForActivityResult(
-                GetContent(),
-                resultCallback
-            )
-        } else {
-            activity?.registerForActivityResult(
-                GetContent(),
-                resultCallback
-            )
-        }
-
-        openDocumentResultLauncher = if (fragment != null) {
-            fragment?.registerForActivityResult(
-                OpenDocument(),
-                resultCallback
-            )
-        } else {
-            activity?.registerForActivityResult(
-                OpenDocument(),
-                resultCallback
-            )
-        }
-    }
-
-    fun buildCreateDocument(typeString: String = "application/octet-stream",
-                            onFileCreated: (fileCreated: Uri?)->Unit) {
-
-        val resultCallback = ActivityResultCallback<Uri> { result ->
-            onFileCreated.invoke(result)
-        }
-
-        createDocumentResultLauncher = if (fragment != null) {
-            fragment?.registerForActivityResult(
-                CreateDocument(typeString),
-                resultCallback
-            )
-        } else {
-            activity?.registerForActivityResult(
-                CreateDocument(typeString),
-                resultCallback
-            )
-        }
-    }
-
-    fun openDocument(getContent: Boolean = false,
-                     typeString: String = "*/*") {
-        try {
-            if (getContent) {
-                getContentResultLauncher?.launch(typeString)
-            } else {
-                openDocumentResultLauncher?.launch(arrayOf(typeString))
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to open document", e)
-            showFileManagerDialogFragment()
-        }
-    }
-
-    fun createDocument(titleString: String) {
-        try {
-            createDocumentResultLauncher?.launch(titleString)
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to create document", e)
-            showFileManagerDialogFragment()
-        }
-    }
-
-    /**
-     * Show Browser dialog to select file picker app
-     */
-    private fun showFileManagerDialogFragment() {
-        try {
-            if (fragment != null) {
-                fragment?.parentFragmentManager
-            } else {
-                activity?.supportFragmentManager
-            }?.let { fragmentManager ->
-                FileManagerDialogFragment().show(fragmentManager, "browserDialog")
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Can't open BrowserDialog", e)
-        }
-    }
-
-    class OpenDocument : ActivityResultContracts.OpenDocument() {
-        @SuppressLint("InlinedApi")
-        override fun createIntent(context: Context, input: Array<out String>): Intent {
-            return super.createIntent(context, input).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-                }
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            }
-        }
-    }
-
-    class GetContent : ActivityResultContracts.GetContent() {
-        @SuppressLint("InlinedApi")
-        override fun createIntent(context: Context, input: String): Intent {
-            return super.createIntent(context, input).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-                }
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            }
-        }
-    }
-
-    class CreateDocument(private val typeString: String) : ActivityResultContracts.CreateDocument() {
-        override fun createIntent(context: Context, input: String): Intent {
-            return super.createIntent(context, input).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = typeString
-            }
-        }
-    }
-
-
-    companion object {
-
-        private const val TAG = "OpenFileHelper"
-
-        @SuppressLint("InlinedApi")
-        fun allowCreateDocumentByStorageAccessFramework(packageManager: PackageManager,
-                                                        typeString: String = "application/octet-stream"): Boolean {
-            return when {
-                // To check if a custom file manager can manage the ACTION_CREATE_DOCUMENT
-                Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT -> {
-                    packageManager.queryIntentActivities(Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                        addCategory(Intent.CATEGORY_OPENABLE)
-                        type = typeString
-                    }, PackageManager.MATCH_DEFAULT_ONLY).isNotEmpty()
-                }
-                else -> true
-            }
-        }
-    }
-}
-
-fun View.setOpenDocumentClickListener(externalFileHelper: ExternalFileHelper?) {
-    externalFileHelper?.let { fileHelper ->
-        setOnClickListener {
-            fileHelper.openDocument(false)
-        }
-        setOnLongClickListener {
-            fileHelper.openDocument(true)
-            true
-        }
-    } ?: kotlin.run {
-        setOnClickListener(null)
-        setOnLongClickListener(null)
-    }
-}

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.helpers
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+import com.kunzisoft.keepass.settings.PreferencesUtil
+
+object ReadOnlyHelper {
+
+    private const val READ_ONLY_KEY = "READ_ONLY_KEY"
+
+    const val READ_ONLY_DEFAULT = false
+
+    fun retrieveReadOnlyFromIntent(intent: Intent): Boolean {
+        return intent.getBooleanExtra(READ_ONLY_KEY, READ_ONLY_DEFAULT)
+    }
+
+    fun retrieveReadOnlyFromInstanceStateOrPreference(context: Context, savedInstanceState: Bundle?): Boolean {
+        return if (savedInstanceState != null && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            savedInstanceState.getBoolean(READ_ONLY_KEY)
+        } else {
+            PreferencesUtil.enableReadOnlyDatabase(context)
+        }
+    }
+
+    fun retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState: Bundle?, arguments: Bundle?): Boolean {
+        var readOnly = READ_ONLY_DEFAULT
+        if (savedInstanceState != null && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY)
+        } else if (arguments != null && arguments.containsKey(READ_ONLY_KEY)) {
+            readOnly = arguments.getBoolean(READ_ONLY_KEY)
+        }
+        return readOnly
+    }
+
+    fun retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState: Bundle?, intent: Intent?): Boolean {
+        var readOnly = READ_ONLY_DEFAULT
+        if (savedInstanceState != null && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY)
+        } else {
+            if (intent != null)
+                readOnly = intent.getBooleanExtra(READ_ONLY_KEY, READ_ONLY_DEFAULT)
+        }
+        return readOnly
+    }
+
+    fun putReadOnlyInIntent(intent: Intent, readOnly: Boolean) {
+        intent.putExtra(READ_ONLY_KEY, readOnly)
+    }
+
+    fun putReadOnlyInBundle(bundle: Bundle, readOnly: Boolean) {
+        bundle.putBoolean(READ_ONLY_KEY, readOnly)
+    }
+
+    fun onSaveInstanceState(outState: Bundle, readOnly: Boolean) {
+        outState.putBoolean(READ_ONLY_KEY, readOnly)
+    }
+}

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

@@ -0,0 +1,244 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.helpers
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Activity.RESULT_OK
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import android.view.MenuItem
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.kunzisoft.keepass.activities.dialogs.FileManagerDialogFragment
+import com.kunzisoft.keepass.utils.UriUtil
+
+class SelectFileHelper {
+
+    private var activity: Activity? = null
+    private var fragment: Fragment? = null
+
+    val selectFileOnClickViewListener: SelectFileOnClickViewListener
+        get() = SelectFileOnClickViewListener()
+
+    constructor(context: Activity) {
+        this.activity = context
+        this.fragment = null
+    }
+
+    constructor(context: Fragment) {
+        this.activity = context.activity
+        this.fragment = context
+    }
+
+    inner class SelectFileOnClickViewListener :
+            View.OnClickListener,
+            View.OnLongClickListener,
+            MenuItem.OnMenuItemClickListener {
+
+        private fun onAbstractClick(longClick: Boolean = false) {
+            try {
+                if (longClick) {
+                    try {
+                        openActivityWithActionGetContent()
+                    } catch (e: Exception) {
+                        openActivityWithActionOpenDocument()
+                    }
+                } else {
+                    try {
+                        openActivityWithActionOpenDocument()
+                    } catch (e: Exception) {
+                        openActivityWithActionGetContent()
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Enable to start the file picker activity", e)
+                // Open browser dialog
+                if (lookForOpenIntentsFilePicker())
+                    showBrowserDialog()
+            }
+        }
+
+        override fun onClick(v: View) {
+            onAbstractClick()
+        }
+
+        override fun onLongClick(v: View?): Boolean {
+            onAbstractClick(true)
+            return true
+        }
+
+        override fun onMenuItemClick(item: MenuItem?): Boolean {
+            onAbstractClick()
+            return true
+        }
+    }
+
+    @SuppressLint("InlinedApi")
+    private fun openActivityWithActionOpenDocument() {
+        val intentOpenDocument = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = "*/*"
+            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+        if (fragment != null)
+            fragment?.startActivityForResult(intentOpenDocument, OPEN_DOC)
+        else
+            activity?.startActivityForResult(intentOpenDocument, OPEN_DOC)
+    }
+
+    @SuppressLint("InlinedApi")
+    private fun openActivityWithActionGetContent() {
+        val intentGetContent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = "*/*"
+            addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+        if (fragment != null)
+            fragment?.startActivityForResult(intentGetContent, GET_CONTENT)
+        else
+            activity?.startActivityForResult(intentGetContent, GET_CONTENT)
+    }
+
+    private fun lookForOpenIntentsFilePicker(): Boolean {
+        var showBrowser = false
+        try {
+            if (isIntentAvailable(activity!!, OPEN_INTENTS_FILE_BROWSE)) {
+                val intent = Intent(OPEN_INTENTS_FILE_BROWSE)
+                if (fragment != null)
+                    fragment?.startActivityForResult(intent, FILE_BROWSE)
+                else
+                    activity?.startActivityForResult(intent, FILE_BROWSE)
+            } else {
+                showBrowser = true
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Enable to start OPEN_INTENTS_FILE_BROWSE", e)
+            showBrowser = true
+        }
+
+        return showBrowser
+    }
+
+    /**
+     * Indicates whether the specified action can be used as an intent. This
+     * method queries the package manager for installed packages that can
+     * respond to an intent with the specified action. If no suitable package is
+     * found, this method returns false.
+     *
+     * @param context The application's environment.
+     * @param action The Intent action to check for availability.
+     *
+     * @return True if an Intent with the specified action can be sent and
+     * responded to, false otherwise.
+     */
+    private fun isIntentAvailable(context: Context, action: String): Boolean {
+        val packageManager = context.packageManager
+        val intent = Intent(action)
+        val list = packageManager.queryIntentActivities(intent,
+                PackageManager.MATCH_DEFAULT_ONLY)
+        return list.size > 0
+    }
+
+    /**
+     * Show Browser dialog to select file picker app
+     */
+    private fun showBrowserDialog() {
+        try {
+            val fileManagerDialogFragment = FileManagerDialogFragment()
+            fragment?.let {
+                fileManagerDialogFragment.show(it.parentFragmentManager, "browserDialog")
+            } ?: fileManagerDialogFragment.show((activity as FragmentActivity).supportFragmentManager, "browserDialog")
+        } catch (e: Exception) {
+            Log.e(TAG, "Can't open BrowserDialog", e)
+        }
+    }
+
+    /**
+     * To use in onActivityResultCallback in Fragment or Activity
+     * @param keyFileCallback Callback retrieve from data
+     * @return true if requestCode was captured, false elsechere
+     */
+    fun onActivityResultCallback(
+            requestCode: Int,
+            resultCode: Int,
+            data: Intent?,
+            keyFileCallback: ((uri: Uri?) -> Unit)?): Boolean {
+
+        when (requestCode) {
+            FILE_BROWSE -> {
+                if (resultCode == RESULT_OK) {
+                    val filename = data?.dataString
+                    var keyUri: Uri? = null
+                    if (filename != null) {
+                        keyUri = UriUtil.parse(filename)
+                    }
+                    keyFileCallback?.invoke(keyUri)
+                }
+                return true
+            }
+            GET_CONTENT, OPEN_DOC -> {
+                if (resultCode == RESULT_OK) {
+                    if (data != null) {
+                        val uri = data.data
+                        if (uri != null) {
+                            try {
+                                // try to persist read and write permissions
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                                    activity?.contentResolver?.apply {
+                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                                        takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                // nop
+                            }
+                            keyFileCallback?.invoke(uri)
+                        }
+                    }
+                }
+                return true
+            }
+        }
+        return false
+    }
+
+    companion object {
+
+        private const val TAG = "OpenFileHelper"
+
+        const val OPEN_INTENTS_FILE_BROWSE = "org.openintents.action.PICK_FILE"
+
+        private const val GET_CONTENT = 25745
+        private const val OPEN_DOC = 25845
+        private const val FILE_BROWSE = 25645
+    }
+}

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

@@ -1,80 +0,0 @@
-package com.kunzisoft.keepass.activities.legacy
-
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.viewModels
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
-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
-
-abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval {
-
-    protected val mDatabaseViewModel: DatabaseViewModel by viewModels()
-    protected var mDatabaseTaskProvider: DatabaseTaskProvider? = null
-    protected var mDatabase: Database? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        mDatabaseTaskProvider = DatabaseTaskProvider(this)
-
-        mDatabaseTaskProvider?.onDatabaseRetrieved = { database ->
-            val databaseWasReloaded = database?.wasReloaded == true
-            if (databaseWasReloaded && finishActivityIfReloadRequested()) {
-                finish()
-            } else if (mDatabase == null || mDatabase != database || databaseWasReloaded) {
-                database?.wasReloaded = false
-                onDatabaseRetrieved(database)
-            }
-        }
-        mDatabaseTaskProvider?.onActionFinish = { database, actionTask, result ->
-            onDatabaseActionFinished(database, actionTask, result)
-        }
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        mDatabase = database
-        mDatabaseViewModel.defineDatabase(database)
-        // optional method implementation
-    }
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        mDatabaseViewModel.onActionFinished(database, actionTask, result)
-        // optional method implementation
-    }
-
-    fun createDatabase(databaseUri: Uri,
-                       mainCredential: MainCredential) {
-        mDatabaseTaskProvider?.startDatabaseCreate(databaseUri, mainCredential)
-    }
-
-    fun loadDatabase(databaseUri: Uri,
-                     mainCredential: MainCredential,
-                     readOnly: Boolean,
-                     cipherEncryptDatabase: CipherEncryptDatabase?,
-                     fixDuplicateUuid: Boolean) {
-        mDatabaseTaskProvider?.startDatabaseLoad(databaseUri, mainCredential, readOnly, cipherEncryptDatabase, fixDuplicateUuid)
-    }
-
-    protected fun closeDatabase() {
-        mDatabase?.clearAndClose(this)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mDatabaseTaskProvider?.registerProgressTask()
-    }
-
-    override fun onPause() {
-        mDatabaseTaskProvider?.unregisterProgressTask()
-        super.onPause()
-    }
-}

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

@@ -1,491 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.legacy
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.activity.viewModels
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
-import com.kunzisoft.keepass.activities.helpers.SpecialMode
-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.Node
-import com.kunzisoft.keepass.database.element.node.NodeId
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.model.GroupInfo
-import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.*
-import com.kunzisoft.keepass.view.showActionErrorIfNeeded
-import com.kunzisoft.keepass.viewmodels.NodesViewModel
-import java.util.*
-
-abstract class DatabaseLockActivity : DatabaseModeActivity(),
-    PasswordEncodingDialogFragment.Listener {
-
-    private val mNodesViewModel: NodesViewModel by viewModels()
-
-    protected var mTimeoutEnable: Boolean = true
-
-    private var mLockReceiver: LockReceiver? = null
-    private var mExitLock: Boolean = false
-
-    protected var mDatabaseReadOnly: Boolean = true
-    protected var mMergeDataAllowed: Boolean = false
-    private var mAutoSaveEnable: Boolean = true
-
-    protected var mIconDrawableFactory: IconDrawableFactory? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (savedInstanceState != null
-            && savedInstanceState.containsKey(TIMEOUT_ENABLE_KEY)
-        ) {
-            mTimeoutEnable = savedInstanceState.getBoolean(TIMEOUT_ENABLE_KEY)
-        } else {
-            if (intent != null)
-                mTimeoutEnable =
-                    intent.getBooleanExtra(TIMEOUT_ENABLE_KEY, TIMEOUT_ENABLE_KEY_DEFAULT)
-        }
-
-        mNodesViewModel.nodesToPermanentlyDelete.observe(this) { nodes ->
-            deleteDatabaseNodes(nodes)
-        }
-
-        mDatabaseViewModel.saveDatabase.observe(this) { save ->
-            mDatabaseTaskProvider?.startDatabaseSave(save)
-        }
-
-        mDatabaseViewModel.mergeDatabase.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseMerge()
-        }
-
-        mDatabaseViewModel.reloadDatabase.observe(this) { fixDuplicateUuid ->
-            mDatabaseTaskProvider?.askToStartDatabaseReload(mDatabase?.dataModifiedSinceLastLoading != false) {
-                mDatabaseTaskProvider?.startDatabaseReload(fixDuplicateUuid)
-            }
-        }
-
-        mDatabaseViewModel.saveName.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveName(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveDescription.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveDescription(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveDefaultUsername.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveDefaultUsername(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveColor.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveColor(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveCompression.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveCompression(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.removeUnlinkData.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseRemoveUnlinkedData(it)
-        }
-
-        mDatabaseViewModel.saveRecycleBin.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveRecycleBin(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveTemplatesGroup.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveTemplatesGroup(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveMaxHistoryItems.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveMaxHistoryItems(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveMaxHistorySize.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveMaxHistorySize(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveEncryption.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveEncryption(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveKeyDerivation.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveKeyDerivation(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveIterations.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveIterations(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveMemoryUsage.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveMemoryUsage(it.oldValue, it.newValue, it.save)
-        }
-
-        mDatabaseViewModel.saveParallelism.observe(this) {
-            mDatabaseTaskProvider?.startDatabaseSaveParallelism(it.oldValue, it.newValue, it.save)
-        }
-
-        mExitLock = false
-    }
-
-    open fun finishActivityIfDatabaseNotLoaded(): Boolean {
-        return true
-    }
-
-    override fun onDatabaseRetrieved(database: Database?) {
-        super.onDatabaseRetrieved(database)
-
-        // End activity if database not loaded
-        if (finishActivityIfDatabaseNotLoaded() && (database == null || !database.loaded)) {
-            finish()
-        }
-
-        // Focus view to reinitialize timeout,
-        // view is not necessary loaded so retry later in resume
-        viewToInvalidateTimeout()
-            ?.resetAppTimeoutWhenViewTouchedOrFocused(this, database?.loaded)
-
-        database?.let {
-            // check timeout
-            if (mTimeoutEnable) {
-                if (mLockReceiver == null) {
-                    mLockReceiver = LockReceiver {
-                        mDatabase = null
-                        closeDatabase(database)
-                        if (LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == null)
-                            LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
-                        mExitLock = true
-                        closeOptionsMenu()
-                        finish()
-                    }
-                    registerLockReceiver(mLockReceiver)
-                }
-
-                // After the first creation
-                // or If simply swipe with another application
-                // If the time is out -> close the Activity
-                TimeoutHelper.checkTimeAndLockIfTimeout(this)
-                // If onCreate already record time
-                if (!mExitLock)
-                    TimeoutHelper.recordTime(this, database.loaded)
-            }
-
-            mDatabaseReadOnly = database.isReadOnly
-            mMergeDataAllowed = database.isMergeDataAllowed()
-            mIconDrawableFactory = database.iconDrawableFactory
-
-            checkRegister()
-        }
-    }
-
-    abstract fun viewToInvalidateTimeout(): View?
-
-    override fun onDatabaseActionFinished(
-        database: Database,
-        actionTask: String,
-        result: ActionRunnable.Result
-    ) {
-        super.onDatabaseActionFinished(database, actionTask, result)
-        when (actionTask) {
-            DatabaseTaskNotificationService.ACTION_DATABASE_MERGE_TASK,
-            DatabaseTaskNotificationService.ACTION_DATABASE_RELOAD_TASK -> {
-                // Reload the current activity
-                if (result.isSuccess) {
-                    reloadActivity()
-                } else {
-                    this.showActionErrorIfNeeded(result)
-                    finish()
-                }
-            }
-        }
-    }
-
-    override fun onPasswordEncodingValidateListener(databaseUri: Uri?,
-                                                    mainCredential: MainCredential) {
-        assignDatabasePassword(databaseUri, mainCredential)
-    }
-
-    private fun assignDatabasePassword(databaseUri: Uri?,
-                                       mainCredential: MainCredential) {
-        if (databaseUri != null) {
-            mDatabaseTaskProvider?.startDatabaseAssignPassword(databaseUri, mainCredential)
-        }
-    }
-
-    fun assignPassword(mainCredential: MainCredential) {
-        mDatabase?.let { database ->
-            database.fileUri?.let { databaseUri ->
-                // Show the progress dialog now or after dialog confirmation
-                if (database.validatePasswordEncoding(mainCredential)) {
-                    assignDatabasePassword(databaseUri, mainCredential)
-                } else {
-                    PasswordEncodingDialogFragment.getInstance(databaseUri, mainCredential)
-                        .show(supportFragmentManager, "passwordEncodingTag")
-                }
-            }
-        }
-    }
-
-    fun saveDatabase() {
-        mDatabaseTaskProvider?.startDatabaseSave(true)
-    }
-
-    fun saveDatabaseTo(uri: Uri) {
-        mDatabaseTaskProvider?.startDatabaseSave(true, uri)
-    }
-
-    fun mergeDatabase() {
-        mDatabaseTaskProvider?.startDatabaseMerge()
-    }
-
-    fun mergeDatabaseFrom(uri: Uri, mainCredential: MainCredential) {
-        mDatabaseTaskProvider?.startDatabaseMerge(uri, mainCredential)
-    }
-
-    fun reloadDatabase() {
-        mDatabaseTaskProvider?.askToStartDatabaseReload(mDatabase?.dataModifiedSinceLastLoading != false) {
-            mDatabaseTaskProvider?.startDatabaseReload(false)
-        }
-    }
-
-    fun createEntry(newEntry: Entry,
-                    parent: Group) {
-        mDatabaseTaskProvider?.startDatabaseCreateEntry(newEntry, parent, mAutoSaveEnable)
-    }
-
-    fun updateEntry(oldEntry: Entry,
-                    entryToUpdate: Entry) {
-        mDatabaseTaskProvider?.startDatabaseUpdateEntry(oldEntry, entryToUpdate, mAutoSaveEnable)
-    }
-
-    fun copyNodes(nodesToCopy: List<Node>,
-                  newParent: Group) {
-        mDatabaseTaskProvider?.startDatabaseCopyNodes(nodesToCopy, newParent, mAutoSaveEnable)
-    }
-
-    fun moveNodes(nodesToMove: List<Node>,
-                  newParent: Group) {
-        mDatabaseTaskProvider?.startDatabaseMoveNodes(nodesToMove, newParent, mAutoSaveEnable)
-    }
-
-    private fun eachNodeRecyclable(database: Database, nodes: List<Node>): Boolean {
-        return nodes.find { node ->
-            var cannotRecycle = true
-            if (node is Entry) {
-                cannotRecycle = !database.canRecycle(node)
-            } else if (node is Group) {
-                cannotRecycle = !database.canRecycle(node)
-            }
-            cannotRecycle
-        } == null
-    }
-
-    fun deleteNodes(nodes: List<Node>, recycleBin: Boolean = false) {
-        mDatabase?.let { database ->
-            // If recycle bin enabled, ensure it exists
-            if (database.isRecycleBinEnabled) {
-                database.ensureRecycleBinExists(resources)
-            }
-
-            // If recycle bin enabled and not in recycle bin, move in recycle bin
-            if (eachNodeRecyclable(database, nodes)) {
-                deleteDatabaseNodes(nodes)
-            }
-            // else open the dialog to confirm deletion
-            else {
-                DeleteNodesDialogFragment.getInstance(recycleBin)
-                    .show(supportFragmentManager, "deleteNodesDialogFragment")
-                mNodesViewModel.deleteNodes(nodes)
-            }
-        }
-    }
-
-    private fun deleteDatabaseNodes(nodes: List<Node>) {
-        mDatabaseTaskProvider?.startDatabaseDeleteNodes(nodes, mAutoSaveEnable)
-    }
-
-    fun createGroup(parent: Group,
-                    groupInfo: GroupInfo?) {
-        // Build the group
-        mDatabase?.createGroup()?.let { newGroup ->
-            groupInfo?.let { info ->
-                newGroup.setGroupInfo(info)
-            }
-            // Not really needed here because added in runnable but safe
-            newGroup.parent = parent
-            mDatabaseTaskProvider?.startDatabaseCreateGroup(newGroup, parent, mAutoSaveEnable)
-        }
-    }
-
-    fun updateGroup(oldGroup: Group,
-                    groupInfo: GroupInfo) {
-        // If group updated save it in the database
-        val updateGroup = Group(oldGroup).let { updateGroup ->
-            updateGroup.apply {
-                // WARNING remove parent and children to keep memory
-                removeParent()
-                removeChildren()
-                this.setGroupInfo(groupInfo)
-            }
-        }
-        mDatabaseTaskProvider?.startDatabaseUpdateGroup(oldGroup, updateGroup, mAutoSaveEnable)
-    }
-
-    fun restoreEntryHistory(mainEntryId: NodeId<UUID>,
-                            entryHistoryPosition: Int) {
-        mDatabaseTaskProvider
-            ?.startDatabaseRestoreEntryHistory(mainEntryId, entryHistoryPosition, mAutoSaveEnable)
-    }
-
-    fun deleteEntryHistory(mainEntryId: NodeId<UUID>,
-                           entryHistoryPosition: Int) {
-        mDatabaseTaskProvider?.startDatabaseDeleteEntryHistory(mainEntryId, entryHistoryPosition, mAutoSaveEnable)
-    }
-
-    private fun checkRegister() {
-        // If in ave or registration mode, don't allow read only
-        if ((mSpecialMode == SpecialMode.SAVE
-                    || mSpecialMode == SpecialMode.REGISTRATION)
-            && mDatabaseReadOnly) {
-            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
-            EntrySelectionHelper.removeModesFromIntent(intent)
-            finish()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        // To refresh when back to normal workflow from selection workflow
-        mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
-
-        // Invalidate timeout by touch
-        mDatabase?.let { database ->
-            viewToInvalidateTimeout()
-                ?.resetAppTimeoutWhenViewTouchedOrFocused(this, database.loaded)
-        }
-
-        invalidateOptionsMenu()
-
-        LOCKING_ACTIVITY_UI_VISIBLE = true
-    }
-
-    protected fun checkTimeAndLockIfTimeoutOrResetTimeout(action: (() -> Unit)? = null) {
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
-            mDatabase?.loaded == true,
-            action)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
-        super.onSaveInstanceState(outState)
-    }
-
-    override fun onPause() {
-        LOCKING_ACTIVITY_UI_VISIBLE = false
-
-        super.onPause()
-
-        if (mTimeoutEnable) {
-            // If the time is out during our navigation in activity -> close the Activity
-            TimeoutHelper.checkTimeAndLockIfTimeout(this)
-        }
-    }
-
-    override fun onDestroy() {
-        unregisterLockReceiver(mLockReceiver)
-        super.onDestroy()
-    }
-
-    protected fun lockAndExit() {
-        sendBroadcast(Intent(LOCK_ACTION))
-    }
-
-    fun resetAppTimeout() {
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
-            mDatabase?.loaded ?: false)
-    }
-
-    override fun onBackPressed() {
-        if (mTimeoutEnable) {
-            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this,
-                mDatabase?.loaded == true) {
-                super.onBackPressed()
-            }
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-    companion object {
-
-        const val TAG = "LockingActivity"
-
-        const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
-        const val TIMEOUT_ENABLE_KEY_DEFAULT = true
-
-        private var LOCKING_ACTIVITY_UI_VISIBLE = false
-        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
-    }
-}
-
-/**
- * To reset the app timeout when a view is focused or changed
- */
-@SuppressLint("ClickableViewAccessibility")
-fun View.resetAppTimeoutWhenViewTouchedOrFocused(context: Context, databaseLoaded: Boolean?) {
-    // Log.d(DatabaseLockActivity.TAG, "View prepared to reset app timeout")
-    setOnTouchListener { _, event ->
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                // Log.d(DatabaseLockActivity.TAG, "View touched, try to reset app timeout")
-                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-                    databaseLoaded ?: false)
-            }
-        }
-        false
-    }
-    setOnFocusChangeListener { _, _ ->
-        // Log.d(DatabaseLockActivity.TAG, "View focused, try to reset app timeout")
-        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context,
-            databaseLoaded ?: false)
-    }
-    if (this is ViewGroup) {
-        for (i in 0..childCount) {
-            getChildAt(i)?.resetAppTimeoutWhenViewTouchedOrFocused(context, databaseLoaded)
-        }
-    }
-}

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

@@ -1,11 +0,0 @@
-package com.kunzisoft.keepass.activities.legacy
-
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.tasks.ActionRunnable
-
-interface DatabaseRetrieval {
-    fun onDatabaseRetrieved(database: Database?)
-    fun onDatabaseActionFinished(database: Database,
-                                 actionTask: String,
-                                 result: ActionRunnable.Result)
-}

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

@@ -0,0 +1,215 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.lock
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.activities.helpers.SpecialMode
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
+import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.timeout.TimeoutHelper
+import com.kunzisoft.keepass.utils.*
+
+abstract class LockingActivity : SpecialModeActivity() {
+
+    protected var mTimeoutEnable: Boolean = true
+
+    private var mLockReceiver: LockReceiver? = null
+    private var mExitLock: Boolean = false
+
+    // Force readOnly if Entry Selection mode
+    protected var mReadOnly: Boolean
+        get() {
+            return mReadOnlyToSave
+        }
+        set(value) {
+            mReadOnlyToSave = value
+        }
+    private var mReadOnlyToSave: Boolean = false
+    protected var mAutoSaveEnable: Boolean = true
+
+    var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null
+        private set
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+        mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this)
+
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(TIMEOUT_ENABLE_KEY)) {
+            mTimeoutEnable = savedInstanceState.getBoolean(TIMEOUT_ENABLE_KEY)
+        } else {
+            if (intent != null)
+                mTimeoutEnable = intent.getBooleanExtra(TIMEOUT_ENABLE_KEY, TIMEOUT_ENABLE_KEY_DEFAULT)
+        }
+
+        if (mTimeoutEnable) {
+            mLockReceiver = LockReceiver {
+                closeDatabase()
+                if (LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == null)
+                    LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = LOCKING_ACTIVITY_UI_VISIBLE
+                // Add onActivityForResult response
+                setResult(RESULT_EXIT_LOCK)
+                closeOptionsMenu()
+                finish()
+            }
+            registerLockReceiver(mLockReceiver)
+        }
+
+        mExitLock = false
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == RESULT_EXIT_LOCK) {
+            mExitLock = true
+            if (Database.getInstance().loaded) {
+                lockAndExit()
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // If in ave or registration mode, don't allow read only
+        if ((mSpecialMode == SpecialMode.SAVE
+                        || mSpecialMode == SpecialMode.REGISTRATION)
+                && mReadOnly) {
+            Toast.makeText(this, R.string.error_registration_read_only , Toast.LENGTH_LONG).show()
+            EntrySelectionHelper.removeModesFromIntent(intent)
+            finish()
+        }
+
+        mProgressDatabaseTaskProvider?.registerProgressTask()
+
+        // To refresh when back to normal workflow from selection workflow
+        mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent)
+        mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
+
+        invalidateOptionsMenu()
+
+        if (mTimeoutEnable) {
+            // End activity if database not loaded
+            if (!Database.getInstance().loaded) {
+                finish()
+                return
+            }
+
+            // After the first creation
+            // or If simply swipe with another application
+            // If the time is out -> close the Activity
+            TimeoutHelper.checkTimeAndLockIfTimeout(this)
+            // If onCreate already record time
+            if (!mExitLock)
+                TimeoutHelper.recordTime(this)
+        }
+
+        LOCKING_ACTIVITY_UI_VISIBLE = true
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onPause() {
+        LOCKING_ACTIVITY_UI_VISIBLE = false
+
+        mProgressDatabaseTaskProvider?.unregisterProgressTask()
+
+        super.onPause()
+
+        if (mTimeoutEnable) {
+            // If the time is out during our navigation in activity -> close the Activity
+            TimeoutHelper.checkTimeAndLockIfTimeout(this)
+        }
+    }
+
+    override fun onDestroy() {
+        unregisterLockReceiver(mLockReceiver)
+        super.onDestroy()
+    }
+
+    protected fun lockAndExit() {
+        sendBroadcast(Intent(LOCK_ACTION))
+    }
+
+    override fun onBackPressed() {
+        if (mTimeoutEnable) {
+            TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
+                super.onBackPressed()
+            }
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    companion object {
+
+        const val TAG = "LockingActivity"
+
+        const val RESULT_EXIT_LOCK = 1450
+
+        const val TIMEOUT_ENABLE_KEY = "TIMEOUT_ENABLE_KEY"
+        const val TIMEOUT_ENABLE_KEY_DEFAULT = true
+
+        private var LOCKING_ACTIVITY_UI_VISIBLE = false
+        var LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK: Boolean? = null
+    }
+}
+
+/**
+ * To reset the app timeout when a view is focused or changed
+ */
+@SuppressLint("ClickableViewAccessibility")
+fun View.resetAppTimeoutWhenViewFocusedOrChanged(context: Context) {
+    setOnTouchListener { _, event ->
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                //Log.d(LockingActivity.TAG, "View touched, try to reset app timeout")
+                TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context)
+            }
+        }
+        false
+    }
+    setOnFocusChangeListener { _, _ ->
+        //Log.d(LockingActivity.TAG, "View focused, try to reset app timeout")
+        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(context)
+    }
+    if (this is ViewGroup) {
+        for (i in 0..childCount) {
+            getChildAt(i)?.resetAppTimeoutWhenViewFocusedOrChanged(context)
+        }
+    }
+}

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

@@ -1,23 +1,21 @@
-package com.kunzisoft.keepass.activities.legacy
+package com.kunzisoft.keepass.activities.selection
 
 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
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.activities.helpers.TypeMode
+import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.SpecialModeView
 
-
 /**
- * Activity to manage database special mode (ie: selection mode)
+ * Activity to manage special mode (ie: selection mode)
  */
-abstract class DatabaseModeActivity : DatabaseActivity() {
+abstract class SpecialModeActivity : StylishActivity() {
 
     protected var mSpecialMode: SpecialMode = SpecialMode.DEFAULT
     private var mTypeMode: TypeMode = TypeMode.DEFAULT
@@ -66,7 +64,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
             EntrySelectionHelper.removeModesFromIntent(intent)
             EntrySelectionHelper.removeInfoFromIntent(intent)
             if (mSpecialMode != SpecialMode.DEFAULT) {
-                backToTheMainAppAndFinish()
+                // To move the app in background
+                moveTaskToBack(true)
             }
         }
     }
@@ -79,7 +78,8 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
             EntrySelectionHelper.removeModesFromIntent(intent)
             EntrySelectionHelper.removeInfoFromIntent(intent)
             if (mSpecialMode != SpecialMode.DEFAULT) {
-                backToTheMainAppAndFinish()
+                // To move the app in background
+                moveTaskToBack(true)
             }
         }
     }
@@ -89,19 +89,11 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
             // To get the app caller, only for IntentSender
             super.onBackPressed()
         } else {
-            backToTheMainAppAndFinish()
+            // To move the app in background
+            moveTaskToBack(true)
         }
     }
 
-    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)
 
@@ -169,17 +161,12 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
         }
 
         // To hide home button from the regular toolbar in special mode
-        if (mSpecialMode != SpecialMode.DEFAULT
-            && hideHomeButtonIfModeIsNotDefault()) {
+        if (mSpecialMode != SpecialMode.DEFAULT) {
             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

@@ -37,16 +37,12 @@ object Stylish {
      * Initialize the class with a theme preference
      * @param context Context to retrieve the theme preference
      */
-    fun load(context: Context) {
+    fun init(context: Context) {
         Log.d(Stylish::class.java.name, "Attatching to " + context.packageName)
-        try {
-            themeString = PreferencesUtil.getStyle(context)
-        } catch (e: Exception) {
-            Log.e("Stylish", "Unable to get preference style", e)
-        }
+        themeString = PreferencesUtil.getStyle(context)
     }
 
-    fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
+    private fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
         val systemNightMode = when (PreferencesUtil.getStyleBrightness(context)) {
             context.getString(R.string.list_style_brightness_light) -> false
             context.getString(R.string.list_style_brightness_night) -> true
@@ -69,10 +65,8 @@ 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
         }
@@ -83,25 +77,19 @@ 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
         }
     }
 
-    fun defaultStyle(context: Context): String {
-        return context.getString(R.string.list_style_name_light)
-    }
-
     /**
      * Assign the style to the class attribute
      * @param styleString Style id String
      */
     fun assignStyle(context: Context, styleString: String) {
-        PreferencesUtil.setStyle(context, styleString)
+        themeString = retrieveEquivalentSystemStyle(context, styleString)
     }
 
     /**
@@ -117,14 +105,10 @@ 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/StylishActivity.kt

@@ -22,13 +22,10 @@ package com.kunzisoft.keepass.activities.stylish
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.view.WindowManager
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.settings.NestedAppSettingsFragment.Companion.DATABASE_PREFERENCE_CHANGED
+import android.util.Log
+import android.view.WindowManager
 
 /**
  * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from
@@ -38,7 +35,6 @@ abstract class StylishActivity : AppCompatActivity() {
 
     @StyleRes
     private var themeId: Int = 0
-    private var customStyle = true
 
     /* (non-Javadoc) Workaround for HTC Linkify issues
      * @see android.app.Activity#startActivity(android.content.Intent)
@@ -56,30 +52,10 @@ abstract class StylishActivity : AppCompatActivity() {
         }
     }
 
-    open fun applyCustomStyle(): Boolean {
-        return true
-    }
-
-    open fun finishActivityIfReloadRequested(): Boolean {
-        return false
-    }
-
-    open fun reloadActivity() {
-        if (!finishActivityIfReloadRequested()) {
-            startActivity(intent)
-        }
-        finish()
-        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        customStyle = applyCustomStyle()
-        if (customStyle) {
-            this.themeId = Stylish.getThemeId(this)
-            setTheme(themeId)
-        }
+        this.themeId = Stylish.getThemeId(this)
+        setTheme(themeId)
 
         // Several gingerbread devices have problems with FLAG_SECURE
         window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
@@ -87,17 +63,9 @@ abstract class StylishActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-
-        if ((customStyle && Stylish.getThemeId(this) != this.themeId)
-            || DATABASE_PREFERENCE_CHANGED) {
-            DATABASE_PREFERENCE_CHANGED = false
+        if (Stylish.getThemeId(this) != this.themeId) {
             Log.d(this.javaClass.name, "Theme change detected, restarting activity")
-            recreateActivity()
+            this.recreate()
         }
     }
-
-    private fun recreateActivity() {
-        // To prevent KitKat bugs
-        Handler(Looper.getMainLooper()).post { recreate() }
-    }
 }

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

@@ -23,14 +23,12 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
+import androidx.annotation.StyleRes
+import androidx.fragment.app.Fragment
+import androidx.appcompat.view.ContextThemeWrapper
 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() {
 
@@ -44,46 +42,32 @@ abstract class StylishFragment : Fragment() {
         contextThemed = ContextThemeWrapper(context, themeId)
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         // To fix status bar color
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             val window = requireActivity().window
             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) {
-                Log.e(TAG, "Unable to retrieve theme : status bar color", e)
-            }
+            } catch (e: Exception) {}
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 try {
                     val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
-                    windowInset.isAppearanceLightStatusBars = taWindowStatusLight
-                            ?.getBoolean(0, false) == true
+                    if (taWindowStatusLight?.getBoolean(0, false) == true) {
+                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    }
                     taWindowStatusLight?.recycle()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Unable to retrieve theme : window light status bar", e)
-                }
+                } catch (e: Exception) {}
             }
             try {
                 val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
                 window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
                 taNavigationBarColor?.recycle()
-            } catch (e: Exception) {
-                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)
-                }
-            }
+            } catch (e: Exception) {}
         }
         return super.onCreateView(inflater, container, savedInstanceState)
     }
@@ -92,8 +76,4 @@ 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/BreadcrumbAdapter.kt

@@ -1,150 +0,0 @@
-package com.kunzisoft.keepass.adapters
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Color
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.view.strikeOut
-
-class BreadcrumbAdapter(val context: Context)
-    : RecyclerView.Adapter<BreadcrumbAdapter.BreadcrumbGroupViewHolder>() {
-
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var iconDrawableFactory: IconDrawableFactory? = null
-        @SuppressLint("NotifyDataSetChanged")
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    private var mNodeBreadcrumb: MutableList<Node?> = mutableListOf()
-    var onItemClickListener: ((item: Node, position: Int)->Unit)? = null
-    var onLongItemClickListener: ((item: Node, position: Int)->Unit)? = null
-
-    private var mShowNumberEntries = false
-    private var mShowUUID = false
-    private var mIconColor: Int = 0
-
-    init {
-        mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
-        mShowUUID = PreferencesUtil.showUUID(context)
-
-        // Retrieve the textColor to tint the icon
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        mIconColor = taTextColor.getColor(0, Color.WHITE)
-        taTextColor.recycle()
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun setNode(node: Node?) {
-        mNodeBreadcrumb.clear()
-        node?.let {
-            var currentNode = it
-            mNodeBreadcrumb.add(0, currentNode)
-            while (currentNode.containsParent()) {
-                currentNode.parent?.let { parent ->
-                    currentNode = parent
-                    mNodeBreadcrumb.add(0, currentNode)
-                }
-            }
-        }
-        notifyDataSetChanged()
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (position) {
-            mNodeBreadcrumb.size - 1 -> 0
-            else -> 1
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BreadcrumbGroupViewHolder {
-        return BreadcrumbGroupViewHolder(inflater.inflate(
-            when (viewType) {
-                0 -> R.layout.item_group
-                else -> R.layout.item_breadcrumb
-            }, parent, false)
-        )
-    }
-
-    override fun onBindViewHolder(holder: BreadcrumbGroupViewHolder, position: Int) {
-        val node = mNodeBreadcrumb[position]
-
-        holder.groupNameView.apply {
-            text = node?.title ?: ""
-            strikeOut(node?.isCurrentlyExpires ?: false)
-        }
-
-        holder.itemView.apply {
-            setOnClickListener {
-                node?.let {
-                    onItemClickListener?.invoke(it, position)
-                }
-            }
-            setOnLongClickListener {
-                node?.let {
-                    onLongItemClickListener?.invoke(it, position)
-                }
-                true
-            }
-        }
-
-        if (node?.type == Type.GROUP) {
-            (node as Group).let { group ->
-
-                holder.groupIconView?.let { imageView ->
-                    iconDrawableFactory?.assignDatabaseIcon(
-                        imageView,
-                        group.icon,
-                        mIconColor
-                    )
-                }
-
-                holder.groupNumbersView?.apply {
-                    if (mShowNumberEntries) {
-                        group.refreshNumberOfChildEntries(Group.ChildFilter.getDefaults(context))
-                        text = group.numberOfChildEntries.toString()
-                        visibility = View.VISIBLE
-                    } else {
-                        visibility = View.GONE
-                    }
-                }
-
-                holder.groupMetaView?.apply {
-                    val meta = group.nodeId.toVisualString()
-                    visibility = if (meta != null
-                        && !group.isVirtual
-                        && mShowUUID
-                    ) {
-                        text = meta
-                        View.VISIBLE
-                    } else {
-                        View.GONE
-                    }
-                }
-            }
-        }
-
-    }
-
-    override fun getItemCount(): Int {
-        return mNodeBreadcrumb.size
-    }
-
-    inner class BreadcrumbGroupViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var groupIconView: ImageView? = itemView.findViewById(R.id.group_icon)
-        var groupNumbersView: TextView? = itemView.findViewById(R.id.group_numbers)
-        var groupNameView: TextView = itemView.findViewById(R.id.group_name)
-        var groupMetaView: TextView? = itemView.findViewById(R.id.group_meta)
-    }
-}

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

@@ -26,13 +26,13 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.database.element.Entry
 
 class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHistoryAdapter.EntryHistoryViewHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryHistoryList: MutableList<EntryInfo> = ArrayList()
-    var onItemClickListener: ((item: EntryInfo, position: Int)->Unit)? = null
+    var entryHistoryList: MutableList<Entry> = ArrayList()
+    var onItemClickListener: ((item: Entry, position: Int)->Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryHistoryViewHolder {
         return EntryHistoryViewHolder(inflater.inflate(R.layout.item_list_entry_history, parent, false))
@@ -44,6 +44,7 @@ class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHist
         holder.lastModifiedView.text = entryHistory.lastModificationTime.getDateTimeString(context.resources)
         holder.titleView.text = entryHistory.title
         holder.usernameView.text = entryHistory.username
+        holder.urlView.text = entryHistory.url
 
         holder.itemView.setOnClickListener {
             onItemClickListener?.invoke(entryHistory, position)
@@ -63,5 +64,6 @@ class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHist
         var lastModifiedView: TextView = itemView.findViewById(R.id.entry_history_last_modified)
         var titleView: TextView = itemView.findViewById(R.id.entry_history_title)
         var usernameView: TextView = itemView.findViewById(R.id.entry_history_username)
+        var urlView: TextView = itemView.findViewById(R.id.entry_history_url)
     }
 }

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

@@ -27,7 +27,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.Field
+import com.kunzisoft.keepass.model.Field
 
 import java.util.ArrayList
 

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

@@ -30,8 +30,6 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.SortedList
-import androidx.recyclerview.widget.SortedListAdapterCallback
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.DatabaseFile
 import com.kunzisoft.keepass.view.collapse
@@ -46,43 +44,11 @@ class FileDatabaseHistoryAdapter(context: Context)
     private var fileSelectClearListener: ((DatabaseFile)->Boolean)? = null
     private var saveAliasListener: ((DatabaseFile)->Unit)? = null
 
-    private var mDefaultDatabase: DatabaseFile? = null
-    private var mExpandedDatabaseFile: SuperDatabaseFile? = null
-    private var mPreviousExpandedDatabaseFile: SuperDatabaseFile? = null
+    private val listDatabaseFiles = ArrayList<DatabaseFile>()
 
-    private val mListPosition = mutableListOf<SuperDatabaseFile>()
-    private val mSortedListDatabaseFiles = SortedList(SuperDatabaseFile::class.java,
-        object: SortedListAdapterCallback<SuperDatabaseFile>(this) {
-            override fun compare(item1: SuperDatabaseFile, item2: SuperDatabaseFile): Int {
-                val indexItem1 = mListPosition.indexOf(item1)
-                val indexItem2 = mListPosition.indexOf(item2)
-                return if (indexItem1 == -1 && indexItem2 == -1)
-                    -1
-                else if (indexItem1 < indexItem2)
-                    -1
-                else if (indexItem1 > indexItem2)
-                    1
-                else
-                    0
-            }
-
-            override fun areContentsTheSame(oldItem: SuperDatabaseFile, newItem: SuperDatabaseFile): Boolean {
-                val oldDatabaseFile = oldItem.databaseFile
-                val newDatabaseFile = newItem.databaseFile
-                return oldDatabaseFile.databaseUri == newDatabaseFile.databaseUri
-                        && oldDatabaseFile.databaseDecodedPath == newDatabaseFile.databaseDecodedPath
-                        && oldDatabaseFile.databaseAlias == newDatabaseFile.databaseAlias
-                        && oldDatabaseFile.databaseFileExists == newDatabaseFile.databaseFileExists
-                        && oldDatabaseFile.databaseLastModified == newDatabaseFile.databaseLastModified
-                        && oldDatabaseFile.databaseSize == newDatabaseFile.databaseSize
-                        && oldItem.default == newItem.default
-            }
-
-            override fun areItemsTheSame(item1: SuperDatabaseFile, item2: SuperDatabaseFile): Boolean {
-                return item1.databaseFile == item2.databaseFile
-            }
-        }
-    )
+    private var mDefaultDatabaseFile: DatabaseFile? = null
+    private var mExpandedDatabaseFile: DatabaseFile? = null
+    private var mPreviousExpandedDatabaseFile: DatabaseFile? = null
 
     @ColorInt
     private val defaultColor: Int
@@ -105,8 +71,7 @@ class FileDatabaseHistoryAdapter(context: Context)
 
     override fun onBindViewHolder(holder: FileDatabaseHistoryViewHolder, position: Int) {
         // Get info from position
-        val superDatabaseFile = mSortedListDatabaseFiles[position]
-        val databaseFile = superDatabaseFile.databaseFile
+        val databaseFile = listDatabaseFiles[position]
 
         // Click item to open file
         holder.fileContainer.setOnClickListener {
@@ -115,7 +80,7 @@ class FileDatabaseHistoryAdapter(context: Context)
 
         // Default database
         holder.defaultFileButton.apply {
-            this.isChecked = superDatabaseFile.default
+            this.isChecked = mDefaultDatabaseFile == databaseFile
             setOnClickListener {
                 defaultDatabaseListener?.invoke(if (isChecked) databaseFile else null)
             }
@@ -150,7 +115,7 @@ class FileDatabaseHistoryAdapter(context: Context)
         }
 
         // Click on information
-        val isExpanded = superDatabaseFile == mExpandedDatabaseFile
+        val isExpanded = databaseFile == mExpandedDatabaseFile
         // Hides or shows info
         holder.fileExpandContainer.apply {
             if (isExpanded) {
@@ -186,16 +151,16 @@ class FileDatabaseHistoryAdapter(context: Context)
         }
 
         if (isExpanded) {
-            mPreviousExpandedDatabaseFile = superDatabaseFile
+            mPreviousExpandedDatabaseFile = databaseFile
         }
         holder.fileInformationButton.apply {
             animate().rotation(if (isExpanded) 180F else 0F).start()
             setOnClickListener {
-                mExpandedDatabaseFile = if (isExpanded) null else superDatabaseFile
+                mExpandedDatabaseFile = if (isExpanded) null else databaseFile
                 // Notify change
-                val previousExpandedPosition = mListPosition.indexOf(mPreviousExpandedDatabaseFile)
+                val previousExpandedPosition = listDatabaseFiles.indexOf(mPreviousExpandedDatabaseFile)
                 notifyItemChanged(previousExpandedPosition)
-                val expandedPosition = mListPosition.indexOf(mExpandedDatabaseFile)
+                val expandedPosition = listDatabaseFiles.indexOf(mExpandedDatabaseFile)
                 notifyItemChanged(expandedPosition)
             }
         }
@@ -207,67 +172,50 @@ class FileDatabaseHistoryAdapter(context: Context)
     }
 
     override fun getItemCount(): Int {
-        return mSortedListDatabaseFiles.size()
+        return listDatabaseFiles.size
     }
 
     fun clearDatabaseFileHistoryList() {
-        mListPosition.clear()
-        mSortedListDatabaseFiles.clear()
+        listDatabaseFiles.clear()
     }
 
     fun addDatabaseFileHistory(fileDatabaseHistoryToAdd: DatabaseFile) {
-        val superToAdd = SuperDatabaseFile(fileDatabaseHistoryToAdd)
-        mListPosition.add(0, superToAdd)
-        mSortedListDatabaseFiles.add(superToAdd)
+        listDatabaseFiles.add(0, fileDatabaseHistoryToAdd)
+        notifyItemInserted(0)
     }
 
     fun updateDatabaseFileHistory(fileDatabaseHistoryToUpdate: DatabaseFile) {
-        val superToUpdate = SuperDatabaseFile(fileDatabaseHistoryToUpdate)
-        val index = mListPosition.indexOf(superToUpdate)
-        if (mListPosition.remove(superToUpdate)) {
-            mListPosition.add(index, superToUpdate)
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToUpdate)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToUpdate)) {
+            listDatabaseFiles.add(index, fileDatabaseHistoryToUpdate)
+            notifyItemChanged(index)
         }
-        mSortedListDatabaseFiles.updateItemAt(index, superToUpdate)
     }
 
     fun deleteDatabaseFileHistory(fileDatabaseHistoryToDelete: DatabaseFile) {
-        val superToDelete = SuperDatabaseFile(fileDatabaseHistoryToDelete)
-        val index = mListPosition.indexOf(superToDelete)
-        mListPosition.remove(superToDelete)
-        mSortedListDatabaseFiles.removeItemAt(index)
+        val index = listDatabaseFiles.indexOf(fileDatabaseHistoryToDelete)
+        if (listDatabaseFiles.remove(fileDatabaseHistoryToDelete)) {
+            notifyItemRemoved(index)
+        }
     }
 
     fun replaceAllDatabaseFileHistoryList(listFileDatabaseHistoryToAdd: List<DatabaseFile>) {
-        val superMapToReplace = listFileDatabaseHistoryToAdd.map {
-            SuperDatabaseFile(it)
+        if (listDatabaseFiles.isEmpty()) {
+            listFileDatabaseHistoryToAdd.forEach {
+                listDatabaseFiles.add(it)
+                notifyItemInserted(listDatabaseFiles.size)
+            }
+        } else {
+            listDatabaseFiles.clear()
+            listDatabaseFiles.addAll(listFileDatabaseHistoryToAdd)
+            notifyDataSetChanged()
         }
-        mListPosition.clear()
-        mListPosition.addAll(superMapToReplace)
-        mSortedListDatabaseFiles.replaceAll(superMapToReplace)
     }
 
     fun setDefaultDatabase(databaseUri: Uri?) {
-        // Remove default from last item
-        val oldDefaultDatabasePosition = mListPosition.indexOfFirst {
-            it.default
-        }
-        if (oldDefaultDatabasePosition >= 0) {
-            val oldDefaultDatabase = mListPosition[oldDefaultDatabasePosition].apply {
-                default = false
-            }
-            mSortedListDatabaseFiles.updateItemAt(oldDefaultDatabasePosition, oldDefaultDatabase)
-        }
-        // Add default to new item
-        val newDefaultDatabaseFilePosition = mListPosition.indexOfFirst {
-            it.databaseFile.databaseUri == databaseUri
-        }
-        if (newDefaultDatabaseFilePosition >= 0) {
-            val newDefaultDatabase = mListPosition[newDefaultDatabaseFilePosition].apply {
-                default = true
-            }
-            mDefaultDatabase = newDefaultDatabase.databaseFile
-            mSortedListDatabaseFiles.updateItemAt(newDefaultDatabaseFilePosition, newDefaultDatabase)
-        }
+        val defaultDatabaseFile = listDatabaseFiles.firstOrNull { it.databaseUri == databaseUri }
+        mDefaultDatabaseFile = defaultDatabaseFile
+        notifyDataSetChanged()
     }
 
     fun setOnDefaultDatabaseListener(listener: ((DatabaseFile?) -> Unit)?) {
@@ -286,30 +234,6 @@ class FileDatabaseHistoryAdapter(context: Context)
         this.saveAliasListener = listener
     }
 
-    private inner class SuperDatabaseFile(
-        var databaseFile: DatabaseFile,
-        var default: Boolean = false
-    ) {
-
-        init {
-            if (mDefaultDatabase == databaseFile)
-                this.default = true
-        }
-
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (other !is SuperDatabaseFile) return false
-
-            if (databaseFile != other.databaseFile) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            return databaseFile.hashCode()
-        }
-    }
-
     class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         var fileContainer: ViewGroup = itemView.findViewById(R.id.file_container_basic_info)

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

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.icon.IconImageDraw
@@ -96,12 +95,6 @@ class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tint
     override fun onBindViewHolder(holder: CustomIconViewHolder, position: Int) {
         val icon = iconList[position]
         iconDrawableFactory?.assignDatabaseIcon(holder.iconImageView, icon, tintIcon)
-        icon.getIconImageToDraw().custom.name.let { iconName ->
-            holder.iconTextView.apply {
-                text = iconName
-                visibility = if (iconName.isNotEmpty()) View.VISIBLE else View.GONE
-            }
-        }
         holder.iconContainerView.isSelected = icon.selected
         holder.itemView.setOnClickListener {
             iconPickerListener?.onIconClickListener(icon)
@@ -124,6 +117,5 @@ class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tint
     inner class CustomIconViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var iconContainerView: ViewGroup = itemView.findViewById(R.id.icon_container)
         var iconImageView: ImageView = itemView.findViewById(R.id.icon_image)
-        var iconTextView: TextView = itemView.findViewById(R.id.icon_name)
     }
 }

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

@@ -27,12 +27,11 @@ import android.view.View
 import android.view.ViewGroup
 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
-import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
@@ -41,11 +40,7 @@ import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.template.TemplateField
-import com.kunzisoft.keepass.otp.OtpElement
-import com.kunzisoft.keepass.otp.OtpType
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.view.setTextSize
 import com.kunzisoft.keepass.view.strikeOut
 import java.util.*
@@ -54,9 +49,8 @@ import java.util.*
  * Create node list adapter with contextMenu or not
  * @param context Context to use
  */
-class NodesAdapter (private val context: Context,
-                    private val database: Database)
-    : RecyclerView.Adapter<NodesAdapter.NodeViewHolder>() {
+class NodeAdapter (private val context: Context)
+    : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {
 
     private var mNodeComparator: Comparator<NodeVersionedInterface<Group>>? = null
     private val mNodeSortedListCallback: NodeSortedListCallback
@@ -66,36 +60,26 @@ class NodesAdapter (private val context: Context,
     private var mCalculateViewTypeTextSize = Array(2) { true } // number of view type
     private var mTextSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX
     private var mPrefSizeMultiplier: Float = 0F
-    private var mTextDefaultDimension: Float = 0F
-    private var mSubTextDefaultDimension: Float = 0F
-    private var mMetaTextDefaultDimension: Float = 0F
-    private var mOtpTokenTextDefaultDimension: Float = 0F
+    private var mSubtextDefaultDimension: Float = 0F
+    private var mInfoTextDefaultDimension: Float = 0F
     private var mNumberChildrenTextDefaultDimension: Float = 0F
     private var mIconDefaultDimension: Float = 0F
 
-    private var mShowEntryColors: Boolean = true
     private var mShowUserNames: Boolean = true
     private var mShowNumberEntries: Boolean = true
-    private var mShowOTP: Boolean = false
-    private var mShowUUID: Boolean = false
     private var mEntryFilters = arrayOf<Group.ChildFilter>()
-    private var mOldVirtualGroup = false
-    private var mVirtualGroup = false
 
     private var mActionNodesList = LinkedList<Node>()
     private var mNodeClickCallback: NodeClickCallback? = null
-    private var mClipboardHelper = ClipboardHelper(context)
+
+    private val mDatabase: Database
 
     @ColorInt
-    private val mTextColorPrimary: Int
+    private val mContentSelectionColor: Int
     @ColorInt
-    private val mTextColor: Int
+    private val mIconGroupColor: Int
     @ColorInt
-    private val mTextColorSecondary: Int
-    @ColorInt
-    private val mColorAccentLight: Int
-    @ColorInt
-    private val mColorOnAccentColor: Int
+    private val mIconEntryColor: Int
 
     /**
      * Determine if the adapter contains or not any element
@@ -112,29 +96,22 @@ class NodesAdapter (private val context: Context,
         this.mNodeSortedListCallback = NodeSortedListCallback()
         this.mNodeSortedList = SortedList(Node::class.java, mNodeSortedListCallback)
 
+        // Database
+        this.mDatabase = Database.getInstance()
+
+        // 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)
+        this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
         taTextColorPrimary.recycle()
-        // To get text color
+        // In two times to fix bug compilation
         val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        this.mTextColor = taTextColor.getColor(0, Color.BLACK)
+        this.mIconEntryColor = taTextColor.getColor(0, Color.BLACK)
         taTextColor.recycle()
-        // To get text color secondary
-        val taTextColorSecondary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorSecondary))
-        this.mTextColorSecondary = taTextColorSecondary.getColor(0, Color.BLACK)
-        taTextColorSecondary.recycle()
-        // To get background color for selection
-        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 taColorOnAccentColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
-        this.mColorOnAccentColor = taColorOnAccentColor.getColor(0, Color.WHITE)
-        taColorOnAccentColor.recycle()
     }
 
-    private fun assignPreferences() {
+    fun assignPreferences() {
         this.mPrefSizeMultiplier = PreferencesUtil.getListTextSize(context)
 
         notifyChangeSort(
@@ -146,11 +123,8 @@ class NodesAdapter (private val context: Context,
                         )
                 )
 
-        this.mShowEntryColors = PreferencesUtil.showEntryColors(context)
         this.mShowUserNames = PreferencesUtil.showUsernamesListEntries(context)
         this.mShowNumberEntries = PreferencesUtil.showNumberEntries(context)
-        this.mShowOTP = PreferencesUtil.showOTPToken(context)
-        this.mShowUUID = PreferencesUtil.showUUID(context)
 
         this.mEntryFilters = Group.ChildFilter.getDefaults(context)
 
@@ -162,8 +136,6 @@ class NodesAdapter (private val context: Context,
      * Rebuild the list by clear and build children from the group
      */
     fun rebuildList(group: Group) {
-        mOldVirtualGroup = mVirtualGroup
-        mVirtualGroup = group.isVirtual
         assignPreferences()
         mNodeSortedList.replaceAll(group.getFilteredChildren(mEntryFilters))
     }
@@ -174,26 +146,9 @@ class NodesAdapter (private val context: Context,
         }
 
         override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
-            if (mOldVirtualGroup != mVirtualGroup)
-                return false
-            var typeContentTheSame = true
-            if (oldItem is Entry && newItem is Entry) {
-                typeContentTheSame = oldItem.getVisualTitle() == newItem.getVisualTitle()
-                        && oldItem.username == newItem.username
-                        && oldItem.backgroundColor == newItem.backgroundColor
-                        && oldItem.foregroundColor == newItem.foregroundColor
-                        && oldItem.getOtpElement() == newItem.getOtpElement()
-                        && oldItem.containsAttachment() == newItem.containsAttachment()
-            } else if (oldItem is Group && newItem is Group) {
-                typeContentTheSame = oldItem.numberOfChildEntries == newItem.numberOfChildEntries
-                        && oldItem.notes == newItem.notes
-            }
-            return typeContentTheSame
-                    && oldItem.nodeId == newItem.nodeId
-                    && oldItem.type == newItem.type
+            return oldItem.type == newItem.type
                     && oldItem.title == newItem.title
                     && oldItem.icon == newItem.icon
-                    && oldItem.isCurrentlyExpires == newItem.isCurrentlyExpires
         }
 
         override fun areItemsTheSame(item1: Node, item2: Node): Boolean {
@@ -286,10 +241,6 @@ class NodesAdapter (private val context: Context,
         mNodeSortedList.endBatchedUpdates()
     }
 
-    fun indexOf(node: Node): Int {
-        return mNodeSortedList.indexOf(node)
-    }
-
     fun notifyNodeChanged(node: Node) {
         notifyItemChanged(mNodeSortedList.indexOf(node))
     }
@@ -315,7 +266,7 @@ class NodesAdapter (private val context: Context,
      */
     fun notifyChangeSort(sortNodeEnum: SortNodeEnum,
                          sortNodeParameters: SortNodeEnum.SortNodeParameters) {
-        this.mNodeComparator = sortNodeEnum.getNodeComparator(database, sortNodeParameters)
+        this.mNodeComparator = sortNodeEnum.getNodeComparator(sortNodeParameters)
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -329,10 +280,8 @@ class NodesAdapter (private val context: Context,
             mInflater.inflate(R.layout.item_list_nodes_entry, parent, false)
         }
         val nodeViewHolder = NodeViewHolder(view)
-        mTextDefaultDimension = nodeViewHolder.text.textSize
-        mSubTextDefaultDimension = nodeViewHolder.subText?.textSize ?: mSubTextDefaultDimension
-        mMetaTextDefaultDimension = nodeViewHolder.meta.textSize
-        mOtpTokenTextDefaultDimension = nodeViewHolder.otpToken?.textSize ?: mOtpTokenTextDefaultDimension
+        mInfoTextDefaultDimension = nodeViewHolder.text.textSize
+        mSubtextDefaultDimension = nodeViewHolder.subText.textSize
         nodeViewHolder.numberChildren?.let {
             mNumberChildrenTextDefaultDimension = it.textSize
         }
@@ -343,125 +292,57 @@ class NodesAdapter (private val context: Context,
         val subNode = mNodeSortedList.get(position)
 
         // Node selection
-        holder.container.apply {
-            isSelected = mActionNodesList.contains(subNode)
+        holder.container.isSelected = mActionNodesList.contains(subNode)
+
+        // Assign image
+        val iconColor = if (holder.container.isSelected)
+            mContentSelectionColor
+        else when (subNode.type) {
+            Type.GROUP -> mIconGroupColor
+            Type.ENTRY -> mIconEntryColor
+        }
+        holder.imageIdentifier?.setColorFilter(iconColor)
+        holder.icon.apply {
+            mDatabase.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
-            setTextSize(mTextSizeUnit, mTextDefaultDimension, mPrefSizeMultiplier)
+            setTextSize(mTextSizeUnit, mInfoTextDefaultDimension, mPrefSizeMultiplier)
             strikeOut(subNode.isCurrentlyExpires)
         }
-        // Add meta text to show UUID
-        holder.meta.apply {
-            val nodeId = subNode.nodeId?.toVisualString()
-            if (mShowUUID && nodeId != null) {
-                text = nodeId
-                setTextSize(mTextSizeUnit, mMetaTextDefaultDimension, mPrefSizeMultiplier)
-                visibility = View.VISIBLE
-            } else {
-                visibility = View.GONE
-            }
-        }
-        // Add path to virtual group
-        if (mVirtualGroup) {
-            holder.path?.apply {
-                text = subNode.getPathString()
-                visibility = View.VISIBLE
-            }
-        } else {
-            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
+        // Add subText with username
+        holder.subText.apply {
+            text = ""
+            strikeOut(subNode.isCurrentlyExpires)
+            visibility = View.GONE
         }
 
         // Specific elements for entry
         if (subNode.type == Type.ENTRY) {
             val entry = subNode as Entry
-            database.startManageEntry(entry)
+            mDatabase.startManageEntry(entry)
 
             holder.text.text = entry.getVisualTitle()
-            // Add subText with username
-            holder.subText?.apply {
+            holder.subText.apply {
                 val username = entry.username
                 if (mShowUserNames && username.isNotEmpty()) {
                     visibility = View.VISIBLE
                     text = username
-                    setTextSize(mTextSizeUnit, mSubTextDefaultDimension, mPrefSizeMultiplier)
-                    strikeOut(subNode.isCurrentlyExpires)
-                } else {
-                    visibility = View.GONE
+                    setTextSize(mTextSizeUnit, mSubtextDefaultDimension, mPrefSizeMultiplier)
                 }
             }
 
-            val otpElement = entry.getOtpElement()
-            holder.otpContainer?.removeCallbacks(holder.otpRunnable)
-            if (otpElement != null
-                && mShowOTP
-                && otpElement.token.isNotEmpty()) {
-
-                // Execute runnable to show progress
-                holder.otpRunnable.action = {
-                    populateOtpView(holder, otpElement)
-                }
-                if (otpElement.type == OtpType.TOTP) {
-                    holder.otpRunnable.postDelayed()
-                }
-                populateOtpView(holder, otpElement)
-
-                holder.otpContainer?.visibility = View.VISIBLE
-            } else {
-                holder.otpContainer?.visibility = View.GONE
-            }
             holder.attachmentIcon?.visibility =
                     if (entry.containsAttachment()) View.VISIBLE else View.GONE
 
-            // Assign colors
-            val backgroundColor = if (mShowEntryColors) entry.backgroundColor else null
-            if (!holder.container.isSelected) {
-                if (backgroundColor != null) {
-                    holder.container.setBackgroundColor(backgroundColor)
-                } else {
-                    holder.container.setBackgroundColor(Color.TRANSPARENT)
-                }
-            } else {
-                holder.container.setBackgroundColor(mColorAccentLight)
-            }
-            val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
-            if (!holder.container.isSelected) {
-                if (foregroundColor != null) {
-                    holder.text.setTextColor(foregroundColor)
-                    holder.subText?.setTextColor(foregroundColor)
-                    holder.otpToken?.setTextColor(foregroundColor)
-                    holder.otpProgress?.setIndicatorColor(foregroundColor)
-                    holder.attachmentIcon?.setColorFilter(foregroundColor)
-                    holder.meta.setTextColor(foregroundColor)
-                    iconColor = foregroundColor
-                } else {
-                    holder.text.setTextColor(mTextColor)
-                    holder.subText?.setTextColor(mTextColorSecondary)
-                    holder.otpToken?.setTextColor(mTextColorSecondary)
-                    holder.otpProgress?.setIndicatorColor(mTextColorSecondary)
-                    holder.attachmentIcon?.setColorFilter(mTextColorSecondary)
-                    holder.meta.setTextColor(mTextColor)
-                }
-            } else {
-                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)
+            mDatabase.stopManageEntry(entry)
         }
 
         // Add number of entries in groups
@@ -469,7 +350,7 @@ class NodesAdapter (private val context: Context,
             if (mShowNumberEntries) {
                 holder.numberChildren?.apply {
                     text = (subNode as Group)
-                            .numberOfChildEntries
+                            .getNumberOfChildEntries(mEntryFilters)
                             .toString()
                     setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                     visibility = View.VISIBLE
@@ -479,73 +360,15 @@ 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)
+            mNodeClickCallback?.onNodeClick(subNode)
         }
         holder.container.setOnLongClickListener {
-            mNodeClickCallback?.onNodeLongClick(database, subNode) ?: false
+            mNodeClickCallback?.onNodeLongClick(subNode) ?: false
         }
     }
-
-    private fun populateOtpView(holder: NodeViewHolder?, otpElement: OtpElement?) {
-        when (otpElement?.type) {
-            OtpType.HOTP -> {
-                holder?.otpProgress?.apply {
-                    max = 100
-                    setProgressCompat(100, true)
-                }
-            }
-            OtpType.TOTP -> {
-                holder?.otpProgress?.apply {
-                    max = otpElement.period
-                    setProgressCompat(otpElement.secondsRemaining, true)
-                }
-            }
-            null -> {}
-        }
-        holder?.otpToken?.apply {
-            text = otpElement?.token
-            setTextSize(mTextSizeUnit, mOtpTokenTextDefaultDimension, mPrefSizeMultiplier)
-        }
-        holder?.otpContainer?.setOnClickListener {
-            otpElement?.token?.let { token ->
-                Toast.makeText(
-                        context,
-                        context.getString(R.string.copy_field,
-                                TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN)),
-                        Toast.LENGTH_LONG
-                ).show()
-                mClipboardHelper.copyToClipboard(token)
-            }
-        }
-    }
-
-    class OtpRunnable(val view: View?): Runnable {
-
-        var action: (() -> Unit)? = null
-
-        override fun run() {
-            action?.invoke()
-            postDelayed()
-        }
-
-        fun postDelayed() {
-            view?.postDelayed(this, 1000)
-        }
-    }
-
+    
     override fun getItemCount(): Int {
         return mNodeSortedList.size()
     }
@@ -561,8 +384,8 @@ class NodesAdapter (private val context: Context,
      * Callback listener to redefine to do an action when a node is click
      */
     interface NodeClickCallback {
-        fun onNodeClick(database: Database, node: Node)
-        fun onNodeLongClick(database: Database, node: Node): Boolean
+        fun onNodeClick(node: Node)
+        fun onNodeLongClick(node: Node): Boolean
     }
 
     class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -570,18 +393,12 @@ class NodesAdapter (private val context: Context,
         var imageIdentifier: ImageView? = itemView.findViewById(R.id.node_image_identifier)
         var icon: ImageView = itemView.findViewById(R.id.node_icon)
         var text: TextView = itemView.findViewById(R.id.node_text)
-        var subText: TextView? = itemView.findViewById(R.id.node_subtext)
-        var meta: TextView = itemView.findViewById(R.id.node_meta)
-        var path: TextView? = itemView.findViewById(R.id.node_path)
-        var otpContainer: ViewGroup? = itemView.findViewById(R.id.node_otp_container)
-        var otpProgress: CircularProgressIndicator? = itemView.findViewById(R.id.node_otp_progress)
-        var otpToken: TextView? = itemView.findViewById(R.id.node_otp_token)
-        var otpRunnable: OtpRunnable = OtpRunnable(otpContainer)
+        var subText: TextView = itemView.findViewById(R.id.node_subtext)
         var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
         var attachmentIcon: ImageView? = itemView.findViewById(R.id.node_attachment_icon)
     }
 
     companion object {
-        private val TAG = NodesAdapter::class.java.name
+        private val TAG = NodeAdapter::class.java.name
     }
 }

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

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

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

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

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

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

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

@@ -1,77 +0,0 @@
-package com.kunzisoft.keepass.adapters
-
-import android.content.Context
-import android.graphics.Color
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.ImageView
-import android.widget.TextView
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.template.Template
-import com.kunzisoft.keepass.database.element.template.TemplateField
-import com.kunzisoft.keepass.icons.IconDrawableFactory
-
-
-class TemplatesSelectorAdapter(
-    context: Context,
-    private var templates: List<Template>): BaseAdapter() {
-
-    var iconDrawableFactory: IconDrawableFactory? = null
-    private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private var mTextColor = Color.BLACK
-
-    init {
-        val taTextColor = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-        mTextColor = taTextColor.getColor(0, Color.BLACK)
-        taTextColor.recycle()
-    }
-
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val template: Template = getItem(position)
-
-        val holder: TemplateSelectorViewHolder
-        var templateView = convertView
-        if (templateView == null) {
-            holder = TemplateSelectorViewHolder()
-            templateView = inflater.inflate(R.layout.item_template, parent, false)
-            holder.background = templateView?.findViewById(R.id.template_background)
-            holder.icon = templateView?.findViewById(R.id.template_image)
-            holder.name = templateView?.findViewById(R.id.template_name)
-            templateView?.tag = holder
-        } else {
-            holder = templateView.tag as TemplateSelectorViewHolder
-        }
-
-        holder.background?.setBackgroundColor(template.backgroundColor ?: Color.TRANSPARENT)
-        val textColor = template.foregroundColor ?: mTextColor
-        holder.icon?.let { icon ->
-            iconDrawableFactory?.assignDatabaseIcon(icon, template.icon, textColor)
-        }
-        holder.name?.apply {
-            setTextColor(textColor)
-            text = TemplateField.getLocalizedName(context, template.title)
-        }
-
-        return templateView!!
-    }
-
-    override fun getCount(): Int {
-        return templates.size
-    }
-
-    override fun getItem(position: Int): Template {
-        return templates[position]
-    }
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    inner class TemplateSelectorViewHolder {
-        var background: View? = null
-        var icon: ImageView? = null
-        var name: TextView? = null
-    }
-}