Add sendNotification to shieldActions

kingstinct · Jan 11, 2025 · a6f70fe · a6f70fe
1 parent 08f645c
commit a6f70fe
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 43 deletions.
diff --git a/example/screens/ShieldTab.tsx b/example/screens/ShieldTab.tsx
@@ -42,8 +42,6 @@ export function ShieldTab() {
     }
   }, [familyActivitySelectionResult?.familyActivitySelection]);
 
-  const theme = useTheme();
-
   const onSelectionChange = useCallback(
     (
       event: NativeSyntheticEvent<{
@@ -80,6 +78,8 @@ export function ShieldTab() {
             blue: 0,
           },
           subtitle: "subtitle",
+          primaryButtonLabel: "primaryButtonLabel",
+          secondaryButtonLabel: "secondaryButtonLabel",
           subtitleColor: {
             red: Math.random() * 255,
             green: Math.random() * 255,
@@ -103,19 +103,19 @@ export function ShieldTab() {
         },
         {
           primary: {
-            type: "unblockAll",
-            behavior: "defer",
+            type: "openApp",
+            behavior: "close",
           },
           secondary: {
             type: "dismiss",
-            behavior: "close",
+            behavior: "defer",
           },
         },
       ),
     [shieldTitle],
   );
 
-  const [showSelectionView, setShowSelectionView] = useState(true);
+  const [showSelectionView, setShowSelectionView] = useState(false);
 
   return (
     <SafeAreaView style={{ flex: 1 }}>

diff --git a/ios/Shared.swift b/ios/Shared.swift
@@ -9,6 +9,7 @@ import FamilyControls
 import Foundation
 import ManagedSettings
 import UIKit
+import WebKit
 import os
 
 var appGroup = "group.ActivityMonitor"
@@ -124,19 +125,30 @@ func openUrl(urlString: String) {
     return  // be safe
   }
 
-  /*let context = NSExtensionContext()
-   context.open(url) { success in
+  let context = NSExtensionContext()
+  context.open(url) { _ in
 
-   }*/
+  }
 
-  let application =
-    UIApplication.value(forKeyPath: #keyPath(UIApplication.shared)) as! UIApplication
+ /* let webView = WKWebView()
+  webView.load(URLRequest(url: url))
+*/
+  /*let application =
+    UIApplication.value(forKeyPath: #keyPath(UIApplication.shared)) as! UIApplication*/
 
-  if #available(iOS 10.0, *) {
+  /*if #available(iOS 10.0, *) {
     application.open(url, options: [:], completionHandler: nil)
   } else {
     application.openURL(url)
-  }
+  }*/
+}
+
+let notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
+
+func notifyAppWithName(name: String) {
+  let notificationName = CFNotificationName(name as CFString)
+
+  CFNotificationCenterPostNotification(notificationCenter, notificationName, nil, nil, false)
 }
 
 func sendNotification(contents: [String: Any], placeholders: [String: String?]) {

diff --git a/src/ReactNativeDeviceActivity.types.ts b/src/ReactNativeDeviceActivity.types.ts
@@ -136,11 +136,17 @@ export type DeviceActivityEvent = {
   includesPastActivity?: boolean;
 };
 
-export type ShieldActionType = "unblockAll" | "dismiss" | "unblockCurrentApp";
+export type ShieldActionType =
+  | "unblockAll"
+  | "dismiss"
+  | "unblockCurrentApp"
+  | "sendNotification"
+  | "openApp";
 
 export type ShieldAction = {
   type: ShieldActionType;
   delay?: number;
+  payload?: NotificationPayload;
   behavior: "close" | "defer";
 };
 
@@ -149,6 +155,21 @@ export type ShieldActions = {
   secondary?: ShieldAction;
 };
 
+export type NotificationPayload = {
+  title: string;
+  body: string;
+  sound?: "default" | "defaultCritical" | "defaultRingtone";
+  categoryIdentifier?: string;
+  badge?: number;
+  userInfo?: Record<string, any>;
+  interruptionLevel?: "active" | "critical" | "passive";
+  targetContentIdentifier?: string;
+  launchImageName?: string;
+  identifier?: string;
+  threadIdentifier?: string;
+  subtitle?: string;
+};
+
 export type Action =
   | {
       type: "blockSelection";
@@ -175,20 +196,7 @@ export type Action =
     }
   | {
       type: "sendNotification";
-      payload: {
-        title: string;
-        body: string;
-        sound?: "default" | "defaultCritical" | "defaultRingtone";
-        categoryIdentifier?: string;
-        badge?: number;
-        userInfo?: Record<string, any>;
-        interruptionLevel?: "active" | "critical" | "passive";
-        targetContentIdentifier?: string;
-        launchImageName?: string;
-        identifier?: string;
-        threadIdentifier?: string;
-        subtitle?: string;
-      };
+      payload: NotificationPayload;
       sleepBefore?: number;
       sleepAfter?: number;
     }

diff --git a/targets/ActivityMonitorExtension/DeviceActivityMonitorExtension.swift b/targets/ActivityMonitorExtension/DeviceActivityMonitorExtension.swift
@@ -15,15 +15,6 @@ import os
 // Make sure that your class name matches the NSExtensionPrincipalClass in your Info.plist.
 @available(iOS 15.0, *)
 class DeviceActivityMonitorExtension: DeviceActivityMonitor {
-  let notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
-  let store = ManagedSettingsStore()
-
-  func notifyAppWithName(name: String) {
-    let notificationName = CFNotificationName(name as CFString)
-
-    CFNotificationCenterPostNotification(notificationCenter, notificationName, nil, nil, false)
-  }
-
   override func intervalDidStart(for activity: DeviceActivityName) {
     super.intervalDidStart(for: activity)
     logger.log("intervalDidStart")
@@ -33,7 +24,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
       callbackName: "intervalDidStart"
     )
 
-    self.notifyAppWithName(name: "intervalDidStart")
+    notifyAppWithName(name: "intervalDidStart")
 
     self.executeActionsForEvent(activityName: activity.rawValue, callbackName: "intervalDidStart")
   }
@@ -49,7 +40,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
 
     CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication)
 
-    self.notifyAppWithName(name: "intervalDidEnd")
+    notifyAppWithName(name: "intervalDidEnd")
 
     self.executeActionsForEvent(activityName: activity.rawValue, callbackName: "intervalDidEnd")
   }
@@ -84,7 +75,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
       eventName: event.rawValue
     )
 
-    self.notifyAppWithName(name: "eventDidReachThreshold")
+    notifyAppWithName(name: "eventDidReachThreshold")
 
     self.executeActionsForEvent(
       activityName: activity.rawValue, callbackName: "eventDidReachThreshold",
@@ -100,7 +91,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
       callbackName: "intervalWillStartWarning"
     )
 
-    self.notifyAppWithName(name: "intervalWillStartWarning")
+    notifyAppWithName(name: "intervalWillStartWarning")
 
     self.executeActionsForEvent(
       activityName: activity.rawValue, callbackName: "intervalWillStartWarning")
@@ -115,7 +106,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
       callbackName: "intervalWillEndWarning"
     )
 
-    self.notifyAppWithName(name: "intervalWillEndWarning")
+    notifyAppWithName(name: "intervalWillEndWarning")
 
     self.executeActionsForEvent(
       activityName: activity.rawValue, callbackName: "intervalWillEndWarning")
@@ -133,7 +124,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
       eventName: event.rawValue
     )
 
-    self.notifyAppWithName(name: "eventWillReachThresholdWarning")
+    notifyAppWithName(name: "eventWillReachThresholdWarning")
 
     self.executeActionsForEvent(
       activityName: activity.rawValue, callbackName: "eventWillReachThresholdWarning",

diff --git a/targets/ShieldAction/ShieldActionExtension.swift b/targets/ShieldAction/ShieldActionExtension.swift
@@ -20,6 +20,21 @@ func handleAction(
       unblockAllApps()
     }
 
+    if type == "sendNotification" {
+      // todo: replace with general string
+      /*DispatchQueue.main.async(execute: {
+        openUrl(urlString: "device-activity://")
+      })
+
+      notifyAppWithName(name: "fromShieldExtensions")
+
+      sleep(ms: 1)*/
+
+      if let payload = configForSelectedAction["payload"] as? [String: Any] {
+        sendNotification(contents: payload, placeholders: [:])
+      }
+    }
+
     if type == "unblockCurrentApp" {
       let unblockedSelectionStr = userDefaults?.string(forKey: "unblockedSelection")