X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d72b838560b1a4186ac121c7d605773b49fcdf46..53b84bad0280694a19e47d6f76620f8a140fdd15:/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index be628bde..2e9ae08b 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -3,82 +3,33 @@ package org.asamk.signal.dbus;
 import org.asamk.SignalControl;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.DbusConfig;
-import org.asamk.signal.commands.SignalCreator;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.UserAlreadyExists;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.PinLockedException;
 import org.freedesktop.dbus.DBusPath;
-import org.whispersystems.libsignal.util.Pair;
-import org.whispersystems.signalservice.api.KeyBackupServicePinException;
-import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
-import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
-    private final SignalCreator c;
-    private final Function<Manager, Thread> newManagerRunner;
+    private final MultiAccountManager c;
 
-    private final List<Pair<Manager, Thread>> receiveThreads = new ArrayList<>();
-    private final Object stopTrigger = new Object();
     private final String objectPath;
 
-    public DbusSignalControlImpl(
-            final SignalCreator c, final Function<Manager, Thread> newManagerRunner, final String objectPath
-    ) {
+    public DbusSignalControlImpl(final MultiAccountManager c, final String objectPath) {
         this.c = c;
-        this.newManagerRunner = newManagerRunner;
         this.objectPath = objectPath;
     }
 
-    public void addManager(Manager m) {
-        var thread = newManagerRunner.apply(m);
-        if (thread == null) {
-            return;
-        }
-        synchronized (receiveThreads) {
-            receiveThreads.add(new Pair<>(m, thread));
-        }
-    }
-
-    public void run() {
-        synchronized (stopTrigger) {
-            try {
-                stopTrigger.wait();
-            } catch (InterruptedException ignored) {
-            }
-        }
-
-        synchronized (receiveThreads) {
-            for (var t : receiveThreads) {
-                t.second().interrupt();
-            }
-        }
-        while (true) {
-            final Thread thread;
-            synchronized (receiveThreads) {
-                if (receiveThreads.size() == 0) {
-                    break;
-                }
-                var pair = receiveThreads.remove(0);
-                thread = pair.second();
-            }
-            try {
-                thread.join();
-            } catch (InterruptedException ignored) {
-            }
-        }
-    }
-
     @Override
     public boolean isRemote() {
         return false;
@@ -100,9 +51,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     public void registerWithCaptcha(
             final String number, final boolean voiceVerification, final String captcha
     ) throws Error.Failure, Error.InvalidNumber {
-        if (!PhoneNumberFormatter.isValidNumber(number, null)) {
+        if (!Manager.isValidNumber(number, null)) {
             throw new SignalControl.Error.InvalidNumber(
-                    "Invalid username (phone number), make sure you include the country code.");
+                    "Invalid account (phone number), make sure you include the country code.");
         }
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.register(voiceVerification, captcha);
@@ -124,9 +75,8 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             final String number, final String verificationCode, final String pin
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
-            final Manager manager = registrationManager.verifyAccount(verificationCode, pin);
-            addManager(manager);
-        } catch (IOException | KeyBackupSystemNoDataException | KeyBackupServicePinException e) {
+            registrationManager.verifyAccount(verificationCode, pin);
+        } catch (IOException | PinLockedException | IncorrectPinException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
     }
@@ -138,8 +88,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             final URI deviceLinkUri = provisioningManager.getDeviceLinkUri();
             new Thread(() -> {
                 try {
-                    final Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
-                    addManager(manager);
+                    provisioningManager.finishDeviceLink(newDeviceName);
                 } catch (IOException | TimeoutException | UserAlreadyExists e) {
                     e.printStackTrace();
                 }
@@ -157,12 +106,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public List<DBusPath> listAccounts() {
-        synchronized (receiveThreads) {
-            return receiveThreads.stream()
-                    .map(Pair::first)
-                    .map(Manager::getSelfNumber)
-                    .map(u -> new DBusPath(DbusConfig.getObjectPath(u)))
-                    .collect(Collectors.toList());
-        }
+        return c.getAccountNumbers()
+                .stream()
+                .map(u -> new DBusPath(DbusConfig.getObjectPath(u)))
+                .collect(Collectors.toList());
     }
 }