From 88bda6dfb340b1f8d41ee5d1b174139fdbaba2b3 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Mon, 9 Dec 2024 17:02:47 +0100 Subject: [PATCH 1/3] fix: Typo --- .../mail/data/cache/mailboxContent/RefreshController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt index 37fc4c63ef..4f0cc34821 100644 --- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt +++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/RefreshController.kt @@ -768,7 +768,7 @@ class RefreshController @Inject constructor( "3_folderId" to folder.id, "5_deleted" to activities.deletedShortUids.map { it }, "6_updated" to activities.updatedMessages.map { it.shortUid }, - "7_updated" to activities.addedShortUids.map { it }, + "7_added" to activities.addedShortUids.map { it }, ), ) } From 819d85b744b57b82243ba26605a279ba251f20c0 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Mon, 9 Dec 2024 17:03:15 +0100 Subject: [PATCH 2/3] fix: Don't log NOT_AUTHORIZED errors on Sentry --- app/src/main/java/com/infomaniak/mail/utils/ErrorCode.kt | 1 + .../java/com/infomaniak/mail/utils/FetchMessagesManager.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/infomaniak/mail/utils/ErrorCode.kt b/app/src/main/java/com/infomaniak/mail/utils/ErrorCode.kt index 3bda4c986f..a647088f86 100644 --- a/app/src/main/java/com/infomaniak/mail/utils/ErrorCode.kt +++ b/app/src/main/java/com/infomaniak/mail/utils/ErrorCode.kt @@ -37,6 +37,7 @@ object ErrorCode { //region Mailbox const val MAILBOX_LOCKED = "mailbox_locked" const val ACCESS_DENIED = "access_denied" + const val NOT_AUTHORIZED = "not_authorized" const val ERROR_WHILE_LINKING_MAILBOX = "error_while_linking_mailbox" const val INVALID_MAILBOX_PASSWORD = "invalid_mailbox_password" //endregion diff --git a/app/src/main/java/com/infomaniak/mail/utils/FetchMessagesManager.kt b/app/src/main/java/com/infomaniak/mail/utils/FetchMessagesManager.kt index 047933d029..8c927cec30 100644 --- a/app/src/main/java/com/infomaniak/mail/utils/FetchMessagesManager.kt +++ b/app/src/main/java/com/infomaniak/mail/utils/FetchMessagesManager.kt @@ -56,7 +56,9 @@ class FetchMessagesManager @Inject constructor( private fun shouldLogToSentry(throwable: Throwable?): Boolean { return when (throwable) { is CancellationException, is NetworkException -> false - is ApiErrorException -> throwable.errorCode != ErrorCode.ACCESS_DENIED + is ApiErrorException -> { + throwable.errorCode != ErrorCode.ACCESS_DENIED && throwable.errorCode != ErrorCode.NOT_AUTHORIZED + } else -> true } } From 7ac1e5f8d84acfaf2b161a5c7a679b50a9ee1fb8 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Mon, 9 Dec 2024 17:59:30 +0100 Subject: [PATCH 3/3] fix: Wrong usage of Gson when it's not available --- Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core b/Core index da0bc8a9a8..14fb6d123c 160000 --- a/Core +++ b/Core @@ -1 +1 @@ -Subproject commit da0bc8a9a8e2d90db3b3591a6cc3df4f91fcfa6d +Subproject commit 14fb6d123c133ebd2b22264d046c63da37558f86