From 36c279f23d9d6bb64a43548e3d7cc7a4ed30434a Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 26 May 2018 21:47:30 +0000
Subject: [PATCH] i2psnark: Hide peers button if no peers on that page (ticket
 #2152)

---
 .../org/klomp/snark/web/I2PSnarkServlet.java  | 38 ++++++++++++-------
 history.txt                                   |  6 +++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 1e48efa6f2..c379ebbba7 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -495,21 +495,31 @@ public class I2PSnarkServlet extends BasicServlet {
             out.write("</a>");
         out.write("</th>\n<th class=\"snarkTorrentStatus\">");
         if (_manager.util().connected() && !snarks.isEmpty()) {
-            out.write(" <a href=\"" + _contextPath + '/');
-            if (peerParam != null) {
-                // disable peer view
-                out.write(getQueryString(req, "", null, null));
-                out.write("\">");
-                tx = _t("Hide Peers");
-                out.write(toThemeImg("hidepeers", tx, tx));
-            } else {
-                // enable peer view
-                out.write(getQueryString(req, "1", null, null));
-                out.write("\">");
-                tx = _t("Show Peers");
-                out.write(toThemeImg("showpeers", tx, tx));
+            boolean hasPeers = false;
+            int end = Math.min(start + pageSize, snarks.size());
+            for (int i = start; i < end; i++) {
+                if (snarks.get(i).getPeerCount() > 0) {
+                    hasPeers = true;
+                    break;
+                }
+            }
+            if (hasPeers) {
+                out.write(" <a href=\"" + _contextPath + '/');
+                if (peerParam != null) {
+                    // disable peer view
+                    out.write(getQueryString(req, "", null, null));
+                    out.write("\">");
+                    tx = _t("Hide Peers");
+                    out.write(toThemeImg("hidepeers", tx, tx));
+                } else {
+                    // enable peer view
+                    out.write(getQueryString(req, "1", null, null));
+                    out.write("\">");
+                    tx = _t("Show Peers");
+                    out.write(toThemeImg("showpeers", tx, tx));
+                }
+                out.write("</a>\n");
             }
-            out.write("</a>\n");
         }
         out.write("</th>\n<th colspan=\"2\" align=\"left\">");
         // cycle through sort by name or type
diff --git a/history.txt b/history.txt
index 4b7ecb7175..d9adb49da3 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,12 @@
 2018-05-26 zzz
  * /confignet: Reorganize (ticket #2217)
  * /configsidebar: Tag sections for translation; sort unselected sections by translated name
+ * i2psnark:
+   - Hide "0 Bps" if no peers (ticket #2152)
+   - Hide peers button if no peers (ticket #2152)
+   - Hide column 1 icon for peers (ticket #1996)
+ * i2ptunnel: Retry accept after server socket closed (ticket #2003)
+ * Jetty: Skip files with [] in default servlet listing
  * Router: Fix wrapper.config path in OOM message when installed as
    Debian package, but not running as a service (ticket #2223)
  * Summary Bar: Change header from "I2P Updates" to "Update Status" (ticket #2137)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f4edb9752..31c35f8c3e 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";