X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/656282459ccb895b59fcc59e542740ffdf44458a..55dde93811ac137741b49d3fab2483e689592038:/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
index 7519950e..7d396bb1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -136,6 +136,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
             account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
                     accountPath,
                     number,
+                    serviceEnvironmentConfig.getType(),
                     aci,
                     pni,
                     password,
@@ -209,6 +210,13 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                 logger.debug("Account is a master device.");
                 return false;
             }
+            if (signalAccount.isRegistered()
+                    && signalAccount.getServiceEnvironment() != null
+                    && signalAccount.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
+                logger.debug("Account is registered in another environment: {}.",
+                        signalAccount.getServiceEnvironment());
+                return false;
+            }
 
             final var m = new ManagerImpl(signalAccount,
                     pathConfig,