Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-25 15:29:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix npe resuming from standby without monero connection

Browse Source
This commit is contained in:
woodser 2023-08-09 09:21:10 -04:00
parent aeb0822f9f
commit 7fc2f5de52
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java
View File

@ -246,7 +246,7 @@ public final class CoreMoneroConnectionsService {
} }
public boolean isConnectionLocal() { public boolean isConnectionLocal() {
return getConnection() != null && HavenoUtils.isLocalHost(getConnection().getUri()); return isConnectionLocal(getConnection());
} }
public long getRefreshPeriodMs() { public long getRefreshPeriodMs() {
@ -315,19 +315,22 @@ public final class CoreMoneroConnectionsService {
// ------------------------------- HELPERS -------------------------------- // ------------------------------- HELPERS --------------------------------
private boolean isConnectionLocal(MoneroRpcConnection connection) {
return connection != null && HavenoUtils.isLocalHost(connection.getUri());
}
private long getDefaultRefreshPeriodMs() { private long getDefaultRefreshPeriodMs() {
if (daemon == null) return REFRESH_PERIOD_LOCAL_MS; MoneroRpcConnection connection = getConnection();
else { if (connection == null) return REFRESH_PERIOD_LOCAL_MS;
if (isConnectionLocal()) { if (isConnectionLocal(connection)) {
if (lastInfo != null && (lastInfo.isBusySyncing() || (lastInfo.getHeightWithoutBootstrap() != null && lastInfo.getHeightWithoutBootstrap() > 0 && lastInfo.getHeightWithoutBootstrap() < lastInfo.getHeight()))) return REFRESH_PERIOD_HTTP_MS; // refresh slower if syncing or bootstrapped if (lastInfo != null && (lastInfo.isBusySyncing() || (lastInfo.getHeightWithoutBootstrap() != null && lastInfo.getHeightWithoutBootstrap() > 0 && lastInfo.getHeightWithoutBootstrap() < lastInfo.getHeight()))) return REFRESH_PERIOD_HTTP_MS; // refresh slower if syncing or bootstrapped
else return REFRESH_PERIOD_LOCAL_MS; // TODO: announce faster refresh after done syncing else return REFRESH_PERIOD_LOCAL_MS; // TODO: announce faster refresh after done syncing
} else if (useProxy(getConnection())) { } else if (useProxy(connection)) {
return REFRESH_PERIOD_ONION_MS; return REFRESH_PERIOD_ONION_MS;
} else { } else {
return REFRESH_PERIOD_HTTP_MS; return REFRESH_PERIOD_HTTP_MS;
} }
} }
}
private boolean useProxy(MoneroRpcConnection connection) { private boolean useProxy(MoneroRpcConnection connection) {
return connection.isOnion() || (preferences.isUseTorForMonero() && !HavenoUtils.isLocalHost(connection.getUri())); return connection.isOnion() || (preferences.isUseTorForMonero() && !HavenoUtils.isLocalHost(connection.getUri()));