Merge pull request #177 from antonargunov/master

version 0.6.2

Author: antonargunov

AndroidWrapperProject/.idea/caches/build_file_checksums.ser

@@ -15,7 +15,6 @@ public class BranchUnityApp extends Application {
     public void onCreate() {
         super.onCreate();
         BranchUtil.setPluginType(BranchUtil.PluginType.Unity);
-        BranchUtil.setPluginVersion("0.6.1");
         Branch.getAutoInstance(this.getApplicationContext());
         Branch.disableInstantDeepLinking(true);
     }

AndroidWrapperProject/.idea/workspace.xml

@@ -38,25 +38,19 @@
  * Created by grahammueller on 3/25/15.
  */
 public class BranchUnityWrapper {
-    public static void setBranchKey(String branchKey) {
+    public static void setBranchKey(String branchKey, String sdkVersion) {
         _branchKey = branchKey;
+        BranchUtil.setPluginType(BranchUtil.PluginType.Unity);
+        BranchUtil.setPluginVersion(sdkVersion);
     }
 
-    private static Branch.ShareLinkBuilder linkBuilder = null;
 
     private static String autoInitCallbackWithParams = "";
     private static String autoInitCallbackWithBUO = "";
     /**
      * InitSession methods
      */
 
-    public static  void getAutoInstance() {
-        Activity unityActivity = UnityPlayer.currentActivity;
-        BranchUtil.setPluginType(BranchUtil.PluginType.Unity);
-        BranchUtil.setPluginVersion("0.6.1");
-        Branch.getAutoInstance(unityActivity.getApplicationContext());
-    }
-
     public static void initSession() {
         Activity unityActivity = UnityPlayer.currentActivity;
         Branch.getInstance(unityActivity.getApplicationContext(), _branchKey).initSessionWithData(unityActivity.getIntent().getData(), unityActivity);

AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityApp.java

@@ -7,7 +7,7 @@
 
 public class Branch : MonoBehaviour {
 
-	public static string sdkVersion = "0.6.1";
+	public static string sdkVersion = "0.6.2";
 
     public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
     public delegate void BranchCallbackWithUrl(string url, string error);
@@ -19,12 +19,6 @@ public class Branch : MonoBehaviour {
 
     #region InitSession methods
 
-	/**
-	 * 
-	 */
-	public static void getAutoInstance() {
-		_getAutoInstance();
-	}
 
 	/**
 	 * Initialize session and receive information about how it opened.
@@ -397,10 +391,10 @@ public void Awake() {
         DontDestroyOnLoad(gameObject);
 
 		if (BranchData.Instance.testMode) {
-        	_setBranchKey(BranchData.Instance.testBranchKey);
+        	_setBranchKey(BranchData.Instance.testBranchKey, sdkVersion);
 		}
 		else {
-			_setBranchKey(BranchData.Instance.liveBranchKey);
+			_setBranchKey(BranchData.Instance.liveBranchKey, sdkVersion);
 		}
     }
 
@@ -430,9 +424,7 @@ void OnApplicationPause(bool pauseStatus) {
 #if (UNITY_IOS || UNITY_IPHONE) && !UNITY_EDITOR
 
     [DllImport ("__Internal")]
-    private static extern void _setBranchKey(string branchKey);
-    
-	private static void _getAutoInstance() {}
+    private static extern void _setBranchKey(string branchKey, string sdkVersion);
 
     [DllImport ("__Internal")]
     private static extern void _initSession();
@@ -547,14 +539,10 @@ private static void _getAutoInstance() {}
 
 #elif UNITY_ANDROID && !UNITY_EDITOR
 
-    private static void _setBranchKey(string branchKey) {
-        BranchAndroidWrapper.setBranchKey(branchKey);
+    private static void _setBranchKey(string branchKey, string sdkVersion) {
+        BranchAndroidWrapper.setBranchKey(branchKey, sdkVersion);
     }
 
-	private static void _getAutoInstance() {
-		BranchAndroidWrapper.getAutoInstance();
-	}
-
     private static void _initSession() {
         BranchAndroidWrapper.initSession();
     }
@@ -703,9 +691,7 @@ private static void _getShortURLWithBranchUniversalObjectAndCallback(string univ
 
 #else
 
-    private static void _setBranchKey(string branchKey) { }
-    
-	private static void _getAutoInstance() { }
+    private static void _setBranchKey(string branchKey, string sdkVersion) { }
 
     private static void _initSession() {
         Debug.Log("Branch is not implemented on this platform");

AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityWrapper.java

@@ -6,17 +6,11 @@
 public class BranchAndroidWrapper {
 #if UNITY_ANDROID
 
-    public static void setBranchKey(String branchKey) {
+    public static void setBranchKey(String branchKey, String sdkVersion) {
 		_runBlockOnThread(() => {
-        	_getBranchClass().CallStatic("setBranchKey", branchKey);
+        	_getBranchClass().CallStatic("setBranchKey", branchKey, sdkVersion);
 		});
     }
-    
-	public static void getAutoInstance() {
-		_runBlockOnThread(() => {
-			_getBranchClass().CallStatic("getAutoInstance");
-		});
-	}
 
 	#region InitSession methods
 

BranchUnityTestBed/.vs/BranchUnityTestBed/xs/sqlite3/storage.ide

@@ -364,7 +364,7 @@ public static void UpdateLinkDomainsFilter(XmlDocument doc, XmlNode unityActivit
 						ifData.SetAttribute("android____scheme", "https");
 					}
 					else {
-						ifData.SetAttribute("android____scheme", "http");
+						ifData.SetAttribute("android____scheme", "https");
 					}
 
 					ifData.SetAttribute("android____host", link);
@@ -391,7 +391,7 @@ public static void UpdateLinkDomainsFilter(XmlDocument doc, XmlNode unityActivit
 						ifData.SetAttribute("android____scheme", "https");
 					}
 					else {
-						ifData.SetAttribute("android____scheme", "http");
+						ifData.SetAttribute("android____scheme", "https");
 					}
 
 					ifData.SetAttribute("android____host", link);
@@ -479,17 +479,12 @@ public static void UpdateDebugModeMeta(XmlDocument doc, XmlNode appNode) {
 
 		XmlElement keyMetaData = doc.CreateElement("meta-data");
 
-		if (BranchData.Instance.simulateFreshInstalls) {
-			keyMetaData.SetAttribute("android____name", "io.branch.sdk.BranchKey.test");
-		}
-		else {
-			keyMetaData.SetAttribute("android____name", "io.branch.sdk.BranchKey");
-		}
-
 		if (BranchData.Instance.testMode) {
+			keyMetaData.SetAttribute("android____name", "io.branch.sdk.BranchKey.test");
 			keyMetaData.SetAttribute("android____value", BranchData.Instance.testBranchKey);
 		}
 		else {
+			keyMetaData.SetAttribute("android____name", "io.branch.sdk.BranchKey");
 			keyMetaData.SetAttribute("android____value", BranchData.Instance.liveBranchKey);
 		}
 

BranchUnityTestBed/Assets/Branch/Branch.cs

@@ -169,9 +169,15 @@ public static void ChangeXcodeProject(string pathToBuiltProject) {
 		PBXProject proj = new PBXProject();
 		proj.ReadFromString(File.ReadAllText(pathToProject));
 
-		string target = proj.TargetGuidByName("Unity-iPhone");
+		string target = "";
+#if UNITY_2019_3_OR_NEWER
+		target = proj.GetUnityMainTargetGuid();
+#else
+		target = proj.TargetGuidByName("Unity-iPhone");
+#endif
+
 
-		#if UNITY_2017_1_OR_NEWER
+#if UNITY_2017_1_OR_NEWER
 
 		if (!proj.ContainsFramework(target, "AdSupport.framework")) {
 			proj.AddFrameworkToProject(target, "AdSupport.framework", false);