Merge pull request #107 from antonargunov/master

antonargunov · web-flow · commit 40ddc58d4d9c · 2019-09-14T17:45:18.000+03:00
version 5.0.8
diff --git a/Branch-Xamarin-Lib.iOS/ApiDefinitions.cs b/Branch-Xamarin-Lib.iOS/ApiDefinitions.cs
@@ -2859,43 +2859,6 @@ interface BranchShareLink {
 		NSObject WeakDelegate { get; set; }
 	}
 
-	// @interface BranchView : NSObject
-	[BaseType(typeof(NSObject))]
-	interface BranchView {
-		// @property (nonatomic, strong) NSString * branchViewID;
-		[Export("branchViewID", ArgumentSemantic.Strong)]
-		string BranchViewID { get; set; }
-
-		// @property (nonatomic, strong) NSString * branchViewAction;
-		[Export("branchViewAction", ArgumentSemantic.Strong)]
-		string BranchViewAction { get; set; }
-
-		// @property (nonatomic) NSInteger numOfUse;
-		[Export("numOfUse")]
-		nint NumOfUse { get; set; }
-
-		// @property (nonatomic, strong) NSString * webUrl;
-		[Export("webUrl", ArgumentSemantic.Strong)]
-		string WebUrl { get; set; }
-
-		// @property (nonatomic, strong) NSString * webHtml;
-		[Export("webHtml", ArgumentSemantic.Strong)]
-		string WebHtml { get; set; }
-
-		// -(id)initWithBranchView:(NSDictionary *)branchViewDict andActionName:(NSString *)actionName;
-		[Export("initWithBranchView:andActionName:")]
-		IntPtr Constructor(NSDictionary branchViewDict, string actionName);
-
-		// -(BOOL)isAvailable;
-		[Export("isAvailable")]
-		//[Verify (MethodToProperty)]
-		bool IsAvailable { get; }
-
-		// -(void)updateUsageCount;
-		[Export("updateUsageCount")]
-		void UpdateUsageCount();
-	}
-
 	// @protocol BranchViewControllerDelegate <NSObject>
 	[Protocol, Model]
 	[BaseType(typeof(NSObject))]
@@ -2921,24 +2884,6 @@ interface BranchViewControllerDelegate {
 		void BranchViewErrorCode(nint errorCode, string errorMsg, string actionName, string branchViewID);
 	}
 
-	// @interface BranchViewHandler : NSObject
-	[BaseType(typeof(NSObject))]
-	interface BranchViewHandler {
-		// @property (assign, nonatomic) id<BranchViewControllerDelegate> branchViewCallback;
-		[Export("branchViewCallback", ArgumentSemantic.Assign)]
-		BranchViewControllerDelegate BranchViewCallback { get; set; }
-
-		// +(BranchViewHandler *)getInstance;
-		[Static]
-		[Export("getInstance")]
-		//[Verify (MethodToProperty)]
-		BranchViewHandler Instance { get; }
-
-		// -(BOOL)showBranchView:(NSString *)actionName withBranchViewDictionary:(NSDictionary *)branchViewDict andWithDelegate:(id)callback;
-		[Export("showBranchView:withBranchViewDictionary:andWithDelegate:")]
-		bool ShowBranchView(string actionName, NSDictionary branchViewDict, NSObject callback);
-	}
-
 	// @interface Branch (UIViewController)
 	[Category]
 	[BaseType(typeof(UIViewController))]
@@ -3286,10 +3231,6 @@ interface Branch {
 		[Export("delayInitToCheckForSearchAds")]
 		void DelayInitToCheckForSearchAds();
 
-		// -(void)setAppleSearchAdsDebugMode;
-		[Export("setAppleSearchAdsDebugMode")]
-		void SetAppleSearchAdsDebugMode();
-
 		// -(void)setRetryInterval:(NSTimeInterval)retryInterval;
 		[Export("setRetryInterval:")]
 		void SetRetryInterval(double retryInterval);
diff --git a/Branch-Xamarin-Lib.iOS/Branch.a b/Branch-Xamarin-Lib.iOS/Branch.a
diff --git a/Branch-Xamarin-SDK.iOS/BranchIOS.cs b/Branch-Xamarin-SDK.iOS/BranchIOS.cs
@@ -32,7 +32,6 @@ private IOSNativeBranch.Branch NativeBranch {
         #region Helpers declaration
 
         private static bool delayInitToCheckForSearchAds = false;
-        private static bool setAppleSearchAdsDebugMode = false;
 
         #endregion
 
@@ -63,10 +62,6 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes
 				instance.SetDebug ();
 			}
 				
-            if (setAppleSearchAdsDebugMode) {
-                instance.NativeBranch.SetAppleSearchAdsDebugMode();
-            }
-
             if (delayInitToCheckForSearchAds) {
                 instance.NativeBranch.DelayInitToCheckForSearchAds();
             }
@@ -97,10 +92,6 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchBUO
 				instance.SetDebug ();
 			}
 
-            if (setAppleSearchAdsDebugMode) {
-                instance.NativeBranch.SetAppleSearchAdsDebugMode();
-            }
-
             if (delayInitToCheckForSearchAds) {
                 instance.NativeBranch.DelayInitToCheckForSearchAds();
             }
@@ -291,10 +282,6 @@ public static void DelayInitToCheckForSearchAds() {
             delayInitToCheckForSearchAds = true;
         }
 
-        public static void SetAppleSearchAdsDebugMode() {
-            setAppleSearchAdsDebugMode = true;
-        }
-
         public override void SetRetryInterval (int retryInterval) {
 			NativeBranch.SetRetryInterval (retryInterval);
 		}
diff --git a/Branch-Xamarin-SDK/Model/BranchEvent.cs b/Branch-Xamarin-SDK/Model/BranchEvent.cs
@@ -23,6 +23,11 @@ public BranchEvent(BranchEventType branchEventType)
             AddData("event_name", branchEventType.ToString());
         }
 
+        // Set the alias
+        public void SetAlias(string alias) {
+            AddData("customer_event_alias", alias);
+        }
+
         // Set the transaction id associated with this event if there in any
         public void SetTransactionID(string transactionID)
         {
diff --git a/Branch-Xamarin-Testbed.iOS/AppDelegate.cs b/Branch-Xamarin-Testbed.iOS/AppDelegate.cs
@@ -26,7 +26,6 @@ public override bool FinishedLaunching (UIApplication application, NSDictionary
 			// uncomment to try BranchUniversalObject
 			AppBUO appBUO = new AppBUO ();
 
-            //BranchIOS.SetAppleSearchAdsDebugMode();
             //BranchIOS.DelayInitToCheckForSearchAds();
             BranchIOS.Init ("key_live_mglVaBqjIsSpREdbUa6DLahhABarUg0a", launchOptions, appBUO);
 
diff --git a/Branch-Xamarin-Testbed.iOS/Branch-Xamarin-Testbed.iOS.csproj b/Branch-Xamarin-Testbed.iOS/Branch-Xamarin-Testbed.iOS.csproj
@@ -30,13 +30,12 @@
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>full</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignKey>iPhone Developer</CodesignKey>
@@ -64,7 +63,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchFloat32>true</MtouchFloat32>
     <MtouchDebug>true</MtouchDebug>
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,10 @@
 Branch Xamarin SDK change log
 
+- 5.0.8
+  * Updating Branch to IOS version 0.28.1
+  * Adding method `SetAlias(string alias)` in `BranchEvent` class
+  * Deleting method `setAppleSearchAdsDebugMode()`
+
 - 5.0.7
   * Updating Branch to Android version 4.0.0
 
diff --git a/NuGet/Branch-Xamarin-Linking-SDK.5.0.8.nupkg b/NuGet/Branch-Xamarin-Linking-SDK.5.0.8.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>5.0.7</version>
+    <version>5.0.8</version>
     <authors>Branch</authors>
     <owners>Branch</owners>
     <iconUrl> https://s3-us-west-1.amazonaws.com/branchhost/branch_icon.png</iconUrl>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ private IOSNativeBranch.Branch NativeBranch {`
`32`	`32`	`#region Helpers declaration`
`33`	`33`
`34`	`34`	`private static bool delayInitToCheckForSearchAds = false;`
`35`		`- private static bool setAppleSearchAdsDebugMode = false;`
`36`	`35`
`37`	`36`	`#endregion`
`38`	`37`
`@@ -63,10 +62,6 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes`
`63`	`62`	`instance.SetDebug ();`
`64`	`63`	`}`
`65`	`64`
`66`		`- if (setAppleSearchAdsDebugMode) {`
`67`		`- instance.NativeBranch.SetAppleSearchAdsDebugMode();`
`68`		`- }`
`69`		`-`
`70`	`65`	`if (delayInitToCheckForSearchAds) {`
`71`	`66`	`instance.NativeBranch.DelayInitToCheckForSearchAds();`
`72`	`67`	`}`
`@@ -97,10 +92,6 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchBUO`
`97`	`92`	`instance.SetDebug ();`
`98`	`93`	`}`
`99`	`94`
`100`		`- if (setAppleSearchAdsDebugMode) {`
`101`		`- instance.NativeBranch.SetAppleSearchAdsDebugMode();`
`102`		`- }`
`103`		`-`
`104`	`95`	`if (delayInitToCheckForSearchAds) {`
`105`	`96`	`instance.NativeBranch.DelayInitToCheckForSearchAds();`
`106`	`97`	`}`
`@@ -291,10 +282,6 @@ public static void DelayInitToCheckForSearchAds() {`
`291`	`282`	`delayInitToCheckForSearchAds = true;`
`292`	`283`	`}`
`293`	`284`
`294`		`- public static void SetAppleSearchAdsDebugMode() {`
`295`		`- setAppleSearchAdsDebugMode = true;`
`296`		`- }`
`297`		`-`
`298`	`285`	`public override void SetRetryInterval (int retryInterval) {`
`299`	`286`	`NativeBranch.SetRetryInterval (retryInterval);`
`300`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,11 @@ public BranchEvent(BranchEventType branchEventType)`
`23`	`23`	`AddData("event_name", branchEventType.ToString());`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ // Set the alias`
	`27`	`+ public void SetAlias(string alias) {`
	`28`	`+ AddData("customer_event_alias", alias);`
	`29`	`+ }`
	`30`	`+`
`26`	`31`	`// Set the transaction id associated with this event if there in any`
`27`	`32`	`public void SetTransactionID(string transactionID)`
`28`	`33`	`{`