From 0d6e7a3a2424cd9eb649d13c52eed5a68243a0a7 Mon Sep 17 00:00:00 2001
From: Dayle Drinkwater <daylecdrinkwater@gmail.com>
Date: Sun, 21 Apr 2024 12:45:37 +0100
Subject: [PATCH] Forget node menu changes (#983)

* Move 'Forget Node' option to move it away from Traceroute.

Add confirmation dialog to 'Forget Node'

* Move debug for 'Forget Node'
---
 .../java/com/geeksville/mesh/ui/UsersFragment.kt   | 14 ++++++++++----
 app/src/main/res/menu/menu_nodes.xml               |  8 ++++----
 app/src/main/res/values/strings.xml                |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
index 3c45a8791..8933d74a5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
@@ -143,11 +143,17 @@ class UsersFragment : ScreenFragment("Users"), Logging {
                         model.requestTraceroute(node.num)
                     }
                     R.id.forget_node -> {
-                        debug("Forgetting node '${user.longName}'")
-
-                            model.forgetNode(node.num)
-                            onNodesChanged(nodes)
 
+                        MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(R.string.forget_node)
+                            .setMessage(getString(R.string.forget_node_message))
+                            .setNeutralButton(R.string.cancel) { _, _ -> }
+                            .setPositiveButton(R.string.forget_node) {_,_ ->
+                                debug("Forgetting node '${user.longName}'")
+                                model.forgetNode(node.num)
+                                onNodesChanged(nodes)
+                            }
+                            .show()
 
                     }
                     R.id.ignore -> {
diff --git a/app/src/main/res/menu/menu_nodes.xml b/app/src/main/res/menu/menu_nodes.xml
index 227fdeb1e..17b4a17d0 100644
--- a/app/src/main/res/menu/menu_nodes.xml
+++ b/app/src/main/res/menu/menu_nodes.xml
@@ -10,10 +10,6 @@
             android:id="@+id/request_position"
             android:title="@string/request_position"
             app:showAsAction="withText" />
-        <item
-            android:id="@+id/forget_node"
-            android:title="@string/forget_node"
-            app:showAsAction="withText" />
         <item
             android:id="@+id/traceroute"
             android:title="@string/traceroute"
@@ -23,6 +19,10 @@
             android:checkable="true"
             android:checked="false"
             android:title="@string/ignore" />
+        <item
+            android:id="@+id/forget_node"
+            android:title="@string/forget_node"
+            app:showAsAction="withText" />
     </group>
     <group android:id="@+id/group_admin">
         <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92f863ff4..539f49aa7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,4 +188,5 @@
     <string name="waypoint_received">Received waypoint: %s</string>
     <string name="error_duty_cycle">Duty Cycle limit reached. Cannot send messages right now, please try again later.</string>
     <string name="forget_node">Forget Node</string>
+    <string name="forget_node_message">This node will be removed from your list until your node receives NodeInfo data from it again.</string>
 </resources>