Small coverity fixes

schwabe · Jul 23, 2024 · 879ed38 · 879ed38
1 parent 5bdac9a
commit 879ed38
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
 }
 
 android {
-    buildToolsVersion = "33.0.1"
     buildFeatures {
         aidl = true
     }

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -309,7 +309,7 @@ else if (channel.equals(NOTIFICATION_CHANNEL_USERREQ_ID))
         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 {

diff --git a/runcoverity.sh b/runcoverity.sh
@@ -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