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

Remove number from ReportMessageManager#store

Browse Source
This commit is contained in:
Chris Eager
2022-03-25 18:13:06 -07:00
committed by Jon Chambers
parent 5816f76bbe
commit 7b3703506b
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
View File

@@ -56,12 +56,8 @@ public class MessagesManager {
messagesCache.insert(messageGuid, destinationUuid, destinationDevice, message);
if (message.hasSource() && !destinationUuid.toString().equals(message.getSourceUuid())) {
if (message.hasSourceUuid()) {
reportMessageManager.store(message.getSource(), message.getSourceUuid(), messageGuid);
} else {
logger.warn("Message missing source UUID");
}
if (message.hasSourceUuid() && !destinationUuid.toString().equals(message.getSourceUuid())) {
reportMessageManager.store(message.getSourceUuid(), messageGuid);
}
}

6
service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
View File

@@ -45,14 +45,11 @@ public class ReportMessageManager {
this.reportedMessageListeners.add(listener);
}
// TODO sourceNumber can be removed after 2022-04-01
public void store(String sourceNumber, String sourceAci, UUID messageGuid) {
public void store(String sourceAci, UUID messageGuid) {
try {
Objects.requireNonNull(sourceNumber);
Objects.requireNonNull(sourceAci);
reportMessageDynamoDb.store(hash(messageGuid, sourceNumber));
reportMessageDynamoDb.store(hash(messageGuid, sourceAci));
} catch (final Exception e) {
logger.warn("Failed to store hash", e);
@@ -93,7 +90,6 @@ public class ReportMessageManager {
sourceNumber.ifPresent(number ->
reportedMessageListeners.forEach(listener -> {
try {
// TODO should listener take the source Aci?
listener.handleMessageReported(number, messageGuid, reporterUuid);
} catch (final Exception e) {
logger.error("Failed to notify listener of reported message", e);