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

More bug fixes

Browse Source
This commit is contained in:
pokkst 2023-05-24 22:08:29 -05:00
parent db3c4c424b
commit 9e70f64e39
No known key found for this signature in database
GPG Key ID: 90C2ED85E67A50FF
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/mynero/wallet/fragment/dialog/NodeSelectionBottomSheetDialog.java
View File

@ -78,7 +78,7 @@ public class NodeSelectionBottomSheetDialog extends BottomSheetDialogFragment im
Node node = Node.fromString(nodeString);
if (node != null) {
nodes.add(node);
jsonArray.put(i, node.toJson().toString());
jsonArray.put(i, node.toJson());
} else {
jsonArray.remove(i);
}

2
app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.java
View File

@ -300,7 +300,7 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia
JSONObject nodeJsonObject = jsonArray.getJSONObject(i);
Node savedNode = Node.fromJson(nodeJsonObject);
if (savedNode.toNodeString().equals(oldNode.toNodeString()))
jsonArray.put(i, newNode.toNodeString());
jsonArray.put(i, newNode.toJson());
}
saveNodesAndReopen(jsonArray);
} catch (Exception e) {

5
app/src/main/java/net/mynero/wallet/fragment/settings/SettingsViewModel.java
View File

@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel;
import net.mynero.wallet.MoneroApplication;
import net.mynero.wallet.data.DefaultNodes;
import net.mynero.wallet.data.Node;
import net.mynero.wallet.model.WalletManager;
import net.mynero.wallet.service.PrefService;
import net.mynero.wallet.util.Constants;
@ -18,8 +19,8 @@ public class SettingsViewModel extends ViewModel {
public void updateProxy(MoneroApplication application) {
application.getExecutor().execute(() -> {
boolean usesProxy = PrefService.getInstance().getBoolean(Constants.PREF_USES_TOR, false);
String currentNodeString = PrefService.getInstance().getNode().toNodeString();
boolean isNodeLocalIp = currentNodeString.startsWith("10.") || currentNodeString.startsWith("192.168.") || currentNodeString.equals("localhost") || currentNodeString.equals("127.0.0.1");
Node curretNode = PrefService.getInstance().getNode();
boolean isNodeLocalIp = curretNode.getAddress().startsWith("10.") || curretNode.getAddress().startsWith("192.168.") || curretNode.getAddress().equals("localhost") || curretNode.getAddress().equals("127.0.0.1");
if (!usesProxy || isNodeLocalIp) {
WalletManager.getInstance().setProxy("");