Merge pull request #124 from antonargunov/master

antonargunov · web-flow · commit 61047966394d · 2020-04-02T00:13:36.000+03:00
version 7.0.3
diff --git a/Branch-Xamarin-Lib.iOS/ApiDefinition.cs b/Branch-Xamarin-Lib.iOS/ApiDefinition.cs
@@ -2769,13 +2769,13 @@ interface BranchEvent
         BranchEventAdType AdType { get; set; }
 
         // @property (copy, nonatomic) NSArray<BranchUniversalObject *> * _Nonnull contentItems;
-        [Export("contentItems", ArgumentSemantic.Copy)]
+        [Export("contentItems", ArgumentSemantic.Strong)]
         //BranchUniversalObject[] ContentItems { get; set; }
-        NSMutableArray<NSObject> ContentItems { get; set; }
+        NSArray ContentItems { get; set; }
 
         // @property (copy, nonatomic) NSDictionary<NSString *,NSString *> * _Nonnull customData;
-        [Export("customData", ArgumentSemantic.Copy)]
-        NSMutableDictionary<NSString, NSString> CustomData { get; set; }
+        [Export("customData", ArgumentSemantic.Strong)]
+        NSDictionary<NSString, NSString> CustomData { get; set; }
 
         // -(void)logEvent;
         [Export("logEvent")]
diff --git a/Branch-Xamarin-SDK.Droid/Resources/Resource.designer.cs b/Branch-Xamarin-SDK.Droid/Resources/Resource.designer.cs
diff --git a/Branch-Xamarin-SDK.iOS/BranchIOSUtils.cs b/Branch-Xamarin-SDK.iOS/BranchIOSUtils.cs
@@ -354,18 +354,26 @@ public static void SendEvent(BranchEvent e) {
             }
             if (eventDict.ContainsKey("custom_data")) {
                 Dictionary<string, string> dict = eventDict[@"custom_data"] as Dictionary<string, string>;
+                NSMutableDictionary<NSString, NSString> tempDict = new NSMutableDictionary<NSString, NSString>();
 
                 foreach(string key in dict.Keys) {
-                    branchEvent.CustomData.Add(new NSString(key), new NSString(dict[key]));
+                    tempDict.Add(new NSString(key), new NSString(dict[key]));
                 }
+
+                branchEvent.CustomData = new NSDictionary<NSString, NSString>(tempDict.Keys, tempDict.Values);
             }
 
             if (eventDict.ContainsKey("content_items")) {
                 List<string> array = eventDict["content_items"] as List<string>;
+                NSMutableDictionary<NSObject, NSObject> tempDict = new NSMutableDictionary<NSObject, NSObject>();
 
+                int i = 1;
                 foreach (string buoJson in array) {
-                    branchEvent.ContentItems.Add(ToNativeUniversalObject(new BranchUniversalObject(buoJson)));
+                    tempDict.Add(NSObject.FromObject(i), ToNativeUniversalObject(new BranchUniversalObject(buoJson)));
+                    ++i;
                 }
+
+                branchEvent.ContentItems = NSArray.FromNSObjects<NSObject>(tempDict.Values);
             }
                 
             branchEvent.LogEvent();
diff --git a/Branch-Xamarin-SDK/Model/BranchUniversalObject.cs b/Branch-Xamarin-SDK/Model/BranchUniversalObject.cs
@@ -148,7 +148,8 @@ public void loadFromDictionary(Dictionary<string, object> data)
             {
                 if (data["metadata"] != null)
                 {
-                    Dictionary<string, object> metaTemp = data["metadata"] as Dictionary<string, object>;
+                    //Dictionary<string, object> metaTemp = data["metadata"] as Dictionary<string, object>;
+                    Dictionary<string, object> metaTemp = JsonConvert.DeserializeObject<Dictionary<string, object>>(data["metadata"] as string);
 
                     if (metaTemp != null)
                     {
diff --git a/Branch-Xamarin-Testbed.Droid/Resources/Resource.designer.cs b/Branch-Xamarin-Testbed.Droid/Resources/Resource.designer.cs
diff --git a/Branch-Xamarin-Testbed.iOS/Branch-Xamarin-Testbed.iOS.csproj b/Branch-Xamarin-Testbed.iOS/Branch-Xamarin-Testbed.iOS.csproj
@@ -152,14 +152,14 @@
         <Project>{5F491888-E3EF-4A87-9296-75908B2DB31C}</Project>
         <Name>Branch-Xamarin-SDK</Name>
       </ProjectReference>
-      <ProjectReference Include="..\Branch-Xamarin-SDK.iOS\Branch-Xamarin-SDK.iOS.csproj">
-        <Project>{3F24A531-821D-4E9B-9776-31E19ABAF087}</Project>
-        <Name>Branch-Xamarin-SDK.iOS</Name>
-      </ProjectReference>
       <ProjectReference Include="..\Branch-Xamarin-Testbed\Branch-Xamarin-Testbed.csproj">
         <Project>{6CEB1D9B-7A7B-420E-8CA2-AAD59116F2A8}</Project>
         <Name>Branch-Xamarin-Testbed</Name>
       </ProjectReference>
+      <ProjectReference Include="..\Branch-Xamarin-SDK.iOS\Branch-Xamarin-SDK.iOS.csproj">
+        <Project>{3F24A531-821D-4E9B-9776-31E19ABAF087}</Project>
+        <Name>Branch-Xamarin-SDK.iOS</Name>
+      </ProjectReference>
     </ItemGroup>
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 Branch Xamarin SDK change log
 
+- 7.0.3
+  * Fixing InvalidCastException when adding custom data to branch event on IOS 
+  * Fixing empty content items in branch event on IOS
+
 - 7.0.2
   * Supporting 'customer_event_alias' field
 
diff --git a/NuGet/Branch-Xamarin-Linking-SDK.7.0.3.nupkg b/NuGet/Branch-Xamarin-Linking-SDK.7.0.3.nupkg
diff --git a/NuGet/Branch-Xamarin-SDK.nuspec b/NuGet/Branch-Xamarin-SDK.nuspec
@@ -4,7 +4,7 @@
     <id>Branch-Xamarin-Linking-SDK</id>
     <title>Branch Xamarin SDK</title>
     <summary>Hosted deep links for your Xamarin-based Android or iOS app by Branch</summary>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <authors>Branch Metrics, Inc.</authors>
     <owners>Branch Metrics, Inc.</owners>
 <!--     <iconUrl> https://s3-us-west-1.amazonaws.com/branchhost/branch_icon.png</iconUrl> -->

Original file line number	Diff line number	Diff line change
`@@ -354,18 +354,26 @@ public static void SendEvent(BranchEvent e) {`
`354`	`354`	`}`
`355`	`355`	`if (eventDict.ContainsKey("custom_data")) {`
`356`	`356`	`Dictionary<string, string> dict = eventDict[@"custom_data"] as Dictionary<string, string>;`
	`357`	`+ NSMutableDictionary<NSString, NSString> tempDict = new NSMutableDictionary<NSString, NSString>();`
`357`	`358`
`358`	`359`	`foreach(string key in dict.Keys) {`
`359`		`- branchEvent.CustomData.Add(new NSString(key), new NSString(dict[key]));`
	`360`	`+ tempDict.Add(new NSString(key), new NSString(dict[key]));`
`360`	`361`	`}`
	`362`	`+`
	`363`	`+ branchEvent.CustomData = new NSDictionary<NSString, NSString>(tempDict.Keys, tempDict.Values);`
`361`	`364`	`}`
`362`	`365`
`363`	`366`	`if (eventDict.ContainsKey("content_items")) {`
`364`	`367`	`List<string> array = eventDict["content_items"] as List<string>;`
	`368`	`+ NSMutableDictionary<NSObject, NSObject> tempDict = new NSMutableDictionary<NSObject, NSObject>();`
`365`	`369`
	`370`	`+ int i = 1;`
`366`	`371`	`foreach (string buoJson in array) {`
`367`		`- branchEvent.ContentItems.Add(ToNativeUniversalObject(new BranchUniversalObject(buoJson)));`
	`372`	`+ tempDict.Add(NSObject.FromObject(i), ToNativeUniversalObject(new BranchUniversalObject(buoJson)));`
	`373`	`+ ++i;`
`368`	`374`	`}`
	`375`	`+`
	`376`	`+ branchEvent.ContentItems = NSArray.FromNSObjects<NSObject>(tempDict.Values);`
`369`	`377`	`}`
`370`	`378`
`371`	`379`	`branchEvent.LogEvent();`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,8 @@ public void loadFromDictionary(Dictionary<string, object> data)`
`148`	`148`	`{`
`149`	`149`	`if (data["metadata"] != null)`
`150`	`150`	`{`
`151`		`- Dictionary<string, object> metaTemp = data["metadata"] as Dictionary<string, object>;`
	`151`	`+ //Dictionary<string, object> metaTemp = data["metadata"] as Dictionary<string, object>;`
	`152`	`+ Dictionary<string, object> metaTemp = JsonConvert.DeserializeObject<Dictionary<string, object>>(data["metadata"] as string);`
`152`	`153`
`153`	`154`	`if (metaTemp != null)`
`154`	`155`	`{`