Add JS Alert block button (duckduckgo#1039)

* POC for suppress dialogs https://app.asana.com/0/715106103902962/1201481513493461/f * Modify suppress alert text https://app.asana.com/0/715106103902962/1201481513493461/f * PFR Feedback - JSAlerts Add pixel and change alert button label https://app.asana.com/0/1175293949586521/1201692089019804/f * Add translations
rogys88 · Jan 28, 2022 · 0e8f7c1 · 0e8f7c1
1 parent 203def3
commit 0e8f7c1
Show file tree

Hide file tree

Showing 53 changed files with 211 additions and 29 deletions.
diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -170,6 +170,9 @@ public enum PixelName: String {
 
     case textSizeSettingsShown = "m_text_size_settings_shown"
     case textSizeSettingsChanged = "m_text_size_settings_changed"
+
+    case jsAlertShown = "m_js_alert_shown"
+    case jsAlertBlocked = "m_js_alert_blocked"
 
     // MARK: SERP pixels
 

diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
@@ -175,6 +175,7 @@ class TabViewController: UIViewController {
     private var textSizeUserScript = TextSizeUserScript()
     private var autofillUserScript = AutofillUserScript()
     private var debugScript = DebugUserScript()
+    private var shouldBlockJSAlert = false
 
     lazy var emailManager: EmailManager = {
         let emailManager = EmailManager()
@@ -186,7 +187,7 @@ class TabViewController: UIViewController {
     private var userScripts: [UserScript] = []
 
     private var canDisplayJavaScriptAlert: Bool {
-        return presentedViewController == nil && delegate?.tabCheckIfItsBeingCurrentlyPresented(self) ?? false
+        return !shouldBlockJSAlert && presentedViewController == nil && delegate?.tabCheckIfItsBeingCurrentlyPresented(self) ?? false
     }
 
     static func loadFromStoryboard(model: Tab) -> TabViewController {
@@ -1397,8 +1398,10 @@ extension TabViewController: WKUIDelegate {
                   initiatedByFrame frame: WKFrameInfo,
                   completionHandler: @escaping () -> Void) {
         if canDisplayJavaScriptAlert {
-            let alertController = WebJSAlert(message: message,
-                                             alertType: .alert(handler: completionHandler)).createAlertController()
+            let alertController = WebJSAlert(message: message, alertType: .alert(handler: { [weak self] blockAlerts in
+                self?.shouldBlockJSAlert = blockAlerts
+                completionHandler()
+            })).createAlertController()
 
             self.present(alertController, animated: true, completion: nil)
         } else {
@@ -1413,29 +1416,35 @@ extension TabViewController: WKUIDelegate {
 
         if canDisplayJavaScriptAlert {
             let alertController = WebJSAlert(message: message,
-                                             alertType: .confirm(handler: completionHandler)).createAlertController()
+                                             alertType: .confirm(handler: { [weak self] blockAlerts, confirm in
+                self?.shouldBlockJSAlert = blockAlerts
+                completionHandler(confirm)
+            })).createAlertController()
 
             self.present(alertController, animated: true, completion: nil)
         } else {
             completionHandler(false)
         }
      }
-
-     func webView(_ webView: WKWebView,
-                  runJavaScriptTextInputPanelWithPrompt prompt: String,
-                  defaultText: String?,
-                  initiatedByFrame frame: WKFrameInfo,
-                  completionHandler: @escaping (String?) -> Void) {
+    
+    func webView(_ webView: WKWebView,
+                 runJavaScriptTextInputPanelWithPrompt prompt: String,
+                 defaultText: String?,
+                 initiatedByFrame frame: WKFrameInfo,
+                 completionHandler: @escaping (String?) -> Void) {
         if canDisplayJavaScriptAlert {
             let alertController = WebJSAlert(message: prompt,
-                                             alertType: .text(handler: completionHandler,
-                                                              defaultText: defaultText)).createAlertController()
+                                             alertType: .text(handler: { [weak self] blockAlerts, text in
+
+                self?.shouldBlockJSAlert = blockAlerts
+                completionHandler(text)
+            }, defaultText: defaultText)).createAlertController()
 
             self.present(alertController, animated: true, completion: nil)
         } else {
             completionHandler(nil)
         }
-     }
+    }
 }
 
 extension TabViewController: UIPopoverPresentationControllerDelegate {

diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift
@@ -425,4 +425,6 @@ public struct UserText {
         let message = NSLocalizedString("textSize.footer", value: "Text Size - %@", comment: "Replacement string is a current percent value e.g. '120%'")
         return message.format(arguments: percentage)
     }
+    public static let webJSAlertDisableAlertsButton = NSLocalizedString("webJSAlert.block-alerts.button", value: "Block Alerts", comment: "Block Alerts button for JavaScript alerts")
+
 }
diff --git a/DuckDuckGo/WebJSAlert.swift b/DuckDuckGo/WebJSAlert.swift
@@ -18,12 +18,13 @@
 //
 
 import UIKit
+import Core
 
 struct WebJSAlert {
     enum JSAlertType {
-        case confirm(handler: (Bool) -> Void)
-        case text(handler: (String?) -> Void, defaultText: String?)
-        case alert(handler: () -> Void)
+        case confirm(handler: (_ blockAlerts: Bool, _ confirm: Bool) -> Void)
+        case text(handler: (_ blockAlerts: Bool, _ text: String?) -> Void, defaultText: String?)
+        case alert(handler: (_ blockAlerts: Bool) -> Void)
     }
 
     private let message: String
@@ -35,26 +36,40 @@ struct WebJSAlert {
     }
 
     func createAlertController() -> UIAlertController {
-        let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
 
-        switch alertType {
+        // createAlertController is only called right before its presentation
+        Pixel.fire(pixel: .jsAlertShown)
 
+        let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+        switch alertType {
+
         case .confirm(let handler):
             alertController.addAction(UIAlertAction(title: UserText.webJSAlertOKButton,
                                                     style: .default, handler: { _ in
-                handler(true)
+                handler(false, true)
             }))
 
             alertController.addAction(UIAlertAction(title: UserText.webJSAlertCancelButton,
-                                                    style: .cancel, handler: { _ in
-                handler(false)
+                                                    style: .default, handler: { _ in
+                handler(false, false)
+            }))
+
+            alertController.addAction(UIAlertAction(title: UserText.webJSAlertDisableAlertsButton,
+                                                    style: .destructive, handler: { _ in
+                Pixel.fire(pixel: .jsAlertBlocked)
+                handler(true, false)
             }))
             return alertController
 
         case .alert(let handler):
             alertController.addAction(UIAlertAction(title: UserText.webJSAlertOKButton,
                                                     style: .default, handler: { _ in
-                handler()
+                handler(false)
+            }))
+            alertController.addAction(UIAlertAction(title: UserText.webJSAlertDisableAlertsButton,
+                                                    style: .destructive, handler: { _ in
+                Pixel.fire(pixel: .jsAlertBlocked)
+                handler(true)
             }))
             return alertController
 
@@ -65,16 +80,22 @@ struct WebJSAlert {
 
             alertController.addAction(UIAlertAction(title: UserText.webJSAlertOKButton,
                                                     style: .default, handler: { [weak alertController] _ in
-                handler(alertController?.textFields?.first?.text)
-
+                handler(false, alertController?.textFields?.first?.text)
+                
             }))
-
+            
             alertController.addAction(UIAlertAction(title: UserText.webJSAlertCancelButton,
-                                                    style: .cancel, handler: { _ in
-                handler(nil)
+                                                    style: .default, handler: { _ in
+                handler(false, nil)
+            }))
+
+            alertController.addAction(UIAlertAction(title: UserText.webJSAlertDisableAlertsButton,
+                                                    style: .destructive, handler: { _ in
+                Pixel.fire(pixel: .jsAlertBlocked)
+                handler(true, nil)
             }))
 
             return alertController
         }
-     }
+    }
 }
diff --git a/DuckDuckGo/bg.lproj/InfoPlist.strings b/DuckDuckGo/bg.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Позволява запазване на изображения на вашето устройство";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Необходимо е за използване на гласово търсене. DuckDuckGo никога не записва какво казвате.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Поставяне от клипборда";
 

diff --git a/DuckDuckGo/bg.lproj/Localizable.strings b/DuckDuckGo/bg.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Добавено в любими";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Блокиране на предупрежденията";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Отмени";
 

diff --git a/DuckDuckGo/cs.lproj/InfoPlist.strings b/DuckDuckGo/cs.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Umožňuje vám ukládat obrázky do vašeho zařízení";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Je potřeba pro používání hlasového vyhledávání. DuckDuckGo nikdy nenahrává, co říkáš.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Vložit ze schránky";
 

diff --git a/DuckDuckGo/cs.lproj/Localizable.strings b/DuckDuckGo/cs.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Oblíbené položky uloženy";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Blokovat výstrahy";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Zrušit";
 

diff --git a/DuckDuckGo/da.lproj/InfoPlist.strings b/DuckDuckGo/da.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Gør det muligt at gemme billeder på din enhed";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Dette er nødvendigt for at bruge stemmesøgning. DuckDuckGo optager aldrig det, du siger.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Indsæt fra udklipsholder";
 

diff --git a/DuckDuckGo/da.lproj/Localizable.strings b/DuckDuckGo/da.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Favorit tilføjet";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Bloker advarsler";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Annullér";
 

diff --git a/DuckDuckGo/de.lproj/InfoPlist.strings b/DuckDuckGo/de.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Speichere Bilder auf deinem Gerät";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Dies ist für die Nutzung der Sprachsuche erforderlich. DuckDuckGo zeichnet nie auf, was du sagst.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Vom Clipboard einfügen";
 

diff --git a/DuckDuckGo/de.lproj/Localizable.strings b/DuckDuckGo/de.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Favorit wurde hinzugefügt";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Benachrichtigungen blockieren";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Abbrechen";
 

diff --git a/DuckDuckGo/el.lproj/InfoPlist.strings b/DuckDuckGo/el.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Σας επιτρέπει να αποθηκεύετε φωτογραφίες στη συσκευή σας";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Αυτό είναι απαραίτητο για τη χρήση φωνητικής αναζήτησης. Το DuckDuckGo δεν καταγράφει ποτέ ό,τι λέτε.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Επικόλληση από το πρόχειρο";
 

diff --git a/DuckDuckGo/el.lproj/Localizable.strings b/DuckDuckGo/el.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Προστέθηκε αγαπημένο";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Αποκλεισμός ειδοποιήσεων";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Ακύρωση";
 

diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Favorite added";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Block Alerts";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Cancel";
 

diff --git a/DuckDuckGo/es.lproj/InfoPlist.strings b/DuckDuckGo/es.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Te permite guardar imágenes en tu dispositivo";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Esto es necesario para utilizar la búsqueda por voz. DuckDuckGo nunca graba lo que dices.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Pegar desde el portapapeles";
 

diff --git a/DuckDuckGo/es.lproj/Localizable.strings b/DuckDuckGo/es.lproj/Localizable.strings
@@ -557,7 +557,7 @@
 "feedback.positive.header" = "¡Es fantástico oír eso!";
 
 /* No comment provided by engineer. */
-"feedback.positive.noThanks" = "No, gracias. He terminado";
+"feedback.positive.noThanks" = "No, gracias He terminado";
 
 /* Button encouraging uses to share details aboout their feedback */
 "feedback.positive.submit" = "Compartir detalles";
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Favorito añadido";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Bloquear alertas";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Cancelar";
 

diff --git a/DuckDuckGo/et.lproj/InfoPlist.strings b/DuckDuckGo/et.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Võimaldab salvestada pilte oma seadmesse";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "See on vajalik häälotsingu kasutamiseks. DuckDuckGo ei salvesta kunagi seda, mida te ütlete.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Kleebi lõikelaualt";
 

diff --git a/DuckDuckGo/et.lproj/Localizable.strings b/DuckDuckGo/et.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Lemmik lisatud";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Blokeerige märguanded";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Tühista";
 

diff --git a/DuckDuckGo/fi.lproj/InfoPlist.strings b/DuckDuckGo/fi.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Voit tallentaa kuvia laitteellesi";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Tämä vaaditaan puhehaun käyttämiseen. DuckDuckGo ei koskaan tallenna puhettasi.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Liitä leikepöydältä";
 

diff --git a/DuckDuckGo/fi.lproj/Localizable.strings b/DuckDuckGo/fi.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Suosikki lisätty";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Estä ilmoitukset";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Peruuta";
 

diff --git a/DuckDuckGo/fr.lproj/InfoPlist.strings b/DuckDuckGo/fr.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Vous permet d'enregistrer des images sur votre appareil";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "Requis pour utiliser la recherche vocale. DuckDuckGo n'enregistre jamais ce que vous dites.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Coller depuis le presse-papier";
 

diff --git a/DuckDuckGo/fr.lproj/Localizable.strings b/DuckDuckGo/fr.lproj/Localizable.strings
@@ -1078,6 +1078,9 @@
 /* Confirmation message */
 "web.url.save.favorite.done" = "Favori ajouté";
 
+/* Block Alerts button for JavaScript alerts */
+"webJSAlert.block-alerts.button" = "Bloquer les alertes";
+
 /* Cancel button for JavaScript alerts */
 "webJSAlert.cancel.button" = "Annuler";
 

diff --git a/DuckDuckGo/hr.lproj/InfoPlist.strings b/DuckDuckGo/hr.lproj/InfoPlist.strings
@@ -19,6 +19,9 @@
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Omogućuje ti spremanje slika na uređaj";
 
+/* Privacy - Speech Recognition Usage Description */
+"NSSpeechRecognitionUsageDescription" = "To je potrebno za korištenje glasovnih funkcija. DuckDuckGo nikad ne snima ono što govorite.";
+
 /* (No Comment) */
 "Paste from clipboard" = "Zalijepi iz međuspremnika";