From 1fb96439168a69284a638125001fe1b28359b591 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 13 May 2015 14:00:19 +0000
Subject: [PATCH] i2psnark: Fix deletion of single-file torrent outside snark
 dir (ticket #1544)

---
 .../org/klomp/snark/web/I2PSnarkServlet.java  | 21 ++++++++++---------
 history.txt                                   |  5 +++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 17 insertions(+), 11 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 9df86b3b9..64a0ddb05 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1047,19 +1047,20 @@ public class I2PSnarkServlet extends BasicServlet {
                             File f = new File(name);
                             f.delete();
                             _manager.addMessage(_("Torrent file deleted: {0}", f.getAbsolutePath()));
-                            List<List<String>> files = meta.getFiles();
-                            String dataFile = snark.getBaseName();
-                            f = new File(_manager.getDataDir(), dataFile);
-                            if (files == null) { // single file torrent
-                                if (f.delete())
-                                    _manager.addMessage(_("Data file deleted: {0}", f.getAbsolutePath()));
-                                else
-                                    _manager.addMessage(_("Data file could not be deleted: {0}", f.getAbsolutePath()));
-                                break;
-                            }
                             Storage storage = snark.getStorage();
                             if (storage == null)
                                 break;
+                            List<List<String>> files = meta.getFiles();
+                            if (files == null) { // single file torrent
+                                for (File df : storage.getFiles()) {
+                                    // should be only one
+                                    if (df.delete())
+                                        _manager.addMessage(_("Data file deleted: {0}", df.getAbsolutePath()));
+                                    else
+                                        _manager.addMessage(_("Data file could not be deleted: {0}", df.getAbsolutePath()));
+                                }
+                                break;
+                            }
                             // step 1 delete files
                             for (File df : storage.getFiles()) {
                                 if (df.delete()) {
diff --git a/history.txt b/history.txt
index 79b0fdfd3..2fa062515 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2015-05-13 zzz
+ * Console: Fix URLs caught in XSS filter on /confighome (ticket #1569)
+ * i2psnark: Fix deletion of single-file torrent outside snark dir (ticket #1544)
+ * NTCP: Catch race in Reader (ticket #1534)
+
 2015-02-12 dg
  * Job Queue/stats: add stat/graph for amount of scheduled jobs (router.tunnelBacklog)
  * FloodfillMonitorJob:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 601535dbe..a85b0c8aa 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 = 21;
+    public final static long BUILD = 22;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";