From d743454d070dbd0c9b7f703f1a4239907f41983b Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 21 Jun 2024 16:42:18 -0400
Subject: [PATCH] Store updated APNs tokens unconditionally

---
 .../textsecuregcm/controllers/AccountController.java      | 8 ++------
 1 file changed, 2 insertions(+), 6 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 2e505fa4b..3464a352b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
@@ -153,12 +153,8 @@ public class AccountController {
     final Account account = auth.getAccount();
     final Device device = auth.getAuthenticatedDevice();
 
-    if (Objects.equals(device.getApnId(), registrationId.apnRegistrationId()) &&
-        Objects.equals(device.getVoipApnId(), registrationId.voipRegistrationId())) {
-
-      return;
-    }
-
+    // Unlike FCM tokens, we need current "last updated" timestamps for APNs tokens and so update device records
+    // unconditionally
     accounts.updateDevice(account, device.getId(), d -> {
       d.setApnId(registrationId.apnRegistrationId());
       d.setVoipApnId(registrationId.voipRegistrationId());