Break out isShieldActive

kingstinct · Dec 10, 2024 · c11e530 · c11e530
1 parent 2781606
commit c11e530
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/ios/ReactNativeDeviceActivityModule.swift b/ios/ReactNativeDeviceActivityModule.swift
@@ -470,25 +470,12 @@ public class ReactNativeDeviceActivityModule: Module {
     }
 
     Function("isShieldActive") {
-      let areAnyApplicationsShielded =
-        store.shield.applications != nil && store.shield.applications!.count > 0
-      let areAnyWebDomainsShielded =
-        store.shield.webDomains != nil && store.shield.webDomains!.count > 0
-      let areAnyApplicationCategoriesShielded =
-        store.shield.applicationCategories != nil
-        && store.shield.applicationCategories
-          != ShieldSettings.ActivityCategoryPolicy<Application>.none
-      let areAnyWebDomainCategoriesShielded =
-        store.shield.webDomainCategories != nil
-        && store.shield.webDomainCategories != ShieldSettings.ActivityCategoryPolicy<WebDomain>.none
-
-      return areAnyApplicationsShielded || areAnyWebDomainsShielded
-        || areAnyApplicationCategoriesShielded || areAnyWebDomainCategoriesShielded
+      return isShieldActive()
     }
 
     Function("isShieldActiveWithSelection") { (familyActivitySelectionStr: String) -> Bool in
-      let isShieldActive = isShieldActive()
-      if !isShieldActive {
+      let _isShieldActive = isShieldActive()
+      if !_isShieldActive {
         return false
       }
 

diff --git a/ios/Shared.swift b/ios/Shared.swift
@@ -85,6 +85,24 @@ func executeAction(action: [String: Any], placeholders: [String: String?]) {
   }
 }
 
+@available(iOS 15.0, *)
+func isShieldActive() -> Bool {
+  let areAnyApplicationsShielded =
+    store.shield.applications != nil && store.shield.applications!.count > 0
+  let areAnyWebDomainsShielded =
+    store.shield.webDomains != nil && store.shield.webDomains!.count > 0
+  let areAnyApplicationCategoriesShielded =
+    store.shield.applicationCategories != nil
+    && store.shield.applicationCategories
+      != ShieldSettings.ActivityCategoryPolicy<Application>.none
+  let areAnyWebDomainCategoriesShielded =
+    store.shield.webDomainCategories != nil
+    && store.shield.webDomainCategories != ShieldSettings.ActivityCategoryPolicy<WebDomain>.none
+
+  return areAnyApplicationsShielded || areAnyWebDomainsShielded
+    || areAnyApplicationCategoriesShielded || areAnyWebDomainCategoriesShielded
+}
+
 func openUrl(urlString: String) {
   guard let url = URL(string: urlString) else {
     return  // be safe