diff options
3 files changed, 12 insertions, 11 deletions
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 6c680a68d4..4c39859e16 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt @@ -20,8 +20,6 @@ import net.mullvad.talpid.util.EventNotifier val CHANNEL_ID = "vpn_tunnel_status" val FOREGROUND_NOTIFICATION_ID: Int = 1 -val KEY_CONNECT_ACTION = "net.mullvad.mullvadvpn.connect_action" -val KEY_DISCONNECT_ACTION = "net.mullvad.mullvadvpn.disconnect_action" class ForegroundNotificationManager( val service: MullvadVpnService, @@ -161,22 +159,22 @@ class ForegroundNotificationManager( val state = tunnelState return when (state) { - is TunnelState.Disconnected -> KEY_CONNECT_ACTION - is TunnelState.Connecting -> KEY_DISCONNECT_ACTION - is TunnelState.Connected -> KEY_DISCONNECT_ACTION + is TunnelState.Disconnected -> MullvadVpnService.KEY_CONNECT_ACTION + is TunnelState.Connecting -> MullvadVpnService.KEY_DISCONNECT_ACTION + is TunnelState.Connected -> MullvadVpnService.KEY_DISCONNECT_ACTION is TunnelState.Disconnecting -> { when (state.actionAfterDisconnect) { - ActionAfterDisconnect.Reconnect -> KEY_DISCONNECT_ACTION - else -> KEY_CONNECT_ACTION + ActionAfterDisconnect.Reconnect -> MullvadVpnService.KEY_DISCONNECT_ACTION + else -> MullvadVpnService.KEY_CONNECT_ACTION } } - is TunnelState.Error -> KEY_DISCONNECT_ACTION + is TunnelState.Error -> MullvadVpnService.KEY_DISCONNECT_ACTION } } private val tunnelActionIcon: Int get() { - if (tunnelActionKey == KEY_CONNECT_ACTION) { + if (tunnelActionKey == MullvadVpnService.KEY_CONNECT_ACTION) { return R.drawable.icon_notification_connect } else { return R.drawable.icon_notification_disconnect diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt index 4a9562c6ec..f216e69726 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt @@ -57,9 +57,9 @@ class MullvadTileService : TileService() { val intent = Intent(this, MullvadVpnService::class.java) if (secured) { - intent.action = KEY_DISCONNECT_ACTION + intent.action = MullvadVpnService.KEY_DISCONNECT_ACTION } else { - intent.action = KEY_CONNECT_ACTION + intent.action = MullvadVpnService.KEY_CONNECT_ACTION } if (Build.VERSION.SDK_INT >= 26) { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 6952494f04..0998ddcc1c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -23,6 +23,9 @@ private const val RELAYS_FILE = "relays.json" class MullvadVpnService : TalpidVpnService() { companion object { private val TAG = "mullvad" + + val KEY_CONNECT_ACTION = "net.mullvad.mullvadvpn.connect_action" + val KEY_DISCONNECT_ACTION = "net.mullvad.mullvadvpn.disconnect_action" } private enum class PendingAction { |