From 29eec05f8f4394b4ecfa3668be4f15390ca0795a Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 9 Sep 2019 13:35:29 +0200 Subject: [PATCH] Fix warning with parcelable --- .../keepass/database/element/AutoType.kt | 2 +- .../database/element/GroupVersioned.kt | 4 +-- .../keepass/database/element/PwEntryV3.kt | 10 +++---- .../keepass/database/element/PwEntryV4.kt | 26 +++++++++---------- .../keepass/database/element/PwGroup.kt | 2 +- .../keepass/database/element/PwGroupV4.kt | 16 ++++++------ .../keepass/database/element/PwNode.kt | 12 ++++----- .../keepass/database/file/load/ImporterV4.kt | 6 ++--- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/AutoType.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/AutoType.kt index d547ff053..8c4910acf 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/AutoType.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/AutoType.kt @@ -47,7 +47,7 @@ class AutoType : Parcelable { constructor(parcel: Parcel) { this.enabled = parcel.readByte().toInt() != 0 this.obfuscationOptions = parcel.readLong() - this.defaultSequence = parcel.readString() + this.defaultSequence = parcel.readString() ?: defaultSequence this.windowSeqPairs = MemoryUtil.readStringParcelableMap(parcel) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt index 3673e9cfb..607cfd930 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/GroupVersioned.kt @@ -292,11 +292,11 @@ class GroupVersioned : NodeVersioned, PwGroupInterface { constructor() : super() constructor(parcel: Parcel) : super(parcel) { - title = parcel.readString() - username = parcel.readString() + title = parcel.readString() ?: title + username = parcel.readString() ?: username parcel.readByteArray(passwordBytes) - url = parcel.readString() - notes = parcel.readString() - binaryDesc = parcel.readString() + url = parcel.readString() ?: url + notes = parcel.readString() ?: notes + binaryDesc = parcel.readString() ?: binaryDesc parcel.readByteArray(binaryData) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwEntryV4.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwEntryV4.kt index 389114c0c..c4d19d321 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwEntryV4.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwEntryV4.kt @@ -36,10 +36,10 @@ class PwEntryV4 : PwEntry, NodeV4Interface { override var icon: PwIcon get() { - return if (iconCustom.isUnknown) - super.icon - else - iconCustom + return when { + iconCustom.isUnknown -> super.icon + else -> iconCustom + } } set(value) { if (value is PwIconStandard) @@ -91,20 +91,20 @@ class PwEntryV4 : PwEntry, NodeV4Interface { constructor() : super() constructor(parcel: Parcel) : super(parcel) { - iconCustom = parcel.readParcelable(PwIconCustom::class.java.classLoader) + iconCustom = parcel.readParcelable(PwIconCustom::class.java.classLoader) ?: iconCustom usageCount = parcel.readLong() - locationChanged = parcel.readParcelable(PwDate::class.java.classLoader) + locationChanged = parcel.readParcelable(PwDate::class.java.classLoader) ?: locationChanged customData = MemoryUtil.readStringParcelableMap(parcel) fields = MemoryUtil.readStringParcelableMap(parcel, ProtectedString::class.java) // TODO binaries = MemoryUtil.readStringParcelableMap(parcel, ProtectedBinary.class); - foregroundColor = parcel.readString() - backgroundColor = parcel.readString() - overrideURL = parcel.readString() - autoType = parcel.readParcelable(AutoType::class.java.classLoader) + foregroundColor = parcel.readString() ?: foregroundColor + backgroundColor = parcel.readString() ?: backgroundColor + overrideURL = parcel.readString() ?: overrideURL + autoType = parcel.readParcelable(AutoType::class.java.classLoader) ?: autoType parcel.readTypedList(history, CREATOR) - url = parcel.readString() - additional = parcel.readString() - tags = parcel.readString() + url = parcel.readString() ?: url + additional = parcel.readString() ?: additional + tags = parcel.readString() ?: tags } override fun writeToParcel(dest: Parcel, flags: Int) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroup.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroup.kt index 8153fd75b..b696a145e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroup.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroup.kt @@ -19,7 +19,7 @@ abstract class PwGroup constructor() : super() constructor(parcel: Parcel) : super(parcel) { - titleGroup = parcel.readString() + titleGroup = parcel.readString() ?: titleGroup } override fun writeToParcel(dest: Parcel, flags: Int) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupV4.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupV4.kt index f0f54b726..35ea8b9f3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupV4.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwGroupV4.kt @@ -45,8 +45,8 @@ class PwGroupV4 : PwGroup, NodeV4Interface { var notes = "" var isExpanded = true var defaultAutoTypeSequence = "" - var enableAutoType: Boolean? = null - var enableSearching: Boolean? = null + var enableAutoType: Boolean = true + var enableSearching: Boolean = true var lastTopVisibleEntry: UUID = PwDatabase.UUID_ZERO override val type: Type @@ -63,13 +63,13 @@ class PwGroupV4 : PwGroup, NodeV4Interface { constructor() : super() constructor(parcel: Parcel) : super(parcel) { - iconCustom = parcel.readParcelable(PwIconCustom::class.java.classLoader) + iconCustom = parcel.readParcelable(PwIconCustom::class.java.classLoader) ?: iconCustom usageCount = parcel.readLong() - locationChanged = parcel.readParcelable(PwDate::class.java.classLoader) + locationChanged = parcel.readParcelable(PwDate::class.java.classLoader) ?: locationChanged // TODO customData = MemoryUtil.readStringParcelableMap(in); - notes = parcel.readString() + notes = parcel.readString() ?: notes isExpanded = parcel.readByte().toInt() != 0 - defaultAutoTypeSequence = parcel.readString() + defaultAutoTypeSequence = parcel.readString() ?: defaultAutoTypeSequence enableAutoType = parcel.readByte().toInt() != 0 enableSearching = parcel.readByte().toInt() != 0 lastTopVisibleEntry = parcel.readSerializable() as UUID @@ -92,8 +92,8 @@ class PwGroupV4 : PwGroup, NodeV4Interface { dest.writeString(notes) dest.writeByte((if (isExpanded) 1 else 0).toByte()) dest.writeString(defaultAutoTypeSequence) - dest.writeByte((if (enableAutoType == null) -1 else if (enableAutoType!!) 1 else 0).toByte()) - dest.writeByte((if (enableSearching == null) -1 else if (enableSearching!!) 1 else 0).toByte()) + dest.writeByte((if (enableAutoType) 1 else 0).toByte()) + dest.writeByte((if (enableSearching) 1 else 0).toByte()) dest.writeSerializable(lastTopVisibleEntry) } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/PwNode.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/PwNode.kt index 152b3abe4..3cf796319 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/PwNode.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/PwNode.kt @@ -37,13 +37,13 @@ abstract class PwNode, Entry : protected constructor() protected constructor(parcel: Parcel) { - this.nodeId = parcel.readParcelable(PwNodeId::class.java.classLoader) + this.nodeId = parcel.readParcelable(PwNodeId::class.java.classLoader) ?: nodeId this.parent = this.readParentParcelable(parcel) - this.icon = parcel.readParcelable(PwIcon::class.java.classLoader) - this.creationTime = parcel.readParcelable(PwDate::class.java.classLoader) - this.lastModificationTime = parcel.readParcelable(PwDate::class.java.classLoader) - this.lastAccessTime = parcel.readParcelable(PwDate::class.java.classLoader) - this.expiryTime = parcel.readParcelable(PwDate::class.java.classLoader) + this.icon = parcel.readParcelable(PwIcon::class.java.classLoader) ?: icon + this.creationTime = parcel.readParcelable(PwDate::class.java.classLoader) ?: creationTime + this.lastModificationTime = parcel.readParcelable(PwDate::class.java.classLoader) ?: lastModificationTime + this.lastAccessTime = parcel.readParcelable(PwDate::class.java.classLoader) ?: lastAccessTime + this.expiryTime = parcel.readParcelable(PwDate::class.java.classLoader) ?: expiryTime } override fun writeToParcel(dest: Parcel, flags: Int) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt index 2e2a98167..c51a4fb8b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt @@ -1033,9 +1033,9 @@ class ImporterV4(private val streamDir: File) : Importer() { } - private fun stringToBoolean(str: String?): Boolean? { + private fun stringToBoolean(str: String?): Boolean { if (str == null || str.isEmpty()) { - return null + return false } val trimmed = str.trim { it <= ' ' } @@ -1045,7 +1045,7 @@ class ImporterV4(private val streamDir: File) : Importer() { return false } - return null + return false } companion object {