package org.asamk.signal.manager;
-import org.asamk.signal.manager.config.ServiceEnvironment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
-public class MultiAccountManagerImpl implements MultiAccountManager {
+class MultiAccountManagerImpl implements MultiAccountManager {
private final static Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
private final Set<Manager> managers = new HashSet<>();
private final Map<URI, ProvisioningManager> provisioningManagers = new HashMap<>();
- private final File dataPath;
- private final ServiceEnvironment serviceEnvironment;
- private final String userAgent;
-
- public MultiAccountManagerImpl(
- final Collection<Manager> managers,
- final File dataPath,
- final ServiceEnvironment serviceEnvironment,
- final String userAgent
- ) {
+ private final SignalAccountFiles signalAccountFiles;
+
+ public MultiAccountManagerImpl(final Collection<Manager> managers, final SignalAccountFiles signalAccountFiles) {
+ this.signalAccountFiles = signalAccountFiles;
this.managers.addAll(managers);
managers.forEach(m -> m.addClosedListener(() -> this.removeManager(m)));
- this.dataPath = dataPath;
- this.serviceEnvironment = serviceEnvironment;
- this.userAgent = userAgent;
}
@Override
}
}
+ @Override
+ public List<Manager> getManagers() {
+ synchronized (managers) {
+ return new ArrayList<>(managers);
+ }
+ }
+
void addManager(final Manager m) {
synchronized (managers) {
if (managers.contains(m)) {
}
@Override
- public Manager getManager(final String account) {
+ public Manager getManager(final String number) {
synchronized (managers) {
- return managers.stream().filter(m -> m.getSelfNumber().equals(account)).findFirst().orElse(null);
+ return managers.stream().filter(m -> m.getSelfNumber().equals(number)).findFirst().orElse(null);
}
}
}
private ProvisioningManager getNewProvisioningManager() {
- return ProvisioningManager.init(dataPath, serviceEnvironment, userAgent, this::addManager);
+ return signalAccountFiles.initProvisioningManager(this::addManager);
}
@Override
- public RegistrationManager getNewRegistrationManager(String account) throws IOException {
- return RegistrationManager.init(account, dataPath, serviceEnvironment, userAgent, this::addManager);
+ public RegistrationManager getNewRegistrationManager(String number) throws IOException {
+ return signalAccountFiles.initRegistrationManager(number, this::addManager);
}
@Override