From f0e0c0151880ddbd83e4919029720dfc0c7c191f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 17 Apr 2018 12:37:54 +0000
Subject: [PATCH] Console: Fix sidebar status when updating plugin (ticket
 #2137)

---
 .../src/net/i2p/router/update/PluginUpdateRunner.java | 11 +++++++++++
 history.txt                                           |  8 ++++++++
 router/java/src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
index 5084c4860..d72c494ce 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
@@ -133,6 +133,17 @@ class PluginUpdateRunner extends UpdateRunner {
                 _mgr.notifyTaskFailed(this, _errMsg, null);
         }
 
+    /**
+     *  Overridden to change the "Updating I2P" text in super
+     *  @since 0.9.35
+     */
+    @Override
+    public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) {
+        long d = currentWrite + bytesTransferred;
+        String status = "<b>" + _t("Downloading plugin") + ": " + _appName + "</b>";
+        _mgr.notifyProgress(this, status, d, d + bytesRemaining);
+    }
+
         @Override
         public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {
             if (!(_xpi2pURL.startsWith("file:") || _method == UpdateMethod.FILE))
diff --git a/history.txt b/history.txt
index 0c70880e9..964687bef 100644
--- a/history.txt
+++ b/history.txt
@@ -1,7 +1,15 @@
+2018-04-17 zzz
+ * Console: Fix sidebar status when updating plugin (ticket #2137)
+
+2018-04-16 zzz
+ * Console: Add links to bandwidth graphs on /tunnels
+ * SusiMail: Move logging to router logs (ticket #2191)
+
 2018-04-14 zzz
  * Console: Add built-by to /logs (ticket #2204)
  * CPUID: Fix TBM detection (ticket #2211)
  * Debian updates (ticket #2027, PR #15)
+ * i2ptunnel: Build restructuring
  * Jetty: Fix quote in header line tripping XSS filter (ticket #2215)
  * SusiMail: Add folders, drafts, background sending (ticket #2087)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 282c18b42..0725033fa 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 = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";