Merge pull request #137 from BranchMetrics/CORE-2224-update-iOS-SDK-t…

…o-1.39.4 CORE-2224 update 7.1.2, includes support for pasteboard links
BranchMetrics · Aug 6, 2021 · 64cf2b0 · 64cf2b0
2 parents 7bb0743 + 2af12ee
commit 64cf2b0
Show file tree

Hide file tree

Showing 10 changed files with 5,393 additions and 2,483 deletions.
diff --git a/Branch-Xamarin-Lib.iOS/ApiDefinition.cs b/Branch-Xamarin-Lib.iOS/ApiDefinition.cs
@@ -3448,6 +3448,10 @@ interface Branch
         [Export("enableLogging")]
         void EnableLogging();
 
+        // - (void)checkPasteboardOnInstall;
+        [Export("checkPasteboardOnInstall")]
+        void CheckPasteboardOnInstall();
+
         // -(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.Droid/BranchAndroid.cs b/Branch-Xamarin-SDK.Droid/BranchAndroid.cs
@@ -47,7 +47,7 @@ private AndroidNativeBranch NativeBranch {
 
 		public static void GetAutoInstance(Context appContext) {
 			BranchUtil.SetPluginType(BranchUtil.PluginType.Xamarin);
-			BranchUtil.PluginVersion = "7.1.1";
+			BranchUtil.PluginVersion = "7.1.2";
 
 			AndroidNativeBranch.GetAutoInstance(appContext);
             AndroidNativeBranch.DisableInstantDeepLinking(true);

diff --git a/Branch-Xamarin-SDK.iOS/BranchIOS.cs b/Branch-Xamarin-SDK.iOS/BranchIOS.cs
@@ -37,6 +37,8 @@ private IOSNativeBranch.Branch NativeBranch {
 
 		private static bool ignoreAppleSearchAdsTestData = false;
 
+		private static bool checkPasteboardOnInstall = false;
+
 		#endregion
 
 		#region Initialization
@@ -56,7 +58,7 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes
 			Branch.branchInstance = instance;
 			instance.branchKey = branchKey;
 
-            instance.NativeBranch.RegisterPluginName("Xamarin", "7.0.7");
+            instance.NativeBranch.RegisterPluginName("Xamarin", "7.1.2");
             //IOSNativeBranch.RegisterPluginName();
 
             if (launchOptions != null) {
@@ -65,10 +67,6 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes
 				instance.launchOptions = new NSDictionary ();
 			}
 
-			if (Debug || Runtime.Arch == Arch.SIMULATOR) {
-				instance.SetDebug ();
-			}
-
 			if (delayInitToCheckForSearchAds)
 			{
 				instance.NativeBranch.DelayInitToCheckForSearchAds();
@@ -84,7 +82,13 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes
 				instance.NativeBranch.IgnoreAppleSearchAdsTestData();
 			}
 
-			//instance.NativeBranch.EnableLogging();
+			if (checkPasteboardOnInstall)
+            {
+				instance.NativeBranch.CheckPasteboardOnInstall();
+
+			}
+
+			instance.NativeBranch.EnableLogging();
 
 			instance.InitSession (callback);
 		}
@@ -102,7 +106,7 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchBUO
 			Branch.branchInstance = instance;
 			instance.branchKey = branchKey;
 
-			instance.NativeBranch.RegisterPluginName("Xamarin", "7.1.1");
+			instance.NativeBranch.RegisterPluginName("Xamarin", "7.1.2");
 
 			if (launchOptions != null) {
 				instance.launchOptions = new NSDictionary (launchOptions);
@@ -129,7 +133,13 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchBUO
 				instance.NativeBranch.IgnoreAppleSearchAdsTestData();
 			}
 
-			//instance.NativeBranch.EnableLogging();
+			if (checkPasteboardOnInstall)
+			{
+				instance.NativeBranch.CheckPasteboardOnInstall();
+
+			}
+
+			instance.NativeBranch.EnableLogging();
 
 			instance.InitSession (callback);
 		}
@@ -314,7 +324,7 @@ public override int GetCreditsForBucket (string bucket) {
 		#region Configuration methods
 
 		public static void DelayInitToCheckForSearchAds()
-		{
+        {
 			delayInitToCheckForSearchAds = true;
 		}
 
@@ -328,6 +338,11 @@ public static void IgnoreAppleSearchAdsTestData()
 			ignoreAppleSearchAdsTestData = true;
 		}
 
+		public static void CheckPasteboardOnInstall()
+        {
+			checkPasteboardOnInstall = true;
+		}
+
 		public override void SetRetryInterval (int retryInterval) {
 			NativeBranch.SetRetryInterval (retryInterval);
 		}

diff --git a/Branch-Xamarin-Testbed.Droid/Branch-Xamarin-Testbed.Droid.csproj b/Branch-Xamarin-Testbed.Droid/Branch-Xamarin-Testbed.Droid.csproj
@@ -108,12 +108,12 @@
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>5.0.0.2012</Version>
+      <Version>5.0.0.2083</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

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
@@ -77,12 +77,12 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>5.0.0.2012</Version>
+      <Version>5.0.0.2083</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Branch-Xamarin-Testbed/Branch-Xamarin-Testbed.csproj b/Branch-Xamarin-Testbed/Branch-Xamarin-Testbed.csproj
@@ -8,7 +8,7 @@
     <ProjectReference Include="..\Branch-Xamarin-SDK\Branch-Xamarin-SDK.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
   </ItemGroup>
 </Project>
diff --git a/NuGet/Branch-Xamarin-Linking-SDK.7.1.2.nupkg b/NuGet/Branch-Xamarin-Linking-SDK.7.1.2.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.1.1</version>
+    <version>7.1.2</version>
     <authors>Branch Metrics, Inc.</authors>
     <owners>Branch Metrics, Inc.</owners>
 <!--     <iconUrl> https://s3-us-west-1.amazonaws.com/branchhost/branch_icon.png</iconUrl> -->