Merge pull request #305 from BranchMetrics/native-field-mappings

Fix bad field mappings

Author: jdee

android/src/main/java/io/branch/rnbranch/RNBranchModule.java

@@ -654,8 +654,8 @@ public ContentMetadata createContentMetadata(ReadableMap map) {
         }
 
         if (map.hasKey("productCategory")) {
-            ProductCategory category = ProductCategory.valueOf(map.getString("productCategory"));
-            metadata.setProductCategory(category);
+            ProductCategory category = getProductCategory(map.getString("productCategory"));
+            if (category != null) metadata.setProductCategory(category);
         }
 
         if (map.hasKey("productVariant")) {
@@ -809,6 +809,18 @@ else if (mode.equals("public"))
         return branchUniversalObject;
     }
 
+    @Nullable
+    public ProductCategory getProductCategory(final String stringValue) {
+        ProductCategory[] possibleValues = ProductCategory.class.getEnumConstants();
+        for (ProductCategory value: possibleValues) {
+            if (stringValue.equals(value.getName())) {
+                return value;
+            }
+        }
+        Log.w(REACT_CLASS, "Could not find product category " + stringValue);
+        return null;
+    }
+
     @ReactMethod
     public void redeemRewards(int value, String bucket, Promise promise)
     {

ios/BranchContentMetadata+RNBranch.m

@@ -35,7 +35,7 @@ @implementation BranchContentMetadata(RNBranch)
           @"addressCity": [RNBranchProperty propertyWithSetterSelector:@selector(setAddressCity:) type:NSString.class],
           @"addressRegion": [RNBranchProperty propertyWithSetterSelector:@selector(setAddressRegion:) type:NSString.class],
           @"addressCountry": [RNBranchProperty propertyWithSetterSelector:@selector(setAddressCountry:) type:NSString.class],
-          @"addressPostalCode": [RNBranchProperty propertyWithSetterSelector:@selector(setPostalCode:) type:NSString.class],
+          @"addressPostalCode": [RNBranchProperty propertyWithSetterSelector:@selector(setAddressPostalCode:) type:NSString.class],
           @"latitude": [RNBranchProperty propertyWithSetterSelector:@selector(setLatitudeWithNumber:) type:NSNumber.class],
           @"longitude": [RNBranchProperty propertyWithSetterSelector:@selector(setLongitudeWithNumber:) type:NSNumber.class],
           @"imageCaptions": [RNBranchProperty propertyWithSetterSelector:@selector(setImageCaptionsWithArray:) type:NSArray.class],

ios/RNBranch.m

@@ -374,7 +374,7 @@ - (BranchUniversalObject *)findUniversalObjectWithIdent:(NSString *)ident reject
     resolve(NSNull.null);
 }
 
-#pragma mark logEventWithUniversalObjects
+#pragma mark logEvent
 RCT_EXPORT_METHOD(
                   logEvent:(NSArray *)identifiers
                   eventName:(NSString *)eventName