Merge branch 'release/2.9.15'

Currently translated at 98.6% (515 of 522 strings)

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

CHANGELOG

@@ -1,3 +1,17 @@
+KeePassDX(2.9.15)
+ * Fix themes #935 #926
+ * Decrease default clipboard time #934
+ * Better opening performance #929 #933
+ * Fix memory usage setting #941
+
+KeePassDX(2.9.14)
+ * Add custom icons #96
+ * Dark Themes #532 #714
+ * Fix binary deduplication #715
+ * Fix IconId #901
+ * Resize image stream dynamically to prevent slowdown #919
+ * Small changes #795 #900 #903 #909 #914
+
 KeePassDX(2.9.13)
  * Binary image viewer #473 #749
  * Fix TOTP plugin settings #878

app/build.gradle

@@ -1,19 +1,18 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    buildToolsVersion "30.0.3"
-    ndkVersion '21.3.6528147'
+    ndkVersion "21.4.7075529"
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
-        minSdkVersion 14
+        minSdkVersion 15
         targetSdkVersion 30
-        versionCode = 57
+        versionCode = 68
-        versionName = "2.9.13"
+        versionName = "2.9.15"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -30,12 +29,6 @@ android {
         }
     }
 
-    externalNativeBuild {
-        cmake {
-            path "src/main/jni/CMakeLists.txt"
-        }
-    }
-
     buildTypes {
         release {
             minifyEnabled = false
@@ -51,7 +44,11 @@ android {
             buildConfigField "String", "BUILD_VERSION", "\"libre\""
             buildConfigField "boolean", "FULL_VERSION", "true"
             buildConfigField "boolean", "CLOSED_STORE", "false"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
         }
         pro {
@@ -70,7 +67,13 @@ android {
             buildConfigField "String", "BUILD_VERSION", "\"free\""
             buildConfigField "boolean", "FULL_VERSION", "false"
             buildConfigField "boolean", "CLOSED_STORE", "true"
-            buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}"
+            buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Blue\"," +
+                            "\"KeepassDXStyle_Blue_Night\"," +
+                            "\"KeepassDXStyle_Red\"," +
+                            "\"KeepassDXStyle_Red_Night\"," +
+                            "\"KeepassDXStyle_Purple\"," +
+                            "\"KeepassDXStyle_Purple_Dark\"}"
             buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
             manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ]
         }
@@ -104,20 +107,19 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.biometric:biometric:1.1.0-rc01'
     // Lifecycle - LiveData - ViewModel - Coroutines
     implementation "androidx.core:core-ktx:1.3.2"
     implementation 'androidx.fragment:fragment-ktx:1.2.5'
-    // WARNING: To upgrade with style, bug in edit text
+    // WARNING: Don't upgrade because slowdown https://github.com/Kunzisoft/KeePassDX/issues/923
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     // Database
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     // Autofill
-    implementation "androidx.autofill:autofill:1.1.0-rc01"
+    implementation "androidx.autofill:autofill:1.1.0"
-    // Crypto
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.65.01'
     // Time
     implementation 'joda-time:joda-time:2.10.6'
     // Color
@@ -125,9 +127,10 @@ dependencies {
     // Education
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     // Apache Commons
-    implementation 'commons-collections:commons-collections:3.2.2'
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'commons-codec:commons-codec:1.15'
+    // Encrypt lib
+    implementation project(path: ':crypto')
     // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')

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

@@ -1,67 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.tests.crypto
-
-import org.junit.Assert.assertArrayEquals
-
-import java.io.IOException
-import java.util.Random
-
-import junit.framework.TestCase
-
-import com.kunzisoft.keepass.crypto.finalkey.AndroidAESKeyTransformer
-import com.kunzisoft.keepass.crypto.finalkey.NativeAESKeyTransformer
-
-class AESKeyTest : TestCase() {
-    private lateinit var mRand: Random
-
-    @Throws(Exception::class)
-    override fun setUp() {
-        super.setUp()
-
-        mRand = Random()
-    }
-
-    @Throws(IOException::class)
-    fun testAES() {
-        // Test both an old and an even number to test my flip variable
-        testAESFinalKey(5)
-        testAESFinalKey(6)
-    }
-
-    @Throws(IOException::class)
-    private fun testAESFinalKey(rounds: Long) {
-        val seed = ByteArray(32)
-        val key = ByteArray(32)
-        val nativeKey: ByteArray?
-        val androidKey: ByteArray?
-
-        mRand.nextBytes(seed)
-        mRand.nextBytes(key)
-
-        val androidAESKey = AndroidAESKeyTransformer()
-        androidKey = androidAESKey.transformMasterKey(seed, key, rounds)
-
-        val nativeAESKey = NativeAESKeyTransformer()
-        nativeKey = nativeAESKey.transformMasterKey(seed, key, rounds)
-
-        assertArrayEquals("Does not match", androidKey, nativeKey)
-    }
-}

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

@@ -1,83 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.tests.crypto
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-
-import junit.framework.TestCase
-
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.Random
-
-import javax.crypto.BadPaddingException
-import javax.crypto.Cipher
-import javax.crypto.IllegalBlockSizeException
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-import org.junit.Assert.assertArrayEquals
-
-class AESTest : TestCase() {
-
-    private val mRand = Random()
-
-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidAlgorithmParameterException::class)
-    fun testEncrypt() {
-        // Test above below and at the blocksize
-        testFinal(15)
-        testFinal(16)
-        testFinal(17)
-
-        // Test random larger sizes
-        val size = mRand.nextInt(494) + 18
-        testFinal(size)
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, IllegalBlockSizeException::class, BadPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    private fun testFinal(dataSize: Int) {
-
-        // Generate some input
-        val input = ByteArray(dataSize)
-        mRand.nextBytes(input)
-
-        // Generate key
-        val keyArray = ByteArray(32)
-        mRand.nextBytes(keyArray)
-        val key = SecretKeySpec(keyArray, "AES")
-
-        // Generate IV
-        val ivArray = ByteArray(16)
-        mRand.nextBytes(ivArray)
-        val iv = IvParameterSpec(ivArray)
-
-        val android = CipherFactory.getInstance("AES/CBC/PKCS5Padding", true)
-        android.init(Cipher.ENCRYPT_MODE, key, iv)
-        val outAndroid = android.doFinal(input, 0, dataSize)
-
-        val nat = CipherFactory.getInstance("AES/CBC/PKCS5Padding")
-        nat.init(Cipher.ENCRYPT_MODE, key, iv)
-        val outNative = nat.doFinal(input, 0, dataSize)
-
-        assertArrayEquals("Arrays differ on size: $dataSize", outAndroid, outNative)
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
  *
  * This file is part of KeePassDX.
  *
@@ -19,44 +19,32 @@
  */
 package com.kunzisoft.keepass.tests.crypto
 
+import com.kunzisoft.keepass.utils.readBytesLength
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import org.junit.Assert.assertArrayEquals
-
+import org.junit.Test
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
-import java.io.IOException
+import java.util.*
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.Random
-
-import javax.crypto.BadPaddingException
 import javax.crypto.Cipher
+import javax.crypto.CipherInputStream
 import javax.crypto.CipherOutputStream
-import javax.crypto.IllegalBlockSizeException
-import javax.crypto.NoSuchPaddingException
 
-import junit.framework.TestCase
+class EncryptionTest {
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.stream.BetterCipherInputStream
-import com.kunzisoft.keepass.stream.LittleEndianDataInputStream
-
-class CipherTest : TestCase() {
     private val rand = Random()
 
-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidAlgorithmParameterException::class, IllegalBlockSizeException::class, BadPaddingException::class)
+    @Test
     fun testCipherFactory() {
         val key = ByteArray(32)
+        rand.nextBytes(key)
+
         val iv = ByteArray(16)
+        rand.nextBytes(iv)
 
         val plaintext = ByteArray(1024)
-
-        rand.nextBytes(key)
-        rand.nextBytes(iv)
         rand.nextBytes(plaintext)
 
-        val aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID)
+        val aes = EncryptionAlgorithm.AESRijndael.cipherEngine
         val encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv)
         val decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv)
 
@@ -66,20 +54,20 @@ class CipherTest : TestCase() {
         assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext)
     }
 
-    @Throws(InvalidKeyException::class, NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidAlgorithmParameterException::class, IllegalBlockSizeException::class, BadPaddingException::class, IOException::class)
+    @Test
     fun testCipherStreams() {
-        val MESSAGE_LENGTH = 1024
+        val length = 1024
 
         val key = ByteArray(32)
-        val iv = ByteArray(16)
-
-        val plaintext = ByteArray(MESSAGE_LENGTH)
-
         rand.nextBytes(key)
+
+        val iv = ByteArray(16)
         rand.nextBytes(iv)
+
+        val plaintext = ByteArray(length)
         rand.nextBytes(plaintext)
 
-        val aes = CipherFactory.getInstance(AesEngine.CIPHER_UUID)
+        val aes = EncryptionAlgorithm.AESRijndael.cipherEngine
         val encrypt = aes.getCipher(Cipher.ENCRYPT_MODE, key, iv)
         val decrypt = aes.getCipher(Cipher.DECRYPT_MODE, key, iv)
 
@@ -91,10 +79,9 @@ class CipherTest : TestCase() {
         val secrettext = bos.toByteArray()
 
         val bis = ByteArrayInputStream(secrettext)
-        val cis = BetterCipherInputStream(bis, decrypt)
+        val cis = CipherInputStream(bis, decrypt)
-        val lis = LittleEndianDataInputStream(cis)
 
-        val decrypttext = lis.readBytes(MESSAGE_LENGTH)
+        val decrypttext = cis.readBytesLength(length)
 
         assertArrayEquals("Encryption and decryption failed", plaintext, decrypttext)
     }

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

@@ -1,156 +0,0 @@
-package com.kunzisoft.keepass.tests.stream
-
-import android.content.Context
-import androidx.test.platform.app.InstrumentationRegistry
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.database.BinaryAttachment
-import com.kunzisoft.keepass.stream.readAllBytes
-import com.kunzisoft.keepass.utils.UriUtil
-import junit.framework.TestCase.assertEquals
-import org.junit.Test
-import java.io.DataInputStream
-import java.io.File
-import java.io.InputStream
-import java.lang.Exception
-import java.security.MessageDigest
-
-class BinaryAttachmentTest {
-
-    private val context: Context by lazy {
-        InstrumentationRegistry.getInstrumentation().context
-    }
-
-    private val cacheDirectory = UriUtil.getBinaryDir(InstrumentationRegistry.getInstrumentation().targetContext)
-    private val fileA = File(cacheDirectory, TEST_FILE_CACHE_A)
-    private val fileB = File(cacheDirectory, TEST_FILE_CACHE_B)
-    private val fileC = File(cacheDirectory, TEST_FILE_CACHE_C)
-
-    private val loadedKey = Database.LoadedKey.generateNewCipherKey()
-
-    private fun saveBinary(asset: String, binaryAttachment: BinaryAttachment) {
-        context.assets.open(asset).use { assetInputStream ->
-            binaryAttachment.getOutputDataStream(loadedKey).use { binaryOutputStream ->
-                assetInputStream.readAllBytes(DEFAULT_BUFFER_SIZE) { buffer ->
-                    binaryOutputStream.write(buffer)
-                }
-            }
-        }
-    }
-
-    @Test
-    fun testSaveTextInCache() {
-        val binaryA = BinaryAttachment(fileA)
-        val binaryB = BinaryAttachment(fileB)
-        saveBinary(TEST_TEXT_ASSET, binaryA)
-        saveBinary(TEST_TEXT_ASSET, binaryB)
-        assertEquals("Save text binary length failed.", binaryA.length, binaryB.length)
-        assertEquals("Save text binary MD5 failed.", binaryA.md5(), binaryB.md5())
-    }
-
-    @Test
-    fun testSaveImageInCache() {
-        val binaryA = BinaryAttachment(fileA)
-        val binaryB = BinaryAttachment(fileB)
-        saveBinary(TEST_IMAGE_ASSET, binaryA)
-        saveBinary(TEST_IMAGE_ASSET, binaryB)
-        assertEquals("Save image binary length failed.", binaryA.length, binaryB.length)
-        assertEquals("Save image binary failed.", binaryA.md5(), binaryB.md5())
-    }
-
-    @Test
-    fun testCompressText() {
-        val binaryA = BinaryAttachment(fileA)
-        val binaryB = BinaryAttachment(fileB)
-        val binaryC = BinaryAttachment(fileC)
-        saveBinary(TEST_TEXT_ASSET, binaryA)
-        saveBinary(TEST_TEXT_ASSET, binaryB)
-        saveBinary(TEST_TEXT_ASSET, binaryC)
-        binaryA.compress(loadedKey)
-        binaryB.compress(loadedKey)
-        assertEquals("Compress text length failed.", binaryA.length, binaryB.length)
-        assertEquals("Compress text MD5 failed.", binaryA.md5(), binaryB.md5())
-        binaryB.decompress(loadedKey)
-        assertEquals("Decompress text length failed.", binaryB.length, binaryC.length)
-        assertEquals("Decompress text MD5 failed.", binaryB.md5(), binaryC.md5())
-    }
-
-    @Test
-    fun testCompressImage() {
-        val binaryA = BinaryAttachment(fileA)
-        var binaryB = BinaryAttachment(fileB)
-        val binaryC = BinaryAttachment(fileC)
-        saveBinary(TEST_IMAGE_ASSET, binaryA)
-        saveBinary(TEST_IMAGE_ASSET, binaryB)
-        saveBinary(TEST_IMAGE_ASSET, binaryC)
-        binaryA.compress(loadedKey)
-        binaryB.compress(loadedKey)
-        assertEquals("Compress image length failed.", binaryA.length, binaryA.length)
-        assertEquals("Compress image failed.", binaryA.md5(), binaryA.md5())
-        binaryB = BinaryAttachment(fileB, true)
-        binaryB.decompress(loadedKey)
-        assertEquals("Decompress image length failed.", binaryB.length, binaryC.length)
-        assertEquals("Decompress image failed.", binaryB.md5(), binaryC.md5())
-    }
-
-    @Test
-    fun testReadText() {
-        val binaryA = BinaryAttachment(fileA)
-        saveBinary(TEST_TEXT_ASSET, binaryA)
-        assert(streamAreEquals(context.assets.open(TEST_TEXT_ASSET),
-                binaryA.getInputDataStream(loadedKey)))
-    }
-
-    @Test
-    fun testReadImage() {
-        val binaryA = BinaryAttachment(fileA)
-        saveBinary(TEST_IMAGE_ASSET, binaryA)
-        assert(streamAreEquals(context.assets.open(TEST_IMAGE_ASSET),
-                binaryA.getInputDataStream(loadedKey)))
-    }
-
-    private fun streamAreEquals(inputStreamA: InputStream,
-                                inputStreamB: InputStream): Boolean {
-        val bufferA = ByteArray(DEFAULT_BUFFER_SIZE)
-        val bufferB = ByteArray(DEFAULT_BUFFER_SIZE)
-        val dataInputStreamB = DataInputStream(inputStreamB)
-        try {
-            var len: Int
-            while (inputStreamA.read(bufferA).also { len = it } > 0) {
-                dataInputStreamB.readFully(bufferB, 0, len)
-                for (i in 0 until len) {
-                    if (bufferA[i] != bufferB[i])
-                        return false
-                }
-            }
-            return inputStreamB.read() < 0 // is the end of the second file also.
-        } catch (e: Exception) {
-            return false
-        }
-        finally {
-            inputStreamA.close()
-            inputStreamB.close()
-        }
-    }
-
-    private fun BinaryAttachment.md5(): String {
-        val md = MessageDigest.getInstance("MD5")
-        return this.getInputDataStream(loadedKey).use { fis ->
-            val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
-            generateSequence {
-                when (val bytesRead = fis.read(buffer)) {
-                    -1 -> null
-                    else -> bytesRead
-                }
-            }.forEach { bytesRead -> md.update(buffer, 0, bytesRead) }
-            md.digest().joinToString("") { "%02x".format(it) }
-        }
-    }
-
-    companion object {
-        private const val TEST_FILE_CACHE_A = "testA"
-        private const val TEST_FILE_CACHE_B = "testB"
-        private const val TEST_FILE_CACHE_C = "testC"
-        private const val TEST_IMAGE_ASSET = "test_image.png"
-        private const val TEST_TEXT_ASSET = "test_text.txt"
-    }
-}

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

@@ -0,0 +1,176 @@
+package com.kunzisoft.keepass.tests.stream
+
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
+import com.kunzisoft.keepass.utils.readAllBytes
+import com.kunzisoft.keepass.database.element.binary.BinaryCache
+import com.kunzisoft.keepass.database.element.binary.BinaryFile
+import com.kunzisoft.keepass.utils.UriUtil
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import java.io.DataInputStream
+import java.io.File
+import java.io.InputStream
+import kotlin.random.Random
+
+class BinaryDataTest {
+
+    private val context: Context by lazy {
+        InstrumentationRegistry.getInstrumentation().context
+    }
+
+    private val cacheDirectory = UriUtil.getBinaryDir(InstrumentationRegistry.getInstrumentation().targetContext)
+    private val fileA = File(cacheDirectory, TEST_FILE_CACHE_A)
+    private val fileB = File(cacheDirectory, TEST_FILE_CACHE_B)
+    private val fileC = File(cacheDirectory, TEST_FILE_CACHE_C)
+
+    private val binaryCache = BinaryCache()
+
+    private fun saveBinary(asset: String, binaryData: BinaryFile) {
+        context.assets.open(asset).use { assetInputStream ->
+            binaryData.getOutputDataStream(binaryCache).use { binaryOutputStream ->
+                assetInputStream.readAllBytes(DEFAULT_BUFFER_SIZE) { buffer ->
+                    binaryOutputStream.write(buffer)
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testSaveTextInCache() {
+        val binaryA = BinaryFile(fileA)
+        val binaryB = BinaryFile(fileB)
+        saveBinary(TEST_TEXT_ASSET, binaryA)
+        saveBinary(TEST_TEXT_ASSET, binaryB)
+        assertEquals("Save text binary length failed.", binaryA.getSize(), binaryB.getSize())
+        assertEquals("Save text binary MD5 failed.", binaryA.binaryHash(), binaryB.binaryHash())
+    }
+
+    @Test
+    fun testSaveImageInCache() {
+        val binaryA = BinaryFile(fileA)
+        val binaryB = BinaryFile(fileB)
+        saveBinary(TEST_IMAGE_ASSET, binaryA)
+        saveBinary(TEST_IMAGE_ASSET, binaryB)
+        assertEquals("Save image binary length failed.", binaryA.getSize(), binaryB.getSize())
+        assertEquals("Save image binary failed.", binaryA.binaryHash(), binaryB.binaryHash())
+    }
+
+    @Test
+    fun testCompressText() {
+        val binaryA = BinaryFile(fileA)
+        val binaryB = BinaryFile(fileB)
+        val binaryC = BinaryFile(fileC)
+        saveBinary(TEST_TEXT_ASSET, binaryA)
+        saveBinary(TEST_TEXT_ASSET, binaryB)
+        saveBinary(TEST_TEXT_ASSET, binaryC)
+        binaryA.compress(binaryCache)
+        binaryB.compress(binaryCache)
+        assertEquals("Compress text length failed.", binaryA.getSize(), binaryB.getSize())
+        assertEquals("Compress text MD5 failed.", binaryA.binaryHash(), binaryB.binaryHash())
+        binaryB.decompress(binaryCache)
+        assertEquals("Decompress text length failed.", binaryB.getSize(), binaryC.getSize())
+        assertEquals("Decompress text MD5 failed.", binaryB.binaryHash(), binaryC.binaryHash())
+    }
+
+    @Test
+    fun testCompressImage() {
+        val binaryA = BinaryFile(fileA)
+        var binaryB = BinaryFile(fileB)
+        val binaryC = BinaryFile(fileC)
+        saveBinary(TEST_IMAGE_ASSET, binaryA)
+        saveBinary(TEST_IMAGE_ASSET, binaryB)
+        saveBinary(TEST_IMAGE_ASSET, binaryC)
+        binaryA.compress(binaryCache)
+        binaryB.compress(binaryCache)
+        assertEquals("Compress image length failed.", binaryA.getSize(), binaryA.getSize())
+        assertEquals("Compress image failed.", binaryA.binaryHash(), binaryA.binaryHash())
+        binaryB = BinaryFile(fileB, true)
+        binaryB.decompress(binaryCache)
+        assertEquals("Decompress image length failed.", binaryB.getSize(), binaryC.getSize())
+        assertEquals("Decompress image failed.", binaryB.binaryHash(), binaryC.binaryHash())
+    }
+
+    @Test
+    fun testCompressBytes() {
+        // Test random byte array
+        val byteArray = ByteArray(50)
+        Random.nextBytes(byteArray)
+        testCompressBytes(byteArray)
+
+        // Test empty byte array
+        testCompressBytes(ByteArray(0))
+    }
+
+    private fun testCompressBytes(byteArray: ByteArray) {
+        val binaryA = binaryCache.getBinaryData("0", true)
+        binaryA.getOutputDataStream(binaryCache).use { outputStream ->
+            outputStream.write(byteArray)
+        }
+        val binaryB = binaryCache.getBinaryData("1", true)
+        binaryB.getOutputDataStream(binaryCache).use { outputStream ->
+            outputStream.write(byteArray)
+        }
+        val binaryC = binaryCache.getBinaryData("2", true)
+        binaryC.getOutputDataStream(binaryCache).use { outputStream ->
+            outputStream.write(byteArray)
+        }
+        binaryA.compress(binaryCache)
+        binaryB.compress(binaryCache)
+        assertEquals("Compress bytes decompressed failed.", binaryA.isCompressed, true)
+        assertEquals("Compress bytes length failed.", binaryA.getSize(), binaryA.getSize())
+        assertEquals("Compress bytes failed.", binaryA.binaryHash(), binaryA.binaryHash())
+        binaryB.decompress(binaryCache)
+        assertEquals("Decompress bytes decompressed failed.", binaryB.isCompressed, false)
+        assertEquals("Decompress bytes length failed.", binaryB.getSize(), binaryC.getSize())
+        assertEquals("Decompress bytes failed.", binaryB.binaryHash(), binaryC.binaryHash())
+    }
+
+    @Test
+    fun testReadText() {
+        val binaryA = BinaryFile(fileA)
+        saveBinary(TEST_TEXT_ASSET, binaryA)
+        assert(streamAreEquals(context.assets.open(TEST_TEXT_ASSET),
+                binaryA.getInputDataStream(binaryCache)))
+    }
+
+    @Test
+    fun testReadImage() {
+        val binaryA = BinaryFile(fileA)
+        saveBinary(TEST_IMAGE_ASSET, binaryA)
+        assert(streamAreEquals(context.assets.open(TEST_IMAGE_ASSET),
+                binaryA.getInputDataStream(binaryCache)))
+    }
+
+    private fun streamAreEquals(inputStreamA: InputStream,
+                                inputStreamB: InputStream): Boolean {
+        val bufferA = ByteArray(DEFAULT_BUFFER_SIZE)
+        val bufferB = ByteArray(DEFAULT_BUFFER_SIZE)
+        val dataInputStreamB = DataInputStream(inputStreamB)
+        try {
+            var len: Int
+            while (inputStreamA.read(bufferA).also { len = it } > 0) {
+                dataInputStreamB.readFully(bufferB, 0, len)
+                for (i in 0 until len) {
+                    if (bufferA[i] != bufferB[i])
+                        return false
+                }
+            }
+            return inputStreamB.read() < 0 // is the end of the second file also.
+        } catch (e: Exception) {
+            return false
+        }
+        finally {
+            inputStreamA.close()
+            inputStreamB.close()
+        }
+    }
+
+    companion object {
+        private const val TEST_FILE_CACHE_A = "testA"
+        private const val TEST_FILE_CACHE_B = "testB"
+        private const val TEST_FILE_CACHE_C = "testC"
+        private const val TEST_IMAGE_ASSET = "test_image.png"
+        private const val TEST_TEXT_ASSET = "test_text.txt"
+    }
+}

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

@@ -20,9 +20,7 @@
 package com.kunzisoft.keepass.tests.utils
 
 import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.stream.*
+import com.kunzisoft.keepass.utils.*
-import com.kunzisoft.keepass.utils.UnsignedInt
-import com.kunzisoft.keepass.utils.UnsignedLong
 import junit.framework.TestCase
 import org.junit.Assert.assertArrayEquals
 import java.io.ByteArrayOutputStream
@@ -54,7 +52,7 @@ class ValuesTest : TestCase() {
         val orig = ByteArray(8)
         setArray(orig, value, 8)
 
-        assertArrayEquals(orig, longTo8Bytes(bytes64ToLong(orig)))
+        assertArrayEquals(orig, uLongTo8Bytes(bytes64ToULong(orig)))
     }
 
     fun testReadWriteIntZero() {
@@ -133,7 +131,7 @@ class ValuesTest : TestCase() {
     }
 
     private fun testReadWriteByte(value: Byte) {
-        val dest: Byte = UnsignedInt(UnsignedInt.fromKotlinByte(value)).toKotlinByte()
+        val dest: Byte = UnsignedInt(value.toInt() and 0xFF).toKotlinByte()
         assert(value == dest)
     }
 
@@ -144,13 +142,11 @@ class ValuesTest : TestCase() {
         expected.set(2008, 1, 2, 3, 4, 5)
 
         val actual = Calendar.getInstance()
-        dateTo5Bytes(expected.time, cal)?.let { buf ->
+        actual.time = DateInstant(bytes5ToDate(dateTo5Bytes(expected.time, cal), cal)).date
-            actual.time = bytes5ToDate(buf, cal).date
-        }
 
         val jDate = DateInstant(System.currentTimeMillis())
         val intermediate = DateInstant(jDate)
-        val cDate = bytes5ToDate(dateTo5Bytes(intermediate.date)!!)
+        val cDate = DateInstant(bytes5ToDate(dateTo5Bytes(intermediate.date)))
 
         assertEquals("Year mismatch: ", 2008, actual.get(Calendar.YEAR))
         assertEquals("Month mismatch: ", 1, actual.get(Calendar.MONTH))
@@ -183,12 +179,10 @@ class ValuesTest : TestCase() {
             ulongBytes[i] = -1
         }
 
-        val bos = ByteArrayOutputStream()
+        val byteArrayOutputStream = ByteArrayOutputStream()
-        val leos = LittleEndianDataOutputStream(bos)
+        byteArrayOutputStream.write(UnsignedLong.MAX_BYTES)
-        leos.writeLong(UnsignedLong.MAX_VALUE)
+        byteArrayOutputStream.close()
-        leos.close()
+        val uLongMax = byteArrayOutputStream.toByteArray()
-
-        val uLongMax = bos.toByteArray()
 
         assertArrayEquals(ulongBytes, uLongMax)
     }

app/src/main/AndroidManifest.xml

@@ -129,6 +129,9 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.EntryActivity"
             android:configChanges="keyboardHidden" />
+        <activity
+            android:name="com.kunzisoft.keepass.activities.IconPickerActivity"
+            android:configChanges="keyboardHidden" />
         <activity
             android:name="com.kunzisoft.keepass.activities.ImageViewerActivity"
             android:configChanges="keyboardHidden" />

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

@@ -47,7 +47,6 @@ import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
@@ -126,7 +125,7 @@ class EntryActivity : LockingActivity() {
         historyView = findViewById(R.id.history_container)
         entryContentsView = findViewById(R.id.entry_contents)
         entryContentsView?.applyFontVisibilityToFields(PreferencesUtil.fieldFontIsInVisibility(this))
-        entryContentsView?.setAttachmentCipherKey(mDatabase?.loadedCipherKey)
+        entryContentsView?.setAttachmentCipherKey(mDatabase)
         entryProgress = findViewById(R.id.entry_progress)
         lockView = findViewById(R.id.lock_button)
 
@@ -242,7 +241,9 @@ class EntryActivity : LockingActivity() {
         val entryInfo = entry.getEntryInfo(mDatabase)
 
         // Assign title icon
-        titleIconView?.assignDatabaseIcon(mDatabase!!.drawFactory, entryInfo.icon, iconColor)
+        titleIconView?.let { iconView ->
+            mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconView, entryInfo.icon, iconColor)
+        }
 
         // Assign title text
         val entryTitle = entryInfo.title

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

@@ -43,6 +43,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.*
 import com.kunzisoft.keepass.activities.dialogs.FileTooBigDialogFragment.Companion.MAX_WARNING_BINARY_FILE
+import com.kunzisoft.keepass.activities.fragments.EntryEditFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
 import com.kunzisoft.keepass.activities.lock.LockingActivity
@@ -78,7 +79,6 @@ import java.util.*
 import kotlin.collections.ArrayList
 
 class EntryEditActivity : LockingActivity(),
-        IconPickerDialogFragment.IconPickerListener,
         EntryCustomFieldDialogFragment.EntryCustomFieldListener,
         GeneratePasswordDialogFragment.GeneratePasswordListener,
         SetOTPDialogFragment.CreateOtpListener,
@@ -172,10 +172,14 @@ class EntryEditActivity : LockingActivity(),
             val parentIcon = mParent?.icon
             tempEntryInfo = mDatabase?.createEntry()?.getEntryInfo(mDatabase, true)
             // Set default icon
-            if (parentIcon != null
+            if (parentIcon != null) {
-                    && parentIcon.iconId != IconImage.UNKNOWN_ID
+                if (parentIcon.custom.isUnknown
-                    && parentIcon.iconId != IconImageStandard.FOLDER) {
+                        && parentIcon.standard.id != IconImageStandard.FOLDER_ID) {
-                tempEntryInfo?.icon = parentIcon
+                    tempEntryInfo?.icon = IconImage(parentIcon.standard)
+                }
+                if (!parentIcon.custom.isUnknown) {
+                    tempEntryInfo?.icon = IconImage(parentIcon.custom)
+                }
             }
             // Set default username
             tempEntryInfo?.username = mDatabase?.defaultUsername ?: ""
@@ -198,13 +202,13 @@ class EntryEditActivity : LockingActivity(),
         // Build fragment to manage entry modification
         entryEditFragment = supportFragmentManager.findFragmentByTag(ENTRY_EDIT_FRAGMENT_TAG) as? EntryEditFragment?
         if (entryEditFragment == null) {
-            entryEditFragment = EntryEditFragment.getInstance(tempEntryInfo, mDatabase?.loadedCipherKey)
+            entryEditFragment = EntryEditFragment.getInstance(tempEntryInfo)
         }
         supportFragmentManager.beginTransaction()
                 .replace(R.id.entry_edit_contents, entryEditFragment!!, ENTRY_EDIT_FRAGMENT_TAG)
                 .commit()
         entryEditFragment?.apply {
-            drawFactory = mDatabase?.drawFactory
+            drawFactory = mDatabase?.iconDrawableFactory
             setOnDateClickListener = {
                 expiryTime.date.let { expiresDate ->
                     val dateTime = DateTime(expiresDate)
@@ -219,8 +223,8 @@ class EntryEditActivity : LockingActivity(),
                 openPasswordGenerator()
             }
             // Add listener to the icon
-            setOnIconViewClickListener = View.OnClickListener {
+            setOnIconViewClickListener = { iconImage ->
-                IconPickerDialogFragment.launch(this@EntryEditActivity)
+                IconPickerActivity.launch(this@EntryEditActivity, iconImage)
             }
             setOnRemoveAttachment = { attachment ->
                 mAttachmentFileBinderManager?.removeBinaryAttachment(attachment)
@@ -481,7 +485,7 @@ class EntryEditActivity : LockingActivity(),
 
     private fun buildNewAttachment(attachmentToUploadUri: Uri, fileName: String) {
         val compression = mDatabase?.compressionForNewEntry() ?: false
-        mDatabase?.buildNewBinary(UriUtil.getBinaryDir(this), compression)?.let { binaryAttachment ->
+        mDatabase?.buildNewBinaryAttachment(compression)?.let { binaryAttachment ->
             val entryAttachment = Attachment(fileName, binaryAttachment)
             // Ask to replace the current attachment
             if ((mDatabase?.allowMultipleAttachments != true && entryEditFragment?.containsAttachment() == true) ||
@@ -497,9 +501,12 @@ class EntryEditActivity : LockingActivity(),
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
+        IconPickerActivity.onActivityResult(requestCode, resultCode, data) { icon ->
+            entryEditFragment?.icon = icon
+        }
+
         mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
             uri?.let { attachmentToUploadUri ->
-                // TODO Async to get the name
                 UriUtil.getFileData(this, attachmentToUploadUri)?.also { documentFile ->
                     documentFile.name?.let { fileName ->
                         if (documentFile.length() > MAX_WARNING_BINARY_FILE) {
@@ -565,7 +572,7 @@ class EntryEditActivity : LockingActivity(),
                 // Delete temp attachment if not used
                 mTempAttachments.forEach { tempAttachmentState ->
                     val tempAttachment = tempAttachmentState.attachment
-                    mDatabase?.binaryPool?.let { binaryPool ->
+                    mDatabase?.attachmentPool?.let { binaryPool ->
                         if (!newEntry.getAttachments(binaryPool).contains(tempAttachment)) {
                             mDatabase?.removeAttachmentIfNotUsed(tempAttachment)
                         }
@@ -711,12 +718,6 @@ class EntryEditActivity : LockingActivity(),
         }
     }
 
-    override fun iconPicked(bundle: Bundle) {
-        IconPickerDialogFragment.getIconStandardFromBundle(bundle)?.let { icon ->
-            entryEditFragment?.icon = icon
-        }
-    }
-
     override fun onDateSet(datePicker: DatePicker?, year: Int, month: Int, day: Int) {
         // To fix android 4.4 issue
         // https://stackoverflow.com/questions/12436073/datepicker-ondatechangedlistener-called-twice

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

@@ -63,14 +63,13 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.viewmodels.DatabaseFilesViewModel
-import kotlinx.android.synthetic.main.activity_file_selection.*
 import java.io.FileNotFoundException
 
 class FileDatabaseSelectActivity : SpecialModeActivity(),
         AssignMasterKeyDialogFragment.AssignPasswordDialogListener {
 
     // Views
-    private var coordinatorLayout: CoordinatorLayout? = null
+    private lateinit var coordinatorLayout: CoordinatorLayout
     private var createDatabaseButtonView: View? = null
     private var openDatabaseButtonView: View? = null
 
@@ -163,27 +162,31 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
 
         // Observe list of databases
         databaseFilesViewModel.databaseFilesLoaded.observe(this) { databaseFiles ->
-            when (databaseFiles.databaseFileAction) {
+            try {
-                DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
+                when (databaseFiles.databaseFileAction) {
-                    mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
+                    DatabaseFilesViewModel.DatabaseFileAction.NONE -> {
-                }
+                        mAdapterDatabaseHistory?.replaceAllDatabaseFileHistoryList(databaseFiles.databaseFileList)
-                DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
-                        mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
                     }
-                    GroupActivity.launch(this@FileDatabaseSelectActivity,
+                    DatabaseFilesViewModel.DatabaseFileAction.ADD -> {
-                            PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
+                        databaseFiles.databaseFileToActivate?.let { databaseFileToAdd ->
-                }
+                            mAdapterDatabaseHistory?.addDatabaseFileHistory(databaseFileToAdd)
-                DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
+                        }
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
+                        GroupActivity.launch(this@FileDatabaseSelectActivity,
-                        mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
+                                PreferencesUtil.enableReadOnlyDatabase(this@FileDatabaseSelectActivity))
-                    }
+                    }
-                }
+                    DatabaseFilesViewModel.DatabaseFileAction.UPDATE -> {
-                DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
+                        databaseFiles.databaseFileToActivate?.let { databaseFileToUpdate ->
-                    databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
+                            mAdapterDatabaseHistory?.updateDatabaseFileHistory(databaseFileToUpdate)
-                        mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
+                        }
+                    }
+                    DatabaseFilesViewModel.DatabaseFileAction.DELETE -> {
+                        databaseFiles.databaseFileToActivate?.let { databaseFileToDelete ->
+                            mAdapterDatabaseHistory?.deleteDatabaseFileHistory(databaseFileToDelete)
+                        }
                     }
                 }
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to observe database action", e)
             }
             databaseFilesViewModel.consumeAction()
         }
@@ -217,7 +220,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                                 resultError = "$resultError $resultMessage"
                             }
                             Log.e(TAG, resultError)
-                            Snackbar.make(activity_file_selection_coordinator_layout,
+                            Snackbar.make(coordinatorLayout,
                                     resultError,
                                     Snackbar.LENGTH_LONG).asError().show()
                         }
@@ -238,9 +241,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     private fun fileNoFoundAction(e: FileNotFoundException) {
         val error = getString(R.string.file_not_found_content)
         Log.e(TAG, error, e)
-        coordinatorLayout?.let {
+        Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
-            Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-        }
     }
 
     private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) {
@@ -344,7 +345,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
             }
         } catch (e: Exception) {
             val error = getString(R.string.error_create_database_file)
-            Snackbar.make(activity_file_selection_coordinator_layout, error, Snackbar.LENGTH_LONG).asError().show()
+            Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
             Log.e(TAG, error, e)
         }
     }
@@ -372,9 +373,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                         .show(supportFragmentManager, "passwordDialog")
             } else {
                 val error = getString(R.string.error_create_database)
-                coordinatorLayout?.let {
+                Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show()
-                    Snackbar.make(it, error, Snackbar.LENGTH_LONG).asError().show()
-                }
                 Log.e(TAG, error)
             }
         }
@@ -395,9 +394,10 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
     private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
         // If no recent files
         val createDatabaseEducationPerformed =
-                createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
+                createDatabaseButtonView != null
+                && createDatabaseButtonView!!.visibility == View.VISIBLE
                 && mAdapterDatabaseHistory != null
-                && mAdapterDatabaseHistory!!.itemCount > 0
+                && mAdapterDatabaseHistory!!.itemCount == 0
                 && fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
                         createDatabaseButtonView!!,
                 {

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

@@ -45,6 +45,7 @@ import androidx.fragment.app.FragmentManager
 import com.google.android.material.snackbar.Snackbar
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.*
+import com.kunzisoft.keepass.activities.fragments.ListNodesFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
@@ -59,7 +60,6 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.education.GroupActivityEducation
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.model.GroupInfo
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
@@ -81,7 +81,6 @@ import org.joda.time.DateTime
 
 class GroupActivity : LockingActivity(),
         GroupEditDialogFragment.EditGroupListener,
-        IconPickerDialogFragment.IconPickerListener,
         DatePickerDialog.OnDateSetListener,
         TimePickerDialog.OnTimeSetListener,
         ListNodesFragment.NodeClickListener,
@@ -105,7 +104,6 @@ class GroupActivity : LockingActivity(),
     private var mDatabase: Database? = null
 
     private var mListNodesFragment: ListNodesFragment? = null
-    private var mCurrentGroupIsASearch: Boolean = false
     private var mRequestStartupSearch = true
 
     private var actionNodeMode: ActionMode? = null
@@ -172,7 +170,7 @@ class GroupActivity : LockingActivity(),
         }
 
         mCurrentGroup = retrieveCurrentGroup(intent, savedInstanceState)
-        mCurrentGroupIsASearch = Intent.ACTION_SEARCH == intent.action
+        val currentGroupIsASearch = mCurrentGroup?.isVirtual == true
 
         Log.i(TAG, "Started creating tree")
         if (mCurrentGroup == null) {
@@ -181,13 +179,13 @@ class GroupActivity : LockingActivity(),
         }
 
         var fragmentTag = LIST_NODES_FRAGMENT_TAG
-        if (mCurrentGroupIsASearch)
+        if (currentGroupIsASearch)
             fragmentTag = SEARCH_FRAGMENT_TAG
 
         // Initialize the fragment with the list
         mListNodesFragment = supportFragmentManager.findFragmentByTag(fragmentTag) as ListNodesFragment?
         if (mListNodesFragment == null)
-            mListNodesFragment = ListNodesFragment.newInstance(mCurrentGroup, mReadOnly, mCurrentGroupIsASearch)
+            mListNodesFragment = ListNodesFragment.newInstance(mCurrentGroup, mReadOnly, currentGroupIsASearch)
 
         // Attach fragment to content view
         supportFragmentManager.beginTransaction().replace(
@@ -206,9 +204,11 @@ class GroupActivity : LockingActivity(),
 
         // Add listeners to the add buttons
         addNodeButtonView?.setAddGroupClickListener {
-            GroupEditDialogFragment.build()
+            GroupEditDialogFragment.create(GroupInfo().apply {
-                    .show(supportFragmentManager,
+                if (mCurrentGroup?.allowAddNoteInGroup == true) {
-                            GroupEditDialogFragment.TAG_CREATE_GROUP)
+                    notes = ""
+                }
+            }).show(supportFragmentManager, GroupEditDialogFragment.TAG_CREATE_GROUP)
         }
         addNodeButtonView?.setAddEntryClickListener {
             mCurrentGroup?.let { currentGroup ->
@@ -346,9 +346,7 @@ class GroupActivity : LockingActivity(),
                     ACTION_DATABASE_RELOAD_TASK -> {
                         // Reload the current activity
                         if (result.isSuccess) {
-                            startActivity(intent)
+                            reload()
-                            finish()
-                            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
                         } else {
                             this.showActionErrorIfNeeded(result)
                             finish()
@@ -367,6 +365,14 @@ class GroupActivity : LockingActivity(),
         Log.i(TAG, "Finished creating tree")
     }
 
+    private fun reload() {
+        // Reload the current activity
+        startActivity(intent)
+        finish()
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+        mDatabase?.wasReloaded = false
+    }
+
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
 
@@ -375,13 +381,10 @@ class GroupActivity : LockingActivity(),
             manageSearchInfoIntent(intentNotNull)
             Log.d(TAG, "setNewIntent: $intentNotNull")
             setIntent(intentNotNull)
-            mCurrentGroupIsASearch = if (Intent.ACTION_SEARCH == intentNotNull.action) {
+            if (Intent.ACTION_SEARCH == intentNotNull.action) {
                 // only one instance of search in backstack
                 deletePreviousSearchGroup()
                 openGroup(retrieveCurrentGroup(intentNotNull, null), true)
-                true
-            } else {
-                false
             }
         }
     }
@@ -465,12 +468,11 @@ class GroupActivity : LockingActivity(),
 
     private fun refreshSearchGroup() {
         deletePreviousSearchGroup()
-        if (mCurrentGroupIsASearch)
+        if (mCurrentGroup?.isVirtual == true)
             openGroup(retrieveCurrentGroup(intent, null), true)
     }
 
     private fun retrieveCurrentGroup(intent: Intent, savedInstanceState: Bundle?): Group? {
-
         // Force read only if the database is like that
         mReadOnly = mDatabase?.isReadOnly == true || mReadOnly
 
@@ -518,24 +520,21 @@ class GroupActivity : LockingActivity(),
                 }
             }
         }
-        if (mCurrentGroupIsASearch) {
-            searchTitleView?.visibility = View.VISIBLE
-        } else {
-            searchTitleView?.visibility = View.GONE
-        }
 
-        // Assign icon
+        if (mCurrentGroup?.isVirtual == true) {
-        if (mCurrentGroupIsASearch) {
+            searchTitleView?.visibility = View.VISIBLE
             if (toolbar != null) {
                 toolbar?.navigationIcon = null
             }
             iconView?.visibility = View.GONE
         } else {
+            searchTitleView?.visibility = View.GONE
             // Assign the group icon depending of IconPack or custom icon
             iconView?.visibility = View.VISIBLE
-            mCurrentGroup?.let {
+            mCurrentGroup?.let { currentGroup ->
-                if (mDatabase?.drawFactory != null)
+                iconView?.let { imageView ->
-                    iconView?.assignDatabaseIcon(mDatabase?.drawFactory!!, it.icon, mIconColor)
+                    mDatabase?.iconDrawableFactory?.assignDatabaseIcon(imageView, currentGroup.icon, mIconColor)
+                }
 
                 if (toolbar != null) {
                     if (mCurrentGroup?.containsParent() == true)
@@ -550,20 +549,25 @@ class GroupActivity : LockingActivity(),
         // Assign number of children
         refreshNumberOfChildren()
 
-        // Show button if allowed
+        // Hide button
-        addNodeButtonView?.apply {
+        initAddButton()
+    }
 
+    private fun initAddButton() {
+        addNodeButtonView?.apply {
+            closeButtonIfOpen()
             // To enable add button
-            val addGroupEnabled = !mReadOnly && !mCurrentGroupIsASearch
+            val addGroupEnabled = !mReadOnly && mCurrentGroup?.isVirtual != true
-            var addEntryEnabled = !mReadOnly && !mCurrentGroupIsASearch
+            var addEntryEnabled = !mReadOnly && mCurrentGroup?.isVirtual != true
             mCurrentGroup?.let {
-                if (!it.allowAddEntryIfIsRoot())
+                if (!it.allowAddEntryIfIsRoot)
                     addEntryEnabled = it != mRootGroup && addEntryEnabled
             }
             enableAddGroup(addGroupEnabled)
             enableAddEntry(addEntryEnabled)
-
+            if (mCurrentGroup?.isVirtual == true)
-            if (actionNodeMode == null)
+                hideButton()
+            else if (actionNodeMode == null)
                 showButton()
         }
     }
@@ -783,7 +787,7 @@ class GroupActivity : LockingActivity(),
         when (node.type) {
             Type.GROUP -> {
                 mOldGroupToUpdate = node as Group
-                GroupEditDialogFragment.build(mOldGroupToUpdate!!.getGroupInfo())
+                GroupEditDialogFragment.update(mOldGroupToUpdate!!.getGroupInfo())
                         .show(supportFragmentManager,
                                 GroupEditDialogFragment.TAG_CREATE_GROUP)
             }
@@ -893,6 +897,9 @@ class GroupActivity : LockingActivity(),
     override fun onResume() {
         super.onResume()
 
+        if (mDatabase?.wasReloaded == true) {
+            reload()
+        }
         // Show the lock button
         lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
             View.VISIBLE
@@ -1120,13 +1127,6 @@ class GroupActivity : LockingActivity(),
         // Do nothing here
     }
 
-    override// For icon in create tree dialog
-    fun iconPicked(bundle: Bundle) {
-        (supportFragmentManager
-                .findFragmentByTag(GroupEditDialogFragment.TAG_CREATE_GROUP) as GroupEditDialogFragment)
-                .iconPicked(bundle)
-    }
-
     override fun onSortSelected(sortNodeEnum: SortNodeEnum, sortNodeParameters: SortNodeEnum.SortNodeParameters) {
         mListNodesFragment?.onSortSelected(sortNodeEnum, sortNodeParameters)
     }
@@ -1165,6 +1165,13 @@ class GroupActivity : LockingActivity(),
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
+        // To create tree dialog for icon
+        IconPickerActivity.onActivityResult(requestCode, resultCode, data) { icon ->
+            (supportFragmentManager
+                    .findFragmentByTag(GroupEditDialogFragment.TAG_CREATE_GROUP) as GroupEditDialogFragment)
+                    .setIcon(icon)
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data)
         }
@@ -1189,7 +1196,6 @@ class GroupActivity : LockingActivity(),
         mCurrentGroup = mListNodesFragment?.mainGroup
         // Remove search in intent
         deletePreviousSearchGroup()
-        mCurrentGroupIsASearch = false
         if (Intent.ACTION_SEARCH == intent.action) {
             intent.action = Intent.ACTION_DEFAULT
             intent.removeExtra(SearchManager.QUERY)

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

@@ -0,0 +1,329 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.viewModels
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.commit
+import com.google.android.material.snackbar.Snackbar
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.fragments.IconPickerFragment
+import com.kunzisoft.keepass.activities.helpers.SelectFileHelper
+import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import com.kunzisoft.keepass.utils.UriUtil
+import com.kunzisoft.keepass.view.asError
+import com.kunzisoft.keepass.view.updateLockPaddingLeft
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+import kotlinx.coroutines.*
+
+
+class IconPickerActivity : LockingActivity() {
+
+    private lateinit var toolbar: Toolbar
+    private lateinit var coordinatorLayout: CoordinatorLayout
+    private lateinit var uploadButton: View
+    private var lockView: View? = null
+
+    private var mIconImage: IconImage = IconImage()
+
+    private val mainScope = CoroutineScope(Dispatchers.Main)
+
+    private val iconPickerViewModel: IconPickerViewModel by viewModels()
+    private var mCustomIconsSelectionMode = false
+    private var mIconsSelected: List<IconImageCustom> = ArrayList()
+
+    private var mDatabase: Database? = null
+
+    private var mSelectFileHelper: SelectFileHelper? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_icon_picker)
+
+        mDatabase = Database.getInstance()
+
+        toolbar = findViewById(R.id.toolbar)
+        toolbar.title = " "
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        updateIconsSelectedViews()
+
+        coordinatorLayout = findViewById(R.id.icon_picker_coordinator)
+
+        uploadButton = findViewById(R.id.icon_picker_upload)
+        if (mDatabase?.allowCustomIcons == true) {
+            uploadButton.setOnClickListener {
+                mSelectFileHelper?.selectFileOnClickViewListener?.onClick(it)
+            }
+            uploadButton.setOnLongClickListener {
+                mSelectFileHelper?.selectFileOnClickViewListener?.onLongClick(it)
+                true
+            }
+        } else {
+            uploadButton.visibility = View.GONE
+        }
+
+        lockView = findViewById(R.id.lock_button)
+        lockView?.setOnClickListener {
+            lockAndExit()
+        }
+
+        intent?.getParcelableExtra<IconImage>(EXTRA_ICON)?.let {
+            mIconImage = it
+        }
+
+        if (savedInstanceState == null) {
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                add(R.id.icon_picker_fragment, IconPickerFragment.getInstance(
+                        // Default selection tab
+                        if (mIconImage.custom.isUnknown)
+                            IconPickerFragment.IconTab.STANDARD
+                        else
+                            IconPickerFragment.IconTab.CUSTOM
+                ), ICON_PICKER_FRAGMENT_TAG)
+            }
+        } else {
+            mIconImage = savedInstanceState.getParcelable(EXTRA_ICON) ?: mIconImage
+        }
+
+        // Focus view to reinitialize timeout
+        findViewById<ViewGroup>(R.id.icon_picker_container)?.resetAppTimeoutWhenViewFocusedOrChanged(this)
+
+        mSelectFileHelper = SelectFileHelper(this)
+
+        iconPickerViewModel.standardIconPicked.observe(this) { iconStandard ->
+            mIconImage.standard = iconStandard
+            // Remove the custom icon if a standard one is selected
+            mIconImage.custom = IconImageCustom()
+            setResult()
+            finish()
+        }
+        iconPickerViewModel.customIconPicked.observe(this) { iconCustom ->
+            // Keep the standard icon if a custom one is selected
+            mIconImage.custom = iconCustom
+            setResult()
+            finish()
+        }
+        iconPickerViewModel.customIconsSelected.observe(this) { iconsSelected ->
+            mIconsSelected = iconsSelected
+            updateIconsSelectedViews()
+        }
+        iconPickerViewModel.customIconAdded.observe(this) { iconCustomAdded ->
+            if (iconCustomAdded.error && !iconCustomAdded.errorConsumed) {
+                Snackbar.make(coordinatorLayout, iconCustomAdded.errorStringId, Snackbar.LENGTH_LONG).asError().show()
+                iconCustomAdded.errorConsumed = true
+            }
+            uploadButton.isEnabled = true
+        }
+        iconPickerViewModel.customIconRemoved.observe(this) { iconCustomRemoved ->
+            if (iconCustomRemoved.error && !iconCustomRemoved.errorConsumed) {
+                Snackbar.make(coordinatorLayout, iconCustomRemoved.errorStringId, Snackbar.LENGTH_LONG).asError().show()
+                iconCustomRemoved.errorConsumed = true
+            }
+            uploadButton.isEnabled = true
+        }
+    }
+
+    private fun updateIconsSelectedViews() {
+        if (mIconsSelected.isEmpty()) {
+            mCustomIconsSelectionMode = false
+            toolbar.title = " "
+        } else {
+            mCustomIconsSelectionMode = true
+            toolbar.title = mIconsSelected.size.toString()
+        }
+        invalidateOptionsMenu()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putParcelable(EXTRA_ICON, mIconImage)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // Show the lock button
+        lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+
+        // Padding if lock button visible
+        toolbar.updateLockPaddingLeft()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        super.onCreateOptionsMenu(menu)
+
+        if (mCustomIconsSelectionMode) {
+            menuInflater.inflate(R.menu.icon, menu)
+        }
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                if (mCustomIconsSelectionMode) {
+                    iconPickerViewModel.deselectAllCustomIcons()
+                } else {
+                    onBackPressed()
+                }
+            }
+            R.id.menu_delete -> {
+                mIconsSelected.forEach { iconToRemove ->
+                    removeCustomIcon(iconToRemove)
+                }
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun addCustomIcon(iconToUploadUri: Uri?) {
+        uploadButton.isEnabled = false
+        mainScope.launch {
+            withContext(Dispatchers.IO) {
+                // on Progress with thread
+                val asyncResult: Deferred<IconPickerViewModel.IconCustomState?> = async {
+                    val iconCustomState = IconPickerViewModel.IconCustomState(null, true, R.string.error_upload_file)
+                    UriUtil.getFileData(this@IconPickerActivity, iconToUploadUri)?.also { documentFile ->
+                        if (documentFile.length() > MAX_ICON_SIZE) {
+                            iconCustomState.errorStringId = R.string.error_file_to_big
+                        } else {
+                            mDatabase?.buildNewCustomIcon { customIcon, binary ->
+                                if (customIcon != null) {
+                                    iconCustomState.iconCustom = customIcon
+                                    mDatabase?.let { database ->
+                                        BinaryDatabaseManager.resizeBitmapAndStoreDataInBinaryFile(
+                                                contentResolver,
+                                                database,
+                                                iconToUploadUri,
+                                                binary)
+                                        when {
+                                            binary == null -> {
+                                            }
+                                            binary.getSize() <= 0 -> {
+                                            }
+                                            database.isCustomIconBinaryDuplicate(binary) -> {
+                                                iconCustomState.errorStringId = R.string.error_duplicate_file
+                                            }
+                                            else -> {
+                                                iconCustomState.error = false
+                                            }
+                                        }
+                                    }
+                                    if (iconCustomState.error) {
+                                        mDatabase?.removeCustomIcon(customIcon)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    iconCustomState
+                }
+                withContext(Dispatchers.Main) {
+                    asyncResult.await()?.let { customIcon ->
+                        iconPickerViewModel.addCustomIcon(customIcon)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun removeCustomIcon(iconImageCustom: IconImageCustom) {
+        uploadButton.isEnabled = false
+        iconPickerViewModel.deselectAllCustomIcons()
+        mDatabase?.removeCustomIcon(iconImageCustom)
+        iconPickerViewModel.removeCustomIcon(
+                IconPickerViewModel.IconCustomState(iconImageCustom, false, R.string.error_remove_file)
+        )
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        mSelectFileHelper?.onActivityResultCallback(requestCode, resultCode, data) { uri ->
+            addCustomIcon(uri)
+        }
+    }
+
+    private fun setResult() {
+        setResult(Activity.RESULT_OK, Intent().apply {
+            putExtra(EXTRA_ICON, mIconImage)
+        })
+    }
+
+    override fun onBackPressed() {
+        setResult()
+        super.onBackPressed()
+    }
+
+    companion object {
+
+        private const val ICON_PICKER_FRAGMENT_TAG = "ICON_PICKER_FRAGMENT_TAG"
+
+        private const val ICON_SELECTED_REQUEST = 15861
+        private const val EXTRA_ICON = "EXTRA_ICON"
+
+        private const val MAX_ICON_SIZE = 5242880
+
+        fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?, listener: (icon: IconImage) -> Unit) {
+            if (requestCode == ICON_SELECTED_REQUEST) {
+                if (resultCode == Activity.RESULT_OK) {
+                    listener.invoke(data?.getParcelableExtra(EXTRA_ICON) ?: IconImage())
+                }
+            }
+        }
+
+        fun launch(context: Activity,
+                   previousIcon: IconImage?) {
+            // Create an instance to return the picker icon
+            context.startActivityForResult(
+                    Intent(context,
+                    IconPickerActivity::class.java).apply {
+                        if (previousIcon != null)
+                            putExtra(EXTRA_ICON, previousIcon)
+                    },
+                    ICON_SELECTED_REQUEST)
+        }
+    }
+}

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

@@ -26,6 +26,7 @@ import android.text.format.Formatter
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.igreenwood.loupe.Loupe
@@ -33,10 +34,13 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
-import kotlinx.android.synthetic.main.activity_image_viewer.*
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
+import kotlin.math.max
 
 class ImageViewerActivity : LockingActivity() {
 
+    private var mDatabase: Database? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -47,22 +51,39 @@ class ImageViewerActivity : LockingActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
+        val imageContainerView: ViewGroup = findViewById(R.id.image_viewer_container)
         val imageView: ImageView = findViewById(R.id.image_viewer_image)
         val progressView: View = findViewById(R.id.image_viewer_progress)
 
+        // Approximately, to not OOM and allow a zoom
+        val mImagePreviewMaxWidth = max(
+                resources.displayMetrics.widthPixels * 2,
+                resources.displayMetrics.heightPixels * 2
+        )
+
+        mDatabase = Database.getInstance()
+
         try {
             progressView.visibility = View.VISIBLE
             intent.getParcelableExtra<Attachment>(IMAGE_ATTACHMENT_TAG)?.let { attachment ->
 
                 supportActionBar?.title = attachment.name
-                supportActionBar?.subtitle = Formatter.formatFileSize(this, attachment.binaryAttachment.length)
 
-                Attachment.loadBitmap(attachment, Database.getInstance().loadedCipherKey) { bitmapLoaded ->
+                val size = attachment.binaryData.getSize()
-                    if (bitmapLoaded == null) {
+                supportActionBar?.subtitle = Formatter.formatFileSize(this, size)
-                        finish()
+
-                    } else {
+                mDatabase?.let { database ->
-                        progressView.visibility = View.GONE
+                    BinaryDatabaseManager.loadBitmap(
-                        imageView.setImageBitmap(bitmapLoaded)
+                            database,
+                            attachment.binaryData,
+                            mImagePreviewMaxWidth
+                    ) { bitmapLoaded ->
+                        if (bitmapLoaded == null) {
+                            finish()
+                        } else {
+                            progressView.visibility = View.GONE
+                            imageView.setImageBitmap(bitmapLoaded)
+                        }
                     }
                 }
             } ?: finish()
@@ -71,7 +92,7 @@ class ImageViewerActivity : LockingActivity() {
             finish()
         }
 
-        Loupe.create(imageView, image_viewer_container) {
+        Loupe.create(imageView, imageContainerView) {
             onViewTranslateListener = object : Loupe.OnViewTranslateListener {
 
                 override fun onStart(view: ImageView) {

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

@@ -36,6 +36,7 @@ import android.widget.*
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.commit
 import com.google.android.material.snackbar.Snackbar
@@ -71,7 +72,6 @@ import com.kunzisoft.keepass.utils.UriUtil
 import com.kunzisoft.keepass.view.KeyFileSelectionView
 import com.kunzisoft.keepass.view.asError
 import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel
-import kotlinx.android.synthetic.main.activity_password.*
 import java.io.FileNotFoundException
 
 open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.BuilderListener {
@@ -84,8 +84,9 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
     private var confirmButtonView: Button? = null
     private var checkboxPasswordView: CompoundButton? = null
     private var checkboxKeyFileView: CompoundButton? = null
-    private var advancedUnlockFragment: AdvancedUnlockFragment? = null
     private var infoContainerView: ViewGroup? = null
+    private lateinit var coordinatorLayout: CoordinatorLayout
+    private var advancedUnlockFragment: AdvancedUnlockFragment? = null
 
     private val databaseFileViewModel: DatabaseFileViewModel by viewModels()
 
@@ -131,6 +132,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
         checkboxPasswordView = findViewById(R.id.password_checkbox)
         checkboxKeyFileView = findViewById(R.id.keyfile_checkox)
         infoContainerView = findViewById(R.id.activity_password_info_container)
+        coordinatorLayout = findViewById(R.id.activity_password_coordinator_layout)
 
         mPermissionAsked = savedInstanceState?.getBoolean(KEY_PERMISSION_ASKED) ?: mPermissionAsked
         readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrPreference(this, savedInstanceState)
@@ -271,7 +273,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
                                 resultError = "$resultError $resultMessage"
                             }
                             Log.e(TAG, resultError)
-                            Snackbar.make(activity_password_coordinator_layout,
+                            Snackbar.make(coordinatorLayout,
                                     resultError,
                                     Snackbar.LENGTH_LONG).asError().show()
                         }
@@ -523,7 +525,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil
                 || mSpecialMode == SpecialMode.REGISTRATION)
         ) {
             Log.e(TAG, getString(R.string.autofill_read_only_save))
-            Snackbar.make(activity_password_coordinator_layout,
+            Snackbar.make(coordinatorLayout,
                     R.string.autofill_read_only_save,
                     Snackbar.LENGTH_LONG).asError().show()
         } else {

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

@@ -120,8 +120,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                     .setPositiveButton(android.R.string.ok) { _, _ -> }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
-            val credentialsInfo: ImageView? = rootView?.findViewById(R.id.credentials_information)
+            rootView?.findViewById<View>(R.id.credentials_information)?.setOnClickListener {
-            credentialsInfo?.setOnClickListener {
                 UriUtil.gotoUrl(activity, R.string.credentials_explanation_url)
             }
 

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

@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.activities.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 
@@ -31,7 +32,7 @@ class DuplicateUuidDialog : 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).apply {
+            val builder = AlertDialog.Builder(activity).apply {
                 val message = getString(R.string.contains_duplicate_uuid) +
                         "\n\n" + getString(R.string.contains_duplicate_uuid_procedure)
                 setMessage(message)

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

@@ -31,16 +31,17 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.IconPickerActivity
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
 import com.kunzisoft.keepass.view.ExpirationView
 import org.joda.time.DateTime
 
-class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {
+class GroupEditDialogFragment : DialogFragment() {
 
     private var mDatabase: Database? = null
 
@@ -112,8 +113,6 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
                 arguments?.apply {
                     if (containsKey(KEY_ACTION_ID))
                         mEditGroupDialogAction = EditGroupDialogAction.getActionFromOrdinal(getInt(KEY_ACTION_ID))
-                    if (mEditGroupDialogAction === CREATION)
-                        mGroupInfo.notes = ""
                     if (containsKey(KEY_GROUP_INFO)) {
                         mGroupInfo = getParcelable(KEY_GROUP_INFO) ?: mGroupInfo
                     }
@@ -144,7 +143,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
                     }
 
             iconButtonView.setOnClickListener { _ ->
-                IconPickerDialogFragment().show(parentFragmentManager, "IconPickerDialogFragment")
+                IconPickerActivity.launch(activity, mGroupInfo.icon)
             }
 
             return builder.create()
@@ -204,13 +203,11 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
     }
 
     private fun assignIconView() {
-        if (mDatabase?.drawFactory != null) {
+        mDatabase?.iconDrawableFactory?.assignDatabaseIcon(iconButtonView, mGroupInfo.icon, iconColor)
-            iconButtonView.assignDatabaseIcon(mDatabase?.drawFactory!!, mGroupInfo.icon, iconColor)
-        }
     }
 
-    override fun iconPicked(bundle: Bundle) {
+    fun setIcon(icon: IconImage) {
-        mGroupInfo.icon = IconPickerDialogFragment.getIconStandardFromBundle(bundle) ?: mGroupInfo.icon
+        mGroupInfo.icon = icon
         assignIconView()
     }
 
@@ -242,15 +239,16 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
         const val KEY_ACTION_ID = "KEY_ACTION_ID"
         const val KEY_GROUP_INFO = "KEY_GROUP_INFO"
 
-        fun build(): GroupEditDialogFragment {
+        fun create(groupInfo: GroupInfo): GroupEditDialogFragment {
             val bundle = Bundle()
             bundle.putInt(KEY_ACTION_ID, CREATION.ordinal)
+            bundle.putParcelable(KEY_GROUP_INFO, groupInfo)
             val fragment = GroupEditDialogFragment()
             fragment.arguments = bundle
             return fragment
         }
 
-        fun build(groupInfo: GroupInfo): GroupEditDialogFragment {
+        fun update(groupInfo: GroupInfo): GroupEditDialogFragment {
             val bundle = Bundle()
             bundle.putInt(KEY_ACTION_ID, UPDATE.ordinal)
             bundle.putParcelable(KEY_GROUP_INFO, groupInfo)

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

@@ -1,147 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities.dialogs
-
-import android.app.Dialog
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.GridView
-import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.widget.ImageViewCompat
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentActivity
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
-import com.kunzisoft.keepass.icons.IconPack
-import com.kunzisoft.keepass.icons.IconPackChooser
-
-
-class IconPickerDialogFragment : DialogFragment() {
-
-    private var iconPickerListener: IconPickerListener? = null
-    private var iconPack: IconPack? = null
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        try {
-            iconPickerListener = context as IconPickerListener
-        } catch (e: ClassCastException) {
-            // The activity doesn't implement the interface, throw exception
-            throw ClassCastException(context.toString()
-                    + " must implement " + IconPickerListener::class.java.name)
-        }
-    }
-
-    override fun onDetach() {
-        iconPickerListener = null
-        super.onDetach()
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        activity?.let { activity ->
-            val builder = AlertDialog.Builder(activity)
-
-            iconPack = IconPackChooser.getSelectedIconPack(requireContext())
-
-            // Inflate and set the layout for the dialog
-            // Pass null as the parent view because its going in the dialog layout
-            val root = activity.layoutInflater.inflate(R.layout.fragment_icon_picker, null)
-            builder.setView(root)
-
-            val currIconGridView = root.findViewById<GridView>(R.id.IconGridView)
-            currIconGridView.adapter = ImageAdapter(activity)
-
-            currIconGridView.setOnItemClickListener { _, _, position, _ ->
-                val bundle = Bundle()
-                bundle.putParcelable(KEY_ICON_STANDARD, IconImageStandard(position))
-                iconPickerListener?.iconPicked(bundle)
-                dismiss()
-            }
-
-            builder.setNegativeButton(android.R.string.cancel) { _, _ -> this@IconPickerDialogFragment.dialog?.cancel() }
-
-            return builder.create()
-        }
-        return super.onCreateDialog(savedInstanceState)
-    }
-
-    inner class ImageAdapter internal constructor(private val context: Context) : BaseAdapter() {
-
-        override fun getCount(): Int {
-            return iconPack?.numberOfIcons() ?: 0
-        }
-
-        override fun getItem(position: Int): Any? {
-            return null
-        }
-
-        override fun getItemId(position: Int): Long {
-            return 0
-        }
-
-        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-            val currentView: View = convertView
-                    ?: (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater)
-                        .inflate(R.layout.item_icon, parent, false)
-
-            iconPack?.let { iconPack ->
-                val iconImageView = currentView.findViewById<ImageView>(R.id.icon_image)
-                iconImageView.setImageResource(iconPack.iconToResId(position))
-
-                // Assign color if icons are tintable
-                if (iconPack.tintable()) {
-                    // Retrieve the textColor to tint the icon
-                    val ta = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
-                    ImageViewCompat.setImageTintList(iconImageView, ColorStateList.valueOf(ta.getColor(0, Color.BLACK)))
-                    ta.recycle()
-                }
-            }
-
-            return currentView
-        }
-    }
-
-    interface IconPickerListener {
-        fun iconPicked(bundle: Bundle)
-    }
-
-    companion object {
-
-        private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD"
-
-        fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? {
-            return bundle.getParcelable(KEY_ICON_STANDARD)
-        }
-
-        fun launch(activity: FragmentActivity) {
-            // Create an instance of the dialog fragment and show it
-            val dialog = IconPickerDialogFragment()
-            dialog.show(activity.supportFragmentManager, "IconPickerDialogFragment")
-        }
-    }
-}

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

@@ -46,6 +46,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 com.kunzisoft.keepass.utils.UriUtil
 import java.util.*
 
 class SetOTPDialogFragment : DialogFragment() {
@@ -223,13 +224,16 @@ class SetOTPDialogFragment : DialogFragment() {
 
             val builder = AlertDialog.Builder(activity)
             builder.apply {
-                setTitle(R.string.entry_setup_otp)
                 setView(root)
                         .setPositiveButton(android.R.string.ok) {_, _ -> }
                         .setNegativeButton(android.R.string.cancel) { _, _ ->
                         }
             }
 
+            root?.findViewById<View>(R.id.otp_information)?.setOnClickListener {
+                UriUtil.gotoUrl(activity, R.string.otp_explanation_url)
+            }
+
             return builder.create()
         }
         return super.onCreateDialog(savedInstanceState)

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

@@ -17,7 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.activities
+package com.kunzisoft.keepass.activities.fragments
 
 import android.content.Context
 import android.graphics.Color
@@ -34,6 +34,7 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.EntryEditActivity
 import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
 import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
@@ -44,7 +45,6 @@ import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
 import com.kunzisoft.keepass.icons.IconDrawableFactory
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.model.*
 import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.settings.PreferencesUtil
@@ -78,13 +78,12 @@ class EntryEditFragment: StylishFragment() {
     var drawFactory: IconDrawableFactory? = null
     var setOnDateClickListener: (() -> Unit)? = null
     var setOnPasswordGeneratorClickListener: View.OnClickListener? = null
-    var setOnIconViewClickListener: View.OnClickListener? = null
+    var setOnIconViewClickListener: ((IconImage) -> Unit)? = null
     var setOnEditCustomField: ((Field) -> Unit)? = null
     var setOnRemoveAttachment: ((Attachment) -> Unit)? = null
 
     // Elements to modify the current entry
     private var mEntryInfo = EntryInfo()
-    private var mBinaryCipherKey: Database.LoadedKey? = null
     private var mLastFocusedEditField: FocusedEditField? = null
     private var mExtraViewToRequestFocus: EditText? = null
 
@@ -100,7 +99,7 @@ class EntryEditFragment: StylishFragment() {
         entryTitleView = rootView.findViewById(R.id.entry_edit_title)
         entryIconView = rootView.findViewById(R.id.entry_edit_icon_button)
         entryIconView.setOnClickListener {
-            setOnIconViewClickListener?.onClick(it)
+            setOnIconViewClickListener?.invoke(mEntryInfo.icon)
         }
 
         entryUserNameView = rootView.findViewById(R.id.entry_edit_user_name)
@@ -122,7 +121,9 @@ class EntryEditFragment: StylishFragment() {
         attachmentsContainerView = rootView.findViewById(R.id.entry_attachments_container)
         attachmentsListView = rootView.findViewById(R.id.entry_attachments_list)
         attachmentsAdapter = EntryAttachmentsItemsAdapter(requireContext())
-        attachmentsAdapter.binaryCipherKey = arguments?.getSerializable(KEY_BINARY_CIPHER_KEY) as? Database.LoadedKey?
+        // TODO retrieve current database with its unique key
+        attachmentsAdapter.database = Database.getInstance()
+        //attachmentsAdapter.database = arguments?.getInt(KEY_DATABASE)
         attachmentsAdapter.onListSizeChangedListener = { previousSize, newSize ->
             if (previousSize > 0 && newSize == 0) {
                 attachmentsContainerView.collapse(true)
@@ -239,9 +240,7 @@ class EntryEditFragment: StylishFragment() {
         }
         set(value) {
             mEntryInfo.icon = value
-            drawFactory?.let { drawFactory ->
+            drawFactory?.assignDatabaseIcon(entryIconView, value, iconColor)
-                entryIconView.assignDatabaseIcon(drawFactory, value, iconColor)
-            }
         }
 
     var username: String
@@ -315,7 +314,8 @@ class EntryEditFragment: StylishFragment() {
         itemView?.id = View.NO_ID
 
         val extraFieldValueContainer: TextInputLayout? = itemView?.findViewById(R.id.entry_extra_field_value_container)
-        extraFieldValueContainer?.isPasswordVisibilityToggleEnabled = extraField.protectedValue.isProtected
+        extraFieldValueContainer?.endIconMode = if (extraField.protectedValue.isProtected)
+             TextInputLayout.END_ICON_PASSWORD_TOGGLE else TextInputLayout.END_ICON_NONE
         extraFieldValueContainer?.hint = extraField.name
         extraFieldValueContainer?.id = View.NO_ID
 
@@ -503,7 +503,6 @@ class EntryEditFragment: StylishFragment() {
     override fun onSaveInstanceState(outState: Bundle) {
         populateEntryWithViews()
         outState.putParcelable(KEY_TEMP_ENTRY_INFO, mEntryInfo)
-        outState.putSerializable(KEY_BINARY_CIPHER_KEY, mBinaryCipherKey)
         outState.putParcelable(KEY_LAST_FOCUSED_FIELD, mLastFocusedEditField)
 
         super.onSaveInstanceState(outState)
@@ -511,15 +510,16 @@ class EntryEditFragment: StylishFragment() {
 
     companion object {
         const val KEY_TEMP_ENTRY_INFO = "KEY_TEMP_ENTRY_INFO"
-        const val KEY_BINARY_CIPHER_KEY = "KEY_BINARY_CIPHER_KEY"
+        const val KEY_DATABASE = "KEY_DATABASE"
         const val KEY_LAST_FOCUSED_FIELD = "KEY_LAST_FOCUSED_FIELD"
 
-        fun getInstance(entryInfo: EntryInfo?,
+        fun getInstance(entryInfo: EntryInfo?): EntryEditFragment {
-                        loadedKey: Database.LoadedKey?): EntryEditFragment {
+                        //database: Database?): EntryEditFragment {
             return EntryEditFragment().apply {
                 arguments = Bundle().apply {
                     putParcelable(KEY_TEMP_ENTRY_INFO, entryInfo)
-                    putSerializable(KEY_BINARY_CIPHER_KEY, loadedKey)
+                    // TODO Unique database key database.key
+                    putInt(KEY_DATABASE, 0)
                 }
             }
         }

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

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.fragments
+
+import android.os.Bundle
+import android.view.View
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+
+
+class IconCustomFragment : IconFragment<IconImageCustom>() {
+
+    override fun retrieveMainLayoutId(): Int {
+        return R.layout.fragment_icon_grid
+    }
+
+    override fun defineIconList() {
+        mDatabase?.doForEachCustomIcons { customIcon, _ ->
+            iconPickerAdapter.addIcon(customIcon, false)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerViewModel.customIconsSelected.observe(viewLifecycleOwner) { customIconsSelected ->
+            if (customIconsSelected.isEmpty()) {
+                iconActionSelectionMode = false
+                iconPickerAdapter.deselectAllIcons()
+            } else {
+                iconActionSelectionMode = true
+                iconPickerAdapter.updateIconSelectedState(customIconsSelected)
+            }
+        }
+        iconPickerViewModel.customIconAdded.observe(viewLifecycleOwner) { iconCustomAdded ->
+            if (!iconCustomAdded.error) {
+                iconCustomAdded?.iconCustom?.let { icon ->
+                    iconPickerAdapter.addIcon(icon)
+                    iconCustomAdded.iconCustom = null
+                }
+                iconsGridView.smoothScrollToPosition(iconPickerAdapter.lastPosition)
+            }
+        }
+        iconPickerViewModel.customIconRemoved.observe(viewLifecycleOwner) { iconCustomRemoved ->
+            if (!iconCustomRemoved.error) {
+                iconCustomRemoved?.iconCustom?.let { icon ->
+                    iconPickerAdapter.removeIcon(icon)
+                    iconCustomRemoved.iconCustom = null
+                }
+            }
+        }
+    }
+
+    override fun onIconClickListener(icon: IconImageCustom) {
+        if (iconActionSelectionMode) {
+            // Same long click behavior after each single click
+            onIconLongClickListener(icon)
+        } else {
+            iconPickerViewModel.pickCustomIcon(icon)
+        }
+    }
+
+    override fun onIconLongClickListener(icon: IconImageCustom) {
+        // Select or deselect item if already selected
+        icon.selected = !icon.selected
+        iconPickerAdapter.updateIcon(icon)
+        iconActionSelectionMode = iconPickerAdapter.containsAnySelectedIcon()
+        iconPickerViewModel.selectCustomIcons(iconPickerAdapter.getSelectedIcons())
+    }
+}

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

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.fragments
+
+import android.content.Context
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.IconPickerAdapter
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.icon.IconImageDraw
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+abstract class IconFragment<T: IconImageDraw> : StylishFragment(),
+        IconPickerAdapter.IconPickerListener<T> {
+
+    protected lateinit var iconsGridView: RecyclerView
+    protected lateinit var iconPickerAdapter: IconPickerAdapter<T>
+    protected var iconActionSelectionMode = false
+
+    protected var mDatabase: Database? = null
+
+    protected val iconPickerViewModel: IconPickerViewModel by activityViewModels()
+
+    abstract fun retrieveMainLayoutId(): Int
+
+    abstract fun defineIconList()
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        mDatabase = Database.getInstance()
+
+        // Retrieve the textColor to tint the icon
+        val ta = contextThemed?.obtainStyledAttributes(intArrayOf(android.R.attr.textColor))
+        val tintColor = ta?.getColor(0, Color.BLACK) ?: Color.BLACK
+        ta?.recycle()
+
+        iconPickerAdapter = IconPickerAdapter<T>(context, tintColor).apply {
+            iconDrawableFactory = mDatabase?.iconDrawableFactory
+        }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val populateList = launch {
+                iconPickerAdapter.clear()
+                defineIconList()
+            }
+            withContext(Dispatchers.Main) {
+                populateList.join()
+                iconPickerAdapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        val root = inflater.inflate(retrieveMainLayoutId(), container, false)
+        iconsGridView = root.findViewById(R.id.icons_grid_view)
+        iconsGridView.adapter = iconPickerAdapter
+        return root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        iconPickerAdapter.iconPickerListener = this
+    }
+
+    fun onIconDeleteClicked() {
+        iconActionSelectionMode = false
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.kunzisoft.keepass.activities.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.stylish.StylishFragment
+import com.kunzisoft.keepass.adapters.IconPickerPagerAdapter
+import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
+
+class IconPickerFragment : StylishFragment() {
+
+    private var iconPickerPagerAdapter: IconPickerPagerAdapter? = null
+    private lateinit var viewPager: ViewPager2
+
+    private val iconPickerViewModel: IconPickerViewModel by activityViewModels()
+
+    private var mDatabase: Database? = null
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_icon_picker, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        mDatabase = Database.getInstance()
+
+        viewPager = view.findViewById(R.id.icon_picker_pager)
+        val tabLayout = view.findViewById<TabLayout>(R.id.icon_picker_tabs)
+        iconPickerPagerAdapter = IconPickerPagerAdapter(this,
+                if (mDatabase?.allowCustomIcons == true) 2 else 1)
+        viewPager.adapter = iconPickerPagerAdapter
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            tab.text = when (position) {
+                1 -> getString(R.string.icon_section_custom)
+                else -> getString(R.string.icon_section_standard)
+            }
+        }.attach()
+
+        arguments?.apply {
+            if (containsKey(ICON_TAB_ARG)) {
+                viewPager.currentItem = getInt(ICON_TAB_ARG)
+            }
+            remove(ICON_TAB_ARG)
+        }
+
+        iconPickerViewModel.customIconAdded.observe(viewLifecycleOwner) { _ ->
+            viewPager.currentItem = 1
+        }
+    }
+
+    enum class IconTab {
+        STANDARD, CUSTOM
+    }
+
+    companion object {
+
+        private const val ICON_TAB_ARG = "ICON_TAB_ARG"
+
+        fun getInstance(iconTab: IconTab): IconPickerFragment {
+            val fragment = IconPickerFragment()
+            fragment.arguments = Bundle().apply {
+                putInt(ICON_TAB_ARG, iconTab.ordinal)
+            }
+            return fragment
+        }
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
  *
  * This file is part of KeePassDX.
  *
@@ -17,35 +17,27 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.stream
+package com.kunzisoft.keepass.activities.fragments
 
-import java.io.IOException
+import com.kunzisoft.keepass.R
-import java.io.OutputStream
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 
-class NullOutputStream : OutputStream() {
 
-    @Throws(IOException::class)
+class IconStandardFragment : IconFragment<IconImageStandard>() {
-    override fun close() {
+
-        super.close()
+    override fun retrieveMainLayoutId(): Int {
+        return R.layout.fragment_icon_grid
     }
 
-    @Throws(IOException::class)
+    override fun defineIconList() {
-    override fun flush() {
+        mDatabase?.doForEachStandardIcons { standardIcon ->
-        super.flush()
+            iconPickerAdapter.addIcon(standardIcon, false)
+        }
     }
 
-    @Throws(IOException::class)
+    override fun onIconClickListener(icon: IconImageStandard) {
-    override fun write(buffer: ByteArray, offset: Int, count: Int) {
+        iconPickerViewModel.pickStandardIcon(icon)
-        super.write(buffer, offset, count)
     }
 
-    @Throws(IOException::class)
+    override fun onIconLongClickListener(icon: IconImageStandard) {}
-    override fun write(buffer: ByteArray) {
+}
-        super.write(buffer)
-    }
-
-    @Throws(IOException::class)
-    override fun write(oneByte: Int) {
-    }
-
-}

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

@@ -17,7 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.activities
+package com.kunzisoft.keepass.activities.fragments
 
 import android.content.Context
 import android.content.Intent
@@ -28,6 +28,7 @@ import androidx.appcompat.view.ActionMode
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.EntryEditActivity
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper

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

@@ -20,11 +20,11 @@
 package com.kunzisoft.keepass.activities.stylish
 
 import android.content.Context
-import androidx.annotation.StyleRes
+import android.content.res.Configuration
-import androidx.preference.PreferenceManager
 import android.util.Log
-
+import androidx.annotation.StyleRes
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.settings.PreferencesUtil
 
 /**
  * Class that provides functions to retrieve and assign a theme to a module
@@ -38,17 +38,58 @@ object Stylish {
      * @param context Context to retrieve the theme preference
      */
     fun init(context: Context) {
-        val stylishPrefKey = context.getString(R.string.setting_style_key)
         Log.d(Stylish::class.java.name, "Attatching to " + context.packageName)
-        themeString = PreferenceManager.getDefaultSharedPreferences(context).getString(stylishPrefKey, context.getString(R.string.list_style_name_light))
+        themeString = PreferencesUtil.getStyle(context)
+    }
+
+    private fun retrieveEquivalentSystemStyle(context: Context, styleString: String): String {
+        val systemNightMode = when (PreferencesUtil.getStyleBrightness(context)) {
+            context.getString(R.string.list_style_brightness_light) -> false
+            context.getString(R.string.list_style_brightness_night) -> true
+            else -> {
+                when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
+                    Configuration.UI_MODE_NIGHT_YES -> true
+                    else -> false
+                }
+            }
+        }
+        return if (systemNightMode) {
+            retrieveEquivalentNightStyle(context, styleString)
+        } else {
+            retrieveEquivalentLightStyle(context, styleString)
+        }
+    }
+
+    fun retrieveEquivalentLightStyle(context: Context, styleString: String): String {
+        return when (styleString) {
+            context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light)
+            context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white)
+            context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear)
+            context.getString(R.string.list_style_name_blue_night) -> context.getString(R.string.list_style_name_blue)
+            context.getString(R.string.list_style_name_red_night) -> context.getString(R.string.list_style_name_red)
+            context.getString(R.string.list_style_name_purple_dark) -> context.getString(R.string.list_style_name_purple)
+            else -> styleString
+        }
+    }
+
+    private fun retrieveEquivalentNightStyle(context: Context, styleString: String): String {
+        return when (styleString) {
+            context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night)
+            context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black)
+            context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark)
+            context.getString(R.string.list_style_name_blue) -> context.getString(R.string.list_style_name_blue_night)
+            context.getString(R.string.list_style_name_red) -> context.getString(R.string.list_style_name_red_night)
+            context.getString(R.string.list_style_name_purple) -> context.getString(R.string.list_style_name_purple_dark)
+            else -> styleString
+        }
     }
 
     /**
      * Assign the style to the class attribute
      * @param styleString Style id String
      */
-    fun assignStyle(styleString: String) {
+    fun assignStyle(context: Context, styleString: String) {
-        themeString = styleString
+        themeString = retrieveEquivalentSystemStyle(context, styleString)
     }
 
     /**
@@ -58,13 +99,16 @@ object Stylish {
      */
     @StyleRes
     fun getThemeId(context: Context): Int {
-
+        return when (retrieveEquivalentSystemStyle(context, themeString ?: context.getString(R.string.list_style_name_light))) {
-        return when (themeString) {
             context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night
+            context.getString(R.string.list_style_name_white) -> R.style.KeepassDXStyle_White
             context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black
+            context.getString(R.string.list_style_name_clear) -> R.style.KeepassDXStyle_Clear
             context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark
             context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue
+            context.getString(R.string.list_style_name_blue_night) -> R.style.KeepassDXStyle_Blue_Night
             context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red
+            context.getString(R.string.list_style_name_red_night) -> R.style.KeepassDXStyle_Red_Night
             context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple
             context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark
             else -> R.style.KeepassDXStyle_Light

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

@@ -42,6 +42,7 @@ abstract class StylishFragment : Fragment() {
         contextThemed = ContextThemeWrapper(context, themeId)
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         // To fix status bar color
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -53,14 +54,21 @@ abstract class StylishFragment : Fragment() {
                 window.statusBarColor = taStatusBarColor?.getColor(0, defaultColor) ?: defaultColor
                 taStatusBarColor?.recycle()
             } catch (e: Exception) {}
-
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                try {
+                    val taWindowStatusLight = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.windowLightStatusBar))
+                    if (taWindowStatusLight?.getBoolean(0, false) == true) {
+                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    }
+                    taWindowStatusLight?.recycle()
+                } catch (e: Exception) {}
+            }
             try {
                 val taNavigationBarColor = contextThemed?.theme?.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor))
                 window.navigationBarColor = taNavigationBarColor?.getColor(0, defaultColor) ?: defaultColor
                 taNavigationBarColor?.recycle()
             } catch (e: Exception) {}
         }
-
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 

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

@@ -32,22 +32,28 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.ImageViewerActivity
-import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import com.kunzisoft.keepass.view.expand
+import kotlin.math.max
 
 
 class EntryAttachmentsItemsAdapter(context: Context)
     : AnimatedItemsAdapter<EntryAttachmentState, EntryAttachmentsItemsAdapter.EntryBinariesViewHolder>(context) {
 
-    var binaryCipherKey: Database.LoadedKey? = null
+    var database: Database? = null
     var onItemClickListener: ((item: EntryAttachmentState)->Unit)? = null
     var onBinaryPreviewLoaded: ((item: EntryAttachmentState) -> Unit)? = null
 
+    // Approximately
+    private val mImagePreviewMaxWidth = max(
+            context.resources.displayMetrics.widthPixels,
+            context.resources.getDimensionPixelSize(R.dimen.item_file_info_height)
+    )
     private var mTitleColor: Int
 
     init {
@@ -76,17 +82,23 @@ class EntryAttachmentsItemsAdapter(context: Context)
                 if (entryAttachmentState.previewState == AttachmentState.NULL) {
                     entryAttachmentState.previewState = AttachmentState.IN_PROGRESS
                     // Load the bitmap image
-                    Attachment.loadBitmap(entryAttachmentState.attachment, binaryCipherKey) { imageLoaded ->
+                    database?.let { database ->
-                        if (imageLoaded == null) {
+                        BinaryDatabaseManager.loadBitmap(
-                            entryAttachmentState.previewState = AttachmentState.ERROR
+                                database,
-                            visibility = View.GONE
+                                entryAttachmentState.attachment.binaryData,
-                            onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                                mImagePreviewMaxWidth
-                        } else {
+                        ) { imageLoaded ->
-                            entryAttachmentState.previewState = AttachmentState.COMPLETE
+                            if (imageLoaded == null) {
-                            setImageBitmap(imageLoaded)
+                                entryAttachmentState.previewState = AttachmentState.ERROR
-                            if (visibility != View.VISIBLE) {
+                                visibility = View.GONE
-                                expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height)) {
+                                onBinaryPreviewLoaded?.invoke(entryAttachmentState)
-                                    onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                            } else {
+                                entryAttachmentState.previewState = AttachmentState.COMPLETE
+                                setImageBitmap(imageLoaded)
+                                if (visibility != View.VISIBLE) {
+                                    expand(true, resources.getDimensionPixelSize(R.dimen.item_file_info_height)) {
+                                        onBinaryPreviewLoaded?.invoke(entryAttachmentState)
+                                    }
                                 }
                             }
                         }
@@ -101,22 +113,23 @@ class EntryAttachmentsItemsAdapter(context: Context)
         }
         holder.binaryFileBroken.apply {
             setColorFilter(Color.RED)
-            visibility = if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+            visibility = if (entryAttachmentState.attachment.binaryData.isCorrupted) {
                 View.VISIBLE
             } else {
                 View.GONE
             }
         }
         holder.binaryFileTitle.text = entryAttachmentState.attachment.name
-        if (entryAttachmentState.attachment.binaryAttachment.isCorrupted) {
+        if (entryAttachmentState.attachment.binaryData.isCorrupted) {
             holder.binaryFileTitle.setTextColor(Color.RED)
         } else {
             holder.binaryFileTitle.setTextColor(mTitleColor)
         }
-        holder.binaryFileSize.text = Formatter.formatFileSize(context,
+
-                entryAttachmentState.attachment.binaryAttachment.length)
+        val size = entryAttachmentState.attachment.binaryData.getSize()
+        holder.binaryFileSize.text = Formatter.formatFileSize(context, size)
         holder.binaryFileCompression.apply {
-            if (entryAttachmentState.attachment.binaryAttachment.isCompressed) {
+            if (entryAttachmentState.attachment.binaryData.isCompressed) {
                 text = CompressionAlgorithm.GZip.getName(context.resources)
                 visibility = View.VISIBLE
             } else {

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

@@ -0,0 +1,121 @@
+package com.kunzisoft.keepass.adapters
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.recyclerview.widget.RecyclerView
+import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.database.element.icon.IconImageDraw
+import com.kunzisoft.keepass.icons.IconDrawableFactory
+
+class IconPickerAdapter<I: IconImageDraw>(val context: Context, private val tintIcon: Int)
+    : RecyclerView.Adapter<IconPickerAdapter<I>.CustomIconViewHolder>() {
+
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+
+    private val iconList = ArrayList<I>()
+
+    var iconDrawableFactory: IconDrawableFactory? = null
+    var iconPickerListener: IconPickerListener<I>? = null
+
+    val lastPosition: Int
+        get() = iconList.lastIndex
+
+    fun addIcon(icon: I, notify: Boolean = true) {
+        if (!iconList.contains(icon)) {
+            iconList.add(icon)
+            if (notify) {
+                notifyItemInserted(iconList.indexOf(icon))
+            }
+        }
+    }
+
+    fun updateIcon(icon: I) {
+        val index = iconList.indexOf(icon)
+        if (index != -1) {
+            iconList[index] = icon
+            notifyItemChanged(index)
+        }
+    }
+
+    fun updateIconSelectedState(icons: List<I>) {
+        icons.forEach { icon ->
+            val index = iconList.indexOf(icon)
+            if (index != -1
+                    && iconList[index].selected != icon.selected) {
+                iconList[index] = icon
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun removeIcon(icon: I) {
+        if (iconList.contains(icon)) {
+            val position = iconList.indexOf(icon)
+            iconList.remove(icon)
+            notifyItemRemoved(position)
+        }
+    }
+
+    fun containsAnySelectedIcon(): Boolean {
+        return iconList.firstOrNull { it.selected } != null
+    }
+
+    fun deselectAllIcons() {
+        iconList.forEachIndexed { index, icon ->
+            if (icon.selected) {
+                icon.selected = false
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun getSelectedIcons(): List<I> {
+        return iconList.filter { it.selected }
+    }
+
+    fun clear() {
+        iconList.clear()
+    }
+
+    fun setList(icons: List<I>) {
+        iconList.clear()
+        icons.forEach { iconImage ->
+            iconList.add(iconImage)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomIconViewHolder {
+        val view = inflater.inflate(R.layout.item_icon, parent, false)
+        return CustomIconViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: CustomIconViewHolder, position: Int) {
+        val icon = iconList[position]
+        iconDrawableFactory?.assignDatabaseIcon(holder.iconImageView, icon, tintIcon)
+        holder.iconContainerView.isSelected = icon.selected
+        holder.itemView.setOnClickListener {
+            iconPickerListener?.onIconClickListener(icon)
+        }
+        holder.itemView.setOnLongClickListener {
+            iconPickerListener?.onIconLongClickListener(icon)
+            true
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return iconList.size
+    }
+
+    interface IconPickerListener<I: IconImageDraw> {
+        fun onIconClickListener(icon: I)
+        fun onIconLongClickListener(icon: I)
+    }
+
+    inner class CustomIconViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var iconContainerView: ViewGroup = itemView.findViewById(R.id.icon_container)
+        var iconImageView: ImageView = itemView.findViewById(R.id.icon_image)
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.kunzisoft.keepass.adapters
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.kunzisoft.keepass.activities.fragments.IconCustomFragment
+import com.kunzisoft.keepass.activities.fragments.IconStandardFragment
+
+class IconPickerPagerAdapter(fragment: Fragment, val size: Int)
+    : FragmentStateAdapter(fragment) {
+
+    private val iconStandardFragment = IconStandardFragment()
+    private val iconCustomFragment = IconCustomFragment()
+
+    override fun getItemCount(): Int {
+        return size
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return when (position) {
+            1 -> iconCustomFragment
+            else -> iconStandardFragment
+        }
+    }
+}

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

@@ -28,6 +28,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
 import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -39,7 +40,6 @@ import com.kunzisoft.keepass.database.element.SortNodeEnum
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.setTextSize
 import com.kunzisoft.keepass.view.strikeOut
@@ -100,9 +100,7 @@ class NodeAdapter (private val context: Context)
         this.mDatabase = Database.getInstance()
 
         // Color of content selection
-        val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse))
+        this.mContentSelectionColor = ContextCompat.getColor(context, R.color.white)
-        this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
-        taContentSelectionColor.recycle()
         // Retrieve the color to tint the icon
         val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
         this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)
@@ -305,7 +303,7 @@ class NodeAdapter (private val context: Context)
         }
         holder.imageIdentifier?.setColorFilter(iconColor)
         holder.icon.apply {
-            assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor)
+            mDatabase.iconDrawableFactory.assignDatabaseIcon(this, subNode.icon, iconColor)
             // Relative size of the icon
             layoutParams?.apply {
                 height = (mIconDefaultDimension * mPrefSizeMultiplier).toInt()

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

@@ -36,7 +36,6 @@ import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.search.SearchHelper
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.strikeOut
 
@@ -81,10 +80,9 @@ class SearchEntryCursorAdapter(private val context: Context,
             val viewHolder = view.tag as ViewHolder
 
             // Assign image
-            viewHolder.imageViewIcon?.assignDatabaseIcon(
+            viewHolder.imageViewIcon?.let { iconView ->
-                    database.drawFactory,
+                database.iconDrawableFactory.assignDatabaseIcon(iconView, currentEntry.icon, iconColor)
-                    currentEntry.icon,
+            }
-                    iconColor)
 
             // Assign title
             viewHolder.textViewTitle?.apply {
@@ -110,10 +108,24 @@ class SearchEntryCursorAdapter(private val context: Context,
         return database.createEntry()?.apply {
             database.startManageEntry(this)
             entryKDB?.let { entryKDB ->
-                (cursor as EntryCursorKDB).populateEntry(entryKDB, database.iconFactory)
+                (cursor as EntryCursorKDB).populateEntry(entryKDB,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
             }
             entryKDBX?.let { entryKDBX ->
-                (cursor as EntryCursorKDBX).populateEntry(entryKDBX, database.iconFactory)
+                (cursor as EntryCursorKDBX).populateEntry(entryKDBX,
+                        { standardIconId ->
+                            database.getStandardIcon(standardIconId)
+                        },
+                        { customIconId ->
+                            database.getCustomIcon(customIconId)
+                        }
+                )
             }
             database.stopManageEntry(this)
         }

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

@@ -25,6 +25,7 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.net.Uri
 import android.os.IBinder
+import android.util.Log
 import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
@@ -76,7 +77,11 @@ class CipherDatabaseAction(context: Context) {
                     mServiceConnection!!,
                     Context.BIND_ABOVE_CLIENT)
             if (mBinder == null) {
-                applicationContext.startService(mIntentAdvancedUnlockService)
+                try {
+                    applicationContext.startService(mIntentAdvancedUnlockService)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to start cipher action", e)
+                }
             }
         }
     }
@@ -173,5 +178,7 @@ class CipherDatabaseAction(context: Context) {
         ).execute()
     }
 
-    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction)
+    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction) {
+        private val TAG = CipherDatabaseAction::class.java.name
+    }
 }

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

@@ -46,8 +46,6 @@ import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.activities.helpers.SpecialMode
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.icons.assignDatabaseIcon
-import com.kunzisoft.keepass.icons.createIconFromDatabaseIcon
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.AutofillSettingsActivity
@@ -86,6 +84,24 @@ object AutofillHelper {
         return ""
     }
 
+    private fun newRemoteViews(context: Context,
+                               remoteViewsText: String,
+                               remoteViewsIcon: IconImage? = null): RemoteViews {
+        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
+        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
+        if (remoteViewsIcon != null) {
+            try {
+                Database.getInstance().iconDrawableFactory.getBitmapFromIcon(context,
+                        remoteViewsIcon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
+                    presentation.setImageViewBitmap(R.id.autofill_entry_icon, bitmap)
+                }
+            } catch (e: Exception) {
+                Log.e(RemoteViews::class.java.name, "Unable to assign icon in remote view", e)
+            }
+        }
+        return presentation
+    }
+
     private fun buildDataset(context: Context,
                               entryInfo: EntryInfo,
                               struct: StructureParser.Result,
@@ -116,6 +132,21 @@ object AutofillHelper {
         }
     }
 
+    /**
+     * Method to assign a drawable to a new icon from a database icon
+     */
+    private fun buildIconFromEntry(context: Context, entryInfo: EntryInfo): Icon? {
+        try {
+            Database.getInstance().iconDrawableFactory.getBitmapFromIcon(context,
+                    entryInfo.icon, ContextCompat.getColor(context, R.color.green))?.let { bitmap ->
+                return Icon.createWithBitmap(bitmap)
+            }
+        } catch (e: Exception) {
+            Log.e(RemoteViews::class.java.name, "Unable to assign icon in remote view", e)
+        }
+        return null
+    }
+
     @RequiresApi(Build.VERSION_CODES.R)
     @SuppressLint("RestrictedApi")
     private fun buildInlinePresentationForEntry(context: Context,
@@ -267,26 +298,4 @@ object AutofillHelper {
             activity.finish()
         }
     }
-
-    private fun newRemoteViews(context: Context,
-                               remoteViewsText: String,
-                               remoteViewsIcon: IconImage? = null): RemoteViews {
-        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
-        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
-        if (remoteViewsIcon != null) {
-            presentation.assignDatabaseIcon(context,
-                    R.id.autofill_entry_icon,
-                    Database.getInstance().drawFactory,
-                    remoteViewsIcon,
-                    ContextCompat.getColor(context, R.color.green))
-        }
-        return presentation
-    }
-
-    private fun buildIconFromEntry(context: Context, entryInfo: EntryInfo): Icon? {
-        return createIconFromDatabaseIcon(context,
-                Database.getInstance().drawFactory,
-                entryInfo.icon,
-                ContextCompat.getColor(context, R.color.green))
-    }
 }

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

@@ -19,6 +19,7 @@
  */
 package com.kunzisoft.keepass.autofill
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.graphics.BlendMode
@@ -130,6 +131,7 @@ class KeeAutofillService : AutofillService() {
         )
     }
 
+    @SuppressLint("RestrictedApi")
     private fun showUIForEntrySelection(parseResult: StructureParser.Result,
                                         searchInfo: SearchInfo,
                                         inlineSuggestionsRequest: InlineSuggestionsRequest?,

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

@@ -1,79 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto
-
-import android.os.Build
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.crypto.engine.ChaCha20Engine
-import com.kunzisoft.keepass.crypto.engine.CipherEngine
-import com.kunzisoft.keepass.crypto.engine.TwofishEngine
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.NoSuchAlgorithmException
-import java.security.Security
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-
-object CipherFactory {
-
-    private var blacklistInit = false
-    private var blacklisted: Boolean = false
-
-    init {
-        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME)
-        Security.addProvider(BouncyCastleProvider())
-    }
-
-    fun deviceBlacklisted(): Boolean {
-        if (!blacklistInit) {
-            blacklistInit = true
-            // The Acer Iconia A500 is special and seems to always crash in the native crypto libraries
-            blacklisted = Build.MODEL == "A500"
-        }
-        return blacklisted
-    }
-
-    private fun hasNativeImplementation(transformation: String): Boolean {
-        return transformation == "AES/CBC/PKCS5Padding"
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class)
-    fun getInstance(transformation: String, androidOverride: Boolean = false): Cipher {
-        // Return the native AES if it is possible
-        return if (!deviceBlacklisted() && !androidOverride && hasNativeImplementation(transformation) && NativeLib.loaded()) {
-            Cipher.getInstance(transformation, AESProvider())
-        } else {
-            Cipher.getInstance(transformation)
-        }
-    }
-
-    /**
-     * Generate appropriate cipher based on KeePass 2.x UUID's
-     */
-    @Throws(NoSuchAlgorithmException::class)
-    fun getInstance(uuid: UUID): CipherEngine {
-        return when (uuid) {
-            AesEngine.CIPHER_UUID -> AesEngine()
-            TwofishEngine.CIPHER_UUID -> TwofishEngine()
-            ChaCha20Engine.CIPHER_UUID -> ChaCha20Engine()
-            else -> throw NoSuchAlgorithmException("UUID unrecognized.")
-        }
-    }
-}

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

@@ -1,105 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto
-
-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.*
-import javax.crypto.Mac
-import kotlin.math.min
-
-object CryptoUtil {
-
-    fun resizeKey(inBytes: ByteArray, inOffset: Int, cbIn: Int, cbOut: Int): ByteArray {
-        if (cbOut == 0) return ByteArray(0)
-
-        val hash: ByteArray = if (cbOut <= 32) {
-            hashSha256(inBytes, inOffset, cbIn)
-        } else {
-            hashSha512(inBytes, inOffset, cbIn)
-        }
-
-        if (cbOut == hash.size) {
-            return hash
-        }
-
-        val ret = ByteArray(cbOut)
-        if (cbOut < hash.size) {
-            System.arraycopy(hash, 0, ret, 0, cbOut)
-        } else {
-            var pos = 0
-            var r: Long = 0
-            while (pos < cbOut) {
-                val hmac: Mac
-                try {
-                    hmac = Mac.getInstance("HmacSHA256")
-                } catch (e: NoSuchAlgorithmException) {
-                    throw RuntimeException(e)
-                }
-
-                val pbR = longTo8Bytes(r)
-                val part = hmac.doFinal(pbR)
-
-                val copy = min(cbOut - pos, part.size)
-                System.arraycopy(part, 0, ret, pos, copy)
-                pos += copy
-                r++
-
-                Arrays.fill(part, 0.toByte())
-            }
-        }
-
-        Arrays.fill(hash, 0.toByte())
-        return ret
-    }
-
-    fun hashSha256(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
-        return hashGen("SHA-256", data, offset, count)
-    }
-
-    fun hashSha512(data: ByteArray, offset: Int = 0, count: Int = data.size): ByteArray {
-        return hashGen("SHA-512", data, offset, count)
-    }
-
-    private fun hashGen(transform: String, data: ByteArray, offset: Int, count: Int): ByteArray {
-        val hash: MessageDigest
-        try {
-            hash = MessageDigest.getInstance(transform)
-        } catch (e: NoSuchAlgorithmException) {
-            throw RuntimeException(e)
-        }
-
-        val nos = NullOutputStream()
-        val dos = DigestOutputStream(nos, hash)
-
-        try {
-            dos.write(data, offset, count)
-            dos.close()
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-
-        return hash.digest()
-    }
-}

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

@@ -1,71 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto
-
-import org.bouncycastle.crypto.StreamCipher
-import org.bouncycastle.crypto.engines.ChaCha7539Engine
-import org.bouncycastle.crypto.engines.Salsa20Engine
-import org.bouncycastle.crypto.params.KeyParameter
-import org.bouncycastle.crypto.params.ParametersWithIV
-
-object StreamCipherFactory {
-
-    private val SALSA_IV = byteArrayOf(0xE8.toByte(), 0x30, 0x09, 0x4B, 0x97.toByte(), 0x20, 0x5D, 0x2A)
-
-    @Throws(Exception::class)
-    fun getInstance(alg: CrsAlgorithm?, key: ByteArray): StreamCipher {
-        return when {
-            alg === CrsAlgorithm.Salsa20 -> getSalsa20(key)
-            alg === CrsAlgorithm.ChaCha20 -> getChaCha20(key)
-            else -> throw Exception("Invalid random cipher")
-        }
-    }
-
-    private fun getSalsa20(key: ByteArray): StreamCipher {
-        // Build stream cipher key
-        val key32 = CryptoUtil.hashSha256(key)
-
-        val keyParam = KeyParameter(key32)
-        val ivParam = ParametersWithIV(keyParam, SALSA_IV)
-
-        val cipher = Salsa20Engine()
-        cipher.init(true, ivParam)
-
-        return cipher
-    }
-
-    private fun getChaCha20(key: ByteArray): StreamCipher {
-        // Build stream cipher key
-        val hash = CryptoUtil.hashSha512(key)
-        val key32 = ByteArray(32)
-        val iv = ByteArray(12)
-
-        System.arraycopy(hash, 0, key32, 0, 32)
-        System.arraycopy(hash, 32, iv, 0, 12)
-
-        val keyParam = KeyParameter(key32)
-        val ivParam = ParametersWithIV(keyParam, iv)
-
-        val cipher = ChaCha7539Engine()
-        cipher.init(true, ivParam)
-
-        return cipher
-    }
-}

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

@@ -1,68 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.engine
-
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class AesEngine : CipherEngine() {
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
-        val cipher = CipherFactory.getInstance("AES/CBC/PKCS5Padding", androidOverride)
-        cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
-        return cipher
-    }
-
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.AESRijndael
-    }
-
-    companion object {
-
-        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()))
-    }
-}

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

@@ -1,72 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.crypto.engine
-
-import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import java.security.InvalidAlgorithmParameterException
-import java.security.InvalidKeyException
-import java.security.NoSuchAlgorithmException
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class TwofishEngine : CipherEngine() {
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
-        val cipher: Cipher = if (opmode == Cipher.ENCRYPT_MODE) {
-            CipherFactory.getInstance("Twofish/CBC/ZeroBytePadding", androidOverride)
-        } else {
-            CipherFactory.getInstance("Twofish/CBC/NoPadding", androidOverride)
-        }
-        cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
-
-        return cipher
-    }
-
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
-        return EncryptionAlgorithm.Twofish
-    }
-
-    companion object {
-
-        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()))
-    }
-}

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

@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.finalkey
-
-import com.kunzisoft.keepass.crypto.CipherFactory.deviceBlacklisted
-
-object AESKeyTransformerFactory : KeyTransformer() {
-    override fun transformMasterKey(seed: ByteArray?, key: ByteArray?, rounds: Long?): ByteArray? {
-        // Prefer the native final key implementation
-        val keyTransformer = if (!deviceBlacklisted()
-                && NativeAESKeyTransformer.available()) {
-            NativeAESKeyTransformer()
-        } else {
-            // Fall back on the android crypto implementation
-            AndroidAESKeyTransformer()
-        }
-        return keyTransformer.transformMasterKey(seed, key, rounds)
-    }
-}

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

@@ -1,65 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, 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.crypto.NativeLib;
-import com.kunzisoft.keepass.utils.UnsignedInt;
-
-import java.io.IOException;
-
-public class Argon2Native {
-
-    enum CType {
-        ARGON2_D(0),
-        ARGON2_I(1),
-        ARGON2_ID(2);
-
-        int cValue = 0;
-
-        CType(int i) {
-            cValue = i;
-        }
-    }
-
-    public static byte[] transformKey(Argon2Kdf.Type type, byte[] password, byte[] salt, UnsignedInt parallelism,
-                                      UnsignedInt memory, UnsignedInt iterations, byte[] secretKey,
-                                      byte[] associatedData, UnsignedInt version) throws IOException {
-        NativeLib.INSTANCE.init();
-
-        CType cType = CType.ARGON2_D;
-        if (type.equals(Argon2Kdf.Type.ARGON2_ID))
-            cType = CType.ARGON2_ID;
-
-        return nTransformMasterKey(
-                cType.cValue,
-                password,
-                salt,
-                parallelism.toKotlinInt(),
-                memory.toKotlinInt(),
-                iterations.toKotlinInt(),
-                secretKey,
-                associatedData,
-                version.toKotlinInt());
-    }
-
-    private static native byte[] nTransformMasterKey(int type, byte[] password, byte[] salt, int parallelism,
-                                              int memory, int iterations, byte[] secretKey,
-                                              byte[] associatedData, int version) throws IOException;
-}

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

@@ -25,6 +25,8 @@ import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.binary.LoadedKey
+import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
@@ -55,7 +57,10 @@ class LoadDatabaseRunnable(private val context: Context,
                     mReadonly,
                     context.contentResolver,
                     UriUtil.getBinaryDir(context),
-                    Database.LoadedKey.generateNewCipherKey(),
+                    { memoryWanted ->
+                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                    },
+                    LoadedKey.generateNewCipherKey(),
                     mFixDuplicateUUID,
                     progressTaskUpdater)
         }

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

@@ -25,18 +25,21 @@ import android.content.Context.BIND_NOT_FOREGROUND
 import android.net.Uri
 import android.os.Bundle
 import android.os.IBinder
+import android.util.Log
+import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
@@ -48,8 +51,8 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE
@@ -251,11 +254,16 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
     }
 
     private fun start(bundle: Bundle? = null, actionTask: String) {
-        activity.stopService(intentDatabaseTask)
+        try {
-        if (bundle != null)
+            activity.stopService(intentDatabaseTask)
-            intentDatabaseTask.putExtras(bundle)
+            if (bundle != null)
-        intentDatabaseTask.action = actionTask
+                intentDatabaseTask.putExtras(bundle)
-        activity.startService(intentDatabaseTask)
+            intentDatabaseTask.action = actionTask
+            activity.startService(intentDatabaseTask)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to perform database action", e)
+            Toast.makeText(activity, R.string.error_start_database_action, Toast.LENGTH_LONG).show()
+        }
     }
 
     /*
@@ -591,4 +599,8 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
         }
                 , ACTION_DATABASE_SAVE)
     }
+
+    companion object {
+        private val TAG = ProgressDatabaseTaskProvider::class.java.name
+    }
 }

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

@@ -21,6 +21,8 @@ package com.kunzisoft.keepass.database.action
 
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.element.binary.LoadedKey
+import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
@@ -33,19 +35,23 @@ class ReloadDatabaseRunnable(private val context: Context,
                              private val mLoadDatabaseResult: ((Result) -> Unit)?)
     : ActionRunnable() {
 
-    private var tempCipherKey: Database.LoadedKey? = null
+    private var tempCipherKey: LoadedKey? = null
 
     override fun onStartRun() {
-        tempCipherKey = mDatabase.loadedCipherKey
+        tempCipherKey = mDatabase.binaryCache.loadedCipherKey
         // Clear before we load
         mDatabase.clear(UriUtil.getBinaryDir(context))
+        mDatabase.wasReloaded = true
     }
 
     override fun onActionRun() {
         try {
             mDatabase.reloadData(context.contentResolver,
                     UriUtil.getBinaryDir(context),
-                    tempCipherKey ?: Database.LoadedKey.generateNewCipherKey(),
+                    { memoryWanted ->
+                        BinaryData.canMemoryBeAllocatedInRAM(context, memoryWanted)
+                    },
+                    tempCipherKey ?: LoadedKey.generateNewCipherKey(),
                     progressTaskUpdater)
         } catch (e: LoadDatabaseException) {
             setError(e)

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

@@ -52,16 +52,9 @@ class CopyNodesRunnable constructor(
                     if (mNewParent != database.rootGroup || database.rootCanContainsEntry()) {
                         // Update entry with new values
                         mNewParent.touch(modified = false, touchParents = true)
-
                         val entryCopied = database.copyEntryTo(currentNode as Entry, mNewParent)
-                        if (entryCopied != null) {
+                        entryCopied.touch(modified = true, touchParents = true)
-                            entryCopied.touch(modified = true, touchParents = true)
+                        mEntriesCopied.add(entryCopied)
-                            mEntriesCopied.add(entryCopied)
-                        } else {
-                            Log.e(TAG, "Unable to create a copy of the entry")
-                            setError(CopyEntryDatabaseException())
-                            break@foreachNode
-                        }
                     } else {
                         // Only finish thread
                         setError(CopyEntryDatabaseException())

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

@@ -65,7 +65,7 @@ class DeleteNodesRunnable(context: Context,
                         database.deleteEntry(currentNode)
                     }
                     // Remove the oldest attachments
-                    currentNode.getAttachments(database.binaryPool).forEach {
+                    currentNode.getAttachments(database.attachmentPool).forEach {
                         database.removeAttachmentIfNotUsed(it)
                     }
                 }

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

@@ -42,14 +42,14 @@ class UpdateEntryRunnable constructor(
         mNewEntry.addParentFrom(mOldEntry)
 
         // Build oldest attachments
-        val oldEntryAttachments = mOldEntry.getAttachments(database.binaryPool, true)
+        val oldEntryAttachments = mOldEntry.getAttachments(database.attachmentPool, true)
-        val newEntryAttachments = mNewEntry.getAttachments(database.binaryPool, true)
+        val newEntryAttachments = mNewEntry.getAttachments(database.attachmentPool, true)
         val attachmentsToRemove = ArrayList<Attachment>(oldEntryAttachments)
         // Not use equals because only check name
         newEntryAttachments.forEach { newAttachment ->
             oldEntryAttachments.forEach { oldAttachment ->
                 if (oldAttachment.name == newAttachment.name
-                        && oldAttachment.binaryAttachment == newAttachment.binaryAttachment)
+                        && oldAttachment.binaryData == newAttachment.binaryData)
                     attachmentsToRemove.remove(oldAttachment)
             }
         }
@@ -60,7 +60,7 @@ class UpdateEntryRunnable constructor(
 
         // Create an entry history (an entry history don't have history)
         mOldEntry.addEntryToHistory(Entry(mBackupEntryHistory, copyHistory = false))
-        database.removeOldestEntryHistory(mOldEntry, database.binaryPool)
+        database.removeOldestEntryHistory(mOldEntry, database.attachmentPool)
 
         // Only change data in index
         database.updateEntry(mOldEntry)

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

@@ -0,0 +1,40 @@
+/*
+ * 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.crypto
+
+
+import com.kunzisoft.encrypt.CipherFactory
+import java.security.InvalidAlgorithmParameterException
+import java.security.InvalidKeyException
+import java.security.NoSuchAlgorithmException
+import javax.crypto.Cipher
+import javax.crypto.NoSuchPaddingException
+
+class AesEngine : CipherEngine() {
+
+    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
+    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher {
+        return CipherFactory.getAES(opmode, key, IV)
+    }
+
+    override fun getEncryptionAlgorithm(): EncryptionAlgorithm {
+        return EncryptionAlgorithm.AESRijndael
+    }
+}

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

@@ -17,19 +17,14 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.engine
+package com.kunzisoft.keepass.database.crypto
 
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.encrypt.CipherFactory
-import com.kunzisoft.keepass.stream.bytes16ToUuid
-import org.bouncycastle.jce.provider.BouncyCastleProvider
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
-import java.util.*
 import javax.crypto.Cipher
 import javax.crypto.NoSuchPaddingException
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
 
 class ChaCha20Engine : CipherEngine() {
 
@@ -38,34 +33,11 @@ class ChaCha20Engine : CipherEngine() {
     }
 
     @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher {
+    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher {
-        val cipher = Cipher.getInstance("Chacha7539", BouncyCastleProvider())
+        return CipherFactory.getChacha20(opmode, key, IV)
-        cipher.init(opmode, SecretKeySpec(key, "ChaCha7539"), IvParameterSpec(IV))
-        return cipher
     }
 
-    override fun getPwEncryptionAlgorithm(): EncryptionAlgorithm {
+    override fun getEncryptionAlgorithm(): EncryptionAlgorithm {
         return EncryptionAlgorithm.ChaCha20
     }
-
-    companion object {
-
-        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()))
-    }
 }

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

@@ -17,9 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.engine
+package com.kunzisoft.keepass.database.crypto
-
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException
@@ -39,13 +37,8 @@ abstract class CipherEngine {
     }
 
     @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
-    abstract fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray, androidOverride: Boolean): Cipher
+    abstract fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher
 
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
+    abstract fun getEncryptionAlgorithm(): EncryptionAlgorithm
-    fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher {
-        return getCipher(opmode, key, IV, false)
-    }
-
-    abstract fun getPwEncryptionAlgorithm(): EncryptionAlgorithm
 
 }

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

@@ -17,11 +17,13 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto
+package com.kunzisoft.keepass.database.crypto
 
+import com.kunzisoft.encrypt.HashManager
 import com.kunzisoft.keepass.utils.UnsignedInt
+import com.kunzisoft.encrypt.StreamCipher
 
-enum class CrsAlgorithm constructor(val id: UnsignedInt) {
+enum class CrsAlgorithm(val id: UnsignedInt) {
 
     Null(UnsignedInt(0)),
     ArcFourVariant(UnsignedInt(1)),
@@ -30,6 +32,15 @@ enum class CrsAlgorithm constructor(val id: UnsignedInt) {
 
     companion object {
 
+        @Throws(Exception::class)
+        fun getCipher(algorithm: CrsAlgorithm?, key: ByteArray): StreamCipher {
+            return when (algorithm) {
+                Salsa20 -> HashManager.getSalsa20(key)
+                ChaCha20 -> HashManager.getChaCha20(key)
+                else -> throw Exception("Invalid random cipher")
+            }
+        }
+
         fun fromId(num: UnsignedInt): CrsAlgorithm? {
             for (e in values()) {
                 if (e.id == num) {

app/src/main/java/com/kunzisoft/keepass/database/crypto/EncryptionAlgorithm.kt

@@ -0,0 +1,133 @@
+/*
+ * 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.crypto
+
+import com.kunzisoft.keepass.utils.bytes16ToUuid
+import java.security.NoSuchAlgorithmException
+import java.util.*
+
+enum class EncryptionAlgorithm {
+
+    AESRijndael,
+    Twofish,
+    ChaCha20;
+
+    val cipherEngine: CipherEngine
+        get() {
+            return when (this) {
+                AESRijndael -> AesEngine()
+                Twofish -> TwofishEngine()
+                ChaCha20 -> ChaCha20Engine()
+            }
+        }
+
+    val uuid: UUID
+        get() {
+            return when (this) {
+                AESRijndael -> AES_UUID
+                Twofish -> TWOFISH_UUID
+                ChaCha20 -> CHACHA20_UUID
+            }
+        }
+
+    override fun toString(): String {
+        return when (this) {
+            AESRijndael -> "Rijndael (AES)"
+            Twofish -> "Twofish"
+            ChaCha20 -> "ChaCha20"
+        }
+    }
+
+    companion object {
+
+        /**
+         * Generate appropriate cipher based on KeePass 2.x UUID's
+         */
+        @Throws(NoSuchAlgorithmException::class)
+        fun getFrom(uuid: UUID): EncryptionAlgorithm {
+            return when (uuid) {
+                AES_UUID -> AESRijndael
+                TWOFISH_UUID -> Twofish
+                CHACHA20_UUID -> ChaCha20
+                else -> throw NoSuchAlgorithmException("UUID unrecognized.")
+            }
+        }
+
+        private val AES_UUID: UUID by lazy {
+            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()))
+        }
+
+        private val TWOFISH_UUID: UUID by lazy {
+            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()))
+        }
+
+        private val CHACHA20_UUID: UUID by lazy {
+            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()))
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/crypto/HmacBlock.kt

@@ -17,35 +17,40 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.stream
+package com.kunzisoft.keepass.database.crypto
 
 import java.io.IOException
-import java.security.DigestOutputStream
+import java.security.InvalidKeyException
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
+import javax.crypto.Mac
+import javax.crypto.spec.SecretKeySpec
 
-object HmacBlockStream {
+object HmacBlock {
-    fun getHmacKey64(key: ByteArray, blockIndex: Long): ByteArray {
+
+    fun getHmacSha256(blockKey: ByteArray): Mac {
+        val hmac: Mac
+        try {
+            hmac = Mac.getInstance("HmacSHA256")
+            val signingKey = SecretKeySpec(blockKey, "HmacSHA256")
+            hmac.init(signingKey)
+        } catch (e: NoSuchAlgorithmException) {
+            throw IOException("No HmacAlogirthm")
+        } catch (e: InvalidKeyException) {
+            throw IOException("Invalid Hmac Key")
+        }
+        return hmac
+    }
+
+    fun getHmacKey64(key: ByteArray, blockIndex: ByteArray): ByteArray {
         val hash: MessageDigest
         try {
             hash = MessageDigest.getInstance("SHA-512")
         } catch (e: NoSuchAlgorithmException) {
             throw RuntimeException(e)
         }
-
+        hash.update(blockIndex)
-        val nos = NullOutputStream()
+        hash.update(key)
-        val dos = DigestOutputStream(nos, hash)
-        val leos = LittleEndianDataOutputStream(dos)
-
-        try {
-            leos.writeLong(blockIndex)
-            leos.write(key)
-            leos.close()
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-
-        //assert(hashKey.length == 64);
         return hash.digest()
     }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * 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.crypto
+
+import com.kunzisoft.encrypt.CipherFactory
+import java.security.InvalidAlgorithmParameterException
+import java.security.InvalidKeyException
+import java.security.NoSuchAlgorithmException
+import javax.crypto.Cipher
+import javax.crypto.NoSuchPaddingException
+
+class TwofishEngine : CipherEngine() {
+
+    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
+    override fun getCipher(opmode: Int, key: ByteArray, IV: ByteArray): Cipher {
+        return CipherFactory.getTwofish(opmode, key, IV)
+    }
+
+    override fun getEncryptionAlgorithm(): EncryptionAlgorithm {
+        return EncryptionAlgorithm.Twofish
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/crypto/VariantDictionary.kt

@@ -17,13 +17,10 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.utils
+package com.kunzisoft.keepass.database.crypto
 
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
+import com.kunzisoft.keepass.utils.*
-import com.kunzisoft.keepass.stream.*
+import java.io.*
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.IOException
 import java.nio.charset.Charset
 import java.util.*
 
@@ -55,12 +52,12 @@ open class VariantDictionary {
         return dict[name]?.value as UnsignedInt?
     }
 
-    fun setUInt64(name: String, value: Long) {
+    fun setUInt64(name: String, value: UnsignedLong) {
         putType(VdType.UInt64, name, value)
     }
 
-    fun getUInt64(name: String): Long? {
+    fun getUInt64(name: String): UnsignedLong? {
-        return dict[name]?.value as Long?
+        return dict[name]?.value as UnsignedLong?
     }
 
     fun setBool(name: String, value: Boolean) {
@@ -115,22 +112,21 @@ open class VariantDictionary {
 
         @Throws(IOException::class)
         fun deserialize(data: ByteArray): VariantDictionary {
-            val inputStream = LittleEndianDataInputStream(ByteArrayInputStream(data))
+            val inputStream = ByteArrayInputStream(data)
             return deserialize(inputStream)
         }
 
         @Throws(IOException::class)
-        fun serialize(kdfParameters: KdfParameters): ByteArray {
+        fun serialize(variantDictionary: VariantDictionary): ByteArray {
             val byteArrayOutputStream = ByteArrayOutputStream()
-            val outputStream = LittleEndianDataOutputStream(byteArrayOutputStream)
+            serialize(variantDictionary, byteArrayOutputStream)
-            serialize(kdfParameters, outputStream)
             return byteArrayOutputStream.toByteArray()
         }
 
         @Throws(IOException::class)
-        fun deserialize(inputStream: LittleEndianDataInputStream): VariantDictionary {
+        fun deserialize(inputStream: InputStream): VariantDictionary {
             val dictionary = VariantDictionary()
-            val version = inputStream.readUShort()
+            val version = inputStream.readBytes2ToUShort()
             if (version and VdmCritical > VdVersion and VdmCritical) {
                 throw IOException("Invalid format")
             }
@@ -143,14 +139,14 @@ open class VariantDictionary {
                 if (bType == VdType.None) {
                     break
                 }
-                val nameLen = inputStream.readUInt().toKotlinInt()
+                val nameLen = inputStream.readBytes4ToUInt().toKotlinInt()
-                val nameBuf = inputStream.readBytes(nameLen)
+                val nameBuf = inputStream.readBytesLength(nameLen)
                 if (nameLen != nameBuf.size) {
                     throw IOException("Invalid format")
                 }
                 val name = String(nameBuf, UTF8Charset)
-                val valueLen = inputStream.readUInt().toKotlinInt()
+                val valueLen = inputStream.readBytes4ToUInt().toKotlinInt()
-                val valueBuf = inputStream.readBytes(valueLen)
+                val valueBuf = inputStream.readBytesLength(valueLen)
                 if (valueLen != valueBuf.size) {
                     throw IOException("Invalid format")
                 }
@@ -159,7 +155,7 @@ open class VariantDictionary {
                         dictionary.setUInt32(name, bytes4ToUInt(valueBuf))
                     }
                     VdType.UInt64 -> if (valueLen == 8) {
-                        dictionary.setUInt64(name, bytes64ToLong(valueBuf))
+                        dictionary.setUInt64(name, bytes64ToULong(valueBuf))
                     }
                     VdType.Bool -> if (valueLen == 1) {
                         dictionary.setBool(name, valueBuf[0] != 0.toByte())
@@ -181,48 +177,47 @@ open class VariantDictionary {
 
         @Throws(IOException::class)
         fun serialize(variantDictionary: VariantDictionary,
-                      outputStream: LittleEndianDataOutputStream?) {
+                      outputStream: OutputStream?) {
             if (outputStream == null) {
                 return
             }
-            outputStream.writeUShort(VdVersion)
+            outputStream.write2BytesUShort(VdVersion)
             for ((name, vd) in variantDictionary.dict) {
                 val nameBuf = name.toByteArray(UTF8Charset)
-                outputStream.write(vd.type.toInt())
+                outputStream.writeByte(vd.type)
-                outputStream.writeInt(nameBuf.size)
+                outputStream.write4BytesUInt(UnsignedInt(nameBuf.size))
                 outputStream.write(nameBuf)
                 var buf: ByteArray
                 when (vd.type) {
                     VdType.UInt32 -> {
-                        outputStream.writeInt(4)
+                        outputStream.write4BytesUInt(UnsignedInt(4))
-                        outputStream.writeUInt((vd.value as UnsignedInt))
+                        outputStream.write4BytesUInt(vd.value as UnsignedInt)
                     }
                     VdType.UInt64 -> {
-                        outputStream.writeInt(8)
+                        outputStream.write4BytesUInt(UnsignedInt(8))
-                        outputStream.writeLong(vd.value as Long)
+                        outputStream.write8BytesLong(vd.value as UnsignedLong)
                     }
                     VdType.Bool -> {
-                        outputStream.writeInt(1)
+                        outputStream.write4BytesUInt(UnsignedInt(1))
-                        val bool = if (vd.value as Boolean) 1.toByte() else 0.toByte()
+                        outputStream.writeBooleanByte(vd.value as Boolean)
-                        outputStream.write(bool.toInt())
                     }
                     VdType.Int32 -> {
-                        outputStream.writeInt(4)
+                        outputStream.write4BytesUInt(UnsignedInt(4))
-                        outputStream.writeInt(vd.value as Int)
+                        outputStream.write4BytesUInt(UnsignedInt(vd.value as Int))
                     }
                     VdType.Int64 -> {
-                        outputStream.writeInt(8)
+                        outputStream.write4BytesUInt(UnsignedInt(8))
-                        outputStream.writeLong(vd.value as Long)
+                        outputStream.write8BytesLong(vd.value as Long)
                     }
                     VdType.String -> {
                         val value = vd.value as String
                         buf = value.toByteArray(UTF8Charset)
-                        outputStream.writeInt(buf.size)
+                        outputStream.write4BytesUInt(UnsignedInt(buf.size))
                         outputStream.write(buf)
                     }
                     VdType.ByteArray -> {
                         buf = vd.value as ByteArray
-                        outputStream.writeInt(buf.size)
+                        outputStream.write4BytesUInt(UnsignedInt(buf.size))
                         outputStream.write(buf)
                     }
                     else -> {

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

@@ -17,13 +17,12 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.keyDerivation
+package com.kunzisoft.keepass.database.crypto.kdf
 
-import android.content.res.Resources
+import com.kunzisoft.encrypt.HashManager
-import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.utils.UnsignedLong
-import com.kunzisoft.keepass.crypto.CryptoUtil
+import com.kunzisoft.encrypt.aes.AESTransformer
-import com.kunzisoft.keepass.crypto.finalkey.AESKeyTransformerFactory
+import com.kunzisoft.keepass.utils.bytes16ToUuid
-import com.kunzisoft.keepass.stream.bytes16ToUuid
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -38,32 +37,28 @@ class AesKdf : KdfEngine() {
         get() {
             return KdfParameters(uuid!!).apply {
                 setParamUUID()
-                setUInt64(PARAM_ROUNDS, defaultKeyRounds)
+                setUInt64(PARAM_ROUNDS, UnsignedLong(defaultKeyRounds))
             }
         }
 
-    override val defaultKeyRounds: Long = 500000L
+    override val defaultKeyRounds = 500000L
-
-    override fun getName(resources: Resources): String {
-        return resources.getString(R.string.kdf_AES)
-    }
 
     @Throws(IOException::class)
     override fun transform(masterKey: ByteArray, kdfParameters: KdfParameters): ByteArray {
 
         var seed = kdfParameters.getByteArray(PARAM_SEED)
         if (seed != null && seed.size != 32) {
-            seed = CryptoUtil.hashSha256(seed)
+            seed = HashManager.hashSha256(seed)
         }
 
         var currentMasterKey = masterKey
         if (currentMasterKey.size != 32) {
-            currentMasterKey = CryptoUtil.hashSha256(currentMasterKey)
+            currentMasterKey = HashManager.hashSha256(currentMasterKey)
         }
 
-        val rounds = kdfParameters.getUInt64(PARAM_ROUNDS)
+        val rounds = kdfParameters.getUInt64(PARAM_ROUNDS)?.toKotlinLong()
 
-        return AESKeyTransformerFactory.transformMasterKey(seed, currentMasterKey, rounds) ?: ByteArray(0)
+        return AESTransformer.transformKey(seed, currentMasterKey, rounds) ?: ByteArray(0)
     }
 
     override fun randomize(kdfParameters: KdfParameters) {
@@ -76,11 +71,15 @@ class AesKdf : KdfEngine() {
     }
 
     override fun getKeyRounds(kdfParameters: KdfParameters): Long {
-        return kdfParameters.getUInt64(PARAM_ROUNDS) ?: defaultKeyRounds
+        return kdfParameters.getUInt64(PARAM_ROUNDS)?.toKotlinLong() ?: defaultKeyRounds
     }
 
     override fun setKeyRounds(kdfParameters: KdfParameters, keyRounds: Long) {
-        kdfParameters.setUInt64(PARAM_ROUNDS, keyRounds)
+        kdfParameters.setUInt64(PARAM_ROUNDS, UnsignedLong(keyRounds))
+    }
+
+    override fun toString(): String {
+        return "AES"
     }
 
     companion object {

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

@@ -17,13 +17,13 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.keyDerivation
+package com.kunzisoft.keepass.database.crypto.kdf
 
-import android.content.res.Resources
-import androidx.annotation.StringRes
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.stream.bytes16ToUuid
 import com.kunzisoft.keepass.utils.UnsignedInt
+import com.kunzisoft.keepass.utils.UnsignedLong
+import com.kunzisoft.encrypt.argon2.Argon2Transformer
+import com.kunzisoft.encrypt.argon2.Argon2Type
+import com.kunzisoft.keepass.utils.bytes16ToUuid
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -48,40 +48,30 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
         }
 
     override val defaultKeyRounds: Long
-        get() = DEFAULT_ITERATIONS
+        get() = DEFAULT_ITERATIONS.toKotlinLong()
-
-    override fun getName(resources: Resources): String {
-        return resources.getString(type.nameId)
-    }
 
     @Throws(IOException::class)
     override fun transform(masterKey: ByteArray, kdfParameters: KdfParameters): ByteArray {
 
-        val salt = kdfParameters.getByteArray(PARAM_SALT)
+        val salt = kdfParameters.getByteArray(PARAM_SALT) ?: ByteArray(0)
-        val parallelism = kdfParameters.getUInt32(PARAM_PARALLELISM)?.let {
+        val parallelism = kdfParameters.getUInt32(PARAM_PARALLELISM)?.toKotlinLong() ?: DEFAULT_PARALLELISM.toKotlinLong()
-            UnsignedInt(it)
+        val memory = kdfParameters.getUInt64(PARAM_MEMORY)?.toKotlinLong()?.div(MEMORY_BLOCK_SIZE) ?: DEFAULT_MEMORY.toKotlinLong()
-        }
+        val iterations = kdfParameters.getUInt64(PARAM_ITERATIONS)?.toKotlinLong() ?: DEFAULT_ITERATIONS.toKotlinLong()
-        val memory = kdfParameters.getUInt64(PARAM_MEMORY)?.div(MEMORY_BLOCK_SIZE)?.let {
+        val version = kdfParameters.getUInt32(PARAM_VERSION)?.toKotlinInt() ?: MAX_VERSION.toKotlinInt()
-            UnsignedInt.fromKotlinLong(it)
-        }
-        val iterations = kdfParameters.getUInt64(PARAM_ITERATIONS)?.let {
-            UnsignedInt.fromKotlinLong(it)
-        }
-        val version = kdfParameters.getUInt32(PARAM_VERSION)?.let {
-            UnsignedInt(it)
-        }
-        val secretKey = kdfParameters.getByteArray(PARAM_SECRET_KEY)
-        val assocData = kdfParameters.getByteArray(PARAM_ASSOC_DATA)
 
-        return Argon2Native.transformKey(
+        // Not used
-                type,
+        // val secretKey = kdfParameters.getByteArray(PARAM_SECRET_KEY)
+        // val assocData = kdfParameters.getByteArray(PARAM_ASSOC_DATA)
+
+        val argonType = if (type == Type.ARGON2_ID) Argon2Type.ARGON2_ID else Argon2Type.ARGON2_D
+
+        return Argon2Transformer.transformKey(
+                argonType,
                 masterKey,
                 salt,
                 parallelism,
                 memory,
                 iterations,
-                secretKey,
-                assocData,
                 version)
     }
 
@@ -95,32 +85,32 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
     }
 
     override fun getKeyRounds(kdfParameters: KdfParameters): Long {
-        return kdfParameters.getUInt64(PARAM_ITERATIONS) ?: defaultKeyRounds
+        return kdfParameters.getUInt64(PARAM_ITERATIONS)?.toKotlinLong() ?: defaultKeyRounds
     }
 
     override fun setKeyRounds(kdfParameters: KdfParameters, keyRounds: Long) {
-        kdfParameters.setUInt64(PARAM_ITERATIONS, keyRounds)
+        kdfParameters.setUInt64(PARAM_ITERATIONS, UnsignedLong(keyRounds))
     }
 
     override val minKeyRounds: Long
-        get() = MIN_ITERATIONS
+        get() = MIN_ITERATIONS.toKotlinLong()
 
     override val maxKeyRounds: Long
-        get() = MAX_ITERATIONS
+        get() = MAX_ITERATIONS.toKotlinLong()
 
     override fun getMemoryUsage(kdfParameters: KdfParameters): Long {
-        return kdfParameters.getUInt64(PARAM_MEMORY) ?: defaultMemoryUsage
+        return kdfParameters.getUInt64(PARAM_MEMORY)?.toKotlinLong() ?: defaultMemoryUsage
     }
 
     override fun setMemoryUsage(kdfParameters: KdfParameters, memory: Long) {
-        kdfParameters.setUInt64(PARAM_MEMORY, memory)
+        kdfParameters.setUInt64(PARAM_MEMORY, UnsignedLong(memory))
     }
 
     override val defaultMemoryUsage: Long
-        get() = DEFAULT_MEMORY
+        get() = DEFAULT_MEMORY.toKotlinLong()
 
     override val minMemoryUsage: Long
-        get() = MIN_MEMORY
+        get() = MIN_MEMORY.toKotlinLong()
 
     override val maxMemoryUsage: Long
         get() = MAX_MEMORY
@@ -135,16 +125,20 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
         kdfParameters.setUInt32(PARAM_PARALLELISM, UnsignedInt.fromKotlinLong(parallelism))
     }
 
+    override fun toString(): String {
+        return "$type"
+    }
+
     override val defaultParallelism: Long
         get() = DEFAULT_PARALLELISM.toKotlinLong()
 
     override val minParallelism: Long
-        get() = MIN_PARALLELISM
+        get() = MIN_PARALLELISM.toKotlinLong()
 
     override val maxParallelism: Long
-        get() = MAX_PARALLELISM
+        get() = MAX_PARALLELISM.toKotlinLong()
 
-    enum class Type(val CIPHER_UUID: UUID, @StringRes val nameId: Int) {
+    enum class Type(val CIPHER_UUID: UUID, private val typeName: String) {
         ARGON2_D(bytes16ToUuid(
                 byteArrayOf(0xEF.toByte(),
                         0x63.toByte(),
@@ -161,7 +155,7 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
                         0x03.toByte(),
                         0xE3.toByte(),
                         0x0A.toByte(),
-                        0x0C.toByte())), R.string.kdf_Argon2d),
+                        0x0C.toByte())), "Argon2d"),
         ARGON2_ID(bytes16ToUuid(
                 byteArrayOf(0x9E.toByte(),
                         0x29.toByte(),
@@ -178,7 +172,11 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
                         0xC6.toByte(),
                         0xF0.toByte(),
                         0xA1.toByte(),
-                        0xE6.toByte())), R.string.kdf_Argon2id);
+                        0xE6.toByte())), "Argon2id");
+
+        override fun toString(): String {
+            return typeName
+        }
     }
 
     companion object {
@@ -194,21 +192,17 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
         private val MIN_VERSION = UnsignedInt(0x10)
         private val MAX_VERSION = UnsignedInt(0x13)
 
-        private const val MIN_SALT = 8
+        private val DEFAULT_ITERATIONS = UnsignedLong(2L)
-        private val MAX_SALT = UnsignedInt.MAX_VALUE.toKotlinLong()
+        private val MIN_ITERATIONS = UnsignedLong(1L)
+        private val MAX_ITERATIONS = UnsignedLong(4294967295L)
 
-        private const val MIN_ITERATIONS: Long = 1L
+        private val DEFAULT_MEMORY = UnsignedLong((1024L * 1024L))
-        private const val MAX_ITERATIONS = 4294967295L
+        private val MIN_MEMORY = UnsignedLong(1024L * 8L)
-
-        private const val MIN_MEMORY = (1024 * 8).toLong()
         private val MAX_MEMORY = UnsignedInt.MAX_VALUE.toKotlinLong()
         private const val MEMORY_BLOCK_SIZE: Long = 1024L
 
-        private const val MIN_PARALLELISM: Long = 1L
-        private const val MAX_PARALLELISM: Long = ((1 shl 24) - 1).toLong()
-
-        private const val DEFAULT_ITERATIONS: Long = 2L
-        private const val DEFAULT_MEMORY = (1024 * 1024).toLong()
         private val DEFAULT_PARALLELISM = UnsignedInt(2)
+        private val MIN_PARALLELISM = UnsignedInt.fromKotlinLong(1L)
+        private val MAX_PARALLELISM = UnsignedInt.fromKotlinLong(((1 shl 24) - 1))
     }
 }

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

@@ -17,17 +17,15 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.keyDerivation
+package com.kunzisoft.keepass.database.crypto.kdf
 
-import com.kunzisoft.keepass.utils.ObjectNameResource
 import com.kunzisoft.keepass.utils.UnsignedInt
-
 import java.io.IOException
 import java.io.Serializable
-import java.util.UUID
+import java.util.*
 
 // TODO Parcelable
-abstract class KdfEngine : ObjectNameResource, Serializable {
+abstract class KdfEngine : Serializable {
 
     var uuid: UUID? = null
 

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

@@ -17,7 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.keyDerivation
+package com.kunzisoft.keepass.database.crypto.kdf
 
 object KdfFactory {
     var aesKdf = AesKdf()

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

@@ -17,11 +17,11 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.crypto.keyDerivation
+package com.kunzisoft.keepass.database.crypto.kdf
 
-import com.kunzisoft.keepass.stream.bytes16ToUuid
+import com.kunzisoft.keepass.utils.bytes16ToUuid
-import com.kunzisoft.keepass.stream.uuidTo16Bytes
+import com.kunzisoft.keepass.utils.uuidTo16Bytes
-import com.kunzisoft.keepass.utils.VariantDictionary
+import com.kunzisoft.keepass.database.crypto.VariantDictionary
 import java.io.IOException
 import java.util.*
 

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

@@ -23,7 +23,9 @@ import android.database.MatrixCursor
 import android.provider.BaseColumns
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.entry.EntryVersioned
-import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeId
 import java.util.*
 
@@ -49,12 +51,16 @@ abstract class EntryCursor<EntryId, PwEntryV : EntryVersioned<*, EntryId, *, *>>
 
     abstract fun getPwNodeId(): NodeId<EntryId>
 
-    open fun populateEntry(pwEntry: PwEntryV, iconFactory: IconImageFactory) {
+    open fun populateEntry(pwEntry: PwEntryV,
+                           retrieveStandardIcon: (Int) -> IconImageStandard,
+                           retrieveCustomIcon: (UUID) -> IconImageCustom) {
         pwEntry.nodeId = getPwNodeId()
         pwEntry.title = getString(getColumnIndex(COLUMN_INDEX_TITLE))
 
-        val iconStandard = iconFactory.getIcon(getInt(getColumnIndex(COLUMN_INDEX_ICON_STANDARD)))
+        val iconStandard = retrieveStandardIcon.invoke(getInt(getColumnIndex(COLUMN_INDEX_ICON_STANDARD)))
-        pwEntry.icon = iconStandard
+        val iconCustom = retrieveCustomIcon.invoke(UUID(getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
+                getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))))
+        pwEntry.icon = IconImage(iconStandard, iconCustom)
 
         pwEntry.username = getString(getColumnIndex(COLUMN_INDEX_USERNAME))
         pwEntry.password = getString(getColumnIndex(COLUMN_INDEX_PASSWORD))

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

@@ -19,7 +19,6 @@
  */
 package com.kunzisoft.keepass.database.cursor
 
-import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 import com.kunzisoft.keepass.database.element.entry.EntryKDB
 
 class EntryCursorKDB : EntryCursorUUID<EntryKDB>() {
@@ -30,9 +29,9 @@ class EntryCursorKDB : EntryCursorUUID<EntryKDB>() {
                 entry.id.mostSignificantBits,
                 entry.id.leastSignificantBits,
                 entry.title,
-                entry.icon.iconId,
+                entry.icon.standard.id,
-                DatabaseVersioned.UUID_ZERO.mostSignificantBits,
+                entry.icon.custom.uuid.mostSignificantBits,
-                DatabaseVersioned.UUID_ZERO.leastSignificantBits,
+                entry.icon.custom.uuid.leastSignificantBits,
                 entry.username,
                 entry.password,
                 entry.url,

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

@@ -20,9 +20,9 @@
 package com.kunzisoft.keepass.database.cursor
 
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
-import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
-import java.util.UUID
+import java.util.*
 
 class EntryCursorKDBX : EntryCursorUUID<EntryKDBX>() {
 
@@ -34,9 +34,9 @@ class EntryCursorKDBX : EntryCursorUUID<EntryKDBX>() {
                 entry.id.mostSignificantBits,
                 entry.id.leastSignificantBits,
                 entry.title,
-                entry.icon.iconId,
+                entry.icon.standard.id,
-                entry.iconCustom.uuid.mostSignificantBits,
+                entry.icon.custom.uuid.mostSignificantBits,
-                entry.iconCustom.uuid.leastSignificantBits,
+                entry.icon.custom.uuid.leastSignificantBits,
                 entry.username,
                 entry.password,
                 entry.url,
@@ -52,14 +52,10 @@ class EntryCursorKDBX : EntryCursorUUID<EntryKDBX>() {
         entryId++
     }
 
-    override fun populateEntry(pwEntry: EntryKDBX, iconFactory: IconImageFactory) {
+    override fun populateEntry(pwEntry: EntryKDBX,
-        super.populateEntry(pwEntry, iconFactory)
+                               retrieveStandardIcon: (Int) -> IconImageStandard,
-
+                               retrieveCustomIcon: (UUID) -> IconImageCustom) {
-        // Retrieve custom icon
+        super.populateEntry(pwEntry, retrieveStandardIcon, retrieveCustomIcon)
-        val iconCustom = iconFactory.getIcon(
-                UUID(getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
-                        getLong(getColumnIndex(COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))))
-        pwEntry.iconCustom = iconCustom
 
         // Retrieve extra fields
         if (extraFieldCursor.moveToFirst()) {

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

@@ -19,24 +19,23 @@
  */
 package com.kunzisoft.keepass.database.element
 
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.database.BinaryAttachment
+import com.kunzisoft.keepass.database.element.binary.BinaryByte
-import kotlinx.coroutines.*
+import com.kunzisoft.keepass.database.element.binary.BinaryData
+
 
 data class Attachment(var name: String,
-                      var binaryAttachment: BinaryAttachment) : Parcelable {
+                      var binaryData: BinaryData) : Parcelable {
 
     constructor(parcel: Parcel) : this(
             parcel.readString() ?: "",
-            parcel.readParcelable(BinaryAttachment::class.java.classLoader) ?: BinaryAttachment()
+            parcel.readParcelable(BinaryData::class.java.classLoader) ?: BinaryByte()
     )
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(name)
-        parcel.writeParcelable(binaryAttachment, flags)
+        parcel.writeParcelable(binaryData, flags)
     }
 
     override fun describeContents(): Int {
@@ -44,7 +43,7 @@ data class Attachment(var name: String,
     }
 
     override fun toString(): String {
-        return "$name at $binaryAttachment"
+        return "$name at $binaryData"
     }
 
     override fun equals(other: Any?): Boolean {
@@ -68,28 +67,5 @@ data class Attachment(var name: String,
         override fun newArray(size: Int): Array<Attachment?> {
             return arrayOfNulls(size)
         }
-
-        fun loadBitmap(attachment: Attachment,
-                       binaryCipherKey: Database.LoadedKey?,
-                       actionOnFinish: (Bitmap?) -> Unit) {
-            CoroutineScope(Dispatchers.Main).launch {
-                withContext(Dispatchers.IO) {
-                    val asyncResult: Deferred<Bitmap?> = async {
-                        runCatching {
-                            binaryCipherKey?.let { binaryKey ->
-                                var bitmap: Bitmap?
-                                attachment.binaryAttachment.getUnGzipInputDataStream(binaryKey).use { bitmapInputStream ->
-                                    bitmap = BitmapFactory.decodeStream(bitmapInputStream)
-                                }
-                                bitmap
-                            }
-                        }.getOrNull()
-                    }
-                    withContext(Dispatchers.Main) {
-                        actionOnFinish(asyncResult.await())
-                    }
-                }
-            }
-        }
     }
 }

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

@@ -23,17 +23,27 @@ import android.content.ContentResolver
 import android.content.res.Resources
 import android.net.Uri
 import android.util.Log
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
+import com.kunzisoft.keepass.utils.readBytes4ToUInt
 import com.kunzisoft.keepass.database.action.node.NodeHandler
-import com.kunzisoft.keepass.database.element.database.*
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
-import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
+import com.kunzisoft.keepass.database.element.binary.AttachmentPool
+import com.kunzisoft.keepass.database.element.binary.BinaryCache
+import com.kunzisoft.keepass.database.element.binary.BinaryData
+import com.kunzisoft.keepass.database.element.binary.LoadedKey
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.DatabaseKDB
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.icon.IconsManager
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdInt
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
+import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_4
 import com.kunzisoft.keepass.database.file.input.DatabaseInputKDB
 import com.kunzisoft.keepass.database.file.input.DatabaseInputKDBX
 import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDB
@@ -42,16 +52,11 @@ import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.database.search.SearchParameters
 import com.kunzisoft.keepass.icons.IconDrawableFactory
 import com.kunzisoft.keepass.model.MainCredential
-import com.kunzisoft.keepass.stream.readBytes4ToUInt
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
 import com.kunzisoft.keepass.utils.SingletonHolder
 import com.kunzisoft.keepass.utils.UriUtil
 import java.io.*
-import java.security.Key
-import java.security.SecureRandom
 import java.util.*
-import javax.crypto.KeyGenerator
-import javax.crypto.spec.IvParameterSpec
 import kotlin.collections.ArrayList
 
 
@@ -68,7 +73,10 @@ class Database {
 
     var isReadOnly = false
 
-    val drawFactory = IconDrawableFactory()
+    val iconDrawableFactory = IconDrawableFactory(
+            { binaryCache },
+            { iconId -> iconsManager.getBinaryForCustomIcon(iconId) }
+    )
 
     var loaded = false
         set(value) {
@@ -76,6 +84,11 @@ class Database {
             loadTimestamp = if (field) System.currentTimeMillis() else null
         }
 
+    /**
+     * To reload the main activity
+     */
+    var wasReloaded = false
+
     var loadTimestamp: Long? = null
         private set
 
@@ -83,20 +96,56 @@ class Database {
      * Cipher key regenerated when the database is loaded and closed
      * Can be used to temporarily store database elements
      */
-    var loadedCipherKey: LoadedKey?
+    var binaryCache: BinaryCache
         private set(value) {
-            mDatabaseKDB?.loadedCipherKey = value
+            mDatabaseKDB?.binaryCache = value
-            mDatabaseKDBX?.loadedCipherKey = value
+            mDatabaseKDBX?.binaryCache = value
         }
         get() {
-            return mDatabaseKDB?.loadedCipherKey ?: mDatabaseKDBX?.loadedCipherKey
+            return mDatabaseKDB?.binaryCache ?: mDatabaseKDBX?.binaryCache ?: BinaryCache()
         }
 
-    val iconFactory: IconImageFactory
+    fun setCacheDirectory(cacheDirectory: File) {
+        binaryCache.cacheDirectory = cacheDirectory
+    }
+
+    private val iconsManager: IconsManager
         get() {
-            return mDatabaseKDB?.iconFactory ?: mDatabaseKDBX?.iconFactory ?: IconImageFactory()
+            return mDatabaseKDB?.iconsManager ?: mDatabaseKDBX?.iconsManager ?: IconsManager(binaryCache)
         }
 
+    fun doForEachStandardIcons(action: (IconImageStandard) -> Unit) {
+        return iconsManager.doForEachStandardIcon(action)
+    }
+
+    fun getStandardIcon(iconId: Int): IconImageStandard {
+        return iconsManager.getIcon(iconId)
+    }
+
+    val allowCustomIcons: Boolean
+        get() = mDatabaseKDBX != null
+
+    fun doForEachCustomIcons(action: (IconImageCustom, BinaryData) -> Unit) {
+        return iconsManager.doForEachCustomIcon(action)
+    }
+
+    fun getCustomIcon(iconId: UUID): IconImageCustom {
+        return iconsManager.getIcon(iconId)
+    }
+
+    fun buildNewCustomIcon(result: (IconImageCustom?, BinaryData?) -> Unit) {
+        mDatabaseKDBX?.buildNewCustomIcon(null, result)
+    }
+
+    fun isCustomIconBinaryDuplicate(binaryData: BinaryData): Boolean {
+        return mDatabaseKDBX?.isCustomIconBinaryDuplicate(binaryData) ?: false
+    }
+
+    fun removeCustomIcon(customIcon: IconImageCustom) {
+        iconDrawableFactory.clearFromCache(customIcon)
+        iconsManager.removeCustomIcon(binaryCache, customIcon.uuid)
+    }
+
     val allowName: Boolean
         get() = mDatabaseKDBX != null
 
@@ -177,7 +226,7 @@ class Database {
         // Default compression not necessary if stored in header
         mDatabaseKDBX?.let {
             return it.compressionAlgorithm == CompressionAlgorithm.GZip
-                    && it.kdbxVersion.toKotlinLong() < DatabaseHeaderKDBX.FILE_VERSION_32_4.toKotlinLong()
+                    && it.kdbxVersion.isBefore(FILE_VERSION_32_4)
         }
         return false
     }
@@ -190,12 +239,9 @@ class Database {
     val allowNoMasterKey: Boolean
         get() = mDatabaseKDBX != null
 
-    val allowEncryptionAlgorithmModification: Boolean
+    fun getEncryptionAlgorithmName(): String {
-        get() = availableEncryptionAlgorithms.size > 1
+        return mDatabaseKDB?.encryptionAlgorithm?.toString()
-
+                ?: mDatabaseKDBX?.encryptionAlgorithm?.toString()
-    fun getEncryptionAlgorithmName(resources: Resources): String {
-        return mDatabaseKDB?.encryptionAlgorithm?.getName(resources)
-                ?: mDatabaseKDBX?.encryptionAlgorithm?.getName(resources)
                 ?: ""
     }
 
@@ -208,7 +254,7 @@ class Database {
             algorithm?.let {
                 mDatabaseKDBX?.encryptionAlgorithm = algorithm
                 mDatabaseKDBX?.setDataEngine(algorithm.cipherEngine)
-                mDatabaseKDBX?.dataCipher = algorithm.dataCipher
+                mDatabaseKDBX?.cipherUuid = algorithm.uuid
             }
         }
 
@@ -230,8 +276,8 @@ class Database {
             }
         }
 
-    fun getKeyDerivationName(resources: Resources): String {
+    fun getKeyDerivationName(): String {
-        return kdfEngine?.getName(resources) ?: ""
+        return kdfEngine?.toString() ?: ""
     }
 
     var numberKeyEncryptionRounds: Long
@@ -339,25 +385,12 @@ class Database {
 
     fun createData(databaseUri: Uri, databaseName: String, rootName: String) {
         val newDatabase = DatabaseKDBX(databaseName, rootName)
-        newDatabase.loadedCipherKey = LoadedKey.generateNewCipherKey()
         setDatabaseKDBX(newDatabase)
         this.fileUri = databaseUri
         // Set Database state
         this.loaded = true
     }
 
-    class LoadedKey(val key: Key, val iv: ByteArray): Serializable {
-        companion object {
-            const val BINARY_CIPHER = "Blowfish/CBC/PKCS5Padding"
-
-            fun generateNewCipherKey(): LoadedKey {
-                val iv = ByteArray(8)
-                SecureRandom().nextBytes(iv)
-                return LoadedKey(KeyGenerator.getInstance("Blowfish").generateKey(), iv)
-            }
-        }
-    }
-
     @Throws(LoadDatabaseException::class)
     private fun readDatabaseStream(contentResolver: ContentResolver, uri: Uri,
                                    openDatabaseKDB: (InputStream) -> DatabaseKDB,
@@ -411,6 +444,7 @@ class Database {
                  readOnly: Boolean,
                  contentResolver: ContentResolver,
                  cacheDirectory: File,
+                 isRAMSufficient: (memoryWanted: Long) -> Boolean,
                  tempCipherKey: LoadedKey,
                  fixDuplicateUUID: Boolean,
                  progressTaskUpdater: ProgressTaskUpdater?) {
@@ -432,7 +466,7 @@ class Database {
             // Read database stream for the first time
             readDatabaseStream(contentResolver, uri,
                     { databaseInputStream ->
-                        DatabaseInputKDB(cacheDirectory)
+                        DatabaseInputKDB(cacheDirectory, isRAMSufficient)
                                 .openDatabase(databaseInputStream,
                                         mainCredential.masterPassword,
                                         keyFileInputStream,
@@ -441,7 +475,7 @@ class Database {
                                         fixDuplicateUUID)
                     },
                     { databaseInputStream ->
-                        DatabaseInputKDBX(cacheDirectory)
+                        DatabaseInputKDBX(cacheDirectory, isRAMSufficient)
                                 .openDatabase(databaseInputStream,
                                         mainCredential.masterPassword,
                                         keyFileInputStream,
@@ -465,6 +499,7 @@ class Database {
     @Throws(LoadDatabaseException::class)
     fun reloadData(contentResolver: ContentResolver,
                    cacheDirectory: File,
+                   isRAMSufficient: (memoryWanted: Long) -> Boolean,
                    tempCipherKey: LoadedKey,
                    progressTaskUpdater: ProgressTaskUpdater?) {
 
@@ -473,14 +508,14 @@ class Database {
             fileUri?.let { oldDatabaseUri ->
                 readDatabaseStream(contentResolver, oldDatabaseUri,
                         { databaseInputStream ->
-                            DatabaseInputKDB(cacheDirectory)
+                            DatabaseInputKDB(cacheDirectory, isRAMSufficient)
                                     .openDatabase(databaseInputStream,
                                             masterKey,
                                             tempCipherKey,
                                             progressTaskUpdater)
                         },
                         { databaseInputStream ->
-                            DatabaseInputKDBX(cacheDirectory)
+                            DatabaseInputKDBX(cacheDirectory, isRAMSufficient)
                                     .openDatabase(databaseInputStream,
                                             masterKey,
                                             tempCipherKey,
@@ -532,9 +567,9 @@ class Database {
         }, omitBackup, max)
     }
 
-    val binaryPool: BinaryPool
+    val attachmentPool: AttachmentPool
         get() {
-            return mDatabaseKDBX?.binaryPool ?: BinaryPool()
+            return mDatabaseKDB?.attachmentPool ?: mDatabaseKDBX?.attachmentPool ?: AttachmentPool(binaryCache)
         }
 
     val allowMultipleAttachments: Boolean
@@ -546,17 +581,16 @@ class Database {
             return false
         }
 
-    fun buildNewBinary(cacheDirectory: File,
+    fun buildNewBinaryAttachment(compressed: Boolean = false,
-                       compressed: Boolean = false,
+                                 protected: Boolean = false): BinaryData? {
-                       protected: Boolean = false): BinaryAttachment? {
+        return mDatabaseKDB?.buildNewAttachment()
-        return mDatabaseKDB?.buildNewBinary(cacheDirectory)
+                ?: mDatabaseKDBX?.buildNewAttachment( false, compressed, protected)
-                ?: mDatabaseKDBX?.buildNewBinary(cacheDirectory, compressed, protected)
     }
 
     fun removeAttachmentIfNotUsed(attachment: Attachment) {
         // No need in KDB database because unique attachment by entry
         // Don't clear to fix upload multiple times
-        mDatabaseKDBX?.removeUnlinkedAttachment(attachment.binaryAttachment, false)
+        mDatabaseKDBX?.removeUnlinkedAttachment(attachment.binaryData, false)
     }
 
     fun removeUnlinkedAttachments() {
@@ -625,7 +659,9 @@ class Database {
     }
 
     fun clear(filesDirectory: File? = null) {
-        drawFactory.clearCache()
+        binaryCache.clear()
+        iconsManager.clearCache()
+        iconDrawableFactory.clearCache()
         // Delete the cache of the database if present
         mDatabaseKDB?.clearCache()
         mDatabaseKDBX?.clearCache()
@@ -791,7 +827,7 @@ class Database {
      * @param entryToCopy
      * @param newParent
      */
-    fun copyEntryTo(entryToCopy: Entry, newParent: Group): Entry? {
+    fun copyEntryTo(entryToCopy: Entry, newParent: Group): Entry {
         val entryCopied = Entry(entryToCopy, false)
         entryCopied.nodeId = mDatabaseKDB?.newEntryId() ?: mDatabaseKDBX?.newEntryId() ?: NodeIdUUID()
         entryCopied.parent = newParent
@@ -948,7 +984,7 @@ class Database {
         rootGroup?.doForEachChildAndForIt(
                 object : NodeHandler<Entry>() {
                     override fun operate(node: Entry): Boolean {
-                        removeOldestEntryHistory(node, binaryPool)
+                        removeOldestEntryHistory(node, attachmentPool)
                         return true
                     }
                 },
@@ -963,7 +999,7 @@ class Database {
     /**
      * Remove oldest history if more than max items or max memory
      */
-    fun removeOldestEntryHistory(entry: Entry, binaryPool: BinaryPool) {
+    fun removeOldestEntryHistory(entry: Entry, attachmentPool: AttachmentPool) {
         mDatabaseKDBX?.let {
             val maxItems = historyMaxItems
             if (maxItems >= 0) {
@@ -977,7 +1013,7 @@ class Database {
                 while (true) {
                     var historySize: Long = 0
                     for (entryHistory in entry.getHistory()) {
-                        historySize += entryHistory.getSize(binaryPool)
+                        historySize += entryHistory.getSize(attachmentPool)
                     }
                     if (historySize > maxSize) {
                         removeOldestEntryHistory(entry)
@@ -991,7 +1027,7 @@ class Database {
 
     private fun removeOldestEntryHistory(entry: Entry) {
         entry.removeOldestEntryFromHistory()?.let {
-            it.getAttachments(binaryPool, false).forEach { attachmentToRemove ->
+            it.getAttachments(attachmentPool, false).forEach { attachmentToRemove ->
                 removeAttachmentIfNotUsed(attachmentToRemove)
             }
         }
@@ -999,7 +1035,7 @@ class Database {
 
     fun removeEntryHistory(entry: Entry, entryHistoryPosition: Int) {
         entry.removeEntryFromHistory(entryHistoryPosition)?.let {
-            it.getAttachments(binaryPool, false).forEach { attachmentToRemove ->
+            it.getAttachments(attachmentPool, false).forEach { attachmentToRemove ->
                 removeAttachmentIfNotUsed(attachmentToRemove)
             }
         }

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

@@ -21,14 +21,12 @@ package com.kunzisoft.keepass.database.element
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.database.BinaryPool
+import com.kunzisoft.keepass.database.element.binary.AttachmentPool
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.entry.EntryVersionedInterface
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
@@ -109,7 +107,7 @@ class Entry : Node, EntryVersionedInterface<Group> {
 
     override var icon: IconImage
         get() {
-            return entryKDB?.icon ?: entryKDBX?.icon ?: IconImageStandard()
+            return entryKDB?.icon ?: entryKDBX?.icon ?: IconImage()
         }
         set(value) {
             entryKDB?.icon = value
@@ -257,31 +255,12 @@ class Entry : Node, EntryVersionedInterface<Group> {
         }
     }
 
-    /*
-      ------------
-      KDB Methods
-      ------------
-     */
-
-    /**
-     * If it's a node with only meta information like Meta-info SYSTEM Database Color
-     * @return false by default, true if it's a meta stream
-     */
-    val isMetaStream: Boolean
-        get() = entryKDB?.isMetaStream ?: false
-
     /*
       ------------
       KDBX Methods
       ------------
      */
 
-    var iconCustom: IconImageCustom
-        get() = entryKDBX?.iconCustom ?: IconImageCustom.UNKNOWN_ICON
-        set(value) {
-            entryKDBX?.iconCustom = value
-        }
-
     /**
      * Retrieve extra fields to show, key is the label, value is the value of field (protected or not)
      * @return Map of label/value
@@ -330,12 +309,12 @@ class Entry : Node, EntryVersionedInterface<Group> {
         entryKDBX?.stopToManageFieldReferences()
     }
 
-    fun getAttachments(binaryPool: BinaryPool, inHistory: Boolean = false): List<Attachment> {
+    fun getAttachments(attachmentPool: AttachmentPool, inHistory: Boolean = false): List<Attachment> {
         val attachments = ArrayList<Attachment>()
-        entryKDB?.getAttachment()?.let {
+        entryKDB?.getAttachment(attachmentPool)?.let {
             attachments.add(it)
         }
-        entryKDBX?.getAttachments(binaryPool, inHistory)?.let {
+        entryKDBX?.getAttachments(attachmentPool, inHistory)?.let {
             attachments.addAll(it)
         }
         return attachments
@@ -356,9 +335,9 @@ class Entry : Node, EntryVersionedInterface<Group> {
         entryKDBX?.removeAttachments()
     }
 
-    private fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
+    private fun putAttachment(attachment: Attachment, attachmentPool: AttachmentPool) {
-        entryKDB?.putAttachment(attachment)
+        entryKDB?.putAttachment(attachment, attachmentPool)
-        entryKDBX?.putAttachment(attachment, binaryPool)
+        entryKDBX?.putAttachment(attachment, attachmentPool)
     }
 
     fun getHistory(): ArrayList<Entry> {
@@ -390,8 +369,8 @@ class Entry : Node, EntryVersionedInterface<Group> {
         return null
     }
 
-    fun getSize(binaryPool: BinaryPool): Long {
+    fun getSize(attachmentPool: AttachmentPool): Long {
-        return entryKDBX?.getSize(binaryPool) ?: 0L
+        return entryKDBX?.getSize(attachmentPool) ?: 0L
     }
 
     fun containsCustomData(): Boolean {
@@ -433,7 +412,7 @@ class Entry : Node, EntryVersionedInterface<Group> {
             // Replace parameter fields by generated OTP fields
             entryInfo.customFields = OtpEntryFields.generateAutoFields(entryInfo.customFields)
         }
-        database?.binaryPool?.let { binaryPool ->
+        database?.attachmentPool?.let { binaryPool ->
             entryInfo.attachments = getAttachments(binaryPool)
         }
 
@@ -460,7 +439,7 @@ class Entry : Node, EntryVersionedInterface<Group> {
         url = newEntryInfo.url
         notes = newEntryInfo.notes
         addExtraFields(newEntryInfo.customFields)
-        database?.binaryPool?.let { binaryPool ->
+        database?.attachmentPool?.let { binaryPool ->
             newEntryInfo.attachments.forEach { attachment ->
                 putAttachment(attachment, binaryPool)
             }

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

@@ -26,7 +26,6 @@ import com.kunzisoft.keepass.database.element.group.GroupKDB
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.group.GroupVersionedInterface
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.*
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.GroupInfo
@@ -41,6 +40,9 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
     var groupKDBX: GroupKDBX? = null
         private set
 
+    // Virtual group is used to defined a detached database group
+    var isVirtual = false
+
     fun updateWith(group: Group) {
         group.groupKDB?.let {
             this.groupKDB?.updateWith(it)
@@ -78,6 +80,7 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
     constructor(parcel: Parcel) {
         groupKDB = parcel.readParcelable(GroupKDB::class.java.classLoader)
         groupKDBX = parcel.readParcelable(GroupKDBX::class.java.classLoader)
+        isVirtual = parcel.readByte().toInt() != 0
     }
 
     enum class ChildFilter {
@@ -111,6 +114,7 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
     override fun writeToParcel(dest: Parcel, flags: Int) {
         dest.writeParcelable(groupKDB, flags)
         dest.writeParcelable(groupKDBX, flags)
+        dest.writeByte((if (isVirtual) 1 else 0).toByte())
     }
 
     override val nodeId: NodeId<*>?
@@ -124,7 +128,7 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
         }
 
     override var icon: IconImage
-        get() = groupKDB?.icon ?: groupKDBX?.icon ?: IconImageStandard()
+        get() = groupKDB?.icon ?: groupKDBX?.icon ?: IconImage()
         set(value) {
             groupKDB?.icon = value
             groupKDBX?.icon = value
@@ -344,9 +348,11 @@ class Group : Node, GroupVersionedInterface<Group, Entry> {
         groupKDBX?.removeChildren()
     }
 
-    override fun allowAddEntryIfIsRoot(): Boolean {
+    val allowAddEntryIfIsRoot: Boolean
-        return groupKDB?.allowAddEntryIfIsRoot() ?: groupKDBX?.allowAddEntryIfIsRoot() ?: false
+        get() = groupKDBX != null
-    }
+
+    val allowAddNoteInGroup: Boolean
+        get() = groupKDBX != null
 
     /*
       ------------

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element.binary
+
+class AttachmentPool(binaryCache: BinaryCache) : BinaryPool<Int>(binaryCache) {
+
+    /**
+     * Utility method to find an unused key in the pool
+     */
+    override fun findUnusedKey(): Int {
+        var unusedKey = 0
+        while (pool[unusedKey] != null)
+            unusedKey++
+        return unusedKey
+    }
+
+    /**
+     * To register a binary with a ref corresponding to an ordered index
+     */
+    fun getBinaryIndexFromKey(key: Int): Int? {
+        val index = orderedBinariesWithoutDuplication().indexOfFirst { it.keys.contains(key) }
+        return if (index < 0)
+            null
+        else
+            index
+    }
+}

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

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element.binary
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.Base64
+import android.util.Base64InputStream
+import android.util.Base64OutputStream
+import com.kunzisoft.keepass.utils.readAllBytes
+import com.kunzisoft.keepass.database.element.binary.BinaryCache.Companion.UNKNOWN
+import java.io.*
+import java.util.zip.GZIPOutputStream
+
+class BinaryByte : BinaryData {
+
+    private var mDataByteId: String
+
+    private fun getByteArray(binaryCache: BinaryCache): ByteArray {
+        val keyData = binaryCache.getByteArray(mDataByteId)
+        mDataByteId = keyData.key
+        return keyData.data
+    }
+
+    constructor() : super() {
+        mDataByteId = UNKNOWN
+    }
+
+    constructor(id: String,
+                compressed: Boolean = false,
+                protected: Boolean = false) : super(compressed, protected) {
+        mDataByteId = id
+    }
+
+    constructor(parcel: Parcel) : super(parcel) {
+        mDataByteId = parcel.readString() ?: UNKNOWN
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        super.writeToParcel(dest, flags)
+        dest.writeString(mDataByteId)
+    }
+
+    @Throws(IOException::class)
+    override fun getInputDataStream(binaryCache: BinaryCache): InputStream {
+        return Base64InputStream(ByteArrayInputStream(getByteArray(binaryCache)), Base64.NO_WRAP)
+    }
+
+    @Throws(IOException::class)
+    override fun getOutputDataStream(binaryCache: BinaryCache): OutputStream {
+        return BinaryCountingOutputStream(Base64OutputStream(ByteOutputStream(binaryCache), Base64.NO_WRAP))
+    }
+
+    @Throws(IOException::class)
+    override fun compress(binaryCache: BinaryCache) {
+        if (!isCompressed) {
+            GZIPOutputStream(getOutputDataStream(binaryCache)).use { outputStream ->
+                getInputDataStream(binaryCache).use { inputStream ->
+                    inputStream.readAllBytes { buffer ->
+                        outputStream.write(buffer)
+                    }
+                }
+                isCompressed = true
+            }
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun decompress(binaryCache: BinaryCache) {
+        if (isCompressed) {
+            getUnGzipInputDataStream(binaryCache).use { inputStream ->
+                getOutputDataStream(binaryCache).use { outputStream ->
+                    inputStream.readAllBytes { buffer ->
+                        outputStream.write(buffer)
+                    }
+                }
+                isCompressed = false
+            }
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun clear(binaryCache: BinaryCache) {
+        binaryCache.removeByteArray(mDataByteId)
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is BinaryByte) return false
+        if (!super.equals(other)) return false
+
+        if (mDataByteId != other.mDataByteId) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + mDataByteId.hashCode()
+        return result
+    }
+
+    /**
+     * Custom OutputStream to calculate the size and hash of binary file
+     */
+    private inner class ByteOutputStream(private val binaryCache: BinaryCache) : ByteArrayOutputStream() {
+        override fun close() {
+            binaryCache.setByteArray(mDataByteId, this.toByteArray())
+            super.close()
+        }
+    }
+
+    companion object {
+        private val TAG = BinaryByte::class.java.name
+
+        @JvmField
+        val CREATOR: Parcelable.Creator<BinaryByte> = object : Parcelable.Creator<BinaryByte> {
+            override fun createFromParcel(parcel: Parcel): BinaryByte {
+                return BinaryByte(parcel)
+            }
+
+            override fun newArray(size: Int): Array<BinaryByte?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,81 @@
+package com.kunzisoft.keepass.database.element.binary
+
+import java.io.File
+import java.util.*
+
+class BinaryCache {
+
+    /**
+     * Cipher key generated when the database is loaded, and destroyed when the database is closed
+     * Can be used to temporarily store database elements
+     */
+    var loadedCipherKey: LoadedKey = LoadedKey.generateNewCipherKey()
+
+    lateinit var cacheDirectory: File
+
+    private val voidBinary = KeyByteArray(UNKNOWN, ByteArray(0))
+
+    fun getBinaryData(binaryId: String,
+                      smallSize: Boolean = false,
+                      compression: Boolean = false,
+                      protection: Boolean = false): BinaryData {
+        return if (smallSize) {
+            BinaryByte(binaryId, compression, protection)
+        } else {
+            val fileInCache = File(cacheDirectory, binaryId)
+            return BinaryFile(fileInCache, compression, protection)
+        }
+    }
+
+    // Similar to file storage but much faster TODO SparseArray
+    private val byteArrayList = HashMap<String, ByteArray>()
+
+    fun getByteArray(key: String): KeyByteArray {
+        if (key == UNKNOWN) {
+            return voidBinary
+        }
+        if (!byteArrayList.containsKey(key)) {
+            val newItem = KeyByteArray(key, ByteArray(0))
+            byteArrayList[newItem.key] = newItem.data
+            return newItem
+        }
+        return KeyByteArray(key, byteArrayList[key]!!)
+    }
+
+    fun setByteArray(key: String, data: ByteArray): KeyByteArray {
+        if (key == UNKNOWN) {
+            return voidBinary
+        }
+        byteArrayList[key] = data
+        return KeyByteArray(key, data)
+    }
+
+    fun removeByteArray(key: String?) {
+        key?.let {
+            byteArrayList.remove(it)
+        }
+    }
+
+    fun clear() {
+        byteArrayList.clear()
+    }
+
+    companion object {
+        const val UNKNOWN = "UNKNOWN"
+    }
+
+    data class KeyByteArray(val key: String, val data: ByteArray) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is KeyByteArray) return false
+
+            if (key != other.key) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return key.hashCode()
+        }
+    }
+}

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

@@ -0,0 +1,192 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element.binary
+
+import android.app.ActivityManager
+import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
+import org.apache.commons.io.output.CountingOutputStream
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.ByteBuffer
+import java.security.MessageDigest
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
+
+abstract class BinaryData : Parcelable {
+
+    var isCompressed: Boolean = false
+        protected set
+    var isProtected: Boolean = false
+        protected set
+    var isCorrupted: Boolean = false
+    private var mLength: Long = 0
+    private var mBinaryHash = 0
+
+    protected constructor(compressed: Boolean = false, protected: Boolean = false) {
+        this.isCompressed = compressed
+        this.isProtected = protected
+        this.mLength = 0
+        this.mBinaryHash = 0
+    }
+
+    protected constructor(parcel: Parcel) {
+        isCompressed = parcel.readByte().toInt() != 0
+        isProtected = parcel.readByte().toInt() != 0
+        isCorrupted = parcel.readByte().toInt() != 0
+        mLength = parcel.readLong()
+        mBinaryHash = parcel.readInt()
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeByte((if (isCompressed) 1 else 0).toByte())
+        dest.writeByte((if (isProtected) 1 else 0).toByte())
+        dest.writeByte((if (isCorrupted) 1 else 0).toByte())
+        dest.writeLong(mLength)
+        dest.writeInt(mBinaryHash)
+    }
+
+    @Throws(IOException::class)
+    abstract fun getInputDataStream(binaryCache: BinaryCache): InputStream
+
+    @Throws(IOException::class)
+    abstract fun getOutputDataStream(binaryCache: BinaryCache): OutputStream
+
+    @Throws(IOException::class)
+    fun getUnGzipInputDataStream(binaryCache: BinaryCache): InputStream {
+        return if (isCompressed) {
+            GZIPInputStream(getInputDataStream(binaryCache))
+        } else {
+            getInputDataStream(binaryCache)
+        }
+    }
+
+    @Throws(IOException::class)
+    fun getGzipOutputDataStream(binaryCache: BinaryCache): OutputStream {
+        return if (isCompressed) {
+            GZIPOutputStream(getOutputDataStream(binaryCache))
+        } else {
+            getOutputDataStream(binaryCache)
+        }
+    }
+
+    @Throws(IOException::class)
+    abstract fun compress(binaryCache: BinaryCache)
+
+    @Throws(IOException::class)
+    abstract fun decompress(binaryCache: BinaryCache)
+
+    @Throws(IOException::class)
+    fun dataExists(): Boolean {
+        return mLength > 0
+    }
+
+    @Throws(IOException::class)
+    fun getSize(): Long {
+        return mLength
+    }
+
+    @Throws(IOException::class)
+    fun binaryHash(): Int {
+        return mBinaryHash
+    }
+
+    @Throws(IOException::class)
+    abstract fun clear(binaryCache: BinaryCache)
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is BinaryData) return false
+
+        if (isCompressed != other.isCompressed) return false
+        if (isProtected != other.isProtected) return false
+        if (isCorrupted != other.isCorrupted) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = isCompressed.hashCode()
+        result = 31 * result + isProtected.hashCode()
+        result = 31 * result + isCorrupted.hashCode()
+        result = 31 * result + mLength.hashCode()
+        result = 31 * result + mBinaryHash
+        return result
+    }
+
+
+    /**
+     * Custom OutputStream to calculate the size and hash of binary file
+     */
+    protected inner class BinaryCountingOutputStream(out: OutputStream): CountingOutputStream(out) {
+
+        private val mMessageDigest: MessageDigest
+        init {
+            mLength = 0
+            mMessageDigest = MessageDigest.getInstance("MD5")
+            mBinaryHash = 0
+        }
+
+        override fun beforeWrite(n: Int) {
+            super.beforeWrite(n)
+            mLength = byteCount
+        }
+
+        override fun write(idx: Int) {
+            super.write(idx)
+            mMessageDigest.update(idx.toByte())
+        }
+
+        override fun write(bts: ByteArray) {
+            super.write(bts)
+            mMessageDigest.update(bts)
+        }
+
+        override fun write(bts: ByteArray, st: Int, end: Int) {
+            super.write(bts, st, end)
+            mMessageDigest.update(bts, st, end)
+        }
+
+        override fun close() {
+            super.close()
+            mLength = byteCount
+            val bytes = mMessageDigest.digest()
+            mBinaryHash = ByteBuffer.wrap(bytes).int
+        }
+    }
+
+    companion object {
+        private val TAG = BinaryData::class.java.name
+
+        fun canMemoryBeAllocatedInRAM(context: Context, memoryWanted: Long): Boolean {
+            val memoryInfo = ActivityManager.MemoryInfo()
+            (context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).getMemoryInfo(memoryInfo)
+            val availableMemory = memoryInfo.availMem
+            return availableMemory > memoryWanted * 3
+        }
+    }
+
+}

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

@@ -0,0 +1,183 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element.binary
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.Base64
+import android.util.Base64InputStream
+import android.util.Base64OutputStream
+import com.kunzisoft.keepass.utils.readAllBytes
+import java.io.*
+import java.util.zip.GZIPOutputStream
+import javax.crypto.Cipher
+import javax.crypto.CipherInputStream
+import javax.crypto.CipherOutputStream
+import javax.crypto.spec.IvParameterSpec
+
+class BinaryFile : BinaryData {
+
+    private var mDataFile: File? = null
+
+    // Cipher to encrypt temp file
+    @Transient
+    private var cipherEncryption: Cipher = Cipher.getInstance(LoadedKey.BINARY_CIPHER)
+    @Transient
+    private var cipherDecryption: Cipher = Cipher.getInstance(LoadedKey.BINARY_CIPHER)
+
+    constructor(dataFile: File,
+                compressed: Boolean = false,
+                protected: Boolean = false) : super(compressed, protected) {
+        this.mDataFile = dataFile
+    }
+
+    constructor(parcel: Parcel) : super(parcel) {
+        parcel.readString()?.let {
+            mDataFile = File(it)
+        }
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        super.writeToParcel(dest, flags)
+        dest.writeString(mDataFile?.absolutePath)
+    }
+
+    @Throws(IOException::class)
+    override fun getInputDataStream(binaryCache: BinaryCache): InputStream {
+        return buildInputStream(mDataFile, binaryCache)
+    }
+
+    @Throws(IOException::class)
+    override fun getOutputDataStream(binaryCache: BinaryCache): OutputStream {
+        return buildOutputStream(mDataFile, binaryCache)
+    }
+
+    @Throws(IOException::class)
+    private fun buildInputStream(file: File?, binaryCache: BinaryCache): InputStream {
+        val cipherKey = binaryCache.loadedCipherKey
+        return when {
+            file != null && file.length() > 0 -> {
+                cipherDecryption.init(Cipher.DECRYPT_MODE, cipherKey.key, IvParameterSpec(cipherKey.iv))
+                Base64InputStream(CipherInputStream(FileInputStream(file), cipherDecryption), Base64.NO_WRAP)
+            }
+            else -> ByteArrayInputStream(ByteArray(0))
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun buildOutputStream(file: File?, binaryCache: BinaryCache): OutputStream {
+        val cipherKey = binaryCache.loadedCipherKey
+        return when {
+            file != null -> {
+                cipherEncryption.init(Cipher.ENCRYPT_MODE, cipherKey.key, IvParameterSpec(cipherKey.iv))
+                BinaryCountingOutputStream(Base64OutputStream(CipherOutputStream(FileOutputStream(file), cipherEncryption), Base64.NO_WRAP))
+            }
+            else -> throw IOException("Unable to write in an unknown file")
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun compress(binaryCache: BinaryCache) {
+        mDataFile?.let { concreteDataFile ->
+            // To compress, create a new binary with file
+            if (!isCompressed) {
+                // Encrypt the new gzipped temp file
+                val fileBinaryCompress = File(concreteDataFile.parent, concreteDataFile.name + "_temp")
+                getInputDataStream(binaryCache).use { inputStream ->
+                    GZIPOutputStream(buildOutputStream(fileBinaryCompress, binaryCache)).use { outputStream ->
+                        inputStream.readAllBytes { buffer ->
+                            outputStream.write(buffer)
+                        }
+                    }
+                }
+                // Remove ungzip file
+                if (concreteDataFile.delete()) {
+                    if (fileBinaryCompress.renameTo(concreteDataFile)) {
+                        // Harmonize with database compression
+                        isCompressed = true
+                    }
+                }
+            }
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun decompress(binaryCache: BinaryCache) {
+        mDataFile?.let { concreteDataFile ->
+            if (isCompressed) {
+                // Encrypt the new ungzipped temp file
+                val fileBinaryDecompress = File(concreteDataFile.parent, concreteDataFile.name + "_temp")
+                getUnGzipInputDataStream(binaryCache).use { inputStream ->
+                    buildOutputStream(fileBinaryDecompress, binaryCache).use { outputStream ->
+                        inputStream.readAllBytes { buffer ->
+                            outputStream.write(buffer)
+                        }
+                    }
+                }
+                // Remove gzip file
+                if (concreteDataFile.delete()) {
+                    if (fileBinaryDecompress.renameTo(concreteDataFile)) {
+                        // Harmonize with database compression
+                        isCompressed = false
+                    }
+                }
+            }
+        }
+    }
+
+    override fun clear(binaryCache: BinaryCache) {
+        if (mDataFile != null && !mDataFile!!.delete())
+            throw IOException("Unable to delete temp file " + mDataFile!!.absolutePath)
+    }
+
+    override fun toString(): String {
+        return mDataFile.toString()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is BinaryFile) return false
+        if (!super.equals(other)) return false
+
+        return mDataFile != null && mDataFile == other.mDataFile
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + (mDataFile?.hashCode() ?: 0)
+        return result
+    }
+
+    companion object {
+        private val TAG = BinaryFile::class.java.name
+
+        @JvmField
+        val CREATOR: Parcelable.Creator<BinaryFile> = object : Parcelable.Creator<BinaryFile> {
+            override fun createFromParcel(parcel: Parcel): BinaryFile {
+                return BinaryFile(parcel)
+            }
+
+            override fun newArray(size: Int): Array<BinaryFile?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,262 @@
+/*
+ * 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.element.binary
+
+import android.util.Log
+import java.io.IOException
+import kotlin.math.abs
+
+abstract class BinaryPool<T>(private val mBinaryCache: BinaryCache) {
+
+    protected val pool = LinkedHashMap<T, BinaryData>()
+
+    // To build unique file id
+    private var creationId: Long = System.currentTimeMillis()
+    private var poolId: Int = abs(javaClass.simpleName.hashCode())
+    private var binaryFileIncrement = 0L
+
+    /**
+     * To get a binary by the pool key (ref attribute in entry)
+     */
+    operator fun get(key: T): BinaryData? {
+        return pool[key]
+    }
+
+    /**
+     * Create and return a new binary file not yet linked to a binary
+     */
+    fun put(key: T? = null,
+            builder: (uniqueBinaryId: String) -> BinaryData): KeyBinary<T> {
+        binaryFileIncrement++
+        val newBinaryFile: BinaryData = builder("$poolId$creationId$binaryFileIncrement")
+        val newKey = put(key, newBinaryFile)
+        return KeyBinary(newBinaryFile, newKey)
+    }
+
+    /**
+     * To linked a binary with a pool key, if the pool key doesn't exists, create an unused one
+     */
+    fun put(key: T?, value: BinaryData): T {
+        if (key == null)
+            return put(value)
+        else
+            pool[key] = value
+        return key
+    }
+
+    /**
+     * To put a [binaryData] in the pool,
+     * if already exists, replace the current one,
+     * else add it with a new key
+     */
+    fun put(binaryData: BinaryData): T {
+        var key: T? = findKey(binaryData)
+        if (key == null) {
+            key = findUnusedKey()
+        }
+        pool[key!!] = binaryData
+        return key
+    }
+
+    /**
+     * Remove a binary from the pool with its [key], the file is not deleted
+     */
+    @Throws(IOException::class)
+    fun remove(key: T) {
+        pool.remove(key)
+        // Don't clear attachment here because a file can be used in many BinaryAttachment
+    }
+
+    /**
+     * Remove a binary from the pool, the file is not deleted
+     */
+    @Throws(IOException::class)
+    fun remove(binaryData: BinaryData) {
+        findKey(binaryData)?.let {
+            pool.remove(it)
+        }
+        // Don't clear attachment here because a file can be used in many BinaryAttachment
+    }
+
+    /**
+     * Utility method to find an unused key in the pool
+     */
+    abstract fun findUnusedKey(): T
+
+    /**
+     * Return key of [binaryDataToRetrieve] or null if not found
+     */
+    private fun findKey(binaryDataToRetrieve: BinaryData): T? {
+        val contains = pool.containsValue(binaryDataToRetrieve)
+        return if (!contains)
+            null
+        else {
+            for ((key, binary) in pool) {
+                if (binary == binaryDataToRetrieve) {
+                    return key
+                }
+            }
+            return null
+        }
+    }
+
+    fun isBinaryDuplicate(binaryData: BinaryData?): Boolean {
+        try {
+            binaryData?.let {
+                if (it.getSize() > 0) {
+                    val searchBinaryMD5 = it.binaryHash()
+                    var i = 0
+                    for ((_, binary) in pool) {
+                        if (binary.binaryHash() == searchBinaryMD5) {
+                            i++
+                            if (i > 1)
+                                return true
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to check binary duplication", e)
+        }
+        return false
+    }
+
+    /**
+     * To do an action on each binary in the pool (order is not important)
+     */
+    private fun doForEachBinary(action: (key: T, binary: BinaryData) -> Unit,
+                                condition: (key: T, binary: BinaryData) -> Boolean) {
+        for ((key, value) in pool) {
+            if (condition.invoke(key, value)) {
+                action.invoke(key, value)
+            }
+        }
+    }
+
+    fun doForEachBinary(action: (key: T, binary: BinaryData) -> Unit) {
+        doForEachBinary(action) { _, _ -> true }
+    }
+
+    /**
+     * Utility method to order binaries and solve index problem in database v4
+     */
+    protected fun orderedBinariesWithoutDuplication(condition: ((binary: BinaryData) -> Boolean) = { true })
+    : List<KeyBinary<T>> {
+        val keyBinaryList = ArrayList<KeyBinary<T>>()
+        for ((key, binary) in pool) {
+            // Don't deduplicate
+            val existentBinary =
+            try {
+                if (binary.getSize() > 0) {
+                    keyBinaryList.find {
+                        val hash0 = it.binary.binaryHash()
+                        val hash1 = binary.binaryHash()
+                        hash0 != 0 && hash1 != 0 && hash0 == hash1
+                    }
+                } else {
+                    null
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Unable to check binary hash", e)
+                null
+            }
+            if (existentBinary == null) {
+                val newKeyBinary = KeyBinary(binary, key)
+                if (condition.invoke(newKeyBinary.binary)) {
+                    keyBinaryList.add(newKeyBinary)
+                }
+            } else {
+                if (condition.invoke(existentBinary.binary)) {
+                    existentBinary.addKey(key)
+                }
+            }
+        }
+        return keyBinaryList
+    }
+
+    /**
+     * Different from doForEach, provide an ordered index to each binary
+     */
+    private fun doForEachBinaryWithoutDuplication(action: (keyBinary: KeyBinary<T>) -> Unit,
+                                                  conditionToAdd: (binary: BinaryData) -> Boolean) {
+        orderedBinariesWithoutDuplication(conditionToAdd).forEach { keyBinary ->
+            action.invoke(keyBinary)
+        }
+    }
+
+    fun doForEachBinaryWithoutDuplication(action: (keyBinary: KeyBinary<T>) -> Unit) {
+        doForEachBinaryWithoutDuplication(action, { true })
+    }
+
+    /**
+     * Different from doForEach, provide an ordered index to each binary
+     */
+    private fun doForEachOrderedBinaryWithoutDuplication(action: (index: Int, binary: BinaryData) -> Unit,
+                                                         conditionToAdd: (binary: BinaryData) -> Boolean) {
+        orderedBinariesWithoutDuplication(conditionToAdd).forEachIndexed { index, keyBinary ->
+            action.invoke(index, keyBinary.binary)
+        }
+    }
+
+    fun doForEachOrderedBinaryWithoutDuplication(action: (index: Int, binary: BinaryData) -> Unit) {
+        doForEachOrderedBinaryWithoutDuplication(action, { true })
+    }
+
+    fun isEmpty(): Boolean {
+        return pool.isEmpty()
+    }
+
+    @Throws(IOException::class)
+    fun clear() {
+        doForEachBinary { _, binary ->
+            binary.clear(mBinaryCache)
+        }
+        pool.clear()
+    }
+
+    override fun toString(): String {
+        val stringBuffer = StringBuffer()
+        for ((key, value) in pool) {
+            if (stringBuffer.isNotEmpty())
+                stringBuffer.append(", {$key:$value}")
+            else
+                stringBuffer.append("{$key:$value}")
+        }
+        return stringBuffer.toString()
+    }
+
+    /**
+     * Utility class to order binaries
+     */
+    class KeyBinary<T>(val binary: BinaryData, key: T) {
+        val keys = HashSet<T>()
+        init {
+            addKey(key)
+        }
+
+        fun addKey(key: T) {
+            keys.add(key)
+        }
+    }
+
+    companion object {
+        private val TAG = BinaryPool::class.java.name
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.kunzisoft.keepass.database.element.binary
+
+import java.util.*
+
+class CustomIconPool(binaryCache: BinaryCache) : BinaryPool<UUID>(binaryCache) {
+
+    override fun findUnusedKey(): UUID {
+        var newUUID = UUID.randomUUID()
+        while (pool.containsKey(newUUID)) {
+            newUUID = UUID.randomUUID()
+        }
+        return newUUID
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.kunzisoft.keepass.database.element.binary
+
+import java.io.Serializable
+import java.security.Key
+import java.security.SecureRandom
+import javax.crypto.KeyGenerator
+
+class LoadedKey(val key: Key, val iv: ByteArray): Serializable {
+    companion object {
+        const val BINARY_CIPHER = "Blowfish/CBC/PKCS5Padding"
+
+        fun generateNewCipherKey(): LoadedKey {
+            val iv = ByteArray(8)
+            SecureRandom().nextBytes(iv)
+            return LoadedKey(KeyGenerator.getInstance("Blowfish").generateKey(), iv)
+        }
+    }
+}

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

@@ -1,259 +0,0 @@
-/*
- * Copyright 2018 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.element.database
-
-import android.os.Parcel
-import android.os.Parcelable
-import android.util.Base64
-import android.util.Base64InputStream
-import android.util.Base64OutputStream
-import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.stream.readAllBytes
-import org.apache.commons.io.output.CountingOutputStream
-import java.io.*
-import java.util.zip.GZIPInputStream
-import java.util.zip.GZIPOutputStream
-import javax.crypto.Cipher
-import javax.crypto.CipherInputStream
-import javax.crypto.CipherOutputStream
-import javax.crypto.spec.IvParameterSpec
-
-class BinaryAttachment : Parcelable {
-
-    private var dataFile: File? = null
-    var length: Long = 0
-        private set
-    var isCompressed: Boolean = false
-        private set
-    var isProtected: Boolean = false
-        private set
-    var isCorrupted: Boolean = false
-    // Cipher to encrypt temp file
-    private var cipherEncryption: Cipher = Cipher.getInstance(Database.LoadedKey.BINARY_CIPHER)
-    private var cipherDecryption: Cipher = Cipher.getInstance(Database.LoadedKey.BINARY_CIPHER)
-
-    /**
-     * Empty protected binary
-     */
-    constructor()
-
-    constructor(dataFile: File, compressed: Boolean = false, protected: Boolean = false) {
-        this.dataFile = dataFile
-        this.length = 0
-        this.isCompressed = compressed
-        this.isProtected = protected
-    }
-
-    private constructor(parcel: Parcel) {
-        parcel.readString()?.let {
-            dataFile = File(it)
-        }
-        length = parcel.readLong()
-        isCompressed = parcel.readByte().toInt() != 0
-        isProtected = parcel.readByte().toInt() != 0
-        isCorrupted = parcel.readByte().toInt() != 0
-    }
-
-    @Throws(IOException::class)
-    fun getInputDataStream(cipherKey: Database.LoadedKey): InputStream {
-        return buildInputStream(dataFile!!, cipherKey)
-    }
-
-    @Throws(IOException::class)
-    fun getOutputDataStream(cipherKey: Database.LoadedKey): OutputStream {
-        return buildOutputStream(dataFile!!, cipherKey)
-    }
-
-    @Throws(IOException::class)
-    fun getUnGzipInputDataStream(cipherKey: Database.LoadedKey): InputStream {
-        return if (isCompressed) {
-            GZIPInputStream(getInputDataStream(cipherKey))
-        } else {
-            getInputDataStream(cipherKey)
-        }
-    }
-
-    @Throws(IOException::class)
-    fun getGzipOutputDataStream(cipherKey: Database.LoadedKey): OutputStream {
-        return if (isCompressed) {
-            GZIPOutputStream(getOutputDataStream(cipherKey))
-        } else {
-            getOutputDataStream(cipherKey)
-        }
-    }
-
-    @Throws(IOException::class)
-    private fun buildInputStream(file: File?, cipherKey: Database.LoadedKey): InputStream {
-        return when {
-            file != null && file.length() > 0 -> {
-                cipherDecryption.init(Cipher.DECRYPT_MODE, cipherKey.key, IvParameterSpec(cipherKey.iv))
-                Base64InputStream(CipherInputStream(FileInputStream(file), cipherDecryption), Base64.NO_WRAP)
-            }
-            else -> ByteArrayInputStream(ByteArray(0))
-        }
-    }
-
-    @Throws(IOException::class)
-    private fun buildOutputStream(file: File?, cipherKey: Database.LoadedKey): OutputStream {
-        return when {
-            file != null -> {
-                cipherEncryption.init(Cipher.ENCRYPT_MODE, cipherKey.key, IvParameterSpec(cipherKey.iv))
-                BinaryCountingOutputStream(Base64OutputStream(CipherOutputStream(FileOutputStream(file), cipherEncryption), Base64.NO_WRAP))
-            }
-            else -> throw IOException("Unable to write in an unknown file")
-        }
-    }
-
-    @Throws(IOException::class)
-    fun compress(cipherKey: Database.LoadedKey) {
-        dataFile?.let { concreteDataFile ->
-            // To compress, create a new binary with file
-            if (!isCompressed) {
-                // Encrypt the new gzipped temp file
-                val fileBinaryCompress = File(concreteDataFile.parent, concreteDataFile.name + "_temp")
-                getInputDataStream(cipherKey).use { inputStream ->
-                    GZIPOutputStream(buildOutputStream(fileBinaryCompress, cipherKey)).use { outputStream ->
-                        inputStream.readAllBytes { buffer ->
-                            outputStream.write(buffer)
-                        }
-                    }
-                }
-                // Remove ungzip file
-                if (concreteDataFile.delete()) {
-                    if (fileBinaryCompress.renameTo(concreteDataFile)) {
-                        // Harmonize with database compression
-                        isCompressed = true
-                    }
-                }
-            }
-        }
-    }
-
-    @Throws(IOException::class)
-    fun decompress(cipherKey: Database.LoadedKey) {
-        dataFile?.let { concreteDataFile ->
-            if (isCompressed) {
-                // Encrypt the new ungzipped temp file
-                val fileBinaryDecompress = File(concreteDataFile.parent, concreteDataFile.name + "_temp")
-                getUnGzipInputDataStream(cipherKey).use { inputStream ->
-                    buildOutputStream(fileBinaryDecompress, cipherKey).use { outputStream ->
-                        inputStream.readAllBytes { buffer ->
-                            outputStream.write(buffer)
-                        }
-                    }
-                }
-                // Remove gzip file
-                if (concreteDataFile.delete()) {
-                    if (fileBinaryDecompress.renameTo(concreteDataFile)) {
-                        // Harmonize with database compression
-                        isCompressed = false
-                    }
-                }
-            }
-        }
-    }
-
-    @Throws(IOException::class)
-    fun clear() {
-        if (dataFile != null && !dataFile!!.delete())
-            throw IOException("Unable to delete temp file " + dataFile!!.absolutePath)
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other)
-            return true
-        if (other == null || javaClass != other.javaClass)
-            return false
-        if (other !is BinaryAttachment)
-            return false
-
-        var sameData = false
-        if (dataFile != null && dataFile == other.dataFile)
-            sameData = true
-
-        return isCompressed == other.isCompressed
-                && isProtected == other.isProtected
-                && isCorrupted == other.isCorrupted
-                && sameData
-    }
-
-    override fun hashCode(): Int {
-
-        var result = 0
-        result = 31 * result + if (isCompressed) 1 else 0
-        result = 31 * result + if (isProtected) 1 else 0
-        result = 31 * result + if (isCorrupted) 1 else 0
-        result = 31 * result + dataFile!!.hashCode()
-        result = 31 * result + length.hashCode()
-        return result
-    }
-
-    override fun toString(): String {
-        return dataFile.toString()
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(dataFile?.absolutePath)
-        dest.writeLong(length)
-        dest.writeByte((if (isCompressed) 1 else 0).toByte())
-        dest.writeByte((if (isProtected) 1 else 0).toByte())
-        dest.writeByte((if (isCorrupted) 1 else 0).toByte())
-    }
-
-    /**
-     * Custom OutputStream to calculate the size of binary file
-     */
-    private inner class BinaryCountingOutputStream(out: OutputStream): CountingOutputStream(out) {
-        init {
-            length = 0
-        }
-
-        override fun beforeWrite(n: Int) {
-            super.beforeWrite(n)
-            length = byteCount
-        }
-
-        override fun close() {
-            super.close()
-            length = byteCount
-        }
-    }
-
-    companion object {
-
-        private val TAG = BinaryAttachment::class.java.name
-
-        @JvmField
-        val CREATOR: Parcelable.Creator<BinaryAttachment> = object : Parcelable.Creator<BinaryAttachment> {
-            override fun createFromParcel(parcel: Parcel): BinaryAttachment {
-                return BinaryAttachment(parcel)
-            }
-
-            override fun newArray(size: Int): Array<BinaryAttachment?> {
-                return arrayOfNulls(size)
-            }
-        }
-    }
-
-}

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

@@ -1,155 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.element.database
-
-import java.io.IOException
-
-class BinaryPool {
-    private val pool = LinkedHashMap<Int, BinaryAttachment>()
-
-    /**
-     * To get a binary by the pool key (ref attribute in entry)
-     */
-    operator fun get(key: Int): BinaryAttachment? {
-        return pool[key]
-    }
-
-    /**
-     * To linked a binary with a pool key, if the pool key doesn't exists, create an unused one
-     */
-    fun put(key: Int?, value: BinaryAttachment) {
-        if (key == null)
-            put(value)
-        else
-            pool[key] = value
-    }
-
-    /**
-     * To put a [binaryAttachment] in the pool,
-     * if already exists, replace the current one,
-     * else add it with a new key
-     */
-    fun put(binaryAttachment: BinaryAttachment): Int {
-        var key = findKey(binaryAttachment)
-        if (key == null) {
-            key = findUnusedKey()
-        }
-        pool[key] = binaryAttachment
-        return key
-    }
-
-    /**
-     * Remove a binary from the pool, the file is not deleted
-     */
-    @Throws(IOException::class)
-    fun remove(binaryAttachment: BinaryAttachment) {
-        findKey(binaryAttachment)?.let {
-            pool.remove(it)
-        }
-        // Don't clear attachment here because a file can be used in many BinaryAttachment
-    }
-
-    /**
-     * Utility method to find an unused key in the pool
-     */
-    private fun findUnusedKey(): Int {
-        var unusedKey = 0
-        while (pool[unusedKey] != null)
-            unusedKey++
-        return unusedKey
-    }
-
-    /**
-     * Return key of [binaryAttachmentToRetrieve] or null if not found
-     */
-    private fun findKey(binaryAttachmentToRetrieve: BinaryAttachment): Int? {
-        val contains = pool.containsValue(binaryAttachmentToRetrieve)
-        return if (!contains)
-            null
-        else {
-            for ((key, binary) in pool) {
-                if (binary == binaryAttachmentToRetrieve) {
-                    return key
-                }
-            }
-            return null
-        }
-    }
-
-    /**
-     * Utility method to order binaries and solve index problem in database v4
-     */
-    private fun orderedBinaries(): List<KeyBinary> {
-        val keyBinaryList = ArrayList<KeyBinary>()
-        for ((key, binary) in pool) {
-            keyBinaryList.add(KeyBinary(key, binary))
-        }
-        return keyBinaryList
-    }
-
-    /**
-     * To register a binary with a ref corresponding to an ordered index
-     */
-    fun getBinaryIndexFromKey(key: Int): Int? {
-        val index = orderedBinaries().indexOfFirst { it.key == key }
-        return if (index < 0)
-            null
-        else
-            index
-    }
-
-    /**
-     * Different from doForEach, provide an ordered index to each binary
-     */
-    fun doForEachOrderedBinary(action: (index: Int, keyBinary: KeyBinary) -> Unit) {
-        orderedBinaries().forEachIndexed(action)
-    }
-
-    /**
-     * To do an action on each binary in the pool
-     */
-    fun doForEachBinary(action: (binary: BinaryAttachment) -> Unit) {
-        pool.values.forEach { action.invoke(it) }
-    }
-
-    @Throws(IOException::class)
-    fun clear() {
-        doForEachBinary {
-            it.clear()
-        }
-        pool.clear()
-    }
-
-    override fun toString(): String {
-        val stringBuffer = StringBuffer()
-        for ((key, value) in pool) {
-            if (stringBuffer.isNotEmpty())
-                stringBuffer.append(", {$key:$value}")
-            else
-                stringBuffer.append("{$key:$value}")
-        }
-        return stringBuffer.toString()
-    }
-
-    /**
-     * Utility data class to order binaries
-     */
-    data class KeyBinary(val key: Int, val binary: BinaryAttachment)
-}

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

@@ -19,22 +19,20 @@
 
 package com.kunzisoft.keepass.database.element.database
 
-import com.kunzisoft.keepass.crypto.finalkey.AESKeyTransformerFactory
+import com.kunzisoft.encrypt.HashManager
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
+import com.kunzisoft.encrypt.aes.AESTransformer
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
+import com.kunzisoft.keepass.database.crypto.kdf.KdfFactory
+import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.element.group.GroupKDB
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeIdInt
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeVersioned
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
-import com.kunzisoft.keepass.stream.NullOutputStream
-import java.io.File
 import java.io.IOException
 import java.io.InputStream
-import java.security.DigestOutputStream
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -44,8 +42,6 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
 
     private var kdfListV3: MutableList<KdfEngine> = ArrayList()
 
-    private var binaryIncrement = 0
-
     override val version: String
         get() = "KeePass 1"
 
@@ -68,7 +64,7 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
                 getGroupById(backupGroupId)
         }
 
-    override val kdfEngine: KdfEngine?
+    override val kdfEngine: KdfEngine
         get() = kdfListV3[0]
 
     override val kdfAvailableList: List<KdfEngine>
@@ -78,6 +74,7 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         get() {
             val list = ArrayList<EncryptionAlgorithm>()
             list.add(EncryptionAlgorithm.AESRijndael)
+            list.add(EncryptionAlgorithm.Twofish)
             return list
         }
 
@@ -143,24 +140,11 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
     }
 
     @Throws(IOException::class)
-    fun makeFinalKey(masterSeed: ByteArray, masterSeed2: ByteArray, numRounds: Long) {
+    fun makeFinalKey(masterSeed: ByteArray, transformSeed: ByteArray, numRounds: Long) {
-
-        // Write checksum Checksum
-        val messageDigest: MessageDigest
-        try {
-            messageDigest = MessageDigest.getInstance("SHA-256")
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("SHA-256 not implemented here.")
-        }
-
-        val nos = NullOutputStream()
-        val dos = DigestOutputStream(nos, messageDigest)
-
         // Encrypt the master key a few times to make brute-force key-search harder
-        dos.write(masterSeed)
+        val transformedKey = AESTransformer.transformKey(transformSeed, masterKey, numRounds) ?: ByteArray(0)
-        dos.write(AESKeyTransformerFactory.transformMasterKey(masterSeed2, masterKey, numRounds) ?: ByteArray(0))
+        // Write checksum Checksum
-
+        finalKey = HashManager.hashSha256(masterSeed, transformedKey)
-        finalKey = messageDigest.digest()
     }
 
     override fun createGroup(): GroupKDB {
@@ -175,6 +159,10 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         return false
     }
 
+    override fun getStandardIcon(iconId: Int): IconImageStandard {
+        return this.iconsManager.getIcon(iconId)
+    }
+
     override fun containsCustomData(): Boolean {
         return false
     }
@@ -223,7 +211,7 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
             // Create recycle bin
             val recycleBinGroup = createGroup().apply {
                 title = BACKUP_FOLDER_TITLE
-                icon = iconFactory.trashIcon
+                icon.standard = getStandardIcon(IconImageStandard.TRASH_ID)
             }
             addGroupTo(recycleBinGroup, rootGroup)
             backupGroupId = recycleBinGroup.id
@@ -269,11 +257,11 @@ class DatabaseKDB : DatabaseVersioned<Int, UUID, GroupKDB, EntryKDB>() {
         addEntryTo(entry, origParent)
     }
 
-    fun buildNewBinary(cacheDirectory: File): BinaryAttachment {
+    fun buildNewAttachment(): BinaryData {
         // Generate an unique new file
-        val fileInCache = File(cacheDirectory, binaryIncrement.toString())
+        return attachmentPool.put { uniqueBinaryId ->
-        binaryIncrement++
+            binaryCache.getBinaryData(uniqueBinaryId, false)
-        return BinaryAttachment(fileInCache)
+        }.binary
     }
 
     companion object {

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

@@ -22,49 +22,53 @@ package com.kunzisoft.keepass.database.element.database
 import android.content.res.Resources
 import android.util.Base64
 import android.util.Log
+import com.kunzisoft.encrypt.HashManager
+import com.kunzisoft.keepass.utils.UnsignedInt
+import com.kunzisoft.keepass.utils.longTo8Bytes
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.crypto.CryptoUtil
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.crypto.engine.CipherEngine
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
 import com.kunzisoft.keepass.database.action.node.NodeHandler
+import com.kunzisoft.keepass.database.crypto.AesEngine
+import com.kunzisoft.keepass.database.crypto.CipherEngine
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.crypto.VariantDictionary
+import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
+import com.kunzisoft.keepass.database.crypto.kdf.KdfFactory
+import com.kunzisoft.keepass.database.crypto.kdf.KdfParameters
 import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.DeletedObject
+import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeVersioned
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.exception.UnknownKDF
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_3
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_4
 import com.kunzisoft.keepass.utils.StringUtil.removeSpaceChars
 import com.kunzisoft.keepass.utils.StringUtil.toHexString
-import com.kunzisoft.keepass.utils.UnsignedInt
-import com.kunzisoft.keepass.utils.VariantDictionary
 import org.apache.commons.codec.binary.Hex
 import org.w3c.dom.Node
-import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.util.*
+import javax.crypto.Mac
 import javax.xml.XMLConstants
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.parsers.ParserConfigurationException
+import kotlin.math.min
 
 
 class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
     var hmacKey: ByteArray? = null
         private set
-    var dataCipher = AesEngine.CIPHER_UUID
+    var cipherUuid = EncryptionAlgorithm.AESRijndael.uuid
     private var dataEngine: CipherEngine = AesEngine()
     var compressionAlgorithm = CompressionAlgorithm.GZip
     var kdfParameters: KdfParameters? = null
@@ -105,12 +109,8 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     var lastTopVisibleGroupUUID = UUID_ZERO
     var memoryProtection = MemoryProtectionConfig()
     val deletedObjects = ArrayList<DeletedObject>()
-    val customIcons = ArrayList<IconImageCustom>()
     val customData = HashMap<String, String>()
 
-    var binaryPool = BinaryPool()
-    private var binaryIncrement = 0 // Unique id (don't use current time because CPU too fast)
-
     var localizedAppName = "KeePassDX"
 
     init {
@@ -129,7 +129,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         kdbxVersion = FILE_VERSION_32_3
         val group = createGroup().apply {
             title = rootName
-            icon = iconFactory.folderIcon
+            icon.standard = getStandardIcon(IconImageStandard.FOLDER_ID)
         }
         rootGroup = group
         addGroupIndex(group)
@@ -187,7 +187,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
                     }
                     CompressionAlgorithm.GZip -> {
                         // Only in databaseV3.1, in databaseV4 the header is zipped during the save
-                        if (kdbxVersion.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong()) {
+                        if (kdbxVersion.isBefore(FILE_VERSION_32_4)) {
                             compressAllBinaries()
                         }
                     }
@@ -195,9 +195,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             }
             CompressionAlgorithm.GZip -> {
                 // In databaseV4 the header is zipped during the save, so not necessary here
-                if (kdbxVersion.toKotlinLong() >= FILE_VERSION_32_4.toKotlinLong()) {
+                if (kdbxVersion.isBefore(FILE_VERSION_32_4)) {
-                    decompressAllBinaries()
-                } else {
                     when (newCompression) {
                         CompressionAlgorithm.None -> {
                             decompressAllBinaries()
@@ -205,18 +203,18 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
                         CompressionAlgorithm.GZip -> {
                         }
                     }
+                } else {
+                    decompressAllBinaries()
                 }
             }
         }
     }
 
     private fun compressAllBinaries() {
-        binaryPool.doForEachBinary { binary ->
+        attachmentPool.doForEachBinary { _, binary ->
             try {
-                val cipherKey = loadedCipherKey
-                        ?: throw IOException("Unable to retrieve cipher key to compress binaries")
                 // To compress, create a new binary with file
-                binary.compress(cipherKey)
+                binary.compress(binaryCache)
             } catch (e: Exception) {
                 Log.e(TAG, "Unable to compress $binary", e)
             }
@@ -224,11 +222,9 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     }
 
     private fun decompressAllBinaries() {
-        binaryPool.doForEachBinary { binary ->
+        attachmentPool.doForEachBinary { _, binary ->
             try {
-                val cipherKey = loadedCipherKey
+                binary.decompress(binaryCache)
-                        ?: throw IOException("Unable to retrieve cipher key to decompress binaries")
-                binary.decompress(cipherKey)
             } catch (e: Exception) {
                 Log.e(TAG, "Unable to decompress $binary", e)
             }
@@ -307,16 +303,27 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         this.dataEngine = dataEngine
     }
 
-    fun getCustomIcons(): List<IconImageCustom> {
+    override fun getStandardIcon(iconId: Int): IconImageStandard {
-        return customIcons
+        return this.iconsManager.getIcon(iconId)
     }
 
-    fun addCustomIcon(customIcon: IconImageCustom) {
+    fun buildNewCustomIcon(customIconId: UUID? = null,
-        this.customIcons.add(customIcon)
+                           result: (IconImageCustom, BinaryData?) -> Unit) {
+        iconsManager.buildNewCustomIcon(customIconId, result)
     }
 
-    fun getCustomData(): Map<String, String> {
+    fun addCustomIcon(customIconId: UUID? = null,
-        return customData
+                      smallSize: Boolean,
+                      result: (IconImageCustom, BinaryData?) -> Unit) {
+        iconsManager.addCustomIcon(customIconId, smallSize, result)
+    }
+
+    fun isCustomIconBinaryDuplicate(binary: BinaryData): Boolean {
+        return iconsManager.isCustomIconBinaryDuplicate(binary)
+    }
+
+    fun getCustomIcon(iconUuid: UUID): IconImageCustom {
+        return this.iconsManager.getIcon(iconUuid)
     }
 
     fun putCustomData(label: String, value: String) {
@@ -324,7 +331,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     }
 
     override fun containsCustomData(): Boolean {
-        return getCustomData().isNotEmpty()
+        return customData.isNotEmpty()
     }
 
     @Throws(IOException::class)
@@ -340,14 +347,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             masterKey = getFileKey(keyInputStream)
         }
 
-        val messageDigest: MessageDigest
+        return HashManager.hashSha256(masterKey)
-        try {
-            messageDigest = MessageDigest.getInstance("SHA-256")
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("No SHA-256 implementation")
-        }
-
-        return messageDigest.digest(masterKey)
     }
 
     @Throws(IOException::class)
@@ -358,13 +358,13 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
 
             var transformedMasterKey = kdfEngine.transform(masterKey, keyDerivationFunctionParameters)
             if (transformedMasterKey.size != 32) {
-                transformedMasterKey = CryptoUtil.hashSha256(transformedMasterKey)
+                transformedMasterKey = HashManager.hashSha256(transformedMasterKey)
             }
 
             val cmpKey = ByteArray(65)
             System.arraycopy(masterSeed, 0, cmpKey, 0, 32)
             System.arraycopy(transformedMasterKey, 0, cmpKey, 32, 32)
-            finalKey = CryptoUtil.resizeKey(cmpKey, 0, 64, dataEngine.keyLength())
+            finalKey = resizeKey(cmpKey, dataEngine.keyLength())
 
             val messageDigest: MessageDigest
             try {
@@ -379,6 +379,47 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         }
     }
 
+    private fun resizeKey(inBytes: ByteArray, cbOut: Int): ByteArray {
+        if (cbOut == 0) return ByteArray(0)
+
+        val messageDigest = if (cbOut <= 32) HashManager.getHash256() else HashManager.getHash512()
+        messageDigest.update(inBytes, 0, 64)
+        val hash: ByteArray = messageDigest.digest()
+
+        if (cbOut == hash.size) {
+            return hash
+        }
+
+        val ret = ByteArray(cbOut)
+        if (cbOut < hash.size) {
+            System.arraycopy(hash, 0, ret, 0, cbOut)
+        } else {
+            var pos = 0
+            var r: Long = 0
+            while (pos < cbOut) {
+                val hmac: Mac
+                try {
+                    hmac = Mac.getInstance("HmacSHA256")
+                } catch (e: NoSuchAlgorithmException) {
+                    throw RuntimeException(e)
+                }
+
+                val pbR = longTo8Bytes(r)
+                val part = hmac.doFinal(pbR)
+
+                val copy = min(cbOut - pos, part.size)
+                System.arraycopy(part, 0, ret, pos, copy)
+                pos += copy
+                r++
+
+                Arrays.fill(part, 0.toByte())
+            }
+        }
+
+        Arrays.fill(hash, 0.toByte())
+        return ret
+    }
+
     override fun loadXmlKeyFile(keyInputStream: InputStream): ByteArray? {
         try {
             val documentBuilderFactory = DocumentBuilderFactory.newInstance()
@@ -476,17 +517,13 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     }
 
     private fun checkKeyFileHash(data: String, hash: String): Boolean {
-        val digest: MessageDigest?
         var success = false
         try {
-            digest = MessageDigest.getInstance("SHA-256")
-            digest?.reset()
             // hexadecimal encoding of the first 4 bytes of the SHA-256 hash of the key.
-            val dataDigest = digest.digest(Hex.decodeHex(data.toCharArray()))
+            val dataDigest = HashManager.hashSha256(Hex.decodeHex(data.toCharArray()))
-                    .copyOfRange(0, 4)
+                    .copyOfRange(0, 4).toHexString()
-                    .toHexString()
             success = dataDigest == hash
-        } catch (e: NoSuchAlgorithmException) {
+        } catch (e: Exception) {
             e.printStackTrace()
         }
         return success
@@ -550,7 +587,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
             // Create recycle bin
             val recycleBinGroup = createGroup().apply {
                 title = resources.getString(R.string.recycle_bin)
-                icon = iconFactory.trashIcon
+                icon.standard = getStandardIcon(IconImageStandard.TRASH_ID)
                 enableAutoType = false
                 enableSearching = false
                 isExpanded = false
@@ -629,21 +666,17 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         return publicCustomData.size() > 0
     }
 
-    fun buildNewBinary(cacheDirectory: File,
+    fun buildNewAttachment(smallSize: Boolean,
-                       compression: Boolean,
+                           compression: Boolean,
-                       protection: Boolean,
+                           protection: Boolean,
-                       binaryPoolId: Int? = null): BinaryAttachment {
+                           binaryPoolId: Int? = null): BinaryData {
-        // New file with current time
+        return attachmentPool.put(binaryPoolId) { uniqueBinaryId ->
-        val fileInCache = File(cacheDirectory, binaryIncrement.toString())
+            binaryCache.getBinaryData(uniqueBinaryId, smallSize, compression, protection)
-        binaryIncrement++
+        }.binary
-        val binaryAttachment = BinaryAttachment(fileInCache, compression, protection)
-        // add attachment to pool
-        binaryPool.put(binaryPoolId, binaryAttachment)
-        return binaryAttachment
     }
 
-    fun removeUnlinkedAttachment(binary: BinaryAttachment, clear: Boolean) {
+    fun removeUnlinkedAttachment(binary: BinaryData, clear: Boolean) {
-        val listBinaries = ArrayList<BinaryAttachment>()
+        val listBinaries = ArrayList<BinaryData>()
         listBinaries.add(binary)
         removeUnlinkedAttachments(listBinaries, clear)
     }
@@ -652,11 +685,11 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         removeUnlinkedAttachments(emptyList(), clear)
     }
 
-    private fun removeUnlinkedAttachments(binaries: List<BinaryAttachment>, clear: Boolean) {
+    private fun removeUnlinkedAttachments(binaries: List<BinaryData>, clear: Boolean) {
         // Build binaries to remove with all binaries known
-        val binariesToRemove = ArrayList<BinaryAttachment>()
+        val binariesToRemove = ArrayList<BinaryData>()
         if (binaries.isEmpty()) {
-            binaryPool.doForEachBinary { binary ->
+            attachmentPool.doForEachBinary { _, binary ->
                 binariesToRemove.add(binary)
             }
         } else {
@@ -665,8 +698,8 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         // Remove binaries from the list
         rootGroup?.doForEachChild(object : NodeHandler<EntryKDBX>() {
             override fun operate(node: EntryKDBX): Boolean {
-                node.getAttachments(binaryPool, true).forEach {
+                node.getAttachments(attachmentPool, true).forEach {
-                    binariesToRemove.remove(it.binaryAttachment)
+                    binariesToRemove.remove(it.binaryData)
                 }
                 return binariesToRemove.isNotEmpty()
             }
@@ -674,9 +707,9 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         // Effective removing
         binariesToRemove.forEach {
             try {
-                binaryPool.remove(it)
+                attachmentPool.remove(it)
                 if (clear)
-                    it.clear()
+                    it.clear(binaryCache)
             } catch (e: Exception) {
                 Log.w(TAG, "Unable to clean binaries", e)
             }
@@ -692,7 +725,7 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
     override fun clearCache() {
         try {
             super.clearCache()
-            binaryPool.clear()
+            attachmentPool.clear()
         } catch (e: Exception) {
             Log.e(TAG, "Unable to clear cache", e)
         }

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

@@ -19,14 +19,16 @@
  */
 package com.kunzisoft.keepass.database.element.database
 
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
+import com.kunzisoft.encrypt.HashManager
-import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.binary.AttachmentPool
+import com.kunzisoft.keepass.database.element.binary.BinaryCache
 import com.kunzisoft.keepass.database.element.entry.EntryVersioned
 import com.kunzisoft.keepass.database.element.group.GroupVersioned
-import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.icon.IconsManager
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import org.apache.commons.codec.binary.Hex
 import java.io.ByteArrayInputStream
@@ -34,7 +36,6 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.UnsupportedEncodingException
 import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
 import java.util.*
 
 abstract class DatabaseVersioned<
@@ -47,16 +48,22 @@ abstract class DatabaseVersioned<
     // Algorithm used to encrypt the database
     protected var algorithm: EncryptionAlgorithm? = null
 
-    abstract val kdfEngine: KdfEngine?
+    abstract val kdfEngine: com.kunzisoft.keepass.database.crypto.kdf.KdfEngine?
 
-    abstract val kdfAvailableList: List<KdfEngine>
+    abstract val kdfAvailableList: List<com.kunzisoft.keepass.database.crypto.kdf.KdfEngine>
 
     var masterKey = ByteArray(32)
     var finalKey: ByteArray? = null
         protected set
 
-    var iconFactory = IconImageFactory()
+    /**
-        protected set
+     * To manage binaries in faster way
+     * Cipher key generated when the database is loaded, and destroyed when the database is closed
+     * Can be used to temporarily store database elements
+     */
+    var binaryCache = BinaryCache()
+    val iconsManager = IconsManager(binaryCache)
+    var attachmentPool = AttachmentPool(binaryCache)
 
     var changeDuplicateId = false
 
@@ -93,42 +100,21 @@ abstract class DatabaseVersioned<
     protected fun getCompositeKey(key: String, keyfileInputStream: InputStream): ByteArray {
         val fileKey = getFileKey(keyfileInputStream)
         val passwordKey = getPasswordKey(key)
-
+        return HashManager.hashSha256(passwordKey, fileKey)
-        val messageDigest: MessageDigest
-        try {
-            messageDigest = MessageDigest.getInstance("SHA-256")
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("SHA-256 not supported")
-        }
-
-        messageDigest.update(passwordKey)
-
-        return messageDigest.digest(fileKey)
     }
 
     @Throws(IOException::class)
     protected fun getPasswordKey(key: String): ByteArray {
-        val messageDigest: MessageDigest
-        try {
-            messageDigest = MessageDigest.getInstance("SHA-256")
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("SHA-256 not supported")
-        }
-
         val bKey: ByteArray = try {
             key.toByteArray(charset(passwordEncoding))
         } catch (e: UnsupportedEncodingException) {
             key.toByteArray()
         }
-
+        return HashManager.hashSha256(bKey)
-        messageDigest.update(bKey, 0, bKey.size)
-
-        return messageDigest.digest()
     }
 
     @Throws(IOException::class)
     protected fun getFileKey(keyInputStream: InputStream): ByteArray {
-
         val keyData = keyInputStream.readBytes()
 
         // Check XML key file
@@ -146,13 +132,8 @@ abstract class DatabaseVersioned<
                 // Key is not base 64, treat it as binary data
             }
         }
-
         // Hash file as binary data
-        try {
+        return HashManager.hashSha256(keyData)
-            return MessageDigest.getInstance("SHA-256").digest(keyData)
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("SHA-256 not supported")
-        }
     }
 
     protected open fun loadXmlKeyFile(keyInputStream: InputStream): ByteArray? {
@@ -329,6 +310,8 @@ abstract class DatabaseVersioned<
 
     abstract fun rootCanContainsEntry(): Boolean
 
+    abstract fun getStandardIcon(iconId: Int): IconImageStandard
+
     abstract fun containsCustomData(): Boolean
 
     fun addGroupTo(newGroup: Group, parent: Group?) {
@@ -384,12 +367,6 @@ abstract class DatabaseVersioned<
         return true
     }
 
-    /**
-     * Cipher key generated when the database is loaded, and destroyed when the database is closed
-     * Can be used to temporarily store database elements
-     */
-    var loadedCipherKey: Database.LoadedKey? = null
-
     companion object {
 
         private const val TAG = "DatabaseVersioned"

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

@@ -21,15 +21,16 @@ package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.Attachment
+import com.kunzisoft.keepass.database.element.binary.AttachmentPool
+import com.kunzisoft.keepass.database.element.binary.BinaryData
 import com.kunzisoft.keepass.database.element.group.GroupKDB
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.KEY_ID
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBInterface
 import com.kunzisoft.keepass.database.element.node.Type
-import com.kunzisoft.keepass.database.element.database.BinaryAttachment
-import com.kunzisoft.keepass.database.element.Attachment
 import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * Structure containing information about one entry.
@@ -56,7 +57,7 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
 
     /** A string describing what is in binaryData  */
     var binaryDescription = ""
-    var binaryData: BinaryAttachment? = null
+    private var binaryDataId: Int? = null
 
     // Determine if this is a MetaStream entry
     val isMetaStream: Boolean
@@ -68,7 +69,8 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
             if (username.isEmpty()) return false
             if (username != PMS_ID_USER) return false
             if (url.isEmpty()) return false
-            return if (url != PMS_ID_URL) false else icon.isMetaStreamIcon
+            if (url != PMS_ID_URL) return false
+            return icon.standard.id == KEY_ID
         }
 
     override fun initNodeId(): NodeId<UUID> {
@@ -88,7 +90,7 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         url = parcel.readString() ?: url
         notes = parcel.readString() ?: notes
         binaryDescription = parcel.readString() ?: binaryDescription
-        binaryData = parcel.readParcelable(BinaryAttachment::class.java.classLoader)
+        binaryDataId = parcel.readInt()
     }
 
     override fun readParentParcelable(parcel: Parcel): GroupKDB? {
@@ -107,7 +109,9 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         dest.writeString(url)
         dest.writeString(notes)
         dest.writeString(binaryDescription)
-        dest.writeParcelable(binaryData, flags)
+        binaryDataId?.let {
+            dest.writeInt(it)
+        }
     }
 
     fun updateWith(source: EntryKDB) {
@@ -118,7 +122,7 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         url = source.url
         notes = source.notes
         binaryDescription = source.binaryDescription
-        binaryData = source.binaryData
+        binaryDataId = source.binaryDataId
     }
 
     override var username = ""
@@ -137,26 +141,39 @@ class EntryKDB : EntryVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
     override val type: Type
         get() = Type.ENTRY
 
-    fun getAttachment(): Attachment? {
+    fun getAttachment(attachmentPool: AttachmentPool): Attachment? {
-        val binary = binaryData
+        binaryDataId?.let { poolId ->
-        return if (binary != null)
+            attachmentPool[poolId]?.let { binary ->
-            Attachment(binaryDescription, binary)
+                return Attachment(binaryDescription, binary)
-        else null
+            }
+        }
+        return null
     }
 
     fun containsAttachment(): Boolean {
-        return binaryData != null
+        return binaryDataId != null
     }
 
-    fun putAttachment(attachment: Attachment) {
+    fun getBinary(attachmentPool: AttachmentPool): BinaryData? {
+        this.binaryDataId?.let {
+            return attachmentPool[it]
+        }
+        return null
+    }
+
+    fun putBinary(binaryData: BinaryData, attachmentPool: AttachmentPool) {
+        this.binaryDataId = attachmentPool.put(binaryData)
+    }
+
+    fun putAttachment(attachment: Attachment, attachmentPool: AttachmentPool) {
         this.binaryDescription = attachment.name
-        this.binaryData = attachment.binaryAttachment
+        this.binaryDataId = attachmentPool.put(attachment.binaryData)
     }
 
     fun removeAttachment(attachment: Attachment? = null) {
         if (attachment == null || this.binaryDescription == attachment.name) {
             this.binaryDescription = ""
-            this.binaryData = null
+            this.binaryDataId = null
         }
     }
 

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

@@ -21,21 +21,18 @@ package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.utils.UnsignedLong
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.database.element.DateInstant
-import com.kunzisoft.keepass.database.element.database.BinaryPool
+import com.kunzisoft.keepass.database.element.binary.AttachmentPool
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.utils.ParcelableUtil
-import com.kunzisoft.keepass.utils.UnsignedLong
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.LinkedHashMap
@@ -48,19 +45,6 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     @Transient
     private var mDecodeRef = false
 
-    override var icon: IconImage
-        get() {
-            return when {
-                iconCustom.isUnknown -> super.icon
-                else -> iconCustom
-            }
-        }
-        set(value) {
-            if (value is IconImageStandard)
-                iconCustom = IconImageCustom.UNKNOWN_ICON
-            super.icon = value
-        }
-    var iconCustom = IconImageCustom.UNKNOWN_ICON
     var customData = LinkedHashMap<String, String>()
     var fields = LinkedHashMap<String, ProtectedString>()
     var binaries = LinkedHashMap<String, Int>() // Map<Label, PoolId>
@@ -72,7 +56,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     var additional = ""
     var tags = ""
 
-    fun getSize(binaryPool: BinaryPool): Long {
+    fun getSize(attachmentPool: AttachmentPool): Long {
         var size = FIXED_LENGTH_SIZE
 
         for (entry in fields.entries) {
@@ -80,7 +64,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
             size += entry.value.length().toLong()
         }
 
-        size += getAttachmentsSize(binaryPool)
+        size += getAttachmentsSize(attachmentPool)
 
         size += autoType.defaultSequence.length.toLong()
         for ((key, value) in autoType.entrySet()) {
@@ -89,7 +73,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         }
 
         for (entry in history) {
-            size += entry.getSize(binaryPool)
+            size += entry.getSize(attachmentPool)
         }
 
         size += overrideURL.length.toLong()
@@ -103,7 +87,6 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     constructor() : super()
 
     constructor(parcel: Parcel) : super(parcel) {
-        iconCustom = parcel.readParcelable(IconImageCustom::class.java.classLoader) ?: iconCustom
         usageCount = UnsignedLong(parcel.readLong())
         locationChanged = parcel.readParcelable(DateInstant::class.java.classLoader) ?: locationChanged
         customData = ParcelableUtil.readStringParcelableMap(parcel)
@@ -121,7 +104,6 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
         super.writeToParcel(dest, flags)
-        dest.writeParcelable(iconCustom, flags)
         dest.writeLong(usageCount.toKotlinLong())
         dest.writeParcelable(locationChanged, flags)
         ParcelableUtil.writeStringParcelableMap(dest, customData)
@@ -143,7 +125,6 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
      */
     fun updateWith(source: EntryKDBX, copyHistory: Boolean = true) {
         super.updateWith(source)
-        iconCustom = IconImageCustom(source.iconCustom)
         usageCount = source.usageCount
         locationChanged = DateInstant(source.locationChanged)
         // Add all custom elements in map
@@ -281,16 +262,16 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     /**
      * It's a list because history labels can be defined multiple times
      */
-    fun getAttachments(binaryPool: BinaryPool, inHistory: Boolean = false): List<Attachment> {
+    fun getAttachments(attachmentPool: AttachmentPool, inHistory: Boolean = false): List<Attachment> {
         val entryAttachmentList = ArrayList<Attachment>()
         for ((label, poolId) in binaries) {
-            binaryPool[poolId]?.let { binary ->
+            attachmentPool[poolId]?.let { binary ->
                 entryAttachmentList.add(Attachment(label, binary))
             }
         }
         if (inHistory) {
             history.forEach {
-                entryAttachmentList.addAll(it.getAttachments(binaryPool, false))
+                entryAttachmentList.addAll(it.getAttachments(attachmentPool, false))
             }
         }
         return entryAttachmentList
@@ -300,8 +281,8 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         return binaries.isNotEmpty()
     }
 
-    fun putAttachment(attachment: Attachment, binaryPool: BinaryPool) {
+    fun putAttachment(attachment: Attachment, attachmentPool: AttachmentPool) {
-        binaries[attachment.name] = binaryPool.put(attachment.binaryAttachment)
+        binaries[attachment.name] = attachmentPool.put(attachment.binaryData)
     }
 
     fun removeAttachment(attachment: Attachment) {
@@ -312,11 +293,11 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         binaries.clear()
     }
 
-    private fun getAttachmentsSize(binaryPool: BinaryPool): Long {
+    private fun getAttachmentsSize(attachmentPool: AttachmentPool): Long {
         var size = 0L
         for ((label, poolId) in binaries) {
             size += label.length.toLong()
-            size += binaryPool[poolId]?.length ?: 0
+            size += attachmentPool[poolId]?.getSize() ?: 0
         }
         return size
     }
@@ -333,7 +314,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         history.add(entry)
     }
 
-    fun removeEntryFromHistory(position: Int): EntryKDBX? {
+    fun removeEntryFromHistory(position: Int): EntryKDBX {
         return history.removeAt(position)
     }
 
@@ -357,8 +338,7 @@ class EntryKDBX : EntryVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
 
     override fun touch(modified: Boolean, touchParents: Boolean) {
         super.touch(modified, touchParents)
-        // TODO unsigned long
+        usageCount.plusOne()
-        usageCount = UnsignedLong(usageCount.toKotlinLong() + 1)
     }
 
     companion object {

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

@@ -82,10 +82,6 @@ class GroupKDB : GroupVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface
         this.nodeId = NodeIdInt(groupId)
     }
 
-    override fun allowAddEntryIfIsRoot(): Boolean {
-        return false
-    }
-
     companion object {
 
         @JvmField

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

@@ -21,37 +21,18 @@ package com.kunzisoft.keepass.database.element.group
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
-import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageCustom
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.utils.UnsignedLong
-
+import java.util.*
-import java.util.HashMap
-import java.util.UUID
 
 class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInterface {
 
-    // TODO Encapsulate
-    override var icon: IconImage
-        get() {
-            return if (iconCustom.isUnknown)
-                super.icon
-            else
-                iconCustom
-        }
-        set(value) {
-            if (value is IconImageStandard)
-                iconCustom = IconImageCustom.UNKNOWN_ICON
-            super.icon = value
-        }
-    var iconCustom = IconImageCustom.UNKNOWN_ICON
     private val customData = HashMap<String, String>()
     var notes = ""
 
@@ -77,7 +58,6 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
     constructor() : super()
 
     constructor(parcel: Parcel) : super(parcel) {
-        iconCustom = parcel.readParcelable(IconImageCustom::class.java.classLoader) ?: iconCustom
         usageCount = UnsignedLong(parcel.readLong())
         locationChanged = parcel.readParcelable(DateInstant::class.java.classLoader) ?: locationChanged
         // TODO customData = ParcelableUtil.readStringParcelableMap(parcel);
@@ -101,7 +81,6 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
         super.writeToParcel(dest, flags)
-        dest.writeParcelable(iconCustom, flags)
         dest.writeLong(usageCount.toKotlinLong())
         dest.writeParcelable(locationChanged, flags)
         // TODO ParcelableUtil.writeStringParcelableMap(dest, customData);
@@ -115,7 +94,6 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
 
     fun updateWith(source: GroupKDBX) {
         super.updateWith(source)
-        iconCustom = IconImageCustom(source.iconCustom)
         usageCount = source.usageCount
         locationChanged = DateInstant(source.locationChanged)
         // Add all custom elements in map
@@ -147,10 +125,6 @@ class GroupKDBX : GroupVersioned<UUID, UUID, GroupKDBX, EntryKDBX>, NodeKDBXInte
         return customData.isNotEmpty()
     }
 
-    override fun allowAddEntryIfIsRoot(): Boolean {
-        return true
-    }
-
     companion object {
 
         @JvmField

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

@@ -38,8 +38,6 @@ interface GroupVersionedInterface<Group: GroupVersionedInterface<Group, Entry>,
 
     fun removeChildren()
 
-    fun allowAddEntryIfIsRoot(): Boolean
-
     @Suppress("UNCHECKED_CAST")
     fun doForEachChildAndForIt(entryHandler: NodeHandler<Entry>,
                                groupHandler: NodeHandler<Group>) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
  *
  * This file is part of KeePassDX.
  *
@@ -19,19 +19,69 @@
  */
 package com.kunzisoft.keepass.database.element.icon
 
+import android.os.Parcel
 import android.os.Parcelable
 
-abstract class IconImage protected constructor() : Parcelable {
+class IconImage() : IconImageDraw(), Parcelable {
 
-    abstract val iconId: Int
+    var standard: IconImageStandard = IconImageStandard()
-    abstract val isUnknown: Boolean
+    var custom: IconImageCustom = IconImageCustom()
-    abstract val isMetaStreamIcon: Boolean
+
+    constructor(iconImageStandard: IconImageStandard) : this() {
+        this.standard = iconImageStandard
+    }
+
+    constructor(iconImageCustom: IconImageCustom) : this() {
+        this.custom = iconImageCustom
+    }
+
+    constructor(iconImageStandard: IconImageStandard,
+                iconImageCustom: IconImageCustom) : this() {
+        this.standard = iconImageStandard
+        this.custom = iconImageCustom
+    }
+
+    constructor(parcel: Parcel) : this() {
+        standard = parcel.readParcelable(IconImageStandard::class.java.classLoader) ?: standard
+        custom = parcel.readParcelable(IconImageCustom::class.java.classLoader) ?: custom
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeParcelable(standard, flags)
+        parcel.writeParcelable(custom, flags)
+    }
 
     override fun describeContents(): Int {
         return 0
     }
 
-    companion object {
+    override fun getIconImageToDraw(): IconImage {
-        const val UNKNOWN_ID = -1
+        return this
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is IconImage) return false
+
+        if (standard != other.standard) return false
+        if (custom != other.custom) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = standard.hashCode()
+        result = 31 * result + custom.hashCode()
+        return result
+    }
+
+    companion object CREATOR : Parcelable.Creator<IconImage> {
+        override fun createFromParcel(parcel: Parcel): IconImage {
+            return IconImage(parcel)
+        }
+
+        override fun newArray(size: Int): Array<IconImage?> {
+            return arrayOfNulls(size)
+        }
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
  *     
  * This file is part of KeePassDX.
  *
@@ -20,41 +20,33 @@
 package com.kunzisoft.keepass.database.element.icon
 
 import android.os.Parcel
+import android.os.ParcelUuid
 import android.os.Parcelable
 import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
+import java.util.*
 
-import java.util.UUID
+class IconImageCustom : Parcelable, IconImageDraw {
 
-class IconImageCustom : IconImage {
+    var uuid: UUID
 
-    val uuid: UUID
+    constructor() {
-    @Transient
+        uuid = DatabaseVersioned.UUID_ZERO
-    var imageData: ByteArray = ByteArray(0)
-
-    constructor(uuid: UUID, data: ByteArray) : super() {
-        this.uuid = uuid
-        this.imageData = data
     }
 
-    constructor(uuid: UUID) : super() {
+    constructor(uuid: UUID) {
         this.uuid = uuid
-        this.imageData = ByteArray(0)
-    }
-
-    constructor(icon: IconImageCustom) : super() {
-        uuid = icon.uuid
-        imageData = icon.imageData
     }
 
     constructor(parcel: Parcel) {
-        uuid = parcel.readSerializable() as UUID
+        uuid = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: DatabaseVersioned.UUID_ZERO
-        // TODO Take too much memories
-        // parcel.readByteArray(imageData);
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeSerializable(uuid)
+        dest.writeParcelable(ParcelUuid(uuid), flags)
-        // Too big for a parcelable dest.writeByteArray(imageData);
+    }
+
+    override fun describeContents(): Int {
+        return 0
     }
 
     override fun hashCode(): Int {
@@ -64,6 +56,10 @@ class IconImageCustom : IconImage {
         return result
     }
 
+    override fun getIconImageToDraw(): IconImage {
+        return IconImage(this)
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other)
             return true
@@ -74,17 +70,10 @@ class IconImageCustom : IconImage {
         return uuid == other.uuid
     }
 
-    override val iconId: Int
+    val isUnknown: Boolean
-        get() = UNKNOWN_ID
+        get() = uuid == DatabaseVersioned.UUID_ZERO
-
-    override val isUnknown: Boolean
-        get() = this == UNKNOWN_ICON
-
-    override val isMetaStreamIcon: Boolean
-        get() = false
 
     companion object {
-        val UNKNOWN_ICON = IconImageCustom(DatabaseVersioned.UUID_ZERO, ByteArray(0))
 
         @JvmField
         val CREATOR: Parcelable.Creator<IconImageCustom> = object : Parcelable.Creator<IconImageCustom> {

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element.icon
+
+abstract class IconImageDraw {
+
+    var selected = false
+    /**
+     * Only to retrieve an icon image to Draw, to not use as object to manipulate
+     */
+    abstract fun getIconImageToDraw(): IconImage
+}

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

@@ -1,77 +0,0 @@
-/*
- * Copyright 2019 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.element.icon
-
-import org.apache.commons.collections.map.AbstractReferenceMap
-import org.apache.commons.collections.map.ReferenceMap
-
-import java.util.UUID
-
-class IconImageFactory {
-    /** customIconMap
-     * Cache for icon drawable.
-     * Keys: Integer, Values: IconImageStandard
-     */
-    private val cache = ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK)
-
-    /** standardIconMap
-     * Cache for icon drawable.
-     * Keys: UUID, Values: IconImageCustom
-     */
-    private val customCache = ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK)
-
-    val unknownIcon: IconImageStandard
-        get() = getIcon(IconImage.UNKNOWN_ID)
-
-    val keyIcon: IconImageStandard
-        get() = getIcon(IconImageStandard.KEY)
-
-    val trashIcon: IconImageStandard
-        get() = getIcon(IconImageStandard.TRASH)
-
-    val folderIcon: IconImageStandard
-        get() = getIcon(IconImageStandard.FOLDER)
-
-    fun getIcon(iconId: Int): IconImageStandard {
-        var icon: IconImageStandard? = cache[iconId] as IconImageStandard?
-
-        if (icon == null) {
-            icon = IconImageStandard(iconId)
-            cache[iconId] = icon
-        }
-
-        return icon
-    }
-
-    fun getIcon(iconUuid: UUID): IconImageCustom {
-        var icon: IconImageCustom? = customCache[iconUuid] as IconImageCustom?
-
-        if (icon == null) {
-            icon = IconImageCustom(iconUuid)
-            customCache[iconUuid] = icon
-        }
-
-        return icon
-    }
-
-    fun put(icon: IconImageCustom) {
-        customCache[icon.uuid] = icon
-    }
-}

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

@@ -21,36 +21,46 @@ package com.kunzisoft.keepass.database.element.icon
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.icons.IconPack.Companion.NB_ICONS
 
-class IconImageStandard : IconImage {
+class IconImageStandard : Parcelable, IconImageDraw {
+
+    val id: Int
 
     constructor() {
-        this.iconId = KEY
+        this.id = KEY_ID
     }
 
     constructor(iconId: Int) {
-        this.iconId = iconId
+        if (!isCorrectIconId(iconId))
-    }
+            this.id = KEY_ID
-
+        else
-    constructor(icon: IconImageStandard) {
+            this.id = iconId
-        this.iconId = icon.iconId
     }
 
     constructor(parcel: Parcel) {
-        iconId = parcel.readInt()
+        id = parcel.readInt()
+    }
+
+    override fun describeContents(): Int {
+        return 0
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeInt(iconId)
+        dest.writeInt(id)
     }
 
     override fun hashCode(): Int {
         val prime = 31
         var result = 1
-        result = prime * result + iconId
+        result = prime * result + id
         return result
     }
 
+    override fun getIconImageToDraw(): IconImage {
+        return IconImage(this)
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other)
             return true
@@ -59,22 +69,18 @@ class IconImageStandard : IconImage {
         if (other !is IconImageStandard) {
             return false
         }
-        return iconId == other.iconId
+        return id == other.id
     }
 
-    override val iconId: Int
-
-    override val isUnknown: Boolean
-        get() = iconId == UNKNOWN_ID
-
-    override val isMetaStreamIcon: Boolean
-        get() = iconId == 0
-
     companion object {
 
-        const val KEY = 0
+        const val KEY_ID = 0
-        const val TRASH = 43
+        const val TRASH_ID = 43
-        const val FOLDER = 48
+        const val FOLDER_ID = 48
+
+        fun isCorrectIconId(iconId: Int): Boolean {
+            return iconId in 0 until NB_ICONS
+        }
 
         @JvmField
         val CREATOR: Parcelable.Creator<IconImageStandard> = object : Parcelable.Creator<IconImageStandard> {

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2021 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePassDX.
+ *
+ *  KeePassDX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.element.icon
+
+import android.util.Log
+import com.kunzisoft.keepass.database.element.binary.BinaryCache
+import com.kunzisoft.keepass.database.element.binary.BinaryData
+import com.kunzisoft.keepass.database.element.binary.CustomIconPool
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.KEY_ID
+import com.kunzisoft.keepass.icons.IconPack.Companion.NB_ICONS
+import java.util.*
+
+class IconsManager(private val binaryCache: BinaryCache) {
+
+    private val standardCache = List(NB_ICONS) {
+        IconImageStandard(it)
+    }
+    private val customCache = CustomIconPool(binaryCache)
+
+    fun getIcon(iconId: Int): IconImageStandard {
+        val searchIconId = if (IconImageStandard.isCorrectIconId(iconId)) iconId else KEY_ID
+        return standardCache[searchIconId]
+    }
+
+    fun doForEachStandardIcon(action: (IconImageStandard) -> Unit) {
+        standardCache.forEach { icon ->
+            action.invoke(icon)
+        }
+    }
+
+    /*
+     *  Custom
+     */
+
+    fun buildNewCustomIcon(key: UUID? = null,
+                           result: (IconImageCustom, BinaryData?) -> Unit) {
+        // Create a binary file for a brand new custom icon
+        addCustomIcon(key, false, result)
+    }
+
+    fun addCustomIcon(key: UUID? = null,
+                      smallSize: Boolean,
+                      result: (IconImageCustom, BinaryData?) -> Unit) {
+        val keyBinary = customCache.put(key) { uniqueBinaryId ->
+            // Create a byte array for better performance with small data
+            binaryCache.getBinaryData(uniqueBinaryId, smallSize)
+        }
+        result.invoke(IconImageCustom(keyBinary.keys.first()), keyBinary.binary)
+    }
+
+    fun getIcon(iconUuid: UUID): IconImageCustom {
+        return IconImageCustom(iconUuid)
+    }
+
+    fun isCustomIconBinaryDuplicate(binaryData: BinaryData): Boolean {
+        return customCache.isBinaryDuplicate(binaryData)
+    }
+
+    fun removeCustomIcon(binaryCache: BinaryCache, iconUuid: UUID) {
+        val binary = customCache[iconUuid]
+        customCache.remove(iconUuid)
+        try {
+            binary?.clear(binaryCache)
+        } catch (e: Exception) {
+            Log.w(TAG, "Unable to remove custom icon binary", e)
+        }
+    }
+
+    fun getBinaryForCustomIcon(iconUuid: UUID): BinaryData? {
+        return customCache[iconUuid]
+    }
+
+    fun doForEachCustomIcon(action: (IconImageCustom, BinaryData) -> Unit) {
+        customCache.doForEachBinary { key, binary ->
+            action.invoke(IconImageCustom(key), binary)
+        }
+    }
+
+    /**
+     * Clear the cache of icons
+     */
+    fun clearCache() {
+        try {
+            customCache.clear()
+        } catch(e: Exception) {
+            Log.e(TAG, "Unable to clear cache", e)
+        }
+    }
+
+    companion object {
+        private val TAG = IconsManager::class.java.name
+    }
+}

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

@@ -20,6 +20,7 @@
 package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcel
+import android.os.ParcelUuid
 import android.os.Parcelable
 import java.util.*
 
@@ -35,12 +36,12 @@ class NodeIdUUID : NodeId<UUID> {
     }
 
     constructor(parcel: Parcel) {
-        id = parcel.readSerializable() as UUID
+        id = parcel.readParcelable<ParcelUuid>(ParcelUuid::class.java.classLoader)?.uuid ?: id
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
         super.writeToParcel(dest, flags)
-        dest.writeSerializable(id)
+        dest.writeParcelable(ParcelUuid(id), flags)
     }
 
     override fun equals(other: Any?): Boolean {

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

@@ -22,11 +22,10 @@ package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.DateInstant
 import com.kunzisoft.keepass.database.element.entry.EntryVersionedInterface
 import com.kunzisoft.keepass.database.element.group.GroupVersionedInterface
 import com.kunzisoft.keepass.database.element.icon.IconImage
-import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import org.joda.time.LocalDateTime
 
 /**
@@ -88,7 +87,7 @@ abstract class NodeVersioned<IdType, Parent : GroupVersionedInterface<Parent, En
 
     final override var parent: Parent? = null
 
-    override var icon: IconImage = IconImageStandard()
+    final override var icon: IconImage = IconImage()
 
     final override var creationTime: DateInstant = DateInstant()
 

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

@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.element.security
-
-import android.content.res.Resources
-
-import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.crypto.engine.AesEngine
-import com.kunzisoft.keepass.crypto.engine.ChaCha20Engine
-import com.kunzisoft.keepass.crypto.engine.CipherEngine
-import com.kunzisoft.keepass.crypto.engine.TwofishEngine
-import com.kunzisoft.keepass.utils.ObjectNameResource
-
-import java.util.UUID
-
-enum class EncryptionAlgorithm : ObjectNameResource {
-
-    AESRijndael,
-    Twofish,
-    ChaCha20;
-
-    val cipherEngine: CipherEngine
-        get() {
-            return when (this) {
-                AESRijndael -> AesEngine()
-                Twofish -> TwofishEngine()
-                ChaCha20 -> ChaCha20Engine()
-            }
-        }
-
-    val dataCipher: UUID
-        get() {
-            return when (this) {
-                AESRijndael -> AesEngine.CIPHER_UUID
-                Twofish -> TwofishEngine.CIPHER_UUID
-                ChaCha20 -> ChaCha20Engine.CIPHER_UUID
-            }
-        }
-
-    override fun getName(resources: Resources): String {
-        return when (this) {
-            AESRijndael -> resources.getString(R.string.encryption_rijndael)
-            Twofish -> resources.getString(R.string.encryption_twofish)
-            ChaCha20 -> resources.getString(R.string.encryption_chacha20)
-        }
-    }
-}

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

@@ -21,9 +21,9 @@
 
 package com.kunzisoft.keepass.database.file
 
-import com.kunzisoft.keepass.stream.readBytesLength
-import com.kunzisoft.keepass.stream.readBytes4ToUInt
 import com.kunzisoft.keepass.utils.UnsignedInt
+import com.kunzisoft.keepass.utils.readBytes4ToUInt
+import com.kunzisoft.keepass.utils.readBytesLength
 import java.io.IOException
 import java.io.InputStream
 

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

@@ -19,30 +19,26 @@
  */
 package com.kunzisoft.keepass.database.file
 
-import com.kunzisoft.keepass.crypto.CrsAlgorithm
+import com.kunzisoft.keepass.database.crypto.CrsAlgorithm
-import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf
+import com.kunzisoft.encrypt.HashManager
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
 import com.kunzisoft.keepass.database.action.node.NodeHandler
+import com.kunzisoft.keepass.database.crypto.VariantDictionary
+import com.kunzisoft.keepass.database.crypto.kdf.AesKdf
+import com.kunzisoft.keepass.database.crypto.kdf.KdfFactory
+import com.kunzisoft.keepass.database.crypto.kdf.KdfParameters
 import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.exception.VersionDatabaseException
-import com.kunzisoft.keepass.stream.*
+import com.kunzisoft.keepass.stream.CopyInputStream
-import com.kunzisoft.keepass.utils.UnsignedInt
+import com.kunzisoft.keepass.utils.*
-import com.kunzisoft.keepass.utils.UnsignedLong
-import com.kunzisoft.keepass.utils.VariantDictionary
 import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.InputStream
 import java.security.DigestInputStream
-import java.security.InvalidKeyException
 import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import javax.crypto.Mac
-import javax.crypto.spec.SecretKeySpec
 
 class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader() {
     var innerRandomStreamKey: ByteArray = ByteArray(32)
@@ -140,33 +136,27 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
      */
     @Throws(IOException::class, VersionDatabaseException::class)
     fun loadFromFile(inputStream: InputStream): HeaderAndHash {
-        val messageDigest: MessageDigest
+        val messageDigest: MessageDigest = HashManager.getHash256()
-        try {
-            messageDigest = MessageDigest.getInstance("SHA-256")
-        } catch (e: NoSuchAlgorithmException) {
-            throw IOException("No SHA-256 implementation")
-        }
 
         val headerBOS = ByteArrayOutputStream()
         val copyInputStream = CopyInputStream(inputStream, headerBOS)
         val digestInputStream = DigestInputStream(copyInputStream, messageDigest)
-        val littleEndianDataInputStream = LittleEndianDataInputStream(digestInputStream)
 
-        val sig1 = littleEndianDataInputStream.readUInt()
+        val sig1 = digestInputStream.readBytes4ToUInt()
-        val sig2 = littleEndianDataInputStream.readUInt()
+        val sig2 = digestInputStream.readBytes4ToUInt()
 
         if (!matchesHeader(sig1, sig2)) {
             throw VersionDatabaseException()
         }
 
-        version = littleEndianDataInputStream.readUInt() // Erase previous value
+        version = digestInputStream.readBytes4ToUInt() // Erase previous value
         if (!validVersion(version)) {
             throw VersionDatabaseException()
         }
 
         var done = false
         while (!done) {
-            done = readHeaderField(littleEndianDataInputStream)
+            done = readHeaderField(digestInputStream)
         }
 
         val hash = messageDigest.digest()
@@ -174,13 +164,13 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
     }
 
     @Throws(IOException::class)
-    private fun readHeaderField(dis: LittleEndianDataInputStream): Boolean {
+    private fun readHeaderField(dis: InputStream): Boolean {
         val fieldID = dis.read().toByte()
 
-        val fieldSize: Int = if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong()) {
+        val fieldSize: Int = if (version.isBefore(FILE_VERSION_32_4)) {
-            dis.readUShort()
+            dis.readBytes2ToUShort()
         } else {
-            dis.readUInt().toKotlinInt()
+            dis.readBytes4ToUInt().toKotlinInt()
         }
 
         var fieldData: ByteArray? = null
@@ -204,20 +194,20 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
 
             PwDbHeaderV4Fields.MasterSeed -> masterSeed = fieldData
 
-            PwDbHeaderV4Fields.TransformSeed -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
+            PwDbHeaderV4Fields.TransformSeed -> if (version.isBefore(FILE_VERSION_32_4))
                 transformSeed = fieldData
 
-            PwDbHeaderV4Fields.TransformRounds -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
+            PwDbHeaderV4Fields.TransformRounds -> if (version.isBefore(FILE_VERSION_32_4))
                 setTransformRound(fieldData)
 
             PwDbHeaderV4Fields.EncryptionIV -> encryptionIV = fieldData
 
-            PwDbHeaderV4Fields.InnerRandomstreamKey -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
+            PwDbHeaderV4Fields.InnerRandomstreamKey -> if (version.isBefore(FILE_VERSION_32_4))
                 innerRandomStreamKey = fieldData
 
             PwDbHeaderV4Fields.StreamStartBytes -> streamStartBytes = fieldData
 
-            PwDbHeaderV4Fields.InnerRandomStreamID -> if (version.toKotlinLong() < FILE_VERSION_32_4.toKotlinLong())
+            PwDbHeaderV4Fields.InnerRandomStreamID -> if (version.isBefore(FILE_VERSION_32_4))
                 setRandomStreamID(fieldData)
 
             PwDbHeaderV4Fields.KdfParameters -> databaseV4.kdfParameters = KdfParameters.deserialize(fieldData)
@@ -244,14 +234,14 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
             throw IOException("Invalid cipher ID.")
         }
 
-        databaseV4.dataCipher = bytes16ToUuid(pbId)
+        databaseV4.cipherUuid = bytes16ToUuid(pbId)
     }
 
     private fun setTransformRound(roundsByte: ByteArray) {
         assignAesKdfEngineIfNotExists()
-        val rounds = bytes64ToLong(roundsByte)
+        val rounds = bytes64ToULong(roundsByte)
         databaseV4.kdfParameters?.setUInt64(AesKdf.PARAM_ROUNDS, rounds)
-        databaseV4.numberKeyEncryptionRounds = rounds
+        databaseV4.numberKeyEncryptionRounds = rounds.toKotlinLong()
     }
 
     @Throws(IOException::class)
@@ -323,23 +313,5 @@ class DatabaseHeaderKDBX(private val databaseV4: DatabaseKDBX) : DatabaseHeader(
         fun matchesHeader(sig1: UnsignedInt, sig2: UnsignedInt): Boolean {
             return sig1 == PWM_DBSIG_1 && (sig2 == DBSIG_PRE2 || sig2 == DBSIG_2)
         }
-
-        @Throws(IOException::class)
-        fun computeHeaderHmac(header: ByteArray, key: ByteArray): ByteArray {
-            val blockKey = HmacBlockStream.getHmacKey64(key, UnsignedLong.MAX_VALUE)
-
-            val hmac: Mac
-            try {
-                hmac = Mac.getInstance("HmacSHA256")
-                val signingKey = SecretKeySpec(blockKey, "HmacSHA256")
-                hmac.init(signingKey)
-            } catch (e: NoSuchAlgorithmException) {
-                throw IOException("No HmacAlogirthm")
-            } catch (e: InvalidKeyException) {
-                throw IOException("Invalid Hmac Key")
-            }
-
-            return hmac.doFinal(header)
-        }
     }
 }

app/src/main/java/com/kunzisoft/keepass/database/file/DateKDBXUtil.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2019 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- *  KeePassDX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePassDX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.file;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.Duration;
-
-import java.util.Date;
-
-public class DateKDBXUtil {
-    private static final DateTime dotNetEpoch = new DateTime(1, 1, 1, 0, 0, 0, DateTimeZone.UTC);
-    private static final DateTime javaEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeZone.UTC);
-
-    private static final long epochOffset;
-
-    static {
-        epochOffset = (javaEpoch.getMillis() - dotNetEpoch.getMillis()) / 1000L;
-    }
-
-    public static Date convertKDBX4Time(long seconds) {
-        DateTime dt = dotNetEpoch.plus(seconds * 1000L);
-        // Switch corrupted dates to a more recent date that won't cause issues on the client
-        if (dt.isBefore(javaEpoch)) {
-            return javaEpoch.toDate();
-        }
-        return dt.toDate();
-    }
-
-    public static long convertDateToKDBX4Time(DateTime dt) {
-        Duration duration = new Duration( javaEpoch, dt );
-        long seconds = ( duration.getMillis() / 1000L );
-        return seconds + epochOffset;
-    }
-}