diff options
author | pacien | 2018-02-16 18:42:02 +0100 |
---|---|---|
committer | pacien | 2018-02-16 18:42:02 +0100 |
commit | d360837d494a86930b8323a99691dc52925eb7ea (patch) | |
tree | 2fc1a8b1bf70d0fdbaa45a0185b0158f23a29a5d /app/src/main/java/org/pacien/tincapp/extensions | |
parent | 5a4f0f964e41847b10ed44ac1f5b2bbf060102c3 (diff) | |
download | tincapp-d360837d494a86930b8323a99691dc52925eb7ea.tar.gz |
Cosmetic
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/extensions')
3 files changed, 0 insertions, 7 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/extensions/Android.kt b/app/src/main/java/org/pacien/tincapp/extensions/Android.kt index 6674cc3..2269736 100644 --- a/app/src/main/java/org/pacien/tincapp/extensions/Android.kt +++ b/app/src/main/java/org/pacien/tincapp/extensions/Android.kt | |||
@@ -9,7 +9,6 @@ import org.pacien.tincapp.context.App | |||
9 | * @author pacien | 9 | * @author pacien |
10 | */ | 10 | */ |
11 | object Android { | 11 | object Android { |
12 | |||
13 | fun <T> ArrayAdapter<T>.setElements(elems: Collection<T>) { | 12 | fun <T> ArrayAdapter<T>.setElements(elems: Collection<T>) { |
14 | setNotifyOnChange(false) | 13 | setNotifyOnChange(false) |
15 | clear() | 14 | clear() |
@@ -21,5 +20,4 @@ object Android { | |||
21 | fun TextView.setText(list: List<String>) { | 20 | fun TextView.setText(list: List<String>) { |
22 | text = if (list.isNotEmpty()) list.joinToString("\n") else App.getContext().getString(R.string.value_none) | 21 | text = if (list.isNotEmpty()) list.joinToString("\n") else App.getContext().getString(R.string.value_none) |
23 | } | 22 | } |
24 | |||
25 | } | 23 | } |
diff --git a/app/src/main/java/org/pacien/tincapp/extensions/ApacheConfiguration.kt b/app/src/main/java/org/pacien/tincapp/extensions/ApacheConfiguration.kt index 48d1118..969c2c8 100644 --- a/app/src/main/java/org/pacien/tincapp/extensions/ApacheConfiguration.kt +++ b/app/src/main/java/org/pacien/tincapp/extensions/ApacheConfiguration.kt | |||
@@ -8,11 +8,8 @@ import java.io.File | |||
8 | * @author pacien | 8 | * @author pacien |
9 | */ | 9 | */ |
10 | object ApacheConfiguration { | 10 | object ApacheConfiguration { |
11 | |||
12 | fun Configuration.getStringList(key: String): List<String> = getList(String::class.java, key, emptyList()) | 11 | fun Configuration.getStringList(key: String): List<String> = getList(String::class.java, key, emptyList()) |
13 | fun Configuration.getCidrList(key: String): List<CidrAddress> = getStringList(key).map { CidrAddress.fromSlashSeparated(it) } | 12 | fun Configuration.getCidrList(key: String): List<CidrAddress> = getStringList(key).map { CidrAddress.fromSlashSeparated(it) } |
14 | fun Configuration.getIntList(key: String): List<Int> = getList(Int::class.java, key, emptyList()) | 13 | fun Configuration.getIntList(key: String): List<Int> = getList(Int::class.java, key, emptyList()) |
15 | |||
16 | fun Configuration.getFile(key: String): File? = getString(key)?.let { File(it) } | 14 | fun Configuration.getFile(key: String): File? = getString(key)?.let { File(it) } |
17 | |||
18 | } | 15 | } |
diff --git a/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt b/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt index d70fa80..53a0f7a 100644 --- a/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt +++ b/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt | |||
@@ -9,7 +9,6 @@ import org.pacien.tincapp.extensions.Java.applyIgnoringException | |||
9 | * @author pacien | 9 | * @author pacien |
10 | */ | 10 | */ |
11 | object VpnServiceBuilder { | 11 | object VpnServiceBuilder { |
12 | |||
13 | fun VpnService.Builder.addAddress(cidr: CidrAddress): VpnService.Builder = addAddress(cidr.address, cidr.prefix) | 12 | fun VpnService.Builder.addAddress(cidr: CidrAddress): VpnService.Builder = addAddress(cidr.address, cidr.prefix) |
14 | fun VpnService.Builder.addRoute(cidr: CidrAddress): VpnService.Builder = addRoute(cidr.address, cidr.prefix) | 13 | fun VpnService.Builder.addRoute(cidr: CidrAddress): VpnService.Builder = addRoute(cidr.address, cidr.prefix) |
15 | fun VpnService.Builder.allowBypass(allow: Boolean): VpnService.Builder = if (allow) allowBypass() else this | 14 | fun VpnService.Builder.allowBypass(allow: Boolean): VpnService.Builder = if (allow) allowBypass() else this |
@@ -47,5 +46,4 @@ object VpnServiceBuilder { | |||
47 | .allowBypass(cfg.allowBypass) | 46 | .allowBypass(cfg.allowBypass) |
48 | .setBlocking(cfg.blocking) | 47 | .setBlocking(cfg.blocking) |
49 | .overrideMtu(cfg.mtu) | 48 | .overrideMtu(cfg.mtu) |
50 | |||
51 | } | 49 | } |