diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-20 15:08:39 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-04 12:55:02 +0000 |
| commit | 882f7bdb5ee24559343a1fccf1530f4d18ad2f8b (patch) | |
| tree | c996fcb8bcc66c85fad5aeb88331499468aff703 /android/src/main | |
| parent | fcef59c5c7af1ce1dcf1f92ffb293ca5232daad8 (diff) | |
| download | mullvadvpn-882f7bdb5ee24559343a1fccf1530f4d18ad2f8b.tar.xz mullvadvpn-882f7bdb5ee24559343a1fccf1530f4d18ad2f8b.zip | |
Store connectivity listener in `MainActivity`
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt | 5 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt index cfa4f99000..381df7a6b0 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt @@ -22,12 +22,15 @@ import net.mullvad.mullvadvpn.dataproxy.RelayListListener import net.mullvad.mullvadvpn.dataproxy.SettingsListener import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever import net.mullvad.mullvadvpn.util.SmartDeferred +import net.mullvad.talpid.ConnectivityListener class MainActivity : FragmentActivity() { companion object { val KEY_SHOULD_CONNECT = "should_connect" } + var connectivityListener = CompletableDeferred<ConnectivityListener>() + private set var daemon = CompletableDeferred<MullvadDaemon>() private set var service = CompletableDeferred<MullvadVpnService.LocalBinder>() @@ -55,6 +58,7 @@ class MainActivity : FragmentActivity() { localBinder.resetComplete?.await() service.complete(localBinder) daemon.complete(localBinder.daemon.await()) + connectivityListener.complete(localBinder.connectivityListener) } } @@ -67,6 +71,7 @@ class MainActivity : FragmentActivity() { service = CompletableDeferred<MullvadVpnService.LocalBinder>() daemon = CompletableDeferred<MullvadDaemon>() + connectivityListener = CompletableDeferred<ConnectivityListener>() } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt index 91bc269ba2..dcbb7f83c5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt @@ -56,6 +56,8 @@ class MullvadVpnService : TalpidVpnService() { get() = this@MullvadVpnService.daemon val connectionProxy get() = this@MullvadVpnService.connectionProxy + val connectivityListener + get() = this@MullvadVpnService.connectivityListener val resetComplete get() = this@MullvadVpnService.resetComplete |