From 4994c12f9c7a901f738047cb05f12b9380bd881e Mon Sep 17 00:00:00 2001
From: Robert Herber <robert@kingstinct.com>
Date: Tue, 17 Dec 2024 00:17:41 +0100
Subject: [PATCH 1/3] Introducing familyActivitySelectionId to reduce load on
 userDefaults and streamline structure

---
 example/components/CreateActivity.tsx         |  2 +-
 example/screens/AllTheThings.tsx              | 10 ++--
 example/screens/ShieldTab.tsx                 |  2 +-
 ios/Shared.swift                              | 55 +++++++++++++------
 src/ReactNativeDeviceActivity.types.ts        |  2 +-
 src/index.ts                                  | 12 ++--
 .../ShieldConfigurationExtension.swift        |  8 +--
 7 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/example/components/CreateActivity.tsx b/example/components/CreateActivity.tsx
index 13d6cf30..fa7a23f3 100644
--- a/example/components/CreateActivity.tsx
+++ b/example/components/CreateActivity.tsx
@@ -18,7 +18,7 @@ const startMonitoring = async (
 ) => {
   await requestPermissionsAsync();
 
-  // ReactNativeDeviceActivity.updateFamilyActivitySelectionToActivityNameMap({
+  // ReactNativeDeviceActivity.setFamilyActivitySelectionId({
   //   activityName,
   //   familyActivitySelection: activitySelection,
   // });
diff --git a/example/screens/AllTheThings.tsx b/example/screens/AllTheThings.tsx
index 92b5dd9c..91b895f8 100644
--- a/example/screens/AllTheThings.tsx
+++ b/example/screens/AllTheThings.tsx
@@ -38,7 +38,7 @@ export function requestPermissionsAsync() {
 /* console.log(
   JSON.stringify(
     ReactNativeDeviceActivity.userDefaultsGet(
-      "familyActivitySelectionToActivityNameMap",
+      "familyActivitySelectionIds",
     ),
     null,
     2,
@@ -223,7 +223,7 @@ export function AllTheThings() {
         <Button
           title="Start monitoring"
           disabled={!familyActivitySelection}
-          onPress={() => startMonitoring(familyActivitySelection!)}
+          // onPress={() => startMonitoring(familyActivitySelection!)}
         />
 
         <Button
@@ -263,7 +263,7 @@ export function AllTheThings() {
           onChangeText={(text) => setShieldTitle(text)}
           value={shieldTitle}
           onSubmitEditing={() =>
-            ReactNativeDeviceActivity.updateShieldConfiguration(
+            ReactNativeDeviceActivity.updateShield(
               {
                 title: shieldTitle,
                 backgroundBlurStyle: UIBlurEffectStyle.systemMaterialDark,
@@ -320,9 +320,7 @@ export function AllTheThings() {
           }}
           headerText="a header text!"
           footerText="a footer text!"
-          onSelectionChange={(
-            event: NativeSyntheticEvent<{ familyActivitySelection: string }>,
-          ) => {
+          onSelectionChange={(event) => {
             if (
               event.nativeEvent.familyActivitySelection !==
               familyActivitySelection
diff --git a/example/screens/ShieldTab.tsx b/example/screens/ShieldTab.tsx
index 7e297338..4577355b 100644
--- a/example/screens/ShieldTab.tsx
+++ b/example/screens/ShieldTab.tsx
@@ -67,7 +67,7 @@ export function ShieldTab() {
 
   const onSubmitEditing = useCallback(
     () =>
-      ReactNativeDeviceActivity.updateShieldConfiguration(
+      ReactNativeDeviceActivity.updateShield(
         {
           title: shieldTitle,
           backgroundBlurStyle: UIBlurEffectStyle.systemMaterialDark,
diff --git a/ios/Shared.swift b/ios/Shared.swift
index 88dbf47d..7440d61a 100644
--- a/ios/Shared.swift
+++ b/ios/Shared.swift
@@ -47,15 +47,14 @@ func executeAction(action: [String: Any], placeholders: [String: String?]) {
   let type = action["type"] as? String
 
   if type == "blockSelection" {
-    if let familyActivitySelectionStr = action["familyActivitySelection"] as? String {
-      let activitySelection = getActivitySelectionFromStr(
-        familyActivitySelectionStr: familyActivitySelectionStr)
+    if let familyActivitySelectionId = action["familyActivitySelectionId"] as? String {
+      if let activitySelection = getFamilyActivitySelectionById(id: familyActivitySelectionId) {
+        updateShield(shieldId: action["shieldId"] as? String)
 
-      updateShield(shieldId: action["shieldId"] as? String)
+        sleep(ms: 50)
 
-      sleep(ms: 50)
-
-      blockSelectedApps(activitySelection: activitySelection)
+        blockSelectedApps(activitySelection: activitySelection)
+      }
     }
   } else if type == "unblockAllApps" {
     unblockAllApps()
@@ -80,6 +79,7 @@ func executeAction(action: [String: Any], placeholders: [String: String?]) {
 
       task = sendHttpRequest(with: url, config: config, placeholders: placeholders)
 
+      // required for it to have time to trigger before process/callback ends
       sleep(ms: 1000)
     }
   }
@@ -258,9 +258,9 @@ func sendHttpRequest(with url: String, config: [String: Any], placeholders: [Str
 }
 
 @available(iOS 15.0, *)
-struct SelectionWithActivityName {
+struct FamilyActivitySelectionWithId {
   var selection: FamilyActivitySelection
-  var activityName: String
+  var id: String
 }
 
 struct TextToReplaceWithOptionalSpecialTreatment {
@@ -339,15 +339,15 @@ func replacePlaceholders(_ text: String, with placeholders: [String: String?]) -
 let store = ManagedSettingsStore()
 
 @available(iOS 15.0, *)
-func getFamilyActivitySelectionToActivityNameMap() -> [SelectionWithActivityName?] {
-  if let familyActivitySelectionToActivityNameMap = userDefaults?.dictionary(
-    forKey: "familyActivitySelectionToActivityNameMap") {
-    return familyActivitySelectionToActivityNameMap.map { (key: String, value: Any) in
+func getFamilyActivitySelectionIds() -> [FamilyActivitySelectionWithId?] {
+  if let familyActivitySelectionIds = userDefaults?.dictionary(
+    forKey: "familyActivitySelectionIds") {
+    return familyActivitySelectionIds.map { (key: String, value: Any) in
       if let familyActivitySelectionStr = value as? String {
         let activitySelection = getActivitySelectionFromStr(
           familyActivitySelectionStr: familyActivitySelectionStr)
 
-        return SelectionWithActivityName(selection: activitySelection, activityName: key)
+        return FamilyActivitySelectionWithId(selection: activitySelection, id: key)
       }
       return nil
     }
@@ -356,14 +356,33 @@ func getFamilyActivitySelectionToActivityNameMap() -> [SelectionWithActivityName
 }
 
 @available(iOS 15.0, *)
-func getPossibleActivityName(
+func getFamilyActivitySelectionById(id: String) -> FamilyActivitySelection? {
+  if let familyActivitySelectionIds = userDefaults?.dictionary(forKey: "familyActivitySelectionIds") {
+    if let pair =
+      familyActivitySelectionIds
+      .first(where: { (key: String, _: Any) in
+        return key == id
+      }) {
+      if let familyActivitySelectionStr = pair.value as? String {
+        let activitySelection = getActivitySelectionFromStr(
+          familyActivitySelectionStr: familyActivitySelectionStr
+        )
+        return activitySelection
+      }
+    }
+  }
+  return nil
+}
+
+@available(iOS 15.0, *)
+func getPossibleFamilyActivitySelectionId(
   applicationToken: ApplicationToken?,
   webDomainToken: WebDomainToken?,
   categoryToken: ActivityCategoryToken?
 ) -> String? {
-  let familyActivitySelectionToActivityNameMap = getFamilyActivitySelectionToActivityNameMap()
+  let familyActivitySelectionIds = getFamilyActivitySelectionIds()
 
-  let foundIt = familyActivitySelectionToActivityNameMap.first(where: { (mapping) in
+  let foundIt = familyActivitySelectionIds.first(where: { (mapping) in
     if let mapping = mapping {
       if let applicationToken = applicationToken {
         if mapping.selection.applicationTokens.contains(applicationToken) {
@@ -387,7 +406,7 @@ func getPossibleActivityName(
     return false
   })
 
-  return foundIt??.activityName
+  return foundIt??.id
 }
 
 @available(iOS 15.0, *)
diff --git a/src/ReactNativeDeviceActivity.types.ts b/src/ReactNativeDeviceActivity.types.ts
index 42a19261..a3dbb621 100644
--- a/src/ReactNativeDeviceActivity.types.ts
+++ b/src/ReactNativeDeviceActivity.types.ts
@@ -150,7 +150,7 @@ export type ShieldActions = {
 export type Action =
   | {
       type: "blockSelection";
-      familyActivitySelection: string;
+      familyActivitySelectionId: string;
       shieldId?: string;
     }
   | {
diff --git a/src/index.ts b/src/index.ts
index a21ca7f0..e60e44a6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -158,21 +158,21 @@ export const cleanUpAfterActivity = (activityName: string) => {
   );
 };
 
-export const updateFamilyActivitySelectionToActivityNameMap = ({
-  activityName,
+export const setFamilyActivitySelectionId = ({
+  id,
   familyActivitySelection,
 }: {
-  activityName: string;
+  id: string;
   familyActivitySelection: string;
 }) => {
   const previousValue =
     (ReactNativeDeviceActivityModule.userDefaultsGet(
-      "familyActivitySelectionToActivityNameMap",
+      "familyActivitySelectionIds",
     ) as Record<string, string>) ?? {};
 
-  userDefaultsSet("familyActivitySelectionToActivityNameMap", {
+  userDefaultsSet("familyActivitySelectionIds", {
     ...previousValue,
-    [activityName]: familyActivitySelection,
+    [id]: familyActivitySelection,
   });
 };
 
diff --git a/targets/ShieldConfiguration/ShieldConfigurationExtension.swift b/targets/ShieldConfiguration/ShieldConfigurationExtension.swift
index bbf011e5..19f481d5 100644
--- a/targets/ShieldConfiguration/ShieldConfigurationExtension.swift
+++ b/targets/ShieldConfiguration/ShieldConfigurationExtension.swift
@@ -104,7 +104,7 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
       "applicationOrDomainDisplayName": application.localizedDisplayName,
       "token": "\(application.token!.hashValue)",
       "tokenType": "application",
-      "activityName": getPossibleActivityName(
+      "familyActivitySelectionId": getPossibleFamilyActivitySelectionId(
         applicationToken: application.token,
         webDomainToken: nil,
         categoryToken: nil
@@ -127,7 +127,7 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
       "applicationOrDomainDisplayName": application.localizedDisplayName,
       "token": "\(category.token!.hashValue)",
       "tokenType": "application_category",
-      "activityName": getPossibleActivityName(
+      "familyActivitySelectionId": getPossibleFamilyActivitySelectionId(
         applicationToken: application.token,
         webDomainToken: nil,
         categoryToken: category.token
@@ -148,7 +148,7 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
       "applicationOrDomainDisplayName": webDomain.domain,
       "token": "\(webDomain.token!.hashValue)",
       "tokenType": "web_domain",
-      "activityName": getPossibleActivityName(
+      "familyActivitySelectionId": getPossibleFamilyActivitySelectionId(
         applicationToken: nil,
         webDomainToken: webDomain.token,
         categoryToken: nil
@@ -172,7 +172,7 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
       "applicationOrDomainDisplayName": webDomain.domain,
       "token": "\(category.token!.hashValue)",
       "tokenType": "web_domain_category",
-      "activityName": getPossibleActivityName(
+      "familyActivitySelectionId": getPossibleFamilyActivitySelectionId(
         applicationToken: nil,
         webDomainToken: webDomain.token,
         categoryToken: category.token

From 5339d44496b0d9b1ee067e3cb9a10a38881c0da0 Mon Sep 17 00:00:00 2001
From: Robert Herber <robert@kingstinct.com>
Date: Tue, 17 Dec 2024 00:48:01 +0100
Subject: [PATCH 2/3] Following up on some coderabbit suggestions

---
 example/components/CreateActivity.tsx |  4 ++--
 ios/Shared.swift                      | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/example/components/CreateActivity.tsx b/example/components/CreateActivity.tsx
index fa7a23f3..29e5e9a2 100644
--- a/example/components/CreateActivity.tsx
+++ b/example/components/CreateActivity.tsx
@@ -19,8 +19,8 @@ const startMonitoring = async (
   await requestPermissionsAsync();
 
   // ReactNativeDeviceActivity.setFamilyActivitySelectionId({
-  //   activityName,
-  //   familyActivitySelection: activitySelection,
+  //  id: activityName,
+  //  familyActivitySelection: activitySelection,
   // });
 
   const events: DeviceActivityEvent[] = [
diff --git a/ios/Shared.swift b/ios/Shared.swift
index 7440d61a..f7922f67 100644
--- a/ios/Shared.swift
+++ b/ios/Shared.swift
@@ -54,6 +54,8 @@ func executeAction(action: [String: Any], placeholders: [String: String?]) {
         sleep(ms: 50)
 
         blockSelectedApps(activitySelection: activitySelection)
+      } else {
+        logger.log("No familyActivitySelection found with ID: \(familyActivitySelectionId)")
       }
     }
   } else if type == "unblockAllApps" {
@@ -66,6 +68,7 @@ func executeAction(action: [String: Any], placeholders: [String: String?]) {
   } else if type == "blockAllApps" {
     updateShield(shieldId: action["shieldId"] as? String)
 
+    // sometimes the shield doesn't pick up the shield config change above, trying a sleep to get around it
     sleep(ms: 50)
 
     blockAllApps()
@@ -342,7 +345,7 @@ let store = ManagedSettingsStore()
 func getFamilyActivitySelectionIds() -> [FamilyActivitySelectionWithId?] {
   if let familyActivitySelectionIds = userDefaults?.dictionary(
     forKey: "familyActivitySelectionIds") {
-    return familyActivitySelectionIds.map { (key: String, value: Any) in
+    return familyActivitySelectionIds.compactMap { (key: String, value: Any) in
       if let familyActivitySelectionStr = value as? String {
         let activitySelection = getActivitySelectionFromStr(
           familyActivitySelectionStr: familyActivitySelectionStr)
@@ -358,17 +361,11 @@ func getFamilyActivitySelectionIds() -> [FamilyActivitySelectionWithId?] {
 @available(iOS 15.0, *)
 func getFamilyActivitySelectionById(id: String) -> FamilyActivitySelection? {
   if let familyActivitySelectionIds = userDefaults?.dictionary(forKey: "familyActivitySelectionIds") {
-    if let pair =
-      familyActivitySelectionIds
-      .first(where: { (key: String, _: Any) in
-        return key == id
-      }) {
-      if let familyActivitySelectionStr = pair.value as? String {
-        let activitySelection = getActivitySelectionFromStr(
-          familyActivitySelectionStr: familyActivitySelectionStr
-        )
-        return activitySelection
-      }
+    if let familyActivitySelectionStr = familyActivitySelectionIds[id] as? String {
+      let activitySelection = getActivitySelectionFromStr(
+        familyActivitySelectionStr: familyActivitySelectionStr
+      )
+      return activitySelection
     }
   }
   return nil

From edc57162b1cf3b8676964c016213a28526fee0cd Mon Sep 17 00:00:00 2001
From: Robert Herber <robert@kingstinct.com>
Date: Tue, 17 Dec 2024 00:56:40 +0100
Subject: [PATCH 3/3] v0.0.28

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b5dc87a8..f1f51fa3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-device-activity",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Provides access to Apples DeviceActivity API",
   "main": "build/index.js",
   "types": "build/index.d.ts",