MobileCore.registerEventListener enhancement (#559)

* update public API: registerEventListener * update the test project and do some manual tests for public API -> registerEventListener * update Podfile.lock * format
adobe · Mar 4, 2021 · 50829b3 · 50829b3
1 parent d3d244d
commit 50829b3
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 345 deletions.
diff --git a/AEPCore/Sources/core/MobileCore.swift b/AEPCore/Sources/core/MobileCore.swift
@@ -108,14 +108,18 @@ public final class MobileCore: NSObject {
         EventHub.shared.dispatch(event: event)
     }
 
-    /// Registers an `EventListener` which will be invoked whenever a event with matched type and source is dispatched
+    /// Registers an `EventListener` to perform on the global system queue (Qos = .default) which will be invoked whenever an event with matched type and source is dispatched.
     /// - Parameters:
     ///   - type: A `String` indicating the event type the current listener is listening for
     ///   - source: A `String` indicating the event source the current listener is listening for
-    ///   - listener: An `EventResponseListener` which will be invoked whenever the `EventHub` receives a event with matched type and source
+    ///   - listener: An `EventResponseListener` which will be invoked whenever the `EventHub` receives an event with matched type and source.
     @objc(registerEventListenerWithType:source:listener:)
     public static func registerEventListener(type: String, source: String, listener: @escaping EventListener) {
-        EventHub.shared.registerEventListener(type: type, source: source, listener: listener)
+        EventHub.shared.registerEventListener(type: type, source: source) { event in
+            DispatchQueue.global(qos: .default).async {
+                listener(event)
+            }
+        }
     }
 
     /// Submits a generic event containing the provided IDFA with event type `generic.identity`.

diff --git a/AEPServices/Sources/ui/fullscreen/FullscreenMessage.swift b/AEPServices/Sources/ui/fullscreen/FullscreenMessage.swift
@@ -166,7 +166,7 @@ public class FullscreenMessage: NSObject, WKNavigationDelegate, FullscreenPresen
     private func getConfiguredWebview(newFrame: CGRect) -> WKWebView {
         let webViewConfiguration = WKWebViewConfiguration()
 
-        //Fix for media playback.
+        // Fix for media playback.
         webViewConfiguration.allowsInlineMediaPlayback = true // Plays Media inline
         webViewConfiguration.mediaTypesRequiringUserActionForPlayback = []
         let wkWebView = WKWebView(frame: newFrame, configuration: webViewConfiguration)

diff --git a/AEPServices/Sources/utility/unzip/URL+Validator.swift b/AEPServices/Sources/utility/unzip/URL+Validator.swift
@@ -9,6 +9,8 @@
  governing permissions and limitations under the License.
  */
 
+import Foundation
+
 extension URL {
     ///
     /// Validates a URL against a Zip Slip attack. Simply checks if there is any sort of traversal attempted in the url

diff --git a/Podfile.lock b/Podfile.lock
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 31a9899de6250afde3d420f3c919cf16beb8dc75
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
diff --git a/TestApps/AEPCoreTestApp.xcodeproj/project.pbxproj b/TestApps/AEPCoreTestApp.xcodeproj/project.pbxproj
diff --git a/TestApps/AEPCoreTestApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TestApps/AEPCoreTestApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,7 +6,7 @@
         "repositoryURL": "https://github.com/adobe/aepsdk-rulesengine-ios.git",
         "state": {
           "branch": "main",
-          "revision": "8815389caf92bd8886b72e9e4e1cb05176cb2767",
+          "revision": "1e270654b330b9f07a6b1ec374e686f2e631e039",
           "version": null
         }
       }

diff --git a/TestApps/PerformanceApp/ContentView.swift b/TestApps/PerformanceApp/ContentView.swift
@@ -67,6 +67,26 @@ struct ContentView: View {
                             usleep(100)
                         }
                     }
+//                    let type = "test.type"
+//                    let source = "test.source"
+//                    MobileCore.registerEventListener(type: type, source: source){event in
+//                        while (true){
+//                            print("sleep for 2 seconds.")
+//                            sleep(2)
+//                        }
+//                    }
+//                    MobileCore.registerEventListener(type: type, source: source){event in
+//                        if let dataValue = event.data?["key"] as? String {
+//                            print("==== \(dataValue)")
+//                        }else{
+//                            print("==== data key not exists")
+//                        }
+//                    }
+//                    for n in 0..<10{
+//                        MobileCore.dispatch(event: Event(name: "test event", type: type, source: source, data:
+//                                                            ["key":"value_\(n)"]))
+//                    }
+
                 }) {
                     Text("Evaluate Rules")
                         .frame(minWidth: 0, maxWidth: .infinity)