aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/extensions
diff options
context:
space:
mode:
authorpacien2018-08-05 22:12:46 +0200
committerpacien2018-08-05 22:12:46 +0200
commit9012ef92ed810f4a08b5f01cd2c18430a277eacf (patch)
tree7e2dc8f9b61698e895fab07bc524575af5ec484b /app/src/main/java/org/pacien/tincapp/extensions
parenta9d1ac81374119e33871484c8749a94d11a71cae (diff)
downloadtincapp-9012ef92ed810f4a08b5f01cd2c18430a277eacf.tar.gz
Code style
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/extensions')
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/Android.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt18
2 files changed, 11 insertions, 11 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 6563e40..d703c45 100644
--- a/app/src/main/java/org/pacien/tincapp/extensions/Android.kt
+++ b/app/src/main/java/org/pacien/tincapp/extensions/Android.kt
@@ -27,10 +27,10 @@ import org.pacien.tincapp.context.App
27 * @author pacien 27 * @author pacien
28 */ 28 */
29object Android { 29object Android {
30 fun <T> ArrayAdapter<T>.setElements(elems: Collection<T>) { 30 fun <T> ArrayAdapter<T>.setElements(elements: Collection<T>) {
31 setNotifyOnChange(false) 31 setNotifyOnChange(false)
32 clear() 32 clear()
33 addAll(elems) 33 addAll(elements)
34 notifyDataSetChanged() 34 notifyDataSetChanged()
35 setNotifyOnChange(true) 35 setNotifyOnChange(true)
36 } 36 }
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 94e47d6..2bf5661 100644
--- a/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt
+++ b/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt
@@ -34,10 +34,10 @@ object VpnServiceBuilder {
34 } 34 }
35 35
36 private fun VpnService.Builder.addAddress(cidr: CidrAddress): VpnService.Builder = 36 private fun VpnService.Builder.addAddress(cidr: CidrAddress): VpnService.Builder =
37 exceptWithCidr(cidr, { addAddress(cidr.address, cidr.prefix) }) 37 exceptWithCidr(cidr) { addAddress(cidr.address, cidr.prefix) }
38 38
39 private fun VpnService.Builder.addRoute(cidr: CidrAddress): VpnService.Builder = 39 private fun VpnService.Builder.addRoute(cidr: CidrAddress): VpnService.Builder =
40 exceptWithCidr(cidr, { addRoute(cidr.address, cidr.prefix) }) 40 exceptWithCidr(cidr) { addRoute(cidr.address, cidr.prefix) }
41 41
42 private fun VpnService.Builder.allowBypass(allow: Boolean): VpnService.Builder = 42 private fun VpnService.Builder.allowBypass(allow: Boolean): VpnService.Builder =
43 if (allow) allowBypass() else this 43 if (allow) allowBypass() else this
@@ -46,25 +46,25 @@ object VpnServiceBuilder {
46 if (mtu != null) setMtu(mtu) else this 46 if (mtu != null) setMtu(mtu) else this
47 47
48 private fun VpnService.Builder.addAddresses(cidrList: List<CidrAddress>): VpnService.Builder = 48 private fun VpnService.Builder.addAddresses(cidrList: List<CidrAddress>): VpnService.Builder =
49 cidrList.fold(this, { net, cidr -> net.addAddress(cidr) }) 49 cidrList.fold(this) { net, cidr -> net.addAddress(cidr) }
50 50
51 private fun VpnService.Builder.addRoutes(cidrList: List<CidrAddress>): VpnService.Builder = 51 private fun VpnService.Builder.addRoutes(cidrList: List<CidrAddress>): VpnService.Builder =
52 cidrList.fold(this, { net, cidr -> net.addRoute(cidr) }) 52 cidrList.fold(this) { net, cidr -> net.addRoute(cidr) }
53 53
54 private fun VpnService.Builder.addDnsServers(dnsList: List<String>): VpnService.Builder = 54 private fun VpnService.Builder.addDnsServers(dnsList: List<String>): VpnService.Builder =
55 dnsList.fold(this, { net, dns -> net.addDnsServer(dns) }) 55 dnsList.fold(this) { net, dns -> net.addDnsServer(dns) }
56 56
57 private fun VpnService.Builder.addSearchDomains(domainList: List<String>): VpnService.Builder = 57 private fun VpnService.Builder.addSearchDomains(domainList: List<String>): VpnService.Builder =
58 domainList.fold(this, { net, domain -> net.addSearchDomain(domain) }) 58 domainList.fold(this) { net, domain -> net.addSearchDomain(domain) }
59 59
60 private fun VpnService.Builder.allowFamilies(familyList: List<Int>): VpnService.Builder = 60 private fun VpnService.Builder.allowFamilies(familyList: List<Int>): VpnService.Builder =
61 familyList.fold(this, { net, family -> net.allowFamily(family) }) 61 familyList.fold(this) { net, family -> net.allowFamily(family) }
62 62
63 private fun VpnService.Builder.addAllowedApplications(apps: List<String>): VpnService.Builder = 63 private fun VpnService.Builder.addAllowedApplications(apps: List<String>): VpnService.Builder =
64 apps.fold(this, { net, app -> applyIgnoringException(net::addAllowedApplication, app, net)!! }) 64 apps.fold(this) { net, app -> applyIgnoringException(net::addAllowedApplication, app, net)!! }
65 65
66 private fun VpnService.Builder.addDisallowedApplications(apps: List<String>): VpnService.Builder = 66 private fun VpnService.Builder.addDisallowedApplications(apps: List<String>): VpnService.Builder =
67 apps.fold(this, { net, app -> applyIgnoringException(net::addDisallowedApplication, app, net)!! }) 67 apps.fold(this) { net, app -> applyIgnoringException(net::addDisallowedApplication, app, net)!! }
68 68
69 fun VpnService.Builder.applyCfg(cfg: VpnInterfaceConfiguration): VpnService.Builder = this 69 fun VpnService.Builder.applyCfg(cfg: VpnInterfaceConfiguration): VpnService.Builder = this
70 .addAddresses(cfg.addresses) 70 .addAddresses(cfg.addresses)