From 7237ae6c54e4622e8f392a0d3409b6c4e5a1aad1 Mon Sep 17 00:00:00 2001
From: Jonathan Klabunde Tomer <125505367+jkt-signal@users.noreply.github.com>
Date: Thu, 24 Aug 2023 09:04:29 -0700
Subject: [PATCH] check that pq last-resort prekeys, if submitted, match device
 list

---
 .../textsecuregcm/storage/AccountsManager.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
index 510a15501..f8496b4ba 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -434,11 +434,13 @@ public class AccountsManager {
         Collections.emptySet());
 
     // Check that all including master ID are in Pq pre-keys
-    DestinationDeviceValidator.validateCompleteDeviceList(
-        account,
-        pniSignedPreKeys.keySet(),
-        Collections.emptySet());
-
+    if (pniPqLastResortPreKeys != null) {
+      DestinationDeviceValidator.validateCompleteDeviceList(
+          account,
+          pniPqLastResortPreKeys.keySet(),
+          Collections.emptySet());
+    }
+    
     // Check that all devices are accounted for in the map of new PNI registration IDs
     DestinationDeviceValidator.validateCompleteDeviceList(
         account,