feat: Confirmation modal for threads download

Mail/Views/Alerts/ConfirmationSaveThreadInKdrive.swift

@@ -0,0 +1,48 @@
+//
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2024 Infomaniak Network SA
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import InfomaniakCore
+import InfomaniakCoreSwiftUI
+import MailCore
+import MailResources
+import SwiftUI
+
+struct ConfirmationSaveThreadInKdrive: View {
+    @EnvironmentObject private var mailboxManager: MailboxManager
+
+    let targetMessages: [Message]
+
+    var body: some View {
+        VStack(spacing: 0) {
+            Text(Action.saveThreadInkDrive.title)
+                .textStyle(.bodyMedium)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(.bottom, IKPadding.alertTitleBottom)
+            Text(MailResourcesStrings.Localizable.downloadAlertDescription)
+                .textStyle(.bodySecondary)
+                .padding(.bottom, IKPadding.alertDescriptionBottom)
+            ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonConfirm) {
+                await tryOrDisplayError {
+                    let filesURL = try await mailboxManager.apiFetcher.download(messages: targetMessages)
+                    try DeeplinkService().shareFilesToKdrive(filesURL)
+                }
+            }
+        }
+    }
+}

Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift

@@ -53,6 +53,7 @@ struct ActionsPanelViewModifier: ViewModifier {
     @ModalState private var messagesToMove: [Message]?
     @ModalState private var flushAlert: FlushAlertState?
     @ModalState private var shareMailLink: ShareMailLinkResult?
+    @ModalState private var messagesToDownload: [Message]?
 
     @Binding var messages: [Message]?
     let originFolder: Folder?
@@ -71,7 +72,8 @@ struct ActionsPanelViewModifier: ViewModifier {
             nearestReportJunkMessageActionsPanel: $reportForJunkMessages,
             nearestReportedForPhishingMessageAlert: $reportedForPhishingMessage,
             nearestReportedForDisplayProblemMessageAlert: $reportedForDisplayProblemMessage,
-            nearestShareMailLinkPanel: $shareMailLink
+            nearestShareMailLinkPanel: $shareMailLink,
+            messagesToDownload: $messagesToDownload
         )
     }
 
@@ -116,6 +118,9 @@ struct ActionsPanelViewModifier: ViewModifier {
         .customAlert(item: $flushAlert) { item in
             FlushFolderAlertView(flushAlert: item, folder: originFolder)
         }
+        .customAlert(item: $messagesToDownload) { message in
+            ConfirmationSaveThreadInKdrive(targetMessages: message)
+        }
         .sheet(item: $shareMailLink) { shareMailLinkResult in
             if #available(iOS 16.0, *) {
                 ActivityView(activityItems: [shareMailLinkResult.url])

Mail/Views/Bottom sheets/Actions/ActionsView.swift

@@ -139,20 +139,14 @@ struct MessageActionView: View {
     @Environment(\.dismiss) private var dismiss
     @EnvironmentObject private var actionsManager: ActionsManager
 
-    @State private var isLoading = false
-
     let targetMessages: [Message]
     let action: Action
     let origin: ActionOrigin
     var completionHandler: ((Action) -> Void)?
 
     var body: some View {
         Button {
-            if action.shouldDismiss {
-                dismiss()
-            } else {
-                isLoading = true
-            }
+            dismiss()
             Task {
                 await tryOrDisplayError {
                     try await actionsManager.performAction(
@@ -162,18 +156,16 @@ struct MessageActionView: View {
                     )
                     completionHandler?(action)
                 }
-                isLoading = false
             }
         } label: {
-            ActionButtonLabel(action: action, isLoading: isLoading)
+            ActionButtonLabel(action: action)
         }
         .accessibilityIdentifier(action.accessibilityIdentifier)
     }
 }
 
 struct ActionButtonLabel: View {
     let action: Action
-    var isLoading = false
 
     var iconColor: MailResourcesColors {
         switch action {
@@ -199,14 +191,9 @@ struct ActionButtonLabel: View {
 
     var body: some View {
         HStack(spacing: IKPadding.medium) {
-            if isLoading {
-                ProgressView()
-                    .frame(width: 24, height: 24)
-            } else {
-                action.icon
-                    .iconSize(.large)
-                    .foregroundStyle(iconColor)
-            }
+            action.icon
+                .iconSize(.large)
+                .foregroundStyle(iconColor)
             Text(action.title)
                 .foregroundStyle(titleColor)
                 .textStyle(.body)

MailCore/Cache/Actions/ActionOrigin.swift

@@ -45,6 +45,7 @@ public struct ActionOrigin {
     private(set) var nearestReportedForPhishingMessageAlert: Binding<Message?>?
     private(set) var nearestReportedForDisplayProblemMessageAlert: Binding<Message?>?
     private(set) var nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>?
+    private(set) var messagesToDownload: Binding<[Message]?>?
 
     init(
         type: ActionOriginType,
@@ -57,7 +58,8 @@ public struct ActionOrigin {
         nearestReportJunkMessageActionsPanel: Binding<[Message]?>? = nil,
         nearestReportedForPhishingMessageAlert: Binding<Message?>? = nil,
         nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
-        nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil
+        nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
+        messagesToDownload: Binding<[Message]?>? = nil
     ) {
         self.type = type
         frozenFolder = folder?.freezeIfNeeded()
@@ -70,6 +72,7 @@ public struct ActionOrigin {
         self.nearestReportedForPhishingMessageAlert = nearestReportedForPhishingMessageAlert
         self.nearestReportedForDisplayProblemMessageAlert = nearestReportedForDisplayProblemMessageAlert
         self.nearestShareMailLinkPanel = nearestShareMailLinkPanel
+        self.messagesToDownload = messagesToDownload
     }
 
     public static func toolbar(originFolder: Folder? = nil,
@@ -86,7 +89,8 @@ public struct ActionOrigin {
                                      nearestReportJunkMessageActionsPanel: Binding<[Message]?>? = nil,
                                      nearestReportedForPhishingMessageAlert: Binding<Message?>? = nil,
                                      nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
-                                     nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil) -> ActionOrigin {
+                                     nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
+                                     messagesToDownload: Binding<[Message]?>? = nil) -> ActionOrigin {
         return ActionOrigin(
             type: .floatingPanel(source: source),
             folder: originFolder,
@@ -97,7 +101,8 @@ public struct ActionOrigin {
             nearestReportJunkMessageActionsPanel: nearestReportJunkMessageActionsPanel,
             nearestReportedForPhishingMessageAlert: nearestReportedForPhishingMessageAlert,
             nearestReportedForDisplayProblemMessageAlert: nearestReportedForDisplayProblemMessageAlert,
-            nearestShareMailLinkPanel: nearestShareMailLinkPanel
+            nearestShareMailLinkPanel: nearestShareMailLinkPanel,
+            messagesToDownload: messagesToDownload
         )
     }
 

MailCore/Cache/Actions/ActionsManager.swift

@@ -188,7 +188,6 @@ public class ActionsManager: ObservableObject {
             snackbarPresenter.show(message: MailResourcesStrings.Localizable.snackbarSenderBlacklisted(1))
         case .blockList:
             Task { @MainActor in
-
                 let uniqueRecipient = self.getUniqueRecipients(reportedMessages: messages)
                 if uniqueRecipient.count > 1 {
                     origin.nearestBlockSendersList?.wrappedValue = BlockRecipientState(recipientsToMessage: uniqueRecipient)
@@ -200,17 +199,8 @@ public class ActionsManager: ObservableObject {
                 }
             }
         case .saveThreadInkDrive:
-            guard !platformDetector.isMac else {
-                return
-            }
-            await Task { @MainActor in
-                do {
-                    let filesURL = try await mailboxManager.apiFetcher.download(messages: messages)
-                    try DeeplinkService().shareFilesToKdrive(filesURL)
-                } catch {
-                    SentrySDK.capture(error: error)
-                }
-            }.value
+            guard !platformDetector.isMac else { return }
+            origin.messagesToDownload?.wrappedValue = messages
         case .shareMailLink:
             guard let message = messagesWithDuplicates.first else { return }
             let result = try await mailboxManager.apiFetcher.shareMailLink(message: message)
@@ -316,7 +306,7 @@ public class ActionsManager: ObservableObject {
             if uniqueThreadCount == 1 {
                 return MailResourcesStrings.Localizable.snackbarThreadMoved(destinationFolderName)
             } else {
-                return MailResourcesStrings.Localizable.snackbarThreadsMoved(destinationFolderName)
+                return MailResourcesStrings.Localizable.snackbarThreadMovedPlural(destinationFolderName)
             }
         }
     }

MailResources/Localizable/de.lproj/Localizable.strings

@@ -661,6 +661,15 @@
 /* loco:66cdadf9bc780d2bbd033462 */
 "deleteAccountWarning" = "Die Löschung Ihres Kontos ist endgültig. Sie werden nicht in der Lage sein, Ihr Konto zu reaktivieren.";
 
+/* loco:672e3534c133d192fb0acc92 */
+"disabledFeatureFlagDescription" = "In Kürze können Sie die Beschränkungen Ihrer ik.me-E-Mail-Adresse entsperren\n(Speicherlimit, benutzerdefinierter Zeitplan, Senden und mehr…)";
+
+/* loco:672e34e12d859bafeb03be32 */
+"disabledFeatureFlagTitle" = "Benötigen Sie mehr Speicherplatz und Funktionen?";
+
+/* loco:6777dbf1dc5a5d9dbf09db92 */
+"downloadAlertDescription" = "Der Download kann einige Zeit dauern.";
+
 /* loco:627e3fa5774ef45bfd4d3b92 */
 "draftFolder" = "Entwürfe";
 

MailResources/Localizable/en.lproj/Localizable.strings

@@ -661,6 +661,15 @@
 /* loco:66cdadf9bc780d2bbd033462 */
 "deleteAccountWarning" = "The deletion of your account will be final. You will not be able to reactivate your account.";
 
+/* loco:672e3534c133d192fb0acc92 */
+"disabledFeatureFlagDescription" = "You will soon be able to unlock the limits of your ik.me email address\n(storage limit, custom schedule, sending and more…)";
+
+/* loco:672e34e12d859bafeb03be32 */
+"disabledFeatureFlagTitle" = "Need more storage and features?";
+
+/* loco:6777dbf1dc5a5d9dbf09db92 */
+"downloadAlertDescription" = "The download may take some time.";
+
 /* loco:627e3fa5774ef45bfd4d3b92 */
 "draftFolder" = "Drafts";
 

MailResources/Localizable/es.lproj/Localizable.strings

@@ -661,6 +661,15 @@
 /* loco:66cdadf9bc780d2bbd033462 */
 "deleteAccountWarning" = "La eliminación de su cuenta será definitiva. No podrá reactivar su cuenta.";
 
+/* loco:672e3534c133d192fb0acc92 */
+"disabledFeatureFlagDescription" = "Pronto podrás desbloquear los límites de tu dirección de correo electrónico ik.me\n(límite de almacenamiento, programación personalizada, envío y más…)";
+
+/* loco:672e34e12d859bafeb03be32 */
+"disabledFeatureFlagTitle" = "¿Necesita más almacenamiento y funciones?";
+
+/* loco:6777dbf1dc5a5d9dbf09db92 */
+"downloadAlertDescription" = "La descarga puede tardar algún tiempo.";
+
 /* loco:627e3fa5774ef45bfd4d3b92 */
 "draftFolder" = "Borradores";
 

MailResources/Localizable/fr.lproj/Localizable.strings

@@ -661,6 +661,15 @@
 /* loco:66cdadf9bc780d2bbd033462 */
 "deleteAccountWarning" = "La suppression de votre compte sera définitive. Vous ne pourrez pas réactiver votre compte.";
 
+/* loco:672e3534c133d192fb0acc92 */
+"disabledFeatureFlagDescription" = "Vous pourrez prochainement débloquer les limites de votre adresse mail ik.me\n(limite de stockage, horaire personnalisé, envoi et plus encore…)";
+
+/* loco:672e34e12d859bafeb03be32 */
+"disabledFeatureFlagTitle" = "Besoin de plus de stockage et de fonctionnalités ?";
+
+/* loco:6777dbf1dc5a5d9dbf09db92 */
+"downloadAlertDescription" = "Le téléchargement peut prendre un certain temps.";
+
 /* loco:627e3fa5774ef45bfd4d3b92 */
 "draftFolder" = "Brouillons";
 

MailResources/Localizable/it.lproj/Localizable.strings

@@ -661,6 +661,15 @@
 /* loco:66cdadf9bc780d2bbd033462 */
 "deleteAccountWarning" = "La cancellazione dell’account sarà definitiva. Non sarà possibile riattivare l’account.";
 
+/* loco:672e3534c133d192fb0acc92 */
+"disabledFeatureFlagDescription" = "Presto sarai in grado di sbloccare i limiti del tuo indirizzo email ik.me\n(limite di archiviazione, pianificazione personalizzata, invio e altro…)";
+
+/* loco:672e34e12d859bafeb03be32 */
+"disabledFeatureFlagTitle" = "Hai bisogno di più spazio di archiviazione e funzionalità?";
+
+/* loco:6777dbf1dc5a5d9dbf09db92 */
+"downloadAlertDescription" = "Il download potrebbe richiedere del tempo.";
+
 /* loco:627e3fa5774ef45bfd4d3b92 */
 "draftFolder" = "Bozze";