mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add additional logging to media send jobs.

fork-5.53.8
Greyson Parrelli 2021-07-09 12:39:02 -04:00 zatwierdzone przez Cody Henthorne
rodzic ff4f0b9f42
commit a361fcc8f3
3 zmienionych plików z 18 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
Wyświetl plik

@ -180,7 +180,7 @@ public final class PushGroupSendJob extends PushSendJob {
} }
try { try {
log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId); log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId + ", Attachments: " + buildAttachmentString(message.getAttachments()));
if (!groupRecipient.resolve().isProfileSharing() && !database.isGroupQuitMessage(messageId)) { if (!groupRecipient.resolve().isProfileSharing() && !database.isGroupQuitMessage(messageId)) {
RecipientUtil.shareProfileIfFirstSecureMessage(context, groupRecipient); RecipientUtil.shareProfileIfFirstSecureMessage(context, groupRecipient);

2
app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
Wyświetl plik

@ -121,7 +121,7 @@ public class PushMediaSendJob extends PushSendJob {
} }
try { try {
log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId); log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId + ", Attachments: " + buildAttachmentString(message.getAttachments()));
RecipientUtil.shareProfileIfFirstSecureMessage(context, message.getRecipient()); RecipientUtil.shareProfileIfFirstSecureMessage(context, message.getRecipient());

16
app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
Wyświetl plik

@ -8,6 +8,7 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.TextSecureExpiredException; import org.thoughtcrime.securesms.TextSecureExpiredException;
import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.contactshare.Contact;
import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
@ -20,6 +21,7 @@ import org.thoughtcrime.securesms.util.Util;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public abstract class SendJob extends BaseJob { public abstract class SendJob extends BaseJob {
@ -62,4 +64,18 @@ public abstract class SendJob extends BaseJob {
database.markAttachmentUploaded(messageId, attachment); database.markAttachmentUploaded(messageId, attachment);
} }
} }
protected String buildAttachmentString(@NonNull List<Attachment> attachments) {
List<String> strings = attachments.stream().map(attachment -> {
if (attachment instanceof DatabaseAttachment) {
return ((DatabaseAttachment) attachment).getAttachmentId().toString();
} else if (attachment.getUri() != null) {
return attachment.getUri().toString();
} else {
return attachment.toString();
}
}).collect(Collectors.toList());
return Util.join(strings, ", ");
}
} }