fix: replace Enum.values()
with Enum.entries
This commit is contained in:
parent
14cc25af14
commit
7475f2fb13
5 changed files with 6 additions and 6 deletions
|
@ -117,7 +117,7 @@ enum class DirectoryStructure(val value: String) {
|
||||||
|
|
||||||
val DEFAULT = FileBased
|
val DEFAULT = FileBased
|
||||||
|
|
||||||
private val reverseMap = values().associateBy { it.value }
|
private val reverseMap = entries.associateBy { it.value }
|
||||||
|
|
||||||
fun fromValue(value: String?) = if (value != null) reverseMap[value] ?: DEFAULT else DEFAULT
|
fun fromValue(value: String?) = if (value != null) reverseMap[value] ?: DEFAULT else DEFAULT
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,7 +140,7 @@ object SshKey {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
fun fromValue(value: String?): Type? = values().associateBy { it.value }[value]
|
fun fromValue(value: String?): Type? = entries.associateBy { it.value }[value]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class AutocryptPeerUpdate() : Parcelable {
|
||||||
private constructor(source: Parcel, version: Int) : this() {
|
private constructor(source: Parcel, version: Int) : this() {
|
||||||
keyData = source.createByteArray()
|
keyData = source.createByteArray()
|
||||||
effectiveDate = if (source.readInt() != 0) Date(source.readLong()) else null
|
effectiveDate = if (source.readInt() != 0) Date(source.readLong()) else null
|
||||||
preferEncrypt = PreferEncrypt.values()[source.readInt()]
|
preferEncrypt = PreferEncrypt.entries[source.readInt()]
|
||||||
}
|
}
|
||||||
|
|
||||||
public fun createAutocryptPeerUpdate(keyData: ByteArray?, timestamp: Date?): AutocryptPeerUpdate {
|
public fun createAutocryptPeerUpdate(keyData: ByteArray?, timestamp: Date?): AutocryptPeerUpdate {
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class OpenPgpSignatureResult : Parcelable {
|
||||||
// backward compatibility for this exact version
|
// backward compatibility for this exact version
|
||||||
if (version > 2) {
|
if (version > 2) {
|
||||||
senderStatusResult =
|
senderStatusResult =
|
||||||
readEnumWithNullAndFallback(source, SenderStatusResult.values(), SenderStatusResult.UNKNOWN)
|
readEnumWithNullAndFallback(source, SenderStatusResult.entries, SenderStatusResult.UNKNOWN)
|
||||||
confirmedUserIds = source.createStringArrayList()
|
confirmedUserIds = source.createStringArrayList()
|
||||||
} else {
|
} else {
|
||||||
senderStatusResult = SenderStatusResult.UNKNOWN
|
senderStatusResult = SenderStatusResult.UNKNOWN
|
||||||
|
@ -74,7 +74,7 @@ public class OpenPgpSignatureResult : Parcelable {
|
||||||
}
|
}
|
||||||
autocryptPeerentityResult =
|
autocryptPeerentityResult =
|
||||||
if (version > 4) {
|
if (version > 4) {
|
||||||
readEnumWithNullAndFallback(source, AutocryptPeerResult.values(), null)
|
readEnumWithNullAndFallback(source, AutocryptPeerResult.entries, null)
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,6 @@ public enum class SSHKeyType(internal val value: String) {
|
||||||
|
|
||||||
public companion object {
|
public companion object {
|
||||||
|
|
||||||
public fun fromValue(type: String?): SSHKeyType? = values().associateBy { it.value }[type]
|
public fun fromValue(type: String?): SSHKeyType? = entries.associateBy { it.value }[type]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue