From 37a4e8a4aa3bc7c32837031bc21000a934bf352d Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 17 Jan 2019 10:37:37 -0800 Subject: [PATCH] No longer need to overload fetchesMessages --- .../textsecuregcm/controllers/AccountController.java | 6 ++---- .../textsecuregcm/entities/GcmRegistrationId.java | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java index 29d14d3f2..14d17bc1a 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java +++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java @@ -282,9 +282,7 @@ public class AccountController { device.setApnId(null); device.setVoipApnId(null); device.setGcmId(registrationId.getGcmRegistrationId()); - - if (registrationId.isWebSocketChannel()) device.setFetchesMessages(true); - else device.setFetchesMessages(false); + device.setFetchesMessages(false); accounts.update(account); @@ -319,7 +317,7 @@ public class AccountController { device.setApnId(registrationId.getApnRegistrationId()); device.setVoipApnId(registrationId.getVoipRegistrationId()); device.setGcmId(null); - device.setFetchesMessages(true); + device.setFetchesMessages(false); accounts.update(account); if (!wasAccountActive && account.isActive()) { diff --git a/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java b/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java index d7b4e2f65..dc1dfec01 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java +++ b/src/main/java/org/whispersystems/textsecuregcm/entities/GcmRegistrationId.java @@ -25,15 +25,9 @@ public class GcmRegistrationId { @NotEmpty private String gcmRegistrationId; - @JsonProperty - private boolean webSocketChannel; - public String getGcmRegistrationId() { return gcmRegistrationId; } - public boolean isWebSocketChannel() { - return webSocketChannel; - } }