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

just set OWA,OWP,OWI user agents upon token deletion

This commit is contained in:
Brian Acton 2021-02-12 09:00:46 -08:00 committed by Jon Chambers
parent 8fc6f9c442
commit d6319aeb92
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,6 +351,7 @@ public class AccountController {
Device device = account.getAuthenticatedDevice().get(); Device device = account.getAuthenticatedDevice().get();
device.setGcmId(null); device.setGcmId(null);
device.setFetchesMessages(false); device.setFetchesMessages(false);
device.setUserAgent("OWA");
accounts.update(account); accounts.update(account);
directoryQueue.refreshRegisteredUser(account); directoryQueue.refreshRegisteredUser(account);
@ -384,6 +385,11 @@ public class AccountController {
Device device = account.getAuthenticatedDevice().get(); Device device = account.getAuthenticatedDevice().get();
device.setApnId(null); device.setApnId(null);
device.setFetchesMessages(false); device.setFetchesMessages(false);
if (device.getId() == 1) {
device.setUserAgent("OWI");
} else {
device.setUserAgent("OWP");
}
accounts.update(account); accounts.update(account);
directoryQueue.refreshRegisteredUser(account); directoryQueue.refreshRegisteredUser(account);

18
service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
View File

@ -49,19 +49,15 @@ public class PushFeedbackProcessor extends AccountDatabaseCrawlerListener {
device.getUninstalledFeedbackTimestamp() + TimeUnit.DAYS.toMillis(2) <= Util.todayInMillis()) device.getUninstalledFeedbackTimestamp() + TimeUnit.DAYS.toMillis(2) <= Util.todayInMillis())
{ {
if (device.getLastSeen() + TimeUnit.DAYS.toMillis(2) <= Util.todayInMillis()) { if (device.getLastSeen() + TimeUnit.DAYS.toMillis(2) <= Util.todayInMillis()) {
String type = "unknown"; if (!Util.isEmpty(device.getApnId())) {
if (!Util.isEmpty(device.getApnId()) && device.getId() == 1) { if (device.getId() == 1) {
type = "iPhone"; device.setUserAgent("OWI");
} else if (!Util.isEmpty(device.getApnId()) && device.getId() != 1) { } else {
type = "iPad"; device.setUserAgent("OWP");
}
} else if (!Util.isEmpty(device.getGcmId())) { } else if (!Util.isEmpty(device.getGcmId())) {
type = "Android"; device.setUserAgent("OWA");
} else if (device.getFetchesMessages() && "OWA".equals(device.getUserAgent())) {
type = "Android Tweaker";
} else if (device.getFetchesMessages()) {
type = "Desktop";
} }
device.setUserAgent(type);
device.setGcmId(null); device.setGcmId(null);
device.setApnId(null); device.setApnId(null);
device.setVoipApnId(null); device.setVoipApnId(null);