rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-09-19 19:06:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix upgrade code

Browse Source
This commit is contained in:
pokkst 2022-10-15 01:08:15 -05:00
parent 90e556abff
commit 95eb106a40
No known key found for this signature in database
GPG Key ID: 90C2ED85E67A50FF
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/mynero/wallet/MainActivity.java
View File

@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity implements MoneroHandlerThre
} }
private void upgradeOldNodePrefs() { private void upgradeOldNodePrefs() {
PrefService.getInstance().getNode(); PrefService.getInstance().upgradeNodePrefs();
} }
@Override @Override

22
app/src/main/java/net/mynero/wallet/service/PrefService.java
View File

@ -26,6 +26,17 @@ public class PrefService extends ServiceBase {
} }
public Node getNode() { 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", ""); String oldNodeString = getString("pref_node", "");
if(!oldNodeString.isEmpty()) { if(!oldNodeString.isEmpty()) {
//upgrade old node pref to new node pref //upgrade old node pref to new node pref
@ -41,14 +52,6 @@ public class PrefService extends ServiceBase {
e.printStackTrace(); 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 { private Node getNode(String oldNodeString) throws JSONException {
@ -79,8 +82,7 @@ public class PrefService extends ServiceBase {
if(nodeString.isEmpty()) { if(nodeString.isEmpty()) {
return null; return null;
} else { } else {
Node oldNode = Node.fromString(nodeString); return Node.fromString(nodeString);
return oldNode;
} }
} }