Skip to content

Commit 97bf819

Browse files
authored
Merge pull request #162 from antonargunov/master
version 0.5.12
2 parents ccacbd6 + 9fe37f7 commit 97bf819

File tree

8 files changed

+43
-11
lines changed

8 files changed

+43
-11
lines changed

AndroidWrapperProject/.idea/libraries/Gradle__com_android_support_multidex_1_0_3_aar.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidWrapperProject/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_1_aar.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,26 @@ public static String getFirstReferringBranchLinkProperties() {
107107
try {
108108
if (firstParam.has("+clicked_branch_link") && firstParam.getBoolean("+clicked_branch_link")) {
109109
linkProperties = new LinkProperties();
110-
if (firstParam.has("channel")) {
111-
linkProperties.setChannel(firstParam.getString("channel"));
110+
if (firstParam.has("~channel")) {
111+
linkProperties.setChannel(firstParam.getString("~channel"));
112112
}
113-
if (firstParam.has("feature")) {
114-
linkProperties.setFeature(firstParam.getString("feature"));
113+
if (firstParam.has("~feature")) {
114+
linkProperties.setFeature(firstParam.getString("~feature"));
115115
}
116-
if (firstParam.has("stage")) {
117-
linkProperties.setStage(firstParam.getString("stage"));
116+
if (firstParam.has("~alias")) {
117+
linkProperties.setAlias(firstParam.getString("~alias"));
118118
}
119-
if (firstParam.has("duration")) {
120-
linkProperties.setDuration(firstParam.getInt("duration"));
119+
if (firstParam.has("~stage")) {
120+
linkProperties.setStage(firstParam.getString("~stage"));
121+
}
122+
if (firstParam.has("~duration")) {
123+
linkProperties.setDuration(firstParam.getInt("~duration"));
121124
}
122125
if (firstParam.has("$match_duration")) {
123126
linkProperties.setDuration(firstParam.getInt("$match_duration"));
124127
}
125-
if (firstParam.has("tags")) {
126-
JSONArray tagsArray = firstParam.getJSONArray("tags");
128+
if (firstParam.has("~tags")) {
129+
JSONArray tagsArray = firstParam.getJSONArray("~tags");
127130
for (int i = 0; i < tagsArray.length(); i++) {
128131
linkProperties.addTag(tagsArray.getString(i));
129132
}
@@ -175,6 +178,9 @@ public static String getLatestReferringBranchLinkProperties() {
175178
if (latestParam.has("~feature")) {
176179
linkProperties.setFeature(latestParam.getString("~feature"));
177180
}
181+
if (latestParam.has("~alias")) {
182+
linkProperties.setAlias(latestParam.getString("~alias"));
183+
}
178184
if (latestParam.has("~stage")) {
179185
linkProperties.setStage(latestParam.getString("~stage"));
180186
}
@@ -602,6 +608,9 @@ private static LinkProperties _linkPropertiesFromJSONObject(JSONObject params) {
602608
if (params.has("~feature")) {
603609
linkProperties.setFeature(params.getString("~feature"));
604610
}
611+
if (params.has("~alias")) {
612+
linkProperties.setAlias(params.getString("~alias"));
613+
}
605614
if (params.has("~stage")) {
606615
linkProperties.setStage(params.getString("~stage"));
607616
}

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.5.11";
10+
public static string sdkVersion = "0.5.12";
1111

1212
public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
1313
public delegate void BranchCallbackWithUrl(string url, string error);
Binary file not shown.
Binary file not shown.

BranchUnityWrapper.unitypackage

507 Bytes
Binary file not shown.

Changelog.md

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

3+
- 0.5.12
4+
* Fixed #160 - Link property alias not being added to custom link generated
5+
36
- 0.5.11
47
* Updating Branch to Android version 4.1.0 and iOS version 0.29.1
58

0 commit comments

Comments
 (0)