From 3e1727fdbceca533080a6b9e13cc4202caa5420d Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 13 May 2021 13:34:35 +1000 Subject: [PATCH] Debug --- .../attachments/DatabaseAttachmentProvider.kt | 4 ++-- .../securesms/database/AttachmentDatabase.java | 2 +- .../libsession/database/MessageDataProvider.kt | 2 +- .../libsession/messaging/jobs/AttachmentUploadJob.kt | 11 +++-------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 8b13757f8e..a083d94cda 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -126,10 +126,10 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper) database.updateAttachmentAfterUploadSucceeded(databaseAttachment.attachmentId, attachment) } - override fun updateAttachmentAfterUploadFailed(attachmentId: Long) { + override fun handleFailedAttachmentUpload(attachmentId: Long) { val database = DatabaseFactory.getAttachmentDatabase(context) val databaseAttachment = getDatabaseAttachment(attachmentId) ?: return - database.updateAttachmentAfterUploadFailed(databaseAttachment.attachmentId) + database.handleFailedAttachmentUpload(databaseAttachment.attachmentId) } override fun getMessageID(serverID: Long): Long? { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java index b69f879993..59b7f52c7d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -393,7 +393,7 @@ public class AttachmentDatabase extends Database { database.update(TABLE_NAME, values, PART_ID_WHERE, id.toStrings()); } - public void updateAttachmentAfterUploadFailed(@NonNull AttachmentId id) { + public void handleFailedAttachmentUpload(@NonNull AttachmentId id) { SQLiteDatabase database = databaseHelper.getWritableDatabase(); ContentValues values = new ContentValues(); diff --git a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt index be4596d57b..ba33ec5a58 100644 --- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt +++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt @@ -30,7 +30,7 @@ interface MessageDataProvider { fun isOutgoingMessage(timestamp: Long): Boolean fun handleSuccessfulAttachmentUpload(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: DotNetAPI.UploadResult) - fun updateAttachmentAfterUploadFailed(attachmentId: Long) + fun handleFailedAttachmentUpload(attachmentId: Long) fun getMessageForQuote(timestamp: Long, author: Address): Pair? fun getAttachmentsAndLinkPreviewFor(mmsId: Long): List diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index b601731e69..a2485f3599 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -105,15 +105,10 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess // it easier to deal with inputStream and outputStreamFactory. val pad = PushAttachmentData(attachment.contentType, inputStream, length, outputStreamFactory, attachment.listener) val contentType = "application/octet-stream" - val drb = DigestingRequestBody(pad.data, pad.outputStreamFactory, contentType, pad.dataSize, attachment.listener) + val drb = DigestingRequestBody(pad.data, pad.outputStreamFactory, contentType, pad.dataSize, pad.listener) Log.d("Loki", "File size: ${length.toDouble() / 1000} kb.") - val mpb = MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addFormDataPart("Content-Type", contentType) - .addFormDataPart("content", UUID.randomUUID().toString(), drb) - .build() val b = Buffer() - mpb.writeTo(b) + drb.writeTo(b) val data = b.readByteArray() // Upload the data val id = upload(data).get() @@ -132,7 +127,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess private fun handlePermanentFailure(e: Exception) { Log.w(TAG, "Attachment upload failed permanently due to error: $this.") delegate?.handleJobFailedPermanently(this, e) - MessagingModuleConfiguration.shared.messageDataProvider.updateAttachmentAfterUploadFailed(attachmentID) + MessagingModuleConfiguration.shared.messageDataProvider.handleFailedAttachmentUpload(attachmentID) failAssociatedMessageSendJob(e) }