Unify unit future typing

2 files changed, 6 insertions, 7 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
index fedd0d2..39c413e 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt
@@ -33,12 +33,12 @@ internal object Executor {
 
   private fun read(stream: InputStream) = BufferedReader(InputStreamReader(stream)).readLines()
 
-  fun forkExec(cmd: Command): CompletableFuture<Void> {
+  fun forkExec(cmd: Command): CompletableFuture<Unit> {
     val pid = forkExec(cmd.asArray()).also {
       if (it == FAILED) throw CommandExecutionException("Could not fork child process.")
     }
 
-    return CompletableFuture.runAsync {
+    return runAsyncTask {
       when (wait(pid)) {
         SUCCESS -> Unit
         FAILED -> throw CommandExecutionException("Process terminated abnormally.")
@@ -60,6 +60,6 @@ internal object Executor {
     }
   }
 
-  fun runAsyncTask(r: () -> Unit) = CompletableFuture.runAsync(Runnable(r), AsyncTask.THREAD_POOL_EXECUTOR)!!
+  fun runAsyncTask(r: () -> Unit) = CompletableFuture.supplyAsync(Supplier(r), AsyncTask.THREAD_POOL_EXECUTOR)!!
   fun <U> supplyAsyncTask(s: () -> U) = CompletableFuture.supplyAsync(Supplier(s), AsyncTask.THREAD_POOL_EXECUTOR)!!
 }
diff --git a/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt b/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
index e5172c8..3c2e27a 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
@@ -1,6 +1,5 @@
 package org.pacien.tincapp.commands
 
-import java8.util.concurrent.CompletableFuture
 import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Executor.runAsyncTask
 import org.pacien.tincapp.context.App
@@ -30,17 +29,17 @@ object TincApp {
     throw FileNotFoundException(App.getResources().getString(R.string.message_network_config_not_found_format, e.message!!))
   }
 
-  fun removeScripts(netName: String): CompletableFuture<Void> = runAsyncTask {
+  fun removeScripts(netName: String) = runAsyncTask {
     listScripts(netName).forEach { it.delete() }
   }
 
-  fun generateIfaceCfg(netName: String): CompletableFuture<Void> = runAsyncTask {
+  fun generateIfaceCfg(netName: String) = runAsyncTask {
     VpnInterfaceConfiguration
       .fromInvitation(AppPaths.invitationFile(netName))
       .write(AppPaths.netConfFile(netName))
   }
 
-  fun setPassphrase(netName: String, currentPassphrase: String? = null, newPassphrase: String?): CompletableFuture<Void> = runAsyncTask {
+  fun setPassphrase(netName: String, currentPassphrase: String? = null, newPassphrase: String?) = runAsyncTask {
     listPrivateKeys(netName)
       .filter { it.exists() }
       .map { Pair(PemUtils.read(it), it) }