From 4fb3e86e4d115fd4cb3ec79645cf6594cd1d039c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 23 Sep 2013 12:13:44 +0000
Subject: [PATCH] Truncate and linkify magnet link in summary bar update
message
---
apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java | 8 +++++++-
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java b/apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java
index 63d9670f17..267dd2aad2 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java
@@ -111,7 +111,7 @@ class UpdateRunner implements UpdateTask, CompleteListener {
}
_snark = _smgr.addMagnet(name, ih, trackerURL, true, true, this);
if (_snark != null) {
- updateStatus("<b>" + _smgr.util().getString("Updating from {0}", updateURL) + "</b>");
+ updateStatus("<b>" + _smgr.util().getString("Updating from {0}", linkify(updateURL)) + "</b>");
new Timeout();
break;
}
@@ -291,6 +291,12 @@ class UpdateRunner implements UpdateTask, CompleteListener {
//////// end CompleteListener methods
+ private static String linkify(String url) {
+ String durl = url.length() <= 28 ? url :
+ url.substring(0, 25) + "…";
+ return "<a target=\"_blank\" href=\"" + url + "\"/>" + durl + "</a>";
+ }
+
private void updateStatus(String s) {
_umgr.notifyProgress(this, s);
}
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 33006bcb1f..285b64c36d 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 = 27;
+ public final static long BUILD = 28;
/** for example "-test" */
public final static String EXTRA = "-rc";
--
GitLab