Dropping the idea of customizing per token

robertherber · robertherber · commit 4629d533fc71 · 2024-11-15T14:58:14.000+01:00
diff --git a/example/App.tsx b/example/App.tsx
@@ -142,8 +142,10 @@ const startMonitoring = (activitySelection: string) => {
         },
         shieldConfiguration: {
           backgroundBlurStyle: UIBlurEffectStyle.prominent,
-          title: "{appname} Blocked by Zabit",
+          title: "{applicationOrDomainDisplayName} Blocked by Zabit",
           subtitle: "You have reached your limit! {token} {tokenType}",
+          primaryButtonLabel: "Give me 5 more minutes",
+          secondaryButtonLabel: "Close",
           titleColor: {
             red: 255,
             green: 0.329 * 255,
@@ -192,9 +194,13 @@ export default function App() {
   const [authorizationStatus, setAuthorizationStatus] =
     React.useState<AuthorizationStatus | null>(null);
 
-  /*console.log(
-    JSON.stringify(ReactNativeDeviceActivity.userDefaultsAll(), null, 2),
-  );*/
+  console.log(
+    JSON.stringify(
+      ReactNativeDeviceActivity.userDefaultsGet("shieldActions"),
+      null,
+      2,
+    ),
+  );
 
   const [familyActivitySelection, setFamilyActivitySelection] = React.useState<
     string | null
diff --git a/example/targets/ActivityMonitorExtension/DeviceActivityMonitorExtension.swift b/example/targets/ActivityMonitorExtension/DeviceActivityMonitorExtension.swift
@@ -93,6 +93,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
                 // update default shield
                 userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration")
                 
+                /* ok so this does not work, tokens change across executions
                 activitySelection.applicationTokens.forEach { applicationToken in
                   userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration_for_application_\(applicationToken.hashValue)")
                 }
@@ -104,9 +105,12 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
                 activitySelection.webDomainTokens.forEach { webDomainToken in
                   userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration_for_domain_\(webDomainToken.hashValue)")
                 }
+                */
               }
               
               if let shieldActions = action["shieldActions"] as? Dictionary<String, Any> {
+                userDefaults?.set(shieldActions, forKey: "shieldActions")
+                /*
                 activitySelection.applicationTokens.forEach { applicationToken in
                   userDefaults?.set(shieldActions, forKey: "shieldActions_for_application_\(applicationToken.hashValue)")
                 }
@@ -118,6 +122,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
                 activitySelection.webDomainTokens.forEach { webDomainToken in
                   userDefaults?.set(shieldActions, forKey: "shieldActions_for_domain_\(webDomainToken.hashValue)")
                 }
+                */
               }
             }
           }
diff --git a/example/targets/ShieldAction/ShieldActionExtension.swift b/example/targets/ShieldAction/ShieldActionExtension.swift
@@ -67,7 +67,7 @@ func handleAction(dict: [String: Any]) -> ShieldActionResponse {
 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: "shieldAction_for_application_\(application.hashValue)") {
+    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)
@@ -81,7 +81,7 @@ class ShieldActionExtension: ShieldActionDelegate {
   
   override func handle(action: ShieldAction, for webDomain: WebDomainToken, completionHandler: @escaping (ShieldActionResponse) -> Void) {
     logger.log("handle domain")
-    if let obj = userDefaults?.dictionary(forKey: "shieldAction_for_domain_\(webDomain.hashValue)") {
+    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)
@@ -97,7 +97,7 @@ class ShieldActionExtension: ShieldActionDelegate {
     logger.log("handle category")
     // openUrl(urlString: "device-activity://")
 
-    if let obj = userDefaults?.dictionary(forKey: "shieldAction_for_category_\(category.hashValue)") {
+    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)
diff --git a/targets/ActivityMonitorExtension/DeviceActivityMonitorExtension.swift b/targets/ActivityMonitorExtension/DeviceActivityMonitorExtension.swift
@@ -93,6 +93,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
                 // update default shield
                 userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration")
                 
+                /* ok so this does not work, tokens change across executions
                 activitySelection.applicationTokens.forEach { applicationToken in
                   userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration_for_application_\(applicationToken.hashValue)")
                 }
@@ -104,9 +105,12 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
                 activitySelection.webDomainTokens.forEach { webDomainToken in
                   userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration_for_domain_\(webDomainToken.hashValue)")
                 }
+                */
               }
               
               if let shieldActions = action["shieldActions"] as? Dictionary<String, Any> {
+                userDefaults?.set(shieldActions, forKey: "shieldActions")
+                /*
                 activitySelection.applicationTokens.forEach { applicationToken in
                   userDefaults?.set(shieldActions, forKey: "shieldActions_for_application_\(applicationToken.hashValue)")
                 }
@@ -118,6 +122,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {
                 activitySelection.webDomainTokens.forEach { webDomainToken in
                   userDefaults?.set(shieldActions, forKey: "shieldActions_for_domain_\(webDomainToken.hashValue)")
                 }
+                */
               }
             }
           }
diff --git a/targets/ShieldAction/ShieldActionExtension.swift b/targets/ShieldAction/ShieldActionExtension.swift
@@ -67,7 +67,7 @@ func handleAction(dict: [String: Any]) -> ShieldActionResponse {
 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: "shieldAction_for_application_\(application.hashValue)") {
+    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)
@@ -81,7 +81,7 @@ class ShieldActionExtension: ShieldActionDelegate {
   
   override func handle(action: ShieldAction, for webDomain: WebDomainToken, completionHandler: @escaping (ShieldActionResponse) -> Void) {
     logger.log("handle domain")
-    if let obj = userDefaults?.dictionary(forKey: "shieldAction_for_domain_\(webDomain.hashValue)") {
+    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)
@@ -97,7 +97,7 @@ class ShieldActionExtension: ShieldActionDelegate {
     logger.log("handle category")
     // openUrl(urlString: "device-activity://")
 
-    if let obj = userDefaults?.dictionary(forKey: "shieldAction_for_category_\(category.hashValue)") {
+    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)

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {`
`93`	`93`	`// update default shield`
`94`	`94`	`userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration")`
`95`	`95`
	`96`	`+ /* ok so this does not work, tokens change across executions`
`96`	`97`	`activitySelection.applicationTokens.forEach { applicationToken in`
`97`	`98`	`userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration_for_application_\(applicationToken.hashValue)")`
`98`	`99`	`}`
`@@ -104,9 +105,12 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {`
`104`	`105`	`activitySelection.webDomainTokens.forEach { webDomainToken in`
`105`	`106`	`userDefaults?.set(shieldConfiguration, forKey: "shieldConfiguration_for_domain_\(webDomainToken.hashValue)")`
`106`	`107`	`}`
	`108`	`+ */`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`if let shieldActions = action["shieldActions"] as? Dictionary<String, Any> {`
	`112`	`+ userDefaults?.set(shieldActions, forKey: "shieldActions")`
	`113`	`+ /*`
`110`	`114`	`activitySelection.applicationTokens.forEach { applicationToken in`
`111`	`115`	`userDefaults?.set(shieldActions, forKey: "shieldActions_for_application_\(applicationToken.hashValue)")`
`112`	`116`	`}`
`@@ -118,6 +122,7 @@ class DeviceActivityMonitorExtension: DeviceActivityMonitor {`
`118`	`122`	`activitySelection.webDomainTokens.forEach { webDomainToken in`
`119`	`123`	`userDefaults?.set(shieldActions, forKey: "shieldActions_for_domain_\(webDomainToken.hashValue)")`
`120`	`124`	`}`
	`125`	`+ */`
`121`	`126`	`}`
`122`	`127`	`}`
`123`	`128`	`}`