Mirrors
/
wowwallet
mirror of https://gitlab.com/monerujo-io/wowwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

keep node once found (#510)

This commit is contained in:
m2049r 2019-01-06 10:57:25 +01:00 committed by GitHub
parent 888b5edaec
commit c04b192753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
View File

@ -92,6 +92,11 @@ public class LoginActivity extends BaseActivity
Set<NodeInfo> favouriteNodes = new HashSet<>(); Set<NodeInfo> favouriteNodes = new HashSet<>();
@Override
public NodeInfo getNode() {
return node;
}
@Override @Override
public void setNode(NodeInfo node) { public void setNode(NodeInfo node) {
if ((node != null) && (node.getNetworkType() != WalletManager.getInstance().getNetworkType())) if ((node != null) && (node.getNetworkType() != WalletManager.getInstance().getNetworkType()))

15
app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
View File

@ -99,6 +99,8 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
void setNode(NodeInfo node); void setNode(NodeInfo node);
NodeInfo getNode();
Set<NodeInfo> getFavouriteNodes(); Set<NodeInfo> getFavouriteNodes();
boolean hasLedger(); boolean hasLedger();
@ -128,7 +130,8 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
activityCallback.setTitle(null); activityCallback.setTitle(null);
activityCallback.setToolbarButton(Toolbar.BUTTON_CREDITS); activityCallback.setToolbarButton(Toolbar.BUTTON_CREDITS);
activityCallback.showNet(); activityCallback.showNet();
findBestNode(); if (activityCallback.getNode() == null)
findBestNode();
} }
@Override @Override
@ -181,7 +184,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (activityCallback.getFavouriteNodes().isEmpty()) if (activityCallback.getFavouriteNodes().isEmpty())
activityCallback.onNodePrefs(); startNodePrefs();
else else
findBestNode(); findBestNode();
} }
@ -191,8 +194,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
view.findViewById(R.id.ibOption).setOnClickListener(new View.OnClickListener() { view.findViewById(R.id.ibOption).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (activityCallback != null) startNodePrefs();
activityCallback.onNodePrefs();
} }
}); });
@ -476,4 +478,9 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
tvNodeAddress.setText(nodeInfo.getAddress()); tvNodeAddress.setText(nodeInfo.getAddress());
tvNodeAddress.setVisibility(View.VISIBLE); tvNodeAddress.setVisibility(View.VISIBLE);
} }
private void startNodePrefs() {
activityCallback.setNode(null);
activityCallback.onNodePrefs();
}
} }