From c04b192753ac88e372fb92196a20b2fa13959ba3 Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 6 Jan 2019 10:57:25 +0100 Subject: [PATCH] keep node once found (#510) --- .../java/com/m2049r/xmrwallet/LoginActivity.java | 5 +++++ .../java/com/m2049r/xmrwallet/LoginFragment.java | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index 56aa7b4..49c2c7d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java @@ -92,6 +92,11 @@ public class LoginActivity extends BaseActivity Set favouriteNodes = new HashSet<>(); + @Override + public NodeInfo getNode() { + return node; + } + @Override public void setNode(NodeInfo node) { if ((node != null) && (node.getNetworkType() != WalletManager.getInstance().getNetworkType())) diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java index 22d9314..0086468 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java @@ -99,6 +99,8 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter void setNode(NodeInfo node); + NodeInfo getNode(); + Set getFavouriteNodes(); boolean hasLedger(); @@ -128,7 +130,8 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter activityCallback.setTitle(null); activityCallback.setToolbarButton(Toolbar.BUTTON_CREDITS); activityCallback.showNet(); - findBestNode(); + if (activityCallback.getNode() == null) + findBestNode(); } @Override @@ -181,7 +184,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter @Override public void onClick(View v) { if (activityCallback.getFavouriteNodes().isEmpty()) - activityCallback.onNodePrefs(); + startNodePrefs(); else findBestNode(); } @@ -191,8 +194,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter view.findViewById(R.id.ibOption).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (activityCallback != null) - activityCallback.onNodePrefs(); + startNodePrefs(); } }); @@ -476,4 +478,9 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter tvNodeAddress.setText(nodeInfo.getAddress()); tvNodeAddress.setVisibility(View.VISIBLE); } + + private void startNodePrefs() { + activityCallback.setNode(null); + activityCallback.onNodePrefs(); + } }