Merge pull request #15287 from brave/js/register-components-ios

[iOS] Allow registering both legacy and raw adblock components
brave · Nov 25, 2022 · 2b986e4 · 2b986e4
2 parents 50ebdb9 + fbe2ece
commit 2b986e4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/ios/browser/api/brave_shields/adblock_service.h b/ios/browser/api/brave_shields/adblock_service.h
@@ -28,15 +28,14 @@ OBJC_EXPORT
 
 /// Registers a filter list with the component updater and calls
 /// `componentReady` each time the component is updated
-- (void)registerFilterListComponent:(AdblockFilterListCatalogEntry*)filterList
-                     componentReady:
-                         (void (^)(AdblockFilterListCatalogEntry* filterList,
-                                   NSString* _Nullable installPath))
-                             componentReady;
+- (void)registerFilterListComponent:(AdblockFilterListCatalogEntry*)entry
+                 useLegacyComponent:(bool)useLegacyComponent
+                     componentReady:(void (^)(NSString* _Nullable installPath))
+                                        componentReady;
 
 /// Unregisters a filter list with the component updater
-- (void)unregisterFilterListComponent:
-    (AdblockFilterListCatalogEntry*)filterList;
+- (void)unregisterFilterListComponent:(AdblockFilterListCatalogEntry*)entry
+                   useLegacyComponent:(bool)useLegacyComponent;
 
 - (instancetype)init NS_UNAVAILABLE;
 

diff --git a/ios/browser/api/brave_shields/adblock_service.mm b/ios/browser/api/brave_shields/adblock_service.mm
@@ -75,22 +75,32 @@ - (void)adblockComponentDidBecomeReady:(base::FilePath)install_path {
 }
 
 - (void)registerFilterListComponent:(AdblockFilterListCatalogEntry*)entry
-                     componentReady:
-                         (void (^)(AdblockFilterListCatalogEntry* entry,
-                                   NSString* _Nullable installPath))
-                             componentReady {
+                 useLegacyComponent:(bool)useLegacyComponent
+                     componentReady:(void (^)(NSString* _Nullable installPath))
+                                        componentReady {
+  std::string base64PublicKey = base::SysNSStringToUTF8(entry.base64PublicKey);
+  std::string componentId = base::SysNSStringToUTF8(entry.componentId);
+
+  if (useLegacyComponent) {
+    base64PublicKey = base::SysNSStringToUTF8(entry.iosBase64PublicKey);
+    componentId = base::SysNSStringToUTF8(entry.iosComponentId);
+  }
+
   brave_shields::RegisterAdBlockFiltersComponent(
-      _cus, base::SysNSStringToUTF8(entry.iosBase64PublicKey),
-      base::SysNSStringToUTF8(entry.iosComponentId),
-      base::SysNSStringToUTF8(entry.title),
+      _cus, base64PublicKey, componentId, base::SysNSStringToUTF8(entry.title),
       base::BindRepeating(^(const base::FilePath& install_path) {
         const auto installPath = base::SysUTF8ToNSString(install_path.value());
-        componentReady(entry, installPath);
+        componentReady(installPath);
       }));
 }
 
-- (void)unregisterFilterListComponent:(AdblockFilterListCatalogEntry*)entry {
-  _cus->UnregisterComponent(base::SysNSStringToUTF8(entry.iosComponentId));
+- (void)unregisterFilterListComponent:(AdblockFilterListCatalogEntry*)entry
+                   useLegacyComponent:(bool)useLegacyComponent {
+  if (useLegacyComponent) {
+    _cus->UnregisterComponent(base::SysNSStringToUTF8(entry.iosComponentId));
+  } else {
+    _cus->UnregisterComponent(base::SysNSStringToUTF8(entry.componentId));
+  }
 }
 
 @end