ui,tunnel: add lastest handshake to peer details

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>

2 files changed, 76 insertions, 5 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 7046cb96..fad1b5d4 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
@@ -20,6 +20,9 @@ import com.wireguard.android.model.ObservableTunnel
 import com.wireguard.android.util.QuantityFormatter
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.ZoneId
 
 /**
  * Fragment that shows details about a specific tunnel.
@@ -99,6 +102,7 @@ class TunnelDetailFragment : BaseFragment() {
         val state = tunnel.state
         if (state != Tunnel.State.UP && lastState == state) return
         lastState = state
+        var now = LocalDateTime.now(ZoneId.of("UTC"))
         try {
             val statistics = tunnel.getStatisticsAsync()
             for (i in 0 until binding.peersLayout.childCount) {
@@ -110,11 +114,20 @@ class TunnelDetailFragment : BaseFragment() {
                 if (rx == 0L && tx == 0L) {
                     peer.transferLabel.visibility = View.GONE
                     peer.transferText.visibility = View.GONE
-                    continue
+                } else {
+                    peer.transferText.text = getString(R.string.transfer_rx_tx, QuantityFormatter.formatBytes(rx), QuantityFormatter.formatBytes(tx))
+                    peer.transferLabel.visibility = View.VISIBLE
+                    peer.transferText.visibility = View.VISIBLE
+                }
+                val lastHandshake:LocalDateTime? = statistics.peerLastHandshake(publicKey)
+                if (lastHandshake == null) {
+                    peer.lastHandshakeLabel.visibility = View.GONE
+                    peer.lastHandshakeText.visibility = View.GONE
+                } else {
+                    peer.lastHandshakeText.text = getString(R.string.last_handshake_ago, QuantityFormatter.formatDuration(Duration.between(lastHandshake, now)))
+                    peer.lastHandshakeLabel.visibility = View.VISIBLE
+                    peer.lastHandshakeText.visibility = View.VISIBLE
                 }
-                peer.transferText.text = getString(R.string.transfer_rx_tx, QuantityFormatter.formatBytes(rx), QuantityFormatter.formatBytes(tx))
-                peer.transferLabel.visibility = View.VISIBLE
-                peer.transferText.visibility = View.VISIBLE
             }
         } catch (e: Throwable) {
             for (i in 0 until binding.peersLayout.childCount) {
@@ -122,6 +135,8 @@ class TunnelDetailFragment : BaseFragment() {
                         ?: continue
                 peer.transferLabel.visibility = View.GONE
                 peer.transferText.visibility = View.GONE
+                peer.lastHandshakeLabel.visibility = View.GONE
+                peer.lastHandshakeText.visibility = View.GONE
             }
         }
     }
diff --git a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt
index 4a9ffed4..cd2adbcb 100644
--- a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt
+++ b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt
@@ -8,6 +8,8 @@ package com.wireguard.android.util
 import com.wireguard.android.Application
 import com.wireguard.android.R
 
+import java.time.Duration
+
 object QuantityFormatter {
     fun formatBytes(bytes: Long): String {
         val context = Application.get().applicationContext
@@ -19,4 +21,58 @@ object QuantityFormatter {
             else -> context.getString(R.string.transfer_tibibytes, bytes / (1024.0 * 1024.0 * 1024.0) / 1024.0)
         }
     }
-}
\ No newline at end of file
+
+    fun formatDuration(duration: Duration): String {
+        val context = Application.get().applicationContext
+        val str = formatHours(duration.getSeconds())
+        return when {
+            str != "" -> str
+            else -> context.getString(R.string.duration_seconds, 0)
+        }
+    }
+
+    fun formatHours(seconds: Long): String {
+        val context = Application.get().applicationContext
+        val hours = seconds / 3600
+        val restSeconds = seconds % 3600
+        val str = formatMinutes(restSeconds)
+
+        return when {
+             hours > 0 -> context.getString(R.string.duration_hours, hours) + if (str != "") ", " + str else ""
+             else -> str
+        }
+    }
+
+    fun formatDays(seconds: Long): String {
+        val context = Application.get().applicationContext
+        val days = seconds / 3600 / 24
+        val restSeconds = seconds % (3600 * 24)
+        val str = formatHours(restSeconds)
+
+        return when {
+             days > 0 -> context.getString(R.string.duration_days, days) + if (str != "") ", " + str else ""
+             else -> str
+        }
+    }
+
+    fun formatMinutes(seconds: Long): String {
+        val context = Application.get().applicationContext
+        val minutes = seconds / 60
+        val restSeconds = seconds % 60
+        val str = formatSeconds(restSeconds)
+
+        return when {
+             minutes > 0 -> context.getString(R.string.duration_minutes, minutes) + if (str != "") ", " + str else ""
+             else -> str
+        }
+    }
+
+    fun formatSeconds(seconds: Long): String {
+        val context = Application.get().applicationContext
+
+        return when {
+            seconds > 0 -> context.getString(R.string.duration_seconds, seconds)
+            else -> ""
+        }
+    }
+}