Merge pull request #352 from Countly/content-improvements

Added additional checks for content after testing

Author: turtledreams

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## xx.xx.xx
+* Mitigated an issue with content action json parsing due to json encoding
 * Mitigated an issue where pausing a view resulted in a '0' view duration.
 * Mitigated an issue where an internal timer was not reset when going to foreground for `autoStoppedViews`
 * Mitigated an issue for `autoStoppedViews` could have not started when multiple views were open at the same time while going to foreground

CountlyWebViewManager.m

@@ -96,16 +96,23 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
     if ([url hasPrefix:@"https://countly_action_event"] && [url containsString:@"cly_x_action_event=1"]) {
         NSDictionary *queryParameters = [self parseQueryString:url];
         NSString *action = queryParameters[@"action"];
-        
-        if ([action isEqualToString:@"event"]) {
-            NSString *eventsJson = queryParameters[@"event"];
-            [self recordEventsWithJSONString:eventsJson];
-        } else if ([action isEqualToString:@"link"]) {
-            NSString *link = queryParameters[@"link"];
-            [self openExternalLink:link];
-        } else if ([action isEqualToString:@"resize_me"]) {
-            NSString *resize = queryParameters[@"resize_me"];
-            [self resizeWebViewWithJSONString:resize];
+        if(action) {
+            if ([action isEqualToString:@"event"]) {
+                NSString *eventsJson = queryParameters[@"event"];
+                if(eventsJson) {
+                    [self recordEventsWithJSONString:eventsJson];
+                }
+            } else if ([action isEqualToString:@"link"]) {
+                NSString *link = queryParameters[@"link"];
+                if(link) {
+                    [self openExternalLink:link];
+                }
+            } else if ([action isEqualToString:@"resize_me"]) {
+                NSString *resize = queryParameters[@"resize_me"];
+                if(resize) {
+                    [self resizeWebViewWithJSONString:resize];
+                }
+            }
         }
 
         if ([queryParameters[@"close"] boolValue]) {
@@ -182,12 +189,30 @@ - (NSDictionary *)parseQueryString:(NSString *)url {
 }
 
 - (void)recordEventsWithJSONString:(NSString *)jsonString {
-    NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-    NSArray *events = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+    // Decode the URL-encoded JSON string
+    NSString *decodedString = [jsonString stringByRemovingPercentEncoding];
+    
+    // Convert the decoded string to NSData
+    NSData *data = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
+    
+    // Parse the JSON data
+    NSError *error = nil;
+    NSArray *events = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    
+    if (error) {
+        NSLog(@"Error parsing JSON: %@", error);
+    } else {
+        NSLog(@"Parsed JSON: %@", events);
+    }
+
 
     for (NSDictionary *event in events) {
         NSString *key = event[@"key"];
         NSDictionary *segmentation = event[@"sg"];
+        if(!key) {
+            CLY_LOG_I(@"Skipping the event due to key is empty or nil");
+            continue;
+        }
         if(!segmentation) {
             CLY_LOG_I(@"Skipping the event due to missing segmentation");
             continue;
@@ -211,22 +236,55 @@ - (void)openExternalLink:(NSString *)urlString {
 }
 
 - (void)resizeWebViewWithJSONString:(NSString *)jsonString {
-    NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *resizeDict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
 
+    // Decode the URL-encoded JSON string
+    NSString *decodedString = [jsonString stringByRemovingPercentEncoding];
+    
+    // Convert the decoded string to NSData
+    NSData *data = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
+    
+    // Parse the JSON data
+    NSError *error = nil;
+    NSDictionary *resizeDict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    
+    if (!resizeDict) {
+        CLY_LOG_I(@"Resize dictionary should not be empty or nil. Error: %@", error);
+        return;
+    }
+    
+    // Ensure resizeDict is a dictionary
+    if (![resizeDict isKindOfClass:[NSDictionary class]]) {
+        CLY_LOG_I(@"Resize dictionary should be of type NSDictionary");
+        return;
+    }
+    
+    // Retrieve portrait and landscape dimensions
     NSDictionary *portraitDimensions = resizeDict[@"p"];
     NSDictionary *landscapeDimensions = resizeDict[@"l"];
 
+    if (!portraitDimensions && !landscapeDimensions) {
+        CLY_LOG_I(@"Resize dimensions should not be empty or nil");
+        return;
+    }
+    
+    // Determine the current orientation
     UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
     BOOL isLandscape = UIInterfaceOrientationIsLandscape(orientation);
 
+    // Select the appropriate dimensions based on orientation
     NSDictionary *dimensions = isLandscape ? landscapeDimensions : portraitDimensions;
 
+    // Get the dimension values
+    CGFloat x = [dimensions[@"x"] floatValue];
+    CGFloat y = [dimensions[@"y"] floatValue];
     CGFloat width = [dimensions[@"w"] floatValue];
     CGFloat height = [dimensions[@"h"] floatValue];
 
+    // Animate the resizing of the web view
     [UIView animateWithDuration:0.3 animations:^{
         CGRect frame = self.backgroundView.webView.frame;
+        frame.origin.x = x;
+        frame.origin.y = y;
         frame.size.width = width;
         frame.size.height = height;
         self.backgroundView.webView.frame = frame;
@@ -236,6 +294,7 @@ - (void)resizeWebViewWithJSONString:(NSString *)jsonString {
 }
 
 
+
 - (void)closeWebView {
     dispatch_async(dispatch_get_main_queue(), ^{
         if (self.dismissBlock) {