Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 3 additions & 57 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,54 +26,6 @@ on:
- '*'

jobs:
codeql:
name: CodeQL Analysis
runs-on: ubuntu-latest

permissions:
contents: read
security-events: write

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false
fetch-depth: 1

- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
with:
distribution: 'temurin'
java-version: '17'

# "bin/templates/platform_www/cordova.js" is ignored because it is a generated file.
# It contains mixed content from the npm package "cordova-js" and "./cordova-js-src".
# The report might not be resolvable because of the external package.
# If the report is related to this repository, it would be detected when scanning "./cordova-js-src".
- uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
with:
languages: javascript, java-kotlin
queries: security-and-quality
# When 'build-mode' is set to 'none', CodeQL will create a database without
# requiring a build for Java. If Kotlin files are added in the future, build
# will be required.
build-mode: none
config: |
paths-ignore:
- coverage
- node_modules
- templates/project/assets/www/cordova.js
- test/androidx/app/src/main/assets/www/cordova.js
- framework/build/intermediates
- framework/build/outputs
- framework/build/reports
- framework/build/tmp
- test/androidx/build/intermediates
- test/androidx/build/outputs
- test/androidx/build/reports
- test/androidx/build/tmp

- uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0

test:
name: NodeJS ${{ matrix.node-version }} on ${{ matrix.os }}

Expand All @@ -85,7 +37,7 @@ jobs:
strategy:
matrix:
node-version: [20.x, 22.x, 24.x, 26.x]
os: [ubuntu-latest, windows-latest, macos-26]
os: [ubuntu-latest, macos-26]

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
Expand All @@ -97,7 +49,8 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
- name: set up JDK 17
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -113,10 +66,3 @@ jobs:
npm cit
env:
CI: true

- uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
if: success()
with:
name: ${{ runner.os }} node.js ${{ matrix.node-version }}
token: ${{ secrets.CORDOVA_CODECOV_TOKEN }}
fail_ci_if_error: false
2 changes: 1 addition & 1 deletion cordova-js-src/plugin/android/splashscreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var exec = require('cordova/exec');

var splashscreen = {
show: function () {
console.log('"navigator.splashscreen.show()" is unsupported on Android.');
exec(null, null, 'CordovaSplashScreenPlugin', 'show', []);
},
hide: function () {
exec(null, null, 'CordovaSplashScreenPlugin', 'hide', []);
Expand Down
3 changes: 3 additions & 0 deletions framework/cordova.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ def doApplyCordovaConfigCustomization() {
if (project.hasProperty('cdvAndroidXWebKitVersion')) {
cordovaConfig.ANDROIDX_WEBKIT_VERSION = cdvAndroidXWebKitVersion
}
if (project.hasProperty('cdvAndroidXCoreSplashscreenVersion')) {
cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION = cdvAndroidXCoreSplashscreenVersion
}

if (!cordovaConfig.BUILD_TOOLS_VERSION) {
cordovaConfig.BUILD_TOOLS_VERSION = doFindLatestInstalledBuildTools(
Expand Down
1 change: 0 additions & 1 deletion framework/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.enableJetifier=true

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
1 change: 1 addition & 0 deletions framework/src/org/apache/cordova/CordovaActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ protected void createViews() {
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
));
webView.setFilterTouchesWhenObscured(preferences.getBoolean("FilterTouchesWhenObscured", true));

// Create StatusBar view that will overlay the top inset
View statusBarView = new View(this);
Expand Down
2 changes: 2 additions & 0 deletions framework/src/org/apache/cordova/CordovaWebViewImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ public void showWebPage(String url, boolean openExternal, boolean clearHistory,
} else {
LOG.e(TAG, "Error loading url " + url, e);
}
} catch (Exception e) {
LOG.e(TAG, "Error loading url " + url + " with error on file URI exposed", e);
}
}

Expand Down
Loading