From 64436bc9abf1dec634f5fab3fa51b8aeb098bf58 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 4 Apr 2023 11:43:50 +0200
Subject: [PATCH] Refresh username after registering

---
 .../main/java/org/asamk/signal/manager/ManagerImpl.java    | 4 ++++
 .../org/asamk/signal/manager/RegistrationManagerImpl.java  | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 451adb59..1dbd9bc6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -292,6 +292,10 @@ class ManagerImpl implements Manager {
         context.getSyncHelper().sendSyncFetchProfileMessage();
     }
 
+    void refreshCurrentUsername() throws IOException, BaseUsernameException {
+        context.getAccountHelper().refreshCurrentUsername();
+    }
+
     @Override
     public String setUsername(final String username) throws IOException, InvalidUsernameException {
         try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
index f5bff4d2..2951f1a7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
@@ -29,6 +29,7 @@ import org.asamk.signal.manager.helper.PinHelper;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
@@ -163,6 +164,12 @@ class RegistrationManagerImpl implements RegistrationManager {
                 logger.warn("Failed to set default profile: {}", e.getMessage());
             }
 
+            try {
+                m.refreshCurrentUsername();
+            } catch (IOException | BaseUsernameException e) {
+                logger.warn("Failed to refresh current username", e);
+            }
+
             if (newManagerListener != null) {
                 newManagerListener.accept(m);
                 m = null;
-- 
2.50.1