From 4dda7582a37833c0aa63fc09674f7f27d4091fab Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 11 Jul 2026 18:44:39 +0200
Subject: [PATCH] Add getSelfACI to manager

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java      | 2 ++
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java  | 5 +++++
 src/main/java/org/asamk/Signal.java                          | 2 ++
 src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java     | 5 +++++
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java      | 5 +++++
 src/test/java/org/asamk/signal/http/SseInitialFlushTest.java | 5 +++++
 .../org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java    | 5 +++++
 7 files changed, 29 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 4c625e79..b2baf2f4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -91,6 +91,8 @@ public interface Manager extends Closeable {
 
     String getSelfNumber();
 
+    String getSelfACI();
+
     /**
      * This is used for checking a set of phone numbers for registration on Signal
      *
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index bbfd9106..f76277a3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -247,6 +247,11 @@ public class ManagerImpl implements Manager {
         return account.getNumber();
     }
 
+    @Override
+    public String getSelfACI() {
+        return account.getAci().toString();
+    }
+
     public void checkAccountState() throws IOException {
         context.getAccountHelper().checkAccountState();
         final var lastRecipientsRefresh = account.getLastRecipientsRefresh();
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 6e1972d6..d127d693 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -22,6 +22,8 @@ public interface Signal extends DBusInterface {
 
     String getSelfNumber();
 
+    String getSelfACI();
+
     void subscribeReceive();
 
     void unsubscribeReceive();
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 3de99600..8e50356f 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -113,6 +113,11 @@ public class DbusManagerImpl implements Manager {
         return signal.getSelfNumber();
     }
 
+    @Override
+    public String getSelfACI() {
+        return signal.getSelfACI();
+    }
+
     @Override
     public Map<String, UserStatus> getUserStatus(final Set<String> numbers) throws IOException {
         final var numbersList = new ArrayList<>(numbers);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index a9983caa..f975f5f0 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -141,6 +141,11 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
         return m.getSelfNumber();
     }
 
+    @Override
+    public String getSelfACI() {
+        return m.getSelfACI();
+    }
+
     @Override
     public void subscribeReceive() {
         if (dbusMessageHandler == null) {
diff --git a/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java b/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java
index 6f029696..042a0cf6 100644
--- a/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java
+++ b/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java
@@ -123,6 +123,11 @@ class SseInitialFlushTest {
             return "+10000000000";
         }
 
+        @Override
+        public String getSelfACI() {
+            return "00000000-0000-0000-0000-000000000000";
+        }
+
         @Override
         public void addReceiveHandler(ReceiveMessageHandler handler, boolean isWeakListener) {
             // no-op
diff --git a/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java b/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java
index 50836cac..d468fafe 100644
--- a/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java
+++ b/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java
@@ -120,6 +120,11 @@ class SubscribeCallEventsTest {
             return selfNumber;
         }
 
+        @Override
+        public String getSelfACI() {
+            return "00000000-0000-0000-0000-000000000000";
+        }
+
         // --- Stubs for remaining Manager interface methods ---
         @Override
         public Map<String, UserStatus> getUserStatus(Set<String> n) {