MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert "set push token" request objects to records

This commit is contained in:
Jon Chambers 2023-04-19 16:14:55 -04:00 committed by Jon Chambers
parent 2043678739
commit 031ee57371
3 changed files with 8 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
View File

@ -537,15 +537,14 @@ public class AccountController {
Account account = disabledPermittedAuth.getAccount();
Device device = disabledPermittedAuth.getAuthenticatedDevice();
if (device.getGcmId() != null &&
device.getGcmId().equals(registrationId.getGcmRegistrationId())) {
if (device.getGcmId() != null && device.getGcmId().equals(registrationId.gcmRegistrationId())) {
return;
}
accounts.updateDevice(account, device.getId(), d -> {
d.setApnId(null);
d.setVoipApnId(null);
d.setGcmId(registrationId.getGcmRegistrationId());
d.setGcmId(registrationId.gcmRegistrationId());
d.setFetchesMessages(false);
});
}
@ -576,8 +575,8 @@ public class AccountController {
Device device = disabledPermittedAuth.getAuthenticatedDevice();
accounts.updateDevice(account, device.getId(), d -> {
d.setApnId(registrationId.getApnRegistrationId());
d.setVoipApnId(registrationId.getVoipRegistrationId());
d.setApnId(registrationId.apnRegistrationId());
d.setVoipApnId(registrationId.voipRegistrationId());
d.setGcmId(null);
d.setFetchesMessages(false);
});

29
service/src/main/java/org/whispersystems/textsecuregcm/entities/ApnRegistrationId.java
View File

@ -4,32 +4,9 @@
*/
package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import javax.annotation.Nullable;
import javax.validation.constraints.NotEmpty;
public class ApnRegistrationId {
@JsonProperty
@NotEmpty
private String apnRegistrationId;
@JsonProperty
private String voipRegistrationId;
public ApnRegistrationId() {}
@VisibleForTesting
public ApnRegistrationId(String apnRegistrationId, String voipRegistrationId) {
this.apnRegistrationId = apnRegistrationId;
this.voipRegistrationId = voipRegistrationId;
}
public String getApnRegistrationId() {
return apnRegistrationId;
}
public String getVoipRegistrationId() {
return voipRegistrationId;
}
public record ApnRegistrationId(@NotEmpty String apnRegistrationId,
@Nullable String voipRegistrationId) {
}

22
service/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java
View File

@ -4,27 +4,7 @@
*/
package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import javax.validation.constraints.NotEmpty;
public class GcmRegistrationId {
@JsonProperty
@NotEmpty
private String gcmRegistrationId;
public GcmRegistrationId() {}
@VisibleForTesting
public GcmRegistrationId(String id) {
this.gcmRegistrationId = id;
}
public String getGcmRegistrationId() {
return gcmRegistrationId;
}
public record GcmRegistrationId(@NotEmpty String gcmRegistrationId) {
}