This commit is contained in:
Niels Andriesse 2021-06-11 11:27:15 +10:00
parent b9a18a50b3
commit f4ae16239e
2 changed files with 1 additions and 2 deletions

View File

@ -34,7 +34,7 @@ class ClosedGroupControlMessage() : ControlMessage() {
is Kind.New -> { is Kind.New -> {
!kind.publicKey.isEmpty && kind.name.isNotEmpty() && kind.encryptionKeyPair?.publicKey != null !kind.publicKey.isEmpty && kind.name.isNotEmpty() && kind.encryptionKeyPair?.publicKey != null
&& kind.encryptionKeyPair?.privateKey != null && kind.members.isNotEmpty() && kind.admins.isNotEmpty() && kind.encryptionKeyPair?.privateKey != null && kind.members.isNotEmpty() && kind.admins.isNotEmpty()
&& kind.expireTimer >= 0 && kind.expireTimer >= 0
} }
is Kind.EncryptionKeyPair -> true is Kind.EncryptionKeyPair -> true
is Kind.NameChange -> kind.name.isNotEmpty() is Kind.NameChange -> kind.name.isNotEmpty()

View File

@ -133,7 +133,6 @@ fun MessageSender.addMembers(groupPublicKey: String, membersToAdd: List<String>)
Log.d("Loki", "Can't add members to nonexistent closed group.") Log.d("Loki", "Can't add members to nonexistent closed group.")
throw Error.NoThread throw Error.NoThread
} }
// Get expiration timer value for the group
val recipient = Recipient.from(context, fromSerialized(groupID), false) val recipient = Recipient.from(context, fromSerialized(groupID), false)
val expireTimer = recipient.expireMessages val expireTimer = recipient.expireMessages
if (membersToAdd.isEmpty()) { if (membersToAdd.isEmpty()) {