github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-31 17:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: Set up CodeQL analysis w/ fixes (#1711)

Browse Source 
* ci: Set up CodeQL analysis
* spec: disable allowBackup in testing
* ci: do not check cordova.js - convered in cordova-js repo
* chore: add missing @Override annotation
This commit is contained in:
エリス 2024-05-13 10:24:04 +09:00 committed by GitHub
parent 7fa4a65d0a
commit ed8e5d2f0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 88 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/ci.yml vendored
View File

@ -31,15 +31,12 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: set up JDK 11
uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
@ -50,6 +47,21 @@ jobs:
npm --version
gradle --version
# "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@v3
with:
languages: javascript, java-kotlin
queries: security-and-quality
config: |
paths-ignore:
- coverage
- node_modules
- templates/project/assets/www/cordova.js
- test/androidx/app/src/main/assets/www/cordova.js
- name: npm install and test
run: |
npm i
@ -57,6 +69,8 @@ jobs:
env:
CI: true
- uses: github/codeql-action/analyze@v3
- uses: codecov/codecov-action@v4
if: success()
with:

5
framework/src/org/apache/cordova/CordovaActivity.java
View File

@ -391,6 +391,7 @@ public class CordovaActivity extends AppCompatActivity {
if ((errorUrl != null) && (!failingUrl.equals(errorUrl)) && (appView != null)) {
// Load URL on UI thread
me.runOnUiThread(new Runnable() {
@Override
public void run() {
me.appView.showWebPage(errorUrl, false, true, null);
}
@ -400,6 +401,7 @@ public class CordovaActivity extends AppCompatActivity {
else {
final boolean exit = !(errorCode == WebViewClient.ERROR_HOST_LOOKUP);
me.runOnUiThread(new Runnable() {
@Override
public void run() {
if (exit) {
me.appView.getView().setVisibility(View.GONE);
@ -416,6 +418,7 @@ public class CordovaActivity extends AppCompatActivity {
public void displayError(final String title, final String message, final String button, final boolean exit) {
final CordovaActivity me = this;
me.runOnUiThread(new Runnable() {
@Override
public void run() {
try {
AlertDialog.Builder dlg = new AlertDialog.Builder(me);
@ -424,6 +427,7 @@ public class CordovaActivity extends AppCompatActivity {
dlg.setCancelable(false);
dlg.setPositiveButton(button,
new AlertDialog.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
if (exit) {
@ -488,6 +492,7 @@ public class CordovaActivity extends AppCompatActivity {
return null;
}
@Override
protected void onSaveInstanceState(Bundle outState) {
cordovaInterface.onSaveInstanceState(outState);
super.onSaveInstanceState(outState);

7
framework/src/org/apache/cordova/CordovaClientCertRequest.java
View File

@ -41,6 +41,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* Cancel this request
*/
@SuppressLint("NewApi")
@Override
public void cancel()
{
request.cancel();
@ -50,6 +51,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* Returns the host name of the server requesting the certificate.
*/
@SuppressLint("NewApi")
@Override
public String getHost()
{
return request.getHost();
@ -59,6 +61,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* Returns the acceptable types of asymmetric keys (can be null).
*/
@SuppressLint("NewApi")
@Override
public String[] getKeyTypes()
{
return request.getKeyTypes();
@ -68,6 +71,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* Returns the port number of the server requesting the certificate.
*/
@SuppressLint("NewApi")
@Override
public int getPort()
{
return request.getPort();
@ -77,6 +81,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* Returns the acceptable certificate issuers for the certificate matching the private key (can be null).
*/
@SuppressLint("NewApi")
@Override
public Principal[] getPrincipals()
{
return request.getPrincipals();
@ -86,6 +91,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* Ignore the request for now. Do not remember user's choice.
*/
@SuppressLint("NewApi")
@Override
public void ignore()
{
request.ignore();
@ -98,6 +104,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
* @param chain The certificate chain
*/
@SuppressLint("NewApi")
@Override
public void proceed(PrivateKey privateKey, X509Certificate[] chain)
{
request.proceed(privateKey, chain);

9
framework/src/org/apache/cordova/CordovaDialogsHelper.java
View File

@ -43,18 +43,21 @@ public class CordovaDialogsHelper {
dlg.setCancelable(true);
dlg.setPositiveButton(android.R.string.ok,
new AlertDialog.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
result.gotResult(true, null);
}
});
dlg.setOnCancelListener(
new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
result.gotResult(false, null);
}
});
dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
//DO NOTHING
@Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK)
{
@ -75,24 +78,28 @@ public class CordovaDialogsHelper {
dlg.setCancelable(true);
dlg.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
result.gotResult(true, null);
}
});
dlg.setNegativeButton(android.R.string.cancel,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
result.gotResult(false, null);
}
});
dlg.setOnCancelListener(
new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
result.gotResult(false, null);
}
});
dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
//DO NOTHING
@Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK)
{
@ -126,6 +133,7 @@ public class CordovaDialogsHelper {
dlg.setCancelable(false);
dlg.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String userText = input.getText().toString();
result.gotResult(true, userText);
@ -133,6 +141,7 @@ public class CordovaDialogsHelper {
});
dlg.setNegativeButton(android.R.string.cancel,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
result.gotResult(false, null);
}

2
framework/src/org/apache/cordova/CordovaHttpAuthHandler.java
View File

@ -35,6 +35,7 @@ public class CordovaHttpAuthHandler implements ICordovaHttpAuthHandler {
/**
* Instructs the WebView to cancel the authentication request.
*/
@Override
public void cancel () {
this.handler.cancel();
}
@ -45,6 +46,7 @@ public class CordovaHttpAuthHandler implements ICordovaHttpAuthHandler {
* @param username
* @param password
*/
@Override
public void proceed (String username, String password) {
this.handler.proceed(username, password);
}

3
framework/src/org/apache/cordova/CordovaInterfaceImpl.java
View File

@ -223,6 +223,7 @@ public class CordovaInterfaceImpl implements CordovaInterface {
}
}
@Override
public void requestPermission(CordovaPlugin plugin, int requestCode, String permission) {
String[] permissions = new String [1];
permissions[0] = permission;
@ -230,11 +231,13 @@ public class CordovaInterfaceImpl implements CordovaInterface {
}
@SuppressLint("NewApi")
@Override
public void requestPermissions(CordovaPlugin plugin, int requestCode, String [] permissions) {
int mappedRequestCode = permissionResultCallbacks.registerCallback(plugin, requestCode);
getActivity().requestPermissions(permissions, mappedRequestCode);
}
@Override
public boolean hasPermission(String permission)
{
return PackageManager.PERMISSION_GRANTED == activity.checkSelfPermission(permission);

5
framework/src/org/apache/cordova/CordovaWebViewImpl.java
View File

@ -149,6 +149,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
// Timeout error method
final Runnable loadError = new Runnable() {
@Override
public void run() {
stopLoading();
LOG.e(TAG, "CordovaWebView: TIMEOUT ERROR!");
@ -168,6 +169,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
// Timeout timer method
final Runnable timeoutCheck = new Runnable() {
@Override
public void run() {
try {
synchronized (this) {
@ -189,6 +191,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
if (cordova.getActivity() != null) {
final boolean _recreatePlugins = recreatePlugins;
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
if (loadUrlTimeoutValue > 0) {
cordova.getThreadPool().execute(timeoutCheck);
@ -579,11 +582,13 @@ public class CordovaWebViewImpl implements CordovaWebView {
// Make app visible after 2 sec in case there was a JS error and Cordova JS never initialized correctly
if (engine.getView().getVisibility() != View.VISIBLE) {
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(2000);
if (cordova.getActivity() != null) {
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
pluginManager.postMessage("spinner", "stop");
}

6
framework/src/org/apache/cordova/CoreAndroid.java
View File

@ -73,6 +73,7 @@ public class CoreAndroid extends CordovaPlugin {
* @param callbackContext The callback context from which we were invoked.
* @return A PluginResult object with a status and message.
*/
@Override
public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
PluginResult.Status status = PluginResult.Status.OK;
String result = "";
@ -86,6 +87,7 @@ public class CoreAndroid extends CordovaPlugin {
// I recommend we change the name of the Message as spinner/stop is not
// indicative of what this actually does (shows the webview).
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
webView.getPluginManager().postMessage("spinner", "stop");
}
@ -144,6 +146,7 @@ public class CoreAndroid extends CordovaPlugin {
*/
public void clearCache() {
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
webView.clearCache();
}
@ -215,6 +218,7 @@ public class CoreAndroid extends CordovaPlugin {
*/
public void clearHistory() {
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
webView.clearHistory();
}
@ -227,6 +231,7 @@ public class CoreAndroid extends CordovaPlugin {
*/
public void backHistory() {
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
webView.backHistory();
}
@ -353,6 +358,7 @@ public class CoreAndroid extends CordovaPlugin {
* Unregister the receiver
*
*/
@Override
public void onDestroy()
{
webView.getContext().unregisterReceiver(this.telephonyReceiver);

4
framework/src/org/apache/cordova/NativeToJsMessageQueue.java
View File

@ -302,6 +302,7 @@ public class NativeToJsMessageQueue {
@Override
public void onNativeToJsMessageAvailable(final NativeToJsMessageQueue queue) {
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
String js = queue.popAndEncodeAsJs();
if (js != null) {
@ -330,6 +331,7 @@ public class NativeToJsMessageQueue {
@Override
public void reset() {
delegate.runOnUiThread(new Runnable() {
@Override
public void run() {
online = false;
// If the following call triggers a notifyOfFlush, then ignore it.
@ -342,6 +344,7 @@ public class NativeToJsMessageQueue {
@Override
public void onNativeToJsMessageAvailable(final NativeToJsMessageQueue queue) {
delegate.runOnUiThread(new Runnable() {
@Override
public void run() {
if (!queue.isEmpty()) {
ignoreNextFlush = false;
@ -372,6 +375,7 @@ public class NativeToJsMessageQueue {
@Override
public void onNativeToJsMessageAvailable(final NativeToJsMessageQueue queue) {
cordova.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
String js = queue.popAndEncodeAsJs();
if (js != null) {

5
framework/src/org/apache/cordova/engine/SystemCookieManager.java
View File

@ -41,22 +41,27 @@ class SystemCookieManager implements ICordovaCookieManager {
cookieManager.setAcceptFileSchemeCookies(true);
}
@Override
public void setCookiesEnabled(boolean accept) {
cookieManager.setAcceptCookie(accept);
}
@Override
public void setCookie(final String url, final String value) {
cookieManager.setCookie(url, value);
}
@Override
public String getCookie(final String url) {
return cookieManager.getCookie(url);
}
@Override
public void clearCookies() {
cookieManager.removeAllCookies(null);
}
@Override
public void flush() {
cookieManager.flush();
}

3
framework/src/org/apache/cordova/engine/SystemExposedJsApi.java
View File

@ -37,16 +37,19 @@ class SystemExposedJsApi implements ExposedJsApi {
}
@JavascriptInterface
@Override
public String exec(int bridgeSecret, String service, String action, String callbackId, String arguments) throws JSONException, IllegalAccessException {
return bridge.jsExec(bridgeSecret, service, action, callbackId, arguments);
}
@JavascriptInterface
@Override
public void setNativeToJsBridgeMode(int bridgeSecret, int value) throws IllegalAccessException {
bridge.jsSetNativeToJsBridgeMode(bridgeSecret, value);
}
@JavascriptInterface
@Override
public String retrieveJsMessages(int bridgeSecret, boolean fromOnlineEvent) throws IllegalAccessException {
return bridge.jsRetrieveJsMessages(bridgeSecret, fromOnlineEvent);
}

1
framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
View File

@ -321,6 +321,7 @@ public class SystemWebChromeClient extends WebChromeClient {
return uri;
}
@Override
public void onPermissionRequest(final PermissionRequest request) {
LOG.d(LOG_TAG, "onPermissionRequest: " + Arrays.toString(request.getResources()));
request.grant(request.getResources());

2
spec/fixtures/android_studio_project/app/src/main/AndroidManifest.xml vendored
View File

@ -3,7 +3,7 @@
package="com.example.anis.myapplication">
<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"

12
test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
View File

@ -69,30 +69,35 @@ public class BackButtonMultipageTest {
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
webInterface.sendJavascript("window.location = 'sample2.html';");
}
});
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
webInterface.sendJavascript("window.location = 'sample3.html';");
}
});
assertPageSample(SAMPLE3_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertFalse(webInterface.backHistory());
}
@ -105,30 +110,35 @@ public class BackButtonMultipageTest {
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
webInterface.loadUrl(SAMPLE2_URL);
}
});
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
webInterface.loadUrl(SAMPLE3_URL);
}
});
assertPageSample(SAMPLE3_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertFalse(webInterface.backHistory());
}
@ -141,12 +151,14 @@ public class BackButtonMultipageTest {
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
webInterface.loadUrl(SAMPLE2_URL);
}
});
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
webInterface.loadUrl(SAMPLE3_URL);
}

1
test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/ErrorUrlTest.java
View File

@ -60,6 +60,7 @@ public class ErrorUrlTest {
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
assertEquals(ERROR_URL, mActivity.onPageFinishedUrl.take());
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
assertEquals(ERROR_URL, mActivity.getWebInterface().getUrl());
}

1
test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/MessageChannelMultipageTest.java
View File

@ -79,6 +79,7 @@ public class MessageChannelMultipageTest {
//load a page - this resets the plugin manager and nulls cordovaWebViewImpl.appPlugin
//(previously this resets plugin manager but did not null cordovaWebViewImpl.appPlugin, leading to the issue)
mActivityRule.runOnUiThread(new Runnable() {
@Override
public void run() {
cordovaWebView.loadUrl(START_URL);
}

2
test/androidx/app/src/main/AndroidManifest.xml
View File

@ -20,7 +20,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"

1
test/androidx/app/src/main/java/org/apache/cordova/unittests/EmbeddedWebViewActivity.java
View File

@ -93,6 +93,7 @@ public class EmbeddedWebViewActivity extends AppCompatActivity {
* @param permissions
* @param grantResults
*/
@Override
public void onRequestPermissionsResult(int requestCode, String permissions[],
int[] grantResults) {
try