Skip to content

Commit 4bd2439

Browse files
author
Adrian Marquez
committed
Platform specific domains
1 parent 94fdca9 commit 4bd2439

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/scripts/android/updateAndroidManifest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
// determine the Branch link domain <data> to append to the App Link intent filter
249249
function getAppLinkIntentFilterData(preferences) {
250250
const intentFilterData = [];
251-
const linkDomains = preferences.linkDomain;
251+
const linkDomains = [...preferences.androidLinkDomain, ...preferences.linkDomain];
252252

253253
for (let i = 0; i < linkDomains.length; i++) {
254254
const linkDomain = linkDomains[i];

src/scripts/ios/updateAssociatedDomains.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
// removed previous associated domains related to Branch (will not remove link domain changes from custom domains or custom sub domains)
9292
function removePreviousAssociatedDomains(preferences, domains) {
9393
const output = [];
94-
const linkDomains = preferences.linkDomain;
94+
const linkDomains = [...preferences.iosLinkDomain, ...preferences.linkDomain];
9595

9696
if (!domains) return output;
9797
for (let i = 0; i < domains.length; i++) {
@@ -122,7 +122,7 @@
122122
function updateAssociatedDomains(preferences) {
123123
const domainList = [];
124124
const prefix = "applinks:";
125-
const linkDomains = preferences.linkDomain;
125+
const linkDomains = [...preferences.iosLinkDomain, ...preferences.linkDomain];
126126

127127
for (let i = 0; i < linkDomains.length; i++) {
128128
const linkDomain = linkDomains[i];

src/scripts/ios/updatePlist.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
CFBundleURLName: SDK,
6262
CFBundleURLSchemes: [preferences.uriScheme]
6363
};
64+
// ios specific domain will be preferred
65+
const linkDomains = [...preferences.iosLinkDomain, ...preferences.linkDomain];
6466

6567
if (!obj.hasOwnProperty("CFBundleURLTypes")) {
6668
// add
@@ -89,7 +91,7 @@
8991

9092
// override
9193
obj.branch_key = preferences.branchKey;
92-
obj.branch_app_domain = preferences.linkDomain[0];
94+
obj.branch_app_domain = linkDomains[0];
9395

9496
return obj;
9597
}

src/scripts/npm/processConfigXml.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
projectName: getProjectName(configXml),
6060
branchKey: getBranchValue(branchXml, "branch-key"),
6161
linkDomain: getBranchLinkDomains(branchXml, "link-domain"),
62+
androidLinkDomain: getBranchLinkDomains(branchXml, "android-link-domain"),
63+
iosLinkDomain: getBranchLinkDomains(branchXml, "ios-link-domain"),
6264
uriScheme: getBranchValue(branchXml, "uri-scheme"),
6365
iosBundleId: getBundleId(configXml, "ios"),
6466
iosProjectModule: getProjectModule(context),
@@ -97,7 +99,8 @@
9799
return branchXml.hasOwnProperty(key) ? branchXml[key][0].$.value : null;
98100
}
99101

100-
// read branch value from <branch-config> for multiple <link-domain>
102+
// read branch value from <branch-config>
103+
// for multiple <link-domain>, <android-link-domain> or <ios-link-domain>
101104
function getBranchLinkDomains(branchXml, key) {
102105
const output = [];
103106
if (branchXml.hasOwnProperty(key)) {
@@ -218,9 +221,8 @@
218221
);
219222
}
220223
if (
221-
preferences.linkDomain === null ||
222224
!/^(?!.*?www).*([a-zA-Z0-9]+(\.[a-zA-Z0-9]+)+.*)$/.test(
223-
preferences.linkDomain
225+
[...preferences.linkDomain, ...preferences.androidLinkDomain, preferences.iosLinkDomain]
224226
)
225227
) {
226228
throw new Error(

0 commit comments

Comments
 (0)