Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update android-prefix validation to only check for bnc.lt #704

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

update android-prefix validation to only check for bnc.lt #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8bbdd3b
update validation to only check for bnc.lt
rex-iotum Apr 4, 2022
109b7bb
support multiple prefixes
rex-iotum May 18, 2023
a59d938
Merge pull request #1 from BranchMetrics/master
rex-iotum May 18, 2023
7a08f54
use getBranchLinkDomains to get the android-prefix
rex-iotum May 18, 2023
8466290
Merge branch 'master' of github.com:iotum/cordova-ionic-phonegap-bran…
rex-iotum May 18, 2023
08fed77
Merge branch 'BranchMetrics:master' into master
rex-iotum Jan 25, 2024
5c15c31
Merge pull request #2 from BranchMetrics/master
rex-iotum Jun 12, 2024
16e4ac5
Merge branch 'BranchMetrics:master' into master
rex-iotum Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions src/scripts/android/updateAndroidManifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,21 +275,14 @@
intentFilterData.push(getAppLinkIntentFilterDictionary(linkDomain));
intentFilterData.push(getAppLinkIntentFilterDictionary(alternate));
} else {
// bnc.lt
if (
linkDomain.indexOf("bnc.lt") !== -1 &&
preferences.androidPrefix === null
) {
throw new Error(
'BRANCH SDK: Invalid "android-prefix" in <branch-config> in your config.xml. Docs https://goo.gl/GijGKP'
preferences.androidPrefix.forEach(prefix => {
intentFilterData.push(
getAppLinkIntentFilterDictionary(
linkDomain,
prefix
)
);
}
intentFilterData.push(
getAppLinkIntentFilterDictionary(
linkDomain,
preferences.androidPrefix
)
);
})
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/scripts/npm/processConfigXml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
iosTeamRelease: getBranchValue(branchXml, "ios-team-release"), // optional
iosTeamDebug: getBranchValue(branchXml, "ios-team-debug"), // optional
androidBundleId: getBundleId(configXml, "android"), // optional
androidPrefix: getBranchValue(branchXml, "android-prefix"), // optional
androidPrefix: getBranchLinkDomains(branchXml, "android-prefix"), // optional
androidTestMode: getBranchValue(branchXml, "android-testmode") // DEPRECATED optional
};
}
Expand Down Expand Up @@ -294,6 +294,7 @@
);
}
if (
[...preferences.linkDomain, ...preferences.androidLinkDomain, preferences.iosLinkDomain].find(domain => domain === 'bnc.lt') &&
preferences.androidPrefix !== null &&
!/^[/].[a-zA-Z0-9]{3,4}$/.test(preferences.androidPrefix)
) {
Expand Down