Skip to content

Commit 273c51c

Browse files
committed
CORE-1788 fix version issue on Android. Remove extra log messages. Add binary.
1 parent d47dbb7 commit 273c51c

File tree

6 files changed

+21
-11
lines changed

6 files changed

+21
-11
lines changed

BranchUnityTestBed/Assets/Branch/Branch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class Branch : MonoBehaviour {
99

10-
public static string sdkVersion = "0.6.6";
10+
public static string sdkVersion = "0.6.7";
1111

1212
public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
1313
public delegate void BranchCallbackWithUrl(string url, string error);

BranchUnityTestBed/Assets/Plugins/Branch/Android/BranchUnityActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void onCreate(Bundle savedInstanceState) {
2424
@Override
2525
public void onStart() {
2626
super.onStart();
27-
Log.i(TAG, "BranchUnityActivity.onStart()");
27+
//Log.i(TAG, "BranchUnityActivity.onStart()");
2828
BranchUnityWrapper.initSession();
2929
}
3030

BranchUnityTestBed/Assets/Plugins/Branch/Android/BranchUnityApp.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ public class BranchUnityApp extends Application {
1818
public void onCreate() {
1919
super.onCreate();
2020

21-
Log.i(TAG, "BranchUnityApp.onCreate()");
22-
Branch.enableLogging();
21+
//Log.i(TAG, "BranchUnityApp.onCreate()");
22+
//Branch.enableLogging();
23+
24+
// TODO: fix the version import, maybe we can do it on build
25+
// Need to set plugin information earlier than the C# startup
26+
Branch.registerPlugin("Unity", "0.6.7");
27+
2328
Branch.disableInstantDeepLinking(true);
2429
Branch.getAutoInstance(this.getApplicationContext());
2530
}

BranchUnityTestBed/Assets/Plugins/Branch/Android/BranchUnityWrapper.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static void setBranchKey(String branchKey, String sdkVersion) {
4848
* Caches the last response.
4949
*/
5050
public static void initSession() {
51-
Log.i(TAG, "BranchUnityWrapper.initSession()");
51+
//Log.i(TAG, "BranchUnityWrapper.initSession()");
5252

5353
defaultListener = new BranchReferralInitListenerUnityCallback();
5454
Activity unityActivity = UnityPlayer.currentActivity;
@@ -60,7 +60,7 @@ public static void initSession() {
6060
* @param callbackId
6161
*/
6262
public static void initSession(String callbackId) {
63-
Log.i(TAG, "BranchUnityWrapper.initSession(String callbackId)");
63+
//Log.i(TAG, "BranchUnityWrapper.initSession(String callbackId)");
6464

6565
defaultListener.setCallbackIDAndClearCachedParams(callbackId, false);
6666
}
@@ -70,7 +70,7 @@ public static void initSession(String callbackId) {
7070
* @param callbackId
7171
*/
7272
public static void initSessionWithUniversalObjectCallback(String callbackId) {
73-
Log.i(TAG, "BranchUnityWrapper.initSessionWithUniversalObjectCallback(String callbackId)");
73+
//Log.i(TAG, "BranchUnityWrapper.initSessionWithUniversalObjectCallback(String callbackId)");
7474

7575
defaultListener.setCallbackIDAndClearCachedParams(callbackId, true);
7676
}
@@ -79,7 +79,7 @@ public static void initSessionWithUniversalObjectCallback(String callbackId) {
7979
* Called by BranchUnityActivity onNewIntent. Forces a new session.
8080
*/
8181
public static void initSessionWithIntent() {
82-
Log.i(TAG, "BranchUnityWrapper.initSessionWithIntent()");
82+
//Log.i(TAG, "BranchUnityWrapper.initSessionWithIntent()");
8383

8484
Activity unityActivity = UnityPlayer.currentActivity;
8585
unityActivity.getIntent().putExtra("branch_force_new_session", true);
@@ -667,7 +667,7 @@ public BranchReferralInitListenerUnityCallback(String callbackId) {
667667

668668
@Override
669669
public void onInitFinished(JSONObject params, BranchError branchError) {
670-
Log.i(TAG, "BranchReferralInitListenerUnityCallback.onInitFinished(JSONObject params, BranchError branchError)");
670+
//Log.i(TAG, "BranchReferralInitListenerUnityCallback.onInitFinished(JSONObject params, BranchError branchError)");
671671
_waitForFirstPayload = false;
672672

673673
// if we don't have a callback id yet, save params until we do
@@ -680,7 +680,7 @@ public void onInitFinished(JSONObject params, BranchError branchError) {
680680

681681
// set a callbackId and respond with the last data we have
682682
public void setCallbackIDAndClearCachedParams(String callbackId, Boolean isBUO) {
683-
Log.i(TAG, "BranchReferralInitListenerUnityCallback.setCallbackIDAndClearCachedParams(String callbackId, Boolean isBUO)");
683+
//Log.i(TAG, "BranchReferralInitListenerUnityCallback.setCallbackIDAndClearCachedParams(String callbackId, Boolean isBUO)");
684684
_callbackId = callbackId;
685685
_isBUO = isBUO;
686686

@@ -692,7 +692,7 @@ public void setCallbackIDAndClearCachedParams(String callbackId, Boolean isBUO)
692692
}
693693

694694
private void handleCallback(JSONObject params, BranchError branchError) {
695-
Log.i(TAG, "BranchReferralInitListenerUnityCallback.handleCallback(JSONObject params, BranchError branchError)");
695+
//Log.i(TAG, "BranchReferralInitListenerUnityCallback.handleCallback(JSONObject params, BranchError branchError)");
696696
if (_isBUO) {
697697
// recreate the convienience API from the Branch SDK
698698
BranchUniversalObject branchUniversalObject = BranchUniversalObject.getReferredBranchUniversalObject();

BranchUnityWrapper.unitypackage

3.61 MB
Binary file not shown.

Changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Branch Unity SDK change log
22

3+
- 0.6.7
4+
* Updating to iOS SDK 1.39.2
5+
* Updating to Android SDK 5.0.7
6+
* Add FB partner parameters API. Known issue with Android not respecting this value on install and open. It does support events.
7+
38
- 0.6.6
49
* Updating Branch to iOS version 0.35.0
510

0 commit comments

Comments
 (0)