rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix recognize iconId -1

Browse Source
This commit is contained in:
J-Jamet
2021-03-10 14:51:30 +01:00
parent 063aba333c
commit 651ef04137
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ class IconImageStandard : Parcelable, IconImageDraw {
} }
constructor(iconId: Int) { constructor(iconId: Int) {
if (iconId < 0 || iconId >= NB_ICONS) if (!isCorrectIconId(iconId))
this.id = KEY_ID this.id = KEY_ID
else else
this.id = iconId this.id = iconId
@@ -78,6 +78,10 @@ class IconImageStandard : Parcelable, IconImageDraw {
const val TRASH_ID = 43 const val TRASH_ID = 43
const val FOLDER_ID = 48 const val FOLDER_ID = 48
fun isCorrectIconId(iconId: Int): Boolean {
return iconId in 0 until NB_ICONS
}
@JvmField @JvmField
val CREATOR: Parcelable.Creator<IconImageStandard> = object : Parcelable.Creator<IconImageStandard> { val CREATOR: Parcelable.Creator<IconImageStandard> = object : Parcelable.Creator<IconImageStandard> {
override fun createFromParcel(parcel: Parcel): IconImageStandard { override fun createFromParcel(parcel: Parcel): IconImageStandard {

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

@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.database.element.icon
import android.util.Log import android.util.Log
import com.kunzisoft.keepass.database.element.database.CustomIconPool import com.kunzisoft.keepass.database.element.database.CustomIconPool
import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.KEY_ID
import com.kunzisoft.keepass.icons.IconPack.Companion.NB_ICONS import com.kunzisoft.keepass.icons.IconPack.Companion.NB_ICONS
import java.io.File import java.io.File
import java.util.* import java.util.*
@@ -34,7 +35,8 @@ class IconsManager {
private val customCache = CustomIconPool() private val customCache = CustomIconPool()
fun getIcon(iconId: Int): IconImageStandard { fun getIcon(iconId: Int): IconImageStandard {
return standardCache[iconId] val searchIconId = if (IconImageStandard.isCorrectIconId(iconId)) iconId else KEY_ID
return standardCache[searchIconId]
} }
fun getStandardIconList(): List<IconImageStandard> { fun getStandardIconList(): List<IconImageStandard> {