account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
accountPath,
number,
+ serviceEnvironmentConfig.getType(),
aci,
pni,
password,
ManagerImpl m = null;
try {
- final var accountPathFinal = accountPath;
m = new ManagerImpl(account,
pathConfig,
- (newNumber, newAci) -> accountsStore.updateAccount(accountPathFinal, newNumber, newAci),
+ new AccountFileUpdaterImpl(accountsStore, accountPath),
serviceEnvironmentConfig,
userAgent);
account = null;
try {
m.refreshPreKeys();
} catch (Exception e) {
- logger.error("Failed to refresh pre keys.");
+ logger.error("Failed to refresh pre keys.", e);
}
logger.debug("Requesting sync data");
m.requestAllSyncData();
} catch (Exception e) {
logger.error(
- "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.");
+ "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.",
+ e);
}
if (newManagerListener != null) {
}
try (signalAccount) {
- if (signalAccount.isMasterDevice()) {
- logger.debug("Account is a master device.");
+ if (signalAccount.isPrimaryDevice()) {
+ logger.debug("Account is a primary 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,
- (newNumber, newAci) -> accountsStore.updateAccount(accountPath, newNumber, newAci),
+ new AccountFileUpdaterImpl(accountsStore, accountPath),
serviceEnvironmentConfig,
userAgent);
try (m) {