WIP add ConfigDetail and PeerDetail

5 files changed, 119 insertions, 7 deletions

diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
index 2aec921a..bb3e76a7 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
@@ -5,6 +5,7 @@
 package com.wireguard.android.fragment
 
 import android.os.Bundle
+import android.util.Log;
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -21,6 +22,7 @@ import com.wireguard.android.databinding.TunnelDetailFragmentBinding
 import com.wireguard.android.databinding.TunnelDetailPeerBinding
 import com.wireguard.android.model.ObservableTunnel
 import com.wireguard.android.util.QuantityFormatter
+import com.wireguard.android.viewmodel.ConfigDetail
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.time.Duration
@@ -80,7 +82,9 @@ class TunnelDetailFragment : BaseFragment(), MenuProvider {
         } else {
             lifecycleScope.launch {
                 try {
-                    binding.config = newTunnel.getConfigAsync()
+                    var config = newTunnel.getConfigDetailAsync()
+                    binding.config = config
+                    Log.i(TAG, "onSelectedTunnelChanged " + config + ", " + config.config)
                 } catch (_: Throwable) {
                     binding.config = null
                 }
@@ -115,7 +119,7 @@ class TunnelDetailFragment : BaseFragment(), MenuProvider {
             for (i in 0 until binding.peersLayout.childCount) {
                 val peer: TunnelDetailPeerBinding = DataBindingUtil.getBinding(binding.peersLayout.getChildAt(i))
                         ?: continue
-                val publicKey = peer.item!!.publicKey
+                val publicKey = peer.item!!.peer.publicKey
                 val rx = statistics.peerRx(publicKey)
                 val tx = statistics.peerTx(publicKey)
                 if (rx == 0L && tx == 0L) {
@@ -147,4 +151,8 @@ class TunnelDetailFragment : BaseFragment(), MenuProvider {
             }
         }
     }
+
+    companion object {
+        private const val TAG = "WireGuard/TunnelDetailFragment"
+    }
 }
diff --git a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
index 49e080f9..d4a0b1c0 100644
--- a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
+++ b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
@@ -13,7 +13,11 @@ import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.databinding.Keyed
 import com.wireguard.android.util.applicationScope
+import com.wireguard.android.viewmodel.ConfigDetail
 import com.wireguard.config.Config
+import com.wireguard.config.InetEndpoint
+import com.wireguard.crypto.Key;
+import java.util.Optional;
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -59,6 +63,12 @@ class ObservableTunnel internal constructor(
         if (state != Tunnel.State.UP) {
             onStatisticsChanged(null)
             onDhcpChanged(null)
+            onEndpointChange(null, null)
+        } else {
+            configDetail?.peers?.forEach {
+                var endpoint: InetEndpoint? = it.peer.endpoint.orElse(null)
+                it.endpoint = Optional.ofNullable(endpoint?.getResolved()?.get())
+            }
         }
         this.state = state
         notifyPropertyChanged(BR.state)
@@ -72,6 +82,7 @@ class ObservableTunnel internal constructor(
             this@ObservableTunnel.state
     }
 
+    private var configDetail: ConfigDetail? = if (config != null) ConfigDetail(config) else null
 
     @get:Bindable
     var config = config
@@ -90,7 +101,11 @@ class ObservableTunnel internal constructor(
         private set
 
     suspend fun getConfigAsync(): Config = withContext(Dispatchers.Main.immediate) {
-        config ?: manager.getTunnelConfig(this@ObservableTunnel)
+        config ?: manager.getTunnelConfig(this@ObservableTunnel).config!!
+    }
+
+    suspend fun getConfigDetailAsync(): ConfigDetail = withContext(Dispatchers.Main.immediate) {
+        configDetail ?: manager.getTunnelConfig(this@ObservableTunnel)
     }
 
     suspend fun setConfigAsync(config: Config): Config = withContext(Dispatchers.Main.immediate) {
@@ -102,10 +117,11 @@ class ObservableTunnel internal constructor(
         }
     }
 
-    fun onConfigChanged(config: Config?): Config? {
+    fun onConfigChanged(config: Config?): ConfigDetail? {
         this.config = config
+        this.configDetail = ConfigDetail(config)
         notifyPropertyChanged(BR.config)
-        return config
+        return configDetail
     }
 
 
@@ -155,6 +171,20 @@ class ObservableTunnel internal constructor(
         return dhcp
     }
 
+    override fun onEndpointChange(publicKey: Key?, newEndpoint: InetEndpoint?) {
+        Log.i(TAG, "ObservableTunnel onEndpointChange " + newEndpoint)
+        configDetail?.peers?.forEach {
+            Log.i(TAG, "ObservableTunnel peer " + it + ", " + it.peer)
+            if (publicKey == null || it.peer.publicKey.equals(publicKey)) {
+                if (newEndpoint == null) {
+                    it.endpoint = it.peer.endpoint
+                } else {
+                    it.endpoint = newEndpoint.getResolved()
+                }
+            }
+        }
+    }
+
 
     suspend fun deleteAsync() = manager.delete(this)
 
diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt
index e7bb751b..77d69f70 100644
--- a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt
+++ b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt
@@ -24,6 +24,7 @@ import com.wireguard.android.databinding.ObservableSortedKeyedArrayList
 import com.wireguard.android.util.ErrorMessages
 import com.wireguard.android.util.UserKnobs
 import com.wireguard.android.util.applicationScope
+import com.wireguard.android.viewmodel.ConfigDetail
 import com.wireguard.config.Config
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
@@ -94,7 +95,7 @@ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() {
             applicationScope.launch { UserKnobs.setLastUsedTunnel(value?.name) }
         }
 
-    suspend fun getTunnelConfig(tunnel: ObservableTunnel): Config = withContext(Dispatchers.Main.immediate) {
+    suspend fun getTunnelConfig(tunnel: ObservableTunnel): ConfigDetail = withContext(Dispatchers.Main.immediate) {
         tunnel.onConfigChanged(withContext(Dispatchers.IO) { configStore.load(tunnel.name) })!!
     }
 
@@ -155,7 +156,7 @@ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() {
         tunnel.onConfigChanged(withContext(Dispatchers.IO) {
             getBackend().setState(tunnel, tunnel.state, config)
             configStore.save(tunnel.name, config)
-        })!!
+        })!!.config!!
     }
 
     suspend fun setTunnelName(tunnel: ObservableTunnel, name: String): String = withContext(Dispatchers.Main.immediate) {
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigDetail.kt b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigDetail.kt
new file mode 100644
index 00000000..af95a86a
--- /dev/null
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigDetail.kt
@@ -0,0 +1,22 @@
+package com.wireguard.android.viewmodel
+
+import androidx.databinding.ObservableArrayList
+import androidx.databinding.ObservableList
+
+import com.wireguard.config.Config
+
+class ConfigDetail {
+    val config: Config?
+    val peers: ObservableList<PeerDetail> = ObservableArrayList()
+
+    constructor(other: Config?) {
+        config = other
+        if (other != null) {
+            other.peers.forEach {
+                val detail = PeerDetail(it)
+                peers.add(detail)
+                detail.bind(this)
+            }
+        }
+    }
+}
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/PeerDetail.kt b/ui/src/main/java/com/wireguard/android/viewmodel/PeerDetail.kt
new file mode 100644
index 00000000..abc81998
--- /dev/null
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/PeerDetail.kt
@@ -0,0 +1,51 @@
+package com.wireguard.android.viewmodel
+
+import android.util.Log
+import androidx.databinding.BaseObservable
+import androidx.databinding.Bindable
+import androidx.databinding.Observable
+
+import com.wireguard.android.BR
+import com.wireguard.config.InetEndpoint
+import com.wireguard.config.Peer
+
+import java.util.Optional;
+
+
+class PeerDetail : BaseObservable {
+    var peer: Peer
+    private var owner: ConfigDetail? = null
+
+    @get:Bindable
+    var endpoint: Optional<InetEndpoint> = Optional.empty()
+        get() {
+            if (!field.isEmpty()) {
+                return field
+            } else {
+                return peer.endpoint
+            }
+        }
+
+        set(value) {
+            Log.i(TAG, "notifyPropertyChanged endpoint " + this + ", " + value)
+            field = value
+            notifyPropertyChanged(BR.endpoint)
+        }
+
+    constructor(other: Peer) {
+        peer = other
+    }
+
+    fun bind(owner: ConfigDetail) {
+        this.owner = owner
+    }
+
+    override fun addOnPropertyChangedCallback (callback: Observable.OnPropertyChangedCallback) {
+        Log.i(TAG, "addOnPropertyChangedCallback " + this + ", " + callback)
+        super.addOnPropertyChangedCallback(callback)
+    }
+    
+    companion object {
+        private const val TAG = "WireGuard/PeerDetail"
+    }
+}