From 08f815e8306d1c2f73341be81302afafd3c6ed8b Mon Sep 17 00:00:00 2001
From: m2049r <m2049r@monerujo.io>
Date: Sat, 21 Nov 2020 13:22:54 +0100
Subject: [PATCH] don't show connection error if we havent tested yet (#700)

---
 .../java/com/m2049r/levin/scanner/Dispatcher.java   |  1 -
 .../java/com/m2049r/xmrwallet/NodeFragment.java     |  1 -
 .../java/com/m2049r/xmrwallet/data/NodeInfo.java    | 13 ++++++++++---
 .../m2049r/xmrwallet/layout/NodeInfoAdapter.java    | 12 ++++++++----
 .../java/com/m2049r/xmrwallet/util/NodePinger.java  |  5 +----
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java b/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java
index fd96e78..536ba19 100644
--- a/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java
+++ b/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java
@@ -185,7 +185,6 @@ public class Dispatcher implements PeerRetriever.OnGetPeers {
 
     public void seedPeers(Collection<NodeInfo> seedNodes) {
         for (NodeInfo node : seedNodes) {
-            node.clear();
             if (node.isFavourite()) {
                 rpcNodes.add(node);
                 if (listener != null) listener.onGet(node);
diff --git a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
index b601de3..74c7dac 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
@@ -563,7 +563,6 @@ public class NodeFragment extends Fragment
             @Override
             protected void onPreExecute() {
                 super.onPreExecute();
-                nodeInfo.clear();
                 tvResult.setText(getString(R.string.node_testing, nodeInfo.getHostAddress()));
             }
 
diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
index 26a0e4c..7531973 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
@@ -46,7 +46,7 @@ import okhttp3.ResponseBody;
 import timber.log.Timber;
 
 public class NodeInfo extends Node {
-    final static public int MIN_MAJOR_VERSION = 11;
+    final static public int MIN_MAJOR_VERSION = 14;
     final static public String RPC_VERSION = "2.0";
 
     private long height = 0;
@@ -54,6 +54,7 @@ public class NodeInfo extends Node {
     private int majorVersion = 0;
     private double responseTime = Double.MAX_VALUE;
     private int responseCode = 0;
+    private boolean tested = false;
 
     public void clear() {
         height = 0;
@@ -61,6 +62,11 @@ public class NodeInfo extends Node {
         responseTime = Double.MAX_VALUE;
         responseCode = 0;
         timestamp = 0;
+        tested = false;
+    }
+
+    public boolean isTested() {
+        return tested;
     }
 
     static public NodeInfo fromString(String nodeString) {
@@ -188,7 +194,7 @@ public class NodeInfo extends Node {
     }
 
     private static final int HTTP_TIMEOUT = OkHttpHelper.HTTP_TIMEOUT;
-    public static final double PING_GOOD = HTTP_TIMEOUT / 3; //ms
+    public static final double PING_GOOD = HTTP_TIMEOUT / 3.0; //ms
     public static final double PING_MEDIUM = 2 * PING_GOOD; //ms
     public static final double PING_BAD = HTTP_TIMEOUT;
 
@@ -251,8 +257,9 @@ public class NodeInfo extends Node {
                 }
             }
         } catch (IOException | JSONException ex) {
-            // failure
             Timber.d(ex);
+        } finally {
+            tested = true;
         }
         return false;
     }
diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java b/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
index 2aeed11..b1643b3 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
@@ -147,11 +147,15 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
             nodeItem = nodeItems.get(position);
             tvName.setText(nodeItem.getName());
             ivPing.setImageResource(getPingIcon(nodeItem));
-            if (nodeItem.isValid()) {
-                Helper.showTimeDifference(tvIp, nodeItem.getTimestamp());
+            if (nodeItem.isTested()) {
+                if (nodeItem.isValid()) {
+                    Helper.showTimeDifference(tvIp, nodeItem.getTimestamp());
+                } else {
+                    tvIp.setText(getResponseErrorText(context, nodeItem.getResponseCode()));
+                    tvIp.setTextColor(ColorHelper.getThemedColor(tvIp.getContext(), R.attr.colorError));
+                }
             } else {
-                tvIp.setText(getResponseErrorText(context, nodeItem.getResponseCode()));
-                tvIp.setTextColor(ColorHelper.getThemedColor(tvIp.getContext(), R.attr.colorError));
+                tvIp.setText(context.getResources().getString(R.string.node_testing, nodeItem.getHostAddress()));
             }
             itemView.setSelected(nodeItem.isSelected());
             itemView.setClickable(itemsClickable);
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/NodePinger.java b/app/src/main/java/com/m2049r/xmrwallet/util/NodePinger.java
index 831f359..e353de1 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/util/NodePinger.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/NodePinger.java
@@ -40,10 +40,7 @@ public class NodePinger {
         final ExecutorService exeService = Executors.newFixedThreadPool(NUM_THREADS);
         List<Callable<Boolean>> taskList = new ArrayList<>();
         for (NodeInfo node : nodes) {
-            taskList.add(() -> {
-                node.clear();
-                return node.testRpcService(listener);
-            });
+            taskList.add(() -> node.testRpcService(listener));
         }
 
         try {