Reformat code

1 files changed, 105 insertions, 105 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 601ffbb..278d20a 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -29,122 +29,122 @@ import java.io.IOException
  */
 class TincVpnService : VpnService() {
 
-    override fun onDestroy() {
-        stopVpn()
-        super.onDestroy()
+  override fun onDestroy() {
+    stopVpn()
+    super.onDestroy()
+  }
+
+  override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    if (isConnected()) stopVpn()
+    startVpn(intent.data.schemeSpecificPart, intent.data.fragment)
+    return Service.START_REDELIVER_INTENT
+  }
+
+  private fun startVpn(netName: String, passphrase: String? = null) {
+    if (netName.isBlank())
+      return reportError(resources.getString(R.string.message_no_network_name_provided), docTopic = "intent-api")
+
+    if (!AppPaths.storageAvailable())
+      return reportError(resources.getString(R.string.message_storage_unavailable))
+
+    if (!AppPaths.confDir(netName).exists())
+      return reportError(resources.getString(R.string.message_no_configuration_for_network_format, netName), docTopic = "configuration")
+
+    Log.i(TAG, "Starting tinc daemon for network \"$netName\".")
+
+    val interfaceCfg = try {
+      VpnInterfaceConfiguration.fromIfaceConfiguration(AppPaths.existing(AppPaths.netConfFile(netName)))
+    } catch (e: FileNotFoundException) {
+      return reportError(resources.getString(R.string.message_network_config_not_found_format, e.message!!), e, "configuration")
+    } catch (e: ConversionException) {
+      return reportError(resources.getString(R.string.message_network_config_invalid_format, e.message!!), e, "network-interface")
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        if (isConnected()) stopVpn()
-        startVpn(intent.data.schemeSpecificPart, intent.data.fragment)
-        return Service.START_REDELIVER_INTENT
+    val deviceFd = try {
+      Builder().setSession(netName)
+        .applyCfg(interfaceCfg)
+        .also { applyIgnoringException(it::addDisallowedApplication, BuildConfig.APPLICATION_ID) }
+        .establish()
+    } catch (e: IllegalArgumentException) {
+      return reportError(resources.getString(R.string.message_network_config_invalid_format, e.message!!), e, "network-interface")
     }
 
-    private fun startVpn(netName: String, passphrase: String? = null) {
-        if (netName.isBlank())
-            return reportError(resources.getString(R.string.message_no_network_name_provided), docTopic = "intent-api")
-
-        if (!AppPaths.storageAvailable())
-            return reportError(resources.getString(R.string.message_storage_unavailable))
-
-        if (!AppPaths.confDir(netName).exists())
-            return reportError(resources.getString(R.string.message_no_configuration_for_network_format, netName), docTopic = "configuration")
-
-        Log.i(TAG, "Starting tinc daemon for network \"$netName\".")
-
-        val interfaceCfg = try {
-            VpnInterfaceConfiguration.fromIfaceConfiguration(AppPaths.existing(AppPaths.netConfFile(netName)))
-        } catch (e: FileNotFoundException) {
-            return reportError(resources.getString(R.string.message_network_config_not_found_format, e.message!!), e, "configuration")
-        } catch (e: ConversionException) {
-            return reportError(resources.getString(R.string.message_network_config_invalid_format, e.message!!), e, "network-interface")
-        }
-
-        val deviceFd = try {
-            Builder().setSession(netName)
-                    .applyCfg(interfaceCfg)
-                    .also { applyIgnoringException(it::addDisallowedApplication, BuildConfig.APPLICATION_ID) }
-                    .establish()
-        } catch (e: IllegalArgumentException) {
-            return reportError(resources.getString(R.string.message_network_config_invalid_format, e.message!!), e, "network-interface")
-        }
-
-        val privateKeys = try {
-            val tincCfg = TincConfiguration.fromTincConfiguration(AppPaths.existing(AppPaths.tincConfFile(netName)))
-
-            Pair(
-                    openPrivateKey(tincCfg.ed25519PrivateKeyFile ?: AppPaths.defaultEd25519PrivateKeyFile(netName), passphrase),
-                    openPrivateKey(tincCfg.privateKeyFile ?: AppPaths.defaultRsaPrivateKeyFile(netName), passphrase)
-            )
-        } catch (e: FileNotFoundException) {
-            Pair(null, null)
-        } catch (e: PEMException) {
-            return reportError(resources.getString(R.string.message_could_not_decrypt_private_keys_format, e.message))
-        }
-
-        Tincd.start(netName, deviceFd!!.fd, privateKeys.first?.fd, privateKeys.second?.fd)
-        setState(true, netName, interfaceCfg, deviceFd)
-        Log.i(TAG, "tinc daemon started.")
+    val privateKeys = try {
+      val tincCfg = TincConfiguration.fromTincConfiguration(AppPaths.existing(AppPaths.tincConfFile(netName)))
+
+      Pair(
+        openPrivateKey(tincCfg.ed25519PrivateKeyFile ?: AppPaths.defaultEd25519PrivateKeyFile(netName), passphrase),
+        openPrivateKey(tincCfg.privateKeyFile ?: AppPaths.defaultRsaPrivateKeyFile(netName), passphrase)
+      )
+    } catch (e: FileNotFoundException) {
+      Pair(null, null)
+    } catch (e: PEMException) {
+      return reportError(resources.getString(R.string.message_could_not_decrypt_private_keys_format, e.message))
     }
 
-    private fun openPrivateKey(f: File?, passphrase: String?): ParcelFileDescriptor? {
-        if (f == null || !f.exists() || passphrase == null) return null
-
-        val pipe = ParcelFileDescriptor.createPipe()
-        val decryptedKey = PemUtils.decrypt(PemUtils.read(f), passphrase)
-        val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(pipe[1])
-        PemUtils.write(decryptedKey, outputStream.writer())
-        return pipe[0]
+    Tincd.start(netName, deviceFd!!.fd, privateKeys.first?.fd, privateKeys.second?.fd)
+    setState(true, netName, interfaceCfg, deviceFd)
+    Log.i(TAG, "tinc daemon started.")
+  }
+
+  private fun openPrivateKey(f: File?, passphrase: String?): ParcelFileDescriptor? {
+    if (f == null || !f.exists() || passphrase == null) return null
+
+    val pipe = ParcelFileDescriptor.createPipe()
+    val decryptedKey = PemUtils.decrypt(PemUtils.read(f), passphrase)
+    val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(pipe[1])
+    PemUtils.write(decryptedKey, outputStream.writer())
+    return pipe[0]
+  }
+
+  private fun reportError(msg: String, e: Throwable? = null, docTopic: String? = null) {
+    if (e != null)
+      Log.e(TAG, msg, e)
+    else
+      Log.e(TAG, msg)
+
+    App.alert(R.string.title_unable_to_start_tinc, msg,
+      if (docTopic != null) resources.getString(R.string.app_doc_url_format, docTopic) else null)
+  }
+
+  companion object {
+
+    val TAG = this::class.java.canonicalName!!
+
+    private var connected: Boolean = false
+    private var netName: String? = null
+    private var interfaceCfg: VpnInterfaceConfiguration? = null
+    private var fd: ParcelFileDescriptor? = null
+
+    private fun setState(connected: Boolean, netName: String?, interfaceCfg: VpnInterfaceConfiguration?, fd: ParcelFileDescriptor?) {
+      TincVpnService.connected = connected
+      TincVpnService.netName = netName
+      TincVpnService.interfaceCfg = interfaceCfg
+      TincVpnService.fd = fd
     }
 
-    private fun reportError(msg: String, e: Throwable? = null, docTopic: String? = null) {
-        if (e != null)
-            Log.e(TAG, msg, e)
-        else
-            Log.e(TAG, msg)
+    fun startVpn(netName: String, passphrase: String? = null) {
+      App.getContext().startService(Intent(App.getContext(), TincVpnService::class.java)
+        .setData(Uri.Builder().scheme(TINC_SCHEME).opaquePart(netName).fragment(passphrase).build()))
+    }
 
-        App.alert(R.string.title_unable_to_start_tinc, msg,
-                if (docTopic != null) resources.getString(R.string.app_doc_url_format, docTopic) else null)
+    fun stopVpn() {
+      try {
+        Log.i(TAG, "Stopping any running tinc daemon.")
+        if (netName != null) Tinc.stop(netName!!)
+        fd?.close()
+        Log.i(TAG, "All tinc daemons stopped.")
+      } catch (e: IOException) {
+        Log.wtf(TAG, e)
+      } finally {
+        setState(false, null, null, null)
+      }
     }
 
-    companion object {
-
-        val TAG = this::class.java.canonicalName!!
-
-        private var connected: Boolean = false
-        private var netName: String? = null
-        private var interfaceCfg: VpnInterfaceConfiguration? = null
-        private var fd: ParcelFileDescriptor? = null
-
-        private fun setState(connected: Boolean, netName: String?, interfaceCfg: VpnInterfaceConfiguration?, fd: ParcelFileDescriptor?) {
-            TincVpnService.connected = connected
-            TincVpnService.netName = netName
-            TincVpnService.interfaceCfg = interfaceCfg
+    fun getCurrentNetName() = netName
+    fun getCurrentInterfaceCfg() = interfaceCfg
+    fun isConnected() = connected