X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=39f342c389a9564d1b0a07feb64f7b7e4537fe32;hp=f7fa975337aabcea73ef49fa52bbb77e9cca3edb;hb=0df5e91852f737d760c5a9f54c5667309fbadcc2;hpb=4f73d25331c6917c3cadcfa7390e680072a20c40

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index f7fa975..39f342c 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - FreenetInterface.java - Copyright © 2010 David Roden
+ * Sone - FreenetInterface.java - Copyright © 2010 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ public class FreenetInterface {
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	public static class InsertToken implements ClientPutCallback {
+	public class InsertToken implements ClientPutCallback {
 
 		/** The image being inserted. */
 		private final Image image;
@@ -342,7 +342,7 @@ public class FreenetInterface {
 		private ClientPutter clientPutter;
 
 		/** The final URI. */
-		private FreenetURI resultingUri;
+		private volatile FreenetURI resultingUri;
 
 		/**
 		 * Creates a new insert token for the given image.
@@ -406,8 +406,9 @@ public class FreenetInterface {
 		 *
 		 * @see ImageInsertListener#imageInsertAborted(Image)
 		 */
+		@SuppressWarnings("synthetic-access")
 		public void cancel() {
-			clientPutter.cancel(null, null);
+			clientPutter.cancel(null, node.clientCore.clientContext);
 			for (ImageInsertListener imageInsertListener : imageInsertListeners) {
 				imageInsertListener.imageInsertAborted(image);
 			}
@@ -431,7 +432,11 @@ public class FreenetInterface {
 		@Override
 		public void onFailure(InsertException insertException, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
 			for (ImageInsertListener imageInsertListener : imageInsertListeners) {
-				imageInsertListener.imageInsertFailed(image, insertException);
+				if ((insertException != null) && ("Cancelled by user".equals(insertException.getMessage()))) {
+					imageInsertListener.imageInsertAborted(image);
+				} else {
+					imageInsertListener.imageInsertFailed(image, insertException);
+				}
 			}
 		}