Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-22 06:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

replicate uuids to contact discovery

Browse Source
This commit is contained in:
Jeffrey Griffin
2019-06-29 08:26:18 -07:00
committed by Moxie Marlinspike
parent 7a3a385569
commit 07822b371f
12 changed files with 59 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@ public class AccountController {
accounts.update(account);
if (!wasAccountEnabled && account.isEnabled()) {
directoryQueue.addRegisteredUser(account.getNumber());
directoryQueue.addRegisteredUser(account.getUuid(), account.getNumber());
}
}
@@ -373,7 +373,7 @@ public class AccountController {
accounts.update(account);
if (!account.isEnabled()) {
directoryQueue.deleteRegisteredUser(account.getNumber());
directoryQueue.deleteRegisteredUser(account.getUuid(), account.getNumber());
}
}
@@ -393,7 +393,7 @@ public class AccountController {
accounts.update(account);
if (!wasAccountEnabled && account.isEnabled()) {
directoryQueue.addRegisteredUser(account.getNumber());
directoryQueue.addRegisteredUser(account.getUuid(), account.getNumber());
}
}
@@ -409,7 +409,7 @@ public class AccountController {
accounts.update(account);
if (!account.isEnabled()) {
directoryQueue.deleteRegisteredUser(account.getNumber());
directoryQueue.deleteRegisteredUser(account.getUuid(), account.getNumber());
}
}
@@ -617,9 +617,9 @@ public class AccountController {
}
if (account.isEnabled()) {
directoryQueue.addRegisteredUser(number);
directoryQueue.addRegisteredUser(account.getUuid(), number);
} else {
directoryQueue.deleteRegisteredUser(number);
directoryQueue.deleteRegisteredUser(account.getUuid(), number);
}
messagesManager.clear(number);

2
service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
View File

@@ -113,7 +113,7 @@ public class DeviceController {
accounts.update(account);
if (!account.isEnabled()) {
directoryQueue.deleteRegisteredUser(account.getNumber());
directoryQueue.deleteRegisteredUser(account.getUuid(), account.getNumber());
}
messages.clear(account.getNumber(), deviceId);

4
service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
View File

@@ -107,7 +107,7 @@ public class KeysController {
accounts.update(account);
if (!wasAccountEnabled && account.isEnabled()) {
directoryQueue.addRegisteredUser(account.getNumber());
directoryQueue.addRegisteredUser(account.getUuid(), account.getNumber());
}
}
@@ -173,7 +173,7 @@ public class KeysController {
accounts.update(account);
if (!wasAccountEnabled && account.isEnabled()) {
directoryQueue.addRegisteredUser(account.getNumber());
directoryQueue.addRegisteredUser(account.getUuid(), account.getNumber());
}
}