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 iconId #901

Browse Source
This commit is contained in:
J-Jamet
2021-02-22 21:25:14 +01:00
parent fc5ffc5f62
commit 38e0433e8f
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -1,6 +1,7 @@
KeePassDX(2.9.14)
* Dark Themes (WARNING: You must reselect your theme if upgrading from an old installation) #532 #714
* Fix binary deduplication #715
* Fix IconId #901
KeePassDX(2.9.13)
* Binary image viewer #473 #749

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

@@ -50,7 +50,6 @@ 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
@@ -173,8 +172,7 @@ class EntryEditActivity : LockingActivity(),
tempEntryInfo = mDatabase?.createEntry()?.getEntryInfo(mDatabase, true)
// Set default icon
if (parentIcon != null
&& parentIcon.iconId != IconImage.UNKNOWN_ID
&& parentIcon.iconId != IconImageStandard.FOLDER) {
&& parentIcon.iconId != IconImageStandard.FOLDER_ID) {
tempEntryInfo?.icon = parentIcon
}
// Set default username

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

@@ -30,8 +30,4 @@ abstract class IconImage protected constructor() : Parcelable {
override fun describeContents(): Int {
return 0
}
companion object {
const val UNKNOWN_ID = -1
}
}

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

@@ -22,6 +22,7 @@ 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.UUID
@@ -75,7 +76,7 @@ class IconImageCustom : IconImage {
}
override val iconId: Int
get() = UNKNOWN_ID
get() = KEY_ID
override val isUnknown: Boolean
get() = this == UNKNOWN_ICON

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

@@ -37,17 +37,14 @@ class IconImageFactory {
*/
private val customCache = ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK)
val unknownIcon: IconImageStandard
get() = getIcon(IconImage.UNKNOWN_ID)
val keyIcon: IconImageStandard
get() = getIcon(IconImageStandard.KEY)
get() = getIcon(IconImageStandard.KEY_ID)
val trashIcon: IconImageStandard
get() = getIcon(IconImageStandard.TRASH)
get() = getIcon(IconImageStandard.TRASH_ID)
val folderIcon: IconImageStandard
get() = getIcon(IconImageStandard.FOLDER)
get() = getIcon(IconImageStandard.FOLDER_ID)
fun getIcon(iconId: Int): IconImageStandard {
var icon: IconImageStandard? = cache[iconId] as IconImageStandard?

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

@@ -25,10 +25,13 @@ import android.os.Parcelable
class IconImageStandard : IconImage {
constructor() {
this.iconId = KEY
this.iconId = KEY_ID
}
constructor(iconId: Int) {
if (iconId < MIN_ID || iconId > MAX_ID)
this.iconId = KEY_ID
else
this.iconId = iconId
}
@@ -65,16 +68,18 @@ class IconImageStandard : IconImage {
override val iconId: Int
override val isUnknown: Boolean
get() = iconId == UNKNOWN_ID
get() = iconId < MIN_ID || iconId > MAX_ID
override val isMetaStreamIcon: Boolean
get() = iconId == 0
companion object {
const val KEY = 0
const val TRASH = 43
const val FOLDER = 48
const val KEY_ID = 0
const val TRASH_ID = 43
const val FOLDER_ID = 48
const val MIN_ID = 0
const val MAX_ID = 48
@JvmField
val CREATOR: Parcelable.Creator<IconImageStandard> = object : Parcelable.Creator<IconImageStandard> {

4
app/src/main/java/com/kunzisoft/keepass/model/GroupInfo.kt
View File

@@ -3,14 +3,14 @@ package com.kunzisoft.keepass.model
import android.os.Parcel
import android.os.Parcelable
import com.kunzisoft.keepass.database.element.icon.IconImageStandard
import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.FOLDER
import com.kunzisoft.keepass.database.element.icon.IconImageStandard.Companion.FOLDER_ID
class GroupInfo : NodeInfo {
var notes: String? = null
init {
icon = IconImageStandard(FOLDER)
icon = IconImageStandard(FOLDER_ID)
}
constructor(): super()

1
fastlane/metadata/android/en-US/changelogs/58.txt
View File

@@ -1,2 +1,3 @@
* Dark Themes (WARNING: You must reselect your theme if upgrading from an old installation) #532 #714
* Fix binary deduplication #715
* Fix IconId #901

1
fastlane/metadata/android/fr-FR/changelogs/58.txt
View File

@@ -1,2 +1,3 @@
* Thèmes sombres (ATTENTION: Vous devez reselectionner votre theme si mise à niveau d'une ancienne installation) #532 #714
* Correction de la duplication des binaires #715
* Correction IconId #901