diff options
| author | Albin <albin@mullvad.net> | 2023-09-07 09:26:05 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-09-22 13:20:14 +0200 |
| commit | 84f6868ca47d00c04e0923fbb7ca2e7482c34ceb (patch) | |
| tree | 8f82b7a549a43d5ab7fc952d47c2df647c3a07bf /android/tile/src/main | |
| parent | 990b5f8df1a79a441fe3910470822538a8e4e476 (diff) | |
| download | mullvadvpn-84f6868ca47d00c04e0923fbb7ca2e7482c34ceb.tar.xz mullvadvpn-84f6868ca47d00c04e0923fbb7ca2e7482c34ceb.zip | |
Support running under build variant app ids
Diffstat (limited to 'android/tile/src/main')
| -rw-r--r-- | android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt | 3 | ||||
| -rw-r--r-- | android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/ServiceConnection.kt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt b/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt index 5b327d91c2..2a51c4e0e7 100644 --- a/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt +++ b/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt @@ -17,7 +17,6 @@ import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeoutOrNull import net.mullvad.mullvadvpn.lib.common.constant.KEY_CONNECT_ACTION import net.mullvad.mullvadvpn.lib.common.constant.KEY_DISCONNECT_ACTION -import net.mullvad.mullvadvpn.lib.common.constant.MULLVAD_PACKAGE_NAME import net.mullvad.mullvadvpn.lib.common.constant.VPN_SERVICE_CLASS import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.setSubtitleIfSupported import net.mullvad.mullvadvpn.model.ServiceResult @@ -78,7 +77,7 @@ class MullvadTileService : TileService() { private fun toggleTunnel() { val intent = Intent().apply { - setClassName(MULLVAD_PACKAGE_NAME, VPN_SERVICE_CLASS) + setClassName(applicationContext.packageName, VPN_SERVICE_CLASS) action = if (qsTile.state == Tile.STATE_INACTIVE) { KEY_CONNECT_ACTION diff --git a/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/ServiceConnection.kt b/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/ServiceConnection.kt index 9673b33e18..a26351162d 100644 --- a/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/ServiceConnection.kt +++ b/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/ServiceConnection.kt @@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import net.mullvad.mullvadvpn.lib.common.constant.MULLVAD_PACKAGE_NAME import net.mullvad.mullvadvpn.lib.common.constant.VPN_SERVICE_CLASS import net.mullvad.mullvadvpn.lib.common.util.DispatchingFlow import net.mullvad.mullvadvpn.lib.common.util.bindServiceFlow @@ -81,7 +80,7 @@ class ServiceConnection(context: Context, scope: CoroutineScope) { } private suspend fun connect(context: Context) { - val intent = Intent().apply { setClassName(MULLVAD_PACKAGE_NAME, VPN_SERVICE_CLASS) } + val intent = Intent().apply { setClassName(context.packageName, VPN_SERVICE_CLASS) } context .bindServiceFlow(intent) |