Update some dependency versions, display API logs, govVPN flavor

.github/workflows/check.yaml

@@ -1,6 +1,6 @@
 name: Run tests
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 jobs:
   build:
@@ -17,9 +17,9 @@ jobs:
         -x :ics-openvpn-main:buildCMakeRelWithDebInfo[x86]
         -x :ics-openvpn-main:configureCMakeRelWithDebInfo[x86_64]
         -x :ics-openvpn-main:buildCMakeRelWithDebInfo[x86_64]
-        -x :ics-openvpn-main:externalNativeBuildUiRelease
-        -x :ics-openvpn-main:packageUiReleaseResources
-        -x :ics-openvpn-main:compileUiReleaseJavaWithJavac
+        -x :ics-openvpn-main:externalNativeBuildUiOvpn23Release
+        -x :ics-openvpn-main:packageUiOvpn23ReleaseResources
+        -x :ics-openvpn-main:compileUiOvpn23ReleaseJavaWithJavac
         -x :ics-openvpn-main:configureCMakeDebug[x86_64]
         -x :ics-openvpn-main:buildCMakeDebug[x86_64]
         -x :ics-openvpn-main:buildCMakeDebug[arm64-v8a]
@@ -29,14 +29,16 @@ jobs:
       matrix:
         api-level: [ 31 ]
     steps:
-      - name: Use Java 17
-        run: echo "JAVA_HOME=${!JAVA_HOME_17_X64}" >> $GITHUB_ENV
-
       - name: Checkout repository and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
-
+      - name: Install Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'gradle'
       # Based on https://github.com/actions/cache/blob/main/examples.md#java---gradle
       - name: Cache Gradle caches and wrapper
         uses: actions/cache@v3

app/build.gradle

@@ -9,15 +9,15 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "nl.eduvpn.app"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 34
         versionCode 23
         versionName "3.1.1"
-        ndkVersion "21.0.6113669"
+        ndkVersion "26.1.10909125"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -34,12 +34,12 @@ android {
         buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.eduvpn.app.android\""
         buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.eduvpn.app:/api/callback\""
         buildConfigField "String", "OAUTH_SCOPE", "\"config\""
-        buildConfigField "String", "CERTIFICATE_DISPLAY_NAME", "\"eduVPN for Android\""
 
         manifestPlaceholders = [
                 'redirectScheme': 'org.eduvpn.app'
         ]
-        missingDimensionStrategy 'implementation', 'ui' // Skeleton is no option for us because we need the log activity
+        missingDimensionStrategy 'implementation', 'ui'  // Skeleton is no option for us because we need the log activity
+        missingDimensionStrategy 'ovpnimpl', 'ovpn23'
 
         // This excludes some pretty old ABIs such armeabi or mips. LibSodium-JNI still includes binaries for these, which
         // leads to some devices selecting these as the app ABI, but the OpenVPN library did not include a binary for these,
@@ -77,7 +77,7 @@ android {
         }
     }
 
-    flavorDimensions "product"
+    flavorDimensions = ["product"]
 
     productFlavors {
         basic {
@@ -88,38 +88,43 @@ android {
             dimension "product"
             applicationId "nl.eduvpn.app.dev"
         }
+        gov {
+            dimension "product"
+            applicationId "org.govvpn.app"
+            // API discovery is disabled, and only custom URLs can be entered.
+            buildConfigField "boolean", "API_DISCOVERY_ENABLED", "false"
+            buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.govvpn.app.android\""
+            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.govvpn.app:/api/callback\""
+
+            manifestPlaceholders = [
+                    'redirectScheme': 'org.govvpn.app.android'
+            ]
+        }
         home {
             dimension "product"
             applicationId "org.letsconnect_vpn.app"
             // API discovery is disabled, and only custom URLs can be entered.
             buildConfigField "boolean", "API_DISCOVERY_ENABLED", "false"
             buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.letsconnect-vpn.app.android\""
             buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.letsconnect-vpn.app:/api/callback\""
-            buildConfigField "String", "CERTIFICATE_DISPLAY_NAME", "\"Let's Connect! for Android\""
 
             manifestPlaceholders = [
                     'redirectScheme': 'org.letsconnect-vpn.app'
             ]
         }
     }
 
-    lintOptions {
-        disable 'GradleDependency', // Gradle dependencies can be a bit outdated, since we prefer to use the same versions as in the VPN library
-                'UnsafeNativeCodeLocation', // The OpenVPN .so files are put to a different place, as per the documentation
-                'RtlSymmetry', 'RtlHardcoded', // No support for RTL as of now
-                'MissingTranslation' // The OpenVPN library contains translations for a lot off languages. This app only has english, so it complains that we are missing translations for the other languages
-    }
 
     compileOptions {
         // Support Java 8+ on sdk < 24, also necessary for WireGuard
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     kapt {
@@ -132,22 +137,26 @@ android {
             option("-Werror")
         }
     }
-
     packagingOptions {
-        // Created by kotlinx-coroutines-core for debugging
-        exclude "DebugProbesKt.bin"
+        resources {
+            excludes += ['DebugProbesKt.bin']
+        }
+    }
+
+    namespace 'nl.eduvpn.app'
+    lint {
+        disable 'GradleDependency', 'UnsafeNativeCodeLocation', 'RtlSymmetry', 'RtlHardcoded', 'MissingTranslation'
     }
 }
 
-def daggerVersion = "2.44"
-def okHttpVersion = "4.10.0"
+def daggerVersion = "2.48"
 def lifecycleVersion = "2.2.0"
 
 dependencies {
     // OpenVPN library
     implementation project(path: ':ics-openvpn-main')
     // WireGuard VPN library
-    implementation 'com.wireguard.android:tunnel:1.0.20230427'
+    implementation 'com.wireguard.android:tunnel:1.0.20230706'
     // eduVPN common library written in Go, stores all data and does the communication with the servers
     implementation project(path: ':common')
     // Please try to stay in sync with the versions used in the ics-openvpn module

app/proguard-rules.pro

@@ -1,17 +1,5 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/fkooman/Android/Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-dontwarn com.google.errorprone.annotations.*
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.*
+-dontwarn org.openjsse.javax.net.ssl.*
+-dontwarn org.openjsse.net.ssl.*

app/src/gov/res/drawable/ic_application_logo.xml

@@ -0,0 +1,25 @@
+<vector android:height="33.469807dp" android:viewportHeight="135.84"
+    android:viewportWidth="487.03" android:width="120dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:fillType="evenOdd"
+        android:pathData="m434.98,124.79c24.49,-0.08 41.26,-16.84 41.17,-41.09 -0.02,-7.71 0.09,-22.24 -0.06,-30.43 -0.42,-23.38 -16.33,-41 -41.07,-41.19 -9.29,-0.07 -151.31,-0.34 -169.09,0.06 -24.21,0.55 -41.27,18.87 -41.17,41.09 0.07,15.22 0.09,18.75 -0.27,31.45 -0.49,17.4 -12.87,40.25 -41.17,40.24 42.97,-0 209.16,-0 251.66,-0.13" android:strokeColor="#00000000"/>
+    <path android:fillColor="#231f20" android:fillType="evenOdd"
+        android:pathData="m434.74,124.67c24.49,-0.07 41.26,-16.84 41.17,-41.09 -0.03,-7.71 0.09,-22.24 -0.06,-30.43 -0.42,-23.38 -16.33,-41 -41.07,-41.19 -9.29,-0.07 -151.31,-0.34 -169.09,0.06 -24.21,0.55 -41.27,18.87 -41.17,41.09 0.07,15.22 0.09,18.75 -0.27,31.45 -0.49,17.4 -12.87,40.25 -41.17,40.24 42.97,-0 209.16,-0 251.66,-0.13zM434.78,0c27.57,-0 52.24,23.24 52.19,52.3 -0.01,9.83 0.05,21.59 0.05,31.28C487.02,110.95 464.56,135.74 434.74,135.8 431.95,135.8 59.74,135.84 52.24,135.84 24.62,135.84 0.05,112.37 0.05,83.54c0,-15.95 -0.07,-15.32 -0.04,-31.27C0.05,23.81 24.34,0.05 52.29,0.05c2.56,-0 374.24,-0.04 382.49,-0.04" android:strokeColor="#00000000"/>
+    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:pathData="m90.28,66.26c0,0.02 0,0.66 0,1.67 -0.29,1.84 0,4.6 -4.51,9.16 -0.38,0.38 -1.83,1.84 -4.21,2.98 -2.51,1.21 -5.34,1.82 -8.49,1.82 -4.97,-0 -9.08,-1.47 -12.33,-4.4 -3.25,-2.93 -4.87,-6.68 -4.87,-11.23 0,-4.58 1.63,-8.35 4.89,-11.32 3.26,-2.97 7.37,-4.45 12.3,-4.45 4.94,-0 9.04,1.48 12.3,4.45 1.44,1.31 2.57,2.78 3.37,4.4 1.4,2.82 1.56,5.44 1.52,6.91zM91.69,49.3c-4.9,-4.42 -11.1,-6.62 -18.62,-6.62 -7.51,-0 -13.72,2.21 -18.61,6.62 -4.89,4.42 -7.34,10.07 -7.34,16.95 0,6.86 2.45,12.48 7.34,16.86 4.9,4.39 11.1,6.58 18.61,6.58 3.74,-0 6.59,-0.74 7.75,-1.07 4.42,-1.27 7.6,-3.38 9.45,-4.82 0,0.26 0,0.41 0,0.43 0,0 0,2.91 0,2.91 0,3.02 -1.48,5.64 -4.45,7.86 -3.29,2.48 -7.54,3.73 -12.75,3.73 -2.63,-0 -5.72,-0.34 -9.25,-1.01 -3.53,-0.67 -6.59,-1.5 -9.16,-2.49l-2.47,7.63c2.93,1.11 6.33,2 10.19,2.67 3.86,0.67 7.42,1.01 10.69,1.01 7.93,-0 14.37,-2.08 19.31,-6.24 2.09,-1.77 3.73,-3.8 4.89,-6.11 1.17,-2.31 1.75,-4.65 1.75,-7.05l0,-20.88c0,-6.89 -2.45,-12.54 -7.34,-16.95" android:strokeColor="#00000000"/>
+    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:pathData="m145.35,79.84c-3.37,3.37 -7.42,5.05 -12.15,5.05 -4.73,-0 -8.78,-1.68 -12.15,-5.05 -3.37,-3.37 -5.05,-7.42 -5.05,-12.15 0,-4.73 1.68,-8.78 5.05,-12.15 3.37,-3.37 7.42,-5.05 12.15,-5.05 4.73,-0 8.78,1.68 12.15,5.05 3.37,3.37 5.05,7.42 5.05,12.15 0,4.73 -1.68,8.78 -5.05,12.15zM151.57,49.78c-2.43,-2.27 -5.22,-4.03 -8.38,-5.26 -3.16,-1.23 -6.49,-1.84 -9.99,-1.84 -3.5,-0 -6.83,0.61 -9.99,1.84 -3.16,1.23 -5.95,2.98 -8.38,5.26 -5.06,4.82 -7.59,10.79 -7.59,17.92 0,7.13 2.53,13.08 7.59,17.88 2.43,2.3 5.22,4.07 8.38,5.3 3.16,1.23 6.49,1.84 9.99,1.84 3.5,-0 6.83,-0.62 9.99,-1.84 3.16,-1.23 5.95,-2.99 8.38,-5.3 5.06,-4.79 7.59,-10.75 7.59,-17.88 0,-7.12 -2.53,-13.1 -7.59,-17.92" android:strokeColor="#00000000"/>
+    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:pathData="m162.16,43.62l8.85,-0l11.68,38.22c0.39,1.41 1.27,2.11 2.65,2.11 1.38,-0.09 2.27,-0.79 2.69,-2.11l11.68,-38.22l8.8,-0l-12.57,41.27c-0.72,2.27 -2.04,4.15 -3.97,5.61 -1.93,1.46 -4.14,2.2 -6.62,2.2 -2.49,-0 -4.7,-0.74 -6.65,-2.22 -1.95,-1.48 -3.25,-3.35 -3.91,-5.59l-12.62,-41.27" android:strokeColor="#00000000"/>
+    <path android:fillColor="#231f20" android:fillType="nonZero"
+        android:pathData="m264.82,43.62l1.39,-0l0,7.81l-1.39,-0c-3.17,-0 -6.02,1.2 -8.53,3.59 -2.52,2.4 -3.77,5.12 -3.77,8.17L252.52,91.81l-8.76,-0l0,-28.61c0,-5.72 1.98,-10.41 5.95,-14.08 3.97,-3.67 9,-5.5 15.11,-5.5" android:strokeColor="#00000000"/>
+    <path android:fillColor="#231f20" android:fillType="nonZero"
+        android:pathData="m308.84,79.84c-3.37,3.37 -7.42,5.05 -12.15,5.05 -4.73,-0 -8.78,-1.68 -12.15,-5.05 -3.37,-3.37 -5.05,-7.42 -5.05,-12.15 0,-4.73 1.68,-8.78 5.05,-12.15 3.37,-3.37 7.42,-5.05 12.15,-5.05 4.73,-0 8.78,1.68 12.15,5.05 3.37,3.37 5.05,7.42 5.05,12.15 0,4.73 -1.68,8.78 -5.05,12.15zM315.06,49.78c-2.42,-2.27 -5.21,-4.03 -8.37,-5.26 -3.16,-1.23 -6.49,-1.84 -9.99,-1.84 -3.5,-0 -6.83,0.61 -9.99,1.84 -3.16,1.23 -5.95,2.98 -8.38,5.26 -5.06,4.82 -7.59,10.79 -7.59,17.92 0,7.13 2.53,13.08 7.59,17.88 2.43,2.3 5.21,4.07 8.38,5.3 3.16,1.23 6.49,1.84 9.99,1.84 3.5,-0 6.83,-0.62 9.99,-1.84 3.16,-1.23 5.95,-2.99 8.37,-5.3 5.06,-4.79 7.59,-10.75 7.59,-17.88 0,-7.12 -2.53,-13.1 -7.59,-17.92" android:strokeColor="#00000000"/>
+    <path android:fillColor="#231f20" android:fillType="nonZero"
+        android:pathData="m371.29,74.11c-1.16,3.26 -4.09,6.01 -9.03,8.72 -2.54,1.39 -5.27,2.07 -8.17,2.07 -4.73,-0 -8.78,-1.68 -12.15,-5.05 -3.37,-3.37 -5.05,-7.42 -5.05,-12.15 0,-4.73 1.68,-8.78 5.05,-12.15 3.37,-3.37 7.42,-5.05 12.15,-5.05 4.73,-0 8.78,1.68 12.15,5.05 3.37,3.37 5.05,7.42 5.05,12.15zM372.46,49.78c-2.43,-2.27 -5.22,-4.03 -8.38,-5.26 -3.16,-1.23 -6.49,-1.84 -9.99,-1.84 -3.5,-0 -6.84,0.61 -9.99,1.84 -3.16,1.23 -5.95,2.98 -8.38,5.26 -5.06,4.82 -7.59,10.79 -7.59,17.92 0,7.13 2.53,13.08 7.59,17.88 2.43,2.3 5.21,4.07 8.38,5.3 3.15,1.23 6.49,1.84 9.99,1.84 5.21,-0 12.78,-2.31 17.2,-6.32l0,5.42l8.76,-0L380.04,67.69c0,-7.12 -2.53,-13.1 -7.59,-17.92" android:strokeColor="#00000000"/>
+    <path android:fillColor="#231f20" android:fillType="nonZero"
+        android:pathData="M399.73,91.81L390.97,91.81L390.97,59.34c0,-4.7 1.7,-8.65 5.1,-11.86 3.4,-3.2 7.57,-4.81 12.51,-4.81 2.45,-0 4.92,0.65 7.41,1.95 2.48,1.3 4.39,2.96 5.7,4.96 1.38,-2.01 3.34,-3.66 5.88,-4.96 2.55,-1.3 5.01,-1.95 7.41,-1.95 4.94,-0 9.1,1.59 12.49,4.78 3.38,3.19 5.07,7.15 5.07,11.88L452.54,91.81L443.79,91.81L443.79,59.34c0,-2.46 -0.86,-4.54 -2.59,-6.27 -1.72,-1.72 -3.79,-2.58 -6.22,-2.58 -2.45,-0 -4.54,0.85 -6.26,2.56 -1.72,1.71 -2.58,3.8 -2.58,6.29L426.14,91.81l-8.76,-0L417.38,59.34c0,-2.46 -0.85,-4.54 -2.56,-6.27 -1.71,-1.72 -3.79,-2.58 -6.24,-2.58 -2.46,-0 -4.55,0.86 -6.27,2.58 -1.72,1.72 -2.58,3.81 -2.58,6.27L399.73,91.81" android:strokeColor="#00000000"/>
+    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:pathData="M55.3,10.21L55.3,17.95C34.84,18.17 17.94,35.02 17.72,55.44L9.99,55.44C10.21,30.59 30.42,10.43 55.3,10.21l0,-0" android:strokeColor="#00000000"/>
+    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:pathData="M55.3,26.7L55.3,34.15C42.3,34.29 34.1,42.47 33.96,55.44l-7.44,-0c0.14,-15.78 12.97,-28.59 28.78,-28.73l0,-0" android:strokeColor="#00000000"/>
+</vector>

app/src/gov/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/gov/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/gov/res/values/colors.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  This file is part of eduVPN.
+  ~
+  ~     eduVPN is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     eduVPN is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with eduVPN.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <color name="mainColor">#A0A0A0</color>
+    <color name="colorPrimary">#A0A0A0</color>
+    <color name="colorPrimaryDark">#808080</color>
+    <color name="colorAccent">#a0a0a0</color>
+    <color name="colorSwitchThumbNormal">#D0D0D0</color>
+    <color name="textColor">#303030</color>
+    <color name="buttonTextColor">#FFFFFF</color>
+    <color name="disabledColor">#808080</color>
+    <color name="pressedColor">#22B9FF</color>
+    <color name="backgroundColor">#f0f0f0</color>
+    <color name="backgroundPressedColor">#202020</color>
+    <color name="hintColor">#C8C8C8</color>
+    <color name="settingsDescriptionTextColor">#FFFFFF</color>
+    <color name="swipeBackgroundColor">#CF0000</color>
+    <color name="iconColor">#808080</color>
+    <color name="transparentGradientColor">#00000000</color>
+    <color name="gradientColor">#000000</color>
+    <color name="buttonBackgroundColor">#808080</color>
+    <color name="buttonBackgroundColorDisabled">#A0A0A0</color>
+    <color name="switcherInactiveBackground">#303030</color>
+    <color name="switcherActiveBackground">#505050</color>
+    <color name="switcherStrokeColor">#606060</color>
+</resources>

app/src/gov/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>

app/src/gov/res/values/strings.xml

@@ -0,0 +1,21 @@
+<!--
+  ~  This file is part of eduVPN.
+  ~
+  ~     eduVPN is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     eduVPN is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with eduVPN.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string name="app_name">govVPN</string>
+    <string name="actionbar_title">govVPN</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nl.eduvpn.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
     <application
         android:name=".EduVPNApplication"
         android:allowBackup="false"
@@ -54,13 +56,20 @@
         <!-- Activities and services inherited from the OpenVPN library. -->
         <service
             android:name="de.blinkt.openvpn.core.OpenVPNService"
-            android:exported="false"
+            android:exported="true"
+            android:foregroundServiceType="specialUse"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn"/>
         </service>
 
+        <service android:name="de.blinkt.openvpn.core.keepVPNAlive"
+            android:process=":openvpn"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE"/>
+
         <service
             android:name="de.blinkt.openvpn.api.ExternalOpenVPNService"
             android:exported="false"
@@ -84,6 +93,7 @@
             android:name="de.blinkt.openvpn.OpenVPNTileService"
             android:icon="@drawable/logo_black"
             android:label="@string/qs_title"
+            android:exported="true"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
             android:value="true"
             tools:replace="android:icon">
@@ -153,6 +163,11 @@
 
         </activity>
 
+        <activity android:name=".ApiLogsActivity"
+            android:launchMode="singleTask"
+            android:exported="false"
+            android:theme="@style/AppTheme.NoActionBar" />
+
         <activity
             android:name=".LicenseActivity"
             android:launchMode="singleTask"