webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use getRegisteredUsers (CDS2) instead of getContacts for getUserStatus command

Browse source 
That's what the official app does, looks like the old contact discovery
system is not working anymore.
This commit is contained in:
AsamK 2021-01-16 17:06:10 +01:00
parent 06404667a1
commit fe25ae275b
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -325,11 +325,9 @@ public class Manager implements Closeable {
*/
public Map<String, Boolean> areUsersRegistered(Set<String> numbers) throws IOException {
// Note "contactDetails" has no optionals. It only gives us info on users who are registered
List<ContactTokenDetails> contactDetails = this.accountManager.getContacts(numbers);
Map<String, UUID> contactDetails = getRegisteredUsers(numbers);
Set<String> registeredUsers = contactDetails.stream()
.map(ContactTokenDetails::getNumber)
.collect(Collectors.toSet());
Set<String> registeredUsers = contactDetails.keySet();
return numbers.stream().collect(Collectors.toMap(x -> x, registeredUsers::contains));
}
@ -1184,28 +1182,29 @@ public class Manager implements Closeable {
private Collection<SignalServiceAddress> getSignalServiceAddresses(Collection<String> numbers) throws InvalidNumberException {
final Set<SignalServiceAddress> signalServiceAddresses = new HashSet<>(numbers.size());
final Set<SignalServiceAddress> missingUuids = new HashSet<>();
final Set<SignalServiceAddress> addressesMissingUuid = new HashSet<>();
for (String number : numbers) {
final SignalServiceAddress resolvedAddress = canonicalizeAndResolveSignalServiceAddress(number);
if (resolvedAddress.getUuid().isPresent()) {
signalServiceAddresses.add(resolvedAddress);
} else {
missingUuids.add(resolvedAddress);
addressesMissingUuid.add(resolvedAddress);
}
}
final Set<String> numbersMissingUuid = addressesMissingUuid.stream()
.map(a -> a.getNumber().get())
.collect(Collectors.toSet());
Map<String, UUID> registeredUsers;
try {
registeredUsers = accountManager.getRegisteredUsers(getIasKeyStore(),
missingUuids.stream().map(a -> a.getNumber().get()).collect(Collectors.toSet()),
CDS_MRENCLAVE);
} catch (IOException | Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException e) {
registeredUsers = getRegisteredUsers(numbersMissingUuid);
} catch (IOException e) {
logger.warn("Failed to resolve uuids from server, ignoring: {}", e.getMessage());
registeredUsers = new HashMap<>();
registeredUsers = Map.of();
}
for (SignalServiceAddress address : missingUuids) {
for (SignalServiceAddress address : addressesMissingUuid) {
final String number = address.getNumber().get();
if (registeredUsers.containsKey(number)) {
final SignalServiceAddress newAddress = resolveSignalServiceAddress(new SignalServiceAddress(
@ -1220,6 +1219,14 @@ public class Manager implements Closeable {
return signalServiceAddresses;
}
private Map<String, UUID> getRegisteredUsers(final Set<String> numbersMissingUuid) throws IOException {
try {
return accountManager.getRegisteredUsers(getIasKeyStore(), numbersMissingUuid, CDS_MRENCLAVE);
} catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException | UnauthenticatedResponseException e) {
throw new IOException(e);
}
}
private Pair<Long, List<SendMessageResult>> sendMessage(
SignalServiceDataMessage.Builder messageBuilder, Collection<SignalServiceAddress> recipients
) throws IOException {