diff options
author | pacien | 2018-02-24 02:37:23 +0100 |
---|---|---|
committer | pacien | 2018-02-24 02:37:23 +0100 |
commit | e2f985900c3b07f13c768c803106bdd4d9b94772 (patch) | |
tree | 6d1dd2d108547780ffc827880db303643704f2ce /app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | |
parent | 97407c40660893650a6d37c5d760167e2e4d24c7 (diff) | |
download | tincapp-e2f985900c3b07f13c768c803106bdd4d9b94772.tar.gz |
Unify unit future typing
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt index 223763d..b59be80 100644 --- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt +++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | |||
@@ -11,6 +11,7 @@ import org.apache.commons.configuration2.ex.ConversionException | |||
11 | import org.bouncycastle.openssl.PEMException | 11 | import org.bouncycastle.openssl.PEMException |
12 | import org.pacien.tincapp.BuildConfig | 12 | import org.pacien.tincapp.BuildConfig |
13 | import org.pacien.tincapp.R | 13 | import org.pacien.tincapp.R |
14 | import org.pacien.tincapp.commands.Executor | ||
14 | import org.pacien.tincapp.commands.Tinc | 15 | import org.pacien.tincapp.commands.Tinc |
15 | import org.pacien.tincapp.commands.Tincd | 16 | import org.pacien.tincapp.commands.Tincd |
16 | import org.pacien.tincapp.context.App | 17 | import org.pacien.tincapp.context.App |
@@ -136,9 +137,9 @@ class TincVpnService : VpnService() { | |||
136 | } | 137 | } |
137 | 138 | ||
138 | private fun waitForDaemonStartup() = | 139 | private fun waitForDaemonStartup() = |
139 | CompletableFuture | 140 | Executor |
140 | .runAsync { Thread.sleep(SETUP_DELAY) } | 141 | .runAsyncTask { Thread.sleep(SETUP_DELAY) } |
141 | .thenCompose { if (daemon!!.isDone) daemon!! else CompletableFuture.runAsync { } } | 142 | .thenCompose { if (daemon!!.isDone) daemon!! else Executor.runAsyncTask { Unit } } |
142 | 143 | ||
143 | companion object { | 144 | companion object { |
144 | private const val SETUP_DELAY = 500L // ms | 145 | private const val SETUP_DELAY = 500L // ms |
@@ -146,10 +147,10 @@ class TincVpnService : VpnService() { | |||
146 | private var netName: String? = null | 147 | private var netName: String? = null |
147 | private var interfaceCfg: VpnInterfaceConfiguration? = null | 148 | private var interfaceCfg: VpnInterfaceConfiguration? = null |
148 | private var fd: ParcelFileDescriptor? = null | 149 | private var fd: ParcelFileDescriptor? = null |
149 | private var daemon: CompletableFuture<Void>? = null | 150 | private var daemon: CompletableFuture<Unit>? = null |
150 | 151 | ||
151 | private fun setState(netName: String?, interfaceCfg: VpnInterfaceConfiguration?, | 152 | private fun setState(netName: String?, interfaceCfg: VpnInterfaceConfiguration?, |
152 | fd: ParcelFileDescriptor?, daemon: CompletableFuture<Void>?) { | 153 | fd: ParcelFileDescriptor?, daemon: CompletableFuture<Unit>?) { |
153 | 154 | ||
154 | TincVpnService.netName = netName | 155 | TincVpnService.netName = netName |
155 | TincVpnService.interfaceCfg = interfaceCfg | 156 | TincVpnService.interfaceCfg = interfaceCfg |