From d0ccbd5526ba67f2917f2cd3432b928365e4f510 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 19 Apr 2023 16:21:47 -0400 Subject: [PATCH] Simplify a check for no-op FCM token changes --- .../textsecuregcm/controllers/AccountController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java index d4f036f08..b526b9300 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java @@ -28,6 +28,7 @@ import java.time.Instant; import java.util.ArrayList; import java.util.Base64; import java.util.HexFormat; +import java.util.Objects; import java.util.Optional; import java.util.UUID; import java.util.concurrent.CompletionException; @@ -534,10 +535,11 @@ public class AccountController { @ChangesDeviceEnabledState public void setGcmRegistrationId(@Auth DisabledPermittedAuthenticatedAccount disabledPermittedAuth, @NotNull @Valid GcmRegistrationId registrationId) { - Account account = disabledPermittedAuth.getAccount(); - Device device = disabledPermittedAuth.getAuthenticatedDevice(); - if (device.getGcmId() != null && device.getGcmId().equals(registrationId.gcmRegistrationId())) { + final Account account = disabledPermittedAuth.getAccount(); + final Device device = disabledPermittedAuth.getAuthenticatedDevice(); + + if (Objects.equals(device.getGcmId(), registrationId.gcmRegistrationId())) { return; }