Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 09:47:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Assume that PNI registration IDs are always present on Device records

Browse Source
This commit is contained in:
Jon Chambers
2025-05-02 12:28:55 -04:00
committed by Jon Chambers
parent 93ba6616d1
commit 13fc0ffbca
9 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
View File

@@ -383,7 +383,7 @@ public class KeysController {
if (signedEcPreKey != null || unsignedEcPreKey != null || pqPreKey != null) {
final int registrationId = switch (targetIdentifier.identityType()) {
case ACI -> device.getRegistrationId();
case PNI -> device.getPhoneNumberIdentityRegistrationId().orElse(device.getRegistrationId());
case PNI -> device.getPhoneNumberIdentityRegistrationId();
};
responseItems.add(

2
service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java
View File

@@ -321,7 +321,7 @@ public class MessageSender {
final int expectedRegistrationId = switch (serviceIdentifier.identityType()) {
case ACI -> device.getRegistrationId();
case PNI -> device.getPhoneNumberIdentityRegistrationId().orElseGet(device::getRegistrationId);
case PNI -> device.getPhoneNumberIdentityRegistrationId();
};
return registrationId != expectedRegistrationId;

2
service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
View File

@@ -63,7 +63,7 @@ public class ReceiptSender {
final Map<Byte, Integer> registrationIdsByDeviceId = destinationAccount.getDevices().stream()
.collect(Collectors.toMap(Device::getId, device -> switch (destinationIdentifier.identityType()) {
case ACI -> device.getRegistrationId();
case PNI -> device.getPhoneNumberIdentityRegistrationId().orElseGet(device::getRegistrationId);
case PNI -> device.getPhoneNumberIdentityRegistrationId();
}));
try {

7
service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
View File

@@ -64,9 +64,8 @@ public class Device {
@JsonProperty
private int registrationId;
@Nullable
@JsonProperty("pniRegistrationId")
private Integer phoneNumberIdentityRegistrationId;
private int phoneNumberIdentityRegistrationId;
@JsonProperty
private long lastSeen;
@@ -216,8 +215,8 @@ public class Device {
this.registrationId = registrationId;
}
public OptionalInt getPhoneNumberIdentityRegistrationId() {
return phoneNumberIdentityRegistrationId != null ? OptionalInt.of(phoneNumberIdentityRegistrationId) : OptionalInt.empty();
public int getPhoneNumberIdentityRegistrationId() {
return phoneNumberIdentityRegistrationId;
}
public void setPhoneNumberIdentityRegistrationId(final int phoneNumberIdentityRegistrationId) {