Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 12:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase logging around attachment compression/upload job lifecycle.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-07-16 17:31:45 -04:00
parent a950462451
commit e9c2f96bb9
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
View File

@@ -1044,6 +1044,7 @@ class AttachmentTable(
@Throws(MmsException::class) @Throws(MmsException::class)
fun insertAttachmentForPreUpload(attachment: Attachment): DatabaseAttachment { fun insertAttachmentForPreUpload(attachment: Attachment): DatabaseAttachment {
Log.d(TAG, "Inserting attachment $attachment for pre-upload.")
val result = insertAttachmentsForMessage(PREUPLOAD_MESSAGE_ID, listOf(attachment), emptyList()) val result = insertAttachmentsForMessage(PREUPLOAD_MESSAGE_ID, listOf(attachment), emptyList())
if (result.values.isEmpty()) { if (result.values.isEmpty()) {

17
app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
View File

@@ -26,6 +26,7 @@ import org.signal.libsignal.zkgroup.InvalidInputException;
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation;
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.AttachmentId;
import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
import org.thoughtcrime.securesms.blurhash.BlurHash; import org.thoughtcrime.securesms.blurhash.BlurHash;
import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.contactshare.Contact;
@@ -248,15 +249,17 @@ public abstract class PushSendJob extends SendJob {
.toList()); .toList());
return new HashSet<>(Stream.of(attachments).map(a -> { return new HashSet<>(Stream.of(attachments).map(a -> {
AttachmentUploadJob attachmentUploadJob = new AttachmentUploadJob(((DatabaseAttachment) a).attachmentId); final AttachmentId attachmentId = ((DatabaseAttachment) a).attachmentId;
Log.d(TAG, "Enqueueing job chain to upload " + attachmentId);
AttachmentUploadJob attachmentUploadJob = new AttachmentUploadJob(attachmentId);
jobManager.startChain(AttachmentCompressionJob.fromAttachment((DatabaseAttachment) a, false, -1)) jobManager.startChain(AttachmentCompressionJob.fromAttachment((DatabaseAttachment) a, false, -1))
.then(attachmentUploadJob) .then(attachmentUploadJob)
.enqueue(); .enqueue();
return attachmentUploadJob.getId(); return attachmentUploadJob.getId();
}) })
.toList()); .toList());
} }
protected @NonNull List<SignalServiceAttachment> getAttachmentPointersFor(List<Attachment> attachments) { protected @NonNull List<SignalServiceAttachment> getAttachmentPointersFor(List<Attachment> attachments) {

5
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
View File

@@ -67,7 +67,9 @@ public class MediaUploadRepository {
public void startUpload(@NonNull Collection<Media> mediaItems, @Nullable Recipient recipient) { public void startUpload(@NonNull Collection<Media> mediaItems, @Nullable Recipient recipient) {
executor.execute(() -> { executor.execute(() -> {
for (Media media : mediaItems) { for (Media media : mediaItems) {
Log.d(TAG, "Canceling existing preuploads.");
cancelUploadInternal(media); cancelUploadInternal(media);
Log.d(TAG, "Re-uploading media with recipient.");
uploadMediaInternal(media, recipient); uploadMediaInternal(media, recipient);
} }
}); });
@@ -85,7 +87,9 @@ public class MediaUploadRepository {
boolean same = oldMedia.equals(newMedia) && hasSameTransformProperties(oldMedia, newMedia); boolean same = oldMedia.equals(newMedia) && hasSameTransformProperties(oldMedia, newMedia);
if (!same || !uploadResults.containsKey(newMedia)) { if (!same || !uploadResults.containsKey(newMedia)) {
Log.d(TAG, "Canceling existing preuploads.");
cancelUploadInternal(oldMedia); cancelUploadInternal(oldMedia);
Log.d(TAG, "Applying media updates.");
uploadMediaInternal(newMedia, recipient); uploadMediaInternal(newMedia, recipient);
} }
} }
@@ -104,6 +108,7 @@ public class MediaUploadRepository {
} }
public void cancelUpload(@NonNull Media media) { public void cancelUpload(@NonNull Media media) {
Log.d(TAG, "User canceling media upload.");
executor.execute(() -> cancelUploadInternal(media)); executor.execute(() -> cancelUploadInternal(media));
} }

4
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
View File

@@ -104,7 +104,9 @@ class MediaSelectionRepository(context: Context) {
val updatedMedia = oldToNewMediaMap.values.toList() val updatedMedia = oldToNewMediaMap.values.toList()
for (media in updatedMedia) { for (media in updatedMedia) {
Log.w(TAG, media.uri.toString() + " : " + media.transformProperties.map { t: TransformProperties -> "" + t.videoTrim }.orElse("null")) val uri: Uri = media.uri
val transformProperties: Boolean? = media.transformProperties.map { it.videoTrim }.orElse(null)
Log.w(TAG, "$uri : trimmed=$transformProperties")
} }
val singleRecipient: Recipient? = singleContact?.let { Recipient.resolved(it.recipientId) } val singleRecipient: Recipient? = singleContact?.let { Recipient.resolved(it.recipientId) }

8
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
View File

@@ -189,12 +189,14 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
val multiselectLauncher = registerForActivityResult(multiselectContract) { keys -> val multiselectLauncher = registerForActivityResult(multiselectContract) { keys ->
if (keys.isNotEmpty()) { if (keys.isNotEmpty()) {
Log.d(TAG, "Performing send from multi-select activity result.")
performSend(keys) performSend(keys)
} }
} }
val storiesLauncher = registerForActivityResult(storiesContract) { keys -> val storiesLauncher = registerForActivityResult(storiesContract) { keys ->
if (keys.isNotEmpty()) { if (keys.isNotEmpty()) {
Log.d(TAG, "Performing send from stories activity result.")
performSend(keys) performSend(keys)
} }
} }
@@ -243,11 +245,15 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
} else if (sharedViewModel.isAddToGroupStoryFlow) { } else if (sharedViewModel.isAddToGroupStoryFlow) {
MaterialAlertDialogBuilder(requireContext()) MaterialAlertDialogBuilder(requireContext())
.setMessage(getString(R.string.MediaReviewFragment__add_to_the_group_story, sharedViewModel.state.value!!.recipient!!.getDisplayName(requireContext()))) .setMessage(getString(R.string.MediaReviewFragment__add_to_the_group_story, sharedViewModel.state.value!!.recipient!!.getDisplayName(requireContext())))
.setPositiveButton(R.string.MediaReviewFragment__add_to_story) { _, _ -> performSend() } .setPositiveButton(R.string.MediaReviewFragment__add_to_story) { _, _ ->
Log.d(TAG, "Performing send add to group story dialog.")
performSend()
}
.setNegativeButton(android.R.string.cancel) { _, _ -> } .setNegativeButton(android.R.string.cancel) { _, _ -> }
.show() .show()
scheduledSendTime = null scheduledSendTime = null
} else { } else {
Log.d(TAG, "Performing send from send button.")
performSend() performSend()
} }
} }