From 95eb106a40662a71ad7b50f2fbffd69a82eaf094 Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@protonmail.com>
Date: Sat, 15 Oct 2022 01:08:15 -0500
Subject: [PATCH] fix upgrade code

---
 .../java/net/mynero/wallet/MainActivity.java  |  2 +-
 .../mynero/wallet/service/PrefService.java    | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/net/mynero/wallet/MainActivity.java b/app/src/main/java/net/mynero/wallet/MainActivity.java
index 3d9bd29..9886403 100644
--- a/app/src/main/java/net/mynero/wallet/MainActivity.java
+++ b/app/src/main/java/net/mynero/wallet/MainActivity.java
@@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity implements MoneroHandlerThre
     }
 
     private void upgradeOldNodePrefs() {
-        PrefService.getInstance().getNode();
+        PrefService.getInstance().upgradeNodePrefs();
     }
 
     @Override
diff --git a/app/src/main/java/net/mynero/wallet/service/PrefService.java b/app/src/main/java/net/mynero/wallet/service/PrefService.java
index c72c88a..1d2837d 100644
--- a/app/src/main/java/net/mynero/wallet/service/PrefService.java
+++ b/app/src/main/java/net/mynero/wallet/service/PrefService.java
@@ -26,6 +26,17 @@ public class PrefService extends ServiceBase {
     }
 
     public Node getNode() {
+        boolean usesProxy = getBoolean(Constants.PREF_USES_TOR, false);
+        DefaultNodes defaultNode = usesProxy ? DefaultNodes.SAMOURAI_ONION : DefaultNodes.SAMOURAI;
+        String nodeString = getString(Constants.PREF_NODE_2, defaultNode.getUri());
+        if(!nodeString.isEmpty()) {
+            return Node.fromString(nodeString);
+        } else {
+            return null;
+        }
+    }
+
+    public void upgradeNodePrefs() {
         String oldNodeString = getString("pref_node", "");
         if(!oldNodeString.isEmpty()) {
             //upgrade old node pref to new node pref
@@ -41,14 +52,6 @@ public class PrefService extends ServiceBase {
                 e.printStackTrace();
             }
         }
-        boolean usesProxy = getBoolean(Constants.PREF_USES_TOR, false);
-        DefaultNodes defaultNode = usesProxy ? DefaultNodes.SAMOURAI_ONION : DefaultNodes.SAMOURAI;
-        String nodeString = getString(Constants.PREF_NODE_2, defaultNode.getUri());
-        if(!nodeString.isEmpty()) {
-            return Node.fromString(nodeString);
-        } else {
-            return null;
-        }
     }
 
     private Node getNode(String oldNodeString) throws JSONException {
@@ -79,8 +82,7 @@ public class PrefService extends ServiceBase {
         if(nodeString.isEmpty()) {
             return null;
         } else {
-            Node oldNode = Node.fromString(nodeString);
-            return oldNode;
+            return Node.fromString(nodeString);
         }
     }