Skip to content

Commit dc083f8

Browse files
authored
Merge pull request #684 from herdwatch/fix-alternate-link-domain
fix duplicate alternate link domains
2 parents f66e048 + d6293e7 commit dc083f8

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const iosEntitlements = require('../ios/updateAssociatedDomains');
2+
const androidManifest = require('../android/updateAndroidManifest');
3+
4+
const preferences = {
5+
iosLinkDomain: [],
6+
androidLinkDomain: [],
7+
linkDomain: ['cordova.app.link', 'cordova-alternate.app.link', 'test.app.link']
8+
}
9+
console.log(iosEntitlements.updateAssociatedDomains(preferences));
10+
console.log(androidManifest.getAppLinkIntentFilterData(preferences));

src/scripts/android/updateAndroidManifest.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
// entry
88
module.exports = {
9-
writePreferences: writePreferences
9+
writePreferences: writePreferences,
10+
getAppLinkIntentFilterData: getAppLinkIntentFilterData
1011
};
1112

1213
// injects config.xml preferences into AndroidManifest.xml file.
@@ -260,6 +261,10 @@
260261

261262
// app.link link domains need -alternate associated domains as well (for Deep Views)
262263
if (linkDomain.indexOf("app.link") !== -1) {
264+
const isAlternateDomain = linkDomain.indexOf("-alternate") !== -1;
265+
if(isAlternateDomain){
266+
continue;
267+
}
263268
const first = linkDomain.split(".")[0];
264269
const rest = linkDomain
265270
.split(".")

src/scripts/ios/updateAssociatedDomains.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
// entry
1414
module.exports = {
15-
addAssociatedDomains: addAssociatedDomains
15+
addAssociatedDomains: addAssociatedDomains,
16+
updateAssociatedDomains: updateAssociatedDomains
1617
};
1718

1819
// updates the associated domains from the link-domain field of the app's config.xml
@@ -127,6 +128,11 @@
127128
for (let i = 0; i < linkDomains.length; i++) {
128129
const linkDomain = linkDomains[i];
129130

131+
const isAlternateDomain = linkDomain.indexOf("-alternate") !== -1;
132+
if(isAlternateDomain){
133+
continue;
134+
}
135+
130136
// add link domain to associated domain
131137
domainList.push(prefix + linkDomain);
132138

0 commit comments

Comments
 (0)