fix: Report multiple mails for phishing

lebojo · lebojo · commit e90e386cd6ba · 2025-03-25T09:18:44.000+01:00
diff --git a/Mail/Views/Alerts/ReportPhishingView.swift b/Mail/Views/Alerts/ReportPhishingView.swift
@@ -49,15 +49,16 @@ struct ReportPhishingView: View {
 
     private func report() async {
         await tryOrDisplayError {
-            var lastResponse = false
-            messagesWithDuplicates.concurrentForEach { message in
-                lastResponse = try await mailboxManager.apiFetcher.reportPhishing(message: message)
+            let latestResponses = try await messagesWithDuplicates.concurrentMap { message in
+                try await mailboxManager.apiFetcher.reportPhishing(message: message)
             }
 
-            if lastResponse {
+            if latestResponses.allSatisfy({ $0 == true }) {
                 let messagesFreeze = messagesWithDuplicates.map { $0.freezeIfNeeded() }
                 _ = try await mailboxManager.move(messages: messagesFreeze, to: .spam)
                 snackbarPresenter.show(message: MailResourcesStrings.Localizable.snackbarReportPhishingConfirmation)
+            } else {
+                snackbarPresenter.show(message: MailResourcesStrings.Localizable.snackbarReportPhishingError)
             }
         }
 
diff --git a/MailCore/Cache/Actions/Action+List.swift b/MailCore/Cache/Actions/Action+List.swift
@@ -79,7 +79,7 @@ extension Action: CaseIterable {
     }
 
     public var shouldDisableMultipleSelection: Bool {
-        return ![.openMovePanel, .saveThreadInkDrive, .shareMailLink, .reportJunk].contains(self)
+        return ![.openMovePanel, .saveThreadInkDrive, .shareMailLink, .reportJunk, .phishing, .block, .blockList].contains(self)
     }
 
     private static func actionsForMessage(_ message: Message, origin: ActionOrigin,
diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings
@@ -1618,6 +1618,9 @@
 /* loco:62ab4ae387f65e26e577dd42 */
 "snackbarReportPhishingConfirmation" = "Erfolgreich gemeldet";
 
+/* loco:67e265b380b26e5cb8004cb2 */
+"snackbarReportPhishingError" = "Beim Melden ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.";
+
 /* loco:62c2f9feea59c120ad52bc23 */
 "snackbarRestorationLaunched" = "Starten der Wiederherstellung";
 
diff --git a/MailResources/Localizable/en.lproj/Localizable.strings b/MailResources/Localizable/en.lproj/Localizable.strings
@@ -1618,6 +1618,9 @@
 /* loco:62ab4ae387f65e26e577dd42 */
 "snackbarReportPhishingConfirmation" = "Successfully reported";
 
+/* loco:67e265b380b26e5cb8004cb2 */
+"snackbarReportPhishingError" = "An error occurred while reporting, please try again.";
+
 /* loco:62c2f9feea59c120ad52bc23 */
 "snackbarRestorationLaunched" = "Launching the restoration";
 
diff --git a/MailResources/Localizable/es.lproj/Localizable.strings b/MailResources/Localizable/es.lproj/Localizable.strings
@@ -1618,6 +1618,9 @@
 /* loco:62ab4ae387f65e26e577dd42 */
 "snackbarReportPhishingConfirmation" = "Informado con éxito";
 
+/* loco:67e265b380b26e5cb8004cb2 */
+"snackbarReportPhishingError" = "Se produjo un error al reportar, por favor inténtalo nuevamente.";
+
 /* loco:62c2f9feea59c120ad52bc23 */
 "snackbarRestorationLaunched" = "Iniciar la restauración";
 
diff --git a/MailResources/Localizable/fr.lproj/Localizable.strings b/MailResources/Localizable/fr.lproj/Localizable.strings
@@ -1618,6 +1618,9 @@
 /* loco:62ab4ae387f65e26e577dd42 */
 "snackbarReportPhishingConfirmation" = "Signalement effectué avec succès";
 
+/* loco:67e265b380b26e5cb8004cb2 */
+"snackbarReportPhishingError" = "Une erreur s’est produite lors du signalement, veuillez réessayer.";
+
 /* loco:62c2f9feea59c120ad52bc23 */
 "snackbarRestorationLaunched" = "Lancement de la restauration";
 
diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings
@@ -1618,6 +1618,9 @@
 /* loco:62ab4ae387f65e26e577dd42 */
 "snackbarReportPhishingConfirmation" = "Segnalato con successo";
 
+/* loco:67e265b380b26e5cb8004cb2 */
+"snackbarReportPhishingError" = "Si è verificato un errore durante la segnalazione. Riprova.";
+
 /* loco:62c2f9feea59c120ad52bc23 */
 "snackbarRestorationLaunched" = "Avvio del restauro";
 

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,16 @@ struct ReportPhishingView: View {`
`49`	`49`
`50`	`50`	`private func report() async {`
`51`	`51`	`await tryOrDisplayError {`
`52`		`- var lastResponse = false`
`53`		`- messagesWithDuplicates.concurrentForEach { message in`
`54`		`- lastResponse = try await mailboxManager.apiFetcher.reportPhishing(message: message)`
	`52`	`+ let latestResponses = try await messagesWithDuplicates.concurrentMap { message in`
	`53`	`+ try await mailboxManager.apiFetcher.reportPhishing(message: message)`
`55`	`54`	`}`
`56`	`55`
`57`		`- if lastResponse {`
	`56`	`+ if latestResponses.allSatisfy({ $0 == true }) {`
`58`	`57`	`let messagesFreeze = messagesWithDuplicates.map { $0.freezeIfNeeded() }`
`59`	`58`	`_ = try await mailboxManager.move(messages: messagesFreeze, to: .spam)`
`60`	`59`	`snackbarPresenter.show(message: MailResourcesStrings.Localizable.snackbarReportPhishingConfirmation)`
	`60`	`+ } else {`
	`61`	`+ snackbarPresenter.show(message: MailResourcesStrings.Localizable.snackbarReportPhishingError)`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ extension Action: CaseIterable {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public var shouldDisableMultipleSelection: Bool {`
`82`		`- return ![.openMovePanel, .saveThreadInkDrive, .shareMailLink, .reportJunk].contains(self)`
	`82`	`+ return ![.openMovePanel, .saveThreadInkDrive, .shareMailLink, .reportJunk, .phishing, .block, .blockList].contains(self)`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private static func actionsForMessage(_ message: Message, origin: ActionOrigin,`