From 98760b631b5d132ababfcbad57ecb4144ee02e5b Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 27 Jul 2022 10:42:13 -0400
Subject: [PATCH] Don't wrap "change number" arguments in `Optional`

---
 .../textsecuregcm/controllers/AccountController.java        | 6 +++---
 1 file changed, 3 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 5df8d95e4..39eaefee1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
@@ -446,9 +446,9 @@ public class AccountController {
           authenticatedAccount.getAccount(),
           request.number(),
           request.pniIdentityKey(),
-          Optional.ofNullable(request.devicePniSignedPrekeys()).orElse(Collections.emptyMap()),
-          Optional.ofNullable(request.deviceMessages()).orElse(Collections.emptyList()),
-          Optional.ofNullable(request.pniRegistrationIds()).orElse(Collections.emptyMap()));
+          request.devicePniSignedPrekeys(),
+          request.deviceMessages(),
+          request.pniRegistrationIds());
 
       return new AccountIdentityResponse(
           updatedAccount.getUuid(),