diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-04 11:12:09 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-04 12:55:02 +0000 |
| commit | 5e09206d91ac7c4a40ea66c9e4f71b7bac235cf4 (patch) | |
| tree | 7b6a68a3ba56cf11fdc7099406a57d1efc3dc7a2 /android/src/main | |
| parent | 6e9d2c96c9fbd13f06d3d1ab2f4b36a55995d3ae (diff) | |
| download | mullvadvpn-5e09206d91ac7c4a40ea66c9e4f71b7bac235cf4.tar.xz mullvadvpn-5e09206d91ac7c4a40ea66c9e4f71b7bac235cf4.zip | |
Move `EventNotifier` to the Talpid library
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/EventNotifier.kt) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt index a641b6a940..33e37f278a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt @@ -9,7 +9,7 @@ import net.mullvad.mullvadvpn.model.RelayList import net.mullvad.mullvadvpn.model.RelaySettingsUpdate import net.mullvad.mullvadvpn.model.Settings import net.mullvad.mullvadvpn.model.TunnelState -import net.mullvad.mullvadvpn.util.EventNotifier +import net.mullvad.talpid.util.EventNotifier class MullvadDaemon(val vpnService: MullvadVpnService) { val onSettingsChange = EventNotifier<Settings?>(null) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt index ee429ca18d..04ab9f96ba 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/ConnectionProxy.kt @@ -13,8 +13,8 @@ import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.MainActivity import net.mullvad.mullvadvpn.MullvadDaemon import net.mullvad.mullvadvpn.model.TunnelState -import net.mullvad.mullvadvpn.util.EventNotifier import net.mullvad.talpid.tunnel.ActionAfterDisconnect +import net.mullvad.talpid.util.EventNotifier val ANTICIPATED_STATE_TIMEOUT_MS = 1500L diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/EventNotifier.kt b/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt index ca45ca96e6..41cf1a7b3e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/EventNotifier.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.util +package net.mullvad.talpid.util class EventNotifier<T>(private val initialValue: T) { private val listeners = HashMap<Int, (T) -> Unit>() |