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

Split Account into Device and Account definitions.

Browse Source
This commit is contained in:
Matt Corallo
2014-01-11 12:43:07 -10:00
parent ce9d3548e4
commit d3830a7fd4
16 changed files with 290 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/whispersystems/textsecuregcm/push/PushSender.java
View File

@@ -16,6 +16,7 @@
*/
package org.whispersystems.textsecuregcm.push;
import com.google.common.base.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.configuration.ApnConfiguration;
@@ -23,6 +24,7 @@ import org.whispersystems.textsecuregcm.configuration.GcmConfiguration;
import org.whispersystems.textsecuregcm.controllers.NoSuchUserException;
import org.whispersystems.textsecuregcm.entities.EncryptedOutgoingMessage;
import org.whispersystems.textsecuregcm.entities.MessageProtos;
import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.Device;
import org.whispersystems.textsecuregcm.storage.AccountsManager;
import org.whispersystems.textsecuregcm.storage.DirectoryManager;
@@ -61,35 +63,6 @@ public class PushSender {
this.apnSender = new APNSender(apnConfiguration.getCertificate(), apnConfiguration.getKey());
}
/**
* For each local destination in destinations, either adds all its accounts to accountCache or adds the number to
* numbersMissingDevices, if the deviceIds list don't match what is required.
* @param destinations Map from number to Pair<localNumber, Set<deviceIds>>
* @param accountCache Map from <number, deviceId> to account
* @param numbersMissingDevices list of numbers missing devices
*/
public void fillLocalAccountsCache(Map<String, Pair<Boolean, Set<Long>>> destinations, Map<Pair<String, Long>, Device> accountCache, List<String> numbersMissingDevices) {
for (Map.Entry<String, Pair<Boolean, Set<Long>>> destination : destinations.entrySet()) {
if (destination.getValue().first()) {
String number = destination.getKey();
List<Device> deviceList = accounts.getAllByNumber(number);
Set<Long> deviceIdsIncluded = destination.getValue().second();
if (deviceList.size() != deviceIdsIncluded.size())
numbersMissingDevices.add(number);
else {
for (Device device : deviceList) {
if (!deviceIdsIncluded.contains(device.getDeviceId())) {
numbersMissingDevices.add(number);
break;
}
}
for (Device device : deviceList)
accountCache.put(new Pair<>(number, device.getDeviceId()), device);
}
}
}
}
public void sendMessage(Device device, MessageProtos.OutgoingMessageSignal outgoingMessage)
throws IOException, NoSuchUserException
{
@@ -99,7 +72,7 @@ public class PushSender {
if (device.getGcmRegistrationId() != null) sendGcmMessage(device, message);
else if (device.getApnRegistrationId() != null) sendApnMessage(device, message);
else if (device.getFetchesMessages()) storeFetchedMessage(device, message);
else throw new NoSuchUserException("No push identifier!");
else throw new NoSuchUserException("No push identifier!");
}
private void sendGcmMessage(Device device, EncryptedOutgoingMessage outgoingMessage)