3 files changed, 58 insertions, 58 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt b/app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt
index 273b5a2..f3a7ea8 100644
--- a/app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt
+++ b/app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt
@@ -7,18 +7,18 @@ import org.apache.commons.configuration2.ex.ConversionException
  */
 data class CidrAddress(val address: String, val prefix: Int) {
 
-    companion object {
+  companion object {
 
-        private val SEPARATOR = "/"
-
-        fun fromSlashSeparated(s: String) = try {
-            CidrAddress(s.substringBefore(SEPARATOR), Integer.parseInt(s.substringAfter(SEPARATOR)))
-        } catch (e: Exception) {
-            throw ConversionException(e.message, e)
-        }
+    private val SEPARATOR = "/"
 
+    fun fromSlashSeparated(s: String) = try {
+      CidrAddress(s.substringBefore(SEPARATOR), Integer.parseInt(s.substringAfter(SEPARATOR)))
+    } catch (e: Exception) {
+      throw ConversionException(e.message, e)
     }
 
-    fun toSlashSeparated() = address + SEPARATOR + prefix
+  }
+
+  fun toSlashSeparated() = address + SEPARATOR + prefix
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt b/app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt
index 66496c4..5a8a254 100644
--- a/app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt
+++ b/app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt
@@ -11,16 +11,16 @@ import java.io.File
 data class TincConfiguration(val ed25519PrivateKeyFile: File? = null,
                              val privateKeyFile: File? = null) {
 
-    companion object {
+  companion object {
 
-        private val KEY_ED25519_PRIVATE_KEY_FILE = "Ed25519PrivateKeyFile"
-        private val KEY_PRIVATE_KEY_FILE = "PrivateKeyFile"
+    private val KEY_ED25519_PRIVATE_KEY_FILE = "Ed25519PrivateKeyFile"
+    private val KEY_PRIVATE_KEY_FILE = "PrivateKeyFile"
 
-        fun fromTincConfiguration(f: File) = fromTincConfiguration(Configurations().properties(f))
-        fun fromTincConfiguration(c: Configuration) = TincConfiguration(
-                c.getFile(KEY_ED25519_PRIVATE_KEY_FILE),
-                c.getFile(KEY_PRIVATE_KEY_FILE))
+    fun fromTincConfiguration(f: File) = fromTincConfiguration(Configurations().properties(f))
+    fun fromTincConfiguration(c: Configuration) = TincConfiguration(
+      c.getFile(KEY_ED25519_PRIVATE_KEY_FILE),
+      c.getFile(KEY_PRIVATE_KEY_FILE))
 
-    }
+  }
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt b/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt
index 70c8b96..7b699c6 100644
--- a/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt
+++ b/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt
@@ -26,53 +26,53 @@ data class VpnInterfaceConfiguration(val addresses: List<CidrAddress> = emptyLis
                                      val blocking: Boolean = false,
                                      val mtu: Int? = null) {
 
-    companion object {
+  companion object {
 
-        private val KEY_ADDRESSES = "Address"
-        private val KEY_ROUTES = "Route"
-        private val KEY_DNS_SERVERS = "DNSServer"
-        private val KEY_SEARCH_DOMAINS = "SearchDomain"
-        private val KEY_ALLOWED_APPLICATIONS = "AllowApplication"
-        private val KEY_DISALLOWED_APPLICATIONS = "DisallowApplication"
-        private val KEY_ALLOWED_FAMILIES = "AllowFamily"
-        private val KEY_ALLOW_BYPASS = "AllowBypass"
-        private val KEY_BLOCKING = "Blocking"
-        private val KEY_MTU = "MTU"
+    private val KEY_ADDRESSES = "Address"
+    private val KEY_ROUTES = "Route"
+    private val KEY_DNS_SERVERS = "DNSServer"
+    private val KEY_SEARCH_DOMAINS = "SearchDomain"
+    private val KEY_ALLOWED_APPLICATIONS = "AllowApplication"
+    private val KEY_DISALLOWED_APPLICATIONS = "DisallowApplication"
+    private val KEY_ALLOWED_FAMILIES = "AllowFamily"
+    private val KEY_ALLOW_BYPASS = "AllowBypass"
+    private val KEY_BLOCKING = "Blocking"
+    private val KEY_MTU = "MTU"
 
-        private val INVITATION_KEY_ADDRESSES = "Ifconfig"
-        private val INVITATION_KEY_ROUTES = "Route"
+    private val INVITATION_KEY_ADDRESSES = "Ifconfig"
+    private val INVITATION_KEY_ROUTES = "Route"
 
-        fun fromIfaceConfiguration(f: File) = fromIfaceConfiguration(Configurations().properties(f))
-        fun fromIfaceConfiguration(c: Configuration) = VpnInterfaceConfiguration(
-                c.getCidrList(KEY_ADDRESSES),
-                c.getCidrList(KEY_ROUTES),
-                c.getStringList(KEY_DNS_SERVERS),
-                c.getStringList(KEY_SEARCH_DOMAINS),
-                c.getStringList(KEY_ALLOWED_APPLICATIONS),
-                c.getStringList(KEY_DISALLOWED_APPLICATIONS),
-                c.getIntList(KEY_ALLOWED_FAMILIES),
-                c.getBoolean(KEY_ALLOW_BYPASS, false),
-                c.getBoolean(KEY_BLOCKING, false),
-                c.getInteger(KEY_MTU, null))
+    fun fromIfaceConfiguration(f: File) = fromIfaceConfiguration(Configurations().properties(f))
+    fun fromIfaceConfiguration(c: Configuration) = VpnInterfaceConfiguration(
+      c.getCidrList(KEY_ADDRESSES),
+      c.getCidrList(KEY_ROUTES),
+      c.getStringList(KEY_DNS_SERVERS),
+      c.getStringList(KEY_SEARCH_DOMAINS),
+      c.getStringList(KEY_ALLOWED_APPLICATIONS),
+      c.getStringList(KEY_DISALLOWED_APPLICATIONS),
+      c.getIntList(KEY_ALLOWED_FAMILIES),
+      c.getBoolean(KEY_ALLOW_BYPASS, false),
+      c.getBoolean(KEY_BLOCKING, false),
+      c.getInteger(KEY_MTU, null))
 
-        fun fromInvitation(f: File) = fromInvitation(Configurations().properties(f))
-        fun fromInvitation(c: Configuration) = VpnInterfaceConfiguration(
-                c.getStringList(INVITATION_KEY_ADDRESSES)
-                        .map { applyIgnoringException(CidrAddress.Companion::fromSlashSeparated, it) }
-                        .filterNotNull(),
-                c.getStringList(INVITATION_KEY_ROUTES)
-                        .map { it.substringBefore(' ') }
-                        .map { CidrAddress.fromSlashSeparated(it) })
+    fun fromInvitation(f: File) = fromInvitation(Configurations().properties(f))
+    fun fromInvitation(c: Configuration) = VpnInterfaceConfiguration(
+      c.getStringList(INVITATION_KEY_ADDRESSES)
+        .map { applyIgnoringException(CidrAddress.Companion::fromSlashSeparated, it) }
+        .filterNotNull(),
+      c.getStringList(INVITATION_KEY_ROUTES)
+        .map { it.substringBefore(' ') }
+        .map { CidrAddress.fromSlashSeparated(it) })
 
-    }
+  }
 
-    fun write(f: File) = FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration::class.java)
-            .configure(Parameters().properties().setFile(f.apply { createNewFile() })).let { builder ->
-        builder.configuration.let { cfg ->
-            addresses.forEach { cfg.addProperty(KEY_ADDRESSES, it.toSlashSeparated()) }
-            routes.forEach { cfg.addProperty(KEY_ROUTES, it.toSlashSeparated()) }
-        }
-        builder.save()
+  fun write(f: File) = FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration::class.java)
+    .configure(Parameters().properties().setFile(f.apply { createNewFile() })).let { builder ->
+    builder.configuration.let { cfg ->
+      addresses.forEach { cfg.addProperty(KEY_ADDRESSES, it.toSlashSeparated()) }
+      routes.forEach { cfg.addProperty(KEY_ROUTES, it.toSlashSeparated()) }
     }
+    builder.save()
+  }
 
 }