mirror of
https://github.com/signalapp/Signal-Server
synced 2026-04-20 01:18:04 +01:00
Remove spurious null checks
This commit is contained in:
committed by
Jon Chambers
parent
650bc2598b
commit
6116830da9
@@ -51,17 +51,10 @@ public class ChangeNumberManager {
|
||||
final String senderUserAgent)
|
||||
throws InterruptedException, MismatchedDevicesException, MessageTooLargeException {
|
||||
|
||||
if (!(ObjectUtils.allNotNull(pniIdentityKey, deviceSignedPreKeys, deviceMessages, pniRegistrationIds) ||
|
||||
ObjectUtils.allNull(pniIdentityKey, deviceSignedPreKeys, deviceMessages, pniRegistrationIds))) {
|
||||
throw new IllegalArgumentException("PNI identity key, signed pre-keys, device messages, and registration IDs must be all null or all non-null");
|
||||
}
|
||||
|
||||
final Account updatedAccount = accountsManager.changeNumber(
|
||||
account, number, pniIdentityKey, deviceSignedPreKeys, devicePqLastResortPreKeys, pniRegistrationIds);
|
||||
|
||||
if (deviceMessages != null) {
|
||||
sendDeviceMessages(updatedAccount, deviceMessages, senderUserAgent);
|
||||
}
|
||||
sendDeviceMessages(updatedAccount, deviceMessages, senderUserAgent);
|
||||
|
||||
return updatedAccount;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user