Simplify action handling

Author: robertherber

targets/ShieldAction/ShieldActionExtension.swift

@@ -41,15 +41,15 @@ func sendNotification(){
   UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
 }
 
-func handleAction(dict: [String: Any]) -> ShieldActionResponse {
+func handleAction(configForSelectedAction: [String: Any]) -> ShieldActionResponse {
   logger.log("handleAction")
-  if let type = dict["type"] as? String {
+  if let type = configForSelectedAction["type"] as? String {
     if(type == "unblockAll"){
       unblockAllApps()
     }
   }
 
-  if let behaviour = dict["behavior"] as? String {
+  if let behaviour = configForSelectedAction["behavior"] as? String {
     if(behaviour == "defer"){
       return .defer
     }
@@ -58,52 +58,37 @@ func handleAction(dict: [String: Any]) -> ShieldActionResponse {
   return .close
 }
 
+func handleAction(action: ShieldAction, completionHandler: @escaping (ShieldActionResponse) -> Void) {
+  if let shieldActionConfig = userDefaults?.dictionary(forKey: "shieldActions") {
+    if let configForSelectedAction = shieldActionConfig[action == .primaryButtonPressed ? "primary" : "secondary"] as? [String: Any] {
+      let response = handleAction(configForSelectedAction: configForSelectedAction)
+      DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+        completionHandler(response);
+      }
+    } else {
+      completionHandler(.close)
+    }
+  } else {
+    completionHandler(.close)
+  }
+}
+
 // Override the functions below to customize the shield actions used in various situations.
 // The system provides a default response for any functions that your subclass doesn't override.
 // Make sure that your class name matches the NSExtensionPrincipalClass in your Info.plist.
 class ShieldActionExtension: ShieldActionDelegate {
   override func handle(action: ShieldAction, for application: ApplicationToken, completionHandler: @escaping (ShieldActionResponse) -> Void) {
     logger.log("handle application")
-    if let obj = userDefaults?.dictionary(forKey: "shieldActions") {
-      if let dict = obj[action == .primaryButtonPressed ? "primary" : "secondary"] as? [String: Any] {
-        let response = handleAction(dict: dict)
-        completionHandler(response)
-      } else {
-        completionHandler(.close)
-      }
-    } else {
-      completionHandler(.close)
-    }
+    handleAction(action: action, completionHandler: completionHandler)
   }
 
   override func handle(action: ShieldAction, for webDomain: WebDomainToken, completionHandler: @escaping (ShieldActionResponse) -> Void) {
     logger.log("handle domain")
-    if let obj = userDefaults?.dictionary(forKey: "shieldActions") {
-      if let dict = obj[action == .primaryButtonPressed ? "primary" : "secondary"] as? [String: Any] { 
-        let response = handleAction(dict: dict)
-        completionHandler(response)
-      } else {
-        completionHandler(.close)
-      }
-    } else {
-      completionHandler(.close)
-    }
+    handleAction(action: action, completionHandler: completionHandler)
   }
 
   override func handle(action: ShieldAction, for category: ActivityCategoryToken, completionHandler: @escaping (ShieldActionResponse) -> Void) {
     logger.log("handle category")
-    // openUrl(urlString: "device-activity://")
-
-    if let obj = userDefaults?.dictionary(forKey: "shieldActions") {
-      if let dict = obj[action == .primaryButtonPressed ? "primary" : "secondary"] as? [String: Any] {
-        let response = handleAction(dict: dict)
-        completionHandler(response)
-    } else {
-        completionHandler(.close)
-      }
-    } else {
-      completionHandler(.close)
-    }
-    // sendNotification()
+    handleAction(action: action, completionHandler: completionHandler)
   }
 }