Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 11:28:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert "set push token" request objects to records

Browse Source
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
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);
});