diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index e24ea6f6f..fdf06eef1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -50,6 +50,7 @@ import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrCha import com.kunzisoft.keepass.autofill.AutofillComponent import com.kunzisoft.keepass.autofill.AutofillHelper import com.kunzisoft.keepass.database.element.* +import com.kunzisoft.keepass.database.element.icon.IconImage import com.kunzisoft.keepass.database.element.icon.IconImageStandard import com.kunzisoft.keepass.database.element.node.Node import com.kunzisoft.keepass.database.element.node.NodeId @@ -171,9 +172,14 @@ class EntryEditActivity : LockingActivity(), val parentIcon = mParent?.icon tempEntryInfo = mDatabase?.createEntry()?.getEntryInfo(mDatabase, true) // Set default icon - if (parentIcon != null - && parentIcon.iconId != IconImageStandard.FOLDER_ID) { - tempEntryInfo?.icon = parentIcon + if (parentIcon != null) { + if (parentIcon.custom.isUnknown + && parentIcon.standard.id != IconImageStandard.FOLDER_ID) { + tempEntryInfo?.icon = IconImage(parentIcon.standard) + } + if (!parentIcon.custom.isUnknown) { + tempEntryInfo?.icon = IconImage(parentIcon.custom) + } } // Set default username tempEntryInfo?.username = mDatabase?.defaultUsername ?: "" diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt index 715b52451..17e300b2d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt @@ -31,11 +31,11 @@ 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.IconImage import com.kunzisoft.keepass.database.element.icon.IconImageStandard import com.kunzisoft.keepass.icons.IconPack import com.kunzisoft.keepass.icons.IconPackChooser @@ -134,8 +134,11 @@ class IconPickerDialogFragment : DialogFragment() { private const val KEY_ICON_STANDARD = "KEY_ICON_STANDARD" - fun getIconStandardFromBundle(bundle: Bundle): IconImageStandard? { - return bundle.getParcelable(KEY_ICON_STANDARD) + fun getIconStandardFromBundle(bundle: Bundle): IconImage? { + bundle.getParcelable(KEY_ICON_STANDARD)?.let { + return IconImage(it) + } + return null } fun launch(activity: FragmentActivity) { diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt index 4b0d92f53..c3cfd04f6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt @@ -110,10 +110,10 @@ 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, database.iconPool) } entryKDBX?.let { entryKDBX -> - (cursor as EntryCursorKDBX).populateEntry(entryKDBX, database.iconFactory) + (cursor as EntryCursorKDBX).populateEntry(entryKDBX, database.iconPool) } database.stopManageEntry(this) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt index 4007d0bdd..d8f6fc34e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt @@ -23,7 +23,8 @@ 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.IconPool import com.kunzisoft.keepass.database.element.node.NodeId import java.util.* @@ -49,12 +50,14 @@ abstract class EntryCursor> abstract fun getPwNodeId(): NodeId - open fun populateEntry(pwEntry: PwEntryV, iconFactory: IconImageFactory) { + open fun populateEntry(pwEntry: PwEntryV, iconPool: IconPool) { pwEntry.nodeId = getPwNodeId() pwEntry.title = getString(getColumnIndex(COLUMN_INDEX_TITLE)) - val iconStandard = iconFactory.getIcon(getInt(getColumnIndex(COLUMN_INDEX_ICON_STANDARD))) - pwEntry.icon = iconStandard + val iconStandard = iconPool.getIcon(getInt(getColumnIndex(COLUMN_INDEX_ICON_STANDARD))) + val iconCustom = iconPool.getIcon(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)) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt index df9eaaf8e..6debdd427 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt +++ b/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() { @@ -30,9 +29,9 @@ class EntryCursorKDB : EntryCursorUUID() { entry.id.mostSignificantBits, entry.id.leastSignificantBits, entry.title, - entry.icon.iconId, - DatabaseVersioned.UUID_ZERO.mostSignificantBits, - DatabaseVersioned.UUID_ZERO.leastSignificantBits, + entry.icon.standard.id, + entry.icon.custom.uuid.mostSignificantBits, + entry.icon.custom.uuid.leastSignificantBits, entry.username, entry.password, entry.url, diff --git a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt index 8564ca467..23bdb3d50 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt @@ -20,9 +20,7 @@ package com.kunzisoft.keepass.database.cursor import com.kunzisoft.keepass.database.element.entry.EntryKDBX -import com.kunzisoft.keepass.database.element.icon.IconImageFactory - -import java.util.UUID +import com.kunzisoft.keepass.database.element.icon.IconPool class EntryCursorKDBX : EntryCursorUUID() { @@ -34,9 +32,9 @@ class EntryCursorKDBX : EntryCursorUUID() { entry.id.mostSignificantBits, entry.id.leastSignificantBits, entry.title, - entry.icon.iconId, - entry.iconCustom.uuid.mostSignificantBits, - entry.iconCustom.uuid.leastSignificantBits, + entry.icon.standard.id, + entry.icon.custom.uuid.mostSignificantBits, + entry.icon.custom.uuid.leastSignificantBits, entry.username, entry.password, entry.url, @@ -52,14 +50,8 @@ class EntryCursorKDBX : EntryCursorUUID() { entryId++ } - override fun populateEntry(pwEntry: EntryKDBX, iconFactory: IconImageFactory) { - super.populateEntry(pwEntry, iconFactory) - - // Retrieve custom icon - 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 + override fun populateEntry(pwEntry: EntryKDBX, iconPool: IconPool) { + super.populateEntry(pwEntry, iconPool) // Retrieve extra fields if (extraFieldCursor.moveToFirst()) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt index 660ae0d16..de0f8646c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt @@ -26,7 +26,7 @@ import android.util.Log import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine import com.kunzisoft.keepass.database.action.node.NodeHandler import com.kunzisoft.keepass.database.element.database.* -import com.kunzisoft.keepass.database.element.icon.IconImageFactory +import com.kunzisoft.keepass.database.element.icon.IconPool import com.kunzisoft.keepass.database.element.node.NodeId import com.kunzisoft.keepass.database.element.node.NodeIdInt import com.kunzisoft.keepass.database.element.node.NodeIdUUID @@ -51,7 +51,6 @@ import java.security.Key import java.security.SecureRandom import java.util.* import javax.crypto.KeyGenerator -import javax.crypto.spec.IvParameterSpec import kotlin.collections.ArrayList @@ -92,9 +91,9 @@ class Database { return mDatabaseKDB?.loadedCipherKey ?: mDatabaseKDBX?.loadedCipherKey } - val iconFactory: IconImageFactory + val iconPool: IconPool get() { - return mDatabaseKDB?.iconFactory ?: mDatabaseKDBX?.iconFactory ?: IconImageFactory() + return mDatabaseKDB?.iconPool ?: mDatabaseKDBX?.iconPool ?: IconPool() } val allowName: Boolean @@ -625,6 +624,7 @@ class Database { } fun clear(filesDirectory: File? = null) { + iconPool.clearCache() drawFactory.clearCache() // Delete the cache of the database if present mDatabaseKDB?.clearCache() diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt index 56fcf7b17..f8519a65a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt @@ -109,7 +109,7 @@ class Entry : Node, EntryVersionedInterface { override var icon: IconImage get() { - return entryKDB?.icon ?: entryKDBX?.icon ?: IconImageStandard() + return entryKDB?.icon ?: entryKDBX?.icon ?: IconImage() } set(value) { entryKDB?.icon = value @@ -257,31 +257,12 @@ class Entry : Node, EntryVersionedInterface { } } - /* - ------------ - 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 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt index 3478376db..96f228ca9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt +++ b/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 @@ -124,7 +123,7 @@ class Group : Node, GroupVersionedInterface { } override var icon: IconImage - get() = groupKDB?.icon ?: groupKDBX?.icon ?: IconImageStandard() + get() = groupKDB?.icon ?: groupKDBX?.icon ?: IconImage() set(value) { groupKDB?.icon = value groupKDBX?.icon = value diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt index a72875753..dba8de58e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt @@ -24,6 +24,7 @@ import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory 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 @@ -175,6 +176,10 @@ class DatabaseKDB : DatabaseVersioned() { return false } + override fun getStandardIcon(iconId: Int): IconImageStandard { + return this.iconPool.getIcon(iconId) + } + override fun containsCustomData(): Boolean { return false } @@ -223,7 +228,7 @@ class DatabaseKDB : DatabaseVersioned() { // 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 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt index d2ebabd20..af9fbdb11 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt @@ -36,6 +36,7 @@ import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BAC 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 @@ -105,7 +106,6 @@ class DatabaseKDBX : DatabaseVersioned { var lastTopVisibleGroupUUID = UUID_ZERO var memoryProtection = MemoryProtectionConfig() val deletedObjects = ArrayList() - val customIcons = ArrayList() val customData = HashMap() var binaryPool = BinaryPool() @@ -129,7 +129,7 @@ class DatabaseKDBX : DatabaseVersioned { kdbxVersion = FILE_VERSION_32_3 val group = createGroup().apply { title = rootName - icon = iconFactory.folderIcon + icon.standard = getStandardIcon(IconImageStandard.FOLDER_ID) } rootGroup = group addGroupIndex(group) @@ -307,16 +307,20 @@ class DatabaseKDBX : DatabaseVersioned { this.dataEngine = dataEngine } - fun getCustomIcons(): List { - return customIcons + override fun getStandardIcon(iconId: Int): IconImageStandard { + return this.iconPool.getIcon(iconId) } - fun addCustomIcon(customIcon: IconImageCustom) { - this.customIcons.add(customIcon) + fun getCustomIcon(iconUuid: UUID): IconImageCustom { + return this.iconPool.getIcon(iconUuid) } - fun getCustomData(): Map { - return customData + fun putCustomIcon(customIcon: IconImageCustom) { + this.iconPool.putIcon(customIcon) + } + + fun containsCustomIcons(): Boolean { + return this.iconPool.containsCustomIcons() } fun putCustomData(label: String, value: String) { @@ -324,7 +328,7 @@ class DatabaseKDBX : DatabaseVersioned { } override fun containsCustomData(): Boolean { - return getCustomData().isNotEmpty() + return customData.isNotEmpty() } @Throws(IOException::class) @@ -550,7 +554,7 @@ class DatabaseKDBX : DatabaseVersioned { // 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 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseVersioned.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseVersioned.kt index 560d8968e..6a2084602 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseVersioned.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseVersioned.kt @@ -23,7 +23,8 @@ import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine import com.kunzisoft.keepass.database.element.Database 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.IconPool import com.kunzisoft.keepass.database.element.node.NodeId import com.kunzisoft.keepass.database.element.node.Type import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm @@ -55,8 +56,7 @@ abstract class DatabaseVersioned< var finalKey: ByteArray? = null protected set - var iconFactory = IconImageFactory() - protected set + val iconPool = IconPool() var changeDuplicateId = false @@ -329,6 +329,8 @@ abstract class DatabaseVersioned< abstract fun rootCanContainsEntry(): Boolean + abstract fun getStandardIcon(iconId: Int): IconImageStandard + abstract fun containsCustomData(): Boolean fun addGroupTo(newGroup: Group, parent: Group?) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt index c0d2da8ca..96f46254d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt @@ -21,15 +21,15 @@ 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.database.BinaryAttachment 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. @@ -68,7 +68,8 @@ class EntryKDB : EntryVersioned, 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 { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt index f6d877322..997483fd5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt @@ -26,9 +26,6 @@ import com.kunzisoft.keepass.database.element.DateInstant import com.kunzisoft.keepass.database.element.database.BinaryPool 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 @@ -48,19 +45,6 @@ class EntryKDBX : EntryVersioned, 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() var fields = LinkedHashMap() var binaries = LinkedHashMap() // Map @@ -103,7 +87,6 @@ class EntryKDBX : EntryVersioned, 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, 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, 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 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt index 8f2d99903..9e5846906 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt +++ b/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.HashMap -import java.util.UUID +import java.util.* class GroupKDBX : GroupVersioned, 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() var notes = "" @@ -77,7 +58,6 @@ class GroupKDBX : GroupVersioned, 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, 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, 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 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt index 51e19a160..ddcfd9b25 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt +++ b/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,15 +19,49 @@ */ package com.kunzisoft.keepass.database.element.icon +import android.os.Parcel import android.os.Parcelable -abstract class IconImage protected constructor() : Parcelable { +class IconImage() : Parcelable { - abstract val iconId: Int - abstract val isUnknown: Boolean - abstract val isMetaStreamIcon: Boolean + var standard: IconImageStandard = IconImageStandard() + var custom: IconImageCustom = IconImageCustom() + + 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 CREATOR : Parcelable.Creator { + override fun createFromParcel(parcel: Parcel): IconImage { + return IconImage(parcel) + } + + override fun newArray(size: Int): Array { + return arrayOfNulls(size) + } + } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt index 346e2357b..1bb36e9ec 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt +++ b/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. * @@ -22,37 +22,34 @@ package com.kunzisoft.keepass.database.element.icon import android.os.Parcel import android.os.Parcelable import com.kunzisoft.keepass.database.element.database.DatabaseVersioned -import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.KEY_ID +import java.util.* -import java.util.UUID +class IconImageCustom() : Parcelable { -class IconImageCustom : IconImage { - - val uuid: UUID + var uuid: UUID = DatabaseVersioned.UUID_ZERO @Transient var imageData: ByteArray = ByteArray(0) - constructor(uuid: UUID, data: ByteArray) : super() { + constructor(uuid: UUID, data: ByteArray) : this() { this.uuid = uuid this.imageData = data } - constructor(uuid: UUID) : super() { + constructor(uuid: UUID) : this() { this.uuid = uuid this.imageData = ByteArray(0) } - constructor(icon: IconImageCustom) : super() { - uuid = icon.uuid - imageData = icon.imageData - } - - constructor(parcel: Parcel) { + constructor(parcel: Parcel) : this() { uuid = parcel.readSerializable() as UUID // TODO Take too much memories // parcel.readByteArray(imageData); } + override fun describeContents(): Int { + return 0 + } + override fun writeToParcel(dest: Parcel, flags: Int) { dest.writeSerializable(uuid) // Too big for a parcelable dest.writeByteArray(imageData); @@ -75,17 +72,10 @@ class IconImageCustom : IconImage { return uuid == other.uuid } - override val iconId: Int - get() = KEY_ID - - override val isUnknown: Boolean - get() = this == UNKNOWN_ICON - - override val isMetaStreamIcon: Boolean - get() = false + val isUnknown: Boolean + get() = uuid == DatabaseVersioned.UUID_ZERO companion object { - val UNKNOWN_ICON = IconImageCustom(DatabaseVersioned.UUID_ZERO, ByteArray(0)) @JvmField val CREATOR: Parcelable.Creator = object : Parcelable.Creator { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt index 0e445b642..bc529b681 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt @@ -22,35 +22,37 @@ package com.kunzisoft.keepass.database.element.icon import android.os.Parcel import android.os.Parcelable -class IconImageStandard : IconImage { +class IconImageStandard : Parcelable { + + val id: Int constructor() { - this.iconId = KEY_ID + this.id = KEY_ID } constructor(iconId: Int) { if (iconId < MIN_ID || iconId > MAX_ID) - this.iconId = KEY_ID + this.id = KEY_ID else - this.iconId = iconId - } - - constructor(icon: IconImageStandard) { - this.iconId = icon.iconId + this.id = 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 } @@ -62,17 +64,9 @@ 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 < MIN_ID || iconId > MAX_ID - - override val isMetaStreamIcon: Boolean - get() = iconId == 0 - companion object { const val KEY_ID = 0 diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageFactory.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconPool.kt similarity index 52% rename from app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageFactory.kt rename to app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconPool.kt index 7dda3fa50..cc1d348c6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageFactory.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconPool.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019 Brian Pellin, Jeremy Jamet / Kunzisoft. + * Copyright 2021 Jeremy Jamet / Kunzisoft. * * This file is part of KeePassDX. * @@ -19,46 +19,26 @@ */ 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) +class IconPool { - /** standardIconMap - * Cache for icon drawable. - * Keys: UUID, Values: IconImageCustom - */ - private val customCache = ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK) - - val keyIcon: IconImageStandard - get() = getIcon(IconImageStandard.KEY_ID) - - val trashIcon: IconImageStandard - get() = getIcon(IconImageStandard.TRASH_ID) - - val folderIcon: IconImageStandard - get() = getIcon(IconImageStandard.FOLDER_ID) + private val standardCache = HashMap() + private val customCache = HashMap() fun getIcon(iconId: Int): IconImageStandard { - var icon: IconImageStandard? = cache[iconId] as IconImageStandard? + var icon: IconImageStandard? = standardCache[iconId] if (icon == null) { icon = IconImageStandard(iconId) - cache[iconId] = icon + standardCache[iconId] = icon } return icon } fun getIcon(iconUuid: UUID): IconImageCustom { - var icon: IconImageCustom? = customCache[iconUuid] as IconImageCustom? + var icon: IconImageCustom? = customCache[iconUuid] if (icon == null) { icon = IconImageCustom(iconUuid) @@ -68,7 +48,25 @@ class IconImageFactory { return icon } - fun put(icon: IconImageCustom) { + fun putIcon(icon: IconImageCustom) { customCache[icon.uuid] = icon } + + fun containsCustomIcons(): Boolean { + return customCache.isNotEmpty() + } + + fun doForEachCustomIcon(action: (customIcon: IconImageCustom) -> Unit) { + for ((_, customIcon) in customCache) { + action.invoke(customIcon!!) + } + } + + /** + * Clear the cache of icons + */ + fun clearCache() { + standardCache.clear() + customCache.clear() + } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeVersioned.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeVersioned.kt index e29e4a08a..1c87f49b3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeVersioned.kt +++ b/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 { @@ -260,7 +260,7 @@ class DatabaseInputKDB(cacheDirectory: File) } 0x0007 -> { newGroup?.let { group -> - group.icon = mDatabase.iconFactory.getIcon(cipherInputStream.readBytes4ToUInt().toKotlinInt()) + group.icon.standard = mDatabase.getStandardIcon(cipherInputStream.readBytes4ToUInt().toKotlinInt()) } ?: newEntry?.let { entry -> entry.password = cipherInputStream.readBytesToString(fieldSize,false) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt index 185af9ba6..fde034bb2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt @@ -507,9 +507,9 @@ class DatabaseInputKDBX(cacheDirectory: File) } else if (name.equals(DatabaseKDBXXML.ElemNotes, ignoreCase = true)) { ctxGroup?.notes = readString(xpp) } else if (name.equals(DatabaseKDBXXML.ElemIcon, ignoreCase = true)) { - ctxGroup?.icon = mDatabase.iconFactory.getIcon(readUInt(xpp, UnsignedInt(0)).toKotlinInt()) + ctxGroup?.icon?.standard = mDatabase.getStandardIcon(readUInt(xpp, UnsignedInt(0)).toKotlinInt()) } else if (name.equals(DatabaseKDBXXML.ElemCustomIconID, ignoreCase = true)) { - ctxGroup?.iconCustom = mDatabase.iconFactory.getIcon(readUuid(xpp)) + ctxGroup?.icon?.custom = mDatabase.getCustomIcon(readUuid(xpp)) } else if (name.equals(DatabaseKDBXXML.ElemTimes, ignoreCase = true)) { return switchContext(ctx, KdbContext.GroupTimes, xpp) } else if (name.equals(DatabaseKDBXXML.ElemIsExpanded, ignoreCase = true)) { @@ -561,9 +561,9 @@ class DatabaseInputKDBX(cacheDirectory: File) KdbContext.Entry -> if (name.equals(DatabaseKDBXXML.ElemUuid, ignoreCase = true)) { ctxEntry?.nodeId = NodeIdUUID(readUuid(xpp)) } else if (name.equals(DatabaseKDBXXML.ElemIcon, ignoreCase = true)) { - ctxEntry?.icon = mDatabase.iconFactory.getIcon(readUInt(xpp, UnsignedInt(0)).toKotlinInt()) + ctxEntry?.icon?.standard = mDatabase.getStandardIcon(readUInt(xpp, UnsignedInt(0)).toKotlinInt()) } else if (name.equals(DatabaseKDBXXML.ElemCustomIconID, ignoreCase = true)) { - ctxEntry?.iconCustom = mDatabase.iconFactory.getIcon(readUuid(xpp)) + ctxEntry?.icon?.custom = mDatabase.getCustomIcon(readUuid(xpp)) } else if (name.equals(DatabaseKDBXXML.ElemFgColor, ignoreCase = true)) { ctxEntry?.foregroundColor = readString(xpp) } else if (name.equals(DatabaseKDBXXML.ElemBgColor, ignoreCase = true)) { @@ -706,8 +706,7 @@ class DatabaseInputKDBX(cacheDirectory: File) } else if (ctx == KdbContext.CustomIcon && name.equals(DatabaseKDBXXML.ElemCustomIconItem, ignoreCase = true)) { if (customIconID != DatabaseVersioned.UUID_ZERO && customIconData != null) { val icon = IconImageCustom(customIconID, customIconData!!) - mDatabase.addCustomIcon(icon) - mDatabase.iconFactory.put(icon) + mDatabase.putCustomIcon(icon) } customIconID = DatabaseVersioned.UUID_ZERO diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt index f3d1fcf34..9944d1f48 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt @@ -35,7 +35,6 @@ import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BA import com.kunzisoft.keepass.database.element.entry.AutoType 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.node.NodeKDBXInterface import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig import com.kunzisoft.keepass.database.element.security.ProtectedString @@ -362,10 +361,10 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX, writeUuid(DatabaseKDBXXML.ElemUuid, group.id) writeObject(DatabaseKDBXXML.ElemName, group.title) writeObject(DatabaseKDBXXML.ElemNotes, group.notes) - writeObject(DatabaseKDBXXML.ElemIcon, group.icon.iconId.toLong()) + writeObject(DatabaseKDBXXML.ElemIcon, group.icon.standard.id.toLong()) - if (group.iconCustom != IconImageCustom.UNKNOWN_ICON) { - writeUuid(DatabaseKDBXXML.ElemCustomIconID, group.iconCustom.uuid) + if (!group.icon.custom.isUnknown) { + writeUuid(DatabaseKDBXXML.ElemCustomIconID, group.icon.custom.uuid) } writeTimes(group) @@ -387,10 +386,10 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX, xml.startTag(null, DatabaseKDBXXML.ElemEntry) writeUuid(DatabaseKDBXXML.ElemUuid, entry.id) - writeObject(DatabaseKDBXXML.ElemIcon, entry.icon.iconId.toLong()) + writeObject(DatabaseKDBXXML.ElemIcon, entry.icon.standard.id.toLong()) - if (entry.iconCustom != IconImageCustom.UNKNOWN_ICON) { - writeUuid(DatabaseKDBXXML.ElemCustomIconID, entry.iconCustom.uuid) + if (!entry.icon.custom.isUnknown) { + writeUuid(DatabaseKDBXXML.ElemCustomIconID, entry.icon.custom.uuid) } writeObject(DatabaseKDBXXML.ElemFgColor, entry.foregroundColor) @@ -698,16 +697,15 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX, @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class) private fun writeCustomIconList() { - val customIcons = mDatabaseKDBX.customIcons - if (customIcons.size == 0) return + if (!mDatabaseKDBX.containsCustomIcons()) return xml.startTag(null, DatabaseKDBXXML.ElemCustomIcons) - for (icon in customIcons) { + mDatabaseKDBX.iconPool.doForEachCustomIcon { customIcon -> xml.startTag(null, DatabaseKDBXXML.ElemCustomIconItem) - writeUuid(DatabaseKDBXXML.ElemCustomIconItemID, icon.uuid) - writeObject(DatabaseKDBXXML.ElemCustomIconItemData, String(Base64.encode(icon.imageData, BASE_64_FLAG))) + writeUuid(DatabaseKDBXXML.ElemCustomIconItemID, customIcon.uuid) + writeObject(DatabaseKDBXXML.ElemCustomIconItemData, String(Base64.encode(customIcon.imageData, BASE_64_FLAG))) xml.endTag(null, DatabaseKDBXXML.ElemCustomIconItem) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt index 25461e985..9da4013ad 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt @@ -53,7 +53,7 @@ class EntryOutputKDB(private val mEntry: EntryKDB, // Image ID mOutputStream.write(IMAGEID_FIELD_TYPE) mOutputStream.write(IMAGEID_FIELD_SIZE) - mOutputStream.write(uIntTo4Bytes(UnsignedInt(mEntry.icon.iconId))) + mOutputStream.write(uIntTo4Bytes(UnsignedInt(mEntry.icon.standard.id))) // Title //byte[] title = mEntry.title.getBytes("UTF-8"); diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/GroupOutputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/GroupOutputKDB.kt index 326dcf543..2eadf7ec3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/output/GroupOutputKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/output/GroupOutputKDB.kt @@ -72,7 +72,7 @@ class GroupOutputKDB(private val mGroup: GroupKDB, // Image ID mOutputStream.write(IMAGEID_FIELD_TYPE) mOutputStream.write(IMAGEID_FIELD_SIZE) - mOutputStream.write(uIntTo4Bytes(UnsignedInt(mGroup.icon.iconId))) + mOutputStream.write(uIntTo4Bytes(UnsignedInt(mGroup.icon.standard.id))) // Level mOutputStream.write(LEVEL_FIELD_TYPE) diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.kt b/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.kt index add39ee52..270d74780 100644 --- a/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.kt +++ b/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.kt @@ -38,7 +38,6 @@ import androidx.core.widget.ImageViewCompat import com.kunzisoft.keepass.R 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 org.apache.commons.collections.map.AbstractReferenceMap import org.apache.commons.collections.map.ReferenceMap @@ -110,17 +109,12 @@ class IconDrawableFactory { * Get the [SuperDrawable] [icon] (from cache, or build it and add it to the cache if not exists yet), then [tint] it with [tintColor] if needed */ fun getIconSuperDrawable(context: Context, icon: IconImage, width: Int, tint: Boolean = false, tintColor: Int = Color.WHITE): SuperDrawable { - return when (icon) { - is IconImageStandard -> { - val resId = IconPackChooser.getSelectedIconPack(context)?.iconToResId(icon.iconId) ?: R.drawable.ic_blank_32dp - getIconSuperDrawable(context, resId, width, tint, tintColor) - } - is IconImageCustom -> { - SuperDrawable(getIconDrawable(context.resources, icon)) - } - else -> { - SuperDrawable(PatternIcon(context.resources).blankDrawable) - } + return if (!icon.custom.isUnknown) { + SuperDrawable(getIconDrawable(context.resources, icon.custom)) + } else IconPackChooser.getSelectedIconPack(context)?.iconToResId(icon.standard.id)?.let { resId -> + getIconSuperDrawable(context, resId, width, tint, tintColor) + } ?: run { + SuperDrawable(PatternIcon(context.resources).blankDrawable) } } diff --git a/app/src/main/java/com/kunzisoft/keepass/model/GroupInfo.kt b/app/src/main/java/com/kunzisoft/keepass/model/GroupInfo.kt index e3c5442ba..491ed3838 100644 --- a/app/src/main/java/com/kunzisoft/keepass/model/GroupInfo.kt +++ b/app/src/main/java/com/kunzisoft/keepass/model/GroupInfo.kt @@ -10,7 +10,7 @@ class GroupInfo : NodeInfo { var notes: String? = null init { - icon = IconImageStandard(FOLDER_ID) + icon.standard = IconImageStandard(FOLDER_ID) } constructor(): super() diff --git a/app/src/main/java/com/kunzisoft/keepass/model/NodeInfo.kt b/app/src/main/java/com/kunzisoft/keepass/model/NodeInfo.kt index 9c2a1d252..731aa777a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/model/NodeInfo.kt +++ b/app/src/main/java/com/kunzisoft/keepass/model/NodeInfo.kt @@ -4,12 +4,11 @@ import android.os.Parcel import android.os.Parcelable import com.kunzisoft.keepass.database.element.DateInstant import com.kunzisoft.keepass.database.element.icon.IconImage -import com.kunzisoft.keepass.database.element.icon.IconImageStandard open class NodeInfo() : Parcelable { var title: String = "" - var icon: IconImage = IconImageStandard() + var icon: IconImage = IconImage() var creationTime: DateInstant = DateInstant() var lastModificationTime: DateInstant = DateInstant() var expires: Boolean = false