diff --git a/.gitignore b/.gitignore index 3c3ffb7..4d4586c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,12 @@ BranchUnityTestBed/Obj BranchUnityTestBed/Build? UnityConnectSettings.asset ClusterInputManager.asset +Logs/ + +# Android Studio +.idea +*.iml +build/ + +# Mac stuff +*.DS_Store \ No newline at end of file diff --git a/AndroidWrapperProject/app/build.gradle b/AndroidWrapperProject/app/build.gradle index 9c828a1..85240f1 100644 --- a/AndroidWrapperProject/app/build.gradle +++ b/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') diff --git a/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityActivity.java b/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityActivity.java index 0aed00f..db9b01d 100644 --- a/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityActivity.java +++ b/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(); diff --git a/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityApp.java b/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityApp.java index 9b2965a..11e1144 100644 --- a/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityApp.java +++ b/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); } diff --git a/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityWrapper.java b/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityWrapper.java index 55d5044..8d891ac 100755 --- a/AndroidWrapperProject/app/src/main/java/io/branch/unity/BranchUnityWrapper.java +++ b/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() { diff --git a/BranchUnityTestBed/Assets/Branch/Branch.cs b/BranchUnityTestBed/Assets/Branch/Branch.cs index 0c8d55b..34695e2 100644 --- a/BranchUnityTestBed/Assets/Branch/Branch.cs +++ b/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 parameters, string error); public delegate void BranchCallbackWithUrl(string url, string error); diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/Android/AndroidManifest.xml b/BranchUnityTestBed/Assets/Plugins/Branch/Android/AndroidManifest.xml index 1340941..b4164ae 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/Android/AndroidManifest.xml +++ b/BranchUnityTestBed/Assets/Plugins/Branch/Android/AndroidManifest.xml @@ -27,13 +27,6 @@ - - - - - - - diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.2.1_core.jar b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.3.2_core.jar similarity index 76% rename from BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.2.1_core.jar rename to BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.3.2_core.jar index 1835339..6e39370 100644 Binary files a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.2.1_core.jar and b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.3.2_core.jar differ diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.2.1_core.jar.meta b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.3.2_core.jar.meta similarity index 81% rename from BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.2.1_core.jar.meta rename to BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.3.2_core.jar.meta index 6166b84..18d5c94 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.2.1_core.jar.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/Branch-4.3.2_core.jar.meta @@ -1,12 +1,15 @@ fileFormatVersion: 2 -guid: 2bbbbbebf160743acb3531ce9686381c +guid: 4a59845dbd0704f51aa38e21dac75ed8 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: Android: Android diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar index ad68677..b25d44b 100644 Binary files a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar and b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar differ diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar.meta b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar.meta index dcf3bc9..8260963 100644 --- a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar.meta +++ b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper.jar.meta @@ -1,33 +1,32 @@ fileFormatVersion: 2 guid: c85a7d3d39e5e42ea9dbf59d72a7974f -timeCreated: 1438891471 -licenseType: Pro PluginImporter: + externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - data: - first: - Android: Android - second: - enabled: 1 - settings: {} - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true userData: assetBundleName: assetBundleVariant: diff --git a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper_mdex.jar.zip b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper_mdex.jar.zip index 4f02800..2627b87 100644 Binary files a/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper_mdex.jar.zip and b/BranchUnityTestBed/Assets/Plugins/Branch/Android/libs/BranchAndroidWrapper_mdex.jar.zip differ diff --git a/BranchUnityWrapper.unitypackage b/BranchUnityWrapper.unitypackage index bcfbe27..fba06b6 100644 Binary files a/BranchUnityWrapper.unitypackage and b/BranchUnityWrapper.unitypackage differ diff --git a/Changelog.md b/Changelog.md index 29d0a5f..442d7db 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ Branch Unity SDK change log +- 0.6.0 + * Updating Branch to Android version 4.3.2 + * Fix missing refrring params + - 0.5.15 * Updating Branch to Android version 4.2.1 and iOS version 0.31.3