Merge pull request #174 from BranchMetrics/SDK-795/fix_missing_params_set_plugin_type

Sdk 795/fix missing params set plugin type

Author: bklastaitis-branch

.gitignore

@@ -7,3 +7,12 @@ BranchUnityTestBed/Obj
 BranchUnityTestBed/Build?
 UnityConnectSettings.asset
 ClusterInputManager.asset
+Logs/
+
+# Android Studio
+.idea
+*.iml
+build/
+
+# Mac stuff
+*.DS_Store

AndroidWrapperProject/app/build.gradle

@@ -25,7 +25,7 @@ android {
 
 dependencies {
 //    compile 'com.android.support:multidex:1.0.3'
-    compile 'io.branch.sdk.android:library:4.2.1'
+    compile 'io.branch.sdk.android:library:4.3.2'
 //    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/app/src/main/java/io/branch/unity/BranchUnityActivity.java

@@ -4,6 +4,8 @@
 import android.os.Bundle;
 import android.content.Intent;
 
+import io.branch.referral.Defines;
+
 /**
  * Created by antonarhunou on 10/13/16.
  */
@@ -16,6 +18,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onNewIntent(Intent intent) {
+    	super.onNewIntent(intent);
+    	intent.putExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), true);
         this.setIntent(intent);
 
         BranchUnityWrapper.initSessionWithIntent();

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

@@ -3,6 +3,7 @@
 import android.app.Application;
 import io.branch.referral.Branch;
 import android.bluetooth.BluetoothSocket;
+import io.branch.referral.BranchUtil;
 //import android.support.multidex.MultiDexApplication;
 
 /**
@@ -13,7 +14,8 @@ public class BranchUnityApp extends Application {
 //public class BranchUnityApp extends MultiDexApplication {
     public void onCreate() {
         super.onCreate();
-
+        BranchUtil.setPluginType(BranchUtil.PluginType.Unity);
+        BranchUtil.setPluginVersion("0.6.0");
         Branch.getAutoInstance(this.getApplicationContext());
         Branch.disableInstantDeepLinking(true);
     }

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

@@ -52,6 +52,8 @@ public static void setBranchKey(String branchKey) {
 
     public static  void getAutoInstance() {
         Activity unityActivity = UnityPlayer.currentActivity;
+        BranchUtil.setPluginType(BranchUtil.PluginType.Unity);
+        BranchUtil.setPluginVersion("0.6.0");
         Branch.getAutoInstance(unityActivity.getApplicationContext());
     }
 
@@ -70,8 +72,7 @@ public static void initSession(String callbackId) {
         autoInitCallbackWithParams = callbackId;
 
         Activity unityActivity = UnityPlayer.currentActivity;
-//        Branch.getInstance(UnityPlayer.currentActivity.getApplicationContext(), _branchKey).initSession(new BranchReferralInitListenerUnityCallback(callbackId), unityActivity.getIntent().getData(), unityActivity);
-        Branch.getInstance(UnityPlayer.currentActivity.getApplicationContext(), _branchKey).reInitSession(unityActivity, new BranchReferralInitListenerUnityCallback(callbackId));
+       Branch.getInstance(UnityPlayer.currentActivity.getApplicationContext(), _branchKey).initSession(new BranchReferralInitListenerUnityCallback(callbackId), unityActivity.getIntent().getData(), unityActivity);
     }
 
     public static void initSession(String callbackId, boolean isReferrable) {
@@ -83,8 +84,7 @@ public static void initSessionWithUniversalObjectCallback(String callbackId) {
         autoInitCallbackWithBUO = callbackId;
 
         Activity unityActivity = UnityPlayer.currentActivity;
-//        Branch.getInstance(UnityPlayer.currentActivity.getApplicationContext(), _branchKey).initSession(new BranchUniversalReferralInitListenerUnityCallback(callbackId), unityActivity.getIntent().getData(), unityActivity);
-        Branch.getInstance(UnityPlayer.currentActivity.getApplicationContext(), _branchKey).reInitSession(unityActivity, new BranchUniversalReferralInitListenerUnityCallback(callbackId));
+       Branch.getInstance(UnityPlayer.currentActivity.getApplicationContext(), _branchKey).initSession(new BranchUniversalReferralInitListenerUnityCallback(callbackId), unityActivity.getIntent().getData(), unityActivity);
     }
 
     public static void initSessionWithIntent() {

BranchUnityTestBed/Assets/Branch/Branch.cs

@@ -7,7 +7,7 @@
 
 public class Branch : MonoBehaviour {
 
-	public static string sdkVersion = "0.5.15";
+	public static string sdkVersion = "0.6.0";
 
     public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
     public delegate void BranchCallbackWithUrl(string url, string error);

BranchUnityTestBed/Assets/Plugins/Branch/Android/AndroidManifest.xml

@@ -27,13 +27,6 @@
       <meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="true" />
     </activity>
 
-    <!-- Add this for Branch for install referrer tracking-->
-    <receiver android:name="io.branch.referral.InstallListener" android:exported="true">
-      <intent-filter>
-        <action android:name="com.android.vending.INSTALL_REFERRER" />
-      </intent-filter>
-    </receiver>
-
     <!-- Optional. Set to true to disable auto deep link feature-->
     <meta-data android:name="io.branch.sdk.auto_link_disable" android:value="false"/>