Merge pull request #2027 from Infomaniak/update-sentry

Update Attachments Sentry padding
Infomaniak · Sep 2, 2024 · 991b8ce · 991b8ce
2 parents 2682435 + a7b5f19
commit 991b8ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/Attachment.kt b/app/src/main/java/com/infomaniak/mail/data/models/Attachment.kt
@@ -82,10 +82,10 @@ class Attachment : EmbeddedRealmObject, Attachable {
      * After uploading an Attachment, we replace the local version with the remote one.
      * The remote one doesn't know about local data, so we have to backup them.
      */
-    fun backupLocalData(oldAttachment: Attachment, uploadStatus: UploadStatus, draft: Draft) {
+    fun backupLocalData(oldAttachment: Attachment, draft: Draft) {
         localUuid = oldAttachment.localUuid
         uploadLocalUri = oldAttachment.uploadLocalUri
-        setUploadStatus(uploadStatus, draft, "backupLocalData -> setUploadStatus")
+        setUploadStatus(UploadStatus.FINISHED, draft, "backupLocalData -> setUploadStatus")
     }
 
     fun setUploadStatus(uploadStatus: UploadStatus, draft: Draft? = null, step: String = "") {

diff --git a/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt b/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt
@@ -115,7 +115,7 @@ object SentryDebug {
         fun Int.countPadding(): String = toString().padStart(length = 2, '0')
 
         fun addData(category: String, key: String = "", value: String) {
-            data[count.countPadding() + "." + category.padStart(length = 15) + key] = value
+            data[count.countPadding() + "." + (category + key).padStart(length = 19)] = value
             count++
         }
 

diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExtensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExtensions.kt
@@ -34,7 +34,6 @@ import com.infomaniak.mail.R
 import com.infomaniak.mail.data.api.ApiRoutes
 import com.infomaniak.mail.data.cache.mailboxContent.DraftController
 import com.infomaniak.mail.data.models.Attachment
-import com.infomaniak.mail.data.models.Attachment.UploadStatus
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.ui.main.SnackbarManager
 import com.infomaniak.mail.ui.main.thread.actions.DownloadAttachmentProgressDialogArgs
@@ -191,7 +190,7 @@ object AttachmentExtensions {
                 SentryLog.d(ATTACHMENT_TAG, "When removing uploaded attachment, we found (uuids to localUris): $uuidToLocalUri")
                 SentryLog.d(ATTACHMENT_TAG, "Target uploadLocalUri is: $uploadLocalUri")
 
-                remoteAttachment.backupLocalData(oldAttachment = this@updateLocalAttachment, UploadStatus.FINISHED, draft)
+                remoteAttachment.backupLocalData(oldAttachment = this@updateLocalAttachment, draft)
 
                 SentryLog.d(ATTACHMENT_TAG, "Uploaded attachment uuid: ${remoteAttachment.uuid}")
                 SentryLog.d(ATTACHMENT_TAG, "Uploaded attachment localUuid: ${remoteAttachment.localUuid}")