From d90ddf790e6d532b988e02677df4554d3f028d89 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Fri, 3 Mar 2023 00:39:07 +0100
Subject: WIP: add dhcp addresses to tunnel details

---
 .../com/wireguard/android/model/ObservableTunnel.kt | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'ui/src/main/java')

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 c3e3405e..49e080f9 100644
--- a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
+++ b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
@@ -8,6 +8,7 @@ import android.util.Log
 import androidx.databinding.BaseObservable
 import androidx.databinding.Bindable
 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
@@ -55,7 +56,10 @@ class ObservableTunnel internal constructor(
     }
 
     fun onStateChanged(state: Tunnel.State): Tunnel.State {
-        if (state != Tunnel.State.UP) onStatisticsChanged(null)
+        if (state != Tunnel.State.UP) {
+            onStatisticsChanged(null)
+            onDhcpChanged(null)
+        }
         this.state = state
         notifyPropertyChanged(BR.state)
         return state
@@ -137,6 +141,21 @@ class ObservableTunnel internal constructor(
     }
 
 
+    @get:Bindable
+    var dhcp: Dhcp? = null
+        private set
+
+    override fun onDhcpChange(newDhcp: Dhcp) {
+        onDhcpChanged(newDhcp)
+    }
+
+    fun onDhcpChanged(dhcp: Dhcp?): Dhcp? {
+        this.dhcp = dhcp
+        notifyPropertyChanged(BR.dhcp)
+        return dhcp
+    }
+
+
     suspend fun deleteAsync() = manager.delete(this)
 
 
-- 
cgit v1.2.3