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

No longer need to overload fetchesMessages

This commit is contained in:
Moxie Marlinspike 2019-01-17 10:37:37 -08:00
parent 3776292278
commit 37a4e8a4aa
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,9 +282,7 @@ public class AccountController {
device.setApnId(null); device.setApnId(null);
device.setVoipApnId(null); device.setVoipApnId(null);
device.setGcmId(registrationId.getGcmRegistrationId()); device.setGcmId(registrationId.getGcmRegistrationId());
device.setFetchesMessages(false);
if (registrationId.isWebSocketChannel()) device.setFetchesMessages(true);
else device.setFetchesMessages(false);
accounts.update(account); accounts.update(account);
@ -319,7 +317,7 @@ public class AccountController {
device.setApnId(registrationId.getApnRegistrationId()); device.setApnId(registrationId.getApnRegistrationId());
device.setVoipApnId(registrationId.getVoipRegistrationId()); device.setVoipApnId(registrationId.getVoipRegistrationId());
device.setGcmId(null); device.setGcmId(null);
device.setFetchesMessages(true); device.setFetchesMessages(false);
accounts.update(account); accounts.update(account);
if (!wasAccountActive && account.isActive()) { if (!wasAccountActive && account.isActive()) {

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

@ -25,15 +25,9 @@ public class GcmRegistrationId {
@NotEmpty @NotEmpty
private String gcmRegistrationId; private String gcmRegistrationId;
@JsonProperty
private boolean webSocketChannel;
public String getGcmRegistrationId() { public String getGcmRegistrationId() {
return gcmRegistrationId; return gcmRegistrationId;
} }
public boolean isWebSocketChannel() {
return webSocketChannel;
}
} }