Unify unit future typing

2 files changed, 3 insertions, 2 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
index a67887c..e571cf5 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -113,7 +113,7 @@ class ConfigureActivity : BaseActivity() {
     R.string.message_encrypting_decrypting_private_keys,
     TincApp.setPassphrase(netName, currentPassphrase, newPassphrase))
 
-  private fun execAction(@StringRes label: Int, action: CompletableFuture<Void>) {
+  private fun execAction(@StringRes label: Int, action: CompletableFuture<Unit>) {
     showProgressDialog(label).let { progressDialog ->
       action
         .whenComplete { _, _ -> progressDialog.dismiss() }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index 0726ee9..1872081 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -17,6 +17,7 @@ import kotlinx.android.synthetic.main.dialog_node_details.view.*
 import kotlinx.android.synthetic.main.fragment_list_view.*
 import kotlinx.android.synthetic.main.fragment_network_status_header.*
 import org.pacien.tincapp.R
+import org.pacien.tincapp.commands.Executor
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.data.VpnInterfaceConfiguration
 import org.pacien.tincapp.extensions.Android.setElements
@@ -163,7 +164,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
       TincVpnService.isConnected() ->
         Tinc.dumpNodes(TincVpnService.getCurrentNetName()!!).thenApply<List<String>> { it.map { it.substringBefore(' ') } }
       else ->
-        CompletableFuture.supplyAsync<List<String>> { emptyList() }
+        Executor.supplyAsyncTask<List<String>> { emptyList() }
     }
   }
 }