Skip to content

Commit 21c1d71

Browse files
jkt-signaleager-signal
authored andcommittedApr 25, 2025
take advantage of list non-nullitude
1 parent 38befdb commit 21c1d71

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed
 

‎service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public CompletableFuture<Response> setKeys(
152152

153153
final List<CompletableFuture<Void>> storeFutures = new ArrayList<>(4);
154154

155-
if (setKeysRequest.preKeys() != null && !setKeysRequest.preKeys().isEmpty()) {
155+
if (!setKeysRequest.preKeys().isEmpty()) {
156156
Metrics.counter(STORE_KEYS_COUNTER_NAME,
157157
Tags.of(platformTag, primaryDeviceTag, identityTypeTag, Tag.of(KEY_TYPE_TAG_NAME, "ec")))
158158
.increment();
@@ -168,7 +168,7 @@ public CompletableFuture<Response> setKeys(
168168
storeFutures.add(keysManager.storeEcSignedPreKeys(identifier, device.getId(), setKeysRequest.signedPreKey()));
169169
}
170170

171-
if (setKeysRequest.pqPreKeys() != null && !setKeysRequest.pqPreKeys().isEmpty()) {
171+
if (!setKeysRequest.pqPreKeys().isEmpty()) {
172172
Metrics.counter(STORE_KEYS_COUNTER_NAME,
173173
Tags.of(platformTag, primaryDeviceTag, identityTypeTag, Tag.of(KEY_TYPE_TAG_NAME, "kyber")))
174174
.increment();
@@ -192,11 +192,7 @@ private void checkSignedPreKeySignatures(final SetKeysRequest setKeysRequest,
192192
final IdentityKey identityKey,
193193
@Nullable final String userAgent) {
194194

195-
final List<SignedPreKey<?>> signedPreKeys = new ArrayList<>();
196-
197-
if (setKeysRequest.pqPreKeys() != null) {
198-
signedPreKeys.addAll(setKeysRequest.pqPreKeys());
199-
}
195+
final List<SignedPreKey<?>> signedPreKeys = new ArrayList<>(setKeysRequest.pqPreKeys());
200196

201197
if (setKeysRequest.pqLastResortPreKey() != null) {
202198
signedPreKeys.add(setKeysRequest.pqLastResortPreKey());

0 commit comments

Comments
 (0)