Merge branch '5561-name_the_vpn_already_running' into 'main'

5561: display name of other VPNrunning always on.

See merge request e/os/advanced-privacy!96

2 files changed, 8 insertions, 6 deletions

diff --git a/permissionsstandalone/build.gradle b/permissionsstandalone/build.gradle
index ef03f2b..8d2def8 100644
--- a/permissionsstandalone/build.gradle
+++ b/permissionsstandalone/build.gradle
@@ -57,4 +57,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
+}
diff --git a/permissionsstandalone/src/main/java/foundation/e/privacymodules/permissions/PermissionsPrivacyModule.kt b/permissionsstandalone/src/main/java/foundation/e/privacymodules/permissions/PermissionsPrivacyModule.kt
index d32cada..98ebdc3 100644
--- a/permissionsstandalone/src/main/java/foundation/e/privacymodules/permissions/PermissionsPrivacyModule.kt
+++ b/permissionsstandalone/src/main/java/foundation/e/privacymodules/permissions/PermissionsPrivacyModule.kt
@@ -18,15 +18,13 @@
 package foundation.e.privacymodules.permissions
 
 import android.content.Context
-import android.os.Build
-import android.provider.Settings
 import foundation.e.privacymodules.permissions.data.AppOpModes
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 
 /**
  * Implements [IPermissionsPrivacyModule] using only API authorized on the PlayStore.
  */
-class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(context) {
+class PermissionsPrivacyModule(context: Context) : APermissionsPrivacyModule(context) {
     /**
      * @see IPermissionsPrivacyModule.toggleDangerousPermission
      * Return an ManualAction to go toggle manually the permission in the ap page of the settings.
@@ -34,8 +32,8 @@ class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(cont
     override fun toggleDangerousPermission(
         appDesc: ApplicationDescription,
         permissionName: String,
-        grant: Boolean): Boolean = false
-
+        grant: Boolean
+    ): Boolean = false
 
     override fun setAppOpMode(
         appDesc: ApplicationDescription,
@@ -46,4 +44,8 @@ class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(cont
     override fun setVpnPackageAuthorization(packageName: String): Boolean {
         return false
     }
+
+    override fun getAlwaysOnVpnPackage(): String? {
+        return null
+    }
 }