From beaab5e4eb9cd09b87d263308ec5fd8ceae8a611 Mon Sep 17 00:00:00 2001 From: Serdar Ozturk Date: Fri, 29 May 2026 15:35:39 +0100 Subject: [PATCH] Add safe fallback mapping for new Rust category-system values - As part of the Rust bump, handle newly introduced category-related system folder values with a defensive fallback strategy. NOJIRA --- .../protonmail/android/maillabel/data/mapper/LabelMapper.kt | 4 ++++ .../mailmessage/data/mapper/MovableSystemFolderMapper.kt | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/mail-label/data/src/main/kotlin/ch/protonmail/android/maillabel/data/mapper/LabelMapper.kt b/mail-label/data/src/main/kotlin/ch/protonmail/android/maillabel/data/mapper/LabelMapper.kt index 26c56139b7..8acc3c6440 100644 --- a/mail-label/data/src/main/kotlin/ch/protonmail/android/maillabel/data/mapper/LabelMapper.kt +++ b/mail-label/data/src/main/kotlin/ch/protonmail/android/maillabel/data/mapper/LabelMapper.kt @@ -151,6 +151,10 @@ fun MovableSystemFolder.toSystemLabel() = when (this) { MovableSystemFolder.TRASH -> SystemLabelId.Trash MovableSystemFolder.SPAM -> SystemLabelId.Spam MovableSystemFolder.ARCHIVE -> SystemLabelId.Archive + else -> { + Timber.w("rust-label: mapping from Inbox categories will be supported later. Fallback to Inbox") + SystemLabelId.Inbox + } } fun InlineCustomLabel.toLabel() = Label( diff --git a/mail-message/data/src/main/kotlin/ch/protonmail/android/mailmessage/data/mapper/MovableSystemFolderMapper.kt b/mail-message/data/src/main/kotlin/ch/protonmail/android/mailmessage/data/mapper/MovableSystemFolderMapper.kt index b6250a020e..cd793ef01f 100644 --- a/mail-message/data/src/main/kotlin/ch/protonmail/android/mailmessage/data/mapper/MovableSystemFolderMapper.kt +++ b/mail-message/data/src/main/kotlin/ch/protonmail/android/mailmessage/data/mapper/MovableSystemFolderMapper.kt @@ -19,6 +19,7 @@ package ch.protonmail.android.mailmessage.data.mapper import ch.protonmail.android.mailcommon.domain.model.Action +import timber.log.Timber import uniffi.mail_uniffi.MovableSystemFolder fun MovableSystemFolder.toAction() = when (this) { @@ -26,4 +27,8 @@ fun MovableSystemFolder.toAction() = when (this) { MovableSystemFolder.SPAM -> Action.Spam MovableSystemFolder.ARCHIVE -> Action.Archive MovableSystemFolder.INBOX -> Action.Inbox + else -> { + Timber.w("Mapping from Inbox categories will be supported later. Fallback to Inbox") + Action.Inbox + } }