From bd03d910fe2547b3cfa78debf22ebf8d06268128 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Wed, 7 Jul 2021 16:40:31 -0500
Subject: [PATCH] Set authenticated device after updating last seen

---
 .../textsecuregcm/auth/BaseAccountAuthenticator.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
index 4eb4b3da9..67efcdf70 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
@@ -82,8 +82,9 @@ public class BaseAccountAuthenticator {
 
       if (device.get().getAuthenticationCredentials().verify(basicCredentials.getPassword())) {
         succeeded = true;
-        account.get().setAuthenticatedDevice(device.get());
-        return Optional.of(updateLastSeen(account.get(), device.get()));
+        final Account authenticatedAccount = updateLastSeen(account.get(), device.get());
+        authenticatedAccount.setAuthenticatedDevice(device.get());
+        return Optional.of(authenticatedAccount);
       }
 
       return Optional.empty();