minor refactoring

This commit is contained in:
Ryan ZHAO 2021-02-16 10:31:26 +11:00
parent f6455253a0
commit 6dfa882803

View File

@ -275,11 +275,8 @@ fun MessageSender.sendLatestEncryptionKeyPair(publicKey: String, groupPublicKey:
return return
} }
// Get the latest encryption key pair // Get the latest encryption key pair
val encryptionKeyPair = if (pendingKeyPair[groupPublicKey] != null && pendingKeyPair[groupPublicKey]!!.isPresent) { val encryptionKeyPair = pendingKeyPair[groupPublicKey]?.orNull()
pendingKeyPair[groupPublicKey]!!.get() ?: storage.getLatestClosedGroupEncryptionKeyPair(groupPublicKey) ?: return
} else {
storage.getLatestClosedGroupEncryptionKeyPair(groupPublicKey)
} ?: return
// Send it // Send it
val proto = SignalServiceProtos.KeyPair.newBuilder() val proto = SignalServiceProtos.KeyPair.newBuilder()
proto.publicKey = ByteString.copyFrom(encryptionKeyPair.publicKey.serialize()) proto.publicKey = ByteString.copyFrom(encryptionKeyPair.publicKey.serialize())