Merge branch 'release/2.5.0.0beta26'

Currently translated at 94.9% (388 of 409 strings)

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,7 +30,7 @@ If applicable, add screenshots to help explain your problem.
  - Size: [e.g. 150Mo]
  - Contains attachment: [e.g. Yes]
 
-**KeePass DX (please complete the following information):**
+**KeePassDX (please complete the following information):**
  - Version: [e.g. 2.5.0.0beta23]
  - Build: [e.g. Free]
  - Language: [e.g. French]
@@ -38,7 +38,7 @@ If applicable, add screenshots to help explain your problem.
 **Android (please complete the following information):**
  - Device: [e.g. GalaxyS8]
  - Version: [e.g. 8.1]
- - Browser: [e.g. Chrome]
 
 **Additional context**
 Add any other context about the problem here.
+ - Browser for Autofill: [e.g. Chrome version X]

CHANGELOG

@@ -1,3 +1,24 @@
+KeepassDX (2.5.0.0beta26)
+ * Download attachments
+ * Change file size string format
+ * Prevent screenshot for all screen
+ * Auto performed "Go" key in Magikeyboard
+ * Restore and delete entry history
+ * Setting to hide expired entries
+ * New Black theme
+ * Fix crash when clearing clipboard
+ * Fix attachments compressions
+ * Fix dates
+ * Fix UUID message for Database v1
+
+KeepassDX (2.5.0.0beta25)
+ * Setting for Recycle Bin
+ * Fix Recycle bin issues
+ * Fix TOTP
+ * Fix infinite save
+ * Fix update group
+ * Fix OOM
+
 KeepassDX (2.5.0.0beta24)
  * Add OTP (HOTP / TOTP)
  * Add settings (Color, Security, Master Key)

LICENSE

@@ -1,6 +1,6 @@
 ---
 
-KeePass DX is free software: you can redistribute it and/or modify
+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.
@@ -13,7 +13,7 @@ KeePass DX is free software: you can redistribute it and/or modify
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-The KeePass DX icon was created by Jeremy JAMET and is licensed under the terms of GPLv3.
+The KeePassDX icon was created by Jeremy JAMET and is licensed under the terms of GPLv3.
 
 ---
 

ReadMe.md

@@ -1,6 +1,6 @@
-# Android Keepass DX
+# Android KeepassDX
 
-<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> Keepass DX is a **multi-format KeePass manager for Android devices**. The application allows to create keys and passwords in a secure way by integrating with the Android design standards.
+<img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/icon.png"> KeepassDX is a **multi-format KeePass manager for Android devices**. The application allows to create keys and passwords in a secure way by integrating with the Android design standards.
 
 <img src="https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/art/screen.jpg" width="220">
 
@@ -8,27 +8,27 @@
 
  * Create database files / entries and groups
  * Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm
- * **Compatible** with the majority of alternative programs (KeePass, KeePassX, KeePass XC...)
+ * **Compatible** with the majority of alternative programs (KeePass, KeePassX, KeePassXC...)
  * Allows **fast copy** of fields and opening of URI / URL
  * **Biometric recognition** for fast unlocking *(Fingerprint / Face unlock / ...)*
- * **One-Time Password** management *(HOTP / TOTP)*
+ * **One-Time Password** management *(HOTP / TOTP)* for Two-factor authentication (2FA)
  * Material design with **themes**
  * **AutoFill** and Integration
  * Field filling **keyboard**
  * Precise management of **settings**
  * Code written in **native language** *(Kotlin / Java / JNI / C)*
 
-Keepass DX is **open source** and **ad-free**. 
+KeepassDX is **open source** and **ad-free**.
 
-## What is KeePass DX?
+## What is KeePassDX?
 
 Today you need to remember many passwords. You need a password for your e-mail account, your website's FTP password, online passwords (like website member account), etc. etc. etc. The list is endless. Also, you **should use different passwords for each account**. Because if you use only one password everywhere and someone gets this password you have a problem... A serious problem. The thief would have access to your e-mail account, website, etc. Unimaginable.
 
-KeePass DX is a **free open source password manager for Android**, which helps you to **manage your passwords in a secure way**. You can put all your passwords in one database, which is locked with one **master key** or a **key file**. So you **only have to remember one single master password or select the key file** to unlock the whole database. The databases are encrypted using the best and **most secure encryption algorithms** currently known.
+KeePassDX is a **free open source password manager for Android**, which helps you to **manage your passwords in a secure way**. You can put all your passwords in one database, which is locked with one **master key** or a **key file**. So you **only have to remember one single master password or select the key file** to unlock the whole database. The databases are encrypted using the best and **most secure encryption algorithms** currently known.
 
 ## Is it really free?
 
-Yes, KeePass DX is under **free license (OSI certified)** and **without advertising**. You can have a look at its full source and check whether the encryption algorithms are implemented correctly.
+Yes, KeePassDX is under **free license (OSI certified)** and **without advertising**. You can have a look at its full source and check whether the encryption algorithms are implemented correctly.
 
 *Note : If you access the application from a store, visual features may not be available to incentivize the contribution to the work of open source projects. These optional visuals are accessible after a donation (and a small congratulation message :) or the purchase of an extended version, but do not worry, the main features remain completely free. If you contribute to the project and you do not have access to the themes, do not hesitate to contact me at [contact@kunzisoft.com](contact@kunzisoft.com), I will give you the procedure.*
 
@@ -39,7 +39,7 @@ You can contribute in different ways to help us on our work.
 * Add features by a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
 * Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** into your language (By using [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or with a manual [pull request](https://help.github.com/articles/about-pull-requests/))
 * **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
-* Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePass DX
+* Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePassDX
 
 ## Download
 
@@ -65,21 +65,21 @@ Other questions? You can read the [F.A.Q.](https://github.com/Kunzisoft/KeePassD
 
 ## License
 
- Copyright (c) 2019 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
+ Copyright (c) 2020 Jeremy Jamet / [Kunzisoft](https://www.kunzisoft.com).
 
- This file is part of KeePass DX.
+ This file is part of KeePassDX.
 
-  [KeePass DX](https://www.keepassdx.com) is free software: you can redistribute it and/or modify
+  [KeePassDX](https://www.keepassdx.com) 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.
 
-  KeePass DX is distributed in the hope that it will be useful,
+  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
   
   *This project is a fork of [KeepassDroid](https://github.com/bpellin/keepassdroid) by bpellin.*

app/build.gradle

@@ -6,14 +6,13 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
-    ndkVersion "20.1.5948944"
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode = 24
+        versionCode = 26
-        versionName = "2.5.0.0beta24"
+        versionName = "2.5.0.0beta26"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -28,7 +27,6 @@ android {
         }
     }
 
-
     buildTypes {
         release {
             minifyEnabled = false
@@ -109,8 +107,6 @@ dependencies {
     implementation 'org.apache.commons:commons-io:1.3.2'
     // Apache Commons Codec
     implementation 'commons-codec:commons-codec:1.11'
-    // Base64
-    implementation 'biz.source_code:base64coder:2010-12-19'
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')

app/src/androidTest/java/com/kunzisoft/keepass/tests/PwDateTest.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePass DX.
- *
- *  KeePass DX 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.
- *
- *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.tests
-
-import junit.framework.TestCase
-
-import com.kunzisoft.keepass.database.element.PwDate
-import org.junit.Assert
-
-class PwDateTest : TestCase() {
-
-    fun testDate() {
-        val jDate = PwDate(System.currentTimeMillis())
-        val intermediate = PwDate(jDate)
-        val cDate = PwDate(intermediate.byteArrayDate!!, 0)
-
-        Assert.assertTrue("jDate and intermediate not equal", jDate == intermediate)
-        Assert.assertTrue("jDate and cDate not equal", cDate == jDate)
-    }
-}

app/src/androidTest/java/com/kunzisoft/keepass/tests/StringDatabaseKDBUtilsTest.kt

@@ -1,38 +1,33 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.tests
 
-import org.junit.Assert.assertArrayEquals
+import com.kunzisoft.keepass.database.element.DateInstant
-
+import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.ULONG_MAX_VALUE
-import java.io.ByteArrayOutputStream
+import com.kunzisoft.keepass.stream.*
-import java.util.Calendar
-import java.util.Random
-
 import junit.framework.TestCase
+import org.junit.Assert.assertArrayEquals
+import java.io.ByteArrayOutputStream
+import java.util.*
 
-import com.kunzisoft.keepass.database.element.PwDate
+class StringDatabaseKDBUtilsTest : TestCase() {
-import com.kunzisoft.keepass.stream.LEDataInputStream
-import com.kunzisoft.keepass.stream.LEDataOutputStream
-import com.kunzisoft.keepass.utils.Types
-
-class TypesTest : TestCase() {
 
     fun testReadWriteLongZero() {
         testReadWriteLong(0.toByte())
@@ -56,15 +51,9 @@ class TypesTest : TestCase() {
 
     private fun testReadWriteLong(value: Byte) {
         val orig = ByteArray(8)
-        val dest = ByteArray(8)
+        setArray(orig, value, 8)
-
-        setArray(orig, value, 0, 8)
-
-        val one = LEDataInputStream.readLong(orig, 0)
-        LEDataOutputStream.writeLong(one, dest, 0)
-
-        assertArrayEquals(orig, dest)
 
+        assertArrayEquals(orig, longTo8Bytes(bytes64ToLong(orig)))
     }
 
     fun testReadWriteIntZero() {
@@ -81,24 +70,22 @@ class TypesTest : TestCase() {
 
     private fun testReadWriteInt(value: Byte) {
         val orig = ByteArray(4)
-        val dest = ByteArray(4)
 
         for (i in 0..3) {
             orig[i] = 0
         }
 
-        setArray(orig, value, 0, 4)
+        setArray(orig, value, 4)
 
-        val one = LEDataInputStream.readInt(orig, 0)
+        val one = bytes4ToInt(orig)
-
+        val dest = intTo4Bytes(one)
-        LEDataOutputStream.writeInt(one, dest, 0)
 
         assertArrayEquals(orig, dest)
 
     }
 
-    private fun setArray(buf: ByteArray, value: Byte, offset: Int, size: Int) {
+    private fun setArray(buf: ByteArray, value: Byte, size: Int) {
-        for (i in offset until offset + size) {
+        for (i in 0 until size) {
             buf[i] = value
         }
     }
@@ -109,11 +96,10 @@ class TypesTest : TestCase() {
         orig[0] = 0
         orig[1] = 1
 
-        val one = LEDataInputStream.readUShort(orig, 0)
+        val one = bytes2ToUShort(orig)
-        val dest = LEDataOutputStream.writeUShortBuf(one)
+        val dest = uShortTo2Bytes(one)
 
         assertArrayEquals(orig, dest)
-
     }
 
     fun testReadWriteShortMin() {
@@ -126,15 +112,12 @@ class TypesTest : TestCase() {
 
     private fun testReadWriteShort(value: Byte) {
         val orig = ByteArray(2)
-        val dest = ByteArray(2)
+        setArray(orig, value, 2)
 
-        setArray(orig, value, 0, 2)
+        val one = bytes2ToUShort(orig)
-
+        val dest = uShortTo2Bytes(one)
-        val one = LEDataInputStream.readUShort(orig, 0)
-        LEDataOutputStream.writeUShort(one, dest, 0)
 
         assertArrayEquals(orig, dest)
-
     }
 
     fun testReadWriteByteZero() {
@@ -150,16 +133,8 @@ class TypesTest : TestCase() {
     }
 
     private fun testReadWriteByte(value: Byte) {
-        val orig = ByteArray(1)
+        val dest: Byte = uIntToByte(byteToUInt(value))
-        val dest = ByteArray(1)
+        assert(value == dest)
-
-        setArray(orig, value, 0, 1)
-
-        val one = Types.readUByte(orig, 0)
-        Types.writeUByte(one, dest, 0)
-
-        assertArrayEquals(orig, dest)
-
     }
 
     fun testDate() {
@@ -168,27 +143,37 @@ class TypesTest : TestCase() {
         val expected = Calendar.getInstance()
         expected.set(2008, 1, 2, 3, 4, 5)
 
-        val buf = PwDate.writeTime(expected.time, cal)
         val actual = Calendar.getInstance()
-        actual.time = PwDate.readTime(buf, 0, cal)
+        dateTo5Bytes(expected.time, cal)?.let { buf ->
+            actual.time = bytes5ToDate(buf, cal).date
+        }
+
+        val jDate = DateInstant(System.currentTimeMillis())
+        val intermediate = DateInstant(jDate)
+        val cDate = bytes5ToDate(dateTo5Bytes(intermediate.date)!!)
 
         assertEquals("Year mismatch: ", 2008, actual.get(Calendar.YEAR))
         assertEquals("Month mismatch: ", 1, actual.get(Calendar.MONTH))
-        assertEquals("Day mismatch: ", 1, actual.get(Calendar.DAY_OF_MONTH))
+        assertEquals("Day mismatch: ", 2, actual.get(Calendar.DAY_OF_MONTH))
         assertEquals("Hour mismatch: ", 3, actual.get(Calendar.HOUR_OF_DAY))
         assertEquals("Minute mismatch: ", 4, actual.get(Calendar.MINUTE))
         assertEquals("Second mismatch: ", 5, actual.get(Calendar.SECOND))
+        assertTrue("jDate and intermediate not equal", jDate == intermediate)
+        assertTrue("jDate $jDate and cDate $cDate not equal", cDate == jDate)
     }
 
     fun testUUID() {
-        val rnd = Random()
         val bUUID = ByteArray(16)
-        rnd.nextBytes(bUUID)
+        Random().nextBytes(bUUID)
 
-        val uuid = Types.bytestoUUID(bUUID)
+        val uuid = bytes16ToUuid(bUUID)
-        val eUUID = Types.UUIDtoBytes(uuid)
+        val eUUID = uuidTo16Bytes(uuid)
+
+        val lUUID = bytes16ToUuid(bUUID)
+        val leUUID = uuidTo16Bytes(lUUID)
 
         assertArrayEquals("UUID match failed", bUUID, eUUID)
+        assertArrayEquals("UUID match failed", bUUID, leUUID)
     }
 
     @Throws(Exception::class)
@@ -199,8 +184,8 @@ class TypesTest : TestCase() {
         }
 
         val bos = ByteArrayOutputStream()
-        val leos = LEDataOutputStream(bos)
+        val leos = LittleEndianDataOutputStream(bos)
-        leos.writeLong(Types.ULONG_MAX_VALUE)
+        leos.writeLong(ULONG_MAX_VALUE)
         leos.close()
 
         val uLongMax = bos.toByteArray()

app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/AESTest.kt

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- * KeePass DX is free software: you can redistribute it and/or modify
+ * 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.
  *
- * KeePass DX is distributed in the hope that it will be useful,
+ * 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 KeePass DX. If not, see <http://www.gnu.org/licenses/>.
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.tests.crypto

app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/CipherTest.kt

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- * KeePass DX is free software: you can redistribute it and/or modify
+ * 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.
  *
- * KeePass DX is distributed in the hope that it will be useful,
+ * 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 KeePass DX. If not, see <http://www.gnu.org/licenses/>.
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.tests.crypto
@@ -39,9 +39,8 @@ import junit.framework.TestCase
 
 import com.kunzisoft.keepass.crypto.CipherFactory
 import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.stream.BetterCipherInputStream
-import com.kunzisoft.keepass.stream.LEDataInputStream
+import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
 
 class CipherTest : TestCase() {
     private val rand = Random()
@@ -93,7 +92,7 @@ class CipherTest : TestCase() {
 
         val bis = ByteArrayInputStream(secrettext)
         val cis = BetterCipherInputStream(bis, decrypt)
-        val lis = LEDataInputStream(cis)
+        val lis = LittleEndianDataInputStream(cis)
 
         val decrypttext = lis.readBytes(MESSAGE_LENGTH)
 

app/src/androidTest/java/com/kunzisoft/keepass/tests/crypto/FinalKeyTest.kt

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- * KeePass DX is free software: you can redistribute it and/or modify
+ * 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.
  *
- * KeePass DX is distributed in the hope that it will be useful,
+ * 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 KeePass DX. If not, see <http://www.gnu.org/licenses/>.
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.tests.crypto

app/src/androidTest/java/com/kunzisoft/keepass/tests/stream/HashedBlock.kt

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- * KeePass DX is free software: you can redistribute it and/or modify
+ * 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.
  *
- * KeePass DX is distributed in the hope that it will be useful,
+ * 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 KeePass DX. If not, see <http://www.gnu.org/licenses/>.
+ * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.tests.stream

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.tests.utils

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.kunzisoft.keepass"
     android:installLocation="auto">
     <supports-screens
@@ -9,8 +10,8 @@
       android:anyDensity="true" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:label="@string/app_name"
@@ -20,7 +21,10 @@
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup"
         android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
-        android:theme="@style/KeepassDXStyle.Night">
+        android:largeHeap="true"
+        android:resizeableActivity="true"
+        android:theme="@style/KeepassDXStyle.Night"
+        tools:targetApi="n">
         <!-- TODO backup API Key -->
         <meta-data
             android:name="com.google.android.backup.api_key"
@@ -149,6 +153,10 @@
             android:name="com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService"
             android:enabled="true"
             android:exported="false" />
+        <service
+            android:name=".notifications.AttachmentFileNotificationService"
+            android:enabled="true"
+            android:exported="false" />
         <service
             android:name="com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService"
             android:enabled="true"

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.kunzisoft.keepass.activities
 
@@ -22,6 +22,7 @@ import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
+import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
@@ -36,24 +37,33 @@ import androidx.appcompat.widget.Toolbar
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
-import com.kunzisoft.keepass.activities.lock.LockingHideActivity
+import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.EntryVersioned
+import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.PwNodeId
+import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME
+import com.kunzisoft.keepass.model.AttachmentState
+import com.kunzisoft.keepass.model.EntryAttachment
+import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService
 import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.settings.SettingsAutofillActivity
+import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.utils.createDocument
+import com.kunzisoft.keepass.utils.onCreateDocumentResult
 import com.kunzisoft.keepass.view.EntryContentsView
 import java.util.*
+import kotlin.collections.HashMap
 
-class EntryActivity : LockingHideActivity() {
+class EntryActivity : LockingActivity() {
 
     private var collapsingToolbarLayout: CollapsingToolbarLayout? = null
     private var titleIconView: ImageView? = null
@@ -64,11 +74,17 @@ class EntryActivity : LockingHideActivity() {
 
     private var mDatabase: Database? = null
 
-    private var mEntry: EntryVersioned? = null
+    private var mEntry: Entry? = null
+
     private var mIsHistory: Boolean = false
+    private var mEntryLastVersion: Entry? = null
+    private var mEntryHistoryPosition: Int = -1
 
     private var mShowPassword: Boolean = false
 
+    private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
+    private var mAttachmentsToDownload: HashMap<Int, EntryAttachment> = HashMap()
+
     private var clipboardHelper: ClipboardHelper? = null
     private var firstLaunchOfActivity: Boolean = false
 
@@ -108,6 +124,21 @@ class EntryActivity : LockingHideActivity() {
         // Init the clipboard helper
         clipboardHelper = ClipboardHelper(this)
         firstLaunchOfActivity = true
+
+        // Init attachment service binder manager
+        mAttachmentFileBinderManager = AttachmentFileBinderManager(this)
+
+        mProgressDialogThread?.onActionFinish = { actionTask, result ->
+            when (actionTask) {
+                ACTION_DATABASE_RESTORE_ENTRY_HISTORY,
+                ACTION_DATABASE_DELETE_ENTRY_HISTORY -> {
+                    // Close the current activity after an history action
+                    if (result.isSuccess)
+                        finish()
+                }
+            }
+            // TODO Visual error for entry history
+        }
     }
 
     override fun onResume() {
@@ -115,13 +146,15 @@ class EntryActivity : LockingHideActivity() {
 
         // Get Entry from UUID
         try {
-            val keyEntry: PwNodeId<UUID> = intent.getParcelableExtra(KEY_ENTRY)
+            val keyEntry: NodeId<UUID> = intent.getParcelableExtra(KEY_ENTRY)
             mEntry = mDatabase?.getEntryById(keyEntry)
+            mEntryLastVersion = mEntry
         } catch (e: ClassCastException) {
             Log.e(TAG, "Unable to retrieve the entry key")
         }
 
-        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, -1)
+        val historyPosition = intent.getIntExtra(KEY_ENTRY_HISTORY_POSITION, mEntryHistoryPosition)
+        mEntryHistoryPosition = historyPosition
         if (historyPosition >= 0) {
             mIsHistory = true
             mEntry = mEntry?.getHistory()?.get(historyPosition)
@@ -155,10 +188,25 @@ class EntryActivity : LockingHideActivity() {
             }
         }
 
+        mAttachmentFileBinderManager?.apply {
+            registerProgressTask()
+            onActionTaskListener = object : AttachmentFileNotificationService.ActionTaskListener {
+                override fun onAttachmentProgress(fileUri: Uri, attachment: EntryAttachment) {
+                    entryContentsView?.updateAttachmentDownloadProgress(attachment)
+                }
+            }
+        }
+
         firstLaunchOfActivity = false
     }
 
-    private fun fillEntryDataInContentsView(entry: EntryVersioned) {
+    override fun onPause() {
+        mAttachmentFileBinderManager?.unregisterProgressTask()
+
+        super.onPause()
+    }
+
+    private fun fillEntryDataInContentsView(entry: Entry) {
 
         val database = Database.getInstance()
         database.startManageEntry(entry)
@@ -191,7 +239,7 @@ class EntryActivity : LockingHideActivity() {
                             "\n\n" +
                             getString(R.string.clipboard_warning))
                     .create().apply {
-                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) {dialog, _ ->
+                        setButton(AlertDialog.BUTTON_POSITIVE, getText(R.string.enable)) { dialog, _ ->
                             PreferencesUtil.setAllowCopyPasswordAndProtectedFields(this@EntryActivity, true)
                             dialog.dismiss()
                             fillEntryDataInContentsView(entry)
@@ -265,6 +313,27 @@ class EntryActivity : LockingHideActivity() {
         }
         entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
 
+        // Manage attachments
+        val attachments = entry.getAttachments()
+        val showAttachmentsView = attachments.isNotEmpty()
+        entryContentsView?.showAttachments(showAttachmentsView)
+        if (showAttachmentsView) {
+            entryContentsView?.assignAttachments(attachments)
+            entryContentsView?.onAttachmentClick { attachmentItem, _ ->
+                when (attachmentItem.downloadState) {
+                    AttachmentState.NULL, AttachmentState.ERROR, AttachmentState.COMPLETE -> {
+                        createDocument(this, attachmentItem.name)?.let { requestCode ->
+                            mAttachmentsToDownload[requestCode] = attachmentItem
+                        }
+                    }
+                    else -> {
+                        // TODO Stop download
+                    }
+                }
+            }
+        }
+        entryContentsView?.refreshAttachments()
+
         // Assign dates
         entryContentsView?.assignCreationDate(entry.creationTime)
         entryContentsView?.assignModificationDate(entry.lastModificationTime)
@@ -276,9 +345,6 @@ class EntryActivity : LockingHideActivity() {
             entryContentsView?.assignExpiresDate(getString(R.string.never))
         }
 
-        // Assign special data
-        entryContentsView?.assignUUID(entry.nodeId.id)
-
         // Manage history
         historyView?.visibility = if (mIsHistory) View.VISIBLE else View.GONE
         if (mIsHistory) {
@@ -287,21 +353,26 @@ class EntryActivity : LockingHideActivity() {
             taColorAccent.recycle()
         }
         val entryHistory = entry.getHistory()
-        // isMainEntry = not an history
+        // TODO isMainEntry = not an history
         val showHistoryView = entryHistory.isNotEmpty()
         entryContentsView?.showHistory(showHistoryView)
         if (showHistoryView) {
             entryContentsView?.assignHistory(entryHistory)
             entryContentsView?.onHistoryClick { historyItem, position ->
-                launch(this, historyItem, true, position)
+                launch(this, historyItem, mReadOnly, position)
             }
         }
+        entryContentsView?.refreshHistory()
+
+        // Assign special data
+        entryContentsView?.assignUUID(entry.nodeId.id)
 
         database.stopManageEntry(entry)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+
         when (requestCode) {
             EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE ->
                 // Not directly get the entry from intent data but from database
@@ -309,6 +380,15 @@ class EntryActivity : LockingHideActivity() {
                     fillEntryDataInContentsView(it)
                 }
         }
+
+        onCreateDocumentResult(requestCode, resultCode, data) { createdFileUri ->
+            if (createdFileUri != null) {
+                mAttachmentsToDownload[requestCode]?.let { attachmentToDownload ->
+                    mAttachmentFileBinderManager
+                            ?.startDownloadAttachment(createdFileUri, attachmentToDownload)
+                }
+            }
+        }
     }
 
     private fun changeShowPasswordIcon(togglePassword: MenuItem?) {
@@ -327,9 +407,12 @@ class EntryActivity : LockingHideActivity() {
         val inflater = menuInflater
         MenuUtil.contributionMenuInflater(inflater, menu)
         inflater.inflate(R.menu.entry, menu)
-        inflater.inflate(R.menu.database_lock, menu)
+        inflater.inflate(R.menu.database, menu)
-
+        if (mIsHistory && !mReadOnly) {
-        if (mReadOnly) {
+            inflater.inflate(R.menu.entry_history, menu)
+        }
+        if (mIsHistory || mReadOnly) {
+            menu.findItem(R.id.menu_save_database)?.isVisible = false
             menu.findItem(R.id.menu_edit)?.isVisible = false
         }
 
@@ -398,21 +481,18 @@ class EntryActivity : LockingHideActivity() {
                 MenuUtil.onContributionItemSelected(this)
                 return true
             }
-
             R.id.menu_toggle_pass -> {
                 mShowPassword = !mShowPassword
                 changeShowPasswordIcon(item)
                 entryContentsView?.setHiddenPasswordStyle(!mShowPassword)
                 return true
             }
-
             R.id.menu_edit -> {
                 mEntry?.let {
                     EntryEditActivity.launch(this@EntryActivity, it)
                 }
                 return true
             }
-
             R.id.menu_goto_url -> {
                 var url: String = mEntry?.url ?: ""
 
@@ -422,18 +502,33 @@ class EntryActivity : LockingHideActivity() {
                 }
 
                 UriUtil.gotoUrl(this, url)
-
                 return true
             }
-
+            R.id.menu_restore_entry_history -> {
+                mEntryLastVersion?.let { mainEntry ->
+                    mProgressDialogThread?.startDatabaseRestoreEntryHistory(
+                            mainEntry,
+                            mEntryHistoryPosition,
+                            !mReadOnly && mAutoSaveEnable)
+                }
+            }
+            R.id.menu_delete_entry_history -> {
+                mEntryLastVersion?.let { mainEntry ->
+                    mProgressDialogThread?.startDatabaseDeleteEntryHistory(
+                            mainEntry,
+                            mEntryHistoryPosition,
+                            !mReadOnly && mAutoSaveEnable)
+                }
+            }
             R.id.menu_lock -> {
                 lockAndExit()
                 return true
             }
-
+            R.id.menu_save_database -> {
+                mProgressDialogThread?.startDatabaseSave(!mReadOnly)
+            }
             android.R.id.home -> finish() // close this activity and return to preview activity (if there is any)
         }
-
         return super.onOptionsItemSelected(item)
     }
 
@@ -455,7 +550,7 @@ class EntryActivity : LockingHideActivity() {
         const val KEY_ENTRY = "KEY_ENTRY"
         const val KEY_ENTRY_HISTORY_POSITION = "KEY_ENTRY_HISTORY_POSITION"
 
-        fun launch(activity: Activity, entry: EntryVersioned, readOnly: Boolean, historyPosition: Int? = null) {
+        fun launch(activity: Activity, entry: Entry, readOnly: Boolean, historyPosition: Int? = null) {
             if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                 val intent = Intent(activity, EntryActivity::class.java)
                 intent.putExtra(KEY_ENTRY, entry.nodeId)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.kunzisoft.keepass.activities
 
@@ -28,13 +28,16 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ScrollView
 import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.SetOTPDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
-import com.kunzisoft.keepass.activities.lock.LockingHideActivity
+import com.kunzisoft.keepass.activities.lock.LockingActivity
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
 import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK
@@ -46,9 +49,10 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.view.EntryEditContentsView
+import com.kunzisoft.keepass.view.asError
 import java.util.*
 
-class EntryEditActivity : LockingHideActivity(),
+class EntryEditActivity : LockingActivity(),
         IconPickerDialogFragment.IconPickerListener,
         GeneratePasswordDialogFragment.GeneratePasswordListener,
         SetOTPDialogFragment.CreateOtpListener {
@@ -56,20 +60,18 @@ class EntryEditActivity : LockingHideActivity(),
     private var mDatabase: Database? = null
 
     // Refs of an entry and group in database, are not modifiable
-    private var mEntry: EntryVersioned? = null
+    private var mEntry: Entry? = null
-    private var mParent: GroupVersioned? = null
+    private var mParent: Group? = null
     // New or copy of mEntry in the database to be modifiable
-    private var mNewEntry: EntryVersioned? = null
+    private var mNewEntry: Entry? = null
     private var mIsNew: Boolean = false
 
     // Views
+    private var coordinatorLayout: CoordinatorLayout? = null
     private var scrollView: ScrollView? = null
     private var entryEditContentsView: EntryEditContentsView? = null
     private var saveView: View? = null
 
-    // Dialog thread
-    private var progressDialogThread: ProgressDialogThread? = null
-
     // Education
     private var entryEditActivityEducation: EntryEditActivityEducation? = null
 
@@ -83,6 +85,8 @@ class EntryEditActivity : LockingHideActivity(),
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
+        coordinatorLayout = findViewById(R.id.entry_edit_coordinator_layout)
+
         scrollView = findViewById(R.id.entry_edit_scroll)
         scrollView?.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
 
@@ -98,7 +102,7 @@ class EntryEditActivity : LockingHideActivity(),
         mDatabase = Database.getInstance()
 
         // Entry is retrieve, it's an entry to update
-        intent.getParcelableExtra<PwNodeId<UUID>>(KEY_ENTRY)?.let {
+        intent.getParcelableExtra<NodeId<UUID>>(KEY_ENTRY)?.let {
             mIsNew = false
             // Create an Entry copy to modify from the database entry
             mEntry = mDatabase?.getEntryById(it)
@@ -118,7 +122,7 @@ class EntryEditActivity : LockingHideActivity(),
                     || !savedInstanceState.containsKey(KEY_NEW_ENTRY)) {
                 mEntry?.let { entry ->
                     // Create a copy to modify
-                    mNewEntry = EntryVersioned(entry).also { newEntry ->
+                    mNewEntry = Entry(entry).also { newEntry ->
                         // WARNING Remove the parent to keep memory with parcelable
                         newEntry.removeParent()
                     }
@@ -127,7 +131,7 @@ class EntryEditActivity : LockingHideActivity(),
         }
 
         // Parent is retrieve, it's a new entry to create
-        intent.getParcelableExtra<PwNodeId<*>>(KEY_PARENT)?.let {
+        intent.getParcelableExtra<NodeId<*>>(KEY_PARENT)?.let {
             mIsNew = true
             // Create an empty new entry
             if (savedInstanceState == null
@@ -176,7 +180,7 @@ class EntryEditActivity : LockingHideActivity(),
         entryEditActivityEducation = EntryEditActivityEducation(this)
 
         // Create progress dialog
-        progressDialogThread = ProgressDialogThread(this) { actionTask, result ->
+        mProgressDialogThread?.onActionFinish = { actionTask, result ->
             when (actionTask) {
                 ACTION_DATABASE_CREATE_ENTRY_TASK,
                 ACTION_DATABASE_UPDATE_ENTRY_TASK -> {
@@ -184,10 +188,19 @@ class EntryEditActivity : LockingHideActivity(),
                         finish()
                 }
             }
+
+            // Show error
+            if (!result.isSuccess) {
+                result.message?.let { resultMessage ->
+                    Snackbar.make(coordinatorLayout!!,
+                            resultMessage,
+                            Snackbar.LENGTH_LONG).asError().show()
+                }
+            }
         }
     }
 
-    private fun populateViewsWithEntry(newEntry: EntryVersioned) {
+    private fun populateViewsWithEntry(newEntry: Entry) {
         // Don't start the field reference manager, we want to see the raw ref
         mDatabase?.stopManageEntry(newEntry)
 
@@ -209,7 +222,7 @@ class EntryEditActivity : LockingHideActivity(),
         }
     }
 
-    private fun populateEntryWithViews(newEntry: EntryVersioned) {
+    private fun populateEntryWithViews(newEntry: Entry) {
 
         mDatabase?.startManageEntry(newEntry)
 
@@ -231,7 +244,7 @@ class EntryEditActivity : LockingHideActivity(),
         mDatabase?.stopManageEntry(newEntry)
     }
 
-    private fun temporarilySaveAndShowSelectedIcon(icon: PwIcon) {
+    private fun temporarilySaveAndShowSelectedIcon(icon: IconImage) {
         mNewEntry?.icon = icon
         mDatabase?.drawFactory?.let { iconDrawFactory ->
             entryEditContentsView?.setIcon(iconDrawFactory, icon)
@@ -265,26 +278,26 @@ class EntryEditActivity : LockingHideActivity(),
                 // WARNING Add the parent previously deleted
                 newEntry.parent = mEntry?.parent
                 // Build info
-                newEntry.lastAccessTime = PwDate()
+                newEntry.lastAccessTime = DateInstant()
-                newEntry.lastModificationTime = PwDate()
+                newEntry.lastModificationTime = DateInstant()
 
                 populateEntryWithViews(newEntry)
 
                 // Open a progress dialog and save entry
                 if (mIsNew) {
                     mParent?.let { parent ->
-                        progressDialogThread?.startDatabaseCreateEntry(
+                        mProgressDialogThread?.startDatabaseCreateEntry(
                                 newEntry,
                                 parent,
-                                !mReadOnly
+                                !mReadOnly && mAutoSaveEnable
                         )
                     }
                 } else {
                     mEntry?.let { oldEntry ->
-                        progressDialogThread?.startDatabaseUpdateEntry(
+                        mProgressDialogThread?.startDatabaseUpdateEntry(
                                 oldEntry,
                                 newEntry,
-                                !mReadOnly
+                                !mReadOnly && mAutoSaveEnable
                         )
                     }
                 }
@@ -292,25 +305,16 @@ class EntryEditActivity : LockingHideActivity(),
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        progressDialogThread?.registerProgressTask()
-    }
-
-    override fun onPause() {
-        progressDialogThread?.unregisterProgressTask()
-
-        super.onPause()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
 
         val inflater = menuInflater
-        inflater.inflate(R.menu.database_lock, menu)
+        inflater.inflate(R.menu.database, menu)
+        // Save database not needed here
+        menu.findItem(R.id.menu_save_database)?.isVisible = false
         MenuUtil.contributionMenuInflater(inflater, menu)
-        inflater.inflate(R.menu.edit_entry, menu)
+        if (mDatabase?.allowOTP == true)
+            inflater.inflate(R.menu.entry_otp, menu)
 
         entryEditActivityEducation?.let {
             Handler().post { performedNextEducation(it) }
@@ -351,12 +355,13 @@ class EntryEditActivity : LockingHideActivity(),
                 lockAndExit()
                 return true
             }
-
+            R.id.menu_save_database -> {
+                mProgressDialogThread?.startDatabaseSave(!mReadOnly)
+            }
             R.id.menu_contribute -> {
                 MenuUtil.onContributionItemSelected(this)
                 return true
             }
-
             R.id.menu_add_otp -> {
                 // Retrieve the current otpElement if exists
                 // and open the dialog to set up the OTP
@@ -364,7 +369,6 @@ class EntryEditActivity : LockingHideActivity(),
                         .show(supportFragmentManager, "addOTPDialog")
                 return true
             }
-
             android.R.id.home -> finish()
         }
 
@@ -452,7 +456,7 @@ class EntryEditActivity : LockingHideActivity(),
          * @param activity from activity
          * @param pwEntry Entry to update
          */
-        fun launch(activity: Activity, pwEntry: EntryVersioned) {
+        fun launch(activity: Activity, pwEntry: Entry) {
             if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                 val intent = Intent(activity, EntryEditActivity::class.java)
                 intent.putExtra(KEY_ENTRY, pwEntry.nodeId)
@@ -466,7 +470,7 @@ class EntryEditActivity : LockingHideActivity(),
          * @param activity from activity
          * @param pwGroup Group who will contains new entry
          */
-        fun launch(activity: Activity, pwGroup: GroupVersioned) {
+        fun launch(activity: Activity, pwGroup: Group) {
             if (TimeoutHelper.checkTimeAndLockIfTimeout(activity)) {
                 val intent = Intent(activity, EntryEditActivity::class.java)
                 intent.putExtra(KEY_PARENT, pwGroup.nodeId)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities
@@ -42,7 +42,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.BrowserDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.OpenFileHelper
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
@@ -53,8 +52,7 @@ import com.kunzisoft.keepass.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
-import com.kunzisoft.keepass.utils.MenuUtil
+import com.kunzisoft.keepass.utils.*
-import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.asError
 import kotlinx.android.synthetic.main.activity_file_selection.*
 import java.io.FileNotFoundException
@@ -76,7 +74,7 @@ class FileDatabaseSelectActivity : StylishActivity(),
 
     private var mOpenFileHelper: OpenFileHelper? = null
 
-    private var progressDialogThread: ProgressDialogThread? = null
+    private var mProgressDialogThread: ProgressDialogThread? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -92,17 +90,14 @@ class FileDatabaseSelectActivity : StylishActivity(),
 
         // Create button
         createButtonView = findViewById(R.id.create_database_button)
-        if (Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+        if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
-                    addCategory(Intent.CATEGORY_OPENABLE)
-                    type = "application/x-keepass"
-                }.resolveActivity(packageManager) == null) {
-            // No Activity found that can handle this intent.
-            createButtonView?.visibility = View.GONE
-        }
-        else{
             // 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() }
 
@@ -163,13 +158,15 @@ class FileDatabaseSelectActivity : StylishActivity(),
         }
 
         // Attach the dialog thread to this activity
-        progressDialogThread = ProgressDialogThread(this) { actionTask, _ ->
+        mProgressDialogThread = ProgressDialogThread(this).apply {
-            when (actionTask) {
+            onActionFinish = { actionTask, _ ->
-                ACTION_DATABASE_CREATE_TASK -> {
+                when (actionTask) {
-                    // TODO Check
+                    ACTION_DATABASE_CREATE_TASK -> {
-                    // mAdapterDatabaseHistory?.notifyDataSetChanged()
+                        // TODO Check
-                    // updateFileListVisibility()
+                        // mAdapterDatabaseHistory?.notifyDataSetChanged()
-                    GroupActivity.launch(this)
+                        // updateFileListVisibility()
+                        GroupActivity.launch(this@FileDatabaseSelectActivity)
+                    }
                 }
             }
         }
@@ -180,18 +177,8 @@ class FileDatabaseSelectActivity : StylishActivity(),
      */
     @SuppressLint("InlinedApi")
     private fun createNewFile() {
-        try {
+        createDocument(this, getString(R.string.database_file_name_default) +
-            startActivityForResult(Intent(
+                getString(R.string.database_file_extension_default), "application/x-keepass")
-                    Intent.ACTION_CREATE_DOCUMENT).apply {
-                        addCategory(Intent.CATEGORY_OPENABLE)
-                        type = "application/x-keepass"
-                        putExtra(Intent.EXTRA_TITLE, getString(R.string.database_file_name_default) +
-                                getString(R.string.database_file_extension_default))
-                    },
-                    CREATE_FILE_REQUEST_CODE)
-        } catch (e: Exception) {
-            BrowserDialogFragment().show(supportFragmentManager, "browserDialog")
-        }
     }
 
     private fun fileNoFoundAction(e: FileNotFoundException) {
@@ -296,12 +283,12 @@ class FileDatabaseSelectActivity : StylishActivity(),
         }
 
         // Register progress task
-        progressDialogThread?.registerProgressTask()
+        mProgressDialogThread?.registerProgressTask()
     }
 
     override fun onPause() {
         // Unregister progress task
-        progressDialogThread?.unregisterProgressTask()
+        mProgressDialogThread?.unregisterProgressTask()
 
         super.onPause()
     }
@@ -329,7 +316,7 @@ class FileDatabaseSelectActivity : StylishActivity(),
             mDatabaseFileUri?.let { databaseUri ->
 
                 // Create the new database
-                progressDialogThread?.startDatabaseCreate(
+                mProgressDialogThread?.startDatabaseCreate(
                         databaseUri,
                         masterPasswordChecked,
                         masterPassword,
@@ -365,14 +352,14 @@ class FileDatabaseSelectActivity : StylishActivity(),
         }
 
         // Retrieve the created URI from the file manager
-        if (requestCode == CREATE_FILE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+        onCreateDocumentResult(requestCode, resultCode, data) { databaseFileCreatedUri ->
-            mDatabaseFileUri = data?.data
+            mDatabaseFileUri = databaseFileCreatedUri
             if (mDatabaseFileUri != null) {
                 AssignMasterKeyDialogFragment.getInstance(true)
                         .show(supportFragmentManager, "passwordDialog")
             }
             // else {
-                // TODO Show error
+            // TODO Show error
             // }
         }
     }
@@ -425,8 +412,6 @@ class FileDatabaseSelectActivity : StylishActivity(),
         private const val EXTRA_STAY = "EXTRA_STAY"
         private const val EXTRA_DATABASE_URI = "EXTRA_DATABASE_URI"
 
-        private const val CREATE_FILE_REQUEST_CODE = 3853
-
         /*
          * -------------------------
          * No Standard Launch, pass by PasswordActivity

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.kunzisoft.keepass.activities
 
@@ -42,18 +42,23 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
-import com.kunzisoft.keepass.activities.dialogs.ReadOnlyDialog
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter
 import com.kunzisoft.keepass.autofill.AutofillHelper
-import com.kunzisoft.keepass.database.SortNodeEnum
+import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.Group
+import com.kunzisoft.keepass.database.element.SortNodeEnum
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.education.GroupActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME
@@ -77,6 +82,7 @@ class GroupActivity : LockingActivity(),
         IconPickerDialogFragment.IconPickerListener,
         ListNodesFragment.NodeClickListener,
         ListNodesFragment.NodesActionMenuListener,
+        DeleteNodesDialogFragment.DeleteNodeListener,
         ListNodesFragment.OnScrollListener,
         SortDialogFragment.SortSelectionListener {
 
@@ -96,14 +102,10 @@ class GroupActivity : LockingActivity(),
     private var mListNodesFragment: ListNodesFragment? = null
     private var mCurrentGroupIsASearch: Boolean = false
 
-    private var progressDialogThread: ProgressDialogThread? = null
-
     // Nodes
-    private var mRootGroup: GroupVersioned? = null
+    private var mRootGroup: Group? = null
-    private var mCurrentGroup: GroupVersioned? = null
+    private var mCurrentGroup: Group? = null
-    private var mOldGroupToUpdate: GroupVersioned? = null
+    private var mOldGroupToUpdate: Group? = null
-    // TODO private var mNodeToCopy: NodeVersioned? = null
-    // TODO private var mNodeToMove: NodeVersioned? = null
 
     private var mSearchSuggestionAdapter: SearchEntryCursorAdapter? = null
 
@@ -134,14 +136,6 @@ class GroupActivity : LockingActivity(),
         toolbar?.title = ""
         setSupportActionBar(toolbar)
 
-        /*
-        toolbarAction?.setNavigationOnClickListener {
-            toolbarAction?.collapse()
-            mNodeToCopy = null
-            mNodeToMove = null
-        }
-        */
-
         // Focus view to reinitialize timeout
         resetAppTimeoutWhenViewFocusedOrChanged(addNodeButtonView)
 
@@ -207,13 +201,13 @@ class GroupActivity : LockingActivity(),
             mSearchSuggestionAdapter = SearchEntryCursorAdapter(this, database)
 
             // Init dialog thread
-            progressDialogThread = ProgressDialogThread(this) { actionTask, result ->
+            mProgressDialogThread?.onActionFinish = { actionTask, result ->
 
-                var oldNodes: List<NodeVersioned> = ArrayList()
+                var oldNodes: List<Node> = ArrayList()
                 result.data?.getBundle(OLD_NODES_KEY)?.let { oldNodesBundle ->
                     oldNodes = getListNodesFromBundle(database, oldNodesBundle)
                 }
-                var newNodes: List<NodeVersioned> = ArrayList()
+                var newNodes: List<Node> = ArrayList()
                 result.data?.getBundle(NEW_NODES_KEY)?.let { newNodesBundle ->
                     newNodes = getListNodesFromBundle(database, newNodesBundle)
                 }
@@ -234,24 +228,23 @@ class GroupActivity : LockingActivity(),
                     ACTION_DATABASE_DELETE_NODES_TASK -> {
                         if (result.isSuccess) {
 
-                            // Rebuild all the list the avoid bug when delete node from db sort
+                            // Rebuild all the list to avoid bug when delete node from sort
-                            if (PreferencesUtil.getListSort(this@GroupActivity) == SortNodeEnum.DB) {
+                            mListNodesFragment?.rebuildList()
-                                mListNodesFragment?.rebuildList()
-                            } else {
-                                // Use the old Nodes / entries unchanged with the old parent
-                                mListNodesFragment?.removeNodes(oldNodes)
-                            }
 
                             // Add trash in views list if it doesn't exists
                             if (database.isRecycleBinEnabled) {
                                 val recycleBin = database.recycleBin
-                                if (mCurrentGroup != null && recycleBin != null
+                                val currentGroup = mCurrentGroup
-                                        && mCurrentGroup!!.parent == null
+                                if (currentGroup != null && recycleBin != null
-                                        && mCurrentGroup != recycleBin) {
+                                        && currentGroup != recycleBin) {
-                                    if (mListNodesFragment?.contains(recycleBin) == true)
+                                    // Recycle bin already here, simply update it
+                                    if (mListNodesFragment?.contains(recycleBin) == true) {
                                         mListNodesFragment?.updateNode(recycleBin)
-                                    else
+                                    }
+                                    // Recycle bin not here, verify if parents are similar to add it
+                                    else if (currentGroup == recycleBin.parent) {
                                         mListNodesFragment?.addNode(recycleBin)
+                                    }
                                 }
                             }
                         }
@@ -259,9 +252,11 @@ class GroupActivity : LockingActivity(),
                 }
 
                 if (!result.isSuccess) {
-                    result.exception?.errorId?.let { errorId ->
+                    coordinatorLayout?.let { coordinatorLayout ->
-                        coordinatorLayout?.let { coordinatorLayout ->
+                        result.exception?.errorId?.let { errorId ->
                             Snackbar.make(coordinatorLayout, errorId, Snackbar.LENGTH_LONG).asError().show()
+                        } ?: result.message?.let { message ->
+                            Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG).asError().show()
                         }
                     }
                 }
@@ -291,7 +286,7 @@ class GroupActivity : LockingActivity(),
         }
     }
 
-    private fun openSearchGroup(group: GroupVersioned?) {
+    private fun openSearchGroup(group: Group?) {
         // Delete the previous search fragment
         val searchFragment = supportFragmentManager.findFragmentByTag(SEARCH_FRAGMENT_TAG)
         if (searchFragment != null) {
@@ -303,11 +298,11 @@ class GroupActivity : LockingActivity(),
         openGroup(group, true)
     }
 
-    private fun openChildGroup(group: GroupVersioned) {
+    private fun openChildGroup(group: Group) {
         openGroup(group, false)
     }
 
-    private fun openGroup(group: GroupVersioned?, isASearch: Boolean) {
+    private fun openGroup(group: Group?, isASearch: Boolean) {
         // Check TimeoutHelper
         TimeoutHelper.checkTimeAndLockIfTimeoutOrResetTimeout(this) {
             // Open a group in a new fragment
@@ -347,7 +342,7 @@ class GroupActivity : LockingActivity(),
         super.onSaveInstanceState(outState)
     }
 
-    private fun retrieveCurrentGroup(intent: Intent, savedInstanceState: Bundle?): GroupVersioned? {
+    private fun retrieveCurrentGroup(intent: Intent, savedInstanceState: Bundle?): Group? {
 
         // Force read only if the database is like that
         mReadOnly = mDatabase?.isReadOnly == true || mReadOnly
@@ -358,7 +353,7 @@ class GroupActivity : LockingActivity(),
         }
         // else a real group
         else {
-            var pwGroupId: PwNodeId<*>? = null
+            var pwGroupId: NodeId<*>? = null
             if (savedInstanceState != null && savedInstanceState.containsKey(GROUP_ID_KEY)) {
                 pwGroupId = savedInstanceState.getParcelable(GROUP_ID_KEY)
             } else {
@@ -367,7 +362,7 @@ class GroupActivity : LockingActivity(),
             }
 
             Log.w(TAG, "Creating tree view")
-            val currentGroup: GroupVersioned?
+            val currentGroup: Group?
             currentGroup = if (pwGroupId == null) {
                 mRootGroup
             } else {
@@ -440,12 +435,8 @@ class GroupActivity : LockingActivity(),
             val addGroupEnabled = !mReadOnly && !mCurrentGroupIsASearch
             var addEntryEnabled = !mReadOnly && !mCurrentGroupIsASearch
             mCurrentGroup?.let {
-                val isRoot = it == mRootGroup
                 if (!it.allowAddEntryIfIsRoot())
-                    addEntryEnabled = !isRoot && addEntryEnabled
+                    addEntryEnabled = it != mRootGroup && addEntryEnabled
-                if (isRoot) {
-                    showWarnings()
-                }
             }
             enableAddGroup(addGroupEnabled)
             enableAddEntry(addEntryEnabled)
@@ -458,7 +449,7 @@ class GroupActivity : LockingActivity(),
     private fun refreshNumberOfChildren() {
         numberChildrenView?.apply {
             if (PreferencesUtil.showNumberEntries(context)) {
-                text = mCurrentGroup?.getChildEntries(true)?.size?.toString() ?: ""
+                text = mCurrentGroup?.getChildEntries(*Group.ChildFilter.getDefaults(context))?.size?.toString() ?: ""
                 visibility = View.VISIBLE
             } else {
                 visibility = View.GONE
@@ -470,16 +461,16 @@ class GroupActivity : LockingActivity(),
         addNodeButtonView?.hideButtonOnScrollListener(dy)
     }
 
-    override fun onNodeClick(node: NodeVersioned) {
+    override fun onNodeClick(node: Node) {
         when (node.type) {
             Type.GROUP -> try {
-                openChildGroup(node as GroupVersioned)
+                openChildGroup(node as Group)
             } catch (e: ClassCastException) {
                 Log.e(TAG, "Node can't be cast in Group")
             }
 
             Type.ENTRY -> try {
-                val entryVersioned = node as EntryVersioned
+                val entryVersioned = node as Entry
                 EntrySelectionHelper.doEntrySelectionAction(intent,
                         {
                             EntryActivity.launch(this@GroupActivity, entryVersioned, mReadOnly)
@@ -517,7 +508,7 @@ class GroupActivity : LockingActivity(),
         actionNodeMode = null
     }
 
-    override fun onNodeSelected(nodes: List<NodeVersioned>): Boolean {
+    override fun onNodeSelected(nodes: List<Node>): Boolean {
         if (nodes.isNotEmpty()) {
             if (actionNodeMode == null || toolbarAction?.getSupportActionModeCallback() == null) {
                 mListNodesFragment?.actionNodesCallback(nodes, this)?.let {
@@ -532,34 +523,34 @@ class GroupActivity : LockingActivity(),
         return true
     }
 
-    override fun onOpenMenuClick(node: NodeVersioned): Boolean {
+    override fun onOpenMenuClick(node: Node): Boolean {
         finishNodeAction()
         onNodeClick(node)
         return true
     }
 
-    override fun onEditMenuClick(node: NodeVersioned): Boolean {
+    override fun onEditMenuClick(node: Node): Boolean {
         finishNodeAction()
         when (node.type) {
             Type.GROUP -> {
-                mOldGroupToUpdate = node as GroupVersioned
+                mOldGroupToUpdate = node as Group
                 GroupEditDialogFragment.build(mOldGroupToUpdate!!)
                         .show(supportFragmentManager,
                                 GroupEditDialogFragment.TAG_CREATE_GROUP)
             }
-            Type.ENTRY -> EntryEditActivity.launch(this@GroupActivity, node as EntryVersioned)
+            Type.ENTRY -> EntryEditActivity.launch(this@GroupActivity, node as Entry)
         }
         return true
     }
 
-    override fun onCopyMenuClick(nodes: List<NodeVersioned>): Boolean {
+    override fun onCopyMenuClick(nodes: List<Node>): Boolean {
         actionNodeMode?.invalidate()
 
         // Nothing here fragment calls onPasteMenuClick internally
         return true
     }
 
-    override fun onMoveMenuClick(nodes: List<NodeVersioned>): Boolean {
+    override fun onMoveMenuClick(nodes: List<Node>): Boolean {
         actionNodeMode?.invalidate()
 
         // Nothing here fragment calls onPasteMenuClick internally
@@ -567,56 +558,88 @@ class GroupActivity : LockingActivity(),
     }
 
     override fun onPasteMenuClick(pasteMode: ListNodesFragment.PasteMode?,
-                                  nodes: List<NodeVersioned>): Boolean {
+                                  nodes: List<Node>): Boolean {
-        when (pasteMode) {
+        // Move or copy only if allowed (in root if allowed)
-            ListNodesFragment.PasteMode.PASTE_FROM_COPY -> {
+        if (mCurrentGroup != mDatabase?.rootGroup
-                // Copy
+                || mDatabase?.rootCanContainsEntry() == true) {
-                mCurrentGroup?.let { newParent ->
+
-                    progressDialogThread?.startDatabaseCopyNodes(
+            when (pasteMode) {
-                            nodes,
+                ListNodesFragment.PasteMode.PASTE_FROM_COPY -> {
-                            newParent,
+                    // Copy
-                            !mReadOnly
+                    mCurrentGroup?.let { newParent ->
-                    )
+                        mProgressDialogThread?.startDatabaseCopyNodes(
+                                nodes,
+                                newParent,
+                                !mReadOnly && mAutoSaveEnable
+                        )
+                    }
+                }
+                ListNodesFragment.PasteMode.PASTE_FROM_MOVE -> {
+                    // Move
+                    mCurrentGroup?.let { newParent ->
+                        mProgressDialogThread?.startDatabaseMoveNodes(
+                                nodes,
+                                newParent,
+                                !mReadOnly && mAutoSaveEnable
+                        )
+                    }
+                }
+                else -> {
                 }
             }
-            ListNodesFragment.PasteMode.PASTE_FROM_MOVE -> {
+        } else {
-                // Move
+            coordinatorLayout?.let { coordinatorLayout ->
-                mCurrentGroup?.let { newParent ->
+                Snackbar.make(coordinatorLayout,
-                    progressDialogThread?.startDatabaseMoveNodes(
+                        R.string.error_copy_entry_here,
-                            nodes,
+                        Snackbar.LENGTH_LONG).asError().show()
-                            newParent,
-                            !mReadOnly
-                    )
-                }
             }
-            else -> {}
         }
         finishNodeAction()
         return true
     }
 
-    override fun onDeleteMenuClick(nodes: List<NodeVersioned>): Boolean {
+    override fun onDeleteMenuClick(nodes: List<Node>): Boolean {
-        progressDialogThread?.startDatabaseDeleteNodes(
+        val database = mDatabase
-                nodes,
+
-                !mReadOnly
+        // If recycle bin enabled, ensure it exists
-        )
+        if (database != null && database.isRecycleBinEnabled) {
+            database.ensureRecycleBinExists(resources)
+        }
+
+        // If recycle bin enabled and not in recycle bin, move in recycle bin
+        if (database != null
+                && database.isRecycleBinEnabled
+                && database.recycleBin != mCurrentGroup) {
+            mProgressDialogThread?.startDatabaseDeleteNodes(
+                    nodes,
+                    !mReadOnly && mAutoSaveEnable
+            )
+        }
+        // else open the dialog to confirm deletion
+        else {
+            DeleteNodesDialogFragment.getInstance(nodes)
+                    .show(supportFragmentManager, "deleteNodesDialogFragment")
+        }
         finishNodeAction()
         return true
     }
 
+    override fun permanentlyDeleteNodes(nodes: List<Node>) {
+        mProgressDialogThread?.startDatabaseDeleteNodes(
+                nodes,
+                !mReadOnly && mAutoSaveEnable
+        )
+    }
+
     override fun onResume() {
         super.onResume()
         // Refresh the elements
         assignGroupViewElements()
         // Refresh suggestions to change preferences
         mSearchSuggestionAdapter?.reInit(this)
-
-        progressDialogThread?.registerProgressTask()
     }
 
     override fun onPause() {
-        progressDialogThread?.unregisterProgressTask()
-
         super.onPause()
 
         finishNodeAction()
@@ -626,12 +649,22 @@ class GroupActivity : LockingActivity(),
 
         val inflater = menuInflater
         inflater.inflate(R.menu.search, menu)
-        inflater.inflate(R.menu.database_lock, menu)
+        inflater.inflate(R.menu.database, menu)
+        if (mReadOnly) {
+            menu.findItem(R.id.menu_save_database)?.isVisible = false
+        }
         if (!mSelectionMode) {
             inflater.inflate(R.menu.default_menu, menu)
             MenuUtil.contributionMenuInflater(inflater, menu)
         }
 
+        // Menu for recycle bin
+        if (!mReadOnly
+                && mDatabase?.isRecycleBinEnabled == true
+                && mDatabase?.recycleBin == mCurrentGroup) {
+            inflater.inflate(R.menu.recycle_bin, menu)
+        }
+
         // Get the SearchView and set the searchable configuration
         val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
 
@@ -740,6 +773,17 @@ class GroupActivity : LockingActivity(),
                 lockAndExit()
                 return true
             }
+            R.id.menu_save_database -> {
+                mProgressDialogThread?.startDatabaseSave(!mReadOnly)
+                return true
+            }
+            R.id.menu_empty_recycle_bin -> {
+                mCurrentGroup?.getChildren()?.let { listChildren ->
+                    // Automatically delete all elements
+                    onDeleteMenuClick(listChildren)
+                }
+                return true
+            }
             else -> {
                 // Check the time lock before launching settings
                 MenuUtil.onDefaultMenuOptionsItemSelected(this, item, mReadOnly, true)
@@ -750,7 +794,7 @@ class GroupActivity : LockingActivity(),
 
     override fun approveEditGroup(action: GroupEditDialogFragment.EditGroupDialogAction?,
                                   name: String?,
-                                  icon: PwIcon?) {
+                                  icon: IconImage?) {
 
         if (name != null && name.isNotEmpty() && icon != null) {
             when (action) {
@@ -764,28 +808,33 @@ class GroupActivity : LockingActivity(),
                             // Not really needed here because added in runnable but safe
                             newGroup.parent = currentGroup
 
-                            progressDialogThread?.startDatabaseCreateGroup(
+                            mProgressDialogThread?.startDatabaseCreateGroup(
-                                    newGroup, currentGroup, !mReadOnly)
+                                    newGroup,
+                                    currentGroup,
+                                    !mReadOnly && mAutoSaveEnable
+                            )
                         }
                     }
                 }
                 GroupEditDialogFragment.EditGroupDialogAction.UPDATE -> {
                     // If update add new elements
                     mOldGroupToUpdate?.let { oldGroupToUpdate ->
-                        GroupVersioned(oldGroupToUpdate).let { updateGroup ->
+                        val updateGroup = Group(oldGroupToUpdate).let { updateGroup ->
                             updateGroup.apply {
                                 // WARNING remove parent and children to keep memory
                                 removeParent()
-                                removeChildren() // TODO concurrent exception
+                                removeChildren()
 
                                 title = name
                                 this.icon = icon // TODO custom icon
                             }
-
-                            // If group updated save it in the database
-                            progressDialogThread?.startDatabaseUpdateGroup(
-                                    oldGroupToUpdate, updateGroup, !mReadOnly)
                         }
+                        // If group updated save it in the database
+                        mProgressDialogThread?.startDatabaseUpdateGroup(
+                                oldGroupToUpdate,
+                                updateGroup,
+                                !mReadOnly && mAutoSaveEnable
+                        )
                     }
                 }
                 else -> {}
@@ -795,7 +844,7 @@ class GroupActivity : LockingActivity(),
 
     override fun cancelEditGroup(action: GroupEditDialogFragment.EditGroupDialogAction?,
                                  name: String?,
-                                 icon: PwIcon?) {
+                                 icon: IconImage?) {
         // Do nothing here
     }
 
@@ -806,14 +855,6 @@ class GroupActivity : LockingActivity(),
                 .iconPicked(bundle)
     }
 
-    private fun showWarnings() {
-        if (Database.getInstance().isReadOnly) {
-            if (PreferencesUtil.showReadOnlyWarning(this)) {
-                ReadOnlyDialog().show(supportFragmentManager, "readOnlyDialog")
-            }
-        }
-    }
-
     override fun onSortSelected(sortNodeEnum: SortNodeEnum, ascending: Boolean, groupsBefore: Boolean, recycleBinBottom: Boolean) {
         mListNodesFragment?.onSortSelected(sortNodeEnum, ascending, groupsBefore, recycleBinBottom)
     }
@@ -906,7 +947,7 @@ class GroupActivity : LockingActivity(),
         private const val SEARCH_FRAGMENT_TAG = "SEARCH_FRAGMENT_TAG"
         private const val OLD_GROUP_TO_UPDATE_KEY = "OLD_GROUP_TO_UPDATE_KEY"
 
-        private fun buildAndLaunchIntent(context: Context, group: GroupVersioned?, readOnly: Boolean,
+        private fun buildAndLaunchIntent(context: Context, group: Group?, readOnly: Boolean,
                                          intentBuildLauncher: (Intent) -> Unit) {
             val checkTime = if (context is Activity)
                 TimeoutHelper.checkTimeAndLockIfTimeout(context)

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.activities
 
 import android.content.Context
@@ -18,16 +37,16 @@ import androidx.appcompat.view.ActionMode
 
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.adapters.NodeAdapter
-import com.kunzisoft.keepass.database.SortNodeEnum
+import com.kunzisoft.keepass.database.element.SortNodeEnum
-import com.kunzisoft.keepass.database.element.GroupVersioned
+import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.NodeVersioned
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Type
+import com.kunzisoft.keepass.database.element.node.Type
 import java.util.*
 
 class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
@@ -36,7 +55,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
     private var onScrollListener: OnScrollListener? = null
 
     private var listView: RecyclerView? = null
-    var mainGroup: GroupVersioned? = null
+    var mainGroup: Group? = null
         private set
     private var mAdapter: NodeAdapter? = null
 
@@ -44,8 +63,8 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         private set
     var nodeActionPasteMode: PasteMode = PasteMode.UNDEFINED
         private set
-    private val listActionNodes = LinkedList<NodeVersioned>()
+    private val listActionNodes = LinkedList<Node>()
-    private val listPasteNodes = LinkedList<NodeVersioned>()
+    private val listPasteNodes = LinkedList<Node>()
 
     private var notFoundView: View? = null
     private var isASearchResult: Boolean = false
@@ -103,7 +122,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
             mAdapter = NodeAdapter(context)
             mAdapter?.apply {
                 setOnNodeClickListener(object : NodeAdapter.NodeClickCallback {
-                    override fun onNodeClick(node: NodeVersioned) {
+                    override fun onNodeClick(node: Node) {
                         if (nodeActionSelectionMode) {
                             if (listActionNodes.contains(node)) {
                                 // Remove selected item if already selected
@@ -120,7 +139,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                         }
                     }
 
-                    override fun onNodeLongClick(node: NodeVersioned): Boolean {
+                    override fun onNodeLongClick(node: Node): Boolean {
                         if (nodeActionPasteMode == PasteMode.UNDEFINED) {
                             // Select the first item after a long click
                             if (!listActionNodes.contains(node))
@@ -228,8 +247,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
             R.id.menu_sort -> {
                 context?.let { context ->
                     val sortDialogFragment: SortDialogFragment =
-                            if (Database.getInstance().allowRecycleBin
+                            if (Database.getInstance().isRecycleBinEnabled) {
-                                    && Database.getInstance().isRecycleBinEnabled) {
                                 SortDialogFragment.getInstance(
                                         PreferencesUtil.getListSort(context),
                                         PreferencesUtil.getAscendingSort(context),
@@ -251,7 +269,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         }
     }
 
-    fun actionNodesCallback(nodes: List<NodeVersioned>,
+    fun actionNodesCallback(nodes: List<Node>,
                             menuListener: NodesActionMenuListener?) : ActionMode.Callback {
 
         return object : ActionMode.Callback {
@@ -276,7 +294,8 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                     // Open and Edit for a single item
                     if (nodes.size == 1) {
                         // Edition
-                        if (readOnly || nodes[0] == database.recycleBin) {
+                        if (readOnly
+                                || (database.isRecycleBinEnabled && nodes[0] == database.recycleBin)) {
                             menu?.removeItem(R.id.menu_edit)
                         }
                     } else {
@@ -287,7 +306,6 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                     // Copy and Move (not for groups)
                     if (readOnly
                             || isASearchResult
-                            || nodes.any { it == database.recycleBin }
                             || nodes.any { it.type == Type.GROUP }) {
                         // TODO COPY For Group
                         menu?.removeItem(R.id.menu_copy)
@@ -295,7 +313,8 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
                     }
 
                     // Deletion
-                    if (readOnly || nodes.any { it == database.recycleBin }) {
+                    if (readOnly
+                            || (database.isRecycleBinEnabled && nodes.any { it == database.recycleBin })) {
                         menu?.removeItem(R.id.menu_delete)
                     }
                 }
@@ -354,7 +373,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
             EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE -> {
                 if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE
                         || resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
-                    data?.getParcelableExtra<NodeVersioned>(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY)?.let { newNode ->
+                    data?.getParcelableExtra<Node>(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY)?.let { newNode ->
                         if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
                             mAdapter?.addNode(newNode)
                         if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
@@ -369,31 +388,31 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         }
     }
 
-    fun contains(node: NodeVersioned): Boolean {
+    fun contains(node: Node): Boolean {
         return mAdapter?.contains(node) ?: false
     }
 
-    fun addNode(newNode: NodeVersioned) {
+    fun addNode(newNode: Node) {
         mAdapter?.addNode(newNode)
     }
 
-    fun addNodes(newNodes: List<NodeVersioned>) {
+    fun addNodes(newNodes: List<Node>) {
         mAdapter?.addNodes(newNodes)
     }
 
-    fun updateNode(oldNode: NodeVersioned, newNode: NodeVersioned? = null) {
+    fun updateNode(oldNode: Node, newNode: Node? = null) {
         mAdapter?.updateNode(oldNode, newNode ?: oldNode)
     }
 
-    fun updateNodes(oldNodes: List<NodeVersioned>, newNodes: List<NodeVersioned>) {
+    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
         mAdapter?.updateNodes(oldNodes, newNodes)
     }
 
-    fun removeNode(pwNode: NodeVersioned) {
+    fun removeNode(pwNode: Node) {
         mAdapter?.removeNode(pwNode)
     }
 
-    fun removeNodes(nodes: List<NodeVersioned>) {
+    fun removeNodes(nodes: List<Node>) {
         mAdapter?.removeNodes(nodes)
     }
 
@@ -409,20 +428,20 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
      * Callback listener to redefine to do an action when a node is click
      */
     interface NodeClickListener {
-        fun onNodeClick(node: NodeVersioned)
+        fun onNodeClick(node: Node)
-        fun onNodeSelected(nodes: List<NodeVersioned>): Boolean
+        fun onNodeSelected(nodes: List<Node>): Boolean
     }
 
     /**
      * Menu listener to redefine to do an action in menu
      */
     interface NodesActionMenuListener {
-        fun onOpenMenuClick(node: NodeVersioned): Boolean
+        fun onOpenMenuClick(node: Node): Boolean
-        fun onEditMenuClick(node: NodeVersioned): Boolean
+        fun onEditMenuClick(node: Node): Boolean
-        fun onCopyMenuClick(nodes: List<NodeVersioned>): Boolean
+        fun onCopyMenuClick(nodes: List<Node>): Boolean
-        fun onMoveMenuClick(nodes: List<NodeVersioned>): Boolean
+        fun onMoveMenuClick(nodes: List<Node>): Boolean
-        fun onDeleteMenuClick(nodes: List<NodeVersioned>): Boolean
+        fun onDeleteMenuClick(nodes: List<Node>): Boolean
-        fun onPasteMenuClick(pasteMode: PasteMode?, nodes: List<NodeVersioned>): Boolean
+        fun onPasteMenuClick(pasteMode: PasteMode?, nodes: List<Node>): Boolean
     }
 
     enum class PasteMode {
@@ -447,7 +466,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
         private const val GROUP_KEY = "GROUP_KEY"
         private const val IS_SEARCH = "IS_SEARCH"
 
-        fun newInstance(group: GroupVersioned?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
+        fun newInstance(group: Group?, readOnly: Boolean, isASearch: Boolean): ListNodesFragment {
             val bundle = Bundle()
             if (group != null) {
                 bundle.putParcelable(GROUP_KEY, group)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities
@@ -24,6 +24,7 @@ import android.app.assist.AssistStructure
 import android.app.backup.BackupManager
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -37,13 +38,11 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
-import android.widget.Button
+import android.widget.*
-import android.widget.CompoundButton
-import android.widget.EditText
-import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.biometric.BiometricManager
+import androidx.core.app.ActivityCompat
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
@@ -58,7 +57,7 @@ import com.kunzisoft.keepass.autofill.AutofillHelper
 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.LoadDatabaseDuplicateUuidException
+import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.education.PasswordActivityEducation
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.CIPHER_ENTITY_KEY
@@ -99,9 +98,10 @@ class PasswordActivity : StylishActivity() {
     private var mRememberKeyFile: Boolean = false
     private var mOpenFileHelper: OpenFileHelper? = null
 
+    private var mPermissionAsked = false
     private var readOnly: Boolean = false
 
-    private var progressDialogThread: ProgressDialogThread? = null
+    private var mProgressDialogThread: ProgressDialogThread? = null
 
     private var advancedUnlockedManager: AdvancedUnlockedManager? = null
 
@@ -130,6 +130,7 @@ class PasswordActivity : StylishActivity() {
         checkboxDefaultDatabaseView = findViewById(R.id.default_database)
         advancedUnlockInfoView = findViewById(R.id.biometric_info)
 
+        mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
         readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrPreference(this, savedInstanceState)
 
         val browseView = findViewById<View>(R.id.open_database_button)
@@ -163,69 +164,71 @@ class PasswordActivity : StylishActivity() {
             enableOrNotTheConfirmationButton()
         }
 
-        progressDialogThread = ProgressDialogThread(this) { actionTask, result ->
+        mProgressDialogThread = ProgressDialogThread(this).apply {
-            when (actionTask) {
+            onActionFinish = { actionTask, result ->
-                ACTION_DATABASE_LOAD_TASK -> {
+                when (actionTask) {
-                    // Recheck biometric if error
+                    ACTION_DATABASE_LOAD_TASK -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        // Recheck biometric if error
-                        if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                            // Stay with the same mode and init it
+                            if (PreferencesUtil.isBiometricUnlockEnable(this@PasswordActivity)) {
-                            advancedUnlockedManager?.initBiometricMode()
+                                // Stay with the same mode and init it
-                        }
+                                advancedUnlockedManager?.initBiometricMode()
-                    }
-
-                    // Remove the password in view in all cases
-                    removePassword()
-
-                    if (result.isSuccess) {
-                        launchGroupActivity()
-                    } else {
-                        var resultError = ""
-                        val resultException = result.exception
-                        val resultMessage = result.message
-
-                        if (resultException != null) {
-                            resultError = resultException.getLocalizedMessage(resources)
-
-                            // Relaunch loading if we need to fix UUID
-                            if (resultException is LoadDatabaseDuplicateUuidException) {
-                                showLoadDatabaseDuplicateUuidMessage {
-
-                                    var databaseUri: Uri? = null
-                                    var masterPassword: String? = null
-                                    var keyFileUri: Uri? = null
-                                    var readOnly = true
-                                    var cipherEntity: CipherDatabaseEntity? = null
-
-                                    result.data?.let { resultData ->
-                                        databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
-                                        masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
-                                        keyFileUri = resultData.getParcelable(KEY_FILE_KEY)
-                                        readOnly = resultData.getBoolean(READ_ONLY_KEY)
-                                        cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
-                                    }
-
-                                    databaseUri?.let { databaseFileUri ->
-                                        showProgressDialogAndLoadDatabase(
-                                                databaseFileUri,
-                                                masterPassword,
-                                                keyFileUri,
-                                                readOnly,
-                                                cipherEntity,
-                                                true)
-                                    }
-                                }
                             }
                         }
 
-                        // Show error message
+                        // Remove the password in view in all cases
-                        if (resultMessage != null && resultMessage.isNotEmpty()) {
+                        removePassword()
-                            resultError = "$resultError $resultMessage"
+
+                        if (result.isSuccess) {
+                            launchGroupActivity()
+                        } else {
+                            var resultError = ""
+                            val resultException = result.exception
+                            val resultMessage = result.message
+
+                            if (resultException != null) {
+                                resultError = resultException.getLocalizedMessage(resources)
+
+                                // Relaunch loading if we need to fix UUID
+                                if (resultException is DuplicateUuidDatabaseException) {
+                                    showLoadDatabaseDuplicateUuidMessage {
+
+                                        var databaseUri: Uri? = null
+                                        var masterPassword: String? = null
+                                        var keyFileUri: Uri? = null
+                                        var readOnly = true
+                                        var cipherEntity: CipherDatabaseEntity? = null
+
+                                        result.data?.let { resultData ->
+                                            databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
+                                            masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
+                                            keyFileUri = resultData.getParcelable(KEY_FILE_KEY)
+                                            readOnly = resultData.getBoolean(READ_ONLY_KEY)
+                                            cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
+                                        }
+
+                                        databaseUri?.let { databaseFileUri ->
+                                            showProgressDialogAndLoadDatabase(
+                                                    databaseFileUri,
+                                                    masterPassword,
+                                                    keyFileUri,
+                                                    readOnly,
+                                                    cipherEntity,
+                                                    true)
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Show error message
+                            if (resultMessage != null && resultMessage.isNotEmpty()) {
+                                resultError = "$resultError $resultMessage"
+                            }
+                            Log.e(TAG, resultError, resultException)
+                            Snackbar.make(activity_password_coordinator_layout,
+                                    resultError,
+                                    Snackbar.LENGTH_LONG).asError().show()
                         }
-                        Log.e(TAG, resultError, resultException)
-                        Snackbar.make(activity_password_coordinator_layout,
-                                resultError,
-                                Snackbar.LENGTH_LONG).asError().show()
                     }
                 }
             }
@@ -272,12 +275,13 @@ class PasswordActivity : StylishActivity() {
         // For check shutdown
         super.onResume()
 
-        progressDialogThread?.registerProgressTask()
+        mProgressDialogThread?.registerProgressTask()
 
         initUriFromIntent()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(KEY_PERMISSION_ASKED, mPermissionAsked)
         ReadOnlyHelper.onSaveInstanceState(outState, readOnly)
         super.onSaveInstanceState(outState)
     }
@@ -399,7 +403,7 @@ class PasswordActivity : StylishActivity() {
                                     }
                                 })
                     }
-                    advancedUnlockedManager?.initBiometric()
+                    advancedUnlockedManager?.checkBiometricAvailability()
                     biometricInitialize = true
                 } else {
                     advancedUnlockedManager?.destroy()
@@ -459,7 +463,7 @@ class PasswordActivity : StylishActivity() {
     }
 
     override fun onPause() {
-        progressDialogThread?.unregisterProgressTask()
+        mProgressDialogThread?.unregisterProgressTask()
 
         super.onPause()
     }
@@ -527,7 +531,7 @@ class PasswordActivity : StylishActivity() {
                                                   readOnly: Boolean,
                                                   cipherDatabaseEntity: CipherDatabaseEntity?,
                                                   fixDuplicateUUID: Boolean) {
-        progressDialogThread?.startDatabaseLoad(
+        mProgressDialogThread?.startDatabaseLoad(
                 databaseUri,
                 password,
                 keyFile,
@@ -543,9 +547,6 @@ class PasswordActivity : StylishActivity() {
         }.show(supportFragmentManager, "duplicateUUIDDialog")
     }
 
-    // To fix multiple view education
-    private var performedEductionInProgress = false
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         // Read menu
@@ -561,51 +562,96 @@ class PasswordActivity : StylishActivity() {
 
         super.onCreateOptionsMenu(menu)
 
-        if (!performedEductionInProgress) {
+        launchEducation(menu) {
-            performedEductionInProgress = true
+            launchCheckPermission()
-            // Show education views
-            Handler().post { performedNextEducation(PasswordActivityEducation(this), menu) }
         }
 
         return true
     }
 
+    // Check permission
+    private fun launchCheckPermission() {
+        val writePermission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+        val permissions = arrayOf(writePermission)
+        if (Build.VERSION.SDK_INT >= 23
+                && !readOnly
+                && !mPermissionAsked) {
+            mPermissionAsked = true
+            // Check self permission to show or not the dialog
+            if (toolbar != null
+                    && ActivityCompat.checkSelfPermission(this, writePermission) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(this, permissions, WRITE_EXTERNAL_STORAGE_REQUEST)
+            }
+        }
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+
+        when (requestCode) {
+            WRITE_EXTERNAL_STORAGE_REQUEST -> {
+                if (grantResults.isEmpty() || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                    if (ActivityCompat.shouldShowRequestPermissionRationale(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE))
+                        Toast.makeText(this, R.string.read_only_warning, Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+    // To fix multiple view education
+    private var performedEductionInProgress = false
+    private fun launchEducation(menu: Menu, onEducationFinished: ()-> Unit) {
+        if (!performedEductionInProgress) {
+            performedEductionInProgress = true
+            // Show education views
+            Handler().post { performedNextEducation(PasswordActivityEducation(this), menu, onEducationFinished) }
+        }
+    }
+
     private fun performedNextEducation(passwordActivityEducation: PasswordActivityEducation,
-                                       menu: Menu) {
+                                       menu: Menu,
-        val educationContainerView = containerView
+                                       onEducationFinished: ()-> Unit) {
-        val unlockEducationPerformed = educationContainerView != null
+        val educationToolbar = toolbar
+        val unlockEducationPerformed = educationToolbar != null
                 && passwordActivityEducation.checkAndPerformedUnlockEducation(
-                educationContainerView,
+                educationToolbar,
                         {
-                            performedNextEducation(passwordActivityEducation, menu)
+                            performedNextEducation(passwordActivityEducation, menu, onEducationFinished)
                         },
                         {
-                            performedNextEducation(passwordActivityEducation, menu)
+                            performedNextEducation(passwordActivityEducation, menu, onEducationFinished)
                         })
         if (!unlockEducationPerformed) {
-            val educationToolbar = toolbar
             val readOnlyEducationPerformed =
                     educationToolbar?.findViewById<View>(R.id.menu_open_file_read_mode_key) != null
                     && passwordActivityEducation.checkAndPerformedReadOnlyEducation(
                     educationToolbar.findViewById(R.id.menu_open_file_read_mode_key),
                     {
                         onOptionsItemSelected(menu.findItem(R.id.menu_open_file_read_mode_key))
-                        performedNextEducation(passwordActivityEducation, menu)
+                        performedNextEducation(passwordActivityEducation, menu, onEducationFinished)
                     },
                     {
-                        performedNextEducation(passwordActivityEducation, menu)
+                        performedNextEducation(passwordActivityEducation, menu, onEducationFinished)
                     })
 
             if (!readOnlyEducationPerformed) {
-
                 val biometricCanAuthenticate = BiometricManager.from(this).canAuthenticate()
-                // EducationPerformed
+                val biometricEducationPerformed =
                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                         && PreferencesUtil.isBiometricUnlockEnable(applicationContext)
                         && (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED || biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS)
                         && advancedUnlockInfoView != null && advancedUnlockInfoView?.unlockIconImageView != null
-                        && passwordActivityEducation.checkAndPerformedBiometricEducation(advancedUnlockInfoView?.unlockIconImageView!!)
+                        && passwordActivityEducation.checkAndPerformedBiometricEducation(advancedUnlockInfoView?.unlockIconImageView!!,
+                        {
+                            performedNextEducation(passwordActivityEducation, menu, onEducationFinished)
+                        },
+                        {
+                            performedNextEducation(passwordActivityEducation, menu, onEducationFinished)
+                        })
 
+                if (!biometricEducationPerformed) {
+                    onEducationFinished.invoke()
+                }
             }
         }
     }
@@ -681,6 +727,10 @@ class PasswordActivity : StylishActivity() {
         private const val KEY_PASSWORD = "password"
         private const val KEY_LAUNCH_IMMEDIATELY = "launchImmediately"
 
+        private const val KEY_PERMISSION_ASKED = "KEY_PERMISSION_ASKED"
+
+        private const val WRITE_EXTERNAL_STORAGE_REQUEST = 647
+
         private fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?,
                                          intentBuildLauncher: (Intent) -> Unit) {
             val intent = Intent(activity, PasswordActivity::class.java)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getListNodesFromBundle
+
+class DeleteNodesDialogFragment : DialogFragment() {
+
+    private var mNodesToDelete: List<Node> = ArrayList()
+    private var mListener: DeleteNodeListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            mListener = context as DeleteNodeListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException(context.toString()
+                    + " must implement " + DeleteNodeListener::class.java.name)
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        arguments?.apply {
+            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
+                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
+                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), this)
+            }
+        } ?: savedInstanceState?.apply {
+            if (containsKey(DatabaseTaskNotificationService.GROUPS_ID_KEY)
+                    && containsKey(DatabaseTaskNotificationService.ENTRIES_ID_KEY)) {
+                mNodesToDelete = getListNodesFromBundle(Database.getInstance(), savedInstanceState)
+            }
+        }
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = AlertDialog.Builder(activity)
+
+            builder.setMessage(getString(R.string.warning_permanently_delete_nodes))
+            builder.setPositiveButton(android.R.string.yes) { _, _ ->
+                mListener?.permanentlyDeleteNodes(mNodesToDelete)
+            }
+            builder.setNegativeButton(android.R.string.no) { _, _ -> dismiss() }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putAll(getBundleFromListNodes(mNodesToDelete))
+    }
+
+    interface DeleteNodeListener {
+        fun permanentlyDeleteNodes(nodes: List<Node>)
+    }
+
+    companion object {
+        fun getInstance(nodesToDelete: List<Node>): DeleteNodesDialogFragment {
+            return DeleteNodesDialogFragment().apply {
+                arguments = getBundleFromListNodes(nodesToDelete)
+            }
+        }
+    }
+}

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs
@@ -33,8 +33,8 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.GroupVersioned
+import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.PwIcon
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 
 class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {
@@ -45,7 +45,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
 
     private var editGroupDialogAction: EditGroupDialogAction? = null
     private var nameGroup: String? = null
-    private var iconGroup: PwIcon? = null
+    private var iconGroup: IconImage? = null
 
     private var nameTextLayoutView: TextInputLayout? = null
     private var nameTextView: TextView? = null
@@ -186,8 +186,8 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
     }
 
     interface EditGroupListener {
-        fun approveEditGroup(action: EditGroupDialogAction?, name: String?, icon: PwIcon?)
+        fun approveEditGroup(action: EditGroupDialogAction?, name: String?, icon: IconImage?)
-        fun cancelEditGroup(action: EditGroupDialogAction?, name: String?, icon: PwIcon?)
+        fun cancelEditGroup(action: EditGroupDialogAction?, name: String?, icon: IconImage?)
     }
 
     companion object {
@@ -206,7 +206,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
             return fragment
         }
 
-        fun build(group: GroupVersioned): GroupEditDialogFragment {
+        fun build(group: Group): GroupEditDialogFragment {
             val bundle = Bundle()
             bundle.putString(KEY_NAME, group.title)
             bundle.putParcelable(KEY_ICON, group.icon)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs
@@ -35,7 +35,7 @@ import android.widget.GridView
 import android.widget.ImageView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.database.element.PwIconStandard
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.icons.IconPack
 import com.kunzisoft.keepass.icons.IconPackChooser
 
@@ -72,7 +72,7 @@ class IconPickerDialogFragment : DialogFragment() {
 
             currIconGridView.setOnItemClickListener { _, _, position, _ ->
                 val bundle = Bundle()
-                bundle.putParcelable(KEY_ICON_STANDARD, PwIconStandard(position))
+                bundle.putParcelable(KEY_ICON_STANDARD, IconImageStandard(position))
                 iconPickerListener?.iconPicked(bundle)
                 dismiss()
             }
@@ -128,7 +128,7 @@ class IconPickerDialogFragment : DialogFragment() {
 
         private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD"
 
-        fun getIconStandardFromBundle(bundle: Bundle): PwIconStandard? {
+        fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? {
             return bundle.getParcelable(KEY_ICON_STANDARD)
         }
 

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePass DX.
- *
- *  KeePass DX 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.
- *
- *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.os.Build
-import android.os.Bundle
-import android.preference.PreferenceManager
-import androidx.fragment.app.DialogFragment
-import com.kunzisoft.keepass.R
-
-class ReadOnlyDialog : DialogFragment() {
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            // Use the Builder class for convenient dialog construction
-            val builder = androidx.appcompat.app.AlertDialog.Builder(activity)
-
-            var warning = getString(R.string.read_only_warning)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                warning = warning + "\n\n" + getString(R.string.read_only_kitkat_warning)
-            }
-            builder.setMessage(warning)
-
-            builder.setPositiveButton(getString(android.R.string.ok)) { _, _ -> dismiss() }
-            builder.setNegativeButton(getString(R.string.beta_dontask)) { _, _ ->
-                val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-                val edit = prefs.edit()
-                edit.putBoolean(getString(R.string.show_read_only_warning), false)
-                edit.apply()
-                dismiss()
-            }
-
-            // Create the AlertDialog object and return it
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-}

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.activities.dialogs
 
 import android.annotation.SuppressLint
@@ -29,6 +48,7 @@ import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_TOTP_PERIOD
 import com.kunzisoft.keepass.otp.OtpTokenType
 import com.kunzisoft.keepass.otp.OtpType
 import com.kunzisoft.keepass.otp.TokenCalculator
+import java.util.*
 
 class SetOTPDialogFragment : DialogFragment() {
 
@@ -246,7 +266,7 @@ class SetOTPDialogFragment : DialogFragment() {
             override fun afterTextChanged(s: Editable?) {
                 s?.toString()?.let { userString ->
                     try {
-                        mOtpElement.setBase32Secret(userString)
+                        mOtpElement.setBase32Secret(userString.toUpperCase(Locale.ENGLISH))
                         otpSecretContainer?.error = null
                     } catch (exception: Exception) {
                         otpSecretContainer?.error = getString(R.string.error_otp_secret_key)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs
@@ -29,7 +29,7 @@ import android.view.View
 import android.widget.CompoundButton
 import android.widget.RadioGroup
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.SortNodeEnum
+import com.kunzisoft.keepass.database.element.SortNodeEnum
 
 class SortDialogFragment : DialogFragment() {
 

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.dialogs

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.activities.helpers
 
 import android.app.assist.AssistStructure

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.helpers

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.activities.helpers
 
 import android.content.Context

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.lock
@@ -32,6 +32,7 @@ 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.database.action.ProgressDialogThread
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService
 import com.kunzisoft.keepass.magikeyboard.MagikIME
@@ -63,6 +64,10 @@ abstract class LockingActivity : StylishActivity() {
             return field || mSelectionMode
         }
     protected var mSelectionMode: Boolean = false
+    protected var mAutoSaveEnable: Boolean = true
+
+    var mProgressDialogThread: ProgressDialogThread? = null
+        private set
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -86,6 +91,8 @@ abstract class LockingActivity : StylishActivity() {
 
         mExitLock = false
         mReadOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrIntent(savedInstanceState, intent)
+
+        mProgressDialogThread = ProgressDialogThread(this)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -101,8 +108,13 @@ abstract class LockingActivity : StylishActivity() {
     override fun onResume() {
         super.onResume()
 
+        mProgressDialogThread?.registerProgressTask()
+
         // To refresh when back to normal workflow from selection workflow
         mSelectionMode = EntrySelectionHelper.retrieveEntrySelectionModeFromIntent(intent)
+        mAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(this)
+
+        invalidateOptionsMenu()
 
         if (mTimeoutEnable) {
             // End activity if database not loaded
@@ -119,8 +131,6 @@ abstract class LockingActivity : StylishActivity() {
             if (!mExitLock)
                 TimeoutHelper.recordTime(this)
         }
-
-        invalidateOptionsMenu()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -130,6 +140,8 @@ abstract class LockingActivity : StylishActivity() {
     }
 
     override fun onPause() {
+        mProgressDialogThread?.unregisterProgressTask()
+
         super.onPause()
 
         if (mTimeoutEnable) {

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

@@ -1,55 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX 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.
- *
- *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.lock
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import android.view.WindowManager
-
-/**
- * Locking Hide Activity that sets FLAG_SECURE to prevent screenshots, and from
- * appearing in the recent app preview
- */
-abstract class LockingHideActivity : LockingActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        // Several gingerbread devices have problems with FLAG_SECURE
-        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
-    }
-
-    /* (non-Javadoc) Workaround for HTC Linkify issues
-	 * @see android.app.Activity#startActivity(android.content.Intent)
-	 */
-    override fun startActivity(intent: Intent) {
-        try {
-            if (intent.component != null && intent.component!!.shortClassName == ".HtcLinkifyDispatcherActivity") {
-                intent.component = null
-            }
-            super.startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            /* Catch the bad HTC implementation case */
-            super.startActivity(Intent.createChooser(intent, null))
-        }
-
-    }
-}

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.stylish
@@ -61,6 +61,7 @@ object Stylish {
 
         return when (themeString) {
             context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night
+            context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black
             context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark
             context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue
             context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red

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

@@ -1,38 +1,63 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.stylish
 
+import android.content.ActivityNotFoundException
+import android.content.Intent
 import android.os.Bundle
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
+import android.view.WindowManager
 
+/**
+ * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from
+ * appearing in the recent app preview
+ */
 abstract class StylishActivity : AppCompatActivity() {
 
     @StyleRes
     private var themeId: Int = 0
 
+    /* (non-Javadoc) Workaround for HTC Linkify issues
+     * @see android.app.Activity#startActivity(android.content.Intent)
+     */
+    override fun startActivity(intent: Intent) {
+        try {
+            if (intent.component != null && intent.component!!.shortClassName == ".HtcLinkifyDispatcherActivity") {
+                intent.component = null
+            }
+            super.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            /* Catch the bad HTC implementation case */
+            super.startActivity(Intent.createChooser(intent, null))
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         this.themeId = Stylish.getThemeId(this)
         setTheme(themeId)
+
+        // Several gingerbread devices have problems with FLAG_SECURE
+        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
     }
 
     override fun onResume() {

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.activities.stylish

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

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

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.adapters
 
 import android.content.Context
@@ -7,13 +26,13 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.EntryVersioned
+import com.kunzisoft.keepass.database.element.Entry
 
 class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHistoryAdapter.EntryHistoryViewHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var entryHistoryList: MutableList<EntryVersioned> = ArrayList()
+    var entryHistoryList: MutableList<Entry> = ArrayList()
-    var onItemClickListener: ((item: EntryVersioned, position: Int)->Unit)? = null
+    var onItemClickListener: ((item: Entry, position: Int)->Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryHistoryViewHolder {
         return EntryHistoryViewHolder(inflater.inflate(R.layout.item_list_entry_history, parent, false))

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.adapters
 
 import android.content.Context
@@ -15,7 +34,7 @@ import java.util.ArrayList
 class FieldsAdapter(context: Context) : RecyclerView.Adapter<FieldsAdapter.FieldViewHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
-    var fields: MutableList<Field> = ArrayList()
+    private var fields: MutableList<Field> = ArrayList()
     var onItemClickListener: OnItemClickListener? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FieldViewHolder {
@@ -33,6 +52,11 @@ class FieldsAdapter(context: Context) : RecyclerView.Adapter<FieldsAdapter.Field
         return fields.size
     }
 
+    fun setFields(fieldsToAdd: List<Field>) {
+        fields.clear()
+        fields.addAll(fieldsToAdd)
+    }
+
     fun clear() {
         fields.clear()
     }

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.adapters

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.adapters
@@ -34,10 +34,15 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.SortNodeEnum
+import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.database.element.Group
+import com.kunzisoft.keepass.database.element.SortNodeEnum
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.view.strikeOut
 import java.util.*
 
 class NodeAdapter
@@ -48,7 +53,7 @@ class NodeAdapter
 (private val context: Context)
     : RecyclerView.Adapter<NodeAdapter.NodeViewHolder>() {
 
-    private val nodeSortedList: SortedList<NodeVersioned>
+    private val nodeSortedList: SortedList<Node>
     private val inflater: LayoutInflater = LayoutInflater.from(context)
 
     private var calculateViewTypeTextSize = Array(2) { true} // number of view type
@@ -64,8 +69,9 @@ class NodeAdapter
     private var recycleBinBottomSort: Boolean = true
     private var showUserNames: Boolean = true
     private var showNumberEntries: Boolean = true
+    private var entryFilters = arrayOf<Group.ChildFilter>()
 
-    private var actionNodesList = LinkedList<NodeVersioned>()
+    private var actionNodesList = LinkedList<Node>()
     private var nodeClickCallback: NodeClickCallback? = null
 
     private val mDatabase: Database
@@ -83,18 +89,18 @@ class NodeAdapter
     init {
         assignPreferences()
 
-        this.nodeSortedList = SortedList(NodeVersioned::class.java, object : SortedListAdapterCallback<NodeVersioned>(this) {
+        this.nodeSortedList = SortedList(Node::class.java, object : SortedListAdapterCallback<Node>(this) {
-            override fun compare(item1: NodeVersioned, item2: NodeVersioned): Int {
+            override fun compare(item1: Node, item2: Node): Int {
                 return listSort.getNodeComparator(ascendingSort, groupsBeforeSort, recycleBinBottomSort).compare(item1, item2)
             }
 
-            override fun areContentsTheSame(oldItem: NodeVersioned, newItem: NodeVersioned): Boolean {
+            override fun areContentsTheSame(oldItem: Node, newItem: Node): Boolean {
                 return oldItem.type == newItem.type
                         && oldItem.title == newItem.title
                         && oldItem.icon == newItem.icon
             }
 
-            override fun areItemsTheSame(item1: NodeVersioned, item2: NodeVersioned): Boolean {
+            override fun areItemsTheSame(item1: Node, item2: Node): Boolean {
                 return item1 == item2
             }
         })
@@ -126,6 +132,8 @@ class NodeAdapter
         this.showUserNames = PreferencesUtil.showUsernamesListEntries(context)
         this.showNumberEntries = PreferencesUtil.showNumberEntries(context)
 
+        this.entryFilters = Group.ChildFilter.getDefaults(context)
+
         // Reinit textSize for all view type
         calculateViewTypeTextSize.forEachIndexed { index, _ -> calculateViewTypeTextSize[index] = true }
     }
@@ -133,11 +141,11 @@ class NodeAdapter
     /**
      * Rebuild the list by clear and build children from the group
      */
-    fun rebuildList(group: GroupVersioned) {
+    fun rebuildList(group: Group) {
         this.nodeSortedList.clear()
         assignPreferences()
         try {
-            this.nodeSortedList.addAll(group.getChildren())
+            this.nodeSortedList.addAll(group.getChildren(*entryFilters))
         } catch (e: Exception) {
             Log.e(TAG, "Can't add node elements to the list", e)
             Toast.makeText(context, "Can't add node elements to the list : " + e.message, Toast.LENGTH_LONG).show()
@@ -145,7 +153,7 @@ class NodeAdapter
         notifyDataSetChanged()
     }
 
-    fun contains(node: NodeVersioned): Boolean {
+    fun contains(node: Node): Boolean {
         return nodeSortedList.indexOf(node) != SortedList.INVALID_POSITION
     }
 
@@ -153,7 +161,7 @@ class NodeAdapter
      * Add a node to the list
      * @param node Node to add
      */
-    fun addNode(node: NodeVersioned) {
+    fun addNode(node: Node) {
         nodeSortedList.add(node)
     }
 
@@ -161,7 +169,7 @@ class NodeAdapter
      * Add nodes to the list
      * @param nodes Nodes to add
      */
-    fun addNodes(nodes: List<NodeVersioned>) {
+    fun addNodes(nodes: List<Node>) {
         nodeSortedList.addAll(nodes)
     }
 
@@ -169,7 +177,7 @@ class NodeAdapter
      * Remove a node in the list
      * @param node Node to delete
      */
-    fun removeNode(node: NodeVersioned) {
+    fun removeNode(node: Node) {
         nodeSortedList.remove(node)
     }
 
@@ -177,7 +185,7 @@ class NodeAdapter
      * Remove nodes in the list
      * @param nodes Nodes to delete
      */
-    fun removeNodes(nodes: List<NodeVersioned>) {
+    fun removeNodes(nodes: List<Node>) {
         nodes.forEach { node ->
             nodeSortedList.remove(node)
         }
@@ -209,7 +217,7 @@ class NodeAdapter
      * @param oldNode Node before the update
      * @param newNode Node after the update
      */
-    fun updateNode(oldNode: NodeVersioned, newNode: NodeVersioned) {
+    fun updateNode(oldNode: Node, newNode: Node) {
         nodeSortedList.beginBatchedUpdates()
         nodeSortedList.remove(oldNode)
         nodeSortedList.add(newNode)
@@ -221,7 +229,7 @@ class NodeAdapter
      * @param oldNodes Nodes before the update
      * @param newNodes Node after the update
      */
-    fun updateNodes(oldNodes: List<NodeVersioned>, newNodes: List<NodeVersioned>) {
+    fun updateNodes(oldNodes: List<Node>, newNodes: List<Node>) {
         nodeSortedList.beginBatchedUpdates()
         oldNodes.forEach { oldNode ->
             nodeSortedList.remove(oldNode)
@@ -230,11 +238,11 @@ class NodeAdapter
         nodeSortedList.endBatchedUpdates()
     }
 
-    fun notifyNodeChanged(node: NodeVersioned) {
+    fun notifyNodeChanged(node: Node) {
         notifyItemChanged(nodeSortedList.indexOf(node))
     }
 
-    fun setActionNodes(actionNodes: List<NodeVersioned>) {
+    fun setActionNodes(actionNodes: List<Node>) {
         this.actionNodesList.apply {
             clear()
             addAll(actionNodes)
@@ -287,15 +295,53 @@ class NodeAdapter
                 width = iconSize.toInt()
             }
         }
+
         // Assign text
         holder.text.apply {
             text = subNode.title
             setTextSize(textSizeUnit, infoTextSize)
-            paintFlags = if (subNode.isCurrentlyExpires)
+            strikeOut(subNode.isCurrentlyExpires)
-                paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-            else
-                paintFlags and Paint.STRIKE_THRU_TEXT_FLAG
         }
+        // Add subText with username
+        holder.subText.apply {
+            text = ""
+            strikeOut(subNode.isCurrentlyExpires)
+            visibility = View.GONE
+        }
+
+        // Specific elements for entry
+        if (subNode.type == Type.ENTRY) {
+            val entry = subNode as Entry
+            mDatabase.startManageEntry(entry)
+
+            holder.text.text = entry.getVisualTitle()
+            holder.subText.apply {
+                val username = entry.username
+                if (showUserNames && username.isNotEmpty()) {
+                    visibility = View.VISIBLE
+                    text = username
+                    setTextSize(textSizeUnit, subtextSize)
+                }
+            }
+
+            mDatabase.stopManageEntry(entry)
+        }
+
+        // Add number of entries in groups
+        if (subNode.type == Type.GROUP) {
+            if (showNumberEntries) {
+                holder.numberChildren?.apply {
+                    text = (subNode as Group)
+                            .getChildEntries(*entryFilters)
+                            .size.toString()
+                    setTextSize(textSizeUnit, numberChildrenTextSize)
+                    visibility = View.VISIBLE
+                }
+            } else {
+                holder.numberChildren?.visibility = View.GONE
+            }
+        }
+
         // Assign click
         holder.container.setOnClickListener {
             nodeClickCallback?.onNodeClick(subNode)
@@ -305,47 +351,9 @@ class NodeAdapter
         }
 
         holder.container.isSelected = actionNodesList.contains(subNode)
-
-        // Add subText with username
-        holder.subText.apply {
-            text = ""
-            paintFlags = if (subNode.isCurrentlyExpires)
-                paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-            else
-                paintFlags and Paint.STRIKE_THRU_TEXT_FLAG
-            visibility = View.GONE
-            if (subNode.type == Type.ENTRY) {
-                val entry = subNode as EntryVersioned
-
-                mDatabase.startManageEntry(entry)
-
-                holder.text.text = entry.getVisualTitle()
-
-                val username = entry.username
-                if (showUserNames && username.isNotEmpty()) {
-                    visibility = View.VISIBLE
-                    text = username
-                    setTextSize(textSizeUnit, subtextSize)
-                }
-
-                mDatabase.stopManageEntry(entry)
-            }
-        }
-
-        // Add number of entries in groups
-        if (subNode.type == Type.GROUP) {
-            if (showNumberEntries) {
-                holder.numberChildren?.apply {
-                    text = (subNode as GroupVersioned).getChildEntries(true).size.toString()
-                    setTextSize(textSizeUnit, numberChildrenTextSize)
-                    visibility = View.VISIBLE
-                }
-            } else {
-                holder.numberChildren?.visibility = View.GONE
-            }
-        }
     }
 
+    
     override fun getItemCount(): Int {
         return nodeSortedList.size()
     }
@@ -361,8 +369,8 @@ class NodeAdapter
      * Callback listener to redefine to do an action when a node is click
      */
     interface NodeClickCallback {
-        fun onNodeClick(node: NodeVersioned)
+        fun onNodeClick(node: Node)
-        fun onNodeLongClick(node: NodeVersioned): Boolean
+        fun onNodeLongClick(node: Node): Boolean
     }
 
     class NodeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.adapters
@@ -22,22 +22,20 @@ package com.kunzisoft.keepass.adapters
 import android.content.Context
 import android.database.Cursor
 import android.graphics.Color
-import androidx.cursoradapter.widget.CursorAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.cursor.EntryCursor
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.EntryVersioned
+import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.PwIcon
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import java.util.*
+import com.kunzisoft.keepass.view.strikeOut
 
-class SearchEntryCursorAdapter(context: Context, private val database: Database)
+class SearchEntryCursorAdapter(private val context: Context,
+                               private val database: Database)
     : androidx.cursoradapter.widget.CursorAdapter(context, null, FLAG_REGISTER_CONTENT_OBSERVER) {
 
     private val cursorInflater: LayoutInflater = context.getSystemService(
@@ -72,34 +70,31 @@ class SearchEntryCursorAdapter(context: Context, private val database: Database)
 
     override fun bindView(view: View, context: Context, cursor: Cursor) {
 
-        // Retrieve elements from cursor
+        database.getEntryFrom(cursor)?.let { currentEntry ->
-        val uuid = UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
+            val viewHolder = view.tag as ViewHolder
-                cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS)))
-        val iconFactory = database.iconFactory
-        var icon: PwIcon = iconFactory.getIcon(
-                UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
-                        cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))))
-        if (icon.isUnknown) {
-            icon = iconFactory.getIcon(cursor.getInt(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_STANDARD)))
-            if (icon.isUnknown)
-                icon = iconFactory.keyIcon
-        }
-        val title = cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_TITLE))
-        val username = cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_USERNAME))
-        val url = cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_URL))
 
-        val viewHolder = view.tag as ViewHolder
+            // Assign image
+            viewHolder.imageViewIcon?.assignDatabaseIcon(
+                    database.drawFactory,
+                    currentEntry.icon,
+                    iconColor)
 
-        // Assign image
+            // Assign title
-        viewHolder.imageViewIcon?.assignDatabaseIcon(database.drawFactory, icon, iconColor)
+            viewHolder.textViewTitle?.apply {
+                text = currentEntry.getVisualTitle()
+                strikeOut(currentEntry.isCurrentlyExpires)
+            }
 
-        // Assign title
+            // Assign subtitle
-        val showTitle = EntryVersioned.getVisualTitle(false, title, username, url, uuid.toString())
+            viewHolder.textViewSubTitle?.apply {
-        viewHolder.textViewTitle?.text = showTitle
+                val entryUsername = currentEntry.username
-        if (displayUsername && username.isNotEmpty()) {
+                text = if (displayUsername && entryUsername.isNotEmpty()) {
-            viewHolder.textViewSubTitle?.text = String.format("(%s)", username)
+                    String.format("(%s)", entryUsername)
-        } else {
+                } else {
-            viewHolder.textViewSubTitle?.text = ""
+                    ""
+                }
+                strikeOut(currentEntry.isCurrentlyExpires)
+            }
         }
     }
 
@@ -110,11 +105,11 @@ class SearchEntryCursorAdapter(context: Context, private val database: Database)
     }
 
     override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor? {
-        return database.searchEntries(constraint.toString())
+        return database.searchEntries(context, constraint.toString())
     }
 
-    fun getEntryFromPosition(position: Int): EntryVersioned? {
+    fun getEntryFromPosition(position: Int): Entry? {
-        var pwEntry: EntryVersioned? = null
+        var pwEntry: Entry? = null
 
         val cursor = this.cursor
         if (cursor.moveToFirst() && cursor.move(position)) {

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.app

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import android.os.AsyncTask

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import androidx.room.Database

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import android.content.Context

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import androidx.room.*

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import android.os.Parcel

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.app.database

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import androidx.room.*

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

@@ -1,3 +1,22 @@
+/*
+ * 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.app.database
 
 import androidx.room.ColumnInfo

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.autofill

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.autofill

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.autofill

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.kunzisoft.keepass.autofill
 

app/src/main/java/com/kunzisoft/keepass/backup/SettingsBackupAgent.kt

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.backup

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

@@ -1,3 +1,22 @@
+/*
+ * 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.biometric
 
 import android.content.Intent
@@ -10,6 +29,7 @@ import android.view.MenuInflater
 import android.widget.CompoundButton
 import android.widget.TextView
 import androidx.annotation.RequiresApi
+import androidx.biometric.BiometricConstants
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
@@ -36,65 +56,59 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
 
     private var cipherDatabaseAction = CipherDatabaseAction.getInstance(context.applicationContext)
 
-    // fingerprint related code here
+    init {
-    fun initBiometric() {
-
-        // Check if fingerprint well init (be called the first time the fingerprint is configured
-        // and the activity still active)
-        if (biometricUnlockDatabaseHelper == null || !biometricUnlockDatabaseHelper!!.isBiometricInitialized) {
-            biometricUnlockDatabaseHelper = BiometricUnlockDatabaseHelper(context)
-            // callback for fingerprint findings
-            biometricUnlockDatabaseHelper?.biometricUnlockCallback = this
-            biometricUnlockDatabaseHelper?.authenticationCallback = biometricAuthenticationCallback
-        }
-
         // Add a check listener to change fingerprint mode
         checkboxPasswordView?.setOnCheckedChangeListener { compoundButton, checked ->
-
             checkBiometricAvailability()
-
             // Add old listener to enable the button, only be call here because of onCheckedChange bug
             onCheckedPasswordChangeListener?.onCheckedChanged(compoundButton, checked)
         }
-
-        checkBiometricAvailability()
     }
 
-    @Synchronized
+    /**
-    private fun checkBiometricAvailability() {
+     * Check biometric availability and change the current mode depending of device's state
+     */
+    fun checkBiometricAvailability() {
 
-        // fingerprint not supported (by API level or hardware) so keep option hidden
+        // biometric not supported (by API level or hardware) so keep option hidden
         // or manually disable
         val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate()
 
         if (!PreferencesUtil.isBiometricUnlockEnable(context)
                 || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
                 || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
-
             toggleMode(Mode.UNAVAILABLE)
-
         } else {
-
+            // biometric is available but not configured, show icon but in disabled state with some information
-            // fingerprint is available but not configured, show icon but in disabled state with some information
             if (biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
-
+                toggleMode(Mode.BIOMETRIC_NOT_CONFIGURED)
-                toggleMode(Mode.NOT_CONFIGURED)
-
             } else {
-                if (checkboxPasswordView?.isChecked == true) {
+                // Check if fingerprint well init (be called the first time the fingerprint is configured
-                    // listen for encryption
+                // and the activity still active)
-                    toggleMode(Mode.STORE)
+                if (biometricUnlockDatabaseHelper?.isKeyManagerInitialized != true) {
+                    biometricUnlockDatabaseHelper = BiometricUnlockDatabaseHelper(context)
+                    // callback for fingerprint findings
+                    biometricUnlockDatabaseHelper?.biometricUnlockCallback = this
+                    biometricUnlockDatabaseHelper?.authenticationCallback = biometricAuthenticationCallback
+                }
+                // Recheck to change the mode
+                if (biometricUnlockDatabaseHelper?.isKeyManagerInitialized != true) {
+                    toggleMode(Mode.KEY_MANAGER_UNAVAILABLE)
                 } else {
-                    cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { containsCipher ->
+                    if (checkboxPasswordView?.isChecked == true) {
-
+                        // listen for encryption
-                        // fingerprint available but no stored password found yet for this DB so show info don't listen
+                        toggleMode(Mode.STORE_CREDENTIAL)
-                        toggleMode( if (containsCipher) {
+                    } else {
-                            // listen for decryption
+                        cipherDatabaseAction.containsCipherDatabase(databaseFileUri) { containsCipher ->
-                            Mode.OPEN
+                            // biometric available but no stored password found yet for this DB so show info don't listen
-                        } else {
+                            toggleMode( if (containsCipher) {
-                            // wait for typing
+                                // listen for decryption
-                            Mode.WAIT_CREDENTIAL
+                                Mode.EXTRACT_CREDENTIAL
-                        })
+                            } else {
+                                // wait for typing
+                                Mode.WAIT_CREDENTIAL
+                            })
+                        }
                     }
                 }
             }
@@ -129,17 +143,15 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
             context.runOnUiThread {
                 when (biometricMode) {
-                    Mode.UNAVAILABLE -> {
+                    Mode.UNAVAILABLE -> {}
-                    }
+                    Mode.BIOMETRIC_NOT_CONFIGURED -> {}
-                    Mode.NOT_CONFIGURED -> {
+                    Mode.KEY_MANAGER_UNAVAILABLE -> {}
-                    }
+                    Mode.WAIT_CREDENTIAL -> {}
-                    Mode.WAIT_CREDENTIAL -> {
+                    Mode.STORE_CREDENTIAL -> {
-                    }
-                    Mode.STORE -> {
                         // newly store the entered password in encrypted way
                         biometricUnlockDatabaseHelper?.encryptData(passwordView?.text.toString())
                     }
-                    Mode.OPEN -> {
+                    Mode.EXTRACT_CREDENTIAL -> {
                         // retrieve the encrypted value from preferences
                         cipherDatabaseAction.getCipherDatabase(databaseFileUri) {
                             it?.encryptedValue?.let { value ->
@@ -155,7 +167,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     private fun initNotAvailable() {
         showFingerPrintViews(false)
 
-        advancedUnlockInfoView?.setIconViewClickListener(null)
+        advancedUnlockInfoView?.setIconViewClickListener(false, null)
     }
 
     private fun initNotConfigured() {
@@ -163,7 +175,17 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         setAdvancedUnlockedTitleView(R.string.configure_biometric)
         setAdvancedUnlockedMessageView("")
 
-        advancedUnlockInfoView?.setIconViewClickListener {
+        advancedUnlockInfoView?.setIconViewClickListener(false) {
+            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
+        }
+    }
+
+    private fun initKeyManagerNotAvailable() {
+        showFingerPrintViews(true)
+        setAdvancedUnlockedTitleView(R.string.keystore_not_accessible)
+        setAdvancedUnlockedMessageView("")
+
+        advancedUnlockInfoView?.setIconViewClickListener(false) {
             context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
         }
     }
@@ -173,7 +195,11 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         setAdvancedUnlockedTitleView(R.string.no_credentials_stored)
         setAdvancedUnlockedMessageView("")
 
-        advancedUnlockInfoView?.setIconViewClickListener(null)
+        advancedUnlockInfoView?.setIconViewClickListener(false) {
+            biometricAuthenticationCallback.onAuthenticationError(
+                    BiometricConstants.ERROR_UNABLE_TO_PROCESS
+                    , context.getString(R.string.credential_before_click_biometric_button))
+        }
     }
 
     private fun openBiometricPrompt(biometricPrompt: BiometricPrompt?,
@@ -235,10 +261,11 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     fun initBiometricMode() {
         when (biometricMode) {
             Mode.UNAVAILABLE -> initNotAvailable()
-            Mode.NOT_CONFIGURED -> initNotConfigured()
+            Mode.BIOMETRIC_NOT_CONFIGURED -> initNotConfigured()
+            Mode.KEY_MANAGER_UNAVAILABLE -> initKeyManagerNotAvailable()
             Mode.WAIT_CREDENTIAL -> initWaitData()
-            Mode.STORE -> initEncryptData()
+            Mode.STORE_CREDENTIAL -> initEncryptData()
-            Mode.OPEN -> initDecryptData()
+            Mode.EXTRACT_CREDENTIAL -> initDecryptData()
         }
         // Show fingerprint key deletion
         context.invalidateOptionsMenu()
@@ -255,7 +282,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         if (!addBiometricMenuInProgress) {
             addBiometricMenuInProgress = true
             cipherDatabaseAction.containsCipherDatabase(databaseFileUri) {
-                if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.NOT_CONFIGURED)
+                if ((biometricMode != Mode.UNAVAILABLE && biometricMode != Mode.BIOMETRIC_NOT_CONFIGURED)
                         && it) {
                     menuInflater.inflate(R.menu.advanced_unlock, menu)
                     addBiometricMenuInProgress = false
@@ -267,7 +294,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     fun deleteEntryKey() {
         biometricUnlockDatabaseHelper?.deleteEntryKey()
         cipherDatabaseAction.deleteByDatabaseUri(databaseFileUri)
-        biometricMode = Mode.NOT_CONFIGURED
+        biometricMode = Mode.BIOMETRIC_NOT_CONFIGURED
         checkBiometricAvailability()
     }
 
@@ -313,7 +340,7 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
     }
 
     enum class Mode {
-        UNAVAILABLE, NOT_CONFIGURED, WAIT_CREDENTIAL, STORE, OPEN
+        UNAVAILABLE, BIOMETRIC_NOT_CONFIGURED, KEY_MANAGER_UNAVAILABLE, WAIT_CREDENTIAL, STORE_CREDENTIAL, EXTRACT_CREDENTIAL
     }
 
     companion object {

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.biometric
@@ -52,13 +52,14 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
     private var keyguardManager: KeyguardManager? = null
     private var cryptoObject: BiometricPrompt.CryptoObject? = null
 
-    private var isBiometricInit = false
+    private var isKeyManagerInit = false
     var authenticationCallback: BiometricPrompt.AuthenticationCallback? = null
     var biometricUnlockCallback: BiometricUnlockCallback? = null
 
     private val promptInfoStoreCredential = BiometricPrompt.PromptInfo.Builder().apply {
         setTitle(context.getString(R.string.biometric_prompt_store_credential_title))
         setDescription(context.getString(R.string.biometric_prompt_store_credential_message))
+        setConfirmationRequired(true)
         // TODO device credential
         /*
         if (keyguardManager?.isDeviceSecure == true)
@@ -70,7 +71,8 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
 
     private val promptInfoExtractCredential = BiometricPrompt.PromptInfo.Builder().apply {
         setTitle(context.getString(R.string.biometric_prompt_extract_credential_title))
-        setDescription(context.getString(R.string.biometric_prompt_extract_credential_message))
+        //setDescription(context.getString(R.string.biometric_prompt_extract_credential_message))
+        setConfirmationRequired(false)
         // TODO device credential
         /*
         if (keyguardManager?.isDeviceSecure == true)
@@ -80,18 +82,18 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
             setNegativeButtonText(context.getString(android.R.string.cancel))
     }.build()
 
-    val isBiometricInitialized: Boolean
+    val isKeyManagerInitialized: Boolean
         get() {
-            if (!isBiometricInit) {
+            if (!isKeyManagerInit) {
                 biometricUnlockCallback?.onBiometricException(Exception("Biometric not initialized"))
             }
-            return isBiometricInit
+            return isKeyManagerInit
         }
 
     init {
         if (BiometricManager.from(context).canAuthenticate() != BiometricManager.BIOMETRIC_SUCCESS) {
             // really not much to do when no fingerprint support found
-            isBiometricInit = false
+            isKeyManagerInit = false
         } else {
             this.keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
 
@@ -103,17 +105,19 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
                                 + BIOMETRIC_BLOCKS_MODES + "/"
                                 + BIOMETRIC_ENCRYPTION_PADDING)
                 this.cryptoObject = BiometricPrompt.CryptoObject(cipher!!)
-                isBiometricInit = true
+                isKeyManagerInit = (keyStore != null
+                        && keyGenerator != null
+                        && cipher != null)
             } catch (e: Exception) {
                 Log.e(TAG, "Unable to initialize the keystore", e)
-                isBiometricInit = false
+                isKeyManagerInit = false
                 biometricUnlockCallback?.onBiometricException(e)
             }
         }
     }
 
     private fun getSecretKey(): SecretKey? {
-        if (!isBiometricInitialized) {
+        if (!isKeyManagerInitialized) {
             return null
         }
         try {
@@ -155,7 +159,7 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
                         : (biometricPrompt: BiometricPrompt?,
                            cryptoObject: BiometricPrompt.CryptoObject?,
                            promptInfo: BiometricPrompt.PromptInfo)->Unit) {
-        if (!isBiometricInitialized) {
+        if (!isKeyManagerInitialized) {
             return
         }
         try {
@@ -176,11 +180,10 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
             Log.e(TAG, "Unable to initialize encrypt data", e)
             biometricUnlockCallback?.onBiometricException(e)
         }
-
     }
 
     fun encryptData(value: String) {
-        if (!isBiometricInitialized) {
+        if (!isKeyManagerInitialized) {
             return
         }
         try {
@@ -197,14 +200,13 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
             Log.e(TAG, "Unable to encrypt data", e)
             biometricUnlockCallback?.onBiometricException(e)
         }
-
     }
 
     fun initDecryptData(ivSpecValue: String, actionIfCypherInit
             : (biometricPrompt: BiometricPrompt?,
                cryptoObject: BiometricPrompt.CryptoObject?,
                promptInfo: BiometricPrompt.PromptInfo)->Unit) {
-        if (!isBiometricInitialized) {
+        if (!isKeyManagerInitialized) {
             return
         }
         try {
@@ -229,11 +231,10 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
             Log.e(TAG, "Unable to initialize decrypt data", e)
             biometricUnlockCallback?.onBiometricException(e)
         }
-
     }
 
     fun decryptData(encryptedValue: String) {
-        if (!isBiometricInitialized) {
+        if (!isKeyManagerInitialized) {
             return
         }
         try {
@@ -249,7 +250,6 @@ class BiometricUnlockDatabaseHelper(private val context: FragmentActivity) {
             Log.e(TAG, "Unable to decrypt data", e)
             biometricUnlockCallback?.onBiometricException(e)
         }
-
     }
 
     fun deleteEntryKey() {

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

@@ -1,62 +1,63 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.biometric
 
 import android.content.Context
-import android.graphics.drawable.Animatable2
-import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
 import androidx.annotation.RequiresApi
 import android.widget.ImageView
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 
 import com.kunzisoft.keepass.R
 
 @RequiresApi(api = Build.VERSION_CODES.M)
 class FingerPrintAnimatedVector(context: Context, imageView: ImageView) {
 
-    private val scanFingerprint: AnimatedVectorDrawable =
+    private val scanFingerprint: AnimatedVectorDrawableCompat? =
-            context.getDrawable(R.drawable.scan_fingerprint) as AnimatedVectorDrawable
+            AnimatedVectorDrawableCompat.create(context, R.drawable.scan_fingerprint)
 
     init {
         imageView.setImageDrawable(scanFingerprint)
     }
 
-    private var animationCallback = object : Animatable2.AnimationCallback() {
+    private var animationCallback = object : Animatable2Compat.AnimationCallback() {
         override fun onAnimationEnd(drawable: Drawable) {
-            if (!scanFingerprint.isRunning)
+            imageView.post {
-                scanFingerprint.start()
+                scanFingerprint?.start()
+            }
         }
     }
 
     fun startScan() {
-        scanFingerprint.registerAnimationCallback(animationCallback)
+        scanFingerprint?.registerAnimationCallback(animationCallback)
 
-        if (!scanFingerprint.isRunning)
+        if (scanFingerprint?.isRunning != true)
-            scanFingerprint.start()
+            scanFingerprint?.start()
     }
 
     fun stopScan() {
-        scanFingerprint.unregisterAnimationCallback(animationCallback)
+        scanFingerprint?.unregisterAnimationCallback(animationCallback)
 
-        if (scanFingerprint.isRunning)
+        if (scanFingerprint?.isRunning == true)
             scanFingerprint.stop()
     }
 }

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto

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

@@ -1,33 +1,31 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto
 
-import com.kunzisoft.keepass.stream.LEDataOutputStream
 import com.kunzisoft.keepass.stream.NullOutputStream
-
+import com.kunzisoft.keepass.stream.longTo8Bytes
 import java.io.IOException
 import java.security.DigestOutputStream
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import java.util.Arrays
+import java.util.*
-
 import javax.crypto.Mac
 import kotlin.math.min
 
@@ -60,7 +58,7 @@ object CryptoUtil {
                     throw RuntimeException(e)
                 }
 
-                val pbR = LEDataOutputStream.writeLongBuf(r)
+                val pbR = longTo8Bytes(r)
                 val part = hmac.doFinal(pbR)
 
                 val copy = min(cbOut - pos, part.size)

app/src/main/java/com/kunzisoft/keepass/crypto/NativeAESCipherSpi.java

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto;

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto

app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt

@@ -1,28 +1,28 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.engine
 
 
 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.utils.Types
+import com.kunzisoft.keepass.stream.bytes16ToUuid
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
@@ -41,13 +41,28 @@ class AesEngine : CipherEngine() {
         return cipher
     }
 
-    override fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm {
+    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return PwEncryptionAlgorithm.AESRijndael
+        return EncryptionAlgorithm.AESRijndael
     }
 
     companion object {
 
-        val CIPHER_UUID: UUID = Types.bytestoUUID(
+        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0x31.toByte(), 0xC1.toByte(), 0xF2.toByte(), 0xE6.toByte(), 0xBF.toByte(), 0x71.toByte(), 0x43.toByte(), 0x50.toByte(), 0xBE.toByte(), 0x58.toByte(), 0x05.toByte(), 0x21.toByte(), 0x6A.toByte(), 0xFC.toByte(), 0x5A.toByte(), 0xFF.toByte()))
+                byteArrayOf(0x31.toByte(),
+                        0xC1.toByte(),
+                        0xF2.toByte(),
+                        0xE6.toByte(),
+                        0xBF.toByte(),
+                        0x71.toByte(),
+                        0x43.toByte(),
+                        0x50.toByte(),
+                        0xBE.toByte(),
+                        0x58.toByte(),
+                        0x05.toByte(),
+                        0x21.toByte(),
+                        0x6A.toByte(),
+                        0xFC.toByte(),
+                        0x5A.toByte(),
+                        0xFF.toByte()))
     }
 }

app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.kt

@@ -1,26 +1,26 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.engine
 
-import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.utils.Types
+import com.kunzisoft.keepass.stream.bytes16ToUuid
 import org.spongycastle.jce.provider.BouncyCastleProvider
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
@@ -44,13 +44,28 @@ class ChaCha20Engine : CipherEngine() {
         return cipher
     }
 
-    override fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm {
+    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return PwEncryptionAlgorithm.ChaCha20
+        return EncryptionAlgorithm.ChaCha20
     }
 
     companion object {
 
-        val CIPHER_UUID: UUID = Types.bytestoUUID(
+        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0xD6.toByte(), 0x03.toByte(), 0x8A.toByte(), 0x2B.toByte(), 0x8B.toByte(), 0x6F.toByte(), 0x4C.toByte(), 0xB5.toByte(), 0xA5.toByte(), 0x24.toByte(), 0x33.toByte(), 0x9A.toByte(), 0x31.toByte(), 0xDB.toByte(), 0xB5.toByte(), 0x9A.toByte()))
+                byteArrayOf(0xD6.toByte(),
+                        0x03.toByte(),
+                        0x8A.toByte(),
+                        0x2B.toByte(),
+                        0x8B.toByte(),
+                        0x6F.toByte(),
+                        0x4C.toByte(),
+                        0xB5.toByte(),
+                        0xA5.toByte(),
+                        0x24.toByte(),
+                        0x33.toByte(),
+                        0x9A.toByte(),
+                        0x31.toByte(),
+                        0xDB.toByte(),
+                        0xB5.toByte(),
+                        0x9A.toByte()))
     }
 }

app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.kt

@@ -1,25 +1,25 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.engine
 
-import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
@@ -46,6 +46,6 @@ abstract class CipherEngine {
         return getCipher(opmode, key, IV, false)
     }
 
-    abstract fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm
+    abstract fun getPwEncryptionAlgorithm(): EncryptionAlgorithm
 
 }

app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt

@@ -1,33 +1,31 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.engine
 
 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.utils.Types
+import com.kunzisoft.keepass.stream.bytes16ToUuid
-
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
-import java.util.UUID
+import java.util.*
-
 import javax.crypto.Cipher
 import javax.crypto.NoSuchPaddingException
 import javax.crypto.spec.IvParameterSpec
@@ -47,13 +45,28 @@ class TwofishEngine : CipherEngine() {
         return cipher
     }
 
-    override fun getPwEncryptionAlgorithm(): PwEncryptionAlgorithm {
+    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return PwEncryptionAlgorithm.Twofish
+        return EncryptionAlgorithm.Twofish
     }
 
     companion object {
 
-        val CIPHER_UUID: UUID = Types.bytestoUUID(
+        val CIPHER_UUID: UUID = bytes16ToUuid(
-                byteArrayOf(0xAD.toByte(), 0x68.toByte(), 0xF2.toByte(), 0x9F.toByte(), 0x57.toByte(), 0x6F.toByte(), 0x4B.toByte(), 0xB9.toByte(), 0xA3.toByte(), 0x6A.toByte(), 0xD4.toByte(), 0x7A.toByte(), 0xF9.toByte(), 0x65.toByte(), 0x34.toByte(), 0x6C.toByte()))
+                byteArrayOf(0xAD.toByte(),
+                        0x68.toByte(),
+                        0xF2.toByte(),
+                        0x9F.toByte(),
+                        0x57.toByte(),
+                        0x6F.toByte(),
+                        0x4B.toByte(),
+                        0xB9.toByte(),
+                        0xA3.toByte(),
+                        0x6A.toByte(),
+                        0xD4.toByte(),
+                        0x7A.toByte(),
+                        0xF9.toByte(),
+                        0x65.toByte(),
+                        0x34.toByte(),
+                        0x6C.toByte()))
     }
 }

app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/AndroidFinalKey.java

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.finalkey;

app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKey.java

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.finalkey;

app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/FinalKeyFactory.java

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.finalkey;

app/src/main/java/com/kunzisoft/keepass/crypto/finalkey/NativeFinalKey.java

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.finalkey;

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.keyDerivation
@@ -23,7 +23,7 @@ import android.content.res.Resources
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.crypto.CryptoUtil
 import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory
-import com.kunzisoft.keepass.utils.Types
+import com.kunzisoft.keepass.stream.bytes16ToUuid
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -32,7 +32,7 @@ class AesKdf internal constructor() : KdfEngine() {
 
     override val defaultParameters: KdfParameters
         get() {
-            return KdfParameters(uuid).apply {
+            return KdfParameters(uuid!!).apply {
                 setParamUUID()
                 setUInt32(PARAM_ROUNDS, DEFAULT_ROUNDS.toLong())
             }
@@ -88,7 +88,7 @@ class AesKdf internal constructor() : KdfEngine() {
 
         private const val DEFAULT_ROUNDS = 6000
 
-        val CIPHER_UUID: UUID = Types.bytestoUUID(
+        val CIPHER_UUID: UUID = bytes16ToUuid(
                 byteArrayOf(0xC9.toByte(),
                         0xD9.toByte(),
                         0xF3.toByte(),

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

@@ -1,27 +1,27 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.keyDerivation
 
 import android.content.res.Resources
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.utils.Types
+import com.kunzisoft.keepass.stream.bytes16ToUuid
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -30,7 +30,7 @@ class Argon2Kdf internal constructor() : KdfEngine() {
 
     override val defaultParameters: KdfParameters
         get() {
-            val p = KdfParameters(uuid)
+            val p = KdfParameters(uuid!!)
 
             p.setParamUUID()
             p.setUInt32(PARAM_PARALLELISM, DEFAULT_PARALLELISM)
@@ -126,7 +126,7 @@ class Argon2Kdf internal constructor() : KdfEngine() {
 
     companion object {
 
-        val CIPHER_UUID: UUID = Types.bytestoUUID(
+        val CIPHER_UUID: UUID = bytes16ToUuid(
                 byteArrayOf(0xEF.toByte(),
                         0x63.toByte(),
                         0x6D.toByte(),

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.keyDerivation;

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.keyDerivation

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.crypto.keyDerivation

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

@@ -1,75 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePass DX.
- *
- *  KeePass DX 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.
- *
- *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.keyDerivation;
-
-import com.kunzisoft.keepass.utils.VariantDictionary;
-import com.kunzisoft.keepass.stream.LEDataInputStream;
-import com.kunzisoft.keepass.stream.LEDataOutputStream;
-import com.kunzisoft.keepass.utils.Types;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class KdfParameters extends VariantDictionary {
-
-    private UUID kdfUUID;
-
-    private static final String ParamUUID = "$UUID";
-
-    KdfParameters(UUID uuid) {
-        kdfUUID = uuid;
-    }
-
-    public UUID getUUID() {
-        return kdfUUID;
-    }
-
-    protected void setParamUUID() {
-        setByteArray(ParamUUID, Types.UUIDtoBytes(kdfUUID));
-    }
-
-    public static KdfParameters deserialize(byte[] data) throws IOException {
-        ByteArrayInputStream bis = new ByteArrayInputStream(data);
-        LEDataInputStream lis = new LEDataInputStream(bis);
-
-        VariantDictionary d = VariantDictionary.deserialize(lis);
-        if (d == null) {
-            return null;
-        }
-
-        UUID uuid = Types.bytestoUUID(d.getByteArray(ParamUUID));
-
-        KdfParameters kdfP = new KdfParameters(uuid);
-        kdfP.copyTo(d);
-        return kdfP;
-    }
-
-    public static byte[] serialize(KdfParameters kdf) throws IOException {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        LEDataOutputStream los = new LEDataOutputStream(bos);
-
-        KdfParameters.serialize(kdf, los);
-
-        return bos.toByteArray();
-    }
-
-}

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

@@ -0,0 +1,67 @@
+/*
+ * 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.crypto.keyDerivation
+
+import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
+import com.kunzisoft.keepass.stream.LittleEndianDataOutputStream
+import com.kunzisoft.keepass.stream.bytes16ToUuid
+import com.kunzisoft.keepass.stream.uuidTo16Bytes
+import com.kunzisoft.keepass.utils.VariantDictionary
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.util.*
+
+class KdfParameters internal constructor(val uuid: UUID) : VariantDictionary() {
+
+    fun setParamUUID() {
+        setByteArray(PARAM_UUID, uuidTo16Bytes(uuid))
+    }
+
+    companion object {
+
+        private const val PARAM_UUID = "\$UUID"
+
+        @Throws(IOException::class)
+        fun deserialize(data: ByteArray): KdfParameters? {
+            val bis = ByteArrayInputStream(data)
+            val lis = LittleEndianDataInputStream(bis)
+
+            val d = deserialize(lis) ?: return null
+
+            val uuid = bytes16ToUuid(d.getByteArray(PARAM_UUID))
+
+            val kdfP = KdfParameters(uuid)
+            kdfP.copyTo(d)
+            return kdfP
+        }
+
+        @Throws(IOException::class)
+        fun serialize(kdf: KdfParameters): ByteArray {
+            val bos = ByteArrayOutputStream()
+            val los = LittleEndianDataOutputStream(bos)
+
+            serialize(kdf, los)
+
+            return bos.toByteArray()
+        }
+    }
+
+}

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action
@@ -32,9 +32,8 @@ open class AssignPasswordInDatabaseRunnable (
         withMasterPassword: Boolean,
         masterPassword: String?,
         withKeyFile: Boolean,
-        keyFile: Uri?,
+        keyFile: Uri?)
-        save: Boolean)
+    : SaveDatabaseRunnable(context, database, true) {
-    : SaveDatabaseRunnable(context, database, save) {
 
     private var mMasterPassword: String? = null
     protected var mKeyFile: Uri? = null
@@ -59,7 +58,7 @@ open class AssignPasswordInDatabaseRunnable (
             database.retrieveMasterKey(mMasterPassword, uriInputStream)
         } catch (e: Exception) {
             erase(mBackupKey)
-            setError(e.message)
+            setError(e)
         }
 
         super.onStartRun()

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action
@@ -28,24 +28,25 @@ import com.kunzisoft.keepass.database.element.Database
 class CreateDatabaseRunnable(context: Context,
                              private val mDatabase: Database,
                              databaseUri: Uri,
+                             private val databaseName: String,
+                             private val rootName: String,
                              withMasterPassword: Boolean,
                              masterPassword: String?,
                              withKeyFile: Boolean,
-                             keyFile: Uri?,
+                             keyFile: Uri?)
-                             save: Boolean)
+    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, withMasterPassword, masterPassword, withKeyFile, keyFile) {
-    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, withMasterPassword, masterPassword, withKeyFile, keyFile, save) {
 
     override fun onStartRun() {
         try {
             // Create new database record
             mDatabase.apply {
-                createData(mDatabaseUri)
+                createData(mDatabaseUri, databaseName, rootName)
                 // Set Database state
                 loaded = true
             }
         } catch (e: Exception) {
             mDatabase.closeAndClear()
-            setError(e.message)
+            setError(e)
         }
 
         super.onStartRun()

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action
@@ -25,7 +25,7 @@ import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.exception.LoadDatabaseDuplicateUuidException
+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
@@ -62,7 +62,7 @@ class LoadDatabaseRunnable(private val context: Context,
                     mFixDuplicateUUID,
                     progressTaskUpdater)
         }
-        catch (e: LoadDatabaseDuplicateUuidException) {
+        catch (e: DuplicateUuidDatabaseException) {
             mDuplicateUuidAction?.invoke(result)
             setError(e)
         }

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.database.action
 
 import android.content.*
@@ -11,27 +30,35 @@ import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.database.element.*
+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.database.element.security.EncryptionAlgorithm
 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
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_COLOR_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_COMPRESSION_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COLOR_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_DESCRIPTION_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COMPRESSION_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_ENCRYPTION_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_ITERATIONS_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_DESCRIPTION_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENCRYPTION_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ITERATIONS_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_NAME_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK
-import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_PARALLELISM_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_NAME_TASK
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_PARALLELISM_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
@@ -44,10 +71,10 @@ import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION
 import java.util.*
 import kotlin.collections.ArrayList
 
+class ProgressDialogThread(private val activity: FragmentActivity) {
 
-class ProgressDialogThread(private val activity: FragmentActivity,
+    var onActionFinish: ((actionTask: String,
-                           var onActionFinish: (actionTask: String,
+                          result: ActionRunnable.Result) -> Unit)? = null
-                                                result: ActionRunnable.Result) -> Unit) {
 
     private var intentDatabaseTask = Intent(activity, DatabaseTaskNotificationService::class.java)
 
@@ -68,7 +95,7 @@ class ProgressDialogThread(private val activity: FragmentActivity,
         }
 
         override fun onStopAction(actionTask: String, result: ActionRunnable.Result) {
-            onActionFinish.invoke(actionTask, result)
+            onActionFinish?.invoke(actionTask, result)
             // Remove the progress task
             ProgressTaskDialogFragment.stop(activity)
             TimeoutHelper.releaseTemporarilyDisableTimeoutAndLockIfTimeout(activity)
@@ -172,7 +199,11 @@ class ProgressDialogThread(private val activity: FragmentActivity,
 
         unBindService()
 
-        activity.unregisterReceiver(databaseTaskBroadcastReceiver)
+        try {
+            activity.unregisterReceiver(databaseTaskBroadcastReceiver)
+        } catch (e: IllegalArgumentException) {
+            // If receiver not register, do nothing
+        }
     }
 
     @Synchronized
@@ -250,8 +281,8 @@ class ProgressDialogThread(private val activity: FragmentActivity,
       ----
     */
 
-    fun startDatabaseCreateGroup(newGroup: GroupVersioned,
+    fun startDatabaseCreateGroup(newGroup: Group,
-                                 parent: GroupVersioned,
+                                 parent: Group,
                                  save: Boolean) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.GROUP_KEY, newGroup)
@@ -261,8 +292,8 @@ class ProgressDialogThread(private val activity: FragmentActivity,
                 , ACTION_DATABASE_CREATE_GROUP_TASK)
     }
 
-    fun startDatabaseUpdateGroup(oldGroup: GroupVersioned,
+    fun startDatabaseUpdateGroup(oldGroup: Group,
-                                 groupToUpdate: GroupVersioned,
+                                 groupToUpdate: Group,
                                  save: Boolean) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.GROUP_ID_KEY, oldGroup.nodeId)
@@ -272,8 +303,8 @@ class ProgressDialogThread(private val activity: FragmentActivity,
                 , ACTION_DATABASE_UPDATE_GROUP_TASK)
     }
 
-    fun startDatabaseCreateEntry(newEntry: EntryVersioned,
+    fun startDatabaseCreateEntry(newEntry: Entry,
-                                 parent: GroupVersioned,
+                                 parent: Group,
                                  save: Boolean) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.ENTRY_KEY, newEntry)
@@ -283,8 +314,8 @@ class ProgressDialogThread(private val activity: FragmentActivity,
                 , ACTION_DATABASE_CREATE_ENTRY_TASK)
     }
 
-    fun startDatabaseUpdateEntry(oldEntry: EntryVersioned,
+    fun startDatabaseUpdateEntry(oldEntry: Entry,
-                                 entryToUpdate: EntryVersioned,
+                                 entryToUpdate: Entry,
                                  save: Boolean) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, oldEntry.nodeId)
@@ -295,20 +326,20 @@ class ProgressDialogThread(private val activity: FragmentActivity,
     }
 
     private fun startDatabaseActionListNodes(actionTask: String,
-                                             nodesPaste: List<NodeVersioned>,
+                                             nodesPaste: List<Node>,
-                                             newParent: GroupVersioned?,
+                                             newParent: Group?,
                                              save: Boolean) {
-        val groupsIdToCopy = ArrayList<PwNodeId<*>>()
+        val groupsIdToCopy = ArrayList<NodeId<*>>()
-        val entriesIdToCopy = ArrayList<PwNodeId<UUID>>()
+        val entriesIdToCopy = ArrayList<NodeId<UUID>>()
         nodesPaste.forEach { nodeVersioned ->
             when (nodeVersioned.type) {
                 Type.GROUP -> {
-                    (nodeVersioned as GroupVersioned).nodeId?.let { groupId ->
+                    (nodeVersioned as Group).nodeId?.let { groupId ->
                         groupsIdToCopy.add(groupId)
                     }
                 }
                 Type.ENTRY -> {
-                    entriesIdToCopy.add((nodeVersioned as EntryVersioned).nodeId)
+                    entriesIdToCopy.add((nodeVersioned as Entry).nodeId)
                 }
             }
         }
@@ -325,23 +356,51 @@ class ProgressDialogThread(private val activity: FragmentActivity,
         , actionTask)
     }
 
-    fun startDatabaseCopyNodes(nodesToCopy: List<NodeVersioned>,
+    fun startDatabaseCopyNodes(nodesToCopy: List<Node>,
-                               newParent: GroupVersioned,
+                               newParent: Group,
                                save: Boolean) {
         startDatabaseActionListNodes(ACTION_DATABASE_COPY_NODES_TASK, nodesToCopy, newParent, save)
     }
 
-    fun startDatabaseMoveNodes(nodesToMove: List<NodeVersioned>,
+    fun startDatabaseMoveNodes(nodesToMove: List<Node>,
-                               newParent: GroupVersioned,
+                               newParent: Group,
                                save: Boolean) {
         startDatabaseActionListNodes(ACTION_DATABASE_MOVE_NODES_TASK, nodesToMove, newParent, save)
     }
 
-    fun startDatabaseDeleteNodes(nodesToDelete: List<NodeVersioned>,
+    fun startDatabaseDeleteNodes(nodesToDelete: List<Node>,
                                  save: Boolean) {
         startDatabaseActionListNodes(ACTION_DATABASE_DELETE_NODES_TASK, nodesToDelete, null, save)
     }
 
+    /*
+      -----------------
+        Entry History Settings
+      -----------------
+    */
+
+    fun startDatabaseRestoreEntryHistory(mainEntry: Entry,
+                                         entryHistoryPosition: Int,
+                                         save: Boolean) {
+        start(Bundle().apply {
+            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntry.nodeId)
+            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
+        }
+                , ACTION_DATABASE_RESTORE_ENTRY_HISTORY)
+    }
+
+    fun startDatabaseDeleteEntryHistory(mainEntry: Entry,
+                                        entryHistoryPosition: Int,
+                                        save: Boolean) {
+        start(Bundle().apply {
+            putParcelable(DatabaseTaskNotificationService.ENTRY_ID_KEY, mainEntry.nodeId)
+            putInt(DatabaseTaskNotificationService.ENTRY_HISTORY_POSITION_KEY, entryHistoryPosition)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
+        }
+                , ACTION_DATABASE_DELETE_ENTRY_HISTORY)
+    }
+
     /*
       -----------------
         Main Settings
@@ -349,66 +408,80 @@ class ProgressDialogThread(private val activity: FragmentActivity,
     */
 
     fun startDatabaseSaveName(oldName: String,
-                              newName: String) {
+                              newName: String,
+                              save: Boolean) {
         start(Bundle().apply {
             putString(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldName)
             putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newName)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_NAME_TASK)
+                , ACTION_DATABASE_UPDATE_NAME_TASK)
     }
 
     fun startDatabaseSaveDescription(oldDescription: String,
-                                     newDescription: String) {
+                                     newDescription: String,
+                                     save: Boolean) {
         start(Bundle().apply {
             putString(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldDescription)
             putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newDescription)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_DESCRIPTION_TASK)
+                , ACTION_DATABASE_UPDATE_DESCRIPTION_TASK)
     }
 
     fun startDatabaseSaveDefaultUsername(oldDefaultUsername: String,
-                                         newDefaultUsername: String) {
+                                         newDefaultUsername: String,
+                                         save: Boolean) {
         start(Bundle().apply {
             putString(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldDefaultUsername)
             putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newDefaultUsername)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK)
+                , ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK)
     }
 
     fun startDatabaseSaveColor(oldColor: String,
-                               newColor: String) {
+                               newColor: String,
+                               save: Boolean) {
         start(Bundle().apply {
             putString(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldColor)
             putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newColor)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_COLOR_TASK)
+                , ACTION_DATABASE_UPDATE_COLOR_TASK)
     }
 
-    fun startDatabaseSaveCompression(oldCompression: PwCompressionAlgorithm,
+    fun startDatabaseSaveCompression(oldCompression: CompressionAlgorithm,
-                                     newCompression: PwCompressionAlgorithm) {
+                                     newCompression: CompressionAlgorithm,
+                                     save: Boolean) {
         start(Bundle().apply {
             putSerializable(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldCompression)
             putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newCompression)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_COMPRESSION_TASK)
+                , ACTION_DATABASE_UPDATE_COMPRESSION_TASK)
     }
 
     fun startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems: Int,
-                                         newMaxHistoryItems: Int) {
+                                         newMaxHistoryItems: Int,
+                                         save: Boolean) {
         start(Bundle().apply {
             putInt(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldMaxHistoryItems)
             putInt(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMaxHistoryItems)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK)
+                , ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK)
     }
 
     fun startDatabaseSaveMaxHistorySize(oldMaxHistorySize: Long,
-                                        newMaxHistorySize: Long) {
+                                        newMaxHistorySize: Long,
+                                        save: Boolean) {
         start(Bundle().apply {
             putLong(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldMaxHistorySize)
             putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMaxHistorySize)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK)
+                , ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK)
     }
 
     /*
@@ -417,48 +490,68 @@ class ProgressDialogThread(private val activity: FragmentActivity,
       -------------------
      */
 
-    fun startDatabaseSaveEncryption(oldEncryption: PwEncryptionAlgorithm,
+    fun startDatabaseSaveEncryption(oldEncryption: EncryptionAlgorithm,
-                                    newEncryption: PwEncryptionAlgorithm) {
+                                    newEncryption: EncryptionAlgorithm,
+                                    save: Boolean) {
         start(Bundle().apply {
             putSerializable(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldEncryption)
             putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newEncryption)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_ENCRYPTION_TASK)
+                , ACTION_DATABASE_UPDATE_ENCRYPTION_TASK)
     }
 
     fun startDatabaseSaveKeyDerivation(oldKeyDerivation: KdfEngine,
-                                       newKeyDerivation: KdfEngine) {
+                                       newKeyDerivation: KdfEngine,
+                                       save: Boolean) {
         start(Bundle().apply {
             putSerializable(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldKeyDerivation)
             putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newKeyDerivation)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK)
+                , ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK)
     }
 
     fun startDatabaseSaveIterations(oldIterations: Long,
-                                    newIterations: Long) {
+                                    newIterations: Long,
+                                    save: Boolean) {
         start(Bundle().apply {
             putLong(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldIterations)
             putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newIterations)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_ITERATIONS_TASK)
+                , ACTION_DATABASE_UPDATE_ITERATIONS_TASK)
     }
 
     fun startDatabaseSaveMemoryUsage(oldMemoryUsage: Long,
-                                     newMemoryUsage: Long) {
+                                     newMemoryUsage: Long,
+                                     save: Boolean) {
         start(Bundle().apply {
             putLong(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldMemoryUsage)
             putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMemoryUsage)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK)
+                , ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK)
     }
 
     fun startDatabaseSaveParallelism(oldParallelism: Int,
-                                     newParallelism: Int) {
+                                     newParallelism: Int,
+                                     save: Boolean) {
         start(Bundle().apply {
             putInt(DatabaseTaskNotificationService.OLD_ELEMENT_KEY, oldParallelism)
             putInt(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newParallelism)
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
         }
-                , ACTION_DATABASE_SAVE_PARALLELISM_TASK)
+                , ACTION_DATABASE_UPDATE_PARALLELISM_TASK)
+    }
+
+    /**
+     * Save Database without parameter
+     */
+    fun startDatabaseSave(save: Boolean) {
+        start(Bundle().apply {
+            putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save)
+        }
+                , ACTION_DATABASE_SAVE)
     }
 }

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

@@ -1,29 +1,28 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action
 
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.exception.DatabaseOutputException
+import com.kunzisoft.keepass.database.exception.DatabaseException
 import com.kunzisoft.keepass.tasks.ActionRunnable
-import java.io.IOException
 
 open class SaveDatabaseRunnable(protected var context: Context,
                                 protected var database: Database,
@@ -38,10 +37,8 @@ open class SaveDatabaseRunnable(protected var context: Context,
         if (saveDatabase && result.isSuccess) {
             try {
                 database.saveData(context.contentResolver)
-            } catch (e: IOException) {
+            } catch (e: DatabaseException) {
-                setError(e.message)
+                setError(e)
-            } catch (e: DatabaseOutputException) {
-                setError(e.message)
             }
         }
     }

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

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action
+
+import android.content.Context
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+
+class UpdateCompressionBinariesDatabaseRunnable (
+        context: Context,
+        database: Database,
+        private val oldCompressionAlgorithm: CompressionAlgorithm,
+        private val newCompressionAlgorithm: CompressionAlgorithm,
+        saveDatabase: Boolean)
+    : SaveDatabaseRunnable(context, database, saveDatabase) {
+
+    override fun onStartRun() {
+        // Set new compression
+        if (database.allowDataCompression) {
+            try {
+                database.apply {
+                    updateDataBinaryCompression(oldCompressionAlgorithm, newCompressionAlgorithm)
+                    compressionAlgorithm = newCompressionAlgorithm
+                }
+            } catch (e: Exception) {
+                setError(e)
+            }
+        }
+
+        super.onStartRun()
+    }
+
+    override fun onFinishRun() {
+        super.onFinishRun()
+
+        if (database.allowDataCompression) {
+            if (!result.isSuccess) {
+                try {
+                    database.apply {
+                        compressionAlgorithm = oldCompressionAlgorithm
+                        updateDataBinaryCompression(newCompressionAlgorithm, oldCompressionAlgorithm)
+                    }
+                } catch (e: Exception) {
+                    setError(e)
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.history
+
+import android.content.Context
+import com.kunzisoft.keepass.database.action.SaveDatabaseRunnable
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.Entry
+
+class DeleteEntryHistoryDatabaseRunnable (
+        context: Context,
+        database: Database,
+        private val mainEntry: Entry,
+        private val entryHistoryPosition: Int,
+        saveDatabase: Boolean)
+    : SaveDatabaseRunnable(context, database, saveDatabase) {
+
+    override fun onStartRun() {
+        try {
+            mainEntry.removeEntryFromHistory(entryHistoryPosition)
+        } catch (e: Exception) {
+            setError(e)
+        }
+
+        super.onStartRun()
+    }
+}

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2020 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.history
+
+import android.content.Context
+import com.kunzisoft.keepass.database.action.node.UpdateEntryRunnable
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.Entry
+import com.kunzisoft.keepass.tasks.ActionRunnable
+
+class RestoreEntryHistoryDatabaseRunnable (
+        private val context: Context,
+        private val database: Database,
+        private val mainEntry: Entry,
+        private val entryHistoryPosition: Int,
+        private val saveDatabase: Boolean)
+    : ActionRunnable() {
+
+    private var updateEntryRunnable: UpdateEntryRunnable? = null
+
+    override fun onStartRun() {
+        try {
+            val historyToRestore = Entry(mainEntry.getHistory()[entryHistoryPosition])
+            // Copy history of main entry in the restore entry
+            mainEntry.getHistory().forEach {
+                historyToRestore.addEntryToHistory(it)
+            }
+            // Update the entry with the fresh formatted entry to restore
+            updateEntryRunnable = UpdateEntryRunnable(context,
+                    database,
+                    mainEntry,
+                    historyToRestore,
+                    saveDatabase,
+                    null)
+
+            updateEntryRunnable?.onStartRun()
+
+        } catch (e: Exception) {
+            setError(e)
+        }
+    }
+
+    override fun onActionRun() {
+        updateEntryRunnable?.onActionRun()
+    }
+
+    override fun onFinishRun() {
+        updateEntryRunnable?.onFinishRun()
+    }
+}

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

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 package com.kunzisoft.keepass.database.action.node
 
 import android.content.Context

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

@@ -1,35 +1,35 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action.node
 
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.EntryVersioned
+import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.GroupVersioned
+import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.NodeVersioned
+import com.kunzisoft.keepass.database.element.node.Node
 
 class AddEntryRunnable constructor(
         context: Context,
         database: Database,
-        private val mNewEntry: EntryVersioned,
+        private val mNewEntry: Entry,
-        private val mParent: GroupVersioned,
+        private val mParent: Group,
         save: Boolean,
         afterActionNodesFinish: AfterActionNodesFinish?)
     : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
@@ -47,8 +47,8 @@ class AddEntryRunnable constructor(
             }
         }
 
-        val oldNodesReturn = ArrayList<NodeVersioned>()
+        val oldNodesReturn = ArrayList<Node>()
-        val newNodesReturn = ArrayList<NodeVersioned>()
+        val newNodesReturn = ArrayList<Node>()
         newNodesReturn.add(mNewEntry)
         return ActionNodesValues(oldNodesReturn, newNodesReturn)
     }

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

@@ -1,34 +1,34 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action.node
 
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.GroupVersioned
+import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.NodeVersioned
+import com.kunzisoft.keepass.database.element.node.Node
 
 class AddGroupRunnable constructor(
         context: Context,
         database: Database,
-        private val mNewGroup: GroupVersioned,
+        private val mNewGroup: Group,
-        private val mParent: GroupVersioned,
+        private val mParent: Group,
         save: Boolean,
         afterActionNodesFinish: AfterActionNodesFinish?)
     : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
@@ -44,8 +44,8 @@ class AddGroupRunnable constructor(
             database.removeGroupFrom(mNewGroup, mParent)
         }
 
-        val oldNodesReturn = ArrayList<NodeVersioned>()
+        val oldNodesReturn = ArrayList<Node>()
-        val newNodesReturn = ArrayList<NodeVersioned>()
+        val newNodesReturn = ArrayList<Node>()
         newNodesReturn.add(mNewGroup)
         return ActionNodesValues(oldNodesReturn, newNodesReturn)
     }

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

@@ -1,25 +1,25 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action.node
 
-import com.kunzisoft.keepass.database.element.NodeVersioned
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.tasks.ActionRunnable
 
 /**
@@ -30,7 +30,7 @@ import com.kunzisoft.keepass.tasks.ActionRunnable
  * - Move : @param oldNodes empty, @param newNodes NodesToMove
  * - Update : @param oldNodes NodesToUpdate, @param newNodes NodesUpdated
  */
-class ActionNodesValues(val oldNodes: List<NodeVersioned>, val newNodes: List<NodeVersioned>)
+class ActionNodesValues(val oldNodes: List<Node>, val newNodes: List<Node>)
 
 abstract class AfterActionNodesFinish {
     abstract fun onActionNodesFinish(result: ActionRunnable.Result, actionNodesValues: ActionNodesValues)

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

@@ -1,20 +1,20 @@
 /*
  * Copyright 2019 Jeremy Jamet / Kunzisoft.
  *     
- * This file is part of KeePass DX.
+ * This file is part of KeePassDX.
  *
- *  KeePass DX is free software: you can redistribute it and/or modify
+ *  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.
  *
- *  KeePass DX is distributed in the hope that it will be useful,
+ *  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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 package com.kunzisoft.keepass.database.action.node
@@ -22,19 +22,21 @@ package com.kunzisoft.keepass.database.action.node
 import android.content.Context
 import android.util.Log
 import com.kunzisoft.keepass.database.element.*
-import com.kunzisoft.keepass.database.exception.CopyDatabaseEntryException
+import com.kunzisoft.keepass.database.element.node.Node
-import com.kunzisoft.keepass.database.exception.CopyDatabaseGroupException
+import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.exception.CopyEntryDatabaseException
+import com.kunzisoft.keepass.database.exception.CopyGroupDatabaseException
 
 class CopyNodesRunnable constructor(
         context: Context,
         database: Database,
-        private val mNodesToCopy: List<NodeVersioned>,
+        private val mNodesToCopy: List<Node>,
-        private val mNewParent: GroupVersioned,
+        private val mNewParent: Group,
         save: Boolean,
         afterActionNodesFinish: AfterActionNodesFinish?)
     : ActionNodeDatabaseRunnable(context, database, afterActionNodesFinish, save) {
 
-    private var mEntriesCopied = ArrayList<EntryVersioned>()
+    private var mEntriesCopied = ArrayList<Entry>()
 
     override fun nodeAction() {
 
@@ -42,7 +44,7 @@ class CopyNodesRunnable constructor(
             when (currentNode.type) {
                 Type.GROUP -> {
                     Log.e(TAG, "Copy not allowed for group")// Only finish thread
-                    setError(CopyDatabaseGroupException())
+                    setError(CopyGroupDatabaseException())
                     break@foreachNode
                 }
                 Type.ENTRY -> {
@@ -51,18 +53,18 @@ class CopyNodesRunnable constructor(
                         // Update entry with new values
                         mNewParent.touch(modified = false, touchParents = true)
 
-                        val entryCopied = database.copyEntryTo(currentNode as EntryVersioned, mNewParent)
+                        val entryCopied = database.copyEntryTo(currentNode as Entry, mNewParent)
                         if (entryCopied != null) {
                             entryCopied.touch(modified = true, touchParents = true)
                             mEntriesCopied.add(entryCopied)
                         } else {
                             Log.e(TAG, "Unable to create a copy of the entry")
-                            setError(CopyDatabaseEntryException())
+                            setError(CopyEntryDatabaseException())
                             break@foreachNode
                         }
                     } else {
                         // Only finish thread
-                        setError(CopyDatabaseEntryException())
+                        setError(CopyEntryDatabaseException())
                         break@foreachNode
                     }
                 }