webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update libsignal-service

Browse source 
Fixes #1633
This commit is contained in:
AsamK 2024-11-24 12:37:42 +01:00
parent fe752e0c79
commit 68c9d84d19
8 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
View file

@ -502,6 +502,7 @@ public class AccountHelper {
account.getProfileKey(),
account.getOrCreatePinMasterKey(),
account.getOrCreateMediaRootBackupKey(),
account.getOrCreateAccountEntropyPool(),
verificationCode.getVerificationCode(),
null));
account.setMultiDevice(true);

4
lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
View file

@ -150,7 +150,9 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
ret.getAciIdentity(),
ret.getPniIdentity(),
profileKey,
ret.getMasterKey());
ret.getMasterKey(),
ret.getAccountEntropyPool(),
ret.getMediaRootBackupKey());
account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());

14
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file

@ -292,7 +292,9 @@ public class SignalAccount implements Closeable {
final IdentityKeyPair aciIdentity,
final IdentityKeyPair pniIdentity,
final ProfileKey profileKey,
final MasterKey masterKey
final MasterKey masterKey,
final AccountEntropyPool accountEntropyPool,
final MediaRootBackupKey mediaRootBackupKey
) {
this.deviceId = 0;
this.number = number;
@ -308,8 +310,14 @@ public class SignalAccount implements Closeable {
this.registered = false;
this.isMultiDevice = true;
setLastReceiveTimestamp(0L);
this.pinMasterKey = masterKey;
this.accountEntropyPool = null;
if (accountEntropyPool != null) {
this.pinMasterKey = null;
this.accountEntropyPool = accountEntropyPool;
} else {
this.pinMasterKey = masterKey;
this.accountEntropyPool = null;
}
this.mediaRootBackupKey = mediaRootBackupKey;
getKeyValueStore().storeEntry(storageManifestVersion, -1L);
this.setStorageManifest(null);
this.storageKey = null;