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

Jump to bottom

fix(cli): Fix cordova plugin config checker over checking 5.x #6444

Merged
merged 2 commits into from
Mar 30, 2023
Merged

fix(cli): Fix cordova plugin config checker over checking 5.x #6444

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
008b4e6
fix(cli): Fix cordova plugin config checker over checking
IT-MikeS Mar 28, 2023
dbeca93
Merge branch 'main' into fix/cli-cordova-config-checking-5.x
IT-MikeS Mar 30, 2023
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
31 changes: 19 additions & 12 deletions cli/src/cordova.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,19 +954,26 @@ export async function writeCordovaAndroidManifest(
}
}
} else {
let foundRequiredElement = false;
for (const existingElementItem of existingElement.children) {
const foundRequiredElementIn = doesElementMatch(
requiredElement,
existingElementItem,
);
if (foundRequiredElementIn) {
foundRequiredElement = true;
break;
if (
requiredElement.children === undefined &&
existingElement.children === undefined
) {
return true;
} else {
let foundRequiredElement = false;
for (const existingElementItem of existingElement.children) {
const foundRequiredElementIn = doesElementMatch(
requiredElement,
existingElementItem,
);
if (foundRequiredElementIn) {
foundRequiredElement = true;
break;
}
}
if (!foundRequiredElement) {
return false;
}
}
if (!foundRequiredElement) {
return false;
}
}
}
Expand Down