Merge pull request #141 from BranchMetrics/SDK-1151-GAID-issue

Prep Branch Xamarin 8.0.0 release

Author: echo-branch

Branch-Xamarin-Lib.Droid/Branch-Xamarin-Lib.Droid.csproj

@@ -56,7 +56,7 @@
     <TransformFile Include="Transforms\EnumMethods.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedJar Include="Jars\Branch-4.3.2_core.jar" />
+    <EmbeddedJar Include="Jars\Branch-5.1.3.jar" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Branch-Xamarin-Lib.Droid/Jars/Branch-4.3.2_core.jar

@@ -8,6 +8,6 @@
     <attr path="/api/package[@name='io.branch.referral']/class[@name='Branch']" name="managedName">AndroidNativeBranch</attr>
     <attr path="/api/package[@name='io.branch.referral']/class[@name='GAdsPrefetchTask']/method[@name='doInBackground' and count(parameter)=1 and parameter[1][@type='java.lang.Void...']]/parameter[1]" name="managedType">Java.Lang.Object[]</attr>
     <attr path="/api/package[@name='io.branch.referral']/class[@name='GAdsPrefetchTask']/method[@name='doInBackground' and count(parameter)=1 and parameter[1][@type='java.lang.Void...']]" name="managedReturn">Java.Lang.Object</attr>
-
-
+    <attr path="/api/package[@name='io.branch.referral']/class[@name='HuaweiOAIDFetchTask']/method[@name='doInBackground' and count(parameter)=1 and parameter[1][@type='java.lang.Void...']]/parameter[1]" name="managedType">Java.Lang.Object[]</attr>
+    <attr path="/api/package[@name='io.branch.referral']/class[@name='HuaweiOAIDFetchTask']/method[@name='doInBackground' and count(parameter)=1 and parameter[1][@type='java.lang.Void...']]" name="managedReturn">Java.Lang.Object</attr>
 </metadata>

Branch-Xamarin-Lib.Droid/Jars/Branch-5.1.3.jar

@@ -66,6 +66,12 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.Android.Binding.InstallReferrer">
+      <Version>2.2.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.GooglePlayServices.Ads.Identifier">
+      <Version>116.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\strings.xml" />

Branch-Xamarin-Lib.Droid/Transforms/Metadata.xml

@@ -16,6 +16,10 @@ public class BranchAndroid : Branch
 
 		private static BranchAndroid instance = null;
 
+		// TODO: can we pull the plugin version automatically?
+		private static String pluginName = "Xamarin";
+		private static String pluginVersion = "8.0.0";
+
 		private BranchAndroid () { }
 
 		public static BranchAndroid getInstance() {
@@ -46,20 +50,17 @@ private AndroidNativeBranch NativeBranch {
 		public Activity CurrActivity { get; set; }
 
 		public static void GetAutoInstance(Context appContext) {
-			BranchUtil.SetPluginType(BranchUtil.PluginType.Xamarin);
-			BranchUtil.PluginVersion = "7.1.2";
 
+			AndroidNativeBranch.RegisterPlugin(pluginName, pluginVersion);
 			AndroidNativeBranch.GetAutoInstance(appContext);
             AndroidNativeBranch.DisableInstantDeepLinking(true);
         }
 
 		public static void Init(Context context, String branchKey, IBranchSessionInterface callback) {
-
 			Init (((Activity)context).Application, branchKey, callback);
 		}
 
 		public static void Init(Context context, String branchKey, IBranchBUOSessionInterface callback) {
-
 			Init (((Activity)context).Application, branchKey, callback);
 		}
 
@@ -78,9 +79,10 @@ public static void Init(Application app, String branchKey, IBranchSessionInterfa
 			instance.appContext = app.ApplicationContext;
 			instance.branchKey = branchKey;
 
-
-			if (Debug) {
-				instance.SetDebug ();
+			AndroidNativeBranch.RegisterPlugin(pluginName, pluginVersion);
+			if (EnableLogging)
+			{
+				AndroidNativeBranch.EnableLogging();
 			}
 
 			instance.lifeCycleHandler = new BranchAndroidLifeCycleHandler(callback);
@@ -101,30 +103,26 @@ public static void Init(Application app, String branchKey, IBranchBUOSessionInte
 			}
 
 			instance = new BranchAndroid ();
+
 			Branch.branchInstance = instance;
 			instance.appContext = app.ApplicationContext;
 			instance.branchKey = branchKey;
 
-			if (Debug) {
-				instance.SetDebug ();
+			AndroidNativeBranch.RegisterPlugin(pluginName, pluginVersion);
+			if (EnableLogging)
+            {
+				AndroidNativeBranch.EnableLogging();
 			}
 
-			instance.lifeCycleHandler = new BranchAndroidLifeCycleHandler(callback);
+            instance.lifeCycleHandler = new BranchAndroidLifeCycleHandler(callback);
 			app.RegisterActivityLifecycleCallbacks(instance.lifeCycleHandler);
 
             // we call IniSession in BranchAndroidLifeCycleHandler.OnActivityStarted
             //getInstance().InitSession(callback);
 		}
 
-
-		protected override void SetDebug() {
-            AndroidNativeBranch.EnableDebugMode();
-            //NativeBranch.SetDebug ();
-		}
-
 		#endregion
 
-
 		#region Session methods
 
 		public override void InitSession(IBranchSessionInterface callback) {