diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/data')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt | 5 |
1 files changed, 2 insertions, 3 deletions
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 c98b567..937213e 100644 --- a/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt +++ b/app/src/main/java/org/pacien/tincapp/data/VpnInterfaceConfiguration.kt | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2019 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -77,8 +77,7 @@ data class VpnInterfaceConfiguration(val addresses: List<CidrAddress> = emptyLis | |||
77 | fun fromInvitation(f: File) = fromInvitation(Configurations().properties(f)) | 77 | fun fromInvitation(f: File) = fromInvitation(Configurations().properties(f)) |
78 | private fun fromInvitation(c: Configuration) = VpnInterfaceConfiguration( | 78 | private fun fromInvitation(c: Configuration) = VpnInterfaceConfiguration( |
79 | c.getStringList(INVITATION_KEY_ADDRESSES) | 79 | c.getStringList(INVITATION_KEY_ADDRESSES) |
80 | .map { applyIgnoringException(CidrAddress.Companion::fromSlashSeparated, it) } | 80 | .mapNotNull { applyIgnoringException(CidrAddress.Companion::fromSlashSeparated, it) }, |
81 | .filterNotNull(), | ||
82 | c.getStringList(INVITATION_KEY_ROUTES) | 81 | c.getStringList(INVITATION_KEY_ROUTES) |
83 | .map { it.substringBefore(' ') } | 82 | .map { it.substringBefore(' ') } |
84 | .map { CidrAddress.fromSlashSeparated(it) }) | 83 | .map { CidrAddress.fromSlashSeparated(it) }) |