diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/data')
3 files changed, 0 insertions, 11 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 f3a7ea8..510ebc9 100644 --- a/app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt +++ b/app/src/main/java/org/pacien/tincapp/data/CidrAddress.kt | |||
@@ -6,9 +6,7 @@ import org.apache.commons.configuration2.ex.ConversionException | |||
6 | * @author pacien | 6 | * @author pacien |
7 | */ | 7 | */ |
8 | data class CidrAddress(val address: String, val prefix: Int) { | 8 | data class CidrAddress(val address: String, val prefix: Int) { |
9 | |||
10 | companion object { | 9 | companion object { |
11 | |||
12 | private val SEPARATOR = "/" | 10 | private val SEPARATOR = "/" |
13 | 11 | ||
14 | fun fromSlashSeparated(s: String) = try { | 12 | fun fromSlashSeparated(s: String) = try { |
@@ -16,9 +14,7 @@ data class CidrAddress(val address: String, val prefix: Int) { | |||
16 | } catch (e: Exception) { | 14 | } catch (e: Exception) { |
17 | throw ConversionException(e.message, e) | 15 | throw ConversionException(e.message, e) |
18 | } | 16 | } |
19 | |||
20 | } | 17 | } |
21 | 18 | ||
22 | fun toSlashSeparated() = address + SEPARATOR + prefix | 19 | fun toSlashSeparated() = address + SEPARATOR + prefix |
23 | |||
24 | } | 20 | } |
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 5a8a254..eb55d2d 100644 --- a/app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt +++ b/app/src/main/java/org/pacien/tincapp/data/TincConfiguration.kt | |||
@@ -10,7 +10,6 @@ import java.io.File | |||
10 | */ | 10 | */ |
11 | data class TincConfiguration(val ed25519PrivateKeyFile: File? = null, | 11 | data class TincConfiguration(val ed25519PrivateKeyFile: File? = null, |
12 | val privateKeyFile: File? = null) { | 12 | val privateKeyFile: File? = null) { |
13 | |||
14 | companion object { | 13 | companion object { |
15 | 14 | ||
16 | private val KEY_ED25519_PRIVATE_KEY_FILE = "Ed25519PrivateKeyFile" | 15 | private val KEY_ED25519_PRIVATE_KEY_FILE = "Ed25519PrivateKeyFile" |
@@ -20,7 +19,5 @@ data class TincConfiguration(val ed25519PrivateKeyFile: File? = null, | |||
20 | fun fromTincConfiguration(c: Configuration) = TincConfiguration( | 19 | fun fromTincConfiguration(c: Configuration) = TincConfiguration( |
21 | c.getFile(KEY_ED25519_PRIVATE_KEY_FILE), | 20 | c.getFile(KEY_ED25519_PRIVATE_KEY_FILE), |
22 | c.getFile(KEY_PRIVATE_KEY_FILE)) | 21 | c.getFile(KEY_PRIVATE_KEY_FILE)) |
23 | |||
24 | } | 22 | } |
25 | |||
26 | } | 23 | } |
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 7b699c6..fec9a8e 100644 --- a/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt +++ b/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt | |||
@@ -25,9 +25,7 @@ data class VpnInterfaceConfiguration(val addresses: List<CidrAddress> = emptyLis | |||
25 | val allowBypass: Boolean = false, | 25 | val allowBypass: Boolean = false, |
26 | val blocking: Boolean = false, | 26 | val blocking: Boolean = false, |
27 | val mtu: Int? = null) { | 27 | val mtu: Int? = null) { |
28 | |||
29 | companion object { | 28 | companion object { |
30 | |||
31 | private val KEY_ADDRESSES = "Address" | 29 | private val KEY_ADDRESSES = "Address" |
32 | private val KEY_ROUTES = "Route" | 30 | private val KEY_ROUTES = "Route" |
33 | private val KEY_DNS_SERVERS = "DNSServer" | 31 | private val KEY_DNS_SERVERS = "DNSServer" |
@@ -63,7 +61,6 @@ data class VpnInterfaceConfiguration(val addresses: List<CidrAddress> = emptyLis | |||
63 | c.getStringList(INVITATION_KEY_ROUTES) | 61 | c.getStringList(INVITATION_KEY_ROUTES) |
64 | .map { it.substringBefore(' ') } | 62 | .map { it.substringBefore(' ') } |
65 | .map { CidrAddress.fromSlashSeparated(it) }) | 63 | .map { CidrAddress.fromSlashSeparated(it) }) |
66 | |||
67 | } | 64 | } |
68 | 65 | ||
69 | fun write(f: File) = FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration::class.java) | 66 | fun write(f: File) = FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration::class.java) |
@@ -74,5 +71,4 @@ data class VpnInterfaceConfiguration(val addresses: List<CidrAddress> = emptyLis | |||
74 | } | 71 | } |
75 | builder.save() | 72 | builder.save() |
76 | } | 73 | } |
77 | |||
78 | } | 74 | } |