fix the crash when editing ssk groups with both adding and removing

This commit is contained in:
Ryan ZHAO 2020-10-07 14:55:05 +11:00
parent cd177ee61e
commit fd108e9d00

View File

@ -153,7 +153,7 @@ class ClosedGroupUpdateMessageSendJob private constructor(parameters: Parameters
"New" -> { "New" -> {
val name = data.getString("name") val name = data.getString("name")
val groupPrivateKey = data.getByteArray("groupPrivateKey") val groupPrivateKey = data.getByteArray("groupPrivateKey")
val senderKeys = data.getString("senderKeys").split(" - ").map { ClosedGroupSenderKey.fromJSON(it)!! } val senderKeys = data.getStringOrDefault("senderKeys","").split(" - ").mapNotNull { ClosedGroupSenderKey.fromJSON(it) } // Can be empty
val members = data.getString("members").split(" - ").map { Hex.fromStringCondensed(it) } val members = data.getString("members").split(" - ").map { Hex.fromStringCondensed(it) }
val admins = data.getString("admins").split(" - ").map { Hex.fromStringCondensed(it) } val admins = data.getString("admins").split(" - ").map { Hex.fromStringCondensed(it) }
kind = Kind.New(groupPublicKey, name, groupPrivateKey, senderKeys, members, admins) kind = Kind.New(groupPublicKey, name, groupPrivateKey, senderKeys, members, admins)