diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt index fb6ab73..a2c39dd 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | |||
@@ -17,10 +17,10 @@ import kotlinx.android.synthetic.main.fragment_network_status_header.* | |||
17 | import kotlinx.android.synthetic.main.page_status.* | 17 | import kotlinx.android.synthetic.main.page_status.* |
18 | import org.pacien.tincapp.R | 18 | import org.pacien.tincapp.R |
19 | import org.pacien.tincapp.commands.Tinc | 19 | import org.pacien.tincapp.commands.Tinc |
20 | import org.pacien.tincapp.data.VpnInterfaceConfiguration | ||
21 | import org.pacien.tincapp.extensions.Android.setElements | ||
22 | import org.pacien.tincapp.extensions.Android.setText | ||
20 | import org.pacien.tincapp.service.TincVpnService | 23 | import org.pacien.tincapp.service.TincVpnService |
21 | import org.pacien.tincapp.service.VpnInterfaceConfiguration | ||
22 | import org.pacien.tincapp.utils.setElements | ||
23 | import org.pacien.tincapp.utils.setText | ||
24 | import java.util.* | 24 | import java.util.* |
25 | import kotlin.concurrent.timerTask | 25 | import kotlin.concurrent.timerTask |
26 | 26 | ||
@@ -105,8 +105,8 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
105 | 105 | ||
106 | fun writeNetworkInfo(cfg: VpnInterfaceConfiguration) { | 106 | fun writeNetworkInfo(cfg: VpnInterfaceConfiguration) { |
107 | text_network_name.text = TincVpnService.getCurrentNetName() ?: getString(R.string.value_none) | 107 | text_network_name.text = TincVpnService.getCurrentNetName() ?: getString(R.string.value_none) |
108 | text_network_ip_addresses.setText(cfg.addresses.map { it.toString() }) | 108 | text_network_ip_addresses.setText(cfg.addresses.map { it.toSlashSeparated() }) |
109 | text_network_routes.setText(cfg.routes.map { it.toString() }) | 109 | text_network_routes.setText(cfg.routes.map { it.toSlashSeparated() }) |
110 | text_network_dns_servers.setText(cfg.dnsServers) | 110 | text_network_dns_servers.setText(cfg.dnsServers) |
111 | text_network_search_domains.setText(cfg.searchDomains) | 111 | text_network_search_domains.setText(cfg.searchDomains) |
112 | text_network_allow_bypass.text = getString(if (cfg.allowBypass) R.string.value_yes else R.string.value_no) | 112 | text_network_allow_bypass.text = getString(if (cfg.allowBypass) R.string.value_yes else R.string.value_no) |
@@ -135,7 +135,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
135 | private val REFRESH_RATE = 5000L | 135 | private val REFRESH_RATE = 5000L |
136 | 136 | ||
137 | fun getNodeNames(): CompletableFuture<List<String>> = when (TincVpnService.isConnected()) { | 137 | fun getNodeNames(): CompletableFuture<List<String>> = when (TincVpnService.isConnected()) { |
138 | true -> Tinc.dumpNodes(TincVpnService.getCurrentNetName()!!).thenApply<List<String>> { it.map { it.substringBefore(" ") } } | 138 | true -> Tinc.dumpNodes(TincVpnService.getCurrentNetName()!!).thenApply<List<String>> { it.map { it.substringBefore(' ') } } |
139 | false -> CompletableFuture.supplyAsync<List<String>> { emptyList() } | 139 | false -> CompletableFuture.supplyAsync<List<String>> { emptyList() } |
140 | } | 140 | } |
141 | } | 141 | } |