mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-19 19:42:29 +02:00
Code

Small coverity fixes

Browse Source
This commit is contained in:
Arne Schwabe 2024-07-23 14:18:13 +02:00
parent 5bdac9a6be
commit 879ed38be5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/build.gradle.kts
View File

@ -12,7 +12,6 @@ plugins {
}
android {
buildToolsVersion = "33.0.1"
buildFeatures {
aidl = true
}

2
main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
View File

@ -309,7 +309,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
nbuilder.setOngoing(true);
nbuilder.setSmallIcon(icon);
if (status == LEVEL_WAITING_FOR_USER_INPUT) {
if (status == LEVEL_WAITING_FOR_USER_INPUT && intent != null) {
PendingIntent pIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
nbuilder.setContentIntent(pIntent);
} else {

3
runcoverity.sh
View File

@ -12,7 +12,8 @@ cov-configure --config .coverity/cfg.xml --kotlin
cov-configure --config .coverity/cfg.xml --java
./gradlew -b build.gradle.kts --no-daemon clean
cov-build --dir .coverity/idir --config .coverity/cfg.xml ./gradlew -b build.gradle.kts --no-daemon assembleUiOvpn23Release
# Coverity needs the --fs-capture-search for Kotlin according to https://community.synopsys.com/s/article/How-to-analyze-Kotlin-project
cov-build --fs-capture-search main/src --dir .coverity/idir --config .coverity/cfg.xml ./gradlew -b build.gradle.kts --no-daemon assembleUiOvpn23Release
NDK_VER=${NDK_VER:-26.1.10909125}
cov-analyze --dir .coverity/idir --all --strip-path ${PWD}/main/src/main/cpp --strip-path ${PWD}/main/src --strip-path ${PWD} --strip-path ${ANDROID_HOME}/ndk/${NDK_VER}/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/ --strip-path ${ANDROID_HOME}/ndk/${NDK_VER}/toolchains/llvm/prebuilt/linux-x86_64/sysroot