Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9b44a5 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

setVpnAuthorization for API 30

parent 93955e58

privacymodulese/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ publishing { 
        maven(MavenPublication) {

            groupId 'foundation.e'

            //You can either define these here or get them from project conf elsewhere

            artifactId 'privacymodule.e-29'

            artifactId 'privacymodule.e-30'

            version android.defaultConfig.versionName

            artifact "$buildDir/outputs/aar/privacymodulese-release.aar" //aar artifact you want to publish

//            artifact "$buildDir/outputs/aar/privacymodulese-debug.aar" //aar artifact you want to publish

privacymodulese/src/main/java/foundation/e/privacymodules/permissions/PermissionsPrivacyModule.kt

+11 −6
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ package foundation.e.privacymodules.permissions 
import android.app.AppOpsManager

import android.app.AppOpsManager.*

import android.content.Context

import android.net.IConnectivityManager

import android.net.VpnManager.TYPE_VPN_SERVICE

import android.os.ServiceManager

import android.os.UserHandle

import android.util.Log

import android.widget.Toast

import androidx.appcompat.app.AppCompatActivity

import foundation.e.privacymodules.commons.ManualAction

import foundation.e.privacymodules.permissions.data.AppOpModes

import foundation.e.privacymodules.permissions.data.ApplicationDescription
@@ -17,7 +19,7 @@ import java.util.* 
class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(context) {



    private val appOpsManager: AppOpsManager get()

        = context.getSystemService(AppCompatActivity.APP_OPS_SERVICE) as AppOpsManager

        = context.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager



    /**

     * @see IPermissionsPrivacyModule.toggleDangerousPermission
@@ -69,13 +71,14 @@ class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(cont 
            if (service.prepareVpn(null, packageName, UserHandle.myUserId())) {

                // Authorize this app to initiate VPN connections in the future without user

                // intervention.

                service.setVpnPackageAuthorization(packageName, UserHandle.myUserId(), true)

                service.setVpnPackageAuthorization(packageName, UserHandle.myUserId(), TYPE_VPN_SERVICE)

                return true

            }

        } catch (e: java.lang.Exception) {

            Log.e("Permissions-e", "Exception while setting VpnPackageAuthorization", e)

        } catch (e: NoSuchMethodError) {

            Log.e("Permissions-e", "Bad android sdk version", e)

        } catch (e: java.lang.NoSuchMethodError) {

            Log.e("Permissions-e", "Bad Android version", e)



        }

        return false

    }
@@ -111,4 +114,6 @@ class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(cont 
//            })



    }





}
 
 No newline at end of file