aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt')
-rw-r--r--app/src/main/java/org/pacien/tincapp/extensions/VpnServiceBuilder.kt18
1 files changed, 9 insertions, 9 deletions
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)