diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-28 10:28:43 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-28 10:28:43 -0300 |
| commit | 96cab3e773169f6be19aee8414265120254a9d6d (patch) | |
| tree | c51d2c23bf274f7f47f7eef2b39f9345ddb57470 | |
| parent | c06f91c47421dd48edee8c078d1ba3033e59aacd (diff) | |
| parent | 64c972048b851a14c24909328eed3f42f051f2b2 (diff) | |
| download | mullvadvpn-96cab3e773169f6be19aee8414265120254a9d6d.tar.xz mullvadvpn-96cab3e773169f6be19aee8414265120254a9d6d.zip | |
Merge branch 'remove-intent-permission'
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | android/src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d111cc2de..da329aade8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,10 @@ Line wrap the file at 100 chars. Th - Add a reconnect button to disconnect and connect again without closing the tunnel device to avoid leaking any data during the reconnection. +### Changed +#### Android +- Allow other apps to request the VPN tunnel to connect or disconnect. + ### Fixed #### Android - Make sure the settings screen is scrollable so that devices with small screens can access the quit diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 8b55f36bf5..8f472d7f5b 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,12 +1,9 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="net.mullvad.mullvadvpn"> - <permission android:name="net.mullvad.mullvadvpn.permission.TUNNEL_ACTION" - android:protectionLevel="signature" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="net.mullvad.mullvadvpn.permission.TUNNEL_ACTION" /> <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt index 4fb1557d8c..733a885b09 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt @@ -22,7 +22,6 @@ val CHANNEL_ID = "vpn_tunnel_status" val FOREGROUND_NOTIFICATION_ID: Int = 1 val KEY_CONNECT_ACTION = "connect_action" val KEY_DISCONNECT_ACTION = "disconnect_action" -val PERMISSION_TUNNEL_ACTION = "net.mullvad.mullvadvpn.permission.TUNNEL_ACTION" class ForegroundNotificationManager( val service: MullvadVpnService, @@ -190,11 +189,8 @@ class ForegroundNotificationManager( } service.apply { - val connectFilter = IntentFilter(KEY_CONNECT_ACTION) - val disconnectFilter = IntentFilter(KEY_DISCONNECT_ACTION) - - registerReceiver(connectReceiver, connectFilter, PERMISSION_TUNNEL_ACTION, null) - registerReceiver(disconnectReceiver, disconnectFilter, PERMISSION_TUNNEL_ACTION, null) + registerReceiver(connectReceiver, IntentFilter(KEY_CONNECT_ACTION)) + registerReceiver(disconnectReceiver, IntentFilter(KEY_DISCONNECT_ACTION)) } updateNotification() |