Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-08-21 14:17:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use getAccountIdentifier in device transfer context

Browse Source
This commit is contained in:
Chris Eager
2026-08-11 09:12:36 -04:00
committed by Jon Chambers
parent d69a5f1f33
commit b63f176ad7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+3 -3
View File
@@ -1524,8 +1524,8 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
}
public CompletableFuture<Optional<TransferArchiveResult>> waitForTransferArchive(final Account account, final Device device, final Duration timeout) {
final DeviceIdentifier deviceIdentifier = new DeviceIdentifier(account.getIdentifier(IdentityType.ACI), device.getId(), device.getRegistrationId(IdentityType.ACI));
final String registrationIdTransferArchiveKey = getRegistrationIdTransferArchiveKey(account.getIdentifier(IdentityType.ACI), device.getId(), device.getRegistrationId(IdentityType.ACI));
final DeviceIdentifier deviceIdentifier = new DeviceIdentifier(account.getAccountIdentifier(), device.getId(), device.getRegistrationId(IdentityType.ACI));
final String registrationIdTransferArchiveKey = getRegistrationIdTransferArchiveKey(account.getAccountIdentifier(), device.getId(), device.getRegistrationId(IdentityType.ACI));
return waitForPubSubKey(waitForTransferArchiveFuturesByDeviceIdentifier,
deviceIdentifier,
@@ -1541,7 +1541,7 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
try {
final String transferArchiveJson = SystemMapper.jsonMapper().writeValueAsString(transferArchiveResult);
final String key = getRegistrationIdTransferArchiveKey(account.getIdentifier(IdentityType.ACI), destinationDeviceId, registrationId);
final String key = getRegistrationIdTransferArchiveKey(account.getAccountIdentifier(), destinationDeviceId, registrationId);
return ResilienceUtil.getGeneralRedisRetry(RETRY_NAME)
.executeCompletionStage(retryExecutor, () -> pubSubRedisClient.withConnection(connection -> connection.async()
service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerDeviceTransferIntegrationTest.java
+4 -4
View File
@@ -97,7 +97,7 @@ public class AccountsManagerDeviceTransferIntegrationTest {
when(device.getRegistrationId(IdentityType.ACI)).thenReturn(registrationId);
final Account account = mock(Account.class);
when(account.getIdentifier(IdentityType.ACI)).thenReturn(accountIdentifier);
when(account.getAccountIdentifier()).thenReturn(accountIdentifier);
final CompletableFuture<Optional<TransferArchiveResult>> displacedFuture =
accountsManager.waitForTransferArchive(account, device, Duration.ofSeconds(5));
@@ -126,7 +126,7 @@ public class AccountsManagerDeviceTransferIntegrationTest {
when(device.getRegistrationId(IdentityType.ACI)).thenReturn(registrationId);
final Account account = mock(Account.class);
when(account.getIdentifier(IdentityType.ACI)).thenReturn(accountIdentifier);
when(account.getAccountIdentifier()).thenReturn(accountIdentifier);
accountsManager.recordTransferArchiveUpload(account, deviceId, registrationId, transferArchive).join();
@@ -148,7 +148,7 @@ public class AccountsManagerDeviceTransferIntegrationTest {
when(device.getRegistrationId(IdentityType.ACI)).thenReturn(registrationId);
final Account account = mock(Account.class);
when(account.getIdentifier(IdentityType.ACI)).thenReturn(accountIdentifier);
when(account.getAccountIdentifier()).thenReturn(accountIdentifier);
accountsManager.recordTransferArchiveUpload(account, deviceId,
registrationId, transferArchiveError).join();
@@ -165,7 +165,7 @@ public class AccountsManagerDeviceTransferIntegrationTest {
when(device.getRegistrationId(IdentityType.ACI)).thenReturn(123);
final Account account = mock(Account.class);
when(account.getIdentifier(IdentityType.ACI)).thenReturn(accountIdentifier);
when(account.getAccountIdentifier()).thenReturn(accountIdentifier);
assertEquals(Optional.empty(),
accountsManager.waitForTransferArchive(account, device, Duration.ofMillis(1)).join());