tunnel: add ConfigDetail and PeerDetail

10 files changed, 280 insertions, 32 deletions

diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
index 1790d227..4176bcff 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -636,6 +636,9 @@ public final class GoBackend implements Backend {
                     final InetEndpoint ep = peer.getEndpoint().orElse(null);
                     if (ep == null)
                         continue;
+                    // FIXME
+                    tunnel.onEndpointChange(peer.getPublicKey(), ep);
+                    Log.i(TAG, "onEndpointChange " + peer.getPublicKey() + ", " + ep);
                     if (ep.getResolved(resolver, true).orElse(null) == null) {
                         if (i < DNS_RESOLUTION_RETRIES - 1) {
                             Log.w(TAG, "DNS host \"" + ep.getHost() + "\" failed to resolve; trying again");
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
index 6c0f54e3..fc94375b 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
@@ -5,8 +5,14 @@
 
 package com.wireguard.android.backend;
 
+import androidx.annotation.Nullable;
+
+import com.wireguard.config.InetEndpoint;
+import com.wireguard.config.InetNetwork;
+import com.wireguard.crypto.Key;
 import com.wireguard.util.NonNullForAll;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 /**
@@ -61,4 +67,8 @@ public interface Tunnel {
      * @param newDhcp The new DHCP info of the tunnel.
      */
     void onDhcpChange(Dhcp newDhcp);
+
+    void onEndpointChange(Key publicKey, @Nullable InetEndpoint newEndpoint);
+
+    void onAllowedIpsChange(Key publicKey, @Nullable List<InetNetwork> addNetworks, @Nullable List<InetNetwork> removeNetworks);
 }
diff --git a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
index 9d087cd6..dffd534b 100644
--- a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
@@ -65,6 +65,10 @@ public final class InetEndpoint {
         }
     }
 
+    public static InetEndpoint fromAddress(final InetAddress address, final int port) {
+        return new InetEndpoint(address.getHostAddress(), true, port);
+    }
+
     @Override
     public boolean equals(final Object obj) {
         if (!(obj instanceof InetEndpoint))
@@ -81,6 +85,14 @@ public final class InetEndpoint {
         return port;
     }
 
+    public Optional<InetEndpoint> getResolved() {
+        if (isResolved) {
+            return Optional.of(this);
+        } else {
+            return Optional.ofNullable(resolved);
+        }
+    }
+
     /**
      * Generate an {@code InetEndpoint} instance with the same port and the host resolved using DNS
      * to a numeric address. If the host is already numeric, the existing instance may be returned.
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 81d8e8c6..fce14d20 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
 
@@ -79,7 +81,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
                 }
@@ -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 ab2ea48f..ef631c7d 100644
--- a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
+++ b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
@@ -7,13 +7,20 @@ package com.wireguard.android.model
 import android.util.Log
 import androidx.databinding.BaseObservable
 import androidx.databinding.Bindable
+import com.wireguard.android.Application
 import com.wireguard.android.BR
 import com.wireguard.android.backend.Dhcp
 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.android.viewmodel.PeerDetail
 import com.wireguard.config.Config
+import com.wireguard.config.InetEndpoint
+import com.wireguard.config.InetNetwork
+import com.wireguard.crypto.Key
+import java.util.Optional
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -59,6 +66,14 @@ class ObservableTunnel internal constructor(
         if (state != Tunnel.State.UP) {
             onStatisticsChanged(null)
             onDhcpChanged(null)
+            Application.getCoroutineScope().launch {
+                onPeersReset()
+            }
+        } 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 +87,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 +106,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 +122,11 @@ class ObservableTunnel internal constructor(
         }
     }
 
-    fun onConfigChanged(config: Config?): Config? {
+    fun onConfigChanged(config: Config?): ConfigDetail? {
+        this.configDetail = ConfigDetail(config)
         this.config = config
         notifyPropertyChanged(BR.config)
-        return config
+        return configDetail
     }
 
 
@@ -155,6 +176,91 @@ class ObservableTunnel internal constructor(
         return dhcp
     }
 
+    // Remove dynamic peers, and reset static peers
+    fun onPeersReset() {
+        Log.i(TAG, "ObservableTunnel onPeersReset")
+        var toRemove: MutableList<PeerDetail> = ArrayList()
+
+        configDetail?.peers?.forEach {
+            if (it.peer == null) {
+                toRemove.add(it)
+            } else {
+                it.endpoint = Optional.empty()
+            }
+        }
+
+        toRemove.forEach {
+            Log.i(TAG, "ObservableTunnel remove " + it)
+            configDetail?.peers?.remove(it)
+        }
+    }
+
+    override fun onEndpointChange(publicKey: Key, newEndpoint: InetEndpoint?) {
+        Application.getCoroutineScope().launch {
+            onEndpointChanged(publicKey, newEndpoint)
+        }
+    }
+
+    private fun onEndpointChanged(publicKey: Key, newEndpoint: InetEndpoint?) {
+
+        Log.i(TAG, "ObservableTunnel onEndpointChange " + newEndpoint)
+        var peer: PeerDetail? = null
+
+        configDetail?.peers?.forEach {
+            if (it.publicKey.equals(publicKey) == true) {
+                Log.i(TAG, "ObservableTunnel peer " + it + ", " + it.peer)
+                peer = it;
+            }
+        }
+
+        if (peer == null) {
+            Log.i(TAG, "ObservableTunnel create peer " + publicKey)
+            peer = PeerDetail(publicKey)
+            configDetail?.peers?.add(peer)
+        }
+
+        var peer2: PeerDetail = peer!!
+
+        if (newEndpoint != null) {
+            peer2.endpoint = newEndpoint.getResolved()
+        } else {
+            var peer3 = peer2.peer
+            peer2.endpoint = if (peer3 != null) peer3.endpoint else Optional.empty()
+        }
+    }
+
+    fun lookupPeer(publicKey: Key): PeerDetail {
+        configDetail?.peers?.forEach {
+            if (it.publicKey.equals(publicKey) == true) {
+                Log.i(TAG, "ObservableTunnel peer " + it + ", " + it.peer)
+                return it
+            }
+        }
+
+        Log.i(TAG, "ObservableTunnel create peer " + publicKey)
+        var peer: PeerDetail = PeerDetail(publicKey)
+        configDetail?.peers?.add(peer)
+
+        return peer
+    }
+
+    override fun onAllowedIpsChange(publicKey: Key, addNetworks: List<InetNetwork>?, removeNetworks: List<InetNetwork>?) {
+        Application.getCoroutineScope().launch {
+            onAllowedIpsChanged(publicKey, addNetworks, removeNetworks)
+        }
+    }
+
+    private fun onAllowedIpsChanged(publicKey: Key, addNetworks: List<InetNetwork>?, removeNetworks: List<InetNetwork>?) {
+        var peer: PeerDetail = lookupPeer(publicKey)
+
+        removeNetworks?.let() {
+            peer.allowedIps.removeAll(removeNetworks)
+        }
+        addNetworks?.let() {
+            peer.allowedIps.addAll(addNetworks)
+        }
+    }
+
 
     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 ba873fa6..960adcaa 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) })!!
     }
 
@@ -156,7 +157,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..80b32fd5
--- /dev/null
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/PeerDetail.kt
@@ -0,0 +1,85 @@
+package com.wireguard.android.viewmodel
+
+import android.util.Log
+import androidx.databinding.BaseObservable
+import androidx.databinding.Bindable
+import androidx.databinding.Observable
+import androidx.databinding.ObservableList
+import androidx.databinding.ObservableArrayList
+
+import com.wireguard.android.BR
+import com.wireguard.config.InetEndpoint
+import com.wireguard.config.InetNetwork
+import com.wireguard.config.Peer
+import com.wireguard.crypto.Key;
+
+import java.util.Optional;
+
+import kotlin.collections.LinkedHashSet
+
+
+class PeerDetail : BaseObservable {
+    var peer: Peer?
+    private var owner: ConfigDetail? = null
+
+    @get:Bindable
+    var publicKey: Key
+
+    @get:Bindable
+    var allowedIps: ObservableList<InetNetwork> = ObservableArrayList<InetNetwork>()
+
+    @get:Bindable
+    var endpoint: Optional<InetEndpoint> = Optional.empty()
+        get() {
+            if (!field.isEmpty()) {
+                return field
+            } else {
+                return Optional.ofNullable(peer?.endpoint?.get())
+            }
+        }
+
+        set(value) {
+            Log.i(TAG, "notifyPropertyChanged endpoint " + this + ", " + value)
+            field = value
+            notifyPropertyChanged(BR.endpoint)
+        }
+
+    @get:Bindable
+    var persistentKeepalive: Optional<Int> = Optional.empty()
+
+    constructor(other: Peer) {
+        peer = other
+        publicKey = other.getPublicKey()
+        allowedIps.addAll(other.getAllowedIps())
+        endpoint = other.getEndpoint();
+        persistentKeepalive = other.getPersistentKeepalive()
+    }
+
+    constructor(publicKey: Key) {
+        peer = null
+        this.publicKey = publicKey
+    }
+
+    fun bind(owner: ConfigDetail) {
+        this.owner = owner
+    }
+
+    override fun addOnPropertyChangedCallback (callback: Observable.OnPropertyChangedCallback) {
+        Log.i(TAG, "addOnPropertyChangedCallback " + this + ", " + callback)
+        super.addOnPropertyChangedCallback(callback)
+    }
+    
+    /**
+     * Converts the {@code Peer} into a string suitable for debugging purposes. The {@code Peer} is
+     * identified by its public key and (if known) its endpoint.
+     *
+     * @return a concise single-line identifier for the {@code Peer}
+     */
+    override fun toString(): String {
+        return "(Peer " + publicKey.toBase64() + ")"
+    }
+
+    companion object {
+        private const val TAG = "WireGuard/PeerDetail"
+    }
+}
diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index ea86ef2b..425b364d 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -21,7 +21,7 @@
 
         <variable
             name="config"
-            type="com.wireguard.config.Config" />
+            type="com.wireguard.android.viewmodel.ConfigDetail" />
     </data>
 
     <ScrollView
@@ -118,7 +118,7 @@
                         android:nextFocusForward="@id/addresses_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:singleLine="true"
-                        android:text="@{config.interface.keyPair.publicKey.toBase64}"
+                        android:text="@{config.config.interface.keyPair.publicKey.toBase64}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/public_key_label"
@@ -131,7 +131,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/addresses_text"
                         android:text="@string/addresses"
-                        android:visibility="@{config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/public_key_text" />
 
@@ -144,9 +144,9 @@
                         android:nextFocusDown="@id/dynamic_addresses_text"
                         android:nextFocusForward="@id/dynamic_addresses_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.addresses}"
+                        android:text="@{config.config.interface.addresses}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/addresses_label"
                         tools:text="fc00:bbbb:bbbb:bb11::3:368b/128" />
@@ -185,7 +185,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/dns_servers_text"
                         android:text="@string/dns_servers"
-                        android:visibility="@{config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/dynamic_addresses_text" />
 
@@ -198,9 +198,9 @@
                         android:nextFocusDown="@id/dns_search_domains_text"
                         android:nextFocusForward="@id/dns_search_domains_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.dnsServers}"
+                        android:text="@{config.config.interface.dnsServers}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/dns_servers_label"
                         tools:text="8.8.8.8, 8.8.4.4" />
@@ -212,7 +212,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/dns_search_domain_text"
                         android:text="@string/dns_search_domains"
-                        android:visibility="@{config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/dns_servers_text" />
 
@@ -225,9 +225,9 @@
                         android:nextFocusDown="@id/listen_port_text"
                         android:nextFocusForward="@id/listen_port_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.dnsSearchDomains}"
+                        android:text="@{config.config.interface.dnsSearchDomains}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/dns_search_domains_label"
                         tools:text="zx2c4.com" />
@@ -239,7 +239,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/listen_port_text"
                         android:text="@string/listen_port"
-                        android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{!config.config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintEnd_toStartOf="@id/mtu_label"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toStartOf="parent"
@@ -255,9 +255,9 @@
                         android:nextFocusDown="@id/http_proxy_text"
                         android:nextFocusForward="@id/mtu_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.listenPort}"
+                        android:text="@{config.config.interface.listenPort}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{!config.config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintEnd_toStartOf="@id/mtu_label"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toStartOf="parent"
@@ -271,7 +271,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/mtu_text"
                         android:text="@string/mtu"
-                        android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{!config.config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintLeft_toRightOf="@id/listen_port_label"
@@ -287,9 +287,9 @@
                         android:nextFocusUp="@id/dns_servers_text"
                         android:nextFocusForward="@id/http_proxy_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.mtu}"
+                        android:text="@{config.config.interface.mtu}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{!config.config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toEndOf="@id/listen_port_label"
@@ -311,7 +311,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/http_proxy_text"
                         android:text="@string/http_proxy"
-                        android:visibility="@{(Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.Q || !config.interface.httpProxy.isPresent()) ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{(Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.Q || !config.config.interface.httpProxy.isPresent()) ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier" />
 
@@ -324,9 +324,9 @@
                         android:nextFocusDown="@id/applications_text"
                         android:nextFocusForward="@id/applications_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.httpProxy}"
+                        android:text="@{config.config.interface.httpProxy}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{(Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.Q || !config.interface.httpProxy.isPresent()) ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{(Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.Q || !config.config.interface.httpProxy.isPresent()) ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintTop_toBottomOf="@id/http_proxy_label"
                         app:layout_constraintStart_toStartOf="parent"
                         tools:text="http://example.com:8888" />
@@ -338,7 +338,7 @@
                         android:layout_marginTop="8dp"
                         android:labelFor="@+id/applications_text"
                         android:text="@string/applications"
-                        android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.includedApplications.isEmpty() &amp;&amp; config.config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/http_proxy_text" />
 
@@ -351,9 +351,9 @@
                         android:nextFocusDown="@id/peers_layout"
                         android:nextFocusForward="@id/peers_layout"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}"
+                        android:text="@{config.config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.config.interface.excludedApplications.size(), config.config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.config.interface.includedApplications.size(), config.config.interface.includedApplications.size())}"
                         android:textAppearance="?attr/textAppearanceBodyLarge"
-                        android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        android:visibility="@{config.config.interface.includedApplications.isEmpty() &amp;&amp; config.config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/applications_label"
                         tools:text="8 excluded" />
@@ -367,6 +367,7 @@
                 android:layout_marginTop="8dp"
                 android:divider="@null"
                 android:orientation="vertical"
+                app:fragment="@{fragment}"
                 app:items="@{config.peers}"
                 app:layout="@{@layout/tunnel_detail_peer}"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/ui/src/main/res/layout/tunnel_detail_peer.xml b/ui/src/main/res/layout/tunnel_detail_peer.xml
index 25081cea..89bb85ec 100644
--- a/ui/src/main/res/layout/tunnel_detail_peer.xml
+++ b/ui/src/main/res/layout/tunnel_detail_peer.xml
@@ -9,7 +9,7 @@
 
         <variable
             name="item"
-            type="com.wireguard.config.Peer" />
+            type="com.wireguard.android.viewmodel.PeerDetail" />
     </data>
 
     <com.google.android.material.card.MaterialCardView
@@ -64,7 +64,7 @@
                 android:layout_marginTop="8dp"
                 android:labelFor="@+id/pre_shared_key_text"
                 android:text="@string/pre_shared_key"
-                android:visibility="@{!item.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                android:visibility="@{!item.peer.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/public_key_text" />
 
@@ -81,7 +81,7 @@
                 android:singleLine="true"
                 android:text="@string/pre_shared_key_enabled"
                 android:textAppearance="?attr/textAppearanceBodyLarge"
-                android:visibility="@{!item.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                android:visibility="@{!item.peer.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/pre_shared_key_label"
                 tools:text="8VyS8W8XeMcBWfKp1GuG3/fZlnUQFkqMNbrdmZtVQIM=" />