From e2f985900c3b07f13c768c803106bdd4d9b94772 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 24 Feb 2018 02:37:23 +0100 Subject: Unify unit future typing --- app/src/main/java/org/pacien/tincapp/commands/TincApp.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/org/pacien/tincapp/commands/TincApp.kt') 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 = runAsyncTask { + fun removeScripts(netName: String) = runAsyncTask { listScripts(netName).forEach { it.delete() } } - fun generateIfaceCfg(netName: String): CompletableFuture = 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 = runAsyncTask { + fun setPassphrase(netName: String, currentPassphrase: String? = null, newPassphrase: String?) = runAsyncTask { listPrivateKeys(netName) .filter { it.exists() } .map { Pair(PemUtils.read(it), it) } -- cgit v1.2.3