[INTENG-19921] Fixed custom data not being properly included (#31)

* Fixed getContentFromEvent function

* Fixed space

* Update to logic

* Updated version

Author: nsingh-branch

AdobeBranchExtension.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "AdobeBranchExtension"
-  s.version          = "3.0.0"
+  s.version          = "3.1.0"
   s.summary          = "The Branch extension for Adobe Cloud Platform on iOS."
 
   s.description      = <<-DESC
@@ -26,5 +26,5 @@ Pod::Spec.new do |s|
   s.dependency 'AEPLifecycle',   '~> 4.2.0'
   s.dependency 'AEPIdentity',    '~> 4.2.0'
   s.dependency 'AEPSignal',      '~> 4.2.0'
-  s.dependency 'BranchSDK',      '~> 3.0.1'
+  s.dependency 'BranchSDK',      '~> 3.2.0'
 end

AdobeBranchExtension/Classes/AdobeBranchExtensionClass.m

@@ -198,7 +198,7 @@ - (void)handleEvent:(AEPEvent*)event {
     for (id<NSObject> key in dictionary_.keyEnumerator) {
         NSString *stringValue = BNCStringWithObject(dictionary_[key]);
         NSString *stringKey = BNCStringWithObject(key);
-        if (stringKey.length && stringValue.length) dictionary[stringKey] = stringValue;
+        if (stringKey.length && stringValue != nil) dictionary[stringKey] = stringValue;
     }
     return dictionary;
 }
@@ -283,16 +283,13 @@ - (void) trackEvent:(AEPEvent*)event {
     NSArray *parameters = [hitUrl componentsSeparatedByString:@"&"];
     NSMutableDictionary *content = [[NSMutableDictionary alloc] init];
 
-    NSArray *keys = @[@"category", @"currency", @"name", @"revenue", @"shipping", @"tax", @"coupon" ,@"sku", @"timestamp", @"transaction_id", @"affiliation", @"title", @"description", @"query"];
-    
     for (NSString *param in parameters) {
-        for (NSString *key in keys) {
-            if ([param containsString:[NSString stringWithFormat:@"%@=", key]]) {
-                NSString *value = [[param componentsSeparatedByString:@"="] lastObject];
-                value = [value stringByRemovingPercentEncoding];
-                [content setObject:value forKey:key];
-                break;
-            }
+        NSArray *keyValue = [param componentsSeparatedByString:@"="];
+        if (keyValue.count == 2) {
+            NSString *key = keyValue[0];
+            NSString *value = keyValue[1];
+            value = [value stringByRemovingPercentEncoding];
+            [content setObject:value forKey:key];
         }
     }
 

Examples/AdobeBranchExample/AdobeBranchExample/ProductListViewController.m

@@ -124,6 +124,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             @"timestamp":       [NSDate date].description,
             @"category":        @"Apparel & Accessories",
             @"sku":             @"sku-bee-doo",
+            @"adobeTestID" :    @"12345",
+            @"myCustomValue":   @"Glasses",
+            @"emptyValue":      @""
         }];
         break;
     }}