From 720d88320d1cd8e7f51af55891a2bd6deeb8b371 Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@protonmail.com>
Date: Sat, 15 Oct 2022 00:11:06 -0500
Subject: [PATCH] handle upgrade better

---
 .../java/net/mynero/wallet/MainActivity.java  | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/mynero/wallet/MainActivity.java b/app/src/main/java/net/mynero/wallet/MainActivity.java
index 86ca72f..6f99263 100644
--- a/app/src/main/java/net/mynero/wallet/MainActivity.java
+++ b/app/src/main/java/net/mynero/wallet/MainActivity.java
@@ -30,6 +30,8 @@ import net.mynero.wallet.service.UTXOService;
 import net.mynero.wallet.util.Constants;
 import net.mynero.wallet.util.UriData;
 
+import org.json.JSONArray;
+
 import java.io.File;
 
 public class MainActivity extends AppCompatActivity implements MoneroHandlerThread.Listener, PasswordBottomSheetDialog.PasswordListener {
@@ -106,12 +108,42 @@ public class MainActivity extends AppCompatActivity implements MoneroHandlerThre
     }
 
     private void upgradeOldNodePrefs() {
-        String oldNodeString = PrefService.getInstance().getString("pref_node", "");
-        if(!oldNodeString.isEmpty()) {
-            Node oldNode = Node.fromString(oldNodeString);
-            if(oldNode != null) {
-                PrefService.getInstance().edit().putString(Constants.PREF_NODE_2, oldNode.toNodeString()).apply();
+        try {
+            String oldNodeString = PrefService.getInstance().getString("pref_node", "");
+            String nodeString = "";
+            if (!oldNodeString.isEmpty()) {
+                String nodesArray = PrefService.getInstance().getString(Constants.PREF_CUSTOM_NODES, "[]");
+                JSONArray jsonArray = new JSONArray(nodesArray);
+                for (int i = 0; i < jsonArray.length(); i++) {
+                    String jsonNodeString = jsonArray.getString(i);
+                    Node savedNode = Node.fromString(jsonNodeString);
+                    if(savedNode != null) {
+                        if (savedNode.getAddress().equals(oldNodeString)) {
+                            nodeString = savedNode.toNodeString();
+                            break;
+                        }
+                    }
+                }
+                if(nodeString.isEmpty()) {
+                    for (DefaultNodes defaultNode : DefaultNodes.values()) {
+                        Node node = Node.fromString(defaultNode.getUri());
+                        if(node != null) {
+                            if(node.getAddress().equals(oldNodeString)) {
+                                nodeString = node.toNodeString();
+                                break;
+                            }
+                        }
+                    }
+                }
+                if(!nodeString.isEmpty()) {
+                    Node oldNode = Node.fromString(nodeString);
+                    if (oldNode != null) {
+                        PrefService.getInstance().edit().putString(Constants.PREF_NODE_2, oldNode.toNodeString()).apply();
+                    }
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }