Merge branch 'release/2.8'

Currently translated at 61.0% (271 of 444 strings)

Translation: KeePass DX/Strings
Translate-URL: https://hosted.weblate.org/projects/keepass-dx/strings/ar/

CHANGELOG

@@ -1,3 +1,27 @@
+KeePassDX(2.8)
+ * Fix TOTP period (> 60s)
+ * Fix searching in recycle bin
+ * Settings to back to the previous keyboard during database credentials and after form filling
+ * Improve action tasks
+ * Improve recognition to reset app timeout
+ * Fix minor issues
+
+KeePassDX(2.7)
+ * Add blocklists for autofill
+ * Add autofill compatibility mode (usefull for Browser not compatible)
+ * Upgrade autofill recognition algorithm
+ * Setting to search through web subdomains
+ * Refactoring selection mode
+
+KeePassDX(2.6)
+ * Share a web domain to automatically search for an entry
+ * Default group icon for a new entry
+ * Better autofill recognition
+ * Fix entry not visually deleted in search
+ * Fix hanged loading dialog
+ * Fix auto open biometric prompt if comes from background
+ * Minor fixes
+
 KeePassDX(2.5)
  * First stable version of KeePassDX
  * Fork completely rewritten from the KeePassDroid project

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode = 33
-        versionName = "2.5"
+        versionCode = 36
+        versionName = "2.8"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -42,9 +42,6 @@ android {
         }
     }
 
-    dexOptions {
-    }
-
     flavorDimensions "version"
     productFlavors {
         libre {
@@ -72,7 +69,7 @@ android {
             buildConfigField "String", "BUILD_VERSION", "\"free\""
             buildConfigField "boolean", "FULL_VERSION", "false"
             buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
+            buildConfigField "String[]", "STYLES_DISABLED", "{}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
             manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
         }
@@ -88,42 +85,47 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
         sourceCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 def room_version = "2.2.5"
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.biometric:biometric:1.0.1'
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    // TODO #538 implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
     // To upgrade with style
     implementation 'com.google.android.material:material:1.0.0'
     // Database
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     // Crypto
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.65.01'
     // Time
-    implementation 'joda-time:joda-time:2.9.9'
+    implementation 'joda-time:joda-time:2.10.6'
     // Color
     implementation 'com.github.Kunzisoft:AndroidClearChroma:2.3'
     // Education
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     // Apache Commons Collections
-    implementation 'commons-collections:commons-collections:3.2.1'
-    implementation 'org.apache.commons:commons-io:1.3.2'
+    implementation 'commons-collections:commons-collections:3.2.2'
     // Apache Commons Codec
-    implementation 'commons-codec:commons-codec:1.11'
+    implementation 'commons-codec:commons-codec:1.14'
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')
 
     // Tests
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'junit:junit:4.13'
 }

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

@@ -6,23 +6,23 @@ import junit.framework.TestCase
 class UnsignedIntTest: TestCase() {
 
     fun testUInt() {
-        val standardInt = UnsignedInt(15).toInt()
+        val standardInt = UnsignedInt(15).toKotlinInt()
         assertEquals(15, standardInt)
-        val unsignedInt = UnsignedInt(-1).toLong()
+        val unsignedInt = UnsignedInt(-1).toKotlinLong()
         assertEquals(4294967295L, unsignedInt)
     }
 
     fun testMaxValue() {
-        val maxValue = UnsignedInt.MAX_VALUE.toLong()
+        val maxValue = UnsignedInt.MAX_VALUE.toKotlinLong()
         assertEquals(4294967295L, maxValue)
-        val longValue = UnsignedInt.fromLong(4294967295L).toLong()
+        val longValue = UnsignedInt.fromKotlinLong(4294967295L).toKotlinLong()
         assertEquals(longValue, maxValue)
     }
 
     fun testLong() {
-        val longValue = UnsignedInt.fromLong(50L).toInt()
+        val longValue = UnsignedInt.fromKotlinLong(50L).toKotlinInt()
         assertEquals(50, longValue)
-        val uIntLongValue = UnsignedInt.fromLong(4294967290).toLong()
+        val uIntLongValue = UnsignedInt.fromKotlinLong(4294967290).toKotlinLong()
         assertEquals(4294967290, uIntLongValue)
     }
 }

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

@@ -35,11 +35,11 @@ class ValuesTest : TestCase() {
     }
 
     fun testReadWriteLongMax() {
-        testReadWriteLong(java.lang.Byte.MAX_VALUE)
+        testReadWriteLong(Byte.MAX_VALUE)
     }
 
     fun testReadWriteLongMin() {
-        testReadWriteLong(java.lang.Byte.MIN_VALUE)
+        testReadWriteLong(Byte.MIN_VALUE)
     }
 
     fun testReadWriteLongRnd() {
@@ -62,11 +62,11 @@ class ValuesTest : TestCase() {
     }
 
     fun testReadWriteIntMin() {
-        testReadWriteInt(java.lang.Byte.MIN_VALUE)
+        testReadWriteInt(Byte.MIN_VALUE)
     }
 
     fun testReadWriteIntMax() {
-        testReadWriteInt(java.lang.Byte.MAX_VALUE)
+        testReadWriteInt(Byte.MAX_VALUE)
     }
 
     private fun testReadWriteInt(value: Byte) {
@@ -103,11 +103,11 @@ class ValuesTest : TestCase() {
     }
 
     fun testReadWriteShortMin() {
-        testReadWriteShort(java.lang.Byte.MIN_VALUE)
+        testReadWriteShort(Byte.MIN_VALUE)
     }
 
     fun testReadWriteShortMax() {
-        testReadWriteShort(java.lang.Byte.MAX_VALUE)
+        testReadWriteShort(Byte.MAX_VALUE)
     }
 
     private fun testReadWriteShort(value: Byte) {
@@ -125,15 +125,15 @@ class ValuesTest : TestCase() {
     }
 
     fun testReadWriteByteMin() {
-        testReadWriteByte(java.lang.Byte.MIN_VALUE)
+        testReadWriteByte(Byte.MIN_VALUE)
     }
 
     fun testReadWriteByteMax() {
-        testReadWriteShort(java.lang.Byte.MAX_VALUE)
+        testReadWriteShort(Byte.MAX_VALUE)
     }
 
     private fun testReadWriteByte(value: Byte) {
-        val dest: Byte = UnsignedInt(UnsignedInt.fromByte(value)).toByte()
+        val dest: Byte = UnsignedInt(UnsignedInt.fromKotlinByte(value)).toKotlinByte()
         assert(value == dest)
     }
 

app/src/main/AndroidManifest.xml

@@ -131,16 +131,30 @@
             android:name="com.kunzisoft.keepass.activities.AboutActivity"
             android:launchMode="singleTask"
             android:label="@string/about" />
-        <activity android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
-        <activity android:name="com.kunzisoft.keepass.autofill.AutofillLauncherActivity"
+        <activity
+            android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.AutofillLauncherActivity"
+            android:theme="@style/Theme.Transparent"
             android:configChanges="keyboardHidden" />
-        <activity android:name="com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity" />
-        <activity android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
-        <activity android:name="com.kunzisoft.keepass.magikeyboard.KeyboardLauncherActivity"
-            android:label="@string/keyboard_name"
-            android:exported="true">
+        <activity
+            android:name="com.kunzisoft.keepass.settings.SettingsAdvancedUnlockActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity"
+            android:theme="@style/Theme.Transparent">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
         </activity>
-        <activity android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
+        <activity
+            android:name="com.kunzisoft.keepass.activities.MagikeyboardLauncherActivity"
+            android:theme="@style/Theme.Transparent" />
+        <activity
+            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
             android:label="@string/keyboard_setting_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

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

@@ -17,7 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.autofill
+package com.kunzisoft.keepass.activities
 
 import android.app.Activity
 import android.app.PendingIntent
@@ -26,27 +26,45 @@ import android.content.Intent
 import android.content.IntentSender
 import android.os.Build
 import android.os.Bundle
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.activities.FileDatabaseSelectActivity
-import com.kunzisoft.keepass.activities.GroupActivity
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.autofill.KeeAutofillService
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.PreferencesUtil
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 class AutofillLauncherActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+
+        // Build search param
+        val searchInfo = SearchInfo().apply {
+            applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
+            webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
+        }
+
         // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
         val assistStructure = AutofillHelper.retrieveAssistStructure(intent)
-        if (assistStructure != null) {
-            // Build search param
-            val searchInfo = SearchInfo().apply {
-                applicationId = intent.getStringExtra(KEY_SEARCH_APPLICATION_ID)
-                webDomain = intent.getStringExtra(KEY_SEARCH_DOMAIN)
-            }
+
+        if (assistStructure == null) {
+            setResult(Activity.RESULT_CANCELED)
+            finish()
+        } else if (!KeeAutofillService.searchAllowedFor(searchInfo.applicationId,
+                        PreferencesUtil.applicationIdBlocklist(this))
+                || !KeeAutofillService.searchAllowedFor(searchInfo.webDomain,
+                        PreferencesUtil.webDomainBlocklist(this))) {
+            // If item not allowed, show a toast
+            Toast.makeText(this.applicationContext, R.string.autofill_block_restart, Toast.LENGTH_LONG).show()
+            setResult(Activity.RESULT_CANCELED)
+            finish()
+        } else {
             // If database is open
-            AutofillHelper.checkAutoSearchInfo(this,
+            SearchHelper.checkAutoSearchInfo(this,
                     Database.getInstance(),
                     searchInfo,
                     { items ->
@@ -57,17 +75,17 @@ class AutofillLauncherActivity : AppCompatActivity() {
                     {
                         // Show the database UI to select the entry
                         GroupActivity.launchForAutofillResult(this,
-                                assistStructure)
+                                assistStructure,
+                                false,
+                                searchInfo)
                     },
                     {
                         // If database not open
                         FileDatabaseSelectActivity.launchForAutofillResult(this,
-                                assistStructure, searchInfo)
+                                assistStructure,
+                                searchInfo)
                     }
             )
-        } else {
-            setResult(Activity.RESULT_CANCELED)
-            finish()
         }
 
         super.onCreate(savedInstanceState)

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

@@ -89,7 +89,7 @@ class EntryActivity : LockingActivity() {
     private var mAttachmentsToDownload: HashMap<Int, EntryAttachment> = HashMap()
 
     private var clipboardHelper: ClipboardHelper? = null
-    private var firstLaunchOfActivity: Boolean = false
+    private var mFirstLaunchOfActivity: Boolean = false
 
     private var iconColor: Int = 0
 
@@ -130,9 +130,12 @@ class EntryActivity : LockingActivity() {
             lockAndExit()
         }
 
+        // Focus view to reinitialize timeout
+        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
+
         // Init the clipboard helper
         clipboardHelper = ClipboardHelper(this)
-        firstLaunchOfActivity = true
+        mFirstLaunchOfActivity = savedInstanceState?.getBoolean(KEY_FIRST_LAUNCH_ACTIVITY) ?: true
 
         // Init attachment service binder manager
         mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
@@ -196,7 +199,7 @@ class EntryActivity : LockingActivity() {
             val entryInfo = entry.getEntryInfo(Database.getInstance())
 
             // Manage entry copy to start notification if allowed
-            if (firstLaunchOfActivity) {
+            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
@@ -215,7 +218,7 @@ class EntryActivity : LockingActivity() {
             }
         }
 
-        firstLaunchOfActivity = false
+        mFirstLaunchOfActivity = false
     }
 
     override fun onPause() {
@@ -542,6 +545,11 @@ class EntryActivity : LockingActivity() {
         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
@@ -555,6 +563,8 @@ class EntryActivity : LockingActivity() {
     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"
 

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

@@ -43,6 +43,7 @@ import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
 import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService
@@ -80,7 +81,7 @@ class EntryEditActivity : LockingActivity(),
     private var scrollView: NestedScrollView? = null
     private var entryEditContentsView: EntryEditContentsView? = null
     private var entryEditAddToolBar: ActionMenuView? = null
-    private var saveView: View? = null
+    private var validateButton: View? = null
     private var lockView: View? = null
 
     // Education
@@ -120,7 +121,7 @@ class EntryEditActivity : LockingActivity(),
         }
 
         // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(entryEditContentsView)
+        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
 
         stopService(Intent(this, ClipboardEntryNotificationService::class.java))
         stopService(Intent(this, KeyboardEntryNotificationService::class.java))
@@ -166,9 +167,16 @@ class EntryEditActivity : LockingActivity(),
                 mNewEntry = mDatabase?.createEntry()
             }
             mParent = mDatabase?.getGroupById(it)
-            // Add the default icon
-            mDatabase?.drawFactory?.let { iconFactory ->
-                entryEditContentsView?.setDefaultIcon(iconFactory)
+            // Add the default icon from parent if not a folder
+            val parentIcon = mParent?.icon
+            if (parentIcon != null
+                    && parentIcon.iconId != IconImage.UNKNOWN_ID
+                    && parentIcon.iconId != IconImageStandard.FOLDER) {
+                temporarilySaveAndShowSelectedIcon(parentIcon)
+            } else {
+                mDatabase?.drawFactory?.let { iconFactory ->
+                    entryEditContentsView?.setDefaultIcon(iconFactory)
+                }
             }
         }
 
@@ -229,8 +237,8 @@ class EntryEditActivity : LockingActivity(),
         }
 
         // Save button
-        saveView = findViewById(R.id.entry_edit_validate)
-        saveView?.setOnClickListener { saveEntry() }
+        validateButton = findViewById(R.id.entry_edit_validate)
+        validateButton?.setOnClickListener { saveEntry() }
 
         // Verify the education views
         entryEditActivityEducation = EntryEditActivityEducation(this)

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

@@ -0,0 +1,130 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.search.SearchHelper
+import com.kunzisoft.keepass.magikeyboard.MagikIME
+import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.PreferencesUtil
+
+/**
+ * Activity to search or select entry in database,
+ * Commonly used with Magikeyboard
+ */
+class EntrySelectionLauncherActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+        var sharedWebDomain: String? = null
+
+        when (intent?.action) {
+            Intent.ACTION_SEND -> {
+                if ("text/plain" == intent.type) {
+                    // Retrieve web domain
+                    intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
+                        sharedWebDomain = Uri.parse(it).host
+                    }
+                }
+            }
+            else -> {}
+        }
+
+        // Setting to integrate Magikeyboard
+        val searchShareForMagikeyboard = PreferencesUtil.isKeyboardSearchShareEnable(this)
+
+        // Build search param
+        val searchInfo = SearchInfo().apply {
+            webDomain = sharedWebDomain
+        }
+
+        // If database is open
+        SearchHelper.checkAutoSearchInfo(this,
+                Database.getInstance(),
+                searchInfo,
+                { items ->
+                    // Items found
+                    if (searchShareForMagikeyboard) {
+                        if (items.size == 1) {
+                            // Automatically populate keyboard
+                            val entryPopulate = items[0]
+                            populateKeyboardAndMoveAppToBackground(this,
+                                    entryPopulate,
+                                    intent)
+                        } else {
+                            // Select the one we want
+                            GroupActivity.launchForEntrySelectionResult(this,
+                                    true,
+                                    searchInfo)
+                        }
+                    } else {
+                        GroupActivity.launch(this,
+                                true,
+                                searchInfo)
+                    }
+                },
+                {
+                    // Show the database UI to select the entry
+                    if (searchShareForMagikeyboard) {
+                        GroupActivity.launchForEntrySelectionResult(this,
+                                false,
+                                searchInfo)
+                    } else {
+                        GroupActivity.launch(this,
+                                false,
+                                searchInfo)
+                    }
+                },
+                {
+                    // If database not open
+                    if (searchShareForMagikeyboard) {
+                        FileDatabaseSelectActivity.launchForEntrySelectionResult(this,
+                                searchInfo)
+                    } else {
+                        FileDatabaseSelectActivity.launch(this,
+                                searchInfo)
+                    }
+                }
+        )
+
+        finish()
+
+        super.onCreate(savedInstanceState)
+    }
+}
+
+fun populateKeyboardAndMoveAppToBackground(activity: Activity,
+                                           entry: EntryInfo,
+                                           intent: Intent,
+                                           toast: Boolean = true) {
+    // Populate Magikeyboard with entry
+    MagikIME.addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
+    // Consume the selection mode
+    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
+    activity.moveTaskToBack(true)
+}

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

@@ -22,6 +22,7 @@ package com.kunzisoft.keepass.activities
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.assist.AssistStructure
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -41,12 +42,12 @@ import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.autofill.AutofillHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
@@ -58,13 +59,13 @@ import com.kunzisoft.keepass.view.asError
 import kotlinx.android.synthetic.main.activity_file_selection.*
 import java.io.FileNotFoundException
 
-class FileDatabaseSelectActivity : StylishActivity(),
+class FileDatabaseSelectActivity : SpecialModeActivity(),
         AssignMasterKeyDialogFragment.AssignPasswordDialogListener {
 
     // Views
     private var coordinatorLayout: CoordinatorLayout? = null
     private var fileManagerExplanationButton: View? = null
-    private var createButtonView: View? = null
+    private var createDatabaseButtonView: View? = null
     private var openDatabaseButtonView: View? = null
 
     // Adapter to manage database history list
@@ -95,19 +96,11 @@ class FileDatabaseSelectActivity : StylishActivity(),
             UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
         }
 
-        // Create button
-        createButtonView = findViewById(R.id.create_database_button)
-        if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
-            // There is an activity which can handle this intent.
-            createButtonView?.visibility = View.VISIBLE
-        }
-        else{
-            // No Activity found that can handle this intent.
-            createButtonView?.visibility = View.GONE
-        }
-
-        createButtonView?.setOnClickListener { createNewFile() }
+        // Create database button
+        createDatabaseButtonView = findViewById(R.id.create_database_button)
+        createDatabaseButtonView?.setOnClickListener { createNewFile() }
 
+        // Open database button
         mOpenFileHelper = OpenFileHelper(this)
         openDatabaseButtonView = findViewById(R.id.open_keyfile_button)
         openDatabaseButtonView?.apply {
@@ -156,7 +149,7 @@ class FileDatabaseSelectActivity : StylishActivity(),
             UriUtil.parse(databasePath)?.let { databaseFileUri ->
                 launchPasswordActivityWithPath(databaseFileUri)
             } ?: run {
-                Log.i(TAG, "Unable to launch Password Activity")
+                Log.i(TAG, "No default database to prepare")
             }
         }
 
@@ -196,23 +189,30 @@ class FileDatabaseSelectActivity : StylishActivity(),
     }
 
     private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
         EntrySelectionHelper.doEntrySelectionAction(intent,
                 {
                     try {
                         PasswordActivity.launch(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile)
+                                databaseUri, keyFile,
+                                searchInfo)
                     } catch (e: FileNotFoundException) {
                         fileNoFoundAction(e)
                     }
+                    // Remove the search info from intent
+                    if (searchInfo != null) {
+                        finish()
+                    }
                 },
                 {
                     try {
                         PasswordActivity.launchForKeyboardResult(this@FileDatabaseSelectActivity,
-                                databaseUri, keyFile)
-                        finish()
+                                databaseUri, keyFile,
+                                searchInfo)
                     } catch (e: FileNotFoundException) {
                         fileNoFoundAction(e)
                     }
+                    finish()
                 },
                 { assistStructure ->
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -220,23 +220,27 @@ class FileDatabaseSelectActivity : StylishActivity(),
                             PasswordActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
                                     databaseUri, keyFile,
                                     assistStructure,
-                                    intent.getParcelableExtra(KEY_SEARCH_INFO))
+                                    searchInfo)
                         } catch (e: FileNotFoundException) {
                             fileNoFoundAction(e)
                         }
-
                     }
                 })
     }
 
     private fun launchGroupActivity(readOnly: Boolean) {
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
         EntrySelectionHelper.doEntrySelectionAction(intent,
                 {
                     GroupActivity.launch(this@FileDatabaseSelectActivity,
+                            false,
+                            searchInfo,
                             readOnly)
                 },
                 {
-                    GroupActivity.launchForKeyboardSelection(this@FileDatabaseSelectActivity,
+                    GroupActivity.launchForEntrySelectionResult(this@FileDatabaseSelectActivity,
+                            false,
+                            searchInfo,
                             readOnly)
                     // Do not keep history
                     finish()
@@ -245,7 +249,8 @@ class FileDatabaseSelectActivity : StylishActivity(),
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                         GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity,
                                 assistStructure,
-                                intent.getParcelableExtra(KEY_SEARCH_INFO),
+                                false,
+                                searchInfo,
                                 readOnly)
                     }
                 })
@@ -259,37 +264,51 @@ class FileDatabaseSelectActivity : StylishActivity(),
     }
 
     override fun onResume() {
+        super.onResume()
+
+        // Show open and create button or special mode
+        if  (mSelectionMode) {
+            // Disable create button if in selection mode or request for autofill
+            createDatabaseButtonView?.visibility = View.GONE
+        } else {
+            if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
+                // There is an activity which can handle this intent.
+                createDatabaseButtonView?.visibility = View.VISIBLE
+            } else{
+                // No Activity found that can handle this intent.
+                createDatabaseButtonView?.visibility = View.GONE
+            }
+        }
+
         val database = Database.getInstance()
         if (database.loaded) {
             launchGroupActivity(database.isReadOnly)
-        }
-
-        super.onResume()
-
-        // Construct adapter with listeners
-        if (PreferencesUtil.showRecentFiles(this)) {
-            mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
-                databaseFileHistoryList?.let { historyList ->
-                    val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(this@FileDatabaseSelectActivity)
-                    mAdapterDatabaseHistory?.addDatabaseFileHistoryList(
-                            // Show only uri accessible
-                            historyList.filter {
-                                if (hideBrokenLocations) {
-                                    FileDatabaseInfo(this@FileDatabaseSelectActivity,
-                                            it.databaseUri).exists
-                                } else
-                                    true
-                            })
-                    mAdapterDatabaseHistory?.notifyDataSetChanged()
-                }
-            }
         } else {
-            mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
-            mAdapterDatabaseHistory?.notifyDataSetChanged()
-        }
+            // Construct adapter with listeners
+            if (PreferencesUtil.showRecentFiles(this)) {
+                mFileDatabaseHistoryAction?.getAllFileDatabaseHistories { databaseFileHistoryList ->
+                    databaseFileHistoryList?.let { historyList ->
+                        val hideBrokenLocations = PreferencesUtil.hideBrokenLocations(this@FileDatabaseSelectActivity)
+                        mAdapterDatabaseHistory?.addDatabaseFileHistoryList(
+                                // Show only uri accessible
+                                historyList.filter {
+                                    if (hideBrokenLocations) {
+                                        FileDatabaseInfo(this@FileDatabaseSelectActivity,
+                                                it.databaseUri).exists
+                                    } else
+                                        true
+                                })
+                        mAdapterDatabaseHistory?.notifyDataSetChanged()
+                    }
+                }
+            } else {
+                mAdapterDatabaseHistory?.clearDatabaseFileHistoryList()
+                mAdapterDatabaseHistory?.notifyDataSetChanged()
+            }
 
-        // Register progress task
-        mProgressDialogThread?.registerProgressTask()
+            // Register progress task
+            mProgressDialogThread?.registerProgressTask()
+        }
     }
 
     override fun onPause() {
@@ -368,7 +387,10 @@ class FileDatabaseSelectActivity : StylishActivity(),
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
-        MenuUtil.defaultMenuInflater(menuInflater, menu)
+
+        if (!mSelectionMode) {
+            MenuUtil.defaultMenuInflater(menuInflater, menu)
+        }
 
         Handler().post { performedNextEducation(FileDatabaseSelectActivityEducation(this)) }
 
@@ -377,11 +399,12 @@ class FileDatabaseSelectActivity : StylishActivity(),
 
     private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
         // If no recent files
-        val createDatabaseEducationPerformed = createButtonView != null && createButtonView!!.visibility == View.VISIBLE
+        val createDatabaseEducationPerformed =
+                createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
                 && mAdapterDatabaseHistory != null
                 && mAdapterDatabaseHistory!!.itemCount > 0
                 && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
-                createButtonView!!,
+                        createDatabaseButtonView!!,
                 {
                     createNewFile()
                 },
@@ -416,18 +439,30 @@ class FileDatabaseSelectActivity : StylishActivity(),
 
         /*
          * -------------------------
-         * No Standard Launch, pass by PasswordActivity
+         * Launch only to standard search, else pass by PasswordActivity
          * -------------------------
          */
 
+        fun launch(context: Context,
+                   searchInfo: SearchInfo? = null) {
+            val intent = Intent(context, FileDatabaseSelectActivity::class.java)
+            searchInfo?.let {
+                intent.putExtra(KEY_SEARCH_INFO, it)
+            }
+            context.startActivity(intent)
+        }
+
         /*
          * -------------------------
          * 		Keyboard Launch
          * -------------------------
          */
 
-        fun launchForKeyboardSelection(activity: Activity) {
-            EntrySelectionHelper.startActivityForEntrySelection(activity, Intent(activity, FileDatabaseSelectActivity::class.java))
+        fun launchForEntrySelectionResult(activity: Activity,
+                                          searchInfo: SearchInfo? = null) {
+            EntrySelectionHelper.startActivityForEntrySelectionResult(activity,
+                    Intent(activity, FileDatabaseSelectActivity::class.java),
+                    searchInfo)
         }
 
         /*
@@ -439,7 +474,7 @@ class FileDatabaseSelectActivity : StylishActivity(),
         @RequiresApi(api = Build.VERSION_CODES.O)
         fun launchForAutofillResult(activity: Activity,
                                     assistStructure: AssistStructure,
-                                    searchInfo: SearchInfo?) {
+                                    searchInfo: SearchInfo? = null) {
             AutofillHelper.startActivityForAutofillResult(activity,
                     Intent(activity, FileDatabaseSelectActivity::class.java),
                     assistStructure,

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

@@ -32,6 +32,7 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.RequiresApi
@@ -47,6 +48,7 @@ import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter
@@ -61,8 +63,8 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.education.GroupActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
-import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.model.getSearchString
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
@@ -89,6 +91,7 @@ class GroupActivity : LockingActivity(),
         SortDialogFragment.SortSelectionListener {
 
     // Views
+    private var rootContainerView: ViewGroup? = null
     private var coordinatorLayout: CoordinatorLayout? = null
     private var lockView: View? = null
     private var toolbar: Toolbar? = null
@@ -96,7 +99,6 @@ class GroupActivity : LockingActivity(),
     private var toolbarAction: ToolbarAction? = null
     private var iconView: ImageView? = null
     private var numberChildrenView: TextView? = null
-    private var modeTitleView: TextView? = null
     private var addNodeButtonView: AddNodeButtonView? = null
     private var groupNameView: TextView? = null
 
@@ -106,6 +108,9 @@ class GroupActivity : LockingActivity(),
     private var mCurrentGroupIsASearch: Boolean = false
     private var mRequestStartupSearch = true
 
+    // To manage history in selection mode
+    private var mSelectionModeCountBackStack = 0
+
     // Nodes
     private var mRootGroup: Group? = null
     private var mCurrentGroup: Group? = null
@@ -127,6 +132,7 @@ class GroupActivity : LockingActivity(),
         setContentView(layoutInflater.inflate(R.layout.activity_group, null))
 
         // Initialize views
+        rootContainerView = findViewById(R.id.activity_group_container_view)
         coordinatorLayout = findViewById(R.id.group_coordinator)
         iconView = findViewById(R.id.group_icon)
         numberChildrenView = findViewById(R.id.group_numbers)
@@ -135,7 +141,6 @@ class GroupActivity : LockingActivity(),
         searchTitleView = findViewById(R.id.search_title)
         groupNameView = findViewById(R.id.group_name)
         toolbarAction = findViewById(R.id.toolbar_action)
-        modeTitleView = findViewById(R.id.mode_title_view)
         lockView = findViewById(R.id.lock_button)
 
         lockView?.setOnClickListener {
@@ -145,8 +150,13 @@ class GroupActivity : LockingActivity(),
         toolbar?.title = ""
         setSupportActionBar(toolbar)
 
+        // Retrieve the textColor to tint the icon
+        val taTextColor = theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        mIconColor = taTextColor.getColor(0, Color.WHITE)
+        taTextColor.recycle()
+
         // Focus view to reinitialize timeout
-        resetAppTimeoutWhenViewFocusedOrChanged(addNodeButtonView)
+        resetAppTimeoutWhenViewFocusedOrChanged(rootContainerView)
 
         // Retrieve elements after an orientation change
         if (savedInstanceState != null) {
@@ -171,14 +181,6 @@ class GroupActivity : LockingActivity(),
             return
         }
 
-        // Update last access time.
-        mCurrentGroup?.touch(modified = false, touchParents = false)
-
-        // Retrieve the textColor to tint the icon
-        val taTextColor = theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
-        mIconColor = taTextColor.getColor(0, Color.WHITE)
-        taTextColor.recycle()
-
         var fragmentTag = LIST_NODES_FRAGMENT_TAG
         if (mCurrentGroupIsASearch)
             fragmentTag = SEARCH_FRAGMENT_TAG
@@ -195,6 +197,14 @@ class GroupActivity : LockingActivity(),
                 fragmentTag)
                 .commit()
 
+        // Update last access time.
+        mCurrentGroup?.touch(modified = false, touchParents = false)
+
+        // To relaunch the activity with ACTION_SEARCH
+        if (manageSearchInfoIntent(intent)) {
+            startActivity(intent)
+        }
+
         // Add listeners to the add buttons
         addNodeButtonView?.setAddGroupClickListener(View.OnClickListener {
             GroupEditDialogFragment.build()
@@ -223,6 +233,8 @@ class GroupActivity : LockingActivity(),
                     newNodes = getListNodesFromBundle(database, newNodesBundle)
                 }
 
+                refreshSearchGroup()
+
                 when (actionTask) {
                     ACTION_DATABASE_UPDATE_GROUP_TASK -> {
                         if (result.isSuccess) {
@@ -277,11 +289,14 @@ class GroupActivity : LockingActivity(),
         super.onNewIntent(intent)
 
         intent?.let { intentNotNull ->
+            // To transform KEY_SEARCH_INFO in ACTION_SEARCH
+            manageSearchInfoIntent(intentNotNull)
             Log.d(TAG, "setNewIntent: $intentNotNull")
             setIntent(intentNotNull)
             mCurrentGroupIsASearch = if (Intent.ACTION_SEARCH == intentNotNull.action) {
                 // only one instance of search in backstack
-                openSearchGroup(retrieveCurrentGroup(intentNotNull, null))
+                deletePreviousSearchGroup()
+                openGroup(retrieveCurrentGroup(intentNotNull, null), true)
                 true
             } else {
                 false
@@ -289,20 +304,34 @@ class GroupActivity : LockingActivity(),
         }
     }
 
-    private fun openSearchGroup(group: Group?) {
-        // Delete the previous search fragment
-        val searchFragment = supportFragmentManager.findFragmentByTag(SEARCH_FRAGMENT_TAG)
-        if (searchFragment != null) {
-            if (supportFragmentManager
-                            .popBackStackImmediate(SEARCH_FRAGMENT_TAG,
-                                    FragmentManager.POP_BACK_STACK_INCLUSIVE))
-                supportFragmentManager.beginTransaction().remove(searchFragment).commit()
+    /**
+     * Transform the KEY_SEARCH_INFO in ACTION_SEARCH, return true if KEY_SEARCH_INFO was present
+     */
+    private fun manageSearchInfoIntent(intent: Intent): Boolean {
+        // To relaunch the activity as ACTION_SEARCH
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
+        val autoSearch = intent.getBooleanExtra(AUTO_SEARCH_KEY, false)
+        if (searchInfo != null && autoSearch) {
+            intent.action = Intent.ACTION_SEARCH
+            intent.putExtra(SearchManager.QUERY, searchInfo.getSearchString(this))
+            return true
         }
-        openGroup(group, true)
+        return false
     }
 
-    private fun openChildGroup(group: Group) {
-        openGroup(group, false)
+    private fun deletePreviousSearchGroup() {
+        // Delete the previous search fragment
+        try {
+            val searchFragment = supportFragmentManager.findFragmentByTag(SEARCH_FRAGMENT_TAG)
+            if (searchFragment != null) {
+                if (supportFragmentManager
+                                .popBackStackImmediate(SEARCH_FRAGMENT_TAG,
+                                        FragmentManager.POP_BACK_STACK_INCLUSIVE))
+                    supportFragmentManager.beginTransaction().remove(searchFragment).commit()
+            }
+        } catch (exception: Exception) {
+            Log.e(TAG, "unable to remove previous search fragment", exception)
+        }
     }
 
     private fun openGroup(group: Group?, isASearch: Boolean) {
@@ -329,6 +358,12 @@ class GroupActivity : LockingActivity(),
             fragmentTransaction.addToBackStack(fragmentTag)
             fragmentTransaction.commit()
 
+            if (mSelectionMode)
+                mSelectionModeCountBackStack++
+
+            // Update last access time.
+            group?.touch(modified = false, touchParents = false)
+
             mListNodesFragment = newListNodeFragment
             mCurrentGroup = group
             assignGroupViewElements()
@@ -346,6 +381,12 @@ class GroupActivity : LockingActivity(),
         super.onSaveInstanceState(outState)
     }
 
+    private fun refreshSearchGroup() {
+        deletePreviousSearchGroup()
+        if (mCurrentGroupIsASearch)
+            openGroup(retrieveCurrentGroup(intent, null), true)
+    }
+
     private fun retrieveCurrentGroup(intent: Intent, savedInstanceState: Bundle?): Group? {
 
         // Force read only if the database is like that
@@ -354,7 +395,8 @@ class GroupActivity : LockingActivity(),
         // If it's a search
         if (Intent.ACTION_SEARCH == intent.action) {
             val searchString = intent.getStringExtra(SearchManager.QUERY)?.trim { it <= ' ' } ?: ""
-            return mDatabase?.createVirtualGroupFromSearch(searchString)
+            return mDatabase?.createVirtualGroupFromSearch(searchString,
+                    PreferencesUtil.omitBackup(this))
         }
         // else a real group
         else {
@@ -426,13 +468,6 @@ class GroupActivity : LockingActivity(),
         // Assign number of children
         refreshNumberOfChildren()
 
-        // Show selection mode message if needed
-        if (mSelectionMode) {
-            modeTitleView?.visibility = View.VISIBLE
-        } else {
-            modeTitleView?.visibility = View.GONE
-        }
-
         // Show button if allowed
         addNodeButtonView?.apply {
 
@@ -450,6 +485,20 @@ class GroupActivity : LockingActivity(),
         }
     }
 
+    override fun onCancelSpecialMode() {
+        // To remove the navigation history and
+        EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
+        val fragmentManager = supportFragmentManager
+        if (mSelectionModeCountBackStack > 0) {
+            for (selectionMode in 0 .. mSelectionModeCountBackStack) {
+                fragmentManager.popBackStack()
+            }
+        }
+        // Reinit the counter for navigation history
+        mSelectionModeCountBackStack = 0
+        backToTheAppCaller()
+    }
+
     private fun refreshNumberOfChildren() {
         numberChildrenView?.apply {
             if (PreferencesUtil.showNumberEntries(context)) {
@@ -468,7 +517,8 @@ class GroupActivity : LockingActivity(),
     override fun onNodeClick(node: Node) {
         when (node.type) {
             Type.GROUP -> try {
-                openChildGroup(node as Group)
+                // Open child group
+                openGroup(node as Group, false)
             } catch (e: ClassCastException) {
                 Log.e(TAG, "Node can't be cast in Group")
             }
@@ -480,14 +530,13 @@ class GroupActivity : LockingActivity(),
                             EntryActivity.launch(this@GroupActivity, entryVersioned, mReadOnly)
                         },
                         {
+                            rebuildListNodes()
                             // Populate Magikeyboard with entry
                             mDatabase?.let { database ->
-                                MagikIME.addEntryAndLaunchNotificationIfAllowed(this@GroupActivity,
-                                        entryVersioned.getEntryInfo(database))
+                                populateKeyboardAndMoveAppToBackground(this@GroupActivity,
+                                        entryVersioned.getEntryInfo(database),
+                                        intent)
                             }
-                            // Consume the selection mode
-                            EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
-                            moveTaskToBack(true)
                         },
                         {
                             // Build response with the entry selected
@@ -616,6 +665,7 @@ class GroupActivity : LockingActivity(),
         if (database != null
                 && database.isRecycleBinEnabled
                 && database.recycleBin != mCurrentGroup) {
+
             mProgressDialogThread?.startDatabaseDeleteNodes(
                     nodes,
                     !mReadOnly && mAutoSaveEnable
@@ -667,8 +717,7 @@ class GroupActivity : LockingActivity(),
             menu.findItem(R.id.menu_save_database)?.isVisible = false
         }
         if (!mSelectionMode) {
-            inflater.inflate(R.menu.default_menu, menu)
-            MenuUtil.contributionMenuInflater(inflater, menu)
+            MenuUtil.defaultMenuInflater(inflater, menu)
         }
 
         // Menu for recycle bin
@@ -877,19 +926,16 @@ class GroupActivity : LockingActivity(),
     }
 
     override fun startActivity(intent: Intent) {
-
         // Get the intent, verify the action and get the query
         if (Intent.ACTION_SEARCH == intent.action) {
-            // manually launch the real search activity
-            val searchIntent = Intent(applicationContext, GroupActivity::class.java).apply {
-                // Add bundle of current intent
-                putExtras(this@GroupActivity.intent)
+            // manually launch the same search activity
+            val searchIntent = getIntent().apply {
                 // add query to the Intent Extras
                 action = Intent.ACTION_SEARCH
                 putExtra(SearchManager.QUERY, intent.getStringExtra(SearchManager.QUERY))
             }
-
-            super.startActivity(searchIntent)
+            setIntent(searchIntent)
+            onNewIntent(searchIntent)
         } else {
             super.startActivity(intent)
         }
@@ -921,12 +967,29 @@ class GroupActivity : LockingActivity(),
         mListNodesFragment?.onActivityResult(requestCode, resultCode, data)
     }
 
-    private fun removeSearchInIntent(intent: Intent) {
+    private fun rebuildListNodes() {
+        mListNodesFragment = supportFragmentManager.findFragmentByTag(LIST_NODES_FRAGMENT_TAG) as ListNodesFragment?
+        // to refresh fragment
+        mListNodesFragment?.rebuildList()
+        mCurrentGroup = mListNodesFragment?.mainGroup
+        // Remove search in intent
+        deletePreviousSearchGroup()
+        mCurrentGroupIsASearch = false
         if (Intent.ACTION_SEARCH == intent.action) {
-            mCurrentGroupIsASearch = false
             intent.action = Intent.ACTION_DEFAULT
             intent.removeExtra(SearchManager.QUERY)
         }
+        assignGroupViewElements()
+    }
+
+    private fun backToTheAppCaller() {
+        if (mAutofillSelection) {
+            // To get the app caller, only for autofill
+            super.onBackPressed()
+        } else {
+            // To move the app in background
+            moveTaskToBack(true)
+        }
     }
 
     override fun onBackPressed() {
@@ -934,24 +997,23 @@ class GroupActivity : LockingActivity(),
             finishNodeAction()
         } else {
             // Normal way when we are not in root
-            if (mRootGroup != null && mRootGroup != mCurrentGroup)
+            if (mRootGroup != null && mRootGroup != mCurrentGroup) {
                 super.onBackPressed()
-            // Else lock if needed
+                rebuildListNodes()
+            }
+            // Else in root, lock if needed
             else {
+                intent.removeExtra(AUTO_SEARCH_KEY)
+                intent.removeExtra(KEY_SEARCH_INFO)
                 if (PreferencesUtil.isLockDatabaseWhenBackButtonOnRootClicked(this)) {
                     lockAndExit()
                     super.onBackPressed()
                 } else {
-                    moveTaskToBack(true)
+                    // To restore standard mode
+                    EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
+                    backToTheAppCaller()
                 }
             }
-
-            mListNodesFragment = supportFragmentManager.findFragmentByTag(LIST_NODES_FRAGMENT_TAG) as ListNodesFragment?
-            // to refresh fragment
-            mListNodesFragment?.rebuildList()
-            mCurrentGroup = mListNodesFragment?.mainGroup
-            removeSearchInIntent(intent)
-            assignGroupViewElements()
         }
     }
 
@@ -964,42 +1026,35 @@ class GroupActivity : LockingActivity(),
         private const val LIST_NODES_FRAGMENT_TAG = "LIST_NODES_FRAGMENT_TAG"
         private const val SEARCH_FRAGMENT_TAG = "SEARCH_FRAGMENT_TAG"
         private const val OLD_GROUP_TO_UPDATE_KEY = "OLD_GROUP_TO_UPDATE_KEY"
+        private const val AUTO_SEARCH_KEY = "AUTO_SEARCH_KEY"
 
         private fun buildIntent(context: Context,
                                 group: Group?,
-                                searchInfo: SearchInfo?,
                                 readOnly: Boolean,
                                 intentBuildLauncher: (Intent) -> Unit) {
             val intent = Intent(context, GroupActivity::class.java)
             if (group != null) {
                 intent.putExtra(GROUP_ID_KEY, group.nodeId)
             }
-            if (searchInfo != null) {
-                intent.action = Intent.ACTION_SEARCH
-                val searchQuery = searchInfo.webDomain ?: searchInfo.applicationId
-                intent.putExtra(SearchManager.QUERY, searchQuery)
-            }
             ReadOnlyHelper.putReadOnlyInIntent(intent, readOnly)
             intentBuildLauncher.invoke(intent)
         }
 
         private fun checkTimeAndBuildIntent(activity: Activity,
                                             group: Group?,
-                                            searchInfo: SearchInfo?,
                                             readOnly: Boolean,
                                             intentBuildLauncher: (Intent) -> Unit) {
             if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
-                buildIntent(activity, group, searchInfo, readOnly, intentBuildLauncher)
+                buildIntent(activity, group, readOnly, intentBuildLauncher)
             }
         }
 
         private fun checkTimeAndBuildIntent(context: Context,
                                             group: Group?,
-                                            searchInfo: SearchInfo?,
                                             readOnly: Boolean,
                                             intentBuildLauncher: (Intent) -> Unit) {
             if (TimeoutHelper.checkTime(context)) {
-                buildIntent(context, group, searchInfo, readOnly, intentBuildLauncher)
+                buildIntent(context, group, readOnly, intentBuildLauncher)
             }
         }
 
@@ -1009,8 +1064,14 @@ class GroupActivity : LockingActivity(),
          * -------------------------
          */
         fun launch(context: Context,
+                   autoSearch: Boolean = false,
+                   searchInfo: SearchInfo? = null,
                    readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
-            checkTimeAndBuildIntent(context, null, null, readOnly) { intent ->
+            checkTimeAndBuildIntent(context, null, readOnly) { intent ->
+                searchInfo?.let {
+                    intent.putExtra(KEY_SEARCH_INFO, it)
+                }
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
                 context.startActivity(intent)
             }
         }
@@ -1020,11 +1081,13 @@ class GroupActivity : LockingActivity(),
          * 		Keyboard Launch
          * -------------------------
          */
-        // TODO implement pre search to directly open the direct group #280
-        fun launchForKeyboardSelection(context: Context,
-                                       readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
-            checkTimeAndBuildIntent(context, null, null, readOnly) { intent ->
-                EntrySelectionHelper.startActivityForEntrySelection(context, intent)
+        fun launchForEntrySelectionResult(context: Context,
+                                          autoSearch: Boolean = false,
+                                          searchInfo: SearchInfo? = null,
+                                          readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(context)) {
+            checkTimeAndBuildIntent(context, null, readOnly) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
+                EntrySelectionHelper.startActivityForEntrySelectionResult(context, intent, searchInfo)
             }
         }
 
@@ -1036,9 +1099,11 @@ class GroupActivity : LockingActivity(),
         @RequiresApi(api = Build.VERSION_CODES.O)
         fun launchForAutofillResult(activity: Activity,
                                     assistStructure: AssistStructure,
+                                    autoSearch: Boolean = false,
                                     searchInfo: SearchInfo? = null,
                                     readOnly: Boolean = PreferencesUtil.enableReadOnlyDatabase(activity)) {
-            checkTimeAndBuildIntent(activity, null, searchInfo, readOnly) { intent ->
+            checkTimeAndBuildIntent(activity, null, readOnly) { intent ->
+                intent.putExtra(AUTO_SEARCH_KEY, autoSearch)
                 AutofillHelper.startActivityForAutofillResult(activity, intent, assistStructure, searchInfo)
             }
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
  *
  * This file is part of KeePassDX.
  *
@@ -17,24 +17,31 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.magikeyboard
+package com.kunzisoft.keepass.activities
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.kunzisoft.keepass.activities.FileDatabaseSelectActivity
-import com.kunzisoft.keepass.activities.GroupActivity
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.timeout.TimeoutHelper
+import com.kunzisoft.keepass.database.search.SearchHelper
 
-class KeyboardLauncherActivity : AppCompatActivity() {
+/**
+ * Activity to select entry in database and populate it in Magikeyboard
+ */
+class MagikeyboardLauncherActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        if (Database.getInstance().loaded && TimeoutHelper.checkTime(this))
-            GroupActivity.launchForKeyboardSelection(this)
-        else {
-            // Pass extra to get entry
-            FileDatabaseSelectActivity.launchForKeyboardSelection(this)
-        }
+        SearchHelper.checkAutoSearchInfo(this,
+                Database.getInstance(),
+                null,
+                {},
+                {
+                    GroupActivity.launchForEntrySelectionResult(this)
+                },
+                {
+                    // Pass extra to get entry
+                    FileDatabaseSelectActivity.launchForEntrySelectionResult(this)
+                }
+        )
         finish()
         super.onCreate(savedInstanceState)
     }

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

@@ -42,18 +42,19 @@ import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.autofill.AutofillHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager
 import com.kunzisoft.keepass.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
+import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.education.PasswordActivityEducation
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
@@ -63,20 +64,17 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.MASTER_PASSWORD_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.READ_ONLY_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.utils.FileDatabaseInfo
-import com.kunzisoft.keepass.utils.MenuUtil
-import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.AdvancedUnlockInfoView
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 import com.kunzisoft.keepass.view.asError
 import kotlinx.android.synthetic.main.activity_password.*
 import java.io.FileNotFoundException
 
-open class PasswordActivity : StylishActivity() {
+open class PasswordActivity : SpecialModeActivity() {
 
     // Views
     private var toolbar: Toolbar? = null
-    private var containerView: View? = null
     private var filenameView: TextView? = null
     private var passwordView: EditText? = null
     private var keyFileSelectionView: KeyFileSelectionView? = null
@@ -110,6 +108,7 @@ open class PasswordActivity : StylishActivity() {
     private var mProgressDialogThread: ProgressDialogThread? = null
 
     private var advancedUnlockedManager: AdvancedUnlockedManager? = null
+    private var mAllowAutoOpenBiometricPrompt: Boolean = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -122,7 +121,6 @@ open class PasswordActivity : StylishActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        containerView = findViewById(R.id.container)
         confirmButtonView = findViewById(R.id.activity_password_open_button)
         filenameView = findViewById(R.id.filename)
         passwordView = findViewById(R.id.password)
@@ -166,6 +164,10 @@ open class PasswordActivity : StylishActivity() {
             mDatabaseKeyFileUri = UriUtil.parse(savedInstanceState.getString(KEY_KEYFILE))
         }
 
+        if (savedInstanceState?.containsKey(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT) == true) {
+            mAllowAutoOpenBiometricPrompt = savedInstanceState.getBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT)
+        }
+
         mProgressDialogThread = ProgressDialogThread(this).apply {
             onActionFinish = { actionTask, result ->
                 when (actionTask) {
@@ -255,21 +257,52 @@ open class PasswordActivity : StylishActivity() {
     }
 
     private fun launchGroupActivity() {
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
         EntrySelectionHelper.doEntrySelectionAction(intent,
                 {
                     GroupActivity.launch(this@PasswordActivity,
+                            true,
+                            searchInfo,
                             readOnly)
+                    // Finish activity if no search info
+                    if (searchInfo != null) {
+                        finish()
+                    }
                 },
                 {
-                    GroupActivity.launchForKeyboardSelection(this@PasswordActivity,
-                            readOnly)
+                    SearchHelper.checkAutoSearchInfo(this,
+                            Database.getInstance(),
+                            searchInfo,
+                            { items ->
+                                // Response is build
+                                if (items.size == 1) {
+                                    populateKeyboardAndMoveAppToBackground(this@PasswordActivity,
+                                            items[0],
+                                            intent)
+                                } else {
+                                    // Select the one we want
+                                    GroupActivity.launchForEntrySelectionResult(this,
+                                            true,
+                                            searchInfo)
+                                }
+                            },
+                            {
+                                // Here no search info found, disable auto search
+                                GroupActivity.launchForEntrySelectionResult(this@PasswordActivity,
+                                        false,
+                                        searchInfo,
+                                        readOnly)
+                            },
+                            {
+                                // Simply close if database not opened, normally not happened
+                            }
+                    )
                     // Do not keep history
                     finish()
                 },
                 { assistStructure ->
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        val searchInfo: SearchInfo? = intent.getParcelableExtra(KEY_SEARCH_INFO)
-                        AutofillHelper.checkAutoSearchInfo(this,
+                        SearchHelper.checkAutoSearchInfo(this,
                                 Database.getInstance(),
                                 searchInfo,
                                 { items ->
@@ -278,10 +311,11 @@ open class PasswordActivity : StylishActivity() {
                                     finish()
                                 },
                                 {
-                                    // Here no search info found
+                                    // Here no search info found, disable auto search
                                     GroupActivity.launchForAutofillResult(this@PasswordActivity,
                                             assistStructure,
-                                            null,
+                                            false,
+                                            searchInfo,
                                             readOnly)
                                 },
                                 {
@@ -304,35 +338,36 @@ open class PasswordActivity : StylishActivity() {
     }
 
     override fun onResume() {
-
-        if (Database.getInstance().loaded)
-            launchGroupActivity()
-
-        mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
-
-        // If the database isn't accessible make sure to clear the password field, if it
-        // was saved in the instance state
-        if (Database.getInstance().loaded) {
-            clearCredentialsViews()
-        }
-
-        // For check shutdown
         super.onResume()
 
-        mProgressDialogThread?.registerProgressTask()
+        if (Database.getInstance().loaded) {
+            launchGroupActivity()
+        } else {
+            mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this)
 
-        initUriFromIntent()
+            // If the database isn't accessible make sure to clear the password field, if it
+            // was saved in the instance state
+            if (Database.getInstance().loaded) {
+                clearCredentialsViews()
+            }
 
-        checkPermission()
-    }
+            mProgressDialogThread?.registerProgressTask()
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(KEY_PERMISSION_ASKED, mPermissionAsked)
-        mDatabaseKeyFileUri?.let {
-            outState.putString(KEY_KEYFILE, it.toString())
+            // Back to previous keyboard is setting activated
+            if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this)) {
+                sendBroadcast(Intent(BACK_PREVIOUS_KEYBOARD_ACTION))
+            }
+
+            // Don't allow auto open prompt if lock become when UI visible
+            mAllowAutoOpenBiometricPrompt = if (LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK == true)
+                false
+            else
+                mAllowAutoOpenBiometricPrompt
+
+            initUriFromIntent()
+
+            checkPermission()
         }
-        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
-        super.onSaveInstanceState(outState)
     }
 
     private fun initUriFromIntent() {
@@ -438,6 +473,7 @@ open class PasswordActivity : StylishActivity() {
                                     }
                                 })
                     }
+                    advancedUnlockedManager?.isBiometricPromptAutoOpenEnable = mAllowAutoOpenBiometricPrompt
                     advancedUnlockedManager?.checkBiometricAvailability()
                     biometricInitialize = true
                 } else {
@@ -499,14 +535,26 @@ open class PasswordActivity : StylishActivity() {
     override fun onPause() {
         mProgressDialogThread?.unregisterProgressTask()
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            advancedUnlockedManager?.destroy()
+            advancedUnlockedManager = null
+        }
+
+        // Reinit locking activity UI variable
+        LockingActivity.LOCKING_ACTIVITY_UI_VISIBLE_DURING_LOCK = null
+        mAllowAutoOpenBiometricPrompt = true
+
         super.onPause()
     }
 
-    override fun onDestroy() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            advancedUnlockedManager?.destroy()
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(KEY_PERMISSION_ASKED, mPermissionAsked)
+        mDatabaseKeyFileUri?.let {
+            outState.putString(KEY_KEYFILE, it.toString())
         }
-        super.onDestroy()
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
+        outState.putBoolean(ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT, false)
+        super.onSaveInstanceState(outState)
     }
 
     private fun verifyCheckboxesAndLoadDatabase(cipherDatabaseEntity: CipherDatabaseEntity? = null) {
@@ -580,14 +628,15 @@ open class PasswordActivity : StylishActivity() {
         val inflater = menuInflater
         // Read menu
         inflater.inflate(R.menu.open_file, menu)
-
-        if (mForceReadOnly) {
+        if (mSelectionMode || mForceReadOnly) {
             menu.removeItem(R.id.menu_open_file_read_mode_key)
         } else {
             changeOpenFileReadIcon(menu.findItem(R.id.menu_open_file_read_mode_key))
         }
 
-        MenuUtil.defaultMenuInflater(inflater, menu)
+        if (!mSelectionMode) {
+            MenuUtil.defaultMenuInflater(inflater, menu)
+        }
 
         if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             // biometric menu
@@ -715,6 +764,8 @@ open class PasswordActivity : StylishActivity() {
             data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
+        mAllowAutoOpenBiometricPrompt = false
+
         // To get entry in result
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
@@ -733,10 +784,13 @@ open class PasswordActivity : StylishActivity() {
         if (!keyFileResult) {
             // this block if not a key file response
             when (resultCode) {
-                LockingActivity.RESULT_EXIT_LOCK, Activity.RESULT_CANCELED -> {
+                LockingActivity.RESULT_EXIT_LOCK -> {
                     clearCredentialsViews()
                     Database.getInstance().closeAndClear(applicationContext.filesDir)
                 }
+                Activity.RESULT_CANCELED -> {
+                    clearCredentialsViews()
+                }
             }
         }
     }
@@ -754,6 +808,8 @@ open class PasswordActivity : StylishActivity() {
         private const val KEY_PERMISSION_ASKED = "KEY_PERMISSION_ASKED"
         private const val WRITE_EXTERNAL_STORAGE_REQUEST = 647
 
+        private const val ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT = "ALLOW_AUTO_OPEN_BIOMETRIC_PROMPT"
+
         private fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?,
                                          intentBuildLauncher: (Intent) -> Unit) {
             val intent = Intent(activity, PasswordActivity::class.java)
@@ -773,8 +829,12 @@ open class PasswordActivity : StylishActivity() {
         fun launch(
                 activity: Activity,
                 databaseFile: Uri,
-                keyFile: Uri?) {
+                keyFile: Uri?,
+                searchInfo: SearchInfo?) {
             buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
+                searchInfo?.let {
+                    intent.putExtra(KEY_SEARCH_INFO, it)
+                }
                 activity.startActivity(intent)
             }
         }
@@ -789,9 +849,13 @@ open class PasswordActivity : StylishActivity() {
         fun launchForKeyboardResult(
                 activity: Activity,
                 databaseFile: Uri,
-                keyFile: Uri?) {
+                keyFile: Uri?,
+                searchInfo: SearchInfo?) {
             buildAndLaunchIntent(activity, databaseFile, keyFile) { intent ->
-                EntrySelectionHelper.startActivityForEntrySelection(activity, intent)
+                EntrySelectionHelper.startActivityForEntrySelectionResult(
+                        activity,
+                        intent,
+                        searchInfo)
             }
         }
 
@@ -818,7 +882,7 @@ open class PasswordActivity : StylishActivity() {
                             searchInfo)
                 }
             } else {
-                launch(activity, databaseFile, keyFile)
+                launch(activity, databaseFile, keyFile, searchInfo)
             }
         }
     }

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

@@ -31,10 +31,10 @@ import android.widget.BaseAdapter
 import android.widget.GridView
 import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.ImageViewCompat
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.icons.IconPack
 import com.kunzisoft.keepass.icons.IconPackChooser
@@ -132,7 +132,7 @@ class IconPickerDialogFragment : DialogFragment() {
             return bundle.getParcelable(KEY_ICON_STANDARD)
         }
 
-        fun launch(activity: StylishActivity) {
+        fun launch(activity: AppCompatActivity) {
             // Create an instance of the dialog fragment and show it
             val dialog = IconPickerDialogFragment()
             dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")

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

@@ -89,9 +89,9 @@ class SetOTPDialogFragment : DialogFragment() {
     }
 
     private var mSecretWellFormed = false
-    private var mCounterWellFormed = true
-    private var mPeriodWellFormed = true
-    private var mDigitsWellFormed = true
+    private var mCounterWellFormed = false
+    private var mPeriodWellFormed = false
+    private var mDigitsWellFormed = false
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -365,14 +365,26 @@ class SetOTPDialogFragment : DialogFragment() {
     private fun upgradeParameters() {
         otpAlgorithmSpinner?.setSelection(TokenCalculator.HashAlgorithm.values()
                 .indexOf(mOtpElement.algorithm))
+
+        val secret = mOtpElement.getBase32Secret()
         otpSecretTextView?.apply {
-            setText(mOtpElement.getBase32Secret())
+            setText(secret)
             // Cursor at end
             setSelection(this.text.length)
         }
-        otpCounterTextView?.setText(mOtpElement.counter.toString())
-        otpPeriodTextView?.setText(mOtpElement.period.toString())
-        otpDigitsTextView?.setText(mOtpElement.digits.toString())
+        mSecretWellFormed = OtpElement.isValidBase32(secret)
+
+        val counter = mOtpElement.counter
+        otpCounterTextView?.setText(counter.toString())
+        mCounterWellFormed = OtpElement.isValidCounter(counter)
+
+        val period = mOtpElement.period
+        otpPeriodTextView?.setText(period.toString())
+        mPeriodWellFormed = OtpElement.isValidPeriod(period)
+
+        val digits = mOtpElement.digits
+        otpDigitsTextView?.setText(digits.toString())
+        mDigitsWellFormed = OtpElement.isValidDigits(digits)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

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

@@ -24,15 +24,22 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.model.SearchInfo
 
 object EntrySelectionHelper {
 
     private const val EXTRA_ENTRY_SELECTION_MODE = "com.kunzisoft.keepass.extra.ENTRY_SELECTION_MODE"
     private const val DEFAULT_ENTRY_SELECTION_MODE = false
+    // Key to retrieve search in intent
+    const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
 
-    fun startActivityForEntrySelection(context: Context, intent: Intent) {
+    fun startActivityForEntrySelectionResult(context: Context,
+                                             intent: Intent,
+                                             searchInfo: SearchInfo?) {
         addEntrySelectionModeExtraInIntent(intent)
-        // only to avoid visible flickering when redirecting
+        searchInfo?.let {
+            intent.putExtra(KEY_SEARCH_INFO, it)
+        }
         context.startActivity(intent)
     }
 

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

@@ -89,13 +89,13 @@ class OpenFileHelper {
 
     @SuppressLint("InlinedApi")
     private fun openActivityWithActionOpenDocument() {
-        val intentOpenDocument = Intent(APP_ACTION_OPEN_DOCUMENT).apply {
+        val intentOpenDocument = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             type = "*/*"
-            flags = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
-                    Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or
-                    Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+            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)
@@ -108,10 +108,10 @@ class OpenFileHelper {
         val intentGetContent = Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             type = "*/*"
-            flags = Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
-                    Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or
-                    Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+            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)
@@ -226,12 +226,6 @@ class OpenFileHelper {
 
         private const val TAG = "OpenFileHelper"
 
-        private var APP_ACTION_OPEN_DOCUMENT: String = try {
-            Intent::class.java.getField("ACTION_OPEN_DOCUMENT").get(null) as String
-        } catch (e: Exception) {
-            "android.intent.action.OPEN_DOCUMENT"
-        }
-
         const val OPEN_INTENTS_FILE_BROWSE = "org.openintents.action.PICK_FILE"
 
         private const val GET_CONTENT = 25745

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

@@ -19,31 +19,21 @@
  */
 package com.kunzisoft.keepass.activities.lock
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 import com.kunzisoft.keepass.database.action.ProgressDialogThread
 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 : StylishActivity() {
-
-    companion object {
-
-        private 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
-    }
+abstract class LockingActivity : SpecialModeActivity() {
 
     protected var mTimeoutEnable: Boolean = true
 
@@ -51,11 +41,14 @@ abstract class LockingActivity : StylishActivity() {
     private var mExitLock: Boolean = false
 
     // Force readOnly if Entry Selection mode
-    protected var mReadOnly: Boolean = false
+    protected var mReadOnly: Boolean
         get() {
-            return field || mSelectionMode
+            return mReadOnlyToSave || mSelectionMode
         }
-    protected var mSelectionMode: Boolean = false
+        set(value) {
+            mReadOnlyToSave = value
+        }
+    private var mReadOnlyToSave: Boolean = false
     protected var mAutoSaveEnable: Boolean = true
 
     var mProgressDialogThread: ProgressDialogThread? = null
@@ -75,15 +68,17 @@ abstract class LockingActivity : StylishActivity() {
         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
-        mReadOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState, intent)
 
         mProgressDialogThread = ProgressDialogThread(this)
     }
@@ -104,7 +99,7 @@ abstract class LockingActivity : StylishActivity() {
         mProgressDialogThread?.registerProgressTask()
 
         // To refresh when back to normal workflow from selection workflow
-        mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
+        mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent)
         mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
 
         invalidateOptionsMenu()
@@ -124,15 +119,18 @@ abstract class LockingActivity : StylishActivity() {
             if (!mExitLock)
                 TimeoutHelper.recordTime(this)
         }
+
+        LOCKING_ACTIVITY_UI_VISIBLE = true
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        ReadOnlyHelper.onSaveInstanceState(outState, mReadOnly)
         outState.putBoolean(TIMEOUT_ENABLE_KEY, mTimeoutEnable)
         super.onSaveInstanceState(outState)
     }
 
     override fun onPause() {
+        LOCKING_ACTIVITY_UI_VISIBLE = false
+
         mProgressDialogThread?.unregisterProgressTask()
 
         super.onPause()
@@ -155,11 +153,21 @@ abstract class LockingActivity : StylishActivity() {
     /**
      * To reset the app timeout when a view is focused or changed
      */
+    @SuppressLint("ClickableViewAccessibility")
     protected fun resetAppTimeoutWhenViewFocusedOrChanged(vararg views: View?) {
         views.forEach {
+            it?.setOnTouchListener { _, event ->
+                when (event.action) {
+                    MotionEvent.ACTION_DOWN -> {
+                        // Log.d(TAG, "View touched, try to reset app timeout")
+                        TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this)
+                    }
+                }
+                false
+            }
             it?.setOnFocusChangeListener { _, hasFocus ->
                 if (hasFocus) {
-                    Log.d(TAG, "View focused, reset app timeout")
+                    // Log.d(TAG, "View focused, try to reset app timeout")
                     TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this)
                 }
             }
@@ -180,4 +188,17 @@ abstract class LockingActivity : StylishActivity() {
             super.onBackPressed()
         }
     }
+
+    companion object {
+
+        private 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
+    }
 }

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

@@ -0,0 +1,90 @@
+package com.kunzisoft.keepass.activities.selection
+
+import android.os.Build
+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.stylish.StylishActivity
+import com.kunzisoft.keepass.autofill.AutofillHelper
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.SpecialModeView
+
+/**
+ * Activity to manage special mode (ie: selection mode)
+ */
+abstract class SpecialModeActivity : StylishActivity() {
+
+    protected var mSelectionMode: Boolean = false
+
+    protected var mAutofillSelection: Boolean = false
+
+    private var specialModeView: SpecialModeView? = null
+
+    open fun onCancelSpecialMode() {
+        onBackPressed()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mAutofillSelection = AutofillHelper.retrieveAssistStructure(intent) != null
+        }
+
+        val searchInfo: SearchInfo? = intent.getParcelableExtra(EntrySelectionHelper.KEY_SEARCH_INFO)
+
+        // To show the selection mode
+        specialModeView = findViewById(R.id.special_mode_view)
+        specialModeView?.apply {
+            // Populate title
+            val typeModeId = if (mAutofillSelection)
+                R.string.autofill
+            else
+                R.string.magic_keyboard_title
+            title = "${resources.getString(R.string.selection_mode)} (${getString(typeModeId)})"
+            // Populate subtitle
+            subtitle = searchInfo?.getName(resources)
+
+            // Show the toolbar or not
+            visible = mSelectionMode
+
+            // Add back listener
+            onCancelButtonClickListener = View.OnClickListener {
+                onCancelSpecialMode()
+            }
+
+            // Create menu
+            menu.clear()
+            if (mAutofillSelection) {
+                menuInflater.inflate(R.menu.autofill, menu)
+                setOnMenuItemClickListener {  menuItem ->
+                    when (menuItem.itemId) {
+                        R.id.menu_block_autofill -> {
+                            blockAutofill(searchInfo)
+                        }
+                    }
+                    true
+                }
+            }
+        }
+    }
+
+    fun blockAutofill(searchInfo: SearchInfo?) {
+        val webDomain = searchInfo?.webDomain
+        val applicationId = searchInfo?.applicationId
+        if (webDomain != null) {
+            PreferencesUtil.addWebDomainToBlocklist(this,
+                    webDomain)
+        } else if (applicationId != null) {
+            PreferencesUtil.addApplicationIdToBlocklist(this,
+                    applicationId)
+        }
+        onCancelSpecialMode()
+        Toast.makeText(this.applicationContext,
+                R.string.autofill_block_restart,
+                Toast.LENGTH_LONG).show()
+    }
+}

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

@@ -27,6 +27,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -73,7 +74,11 @@ class NodeAdapter (private val context: Context)
 
     private val mDatabase: Database
 
+    @ColorInt
+    private val contentSelectionColor: Int
+    @ColorInt
     private val iconGroupColor: Int
+    @ColorInt
     private val iconEntryColor: Int
 
     /**
@@ -97,6 +102,10 @@ class NodeAdapter (private val context: Context)
         // Database
         this.mDatabase = Database.getInstance()
 
+        // Color of content selection
+        val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        this.contentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
+        taContentSelectionColor.recycle()
         // Retrieve the color to tint the icon
         val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
         this.iconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
@@ -280,11 +289,18 @@ class NodeAdapter (private val context: Context)
 
     override fun onBindViewHolder(holder: NodeViewHolder, position: Int) {
         val subNode = nodeSortedList.get(position)
+
+        // Node selection
+        holder.container.isSelected = actionNodesList.contains(subNode)
+
         // Assign image
-        val iconColor = when (subNode.type) {
+        val iconColor = if (holder.container.isSelected)
+            contentSelectionColor
+        else when (subNode.type) {
             Type.GROUP -> iconGroupColor
             Type.ENTRY -> iconEntryColor
         }
+        holder.imageIdentifier?.setColorFilter(iconColor)
         holder.icon.apply {
             assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor)
             // Relative size of the icon
@@ -347,8 +363,6 @@ class NodeAdapter (private val context: Context)
         holder.container.setOnLongClickListener {
             nodeClickCallback?.onNodeLongClick(subNode) ?: false
         }
-
-        holder.container.isSelected = actionNodesList.contains(subNode)
     }
     
     override fun getItemCount(): Int {
@@ -372,6 +386,7 @@ class NodeAdapter (private val context: Context)
 
     class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var container: View = itemView.findViewById(R.id.node_container)
+        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)

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

@@ -46,7 +46,8 @@ class SearchEntryCursorAdapter(private val context: Context,
 
     private val cursorInflater: LayoutInflater? = context.getSystemService(
             Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater?
-    private var displayUsername: Boolean = false
+    private var mDisplayUsername: Boolean = false
+    private var mOmitBackup: Boolean = true
     private val iconColor: Int
 
     init {
@@ -59,7 +60,8 @@ class SearchEntryCursorAdapter(private val context: Context,
     }
 
     fun reInit(context: Context) {
-        this.displayUsername = PreferencesUtil.showUsernamesListEntries(context)
+        this.mDisplayUsername = PreferencesUtil.showUsernamesListEntries(context)
+        this.mOmitBackup = PreferencesUtil.omitBackup(context)
     }
 
     override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
@@ -93,7 +95,7 @@ class SearchEntryCursorAdapter(private val context: Context,
             // Assign subtitle
             viewHolder.textViewSubTitle?.apply {
                 val entryUsername = currentEntry.username
-                text = if (displayUsername && entryUsername.isNotEmpty()) {
+                text = if (mDisplayUsername && entryUsername.isNotEmpty()) {
                     String.format("(%s)", entryUsername)
                 } else {
                     ""
@@ -129,7 +131,9 @@ class SearchEntryCursorAdapter(private val context: Context,
         if (database.type == DatabaseKDBX.TYPE)
             cursorKDBX = EntryCursorKDBX()
 
-        val searchGroup = database.createVirtualGroupFromSearch(query, SearchHelper.MAX_SEARCH_ENTRY)
+        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))) {

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

@@ -34,14 +34,12 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
+import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper.KEY_SEARCH_INFO
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.keepass.timeout.TimeoutHelper
 
 
 @RequiresApi(api = Build.VERSION_CODES.O)
@@ -50,7 +48,6 @@ object AutofillHelper {
     private const val AUTOFILL_RESPONSE_REQUEST_CODE = 8165
 
     private const val ASSIST_STRUCTURE = AutofillManager.EXTRA_ASSIST_STRUCTURE
-    const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
 
     fun retrieveAssistStructure(intent: Intent?): AssistStructure? {
         intent?.let {
@@ -122,60 +119,34 @@ object AutofillHelper {
      * Build the Autofill response for many entry
      */
     fun buildResponse(activity: Activity, entriesInfo: List<EntryInfo>) {
-        var setResultOk = false
-        activity.intent?.extras?.let { extras ->
-            if (extras.containsKey(ASSIST_STRUCTURE)) {
-                activity.intent?.getParcelableExtra<AssistStructure>(ASSIST_STRUCTURE)?.let { structure ->
-                    StructureParser(structure).parse()?.let { result ->
-                        // New Response
-                        val responseBuilder = FillResponse.Builder()
-                        entriesInfo.forEach {
-                            responseBuilder.addDataset(buildDataset(activity, it, result))
-                        }
-                        val mReplyIntent = Intent()
-                        Log.d(activity.javaClass.name, "Successed Autofill auth.")
-                        mReplyIntent.putExtra(
-                                AutofillManager.EXTRA_AUTHENTICATION_RESULT,
-                                responseBuilder.build())
-                        setResultOk = true
-                        activity.setResult(Activity.RESULT_OK, mReplyIntent)
-                    }
-                }
-            }
-            if (!setResultOk) {
-                Log.w(activity.javaClass.name, "Failed Autofill auth.")
-                activity.setResult(Activity.RESULT_CANCELED)
-            }
-        }
-    }
-
-    /**
-     * Utility method to perform actions if item is found or not after an auto search in [database]
-     */
-    fun checkAutoSearchInfo(context: Context,
-                            database: Database,
-                            searchInfo: SearchInfo?,
-                            onItemsFound: (items: List<EntryInfo>) -> Unit,
-                            onItemNotFound: () -> Unit,
-                            onDatabaseClosed: () -> Unit) {
-        if (database.loaded && TimeoutHelper.checkTime(context)) {
-            var searchWithoutUI = false
-            if (PreferencesUtil.isAutofillAutoSearchEnable(context)
-                    && searchInfo != null) {
-                // If search provide results
-                database.createVirtualGroupFromSearch(searchInfo, SearchHelper.MAX_SEARCH_ENTRY)?.let { searchGroup ->
-                    if (searchGroup.getNumberOfChildEntries() > 0) {
-                        searchWithoutUI = true
-                        onItemsFound.invoke(
-                                searchGroup.getChildEntriesInfo(database))
-                    }
-                }
-            }
-            if (!searchWithoutUI) {
-                onItemNotFound.invoke()
-            }
+        if (entriesInfo.isEmpty()) {
+            activity.setResult(Activity.RESULT_CANCELED)
         } else {
-            onDatabaseClosed.invoke()
+            var setResultOk = false
+            activity.intent?.extras?.let { extras ->
+                if (extras.containsKey(ASSIST_STRUCTURE)) {
+                    activity.intent?.getParcelableExtra<AssistStructure>(ASSIST_STRUCTURE)?.let { structure ->
+                        StructureParser(structure).parse()?.let { result ->
+                            // New Response
+                            val responseBuilder = FillResponse.Builder()
+                            entriesInfo.forEach {
+                                responseBuilder.addDataset(buildDataset(activity, it, result))
+                            }
+                            val mReplyIntent = Intent()
+                            Log.d(activity.javaClass.name, "Successed Autofill auth.")
+                            mReplyIntent.putExtra(
+                                    AutofillManager.EXTRA_AUTHENTICATION_RESULT,
+                                    responseBuilder.build())
+                            setResultOk = true
+                            activity.setResult(Activity.RESULT_OK, mReplyIntent)
+                        }
+                    }
+                }
+                if (!setResultOk) {
+                    Log.w(activity.javaClass.name, "Failed Autofill auth.")
+                    activity.setResult(Activity.RESULT_CANCELED)
+                }
+            }
         }
     }
 

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

@@ -26,12 +26,25 @@ import android.util.Log
 import android.widget.RemoteViews
 import androidx.annotation.RequiresApi
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.AutofillLauncherActivity
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.PreferencesUtil
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 class KeeAutofillService : AutofillService() {
 
+    var applicationIdBlocklist: Set<String>? = null
+    var webDomainBlocklist: Set<String>? = null
+
+    override fun onCreate() {
+        super.onCreate()
+
+        applicationIdBlocklist = PreferencesUtil.applicationIdBlocklist(this)
+        webDomainBlocklist = PreferencesUtil.webDomainBlocklist(this)
+    }
+
     override fun onFillRequest(request: FillRequest,
                                cancellationSignal: CancellationSignal,
                                callback: FillCallback) {
@@ -43,32 +56,36 @@ class KeeAutofillService : AutofillService() {
         // Check user's settings for authenticating Responses and Datasets.
         StructureParser(latestStructure).parse()?.let { parseResult ->
 
-            val searchInfo = SearchInfo().apply {
-                applicationId = parseResult.applicationId
-                webDomain = parseResult.domain
-            }
+            // Build search info only if applicationId or webDomain are not blocked
+            if (searchAllowedFor(parseResult.applicationId, applicationIdBlocklist)
+                    && searchAllowedFor(parseResult.domain, webDomainBlocklist)) {
+                val searchInfo = SearchInfo().apply {
+                    applicationId = parseResult.applicationId
+                    webDomain = parseResult.domain
+                }
 
-            AutofillHelper.checkAutoSearchInfo(this,
-                    Database.getInstance(),
-                    searchInfo,
-                    { items ->
-                        val responseBuilder = FillResponse.Builder()
-                        AutofillHelper.addHeader(responseBuilder, packageName,
-                                parseResult.domain, parseResult.applicationId)
-                        items.forEach {
-                            responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
+                SearchHelper.checkAutoSearchInfo(this,
+                        Database.getInstance(),
+                        searchInfo,
+                        { items ->
+                            val responseBuilder = FillResponse.Builder()
+                            AutofillHelper.addHeader(responseBuilder, packageName,
+                                    parseResult.domain, parseResult.applicationId)
+                            items.forEach {
+                                responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
+                            }
+                            callback.onSuccess(responseBuilder.build())
+                        },
+                        {
+                            // Show UI if no search result
+                            showUIForEntrySelection(parseResult, searchInfo, callback)
+                        },
+                        {
+                            // Show UI if database not open
+                            showUIForEntrySelection(parseResult, searchInfo, callback)
                         }
-                        callback.onSuccess(responseBuilder.build())
-                    },
-                    {
-                        // Show UI if no search result
-                        showUIForEntrySelection(parseResult, searchInfo, callback)
-                    },
-                    {
-                        // Show UI if database not open
-                        showUIForEntrySelection(parseResult, searchInfo, callback)
-                    }
-            )
+                )
+            }
         }
     }
 
@@ -114,5 +131,18 @@ class KeeAutofillService : AutofillService() {
 
     companion object {
         private val TAG = KeeAutofillService::class.java.name
+
+        fun searchAllowedFor(element: String?, blockList: Set<String>?): Boolean {
+            element?.let { elementNotNull ->
+                if (blockList?.any { appIdBlocked ->
+                            elementNotNull.contains(appIdBlocked)
+                        } == true
+                ) {
+                    Log.d(TAG, "Autofill not allowed for $elementNotNull")
+                    return false
+                }
+            }
+            return true
+        }
     }
 }

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

@@ -102,9 +102,12 @@ internal class StructureParser(private val structure: AssistStructure) {
             when {
                 it.equals(View.AUTOFILL_HINT_USERNAME, true)
                         || it.equals(View.AUTOFILL_HINT_EMAIL_ADDRESS, true)
-                        || it.equals(View.AUTOFILL_HINT_PHONE, true)
                         || it.equals("email", true)
-                        || it.equals("usernameOrEmail", true)-> {
+                        || it.equals(View.AUTOFILL_HINT_PHONE, true)
+                        || it.contains("OrUsername", true)
+                        || it.contains("OrEmailAddress", true)
+                        || it.contains("OrEmail", true)
+                        || it.contains("OrPhone", true)-> {
                     result?.usernameId = autofillId
                     Log.d(TAG, "Autofill username hint")
                 }
@@ -112,7 +115,7 @@ internal class StructureParser(private val structure: AssistStructure) {
                         || it.contains("password", true) -> {
                     result?.passwordId = autofillId
                     Log.d(TAG, "Autofill password hint")
-                    // Username not needed in this specific case
+                    // Username not needed in this case
                     usernameNeeded = false
                     return true
                 }
@@ -160,42 +163,78 @@ internal class StructureParser(private val structure: AssistStructure) {
         return false
     }
 
+    private fun inputIsVariationType(inputType: Int, vararg type: Int): Boolean {
+        type.forEach {
+            if (inputType and InputType.TYPE_MASK_VARIATION == it)
+                return true
+        }
+        return false
+    }
+
+    private fun showHexInputType(inputType: Int): String {
+        return "0x${"%08x".format(inputType)}"
+    }
+
     private fun parseNodeByAndroidInput(node: AssistStructure.ViewNode): Boolean {
         val autofillId = node.autofillId
         val inputType = node.inputType
-        if (inputType and InputType.TYPE_CLASS_TEXT != 0) {
-            when {
-                inputType and InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS != 0 -> {
-                    result?.usernameId = autofillId
-                    Log.d(TAG, "Autofill username android type: $inputType")
+        when (inputType and InputType.TYPE_MASK_CLASS) {
+            InputType.TYPE_CLASS_TEXT -> {
+                when {
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
+                            InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS) -> {
+                        result?.usernameId = autofillId
+                        Log.d(TAG, "Autofill username android text type: ${showHexInputType(inputType)}")
+                    }
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_TEXT_VARIATION_NORMAL,
+                            InputType.TYPE_TEXT_VARIATION_PERSON_NAME,
+                            InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) -> {
+                        usernameCandidate = autofillId
+                        Log.d(TAG, "Autofill username candidate android text type: ${showHexInputType(inputType)}")
+                    }
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_TEXT_VARIATION_PASSWORD,
+                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
+                            InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) -> {
+                        result?.passwordId = autofillId
+                        Log.d(TAG, "Autofill password android text type: ${showHexInputType(inputType)}")
+                        usernameNeeded = false
+                        return true
+                    }
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT,
+                            InputType.TYPE_TEXT_VARIATION_FILTER,
+                            InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE,
+                            InputType.TYPE_TEXT_VARIATION_PHONETIC,
+                            InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS,
+                            InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE,
+                            InputType.TYPE_TEXT_VARIATION_URI) -> {
+                        // Type not used
+                    }
+                    else -> {
+                        Log.d(TAG, "Autofill unknown android text type: ${showHexInputType(inputType)}")
+                    }
                 }
-                inputType and InputType.TYPE_TEXT_VARIATION_NORMAL != 0 ||
-                        inputType and InputType.TYPE_NUMBER_VARIATION_NORMAL != 0 ||
-                        inputType and InputType.TYPE_TEXT_VARIATION_PERSON_NAME != 0 -> {
-                    usernameCandidate = autofillId
-                    Log.d(TAG, "Autofill username candidate android type: $inputType")
-                }
-                inputType and InputType.TYPE_TEXT_VARIATION_PASSWORD != 0 ||
-                        inputType and InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD != 0 ||
-                        inputType and InputType.TYPE_NUMBER_VARIATION_PASSWORD != 0 -> {
-                    result?.passwordId = autofillId
-                    Log.d(TAG, "Autofill password android type: $inputType")
-                    return true
-                }
-                inputType and InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_FILTER != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_PHONETIC != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_URI != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS != 0 ||
-                inputType and InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD != 0 -> {
-                    // Type not used
-                }
-                else -> {
-                    Log.d(TAG, "Autofill unknown android type: $inputType")
-                    usernameCandidate = autofillId
+            }
+            InputType.TYPE_CLASS_NUMBER -> {
+                when {
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_NUMBER_VARIATION_NORMAL) -> {
+                        usernameCandidate = autofillId
+                        Log.d(TAG, "Autofill usernale candidate android number type: ${showHexInputType(inputType)}")
+                    }
+                    inputIsVariationType(inputType,
+                            InputType.TYPE_NUMBER_VARIATION_PASSWORD) -> {
+                        result?.passwordId = autofillId
+                        Log.d(TAG, "Autofill password android number type: ${showHexInputType(inputType)}")
+                        usernameNeeded = false
+                        return true
+                    }
+                    else -> {
+                        Log.d(TAG, "Autofill unknown android number type: ${showHexInputType(inputType)}")
+                    }
                 }
             }
         }

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

@@ -52,7 +52,18 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     private var biometricUnlockDatabaseHelper: BiometricUnlockDatabaseHelper? = null
     private var biometricMode: Mode = Mode.UNAVAILABLE
 
-    private var isBiometricPromptAutoOpenEnable = PreferencesUtil.isBiometricPromptAutoOpenEnable(context)
+    /**
+     * Manage setting to auto open biometric prompt
+     */
+    private var biometricPromptAutoOpenPreference = PreferencesUtil.isBiometricPromptAutoOpenEnable(context)
+    var isBiometricPromptAutoOpenEnable: Boolean = true
+        get() {
+            return field && biometricPromptAutoOpenPreference
+        }
+
+    // Variable to check if the prompt can be open (if the right activity is currently shown)
+    // checkBiometricAvailability() allows open biometric prompt and onDestroy() removes the authorization
+    private var allowOpenBiometricPrompt = false
 
     private var cipherDatabaseAction = CipherDatabaseAction.getInstance(context.applicationContext)
 
@@ -73,6 +84,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         // biometric not supported (by API level or hardware) so keep option hidden
         // or manually disable
         val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate()
+        allowOpenBiometricPrompt = true
 
         if (!PreferencesUtil.isBiometricUnlockEnable(context)
                 || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
@@ -206,7 +218,8 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
                                     cryptoObject: BiometricPrompt.CryptoObject,
                                     promptInfo: BiometricPrompt.PromptInfo) {
         context.runOnUiThread {
-            biometricPrompt?.authenticate(promptInfo, cryptoObject)
+            if (allowOpenBiometricPrompt)
+                biometricPrompt?.authenticate(promptInfo, cryptoObject)
         }
     }
 
@@ -272,6 +285,9 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     }
 
     fun destroy() {
+        // Close the biometric prompt
+        allowOpenBiometricPrompt = false
+        biometricUnlockDatabaseHelper?.closeBiometricPrompt()
         // Restore the checked listener
         checkboxPasswordView?.setOnCheckedChangeListener(onCheckedPasswordChangeListener)
     }

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

@@ -271,6 +271,10 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
         }
     }
 
+    fun closeBiometricPrompt() {
+        biometricPrompt?.cancelAuthentication()
+    }
+
     interface BiometricUnlockErrorCallback {
         fun onInvalidKeyException(e: Exception)
         fun onBiometricException(e: Exception)

app/src/main/java/com/kunzisoft/keepass/crypto/CipherFactory.kt

@@ -41,17 +41,6 @@ object CipherFactory {
         Security.addProvider(BouncyCastleProvider())
     }
 
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
-    @JvmOverloads
-    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
-        // Return the native AES if it is possible
-        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
-            Cipher.getInstance(transformation, AESProvider())
-        } else {
-            Cipher.getInstance(transformation)
-        }
-    }
-
     fun deviceBlacklisted(): Boolean {
         if (!blacklistInit) {
             blacklistInit = true
@@ -65,6 +54,16 @@ object CipherFactory {
         return transformation == "AES/CBC/PKCS5Padding"
     }
 
+    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
+    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
+        // Return the native AES if it is possible
+        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
+            Cipher.getInstance(transformation, AESProvider())
+        } else {
+            Cipher.getInstance(transformation)
+        }
+    }
+
     /**
      * Generate appropriate cipher based on KeePass 2.x UUID's
      */

app/src/main/java/com/kunzisoft/keepass/crypto/CryptoUtil.kt

@@ -74,12 +74,10 @@ object CryptoUtil {
         return ret
     }
 
-    @JvmOverloads
     fun hashSha256(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
         return hashGen("SHA-256", data, offset, count)
     }
 
-    @JvmOverloads
     fun hashSha512(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
         return hashGen("SHA-512", data, offset, count)
     }

app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidAESKeyTransformer.kt

@@ -20,12 +20,10 @@
 package com.kunzisoft.keepass.crypto.finalkey
 
 import java.io.IOException
-import java.lang.Exception
 import java.security.InvalidKeyException
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
 import javax.crypto.ShortBufferException
 import javax.crypto.spec.SecretKeySpec
 

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

@@ -61,10 +61,10 @@ class Argon2Kdf internal constructor() : KdfEngine() {
             UnsignedInt(it)
         }
         val memory = kdfParameters.getUInt64(PARAM_MEMORY)?.div(MEMORY_BLOCK_SIZE)?.let {
-            UnsignedInt.fromLong(it)
+            UnsignedInt.fromKotlinLong(it)
         }
         val iterations = kdfParameters.getUInt64(PARAM_ITERATIONS)?.let {
-            UnsignedInt.fromLong(it)
+            UnsignedInt.fromKotlinLong(it)
         }
         val version = kdfParameters.getUInt32(PARAM_VERSION)?.let {
             UnsignedInt(it)
@@ -124,16 +124,16 @@ class Argon2Kdf internal constructor() : KdfEngine() {
 
     override fun getParallelism(kdfParameters: KdfParameters): Long {
         return kdfParameters.getUInt32(PARAM_PARALLELISM)?.let {
-            UnsignedInt(it).toLong()
+            UnsignedInt(it).toKotlinLong()
         } ?: defaultParallelism
     }
 
     override fun setParallelism(kdfParameters: KdfParameters, parallelism: Long) {
-        kdfParameters.setUInt32(PARAM_PARALLELISM, UnsignedInt.fromLong(parallelism))
+        kdfParameters.setUInt32(PARAM_PARALLELISM, UnsignedInt.fromKotlinLong(parallelism))
     }
 
     override val defaultParallelism: Long
-        get() = DEFAULT_PARALLELISM.toLong()
+        get() = DEFAULT_PARALLELISM.toKotlinLong()
 
     override val minParallelism: Long
         get() = MIN_PARALLELISM
@@ -173,13 +173,13 @@ class Argon2Kdf internal constructor() : KdfEngine() {
         private val MAX_VERSION = UnsignedInt(0x13)
 
         private const val MIN_SALT = 8
-        private val MAX_SALT = UnsignedInt.MAX_VALUE.toLong()
+        private val MAX_SALT = UnsignedInt.MAX_VALUE.toKotlinLong()
 
         private const val MIN_ITERATIONS: Long = 1L
         private const val MAX_ITERATIONS = 4294967295L
 
         private const val MIN_MEMORY = (1024 * 8).toLong()
-        private val MAX_MEMORY = UnsignedInt.MAX_VALUE.toLong()
+        private val MAX_MEMORY = UnsignedInt.MAX_VALUE.toKotlinLong()
         private const val MEMORY_BLOCK_SIZE: Long = 1024L
 
         private const val MIN_PARALLELISM: Long = 1L

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Native.java

@@ -34,12 +34,12 @@ public class Argon2Native {
         return nTransformMasterKey(
                 password,
                 salt,
-                parallelism.toInt(),
-                memory.toInt(),
-                iterations.toInt(),
+                parallelism.toKotlinInt(),
+                memory.toKotlinInt(),
+                iterations.toKotlinInt(),
                 secretKey,
                 associatedData,
-                version.toInt());
+                version.toKotlinInt());
     }
 
     private static native byte[] nTransformMasterKey(byte[] password, byte[] salt, int parallelism,

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

@@ -52,7 +52,7 @@ abstract class KdfEngine : ObjectNameResource, Serializable {
         get() = 1
 
     open val maxKeyRounds: Long
-        get() = UnsignedInt.MAX_VALUE.toLong()
+        get() = UnsignedInt.MAX_VALUE.toKotlinLong()
 
     /*
      * MEMORY
@@ -73,7 +73,7 @@ abstract class KdfEngine : ObjectNameResource, Serializable {
         get() = 1
 
     open val maxMemoryUsage: Long
-        get() = UnsignedInt.MAX_VALUE.toLong()
+        get() = UnsignedInt.MAX_VALUE.toKotlinLong()
 
     /*
      * PARALLELISM
@@ -94,7 +94,7 @@ abstract class KdfEngine : ObjectNameResource, Serializable {
         get() = 1L
 
     open val maxParallelism: Long
-        get() = UnsignedInt.MAX_VALUE.toLong()
+        get() = UnsignedInt.MAX_VALUE.toKotlinLong()
 
     companion object {
         const val UNKNOWN_VALUE: Long = -1L

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

@@ -27,7 +27,6 @@ import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
-import com.kunzisoft.keepass.notifications.DatabaseOpenNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
@@ -39,7 +38,6 @@ class LoadDatabaseRunnable(private val context: Context,
                            private val mKey: Uri?,
                            private val mReadonly: Boolean,
                            private val mCipherEntity: CipherDatabaseEntity?,
-                           private val mOmitBackup: Boolean,
                            private val mFixDuplicateUUID: Boolean,
                            private val progressTaskUpdater: ProgressTaskUpdater?,
                            private val mDuplicateUuidAction: ((Result) -> Unit)?)
@@ -58,7 +56,6 @@ class LoadDatabaseRunnable(private val context: Context,
                     mReadonly,
                     context.contentResolver,
                     cacheDirectory,
-                    mOmitBackup,
                     mFixDuplicateUUID,
                     progressTaskUpdater)
         }
@@ -88,9 +85,6 @@ class LoadDatabaseRunnable(private val context: Context,
 
             // Register the current time to init the lock timer
             PreferencesUtil.saveCurrentTime(context)
-
-            // Start the opening notification
-            DatabaseOpenNotificationService.start(context)
         } else {
             mDatabase.closeAndClear(cacheDirectory)
         }

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

@@ -27,7 +27,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.database.element.Entry
@@ -37,7 +36,6 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.notifications.DatabaseOpenNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_PASSWORD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
@@ -68,7 +66,6 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment
 import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment.Companion.PROGRESS_TASK_DIALOG_TAG
-import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.DATABASE_START_TASK_ACTION
 import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
 import java.util.*
@@ -90,37 +87,23 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
 
     private val actionTaskListener = object: DatabaseTaskNotificationService.ActionTaskListener {
         override fun onStartAction(titleId: Int?, messageId: Int?, warningId: Int?) {
-            TimeoutHelper.temporarilyDisableTimeout()
-            // Stop the opening notification
-            DatabaseOpenNotificationService.stop(activity)
-            startOrUpdateDialog(titleId, messageId, warningId)
+            startDialog(titleId, messageId, warningId)
         }
 
         override fun onUpdateAction(titleId: Int?, messageId: Int?, warningId: Int?) {
-            startOrUpdateDialog(titleId, messageId, warningId)
+            updateDialog(titleId, messageId, warningId)
         }
 
         override fun onStopAction(actionTask: String, result: ActionRunnable.Result) {
             onActionFinish?.invoke(actionTask, result)
-
             // Remove the progress task
             stopDialog()
-            TimeoutHelper.releaseTemporarilyDisableTimeout()
-
-            val inTime = if (activity is LockingActivity) {
-                TimeoutHelper.checkTimeAndLockIfTimeout(activity)
-            } else {
-                TimeoutHelper.checkTime(activity)
-            }
-            // Start the opening notification if in time
-            // (databaseOpenService is open manually in Action Open Task)
-            if (actionTask != ACTION_DATABASE_LOAD_TASK && inTime) {
-                DatabaseOpenNotificationService.start(activity)
-            }
         }
     }
 
-    private fun startOrUpdateDialog(titleId: Int?, messageId: Int?, warningId: Int?) {
+    private fun startDialog(titleId: Int? = null,
+                            messageId: Int? = null,
+                            warningId: Int? = null) {
         if (progressTaskDialogFragment == null) {
             progressTaskDialogFragment = activity.supportFragmentManager
                     .findFragmentByTag(PROGRESS_TASK_DIALOG_TAG) as ProgressTaskDialogFragment?
@@ -129,6 +112,10 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
             progressTaskDialogFragment = ProgressTaskDialogFragment()
             progressTaskDialogFragment?.show(activity.supportFragmentManager, PROGRESS_TASK_DIALOG_TAG)
         }
+        updateDialog(titleId, messageId, warningId)
+    }
+
+    private fun updateDialog(titleId: Int?, messageId: Int?, warningId: Int?) {
         progressTaskDialogFragment?.apply {
             titleId?.let {
                 updateTitle(it)
@@ -194,6 +181,8 @@ class ProgressDialogThread(private val activity: FragmentActivity) {
                         bindService()
                     }
                     DATABASE_STOP_TASK_ACTION -> {
+                        // Remove the progress task
+                        stopDialog()
                         unBindService()
                     }
                 }

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

@@ -46,12 +46,10 @@ import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDBX
 import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.database.search.SearchParameters
 import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.stream.readBytes4ToUInt
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
 import com.kunzisoft.keepass.utils.SingletonHolder
 import com.kunzisoft.keepass.utils.UriUtil
-import org.apache.commons.io.FileUtils
 import java.io.*
 import java.util.*
 
@@ -317,7 +315,6 @@ class Database {
                  readOnly: Boolean,
                  contentResolver: ContentResolver,
                  cacheDirectory: File,
-                 omitBackup: Boolean,
                  fixDuplicateUUID: Boolean,
                  progressTaskUpdater: ProgressTaskUpdater?) {
 
@@ -379,7 +376,7 @@ class Database {
                 else -> throw SignatureDatabaseException()
             }
 
-            this.mSearchHelper = SearchHelper(omitBackup)
+            this.mSearchHelper = SearchHelper()
             loaded = true
 
         } catch (e: LoadDatabaseException) {
@@ -394,25 +391,24 @@ class Database {
         }
     }
 
-    fun isGroupSearchable(group: Group, isOmitBackup: Boolean): Boolean {
-        return mDatabaseKDB?.isGroupSearchable(group.groupKDB, isOmitBackup) ?:
-        mDatabaseKDBX?.isGroupSearchable(group.groupKDBX, isOmitBackup) ?:
+    fun isGroupSearchable(group: Group, omitBackup: Boolean): Boolean {
+        return mDatabaseKDB?.isGroupSearchable(group.groupKDB, omitBackup) ?:
+        mDatabaseKDBX?.isGroupSearchable(group.groupKDBX, omitBackup) ?:
         false
     }
 
     fun createVirtualGroupFromSearch(searchQuery: String,
+                                     omitBackup: Boolean,
                                      max: Int = Integer.MAX_VALUE): Group? {
-        return mSearchHelper?.createVirtualGroupWithSearchResult(this, searchQuery, SearchParameters(), max)
+        return mSearchHelper?.createVirtualGroupWithSearchResult(this,
+                searchQuery, SearchParameters(), omitBackup, max)
     }
 
-    fun createVirtualGroupFromSearch(searchInfo: SearchInfo,
-                                     max: Int = Integer.MAX_VALUE): Group? {
-        val query = (if (searchInfo.webDomain != null)
-            searchInfo.webDomain
-        else
-            searchInfo.applicationId)
-                ?: return null
-        return mSearchHelper?.createVirtualGroupWithSearchResult(this, query, SearchParameters().apply {
+    fun createVirtualGroupFromSearchInfo(searchInfoString: String,
+                                         omitBackup: Boolean,
+                                         max: Int = Integer.MAX_VALUE): Group? {
+        return mSearchHelper?.createVirtualGroupWithSearchResult(this,
+                searchInfoString, SearchParameters().apply {
             searchInTitles = false
             searchInUserNames = false
             searchInPasswords = false
@@ -422,7 +418,7 @@ class Database {
             searchInUUIDs = false
             searchInTags = false
             ignoreCase = true
-        }, max)
+        }, omitBackup, max)
     }
 
     @Throws(DatabaseOutputException::class)
@@ -492,7 +488,9 @@ class Database {
         mDatabaseKDBX?.clearCache()
         // In all cases, delete all the files in the temp dir
         try {
-            FileUtils.cleanDirectory(filesDirectory)
+            filesDirectory?.let { directory ->
+                cleanDirectory(directory)
+            }
         } catch (e: Exception) {
             Log.e(TAG, "Unable to clear the directory cache.", e)
         }
@@ -503,6 +501,17 @@ class Database {
         this.loaded = false
     }
 
+    private fun cleanDirectory(directory: File) {
+        directory.listFiles()?.let { files ->
+            for (file in files) {
+                if (file.isDirectory) {
+                    cleanDirectory(file)
+                }
+                file.delete()
+            }
+        }
+    }
+
     fun validatePasswordEncoding(password: String?, containsKeyFile: Boolean): Boolean {
         return mDatabaseKDB?.validatePasswordEncoding(password, containsKeyFile)
                 ?: mDatabaseKDBX?.validatePasswordEncoding(password, containsKeyFile)

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

@@ -41,7 +41,6 @@ class DeletedObject {
 
     constructor()
 
-    @JvmOverloads
     constructor(uuid: UUID, deletionTime: Date = Date()) {
         this.uuid = uuid
         this.mDeletionTime = deletionTime

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

@@ -20,15 +20,14 @@
 package com.kunzisoft.keepass.database.element.database
 
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.element.entry.EntryVersioned
 import com.kunzisoft.keepass.database.element.group.GroupVersioned
 import com.kunzisoft.keepass.database.element.icon.IconImageFactory
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.database.exception.KeyFileEmptyDatabaseException
-import org.apache.commons.io.IOUtils
 import java.io.*
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
@@ -127,7 +126,7 @@ abstract class DatabaseVersioned<
     protected fun getFileKey(keyInputStream: InputStream): ByteArray {
 
         val keyByteArrayOutputStream = ByteArrayOutputStream()
-        IOUtils.copy(keyInputStream, keyByteArrayOutputStream)
+        keyInputStream.copyTo(keyByteArrayOutputStream)
         val keyData = keyByteArrayOutputStream.toByteArray()
 
         val keyByteArrayInputStream = ByteArrayInputStream(keyData)

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

@@ -58,7 +58,7 @@ class AutoType : Parcelable {
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
         dest.writeByte((if (enabled) 1 else 0).toByte())
-        dest.writeInt(obfuscationOptions.toInt())
+        dest.writeInt(obfuscationOptions.toKotlinInt())
         dest.writeString(defaultSequence)
         ParcelableUtil.writeStringParcelableMap(dest, windowSeqPairs)
     }

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

@@ -123,7 +123,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     override fun writeToParcel(dest: Parcel, flags: Int) {
         super.writeToParcel(dest, flags)
         dest.writeParcelable(iconCustom, flags)
-        dest.writeLong(usageCount.toLong())
+        dest.writeLong(usageCount.toKotlinLong())
         dest.writeParcelable(locationChanged, flags)
         ParcelableUtil.writeStringParcelableMap(dest, customData)
         ParcelableUtil.writeStringParcelableMap(dest, flags, fields)
@@ -334,7 +334,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     override fun touch(modified: Boolean, touchParents: Boolean) {
         super.touch(modified, touchParents)
         // TODO unsigned long
-        usageCount = UnsignedLong(usageCount.toLong() + 1)
+        usageCount = UnsignedLong(usageCount.toKotlinLong() + 1)
     }
 
     companion object {

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

@@ -102,7 +102,7 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     override fun writeToParcel(dest: Parcel, flags: Int) {
         super.writeToParcel(dest, flags)
         dest.writeParcelable(iconCustom, flags)
-        dest.writeLong(usageCount.toLong())
+        dest.writeLong(usageCount.toKotlinLong())
         dest.writeParcelable(locationChanged, flags)
         // TODO ParcelableUtil.writeStringParcelableMap(dest, customData);
         dest.writeString(notes)

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

@@ -31,7 +31,6 @@ class NodeIdInt : NodeId<Int> {
 
     constructor(source: NodeIdInt) : this(source.id)
 
-    @JvmOverloads
     constructor(groupId: Int = Random().nextInt()) : super() {
         this.id = groupId
     }

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

@@ -30,7 +30,6 @@ class NodeIdUUID : NodeId<UUID> {
 
     constructor(source: NodeIdUUID) : this(source.id)
 
-    @JvmOverloads
     constructor(uuid: UUID = UUID.randomUUID()) : super() {
         this.id = uuid
     }

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

@@ -33,7 +33,6 @@ class ProtectedString : Parcelable {
         this.stringValue = toCopy.stringValue
     }
 
-    @JvmOverloads
     constructor(enableProtection: Boolean = false, string: String = "") {
         this.isProtected = enableProtection
         this.stringValue = string

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

@@ -97,11 +97,11 @@ class DatabaseHeaderKDB : DatabaseHeader() {
         const val BUF_SIZE = 124
 
         fun matchesHeader(sig1: UnsignedInt, sig2: UnsignedInt): Boolean {
-            return sig1.toInt() == PWM_DBSIG_1.toInt() && sig2.toInt() == DBSIG_2.toInt()
+            return sig1.toKotlinInt() == PWM_DBSIG_1.toKotlinInt() && sig2.toKotlinInt() == DBSIG_2.toKotlinInt()
         }
 
         fun compatibleHeaders(one: UnsignedInt, two: UnsignedInt): Boolean {
-            return one.toInt() and -0x100 == two.toInt() and -0x100
+            return one.toKotlinInt() and -0x100 == two.toKotlinInt() and -0x100
         }
     }
 

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

@@ -176,10 +176,10 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
     private fun readHeaderField(dis: LittleEndianDataInputStream): Boolean {
         val fieldID = dis.read().toByte()
 
-        val fieldSize: Int = if (version.toLong() < FILE_VERSION_32_4.toLong()) {
+        val fieldSize: Int = if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong()) {
             dis.readUShort()
         } else {
-            dis.readUInt().toInt()
+            dis.readUInt().toKotlinInt()
         }
 
         var fieldData: ByteArray? = null
@@ -202,20 +202,20 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
 
             PwDbHeaderV4Fields.MasterSeed -> masterSeed = fieldData
 
-            PwDbHeaderV4Fields.TransformSeed -> if (version.toLong() < FILE_VERSION_32_4.toLong())
+            PwDbHeaderV4Fields.TransformSeed -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
                 transformSeed = fieldData
 
-            PwDbHeaderV4Fields.TransformRounds -> if (version.toLong() < FILE_VERSION_32_4.toLong())
+            PwDbHeaderV4Fields.TransformRounds -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
                 setTransformRound(fieldData)
 
             PwDbHeaderV4Fields.EncryptionIV -> encryptionIV = fieldData
 
-            PwDbHeaderV4Fields.InnerRandomstreamKey -> if (version.toLong() < FILE_VERSION_32_4.toLong())
+            PwDbHeaderV4Fields.InnerRandomstreamKey -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
                 innerRandomStreamKey = fieldData
 
             PwDbHeaderV4Fields.StreamStartBytes -> streamStartBytes = fieldData
 
-            PwDbHeaderV4Fields.InnerRandomStreamID -> if (version.toLong() < FILE_VERSION_32_4.toLong())
+            PwDbHeaderV4Fields.InnerRandomStreamID -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
                 setRandomStreamID(fieldData)
 
             PwDbHeaderV4Fields.KdfParameters -> databaseV4.kdfParameters = KdfParameters.deserialize(fieldData)
@@ -261,7 +261,7 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
         }
 
         val flag = bytes4ToUInt(pbFlags)
-        if (flag.toLong() < 0 || flag.toLong() >= CompressionAlgorithm.values().size) {
+        if (flag.toKotlinLong() < 0 || flag.toKotlinLong() >= CompressionAlgorithm.values().size) {
             throw IOException("Unrecognized compression flag.")
         }
 
@@ -277,7 +277,7 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
         }
 
         val id = bytes4ToUInt(streamID)
-        if (id.toInt() < 0 || id.toInt() >= CrsAlgorithm.values().size) {
+        if (id.toKotlinInt() < 0 || id.toKotlinInt() >= CrsAlgorithm.values().size) {
             throw IOException("Invalid stream id.")
         }
 
@@ -292,8 +292,8 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
      * @return true if it's a supported version
      */
     private fun validVersion(version: UnsignedInt): Boolean {
-        return version.toInt() and FILE_VERSION_CRITICAL_MASK.toInt() <=
-                FILE_VERSION_32_4.toInt() and FILE_VERSION_CRITICAL_MASK.toInt()
+        return version.toKotlinInt() and FILE_VERSION_CRITICAL_MASK.toKotlinInt() <=
+                FILE_VERSION_32_4.toKotlinInt() and FILE_VERSION_CRITICAL_MASK.toKotlinInt()
     }
 
     companion object {
@@ -306,7 +306,7 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
         val FILE_VERSION_32_4 = UnsignedInt(0x00040000)
 
         fun getCompressionFromFlag(flag: UnsignedInt): CompressionAlgorithm? {
-            return when (flag.toInt()) {
+            return when (flag.toKotlinInt()) {
                 0 -> CompressionAlgorithm.None
                 1 -> CompressionAlgorithm.GZip
                 else -> null

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

@@ -90,16 +90,16 @@ class DatabaseInputKDB(cacheDirectory: File,
 
             // Select algorithm
             when {
-                header.flags.toInt() and DatabaseHeaderKDB.FLAG_RIJNDAEL.toInt() != 0 -> {
+                header.flags.toKotlinInt() and DatabaseHeaderKDB.FLAG_RIJNDAEL.toKotlinInt() != 0 -> {
                     mDatabaseToOpen.encryptionAlgorithm = EncryptionAlgorithm.AESRijndael
                 }
-                header.flags.toInt() and DatabaseHeaderKDB.FLAG_TWOFISH.toInt() != 0 -> {
+                header.flags.toKotlinInt() and DatabaseHeaderKDB.FLAG_TWOFISH.toKotlinInt() != 0 -> {
                     mDatabaseToOpen.encryptionAlgorithm = EncryptionAlgorithm.Twofish
                 }
                 else -> throw InvalidAlgorithmDatabaseException()
             }
 
-            mDatabaseToOpen.numberKeyEncryptionRounds = header.numKeyEncRounds.toLong()
+            mDatabaseToOpen.numberKeyEncryptionRounds = header.numKeyEncRounds.toKotlinLong()
 
             // Generate transformedMasterKey from masterKey
             mDatabaseToOpen.makeFinalKey(
@@ -160,11 +160,11 @@ class DatabaseInputKDB(cacheDirectory: File,
             var newEntry: EntryKDB? = null
             var currentGroupNumber = 0
             var currentEntryNumber = 0
-            while (currentGroupNumber < header.numGroups.toLong()
-                    || currentEntryNumber < header.numEntries.toLong()) {
+            while (currentGroupNumber < header.numGroups.toKotlinLong()
+                    || currentEntryNumber < header.numEntries.toKotlinLong()) {
 
                 val fieldType = cipherInputStream.readBytes2ToUShort()
-                val fieldSize = cipherInputStream.readBytes4ToUInt().toInt()
+                val fieldSize = cipherInputStream.readBytes4ToUInt().toKotlinInt()
 
                 when (fieldType) {
                     0x0000 -> {
@@ -175,7 +175,7 @@ class DatabaseInputKDB(cacheDirectory: File,
                         when (fieldSize) {
                             4 -> {
                                 newGroup = mDatabaseToOpen.createGroup().apply {
-                                    setGroupId(cipherInputStream.readBytes4ToUInt().toInt())
+                                    setGroupId(cipherInputStream.readBytes4ToUInt().toKotlinInt())
                                 }
                             }
                             16 -> {
@@ -194,7 +194,7 @@ class DatabaseInputKDB(cacheDirectory: File,
                         } ?:
                         newEntry?.let { entry ->
                             val groupKDB = mDatabaseToOpen.createGroup()
-                            groupKDB.nodeId = NodeIdInt(cipherInputStream.readBytes4ToUInt().toInt())
+                            groupKDB.nodeId = NodeIdInt(cipherInputStream.readBytes4ToUInt().toKotlinInt())
                             entry.parent = groupKDB
                         }
                     }
@@ -203,7 +203,7 @@ class DatabaseInputKDB(cacheDirectory: File,
                             group.creationTime = cipherInputStream.readBytes5ToDate()
                         } ?:
                         newEntry?.let { entry ->
-                            var iconId = cipherInputStream.readBytes4ToUInt().toInt()
+                            var iconId = cipherInputStream.readBytes4ToUInt().toKotlinInt()
                             // Clean up after bug that set icon ids to -1
                             if (iconId == -1) {
                                 iconId = 0
@@ -237,7 +237,7 @@ class DatabaseInputKDB(cacheDirectory: File,
                     }
                     0x0007 -> {
                         newGroup?.let { group ->
-                            group.icon = mDatabaseToOpen.iconFactory.getIcon(cipherInputStream.readBytes4ToUInt().toInt())
+                            group.icon = mDatabaseToOpen.iconFactory.getIcon(cipherInputStream.readBytes4ToUInt().toKotlinInt())
                         } ?:
                         newEntry?.let { entry ->
                             entry.password = cipherInputStream.readBytesToString(fieldSize,false)
@@ -253,7 +253,7 @@ class DatabaseInputKDB(cacheDirectory: File,
                     }
                     0x0009 -> {
                         newGroup?.let { group ->
-                            group.groupFlags = cipherInputStream.readBytes4ToUInt().toInt()
+                            group.groupFlags = cipherInputStream.readBytes4ToUInt().toKotlinInt()
                         } ?:
                         newEntry?.let { entry ->
                             entry.creationTime = cipherInputStream.readBytes5ToDate()

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

@@ -132,7 +132,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
             }
 
             val isPlain: InputStream
-            if (mDatabase.kdbxVersion.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+            if (mDatabase.kdbxVersion.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
 
                 val decrypted = attachCipherStream(databaseInputStream, cipher)
                 val dataDecrypted = LittleEndianDataInputStream(decrypted)
@@ -180,7 +180,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
                 else -> isPlain
             }
 
-            if (mDatabase.kdbxVersion.toLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+            if (mDatabase.kdbxVersion.toKotlinLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
                 loadInnerHeader(inputStreamXml, header)
             }
 
@@ -228,7 +228,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
                                 header: DatabaseHeaderKDBX): Boolean {
         val fieldId = dataInputStream.read().toByte()
 
-        val size = dataInputStream.readUInt().toInt()
+        val size = dataInputStream.readUInt().toKotlinInt()
         if (size < 0) throw IOException("Corrupted file")
 
         var data = ByteArray(0)
@@ -492,7 +492,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
             } else if (name.equals(DatabaseKDBXXML.ElemNotes, ignoreCase = true)) {
                 ctxGroup?.notes = readString(xpp)
             } else if (name.equals(DatabaseKDBXXML.ElemIcon, ignoreCase = true)) {
-                ctxGroup?.icon = mDatabase.iconFactory.getIcon(readUInt(xpp, UnsignedInt(0)).toInt())
+                ctxGroup?.icon = mDatabase.iconFactory.getIcon(readUInt(xpp, UnsignedInt(0)).toKotlinInt())
             } else if (name.equals(DatabaseKDBXXML.ElemCustomIconID, ignoreCase = true)) {
                 ctxGroup?.iconCustom = mDatabase.iconFactory.getIcon(readUuid(xpp))
             } else if (name.equals(DatabaseKDBXXML.ElemTimes, ignoreCase = true)) {
@@ -546,7 +546,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
             KdbContext.Entry -> if (name.equals(DatabaseKDBXXML.ElemUuid, ignoreCase = true)) {
                 ctxEntry?.nodeId = NodeIdUUID(readUuid(xpp))
             } else if (name.equals(DatabaseKDBXXML.ElemIcon, ignoreCase = true)) {
-                ctxEntry?.icon = mDatabase.iconFactory.getIcon(readUInt(xpp, UnsignedInt(0)).toInt())
+                ctxEntry?.icon = mDatabase.iconFactory.getIcon(readUInt(xpp, UnsignedInt(0)).toKotlinInt())
             } else if (name.equals(DatabaseKDBXXML.ElemCustomIconID, ignoreCase = true)) {
                 ctxEntry?.iconCustom = mDatabase.iconFactory.getIcon(readUuid(xpp))
             } else if (name.equals(DatabaseKDBXXML.ElemFgColor, ignoreCase = true)) {
@@ -819,7 +819,7 @@ class DatabaseInputKDBX(cacheDirectory: File,
         val sDate = readString(xpp)
         var utcDate: Date? = null
 
-        if (mDatabase.kdbxVersion.toLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (mDatabase.kdbxVersion.toKotlinLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             var buf = Base64.decode(sDate, BASE_64_FLAG)
             if (buf.size != 8) {
                 val buf8 = ByteArray(8)

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

@@ -90,7 +90,7 @@ constructor(private val databaseKDBX: DatabaseKDBX,
         writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.CompressionFlags, uIntTo4Bytes(DatabaseHeaderKDBX.getFlagFromCompression(databaseKDBX.compressionAlgorithm)))
         writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.MasterSeed, header.masterSeed)
 
-        if (header.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (header.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.TransformSeed, header.transformSeed)
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.TransformRounds, longTo8Bytes(databaseKDBX.numberKeyEncryptionRounds))
         } else {
@@ -101,7 +101,7 @@ constructor(private val databaseKDBX: DatabaseKDBX,
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.EncryptionIV, header.encryptionIV)
         }
 
-        if (header.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (header.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.InnerRandomstreamKey, header.innerRandomStreamKey)
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.StreamStartBytes, header.streamStartBytes)
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.InnerRandomStreamID, uIntTo4Bytes(header.innerRandomStream!!.id))
@@ -136,7 +136,7 @@ constructor(private val databaseKDBX: DatabaseKDBX,
 
     @Throws(IOException::class)
     private fun writeHeaderFieldSize(size: Int) {
-        if (header.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (header.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             los.writeUShort(size)
         } else {
             los.writeInt(size)

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

@@ -40,7 +40,7 @@ class DatabaseInnerHeaderOutputKDBX(private val database: DatabaseKDBX,
         dataOutputStream.writeInt(4)
         if (header.innerRandomStream == null)
             throw IOException("Can't write innerRandomStream")
-        dataOutputStream.writeInt(header.innerRandomStream!!.id.toInt())
+        dataOutputStream.writeInt(header.innerRandomStream!!.id.toKotlinInt())
 
         val streamKeySize = header.innerRandomStreamKey.size
         dataOutputStream.write(DatabaseHeaderKDBX.PwDbInnerHeaderV4Fields.InnerRandomstreamKey.toInt())

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

@@ -118,10 +118,10 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
 
         when {
             mDatabaseKDB.encryptionAlgorithm === EncryptionAlgorithm.AESRijndael -> {
-                header.flags = UnsignedInt(header.flags.toInt() or DatabaseHeaderKDB.FLAG_RIJNDAEL.toInt())
+                header.flags = UnsignedInt(header.flags.toKotlinInt() or DatabaseHeaderKDB.FLAG_RIJNDAEL.toKotlinInt())
             }
             mDatabaseKDB.encryptionAlgorithm === EncryptionAlgorithm.Twofish -> {
-                header.flags = UnsignedInt(header.flags.toInt() or DatabaseHeaderKDB.FLAG_TWOFISH.toInt())
+                header.flags = UnsignedInt(header.flags.toKotlinInt() or DatabaseHeaderKDB.FLAG_TWOFISH.toKotlinInt())
             }
             else -> throw DatabaseOutputException("Unsupported algorithm.")
         }
@@ -129,7 +129,7 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
         header.version = DatabaseHeaderKDB.DBVER_DW
         header.numGroups = UnsignedInt(mDatabaseKDB.numberOfGroups())
         header.numEntries = UnsignedInt(mDatabaseKDB.numberOfEntries())
-        header.numKeyEncRounds = UnsignedInt.fromLong(mDatabaseKDB.numberKeyEncryptionRounds)
+        header.numKeyEncRounds = UnsignedInt.fromKotlinLong(mDatabaseKDB.numberKeyEncryptionRounds)
 
         setIVs(header)
 

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

@@ -85,7 +85,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
             header = outputHeader(mOS)
 
             val osPlain: OutputStream
-            osPlain = if (header!!.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+            osPlain = if (header!!.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
                 val cos = attachStreamEncryptor(header!!, mOS)
                 cos.write(header!!.streamStartBytes)
 
@@ -105,7 +105,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
                     else -> osPlain
                 }
 
-                if (header!!.version.toLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+                if (header!!.version.toKotlinLong() >= DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
                     val ihOut = DatabaseInnerHeaderOutputKDBX(mDatabaseKDBX, header!!, osXml)
                     ihOut.output()
                 }
@@ -209,7 +209,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         writeObject(DatabaseKDBXXML.ElemDbDescChanged, mDatabaseKDBX.descriptionChanged.date)
         writeObject(DatabaseKDBXXML.ElemDbDefaultUser, mDatabaseKDBX.defaultUserName, true)
         writeObject(DatabaseKDBXXML.ElemDbDefaultUserChanged, mDatabaseKDBX.defaultUserNameChanged.date)
-        writeObject(DatabaseKDBXXML.ElemDbMntncHistoryDays, mDatabaseKDBX.maintenanceHistoryDays.toLong())
+        writeObject(DatabaseKDBXXML.ElemDbMntncHistoryDays, mDatabaseKDBX.maintenanceHistoryDays.toKotlinLong())
         writeObject(DatabaseKDBXXML.ElemDbColor, mDatabaseKDBX.color)
         writeObject(DatabaseKDBXXML.ElemDbKeyChanged, mDatabaseKDBX.keyLastChanged.date)
         writeObject(DatabaseKDBXXML.ElemDbKeyChangeRec, mDatabaseKDBX.keyChangeRecDays)
@@ -230,7 +230,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         writeUuid(DatabaseKDBXXML.ElemLastTopVisibleGroup, mDatabaseKDBX.lastTopVisibleGroupUUID)
 
         // Seem to work properly if always in meta
-        if (header!!.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong())
+        if (header!!.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong())
             writeMetaBinaries()
 
         writeCustomData(mDatabaseKDBX.customData)
@@ -274,7 +274,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
             Log.e(TAG, "Unable to retrieve header", unknownKDF)
         }
 
-        if (header.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (header.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             header.innerRandomStream = CrsAlgorithm.Salsa20
             header.innerRandomStreamKey = ByteArray(32)
         } else {
@@ -288,7 +288,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
             throw DatabaseOutputException("Invalid random cipher")
         }
 
-        if (header.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (header.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             random.nextBytes(header.streamStartBytes)
         }
 
@@ -385,7 +385,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
 
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)
     private fun writeObject(name: String, value: Date) {
-        if (header!!.version.toLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toLong()) {
+        if (header!!.version.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()) {
             writeObject(name, DatabaseKDBXXML.DateFormatter.format(value))
         } else {
             val dt = DateTime(value)
@@ -489,7 +489,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         xml.startTag(null, DatabaseKDBXXML.ElemAutoType)
 
         writeObject(DatabaseKDBXXML.ElemAutoTypeEnabled, autoType.enabled)
-        writeObject(DatabaseKDBXXML.ElemAutoTypeObfuscation, autoType.obfuscationOptions.toLong())
+        writeObject(DatabaseKDBXXML.ElemAutoTypeObfuscation, autoType.obfuscationOptions.toKotlinLong())
 
         if (autoType.defaultSequence.isNotEmpty()) {
             writeObject(DatabaseKDBXXML.ElemAutoTypeDefaultSeq, autoType.defaultSequence, true)
@@ -629,7 +629,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         writeObject(DatabaseKDBXXML.ElemLastAccessTime, node.lastAccessTime.date)
         writeObject(DatabaseKDBXXML.ElemExpiryTime, node.expiryTime.date)
         writeObject(DatabaseKDBXXML.ElemExpires, node.expires)
-        writeObject(DatabaseKDBXXML.ElemUsageCount, node.usageCount.toLong())
+        writeObject(DatabaseKDBXXML.ElemUsageCount, node.usageCount.toKotlinLong())
         writeObject(DatabaseKDBXXML.ElemLocationChanged, node.locationChanged.date)
 
         xml.endTag(null, DatabaseKDBXXML.ElemTimes)

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

@@ -104,7 +104,7 @@ class EntryOutputKDB
         val binaryData = mEntry.binaryData
         val binaryDataLength = binaryData?.length() ?: 0L
         // Write data length
-        mOutputStream.write(uIntTo4Bytes(UnsignedInt.fromLong(binaryDataLength)))
+        mOutputStream.write(uIntTo4Bytes(UnsignedInt.fromKotlinLong(binaryDataLength)))
         // Write data
         if (binaryDataLength > 0) {
             binaryData?.getInputDataStream().use { inputStream ->

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

@@ -19,17 +19,58 @@
  */
 package com.kunzisoft.keepass.database.search
 
+import android.content.Context
 import com.kunzisoft.keepass.database.action.node.NodeHandler
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorKDB
 import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorKDBX
+import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.model.getSearchString
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.timeout.TimeoutHelper
 
-class SearchHelper(private val isOmitBackup: Boolean) {
+class SearchHelper {
 
     companion object {
         const val MAX_SEARCH_ENTRY = 6
+
+        /**
+         * Utility method to perform actions if item is found or not after an auto search in [database]
+         */
+        fun checkAutoSearchInfo(context: Context,
+                                database: Database,
+                                searchInfo: SearchInfo?,
+                                onItemsFound: (items: List<EntryInfo>) -> Unit,
+                                onItemNotFound: () -> Unit,
+                                onDatabaseClosed: () -> Unit) {
+            if (database.loaded && TimeoutHelper.checkTime(context)) {
+                var searchWithoutUI = false
+                if (PreferencesUtil.isAutofillAutoSearchEnable(context)
+                        && searchInfo != null
+                        && !searchInfo.containsOnlyNullValues()) {
+                    // If search provide results
+                    database.createVirtualGroupFromSearchInfo(
+                            searchInfo.getSearchString(context),
+                            PreferencesUtil.omitBackup(context),
+                            MAX_SEARCH_ENTRY
+                    )?.let { searchGroup ->
+                        if (searchGroup.getNumberOfChildEntries() > 0) {
+                            searchWithoutUI = true
+                            onItemsFound.invoke(
+                                    searchGroup.getChildEntriesInfo(database))
+                        }
+                    }
+                }
+                if (!searchWithoutUI) {
+                    onItemNotFound.invoke()
+                }
+            } else {
+                onDatabaseClosed.invoke()
+            }
+        }
     }
 
     private var incrementEntry = 0
@@ -37,6 +78,7 @@ class SearchHelper(private val isOmitBackup: Boolean) {
     fun createVirtualGroupWithSearchResult(database: Database,
                                            searchQuery: String,
                                            searchParameters: SearchParameters,
+                                           omitBackup: Boolean,
                                            max: Int): Group? {
 
         val searchGroup = database.createGroup()
@@ -61,7 +103,7 @@ class SearchHelper(private val isOmitBackup: Boolean) {
                     override fun operate(node: Group): Boolean {
                         return when {
                             incrementEntry >= max -> false
-                            database.isGroupSearchable(node, isOmitBackup) -> true
+                            database.isGroupSearchable(node, omitBackup) -> true
                             else -> false
                         }
                     }

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

@@ -36,6 +36,7 @@ import android.widget.FrameLayout
 import android.widget.PopupWindow
 import android.widget.TextView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.MagikeyboardLauncherActivity
 import com.kunzisoft.keepass.adapters.FieldsAdapter
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.model.EntryInfo
@@ -64,6 +65,9 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
                         removeEntryInfo()
                         assignKeyboardView()
         }
+        lockReceiver?.backToPreviousKeyboardAction = {
+            switchToPreviousKeyboard()
+        }
 
         registerLockReceiver(lockReceiver, true)
     }
@@ -211,7 +215,7 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
                 // Stop current service and reinit entry
                 stopService(Intent(this, KeyboardEntryNotificationService::class.java))
                 removeEntryInfo()
-                val intent = Intent(this, KeyboardLauncherActivity::class.java)
+                val intent = Intent(this, MagikeyboardLauncherActivity::class.java)
                 // New task needed because don't launch from an Activity context
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 startActivity(intent)
@@ -248,7 +252,9 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
                 }
                 popupCustomKeys?.showAtLocation(keyboardView, Gravity.END or Gravity.TOP, 0, 0)
             }
-            Keyboard.KEYCODE_DELETE -> inputConnection.deleteSurroundingText(1, 0)
+            Keyboard.KEYCODE_DELETE -> {
+                inputConnection.sendKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+            }
             Keyboard.KEYCODE_DONE -> inputConnection.performEditorAction(EditorInfo.IME_ACTION_GO)
         }
     }
@@ -259,8 +265,12 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
     }
 
     private fun actionGoAutomatically() {
-        if (PreferencesUtil.isAutoGoActionEnable(this))
+        if (PreferencesUtil.isAutoGoActionEnable(this)) {
             currentInputConnection.performEditorAction(EditorInfo.IME_ACTION_GO)
+            if (PreferencesUtil.isKeyboardPreviousFillInEnable(this)) {
+                switchToPreviousKeyboard()
+            }
+        }
     }
 
     override fun onPress(primaryCode: Int) {
@@ -321,11 +331,11 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
             context.sendBroadcast(Intent(REMOVE_ENTRY_MAGIKEYBOARD_ACTION))
         }
 
-        fun addEntryAndLaunchNotificationIfAllowed(context: Context, entry: EntryInfo) {
+        fun addEntryAndLaunchNotificationIfAllowed(context: Context, entry: EntryInfo, toast: Boolean = false) {
             // Add a new entry
             entryInfoKey = entry
             // Launch notification if allowed
-            KeyboardEntryNotificationService.launchNotificationIfAllowed(context, entry)
+            KeyboardEntryNotificationService.launchNotificationIfAllowed(context, entry, toast)
         }
     }
 }

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

@@ -1,12 +1,31 @@
 package com.kunzisoft.keepass.model
 
+import android.content.Context
+import android.content.res.Resources
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.ObjectNameResource
+import com.kunzisoft.keepass.utils.UriUtil
 
-class SearchInfo : Parcelable {
+class SearchInfo : ObjectNameResource, Parcelable {
 
     var applicationId: String? = null
+        set(value) {
+            field = when {
+                value == null -> null
+                Regex(APPLICATION_ID_REGEX).matches(value) -> value
+                else -> null
+            }
+        }
     var webDomain: String? = null
+        set(value) {
+            field = when {
+                value == null -> null
+                Regex(WEB_DOMAIN_REGEX).matches(value) -> value
+                else -> null
+            }
+        }
 
     constructor()
 
@@ -26,7 +45,40 @@ class SearchInfo : Parcelable {
         parcel.writeString(webDomain ?: "")
     }
 
+    override fun getName(resources: Resources): String {
+        return toString()
+    }
+
+    fun containsOnlyNullValues(): Boolean {
+        return applicationId == null && webDomain == null
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as SearchInfo
+
+        if (applicationId != other.applicationId) return false
+        if (webDomain != other.webDomain) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = applicationId?.hashCode() ?: 0
+        result = 31 * result + (webDomain?.hashCode() ?: 0)
+        return result
+    }
+
+    override fun toString(): String {
+        return webDomain ?: applicationId ?: ""
+    }
+
     companion object {
+        // https://gist.github.com/rishabhmhjn/8663966
+        const val APPLICATION_ID_REGEX = "^(?:[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)(?:\\.[a-zA-Z]+(?:\\d*[a-zA-Z_]*)*)+\$"
+        const val WEB_DOMAIN_REGEX = "^(?!://)([a-zA-Z0-9-_]+\\.)*[a-zA-Z0-9][a-zA-Z0-9-_]+\\.[a-zA-Z]{2,11}?\$"
 
         @JvmField
         val CREATOR: Parcelable.Creator<SearchInfo> = object : Parcelable.Creator<SearchInfo> {
@@ -39,4 +91,15 @@ class SearchInfo : Parcelable {
             }
         }
     }
+}
+
+fun SearchInfo.getSearchString(context: Context): String {
+    return run {
+                if (!PreferencesUtil.searchSubdomains(context))
+                    UriUtil.getWebDomainWithoutSubDomain(webDomain)
+                else
+                    webDomain
+            }
+            ?: applicationId
+            ?: ""
 }

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

@@ -81,6 +81,7 @@ class AttachmentFileNotificationService: LockNotificationService() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
 
         val downloadFileUri: Uri? = if (intent?.hasExtra(DOWNLOAD_FILE_URI_KEY) == true) {
             intent.getParcelableExtra(DOWNLOAD_FILE_URI_KEY)

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

@@ -55,6 +55,8 @@ class ClipboardEntryNotificationService : LockNotificationService() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+
         // Get entry info from intent
         mEntryInfo = intent?.getParcelableExtra(EXTRA_ENTRY_INFO)
 
@@ -151,9 +153,6 @@ class ClipboardEntryNotificationService : LockNotificationService() {
                 val nextField = nextFields[0]
                 builder.setContentText(getString(R.string.select_to_copy, nextField.label))
                 builder.setContentIntent(getCopyPendingIntent(nextField, nextFields))
-                // Else tell to swipe for a clean
-            } else {
-                builder.setContentText(getString(R.string.clipboard_swipe_clean))
             }
 
             val cleanIntent = Intent(this, ClipboardEntryNotificationService::class.java)

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

@@ -48,6 +48,7 @@ class DatabaseOpenNotificationService: LockNotificationService() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
 
         when(intent?.action) {
             ACTION_CLOSE_DATABASE -> {

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

@@ -21,23 +21,28 @@ package com.kunzisoft.keepass.notifications
 
 import android.content.Intent
 import android.net.Uri
-import android.os.*
+import android.os.Binder
+import android.os.Bundle
+import android.os.IBinder
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.database.action.*
 import com.kunzisoft.keepass.database.action.history.DeleteEntryHistoryDatabaseRunnable
 import com.kunzisoft.keepass.database.action.history.RestoreEntryHistoryDatabaseRunnable
 import com.kunzisoft.keepass.database.action.node.*
-import com.kunzisoft.keepass.database.element.*
+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.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
+import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.DATABASE_START_TASK_ACTION
 import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
+import kotlinx.coroutines.*
 import java.util.*
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.collections.ArrayList
@@ -46,10 +51,11 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
 
     override val notificationId: Int = 575
 
-    private var actionRunnableAsyncTask: ActionRunnableAsyncTask? = null
+    private val mainScope = CoroutineScope(Dispatchers.Main)
 
     private var mActionTaskBinder = ActionTaskBinder()
     private var mActionTaskListeners = LinkedList<ActionTaskListener>()
+    private var mAllowFinishAction = AtomicBoolean()
 
     private var mTitleId: Int? = null
     private var mMessageId: Int? = null
@@ -61,12 +67,14 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
 
         fun addActionTaskListener(actionTaskListener: ActionTaskListener) {
             mActionTaskListeners.add(actionTaskListener)
-            // To prevent task dialog to be unbound before the display
-            actionRunnableAsyncTask?.allowFinishTask?.set(true)
+            mAllowFinishAction.set(true)
         }
 
         fun removeActionTaskListener(actionTaskListener: ActionTaskListener) {
             mActionTaskListeners.remove(actionTaskListener)
+            if (mActionTaskListeners.size == 0) {
+                mAllowFinishAction.set(false)
+            }
         }
     }
 
@@ -78,7 +86,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
 
     fun checkAction() {
         mActionTaskListeners.forEach { actionTaskListener ->
-            actionTaskListener.onUpdateAction(mTitleId, mMessageId, mWarningId)
+            actionTaskListener.onStartAction(mTitleId, mMessageId, mWarningId)
         }
     }
 
@@ -87,6 +95,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
 
         if (intent == null) return START_REDELIVER_INTENT
 
@@ -157,34 +166,79 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
             newNotification(intent.getIntExtra(DATABASE_TASK_TITLE_KEY, titleId))
 
             // Build and launch the action
-            actionRunnableAsyncTask = ActionRunnableAsyncTask(this,
-                {
-                    sendBroadcast(Intent(DATABASE_START_TASK_ACTION).apply {
-                        putExtra(DATABASE_TASK_TITLE_KEY, titleId)
-                        putExtra(DATABASE_TASK_MESSAGE_KEY, messageId)
-                        putExtra(DATABASE_TASK_WARNING_KEY, warningId)
-                    })
+            mainScope.launch {
+                executeAction(this@DatabaseTaskNotificationService,
+                        {
+                            sendBroadcast(Intent(DATABASE_START_TASK_ACTION).apply {
+                                putExtra(DATABASE_TASK_TITLE_KEY, titleId)
+                                putExtra(DATABASE_TASK_MESSAGE_KEY, messageId)
+                                putExtra(DATABASE_TASK_WARNING_KEY, warningId)
+                            })
 
-                    mActionTaskListeners.forEach { actionTaskListener ->
-                        actionTaskListener.onStartAction(titleId, messageId, warningId)
-                    }
+                            mActionTaskListeners.forEach { actionTaskListener ->
+                                actionTaskListener.onStartAction(titleId, messageId, warningId)
+                            }
 
-                }, { result ->
-                    mActionTaskListeners.forEach { actionTaskListener ->
-                        actionTaskListener.onStopAction(intentAction!!, result)
-                    }
+                        },
+                        {
+                            actionRunnableNotNull
+                        },
+                        { result ->
+                            mActionTaskListeners.forEach { actionTaskListener ->
+                                actionTaskListener.onStopAction(intentAction!!, result)
+                            }
 
-                    sendBroadcast(Intent(DATABASE_STOP_TASK_ACTION))
+                            sendBroadcast(Intent(DATABASE_STOP_TASK_ACTION))
 
-                    stopSelf()
-                }
-            )
-            actionRunnableAsyncTask?.execute({ actionRunnableNotNull })
+                            stopSelf()
+                        }
+                )
+            }
         }
 
         return START_REDELIVER_INTENT
     }
 
+    /**
+     * Execute action with a coroutine
+      */
+    private suspend fun executeAction(progressTaskUpdater: ProgressTaskUpdater,
+                                     onPreExecute: () -> Unit,
+                                     onExecute: (ProgressTaskUpdater?) -> ActionRunnable?,
+                                     onPostExecute: (result: ActionRunnable.Result) -> Unit) {
+        mAllowFinishAction.set(false)
+
+        // Stop the opening notification
+        DatabaseOpenNotificationService.stop(this)
+        TimeoutHelper.temporarilyDisableTimeout()
+        onPreExecute.invoke()
+        withContext(Dispatchers.IO) {
+            onExecute.invoke(progressTaskUpdater)?.apply {
+                val asyncResult: Deferred<ActionRunnable.Result> = async {
+                    val startTime = System.currentTimeMillis()
+                    var timeIsUp = false
+                    // Run the actionRunnable
+                    run()
+                    // Wait onBind or 4 seconds max
+                    while (!mAllowFinishAction.get() && !timeIsUp) {
+                        delay(100)
+                        if (startTime + 4000 < System.currentTimeMillis())
+                            timeIsUp = true
+                    }
+                    result
+                }
+                withContext(Dispatchers.Main) {
+                    onPostExecute.invoke(asyncResult.await())
+                    TimeoutHelper.releaseTemporarilyDisableTimeout()
+                    // Start the opening notification
+                    if (TimeoutHelper.checkTimeAndLockIfTimeout(this@DatabaseTaskNotificationService)) {
+                        DatabaseOpenNotificationService.start(this@DatabaseTaskNotificationService)
+                    }
+                }
+            }
+        }
+    }
+
     private fun newNotification(title: Int) {
 
         val builder = buildNewNotification()
@@ -258,7 +312,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     keyFileUri,
                     readOnly,
                     cipherEntity,
-                    PreferencesUtil.omitBackup(this),
                     intent.getBooleanExtra(FIX_DUPLICATE_UUID_KEY, false),
                     this
             ) { result ->
@@ -566,39 +619,6 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         }
     }
 
-    private class ActionRunnableAsyncTask(private val progressTaskUpdater: ProgressTaskUpdater,
-                                          private val onPreExecute: () -> Unit,
-                                          private val onPostExecute: (result: ActionRunnable.Result) -> Unit)
-        : AsyncTask<((ProgressTaskUpdater?) -> ActionRunnable), Void, ActionRunnable.Result>() {
-
-        var allowFinishTask = AtomicBoolean(false)
-
-        override fun onPreExecute() {
-            super.onPreExecute()
-            onPreExecute.invoke()
-        }
-
-        override fun doInBackground(vararg actionRunnables: ((ProgressTaskUpdater?)-> ActionRunnable)?): ActionRunnable.Result {
-            var resultTask = ActionRunnable.Result(false)
-            actionRunnables.forEach {
-                it?.invoke(progressTaskUpdater)?.apply {
-                    run()
-                    resultTask = result
-                }
-            }
-            // Additional wait if the dialog take time to show
-            while(!allowFinishTask.get()) {
-                Thread.sleep(250)
-            }
-            return resultTask
-        }
-
-        override fun onPostExecute(result: ActionRunnable.Result) {
-            super.onPostExecute(result)
-            onPostExecute.invoke(result)
-        }
-    }
-
     companion object {
 
         private val TAG = DatabaseTaskNotificationService::class.java.name

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

@@ -23,6 +23,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.util.Log
+import android.widget.Toast
 import androidx.preference.PreferenceManager
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.magikeyboard.MagikIME
@@ -49,6 +50,8 @@ class KeyboardEntryNotificationService : LockNotificationService() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+
         //Get settings
         notificationTimeoutMilliSecs = PreferenceManager.getDefaultSharedPreferences(this)
                 .getString(getString(R.string.keyboard_entry_timeout_key),
@@ -146,8 +149,9 @@ class KeyboardEntryNotificationService : LockNotificationService() {
 
         const val ACTION_CLEAN_KEYBOARD_ENTRY = "ACTION_CLEAN_KEYBOARD_ENTRY"
 
-        fun launchNotificationIfAllowed(context: Context, entry: EntryInfo) {
+        fun launchNotificationIfAllowed(context: Context, entry: EntryInfo, toast: Boolean) {
 
+            val containsURLToCopy = entry.url.isNotEmpty()
             val containsUsernameToCopy = entry.username.isNotEmpty()
             val containsPasswordToCopy = entry.password.isNotEmpty()
             val containsExtraFieldToCopy = entry.customFields.isNotEmpty()
@@ -155,14 +159,22 @@ class KeyboardEntryNotificationService : LockNotificationService() {
             var startService = false
             val intent = Intent(context, KeyboardEntryNotificationService::class.java)
 
-            // Show the notification if allowed in Preferences
-            if (PreferencesUtil.isKeyboardNotificationEntryEnable(context)) {
-                if (containsUsernameToCopy || containsPasswordToCopy || containsExtraFieldToCopy) {
+            if (containsURLToCopy || containsUsernameToCopy || containsPasswordToCopy || containsExtraFieldToCopy) {
+                if (toast) {
+                    Toast.makeText(context,
+                            context.getString(R.string.keyboard_notification_entry_content_title, entry.title),
+                            Toast.LENGTH_SHORT).show()
+                }
+
+                // Show the notification if allowed in Preferences
+                if (PreferencesUtil.isKeyboardNotificationEntryEnable(context)) {
                     startService = true
                     context.startService(intent.apply {
                         putExtra(ENTRY_INFO_KEY, entry)
                     })
                 }
+            } else {
+                MagikIME.removeEntry(context)
             }
 
             if (!startService)

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

@@ -26,6 +26,7 @@ import com.kunzisoft.keepass.utils.unregisterLockReceiver
 
 abstract class LockNotificationService : NotificationService() {
 
+    private var onStart: Boolean = false
     private var mLockReceiver: LockReceiver? = null
 
     protected open fun actionOnLock() {
@@ -38,11 +39,17 @@ abstract class LockNotificationService : NotificationService() {
 
         // Register a lock receiver to stop notification service when lock on keyboard is performed
         mLockReceiver = LockReceiver {
+            if (onStart)
                 actionOnLock()
         }
         registerLockReceiver(mLockReceiver)
     }
 
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        onStart = true
+        return super.onStartCommand(intent, flags, startId)
+    }
+
     protected fun stopTask(task: Thread?) {
         if (task != null && task.isAlive)
             task.interrupt()

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

@@ -88,30 +88,36 @@ data class OtpElement(var otpModel: OtpModel = OtpModel()) {
         get() = otpModel.counter
         @Throws(NumberFormatException::class)
         set(value) {
-            otpModel.counter = if (value < MIN_HOTP_COUNTER || value > MAX_HOTP_COUNTER) {
+            otpModel.counter = if (isValidCounter(value)) {
+                value
+            } else {
                 TokenCalculator.HOTP_INITIAL_COUNTER
                 throw IllegalArgumentException()
-            } else value
+            }
         }
 
     var period
         get() = otpModel.period
         @Throws(NumberFormatException::class)
         set(value) {
-            otpModel.period = if (value < MIN_TOTP_PERIOD || value > MAX_TOTP_PERIOD) {
+            otpModel.period = if (isValidPeriod(value)) {
+                value
+            } else {
                 TokenCalculator.TOTP_DEFAULT_PERIOD
                 throw NumberFormatException()
-            } else value
+            }
         }
 
     var digits
         get() = otpModel.digits
         @Throws(NumberFormatException::class)
         set(value) {
-            otpModel.digits = if (value < MIN_OTP_DIGITS|| value > MAX_OTP_DIGITS) {
+            otpModel.digits = if (isValidDigits(value)) {
+                value
+            } else {
                 TokenCalculator.OTP_DEFAULT_DIGITS
                 throw NumberFormatException()
-            } else value
+            }
         }
 
     var algorithm
@@ -144,16 +150,15 @@ data class OtpElement(var otpModel: OtpModel = OtpModel()) {
 
     @Throws(IllegalArgumentException::class)
     fun setBase32Secret(secret: String) {
-        val secretChars = replaceBase32Chars(secret)
-        if (secretChars.isNotEmpty() && checkBase32Secret(secretChars))
-            otpModel.secret = Base32().decode(secretChars.toByteArray())
+        if (isValidBase32(secret))
+            otpModel.secret = Base32().decode(replaceBase32Chars(secret).toByteArray())
         else
             throw IllegalArgumentException()
     }
 
     @Throws(IllegalArgumentException::class)
     fun setBase64Secret(secret: String) {
-        if (secret.isNotEmpty() && checkBase64Secret(secret))
+        if (isValidBase64(secret))
             otpModel.secret = Base64().decode(secret.toByteArray())
         else
             throw IllegalArgumentException()
@@ -184,11 +189,33 @@ data class OtpElement(var otpModel: OtpModel = OtpModel()) {
         const val MAX_HOTP_COUNTER = Long.MAX_VALUE
 
         const val MIN_TOTP_PERIOD = 1
-        const val MAX_TOTP_PERIOD = 60
+        const val MAX_TOTP_PERIOD = 900
 
         const val MIN_OTP_DIGITS = 4
         const val MAX_OTP_DIGITS = 18
 
+        fun isValidCounter(counter: Long): Boolean {
+            return counter in MIN_HOTP_COUNTER..MAX_HOTP_COUNTER
+        }
+
+        fun isValidPeriod(period: Int): Boolean {
+            return period in MIN_TOTP_PERIOD..MAX_TOTP_PERIOD
+        }
+
+        fun isValidDigits(digits: Int): Boolean {
+            return digits in MIN_OTP_DIGITS..MAX_OTP_DIGITS
+        }
+
+        fun isValidBase32(secret: String): Boolean {
+            val secretChars = replaceBase32Chars(secret)
+            return secretChars.isNotEmpty() && checkBase32Secret(secretChars)
+        }
+
+        fun isValidBase64(secret: String): Boolean {
+            // TODO replace base 64 chars
+            return secret.isNotEmpty() && checkBase64Secret(secret)
+        }
+
         fun replaceSpaceChars(parameter: String): String {
             return parameter.replace("[\\r|\\n|\\t|\\s|\\u00A0]+".toRegex(), "")
         }

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

@@ -26,8 +26,6 @@ import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.model.Field
 import com.kunzisoft.keepass.otp.OtpElement.Companion.replaceSpaceChars
 import com.kunzisoft.keepass.otp.TokenCalculator.*
-import java.lang.Exception
-import java.lang.StringBuilder
 import java.net.URLEncoder
 import java.util.*
 import java.util.regex.Pattern

app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsActivity.kt

@@ -23,9 +23,9 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 
-class AutofillSettingsActivity : StylishActivity() {
+class AutofillSettingsActivity : SpecialModeActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsFragment.kt

@@ -20,9 +20,12 @@
 package com.kunzisoft.keepass.settings
 
 import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.settings.preferencedialogfragment.AutofillBlocklistAppIdPreferenceDialogFragmentCompat
+import com.kunzisoft.keepass.settings.preferencedialogfragment.AutofillBlocklistWebDomainPreferenceDialogFragmentCompat
 
 class AutofillSettingsFragment : PreferenceFragmentCompat() {
 
@@ -30,4 +33,34 @@ class AutofillSettingsFragment : PreferenceFragmentCompat() {
         // Load the preferences from an XML resource
         setPreferencesFromResource(R.xml.preferences_autofill, rootKey)
     }
+
+    override fun onDisplayPreferenceDialog(preference: Preference?) {
+        var otherDialogFragment = false
+
+        var dialogFragment: DialogFragment? = null
+
+        when (preference?.key) {
+            getString(R.string.autofill_application_id_blocklist_key) -> {
+                dialogFragment = AutofillBlocklistAppIdPreferenceDialogFragmentCompat.newInstance(preference.key)
+            }
+            getString(R.string.autofill_web_domain_blocklist_key) -> {
+                dialogFragment = AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.newInstance(preference.key)
+            }
+            else -> otherDialogFragment = true
+        }
+
+        if (dialogFragment != null) {
+            dialogFragment.setTargetFragment(this, 0)
+            dialogFragment.show(parentFragmentManager, TAG_AUTOFILL_PREF_FRAGMENT)
+        }
+        // Could not be handled here. Try with the super method.
+        else if (otherDialogFragment) {
+            super.onDisplayPreferenceDialog(preference)
+        }
+    }
+
+    companion object {
+
+        private const val TAG_AUTOFILL_PREF_FRAGMENT = "TAG_AUTOFILL_PREF_FRAGMENT"
+    }
 }

app/src/main/java/com/kunzisoft/keepass/settings/MagikeyboardSettingsActivity.kt

@@ -24,9 +24,9 @@ import androidx.appcompat.widget.Toolbar
 import android.view.MenuItem
 
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.activities.selection.SpecialModeActivity
 
-class MagikeyboardSettingsActivity : StylishActivity() {
+class MagikeyboardSettingsActivity : SpecialModeActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt

@@ -62,7 +62,6 @@ abstract class NestedSettingsFragment : PreferenceFragmentCompat() {
 
         private const val TAG_KEY = "NESTED_KEY"
 
-        @JvmOverloads
         fun newInstance(key: Screen, databaseReadOnly: Boolean = ReadOnlyHelper.READ_ONLY_DEFAULT)
                 : NestedSettingsFragment {
             val fragment: NestedSettingsFragment = when (key) {

app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt

@@ -20,8 +20,10 @@
 package com.kunzisoft.keepass.settings
 
 import android.content.Context
+import android.content.res.Resources
 import android.net.Uri
 import androidx.preference.PreferenceManager
+import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.timeout.TimeoutHelper
@@ -97,6 +99,12 @@ object PreferencesUtil {
                 context.resources.getBoolean(R.bool.auto_focus_search_default))
     }
 
+    fun searchSubdomains(context: Context): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getBoolean(context.getString(R.string.subdomain_search_key),
+                context.resources.getBoolean(R.bool.subdomain_search_default))
+    }
+
     fun showUsernamesListEntries(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         return prefs.getBoolean(context.getString(R.string.list_entries_show_username_key),
@@ -337,6 +345,12 @@ object PreferencesUtil {
                 context.resources.getBoolean(R.bool.keyboard_notification_entry_default))
     }
 
+    fun isKeyboardSearchShareEnable(context: Context): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getBoolean(context.getString(R.string.keyboard_search_share_key),
+                context.resources.getBoolean(R.bool.keyboard_search_share_default))
+    }
+
     fun isAutoGoActionEnable(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         return prefs.getBoolean(context.getString(R.string.keyboard_auto_go_action_key),
@@ -355,9 +369,63 @@ object PreferencesUtil {
                 context.resources.getBoolean(R.bool.keyboard_key_sound_default))
     }
 
+    fun isKeyboardPreviousDatabaseCredentialsEnable(context: Context): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getBoolean(context.getString(R.string.keyboard_previous_database_credentials_key),
+                context.resources.getBoolean(R.bool.keyboard_previous_database_credentials_default))
+    }
+
+    fun isKeyboardPreviousFillInEnable(context: Context): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getBoolean(context.getString(R.string.keyboard_previous_fill_in_key),
+                context.resources.getBoolean(R.bool.keyboard_previous_fill_in_default))
+    }
+
     fun isAutofillAutoSearchEnable(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         return prefs.getBoolean(context.getString(R.string.autofill_auto_search_key),
                 context.resources.getBoolean(R.bool.autofill_auto_search_default))
     }
+
+    /**
+     * Retrieve the default Blocklist for application ID, including the current app
+     */
+    fun getDefaultApplicationIdBlocklist(resources: Resources?): Set<String> {
+        return resources?.getStringArray(R.array.autofill_application_id_blocklist_default)
+                ?.toMutableSet()?.apply {
+                    add(BuildConfig.APPLICATION_ID)
+                } ?: emptySet()
+    }
+
+    fun applicationIdBlocklist(context: Context): Set<String> {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getStringSet(context.getString(R.string.autofill_application_id_blocklist_key),
+                getDefaultApplicationIdBlocklist(context.resources))
+                ?: emptySet()
+    }
+
+    fun webDomainBlocklist(context: Context): Set<String> {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getStringSet(context.getString(R.string.autofill_web_domain_blocklist_key),
+                context.resources.getStringArray(R.array.autofill_web_domain_blocklist_default).toMutableSet())
+                ?: emptySet()
+    }
+
+    fun addApplicationIdToBlocklist(context: Context, applicationId: String) {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        val setItems: MutableSet<String> = applicationIdBlocklist(context).toMutableSet()
+        setItems.add(applicationId)
+        prefs.edit()
+                .putStringSet(context.getString(R.string.autofill_application_id_blocklist_key), setItems)
+                .apply()
+    }
+
+    fun addWebDomainToBlocklist(context: Context, webDomain: String) {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        val setItems: MutableSet<String> = webDomainBlocklist(context).toMutableSet()
+        setItems.add(webDomain)
+        prefs.edit()
+                .putStringSet(context.getString(R.string.autofill_web_domain_blocklist_key), setItems)
+                .apply()
+    }
 }

app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt

@@ -92,6 +92,9 @@ open class SettingsActivity
             lockAndExit()
         }
 
+        // Focus view to reinitialize timeout
+        resetAppTimeoutWhenViewFocusedOrChanged(coordinatorLayout)
+
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                     .add(R.id.fragment_container, retrieveMainFragment())

app/src/main/java/com/kunzisoft/keepass/settings/preference/InputListPreference.kt

@@ -0,0 +1,36 @@
+/*
+ * 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.settings.preference
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.preference.DialogPreference
+import com.kunzisoft.keepass.R
+
+open class InputListPreference @JvmOverloads constructor(context: Context,
+                                                         attrs: AttributeSet? = null,
+                                                         defStyleAttr: Int = R.attr.dialogPreferenceStyle,
+                                                         defStyleRes: Int = defStyleAttr)
+    : DialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+
+    override fun getDialogLayoutResource(): Int {
+        return R.layout.pref_dialog_input_list
+    }
+}

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistAppIdPreferenceDialogFragmentCompat.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.settings.preferencedialogfragment
+
+import android.os.Bundle
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.PreferencesUtil
+
+class AutofillBlocklistAppIdPreferenceDialogFragmentCompat
+    : AutofillBlocklistPreferenceDialogFragmentCompat() {
+
+    override fun buildSearchInfoFromString(searchInfoString: String): SearchInfo? {
+        val newSearchInfo = searchInfoString
+                // remove chars not allowed in application ID
+                .replace(Regex("[^a-zA-Z0-9_.]+"), "")
+        return SearchInfo().apply { this.applicationId = newSearchInfo }
+    }
+
+    override fun getDefaultValues(): Set<String> {
+        return PreferencesUtil.getDefaultApplicationIdBlocklist(this.resources)
+    }
+
+    companion object {
+        fun newInstance(key: String): AutofillBlocklistAppIdPreferenceDialogFragmentCompat {
+            val fragment = AutofillBlocklistAppIdPreferenceDialogFragmentCompat()
+            val bundle = Bundle(1)
+            bundle.putString(ARG_KEY, key)
+            fragment.arguments = bundle
+
+            return fragment
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistPreferenceDialogFragmentCompat.kt

@@ -0,0 +1,149 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.settings.preferencedialogfragment
+
+import android.os.Bundle
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.settings.preferencedialogfragment.adapter.AutofillBlocklistAdapter
+import java.util.*
+import kotlin.Comparator
+import kotlin.collections.HashSet
+
+abstract class AutofillBlocklistPreferenceDialogFragmentCompat
+    : InputPreferenceDialogFragmentCompat(),
+        AutofillBlocklistAdapter.ItemDeletedCallback<SearchInfo> {
+
+    private var persistedItems = TreeSet<SearchInfo>(
+            Comparator { o1, o2 -> o1.toString().compareTo(o2.toString()) })
+
+    private var filterAdapter: AutofillBlocklistAdapter<SearchInfo>? = null
+
+    abstract fun buildSearchInfoFromString(searchInfoString: String): SearchInfo?
+
+    abstract fun getDefaultValues(): Set<String>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // To get items for saved instance state
+        savedInstanceState?.getParcelableArray(ITEMS_KEY)?.let {
+            it.forEach { itemSaved ->
+                (itemSaved as SearchInfo?)?.let { item ->
+                    persistedItems.add(item)
+                }
+            }
+        } ?: run {
+            // Or from preference
+            preference.getPersistedStringSet(getDefaultValues()).forEach { searchInfoString ->
+                addSearchInfo(searchInfoString)
+            }
+        }
+    }
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+
+        setOnInputTextEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
+            when (actionId) {
+                EditorInfo.IME_ACTION_DONE -> {
+                    if (inputText.isEmpty()) {
+                        onDialogClosed(true)
+                        dialog?.dismiss()
+                        true
+                    } else {
+                        addItemFromInputText()
+                        false
+                    }
+                }
+                else -> false
+            }
+        })
+
+        val addItemButton = view.findViewById<View>(R.id.add_item_button)
+        addItemButton?.setOnClickListener {
+            addItemFromInputText()
+        }
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.pref_dialog_list)
+        recyclerView.layoutManager = LinearLayoutManager(context)
+
+        activity?.let { activity ->
+            filterAdapter = AutofillBlocklistAdapter(activity)
+            filterAdapter?.setItemDeletedCallback(this)
+            recyclerView.adapter = filterAdapter
+            filterAdapter?.replaceItems(persistedItems.toList())
+        }
+    }
+
+    private fun addSearchInfo(searchInfoString: String): Boolean {
+        val itemToAdd = buildSearchInfoFromString(searchInfoString)
+        return if (itemToAdd != null && !itemToAdd.containsOnlyNullValues()) {
+            persistedItems.add(itemToAdd)
+            true
+        } else {
+            false
+        }
+    }
+
+    private fun addItemFromInputText() {
+        if (addSearchInfo(inputText)) {
+            inputText = ""
+        } else {
+            setInputTextError(getString(R.string.error_string_type))
+        }
+        filterAdapter?.replaceItems(persistedItems.toList())
+    }
+
+    override fun onItemDeleted(item: SearchInfo) {
+        persistedItems.remove(item)
+        filterAdapter?.replaceItems(persistedItems.toList())
+    }
+
+    private fun getStringItems(): Set<String> {
+        val setItems = HashSet<String>()
+        persistedItems.forEach {
+            it.getName(resources).let { item ->
+                setItems.add(item)
+            }
+        }
+        return setItems
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putParcelableArray(ITEMS_KEY, persistedItems.toTypedArray())
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        if (positiveResult) {
+            preference.persistStringSet(getStringItems())
+        }
+    }
+
+    companion object {
+        private const val ITEMS_KEY = "ITEMS_KEY"
+    }
+}

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.settings.preferencedialogfragment
+
+import android.os.Bundle
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.model.SearchInfo
+
+class AutofillBlocklistWebDomainPreferenceDialogFragmentCompat
+    : AutofillBlocklistPreferenceDialogFragmentCompat() {
+
+    override fun buildSearchInfoFromString(searchInfoString: String): SearchInfo? {
+        val newSearchInfo = searchInfoString
+                // remove prefix https://
+                .replace(Regex("^.*://"), "")
+                // Remove suffix /login...
+                .replace(Regex("/.*$"), "")
+        return SearchInfo().apply { webDomain = newSearchInfo }
+    }
+
+    override fun getDefaultValues(): Set<String> {
+        return context?.resources
+                ?.getStringArray(R.array.autofill_web_domain_blocklist_default)
+                ?.toMutableSet()
+                ?: emptySet()
+    }
+
+    companion object {
+        fun newInstance(key: String): AutofillBlocklistWebDomainPreferenceDialogFragmentCompat {
+            val fragment = AutofillBlocklistWebDomainPreferenceDialogFragmentCompat()
+            val bundle = Bundle(1)
+            bundle.putString(ARG_KEY, key)
+            fragment.arguments = bundle
+
+            return fragment
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt

@@ -36,7 +36,6 @@ import com.kunzisoft.androidclearchroma.colormode.ColorMode
 import com.kunzisoft.androidclearchroma.fragment.ChromaColorFragment
 import com.kunzisoft.androidclearchroma.fragment.ChromaColorFragment.*
 import com.kunzisoft.keepass.R
-import java.lang.Exception
 
 class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialogFragmentCompat() {
 

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/InputPreferenceDialogFragmentCompat.kt

@@ -21,10 +21,12 @@ package com.kunzisoft.keepass.settings.preferencedialogfragment
 
 import android.view.View
 import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.CompoundButton
 import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceDialogFragmentCompat
 import com.kunzisoft.keepass.R
 
@@ -34,6 +36,8 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
     private var textExplanationView: TextView? = null
     private var switchElementView: CompoundButton? = null
 
+    private var mOnInputTextEditorActionListener: TextView.OnEditorActionListener? = null
+
     var inputText: String
         get() = this.inputTextView?.text?.toString() ?: ""
         set(inputText) {
@@ -43,6 +47,14 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
             }
         }
 
+    fun setInputTextError(error: CharSequence) {
+        this.inputTextView?.error = error
+    }
+
+    fun setOnInputTextEditorActionListener(onEditorActionListener: TextView.OnEditorActionListener) {
+        this.mOnInputTextEditorActionListener = onEditorActionListener
+    }
+
     var explanationText: String?
         get() = textExplanationView?.text?.toString() ?: ""
         set(explanationText) {
@@ -63,16 +75,21 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
         inputTextView = view.findViewById(R.id.input_text)
         inputTextView?.apply {
             imeOptions = EditorInfo.IME_ACTION_DONE
-            setOnEditorActionListener { _, actionId, _ ->
-                when (actionId) {
-                    EditorInfo.IME_ACTION_DONE -> {
-                        onDialogClosed(true)
-                        dialog?.dismiss()
-                        true
-                    }
-                    else -> {
-                        false
+            setOnEditorActionListener { v, actionId, event ->
+                if (mOnInputTextEditorActionListener == null) {
+                    when (actionId) {
+                        EditorInfo.IME_ACTION_DONE -> {
+                            onDialogClosed(true)
+                            dialog?.dismiss()
+                            true
+                        }
+                        else -> {
+                            false
+                        }
                     }
+                } else {
+                    mOnInputTextEditorActionListener?.onEditorAction(v, actionId, event)
+                            ?: false
                 }
             }
         }
@@ -82,6 +99,20 @@ abstract class InputPreferenceDialogFragmentCompat : PreferenceDialogFragmentCom
         switchElementView?.visibility = View.GONE
     }
 
+    protected fun hideKeyboard(): Boolean {
+        context?.let {
+            ContextCompat.getSystemService(it, InputMethodManager::class.java)?.let { inputManager ->
+                activity?.currentFocus?.let { focus ->
+                    val windowToken = focus.windowToken
+                    if (windowToken != null) {
+                        return inputManager.hideSoftInputFromWindow(windowToken, 0)
+                    }
+                }
+            }
+        }
+        return false
+    }
+
     fun setInoutText(@StringRes inputTextId: Int) {
         inputText = getString(inputTextId)
     }

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/AutofillBlocklistAdapter.kt

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.settings.preferencedialogfragment.adapter
+
+import android.content.Context
+import androidx.recyclerview.widget.RecyclerView
+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.utils.ObjectNameResource
+
+import java.util.ArrayList
+
+class AutofillBlocklistAdapter<T : ObjectNameResource>(private val context: Context)
+    : RecyclerView.Adapter<AutofillBlocklistAdapter.BlocklistItemViewHolder>() {
+
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+
+    val items: MutableList<T> = ArrayList()
+
+    private var itemDeletedCallback: ItemDeletedCallback<T>? = null
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BlocklistItemViewHolder {
+        val view = inflater.inflate(R.layout.pref_dialog_list_removable_item, parent, false)
+        return BlocklistItemViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: BlocklistItemViewHolder, position: Int) {
+        val item = this.items[position]
+        holder.textItem.text = item.getName(context.resources)
+        holder.deleteButton.setOnClickListener(OnItemDeleteClickListener(item))
+    }
+
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
+    fun replaceItems(items: List<T>) {
+        this.items.clear()
+        this.items.addAll(items)
+        notifyDataSetChanged()
+    }
+
+    private inner class OnItemDeleteClickListener(private val itemClicked: T) : View.OnClickListener {
+
+        override fun onClick(view: View) {
+            itemDeletedCallback?.onItemDeleted(itemClicked)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun setItemDeletedCallback(itemDeletedCallback: ItemDeletedCallback<T>) {
+        this.itemDeletedCallback = itemDeletedCallback
+    }
+
+    interface ItemDeletedCallback<T> {
+        fun onItemDeleted(item: T)
+    }
+
+    class BlocklistItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var textItem: TextView = itemView.findViewById(R.id.pref_dialog_list_text)
+        var deleteButton: ImageView = itemView.findViewById(R.id.pref_dialog_list_delete_button)
+    }
+}

app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockInputStream.kt

@@ -81,7 +81,7 @@ class HashedBlockInputStream(inputStream: InputStream) : InputStream() {
         bufferPos = 0
 
         val index = baseStream.readUInt()
-        if (index.toLong() != bufferIndex) {
+        if (index.toKotlinLong() != bufferIndex) {
             throw IOException("Invalid data format")
         }
         bufferIndex++
@@ -91,7 +91,7 @@ class HashedBlockInputStream(inputStream: InputStream) : InputStream() {
             throw IOException("Invalid data format")
         }
 
-        val bufferSize = baseStream.readBytes4ToUInt().toInt()
+        val bufferSize = baseStream.readBytes4ToUInt().toKotlinInt()
         if (bufferSize == 0) {
             for (hash in 0 until HASH_SIZE) {
                 if (storedHash[hash].toInt() != 0) {
@@ -141,7 +141,7 @@ class HashedBlockInputStream(inputStream: InputStream) : InputStream() {
             if (!readHashedBlock()) return -1
         }
 
-        val output = UnsignedInt.fromByte(buffer[bufferPos]).toInt()
+        val output = UnsignedInt.fromKotlinByte(buffer[bufferPos]).toKotlinInt()
         bufferPos++
 
         return output

app/src/main/java/com/kunzisoft/keepass/stream/HashedBlockOutputStream.kt

@@ -99,7 +99,7 @@ class HashedBlockOutputStream : OutputStream {
 
     @Throws(IOException::class)
     private fun writeHashedBlock() {
-        baseStream.writeUInt(UnsignedInt.fromLong(bufferIndex))
+        baseStream.writeUInt(UnsignedInt.fromKotlinLong(bufferIndex))
         bufferIndex++
 
         if (bufferPos > 0) {

app/src/main/java/com/kunzisoft/keepass/stream/HmacBlockInputStream.kt

@@ -44,7 +44,7 @@ class HmacBlockInputStream(baseStream: InputStream, private val verify: Boolean,
             if (!readSafeBlock()) return -1
         }
 
-        val output = UnsignedInt.fromByte(buffer[bufferPos]).toInt()
+        val output = UnsignedInt.fromKotlinByte(buffer[bufferPos]).toKotlinInt()
         bufferPos++
 
         return output
@@ -101,7 +101,7 @@ class HmacBlockInputStream(baseStream: InputStream, private val verify: Boolean,
         val blockSize = bytes4ToUInt(pbBlockSize)
         bufferPos = 0
 
-        buffer = baseStream.readBytes(blockSize.toInt())
+        buffer = baseStream.readBytes(blockSize.toKotlinInt())
 
         if (verify) {
             val cmpHmac: ByteArray
@@ -135,7 +135,7 @@ class HmacBlockInputStream(baseStream: InputStream, private val verify: Boolean,
 
         blockIndex++
 
-        if (blockSize.toLong() == 0L) {
+        if (blockSize.toKotlinLong() == 0L) {
             endOfStream = true
             return false
         }

app/src/main/java/com/kunzisoft/keepass/stream/StreamBytesUtils.kt

@@ -171,11 +171,11 @@ fun bytes5ToDate(buf: ByteArray, calendar: Calendar = Calendar.getInstance()): D
     System.arraycopy(buf, 0, cDate, 0, dateSize)
 
     val readOffset = 0
-    val dw1 = UnsignedInt.fromByte(cDate[readOffset]).toInt()
-    val dw2 = UnsignedInt.fromByte(cDate[readOffset + 1]).toInt()
-    val dw3 = UnsignedInt.fromByte(cDate[readOffset + 2]).toInt()
-    val dw4 = UnsignedInt.fromByte(cDate[readOffset + 3]).toInt()
-    val dw5 = UnsignedInt.fromByte(cDate[readOffset + 4]).toInt()
+    val dw1 = UnsignedInt.fromKotlinByte(cDate[readOffset]).toKotlinInt()
+    val dw2 = UnsignedInt.fromKotlinByte(cDate[readOffset + 1]).toKotlinInt()
+    val dw3 = UnsignedInt.fromKotlinByte(cDate[readOffset + 2]).toKotlinInt()
+    val dw4 = UnsignedInt.fromKotlinByte(cDate[readOffset + 3]).toKotlinInt()
+    val dw5 = UnsignedInt.fromKotlinByte(cDate[readOffset + 4]).toKotlinInt()
 
     // Unpack 5 byte structure to date and time
     val year = dw1 shl 6 or (dw2 shr 2)
@@ -199,7 +199,7 @@ fun bytes5ToDate(buf: ByteArray, calendar: Calendar = Calendar.getInstance()): D
 fun uIntTo4Bytes(value: UnsignedInt): ByteArray {
     val buf = ByteArray(4)
     for (i in 0 until 4) {
-        buf[i] = (value.toInt().ushr(8 * i) and 0xFF).toByte()
+        buf[i] = (value.toKotlinInt().ushr(8 * i) and 0xFF).toByte()
     }
     return buf
 }
@@ -246,8 +246,8 @@ fun dateTo5Bytes(date: Date, calendar: Calendar = Calendar.getInstance()): ByteA
     val minute = calendar.get(Calendar.MINUTE)
     val second = calendar.get(Calendar.SECOND)
 
-    buf[0] = UnsignedInt(year shr 6 and 0x0000003F).toByte()
-    buf[1] = UnsignedInt(year and 0x0000003F shl 2 or (month shr 2 and 0x00000003)).toByte()
+    buf[0] = UnsignedInt(year shr 6 and 0x0000003F).toKotlinByte()
+    buf[1] = UnsignedInt(year and 0x0000003F shl 2 or (month shr 2 and 0x00000003)).toKotlinByte()
     buf[2] = (month and 0x00000003 shl 6
             or (day and 0x0000001F shl 1) or (hour shr 4 and 0x00000001)).toByte()
     buf[3] = (hour and 0x0000000F shl 4 or (minute shr 2 and 0x0000000F)).toByte()

app/src/main/java/com/kunzisoft/keepass/tasks/ActionRunnable.kt

@@ -21,7 +21,6 @@ package com.kunzisoft.keepass.tasks
 
 import android.os.Bundle
 import com.kunzisoft.keepass.database.exception.DatabaseException
-import java.lang.Exception
 
 /**
  * Callback after a task is completed.

app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt

@@ -38,6 +38,7 @@ object TimeoutHelper {
 
     private const val TAG = "TimeoutHelper"
 
+    private var lastAppTimeoutRecord: Long? = null
     var temporarilyDisableTimeout = false
         private set
 
@@ -84,9 +85,15 @@ object TimeoutHelper {
      * Record the current time, to check it later with checkTime and start a new lock timer
      */
     fun recordTime(context: Context) {
-        // Record timeout time in case timeout service is killed
-        PreferencesUtil.saveCurrentTime(context)
-        startLockTimer(context)
+        // To prevent spam registration, record after at least 2 seconds
+        if (lastAppTimeoutRecord == null
+                || lastAppTimeoutRecord!! + 2000 <= System.currentTimeMillis()) {
+            Log.d(TAG, "Record app timeout")
+            // Record timeout time in case timeout service is killed
+            PreferencesUtil.saveCurrentTime(context)
+            startLockTimer(context)
+            lastAppTimeoutRecord = System.currentTimeMillis()
+        }
     }
 
     /**

app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt

@@ -42,10 +42,12 @@ const val DATABASE_STOP_TASK_ACTION = "com.kunzisoft.keepass.DATABASE_STOP_TASK_
 
 const val LOCK_ACTION = "com.kunzisoft.keepass.LOCK"
 const val REMOVE_ENTRY_MAGIKEYBOARD_ACTION = "com.kunzisoft.keepass.REMOVE_ENTRY_MAGIKEYBOARD"
+const val BACK_PREVIOUS_KEYBOARD_ACTION = "com.kunzisoft.keepass.BACK_PREVIOUS_KEYBOARD"
 
 class LockReceiver(var lockAction: () -> Unit) : BroadcastReceiver() {
 
     var mLockPendingIntent: PendingIntent? = null
+    var backToPreviousKeyboardAction: (() -> Unit)? = null
 
     override fun onReceive(context: Context, intent: Intent) {
         // If allowed, lock and exit
@@ -76,7 +78,12 @@ class LockReceiver(var lockAction: () -> Unit) : BroadcastReceiver() {
                         }
                     }
                     LOCK_ACTION,
-                    REMOVE_ENTRY_MAGIKEYBOARD_ACTION -> lockAction.invoke()
+                    REMOVE_ENTRY_MAGIKEYBOARD_ACTION -> {
+                        lockAction.invoke()
+                    }
+                    BACK_PREVIOUS_KEYBOARD_ACTION -> {
+                        backToPreviousKeyboardAction?.invoke()
+                    }
                     else -> {}
                 }
             }
@@ -93,14 +100,16 @@ class LockReceiver(var lockAction: () -> Unit) : BroadcastReceiver() {
 }
 
 fun Context.registerLockReceiver(lockReceiver: LockReceiver?,
-                                 registerRemoveEntryMagikeyboard: Boolean = false) {
+                                 registerKeyboardAction: Boolean = false) {
     lockReceiver?.let {
         registerReceiver(it, IntentFilter().apply {
             addAction(Intent.ACTION_SCREEN_OFF)
             addAction(Intent.ACTION_SCREEN_ON)
             addAction(LOCK_ACTION)
-            if (registerRemoveEntryMagikeyboard)
+            if (registerKeyboardAction) {
                 addAction(REMOVE_ENTRY_MAGIKEYBOARD_ACTION)
+                addAction(BACK_PREVIOUS_KEYBOARD_ACTION)
+            }
         })
     }
 }

app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.kt

@@ -50,7 +50,6 @@ object MenuUtil {
     /*
      * @param checkLock Check the time lock before launch settings in LockingActivity
      */
-    @JvmOverloads
     fun onDefaultMenuOptionsItemSelected(activity: Activity,
                                          item: MenuItem,
                                          readOnly: Boolean = READ_ONLY_DEFAULT,

app/src/main/java/com/kunzisoft/keepass/utils/UnsignedInt.kt

@@ -21,31 +21,31 @@ package com.kunzisoft.keepass.utils
 
 class UnsignedInt(private var unsignedValue: Int) {
 
-    constructor(unsignedValue: UnsignedInt) : this(unsignedValue.toInt())
+    constructor(unsignedValue: UnsignedInt) : this(unsignedValue.toKotlinInt())
 
     /**
      * Get the int value
      */
-    fun toInt(): Int {
+    fun toKotlinInt(): Int {
         return unsignedValue
     }
 
     /**
      * Convert an unsigned Integer to Long
      */
-    fun toLong(): Long {
+    fun toKotlinLong(): Long {
         return unsignedValue.toLong() and INT_TO_LONG_MASK
     }
 
     /**
      * Convert an unsigned Integer to Byte
      */
-    fun toByte(): Byte {
+    fun toKotlinByte(): Byte {
         return (unsignedValue and 0xFF).toByte()
     }
 
     override fun toString():String {
-        return toLong().toString()
+        return toKotlinLong().toString()
     }
 
     override fun equals(other: Any?): Boolean {
@@ -72,12 +72,12 @@ class UnsignedInt(private var unsignedValue: Int) {
         /**
          * Convert a byte to an unsigned byte
          */
-        fun fromByte(value: Byte): UnsignedInt {
+        fun fromKotlinByte(value: Byte): UnsignedInt {
             return UnsignedInt(value.toInt() and 0xFF)
         }
 
         @Throws(NumberFormatException::class)
-        fun fromLong(value: Long): UnsignedInt {
+        fun fromKotlinLong(value: Long): UnsignedInt {
             if (value > UINT_MAX_VALUE)
                 throw NumberFormatException("UInt value > $UINT_MAX_VALUE")
             return UnsignedInt(value.toInt())

app/src/main/java/com/kunzisoft/keepass/utils/UnsignedLong.kt

@@ -24,7 +24,7 @@ class UnsignedLong(private var unsignedValue: Long) {
     /**
      * Convert an unsigned Integer to Long
      */
-    fun toLong(): Long {
+    fun toKotlinLong(): Long {
         return unsignedValue
     }
 

app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt

@@ -86,6 +86,19 @@ object UriUtil {
             null
     }
 
+    fun getWebDomainWithoutSubDomain(webDomain: String?): String? {
+        webDomain?.split(".")?.let { domainArray ->
+            if (domainArray.isEmpty()) {
+                return ""
+            }
+            if (domainArray.size == 1) {
+                return domainArray[0];
+            }
+            return domainArray[domainArray.size - 2] + "." + domainArray[domainArray.size - 1]
+        }
+        return null
+    }
+
     fun decode(uri: String?): String {
         return Uri.decode(uri) ?: ""
     }

app/src/main/java/com/kunzisoft/keepass/utils/VariantDictionary.kt

@@ -127,13 +127,13 @@ open class VariantDictionary {
                 if (bType == VdType.None) {
                     break
                 }
-                val nameLen = inputStream.readUInt().toInt()
+                val nameLen = inputStream.readUInt().toKotlinInt()
                 val nameBuf = inputStream.readBytes(nameLen)
                 if (nameLen != nameBuf.size) {
                     throw IOException("Invalid format")
                 }
                 val name = String(nameBuf, UTF8Charset)
-                val valueLen = inputStream.readUInt().toInt()
+                val valueLen = inputStream.readUInt().toKotlinInt()
                 val valueBuf = inputStream.readBytes(valueLen)
                 if (valueLen != valueBuf.size) {
                     throw IOException("Invalid format")
@@ -149,7 +149,7 @@ open class VariantDictionary {
                         dictionary.setBool(name, valueBuf[0] != 0.toByte())
                     }
                     VdType.Int32 -> if (valueLen == 4) {
-                        dictionary.setInt32(name, bytes4ToUInt(valueBuf).toInt())
+                        dictionary.setInt32(name, bytes4ToUInt(valueBuf).toKotlinInt())
                     }
                     VdType.Int64 -> if (valueLen == 8) {
                         dictionary.setInt64(name, bytes64ToLong(valueBuf))

app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt

@@ -309,15 +309,17 @@ class EntryContentsView @JvmOverloads constructor(context: Context,
                       enableActionButton: Boolean,
                       onActionClickListener: OnClickListener?) {
 
-        val entryCustomField = EntryCustomField(context, attrs, defStyle)
-        entryCustomField.apply {
+        val entryCustomField: EntryCustomField? = EntryCustomField(context, attrs, defStyle)
+        entryCustomField?.apply {
             setLabel(title)
             setValue(value.toString(), value.isProtected)
             enableActionButton(enableActionButton)
             assignActionButtonClickListener(onActionClickListener)
             applyFontVisibility(fontInVisibility)
         }
-        extrasView.addView(entryCustomField)
+        entryCustomField?.let {
+            extrasView.addView(it)
+        }
         extrasContainerView.visibility = View.VISIBLE
     }
 

app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt

@@ -29,9 +29,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 
-open class EntryCustomField @JvmOverloads constructor(context: Context,
-                                                      attrs: AttributeSet? = null,
-                                                      defStyle: Int = 0)
+class EntryCustomField @JvmOverloads constructor(context: Context,
+                                                 attrs: AttributeSet? = null,
+                                                 defStyle: Int = 0)
     : LinearLayout(context, attrs, defStyle) {
 
     private val labelView: TextView

app/src/main/java/com/kunzisoft/keepass/view/SpecialModeView.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import com.kunzisoft.keepass.R
+
+class SpecialModeView @JvmOverloads constructor(context: Context,
+                                                attrs: AttributeSet? = null,
+                                                defStyle: Int = androidx.appcompat.R.attr.toolbarStyle)
+    : Toolbar(context, attrs, defStyle) {
+
+    init {
+        setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        title = resources.getString(R.string.selection_mode)
+    }
+
+    var onCancelButtonClickListener: OnClickListener? = null
+        set(value) {
+            if (value != null)
+                setNavigationOnClickListener(value)
+        }
+
+    var visible: Boolean = false
+        set(value) {
+            visibility = if (value) {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+            field = value
+        }
+}

app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt

@@ -33,7 +33,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.tasks.ActionRunnable
-import java.util.*
 
 /**
  * Replace font by monospace, must be called after seText()
@@ -93,14 +92,17 @@ fun Toolbar.collapse(animate: Boolean = true) {
 }
 
 fun Toolbar.expand(animate: Boolean = true)  {
-    visibility = View.VISIBLE
     val actionBarHeight = layoutParams.height
+    layoutParams.height = 0
     val slideAnimator = ValueAnimator
             .ofInt(0, actionBarHeight)
     if (animate)
         slideAnimator.duration = 300L
     slideAnimator.addUpdateListener { animation ->
         layoutParams.height = animation.animatedValue as Int
+        if (layoutParams.height >= 1) {
+            visibility = View.VISIBLE
+        }
         requestLayout()
     }
     AnimatorSet().apply {

app/src/main/res/color/entry_subtitle_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="true" android:color="@color/colorTextInverse"/>
+    <item android:color="?android:attr/textColorSecondary"/>
+</selector>

app/src/main/res/color/entry_title_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="true" android:color="@color/colorTextInverse"/>
+    <item android:color="?android:attr/textColor"/>
+</selector>

app/src/main/res/color/group_subtitle_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="true" android:color="@color/colorTextInverse"/>
+    <item android:color="?android:attr/textColorSecondary"/>
+</selector>

app/src/main/res/color/group_title_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="true" android:color="@color/colorTextInverse"/>
+    <item android:color="?android:attr/textColorPrimary"/>
+</selector>

app/src/main/res/drawable-v21/background_button.xml

@@ -8,8 +8,8 @@
             <corners
                 android:radius="0dp" />
             <padding
-                android:left="0dp"
-                android:right="0dp"
+                android:left="8dp"
+                android:right="8dp"
                 android:top="12dp"
                 android:bottom="12dp"/>
             <solid android:color="?attr/colorAccent"/>

app/src/main/res/drawable/background_button.xml

@@ -5,8 +5,8 @@
             <corners
                 android:radius="0dp" />
             <padding
-                android:left="0dp"
-                android:right="0dp"
+                android:left="8dp"
+                android:right="8dp"
                 android:top="12dp"
                 android:bottom="12dp"/>
             <solid android:color="@color/orange_light"/>
@@ -17,8 +17,8 @@
             <corners
                 android:radius="0dp" />
             <padding
-                android:left="0dp"
-                android:right="0dp"
+                android:left="8dp"
+                android:right="8dp"
                 android:top="12dp"
                 android:bottom="12dp"/>
             <solid android:color="@color/orange"/>

app/src/main/res/drawable/ic_arrow_back_white_24dp.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <path
+            android:fillColor="#ffffff"
+            android:strokeWidth="1.78885484"
+            android:pathData="M 9.6582031 2.3417969 C 9.4025809 2.3417969 9.1470385 2.4408503 8.9511719 2.6367188 L 3.2929688 8.2929688 C 2.9012354 8.6847056 2.9012354 9.3152944 3.2929688 9.7070312 L 8.9511719 15.363281 C 9.3429052 15.755018 9.973501 15.755018 10.365234 15.363281 C 10.756968 14.971544 10.756968 14.340956 10.365234 13.949219 L 6.4160156 10 L 16 10 L 16 10.03125 A 4.5000001 4.5000001 0 0 1 20 14.5 A 4.5000001 4.5000001 0 0 1 16 18.966797 L 16 19 L 7 19 C 6.4460006 19 6 19.446001 6 20 C 6 20.553999 6.4460006 21 7 21 L 16 21 C 16.123984 21 16.240233 20.970575 16.349609 20.929688 A 6.5000001 6.5000001 0 0 0 22 14.5 A 6.5000001 6.5000001 0 0 0 16 8.0214844 L 16 8 L 6.4160156 8 L 10.365234 4.0507812 C 10.756968 3.6590444 10.756968 3.0284556 10.365234 2.6367188 C 10.169368 2.4408503 9.9138254 2.3417969 9.6582031 2.3417969 z" />
+    </group>
+</vector>