diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/status/subnets')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListLiveData.kt | 13 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListLiveData.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListLiveData.kt index 1dbd8c3..d76badc 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListLiveData.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListLiveData.kt | |||
@@ -20,19 +20,20 @@ package org.pacien.tincapp.activities.status.subnets | |||
20 | 20 | ||
21 | import org.pacien.tincapp.activities.common.SelfRefreshingLiveData | 21 | import org.pacien.tincapp.activities.common.SelfRefreshingLiveData |
22 | import org.pacien.tincapp.commands.Tinc | 22 | import org.pacien.tincapp.commands.Tinc |
23 | import org.pacien.tincapp.service.TincVpnService | ||
23 | import java.util.concurrent.TimeUnit | 24 | import java.util.concurrent.TimeUnit |
24 | 25 | ||
25 | /** | 26 | /** |
26 | * @author pacien | 27 | * @author pacien |
27 | */ | 28 | */ |
28 | class SubnetListLiveData(private val netName: String) : SelfRefreshingLiveData<List<SubnetInfo>>(1, TimeUnit.SECONDS) { | 29 | class SubnetListLiveData : SelfRefreshingLiveData<List<SubnetInfo>>(1, TimeUnit.SECONDS) { |
30 | private val vpnService = TincVpnService | ||
29 | private val tincCtl = Tinc | 31 | private val tincCtl = Tinc |
30 | 32 | ||
31 | override fun onRefresh() { | 33 | override fun onRefresh() { |
32 | val subnetList = tincCtl.dumpSubnets(netName) | 34 | vpnService.getCurrentNetName() |
33 | .thenApply { list -> list.map { SubnetInfo.ofSubnetDump(it) } } | 35 | ?.let { netName -> tincCtl.dumpSubnets(netName) } |
34 | .get() | 36 | ?.thenApply { list -> list.map { SubnetInfo.ofSubnetDump(it) } } |
35 | 37 | ?.thenAccept(this::postValue) | |
36 | postValue(subnetList) | ||
37 | } | 38 | } |
38 | } | 39 | } |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt index 4390aad..ff0afca 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt | |||
@@ -25,6 +25,5 @@ import org.pacien.tincapp.service.TincVpnService | |||
25 | * @author pacien | 25 | * @author pacien |
26 | */ | 26 | */ |
27 | class SubnetListViewModel : ViewModel() { | 27 | class SubnetListViewModel : ViewModel() { |
28 | private val netName by lazy { TincVpnService.getCurrentNetName()!! } | 28 | val nodeList by lazy { SubnetListLiveData() } |
29 | val nodeList by lazy { SubnetListLiveData(netName) } | ||
30 | } | 29 | } |