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

s/accountCache/deviceCache/g

This commit is contained in:
Matt Corallo 2014-01-11 10:57:50 -10:00
parent 0bd82784a0
commit ce9d3548e4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@ -104,19 +104,19 @@ public class MessageController extends HttpServlet {
rateLimiters.getMessagesLimiter().validate(sender.getNumber()); rateLimiters.getMessagesLimiter().validate(sender.getNumber());
Map<Pair<String, Long>, Device> accountCache = new HashMap<>(); Map<Pair<String, Long>, Device> deviceCache = new HashMap<>();
List<String> numbersMissingDevices = new LinkedList<>(); List<String> numbersMissingDevices = new LinkedList<>();
List<IncomingMessage> incomingMessages = messages.getMessages(); List<IncomingMessage> incomingMessages = messages.getMessages();
List<OutgoingMessageSignal> outgoingMessages = getOutgoingMessageSignals(sender.getNumber(), List<OutgoingMessageSignal> outgoingMessages = getOutgoingMessageSignals(sender.getNumber(),
incomingMessages, incomingMessages,
accountCache, deviceCache,
numbersMissingDevices); numbersMissingDevices);
IterablePair<IncomingMessage, OutgoingMessageSignal> listPair = new IterablePair<>(incomingMessages, IterablePair<IncomingMessage, OutgoingMessageSignal> listPair = new IterablePair<>(incomingMessages,
outgoingMessages); outgoingMessages);
handleAsyncDelivery(timerContext, req.startAsync(), listPair, accountCache, numbersMissingDevices); handleAsyncDelivery(timerContext, req.startAsync(), listPair, deviceCache, numbersMissingDevices);
} catch (AuthenticationException e) { } catch (AuthenticationException e) {
failureMeter.mark(); failureMeter.mark();
timerContext.stop(); timerContext.stop();
@ -140,7 +140,7 @@ public class MessageController extends HttpServlet {
private void handleAsyncDelivery(final TimerContext timerContext, private void handleAsyncDelivery(final TimerContext timerContext,
final AsyncContext context, final AsyncContext context,
final IterablePair<IncomingMessage, OutgoingMessageSignal> listPair, final IterablePair<IncomingMessage, OutgoingMessageSignal> listPair,
final Map<Pair<String, Long>, Device> accountCache, final Map<Pair<String, Long>, Device> deviceCache,
final List<String> numbersMissingDevices) final List<String> numbersMissingDevices)
{ {
executor.submit(new Runnable() { executor.submit(new Runnable() {
@ -159,7 +159,7 @@ public class MessageController extends HttpServlet {
if (Util.isEmpty(relay)) { if (Util.isEmpty(relay)) {
try { try {
pushSender.sendMessage(accountCache.get(new Pair<>(destination, destinationDeviceId)), messagePair.second()); pushSender.sendMessage(deviceCache.get(new Pair<>(destination, destinationDeviceId)), messagePair.second());
} catch (NoSuchUserException e) { } catch (NoSuchUserException e) {
logger.debug("No such user", e); logger.debug("No such user", e);
failure.add(destination); failure.add(destination);
@ -218,12 +218,12 @@ public class MessageController extends HttpServlet {
} }
/** /**
* @param accountCache is a map from Pair<number, deviceId> to the account * @param deviceCache is a map from Pair<number, deviceId> to the account
*/ */
@Nullable @Nullable
private List<OutgoingMessageSignal> getOutgoingMessageSignals(String sourceNumber, private List<OutgoingMessageSignal> getOutgoingMessageSignals(String sourceNumber,
List<IncomingMessage> incomingMessages, List<IncomingMessage> incomingMessages,
Map<Pair<String, Long>, Device> accountCache, Map<Pair<String, Long>, Device> deviceCache,
List<String> numbersMissingDevices) List<String> numbersMissingDevices)
{ {
List<OutgoingMessageSignal> outgoingMessages = new LinkedList<>(); List<OutgoingMessageSignal> outgoingMessages = new LinkedList<>();
@ -238,7 +238,7 @@ public class MessageController extends HttpServlet {
deviceIds.second().add(incoming.getDestinationDeviceId()); deviceIds.second().add(incoming.getDestinationDeviceId());
} }
pushSender.fillLocalAccountsCache(destinations, accountCache, numbersMissingDevices); pushSender.fillLocalAccountsCache(destinations, deviceCache, numbersMissingDevices);
for (IncomingMessage incoming : incomingMessages) { for (IncomingMessage incoming : incomingMessages) {
OutgoingMessageSignal.Builder outgoingMessage = OutgoingMessageSignal.newBuilder(); OutgoingMessageSignal.Builder outgoingMessage = OutgoingMessageSignal.newBuilder();