echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* i2psnark: Fix more escaped messages

Browse Source
This commit is contained in:
zzz
2014-08-08 20:05:42 +00:00
parent 64ec9f6a00
commit fbdc535287
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java
View File

@ -86,7 +86,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl
* Set off by startTorrent() * Set off by startTorrent()
*/ */
public void run() { public void run() {
_mgr.addMessage(_("Fetching {0}", urlify(_url))); _mgr.addMessageNoEscape(_("Fetching {0}", urlify(_url)));
File file = get(); File file = get();
if (!_isRunning) // stopped? if (!_isRunning) // stopped?
return; return;
@ -96,7 +96,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl
_mgr.deleteMagnet(this); _mgr.deleteMagnet(this);
add(file); add(file);
} else { } else {
_mgr.addMessage(_("Torrent was not retrieved from {0}", urlify(_url)) + _mgr.addMessageNoEscape(_("Torrent was not retrieved from {0}", urlify(_url)) +
((_failCause != null) ? (": " + DataHelper.stripHTML(_failCause)) : "")); ((_failCause != null) ? (": " + DataHelper.stripHTML(_failCause)) : ""));
} }
if (file != null) if (file != null)
@ -150,7 +150,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl
* This Snark may then be deleted. * This Snark may then be deleted.
*/ */
private void add(File file) { private void add(File file) {
_mgr.addMessage(_("Torrent fetched from {0}", urlify(_url))); _mgr.addMessageNoEscape(_("Torrent fetched from {0}", urlify(_url)));
FileInputStream in = null; FileInputStream in = null;
try { try {
in = new FileInputStream(file); in = new FileInputStream(file);
@ -184,9 +184,9 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl
throw new IOException("Unknown error - check logs"); throw new IOException("Unknown error - check logs");
} }
} catch (IOException ioe) { } catch (IOException ioe) {
_mgr.addMessage(_("Torrent at {0} was not valid", urlify(_url)) + ": " + ioe.getMessage()); _mgr.addMessageNoEscape(_("Torrent at {0} was not valid", urlify(_url)) + ": " + DataHelper.stripHTML(ioe.getMessage()));
} catch (OutOfMemoryError oom) { } catch (OutOfMemoryError oom) {
_mgr.addMessage(_("ERROR - Out of memory, cannot create torrent from {0}", urlify(_url)) + ": " + oom.getMessage()); _mgr.addMessageNoEscape(_("ERROR - Out of memory, cannot create torrent from {0}", urlify(_url)) + ": " + DataHelper.stripHTML(oom.getMessage()));
} finally { } finally {
try { if (in != null) in.close(); } catch (IOException ioe) {} try { if (in != null) in.close(); } catch (IOException ioe) {}
} }

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 6; public final static long BUILD = 7;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";