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

revert to phone number-based account crawler

Browse Source
This commit is contained in:
Jeffrey Griffin
2019-08-26 14:00:15 -07:00
parent 284428a45a
commit cf78047830
16 changed files with 118 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/main/java/org/whispersystems/textsecuregcm/entities/ActiveUserTally.java
View File

@@ -19,11 +19,10 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Map;
import java.util.HashMap;
import java.util.UUID;
public class ActiveUserTally {
@JsonProperty
private UUID fromUuid;
private String fromNumber;
@JsonProperty
private Map<String, long[]> platforms;
@@ -33,14 +32,14 @@ public class ActiveUserTally {
public ActiveUserTally() {}
public ActiveUserTally(UUID fromUuid, Map<String, long[]> platforms, Map<String, long[]> countries) {
this.fromUuid = fromUuid;
public ActiveUserTally(String fromNumber, Map<String, long[]> platforms, Map<String, long[]> countries) {
this.fromNumber = fromNumber;
this.platforms = platforms;
this.countries = countries;
}
public UUID getFromUuid() {
return this.fromUuid;
public String getFromNumber() {
return this.fromNumber;
}
public Map<String, long[]> getPlatforms() {
@@ -51,8 +50,8 @@ public class ActiveUserTally {
return this.countries;
}
public void setFromUuid(UUID fromUuid) {
this.fromUuid = fromUuid;
public void setFromNumber(String fromNumber) {
this.fromNumber = fromNumber;
}
}

29
service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationRequest.java
View File

@@ -19,18 +19,14 @@ package org.whispersystems.textsecuregcm.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import java.util.UUID;
public class DirectoryReconciliationRequest {
@JsonProperty
private UUID fromUuid;
private String fromNumber;
@JsonProperty
private UUID toUuid;
@JsonProperty
private List<UUID> uuids;
private String toNumber;
@JsonProperty
private List<String> numbers;
@@ -38,23 +34,18 @@ public class DirectoryReconciliationRequest {
public DirectoryReconciliationRequest() {
}
public DirectoryReconciliationRequest(UUID fromUuid, UUID toUuid, List<UUID> uuids, List<String> numbers) {
this.fromUuid = fromUuid;
this.toUuid = toUuid;
this.uuids = uuids;
this.numbers = numbers;
public DirectoryReconciliationRequest(String fromNumber, String toNumber, List<String> numbers) {
this.fromNumber = fromNumber;
this.toNumber = toNumber;
this.numbers = numbers;
}
public UUID getFromUuid() {
return fromUuid;
public String getFromNumber() {
return fromNumber;
}
public UUID getToUuid() {
return toUuid;
}
public List<UUID> getUuids() {
return uuids;
public String getToNumber() {
return toNumber;
}
public List<String> getNumbers() {