Merge pull request #143 from antonargunov/master

version 0.5.4

Author: aaustin

AndroidThirdParty/.idea/misc.xml

@@ -86,6 +86,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />

AndroidWrapperProject/.idea/libraries/Gradle____local_jars____Users_antonarhunou_BranchMetrics_unity_branch_deep_linking_AndroidWrapperProject_app_libs_Unity_jar_unspecified_jar.xml

@@ -12,6 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+//        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -22,6 +23,7 @@ android {
 }
 
 dependencies {
+//    compile 'com.android.support:multidex:1.0.1'
     compile 'io.branch.sdk.android:library:3.0.3'
 //    Comment out the line above, uncomment the line below to use local Branch and update the settings.gradle file as well.
 //    compile project(':Branch-SDK')

AndroidWrapperProject/.idea/libraries/Gradle__com_android_support_support_annotations_22_2_0_jar.xml

@@ -3,12 +3,14 @@
 import android.app.Application;
 import io.branch.referral.Branch;
 import android.bluetooth.BluetoothSocket;
+//import android.support.multidex.MultiDexApplication;
 
 /**
  * Created by antonarhunou on 1/9/18.
  */
 
 public class BranchUnityApp extends Application {
+//public class BranchUnityApp extends MultiDexApplication {
     public void onCreate() {
         super.onCreate();
 

AndroidWrapperProject/.idea/libraries/Gradle__com_crashlytics_sdk_android_answers_shim_0_0_6.xml

@@ -7,7 +7,7 @@
 
 public class Branch : MonoBehaviour {
 
-	public static string sdkVersion = "0.5.3";
+	public static string sdkVersion = "0.5.4";
 
     public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
     public delegate void BranchCallbackWithUrl(string url, string error);
@@ -428,9 +428,9 @@ public static void getShortURL(BranchUniversalObject universalObject, BranchLink
 	#region Singleton
 
     public void Awake() {
-		var olderBranch = FindObjectOfType<Branch>();
+		var olderBranches = FindObjectsOfType<Branch>();
 
-		if (olderBranch != null && olderBranch != this) {
+		if (olderBranches != null && olderBranches.Length > 1) {
 			// someone's already here!
 			Destroy(gameObject);
 			return;