X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=af680a15a91f0a04976871ec52ced7b5ef2766ff;hb=9b0f72a3be6a9e1c7f1e8c010712373193cf7033;hp=0976dcad5f0a2afd21767c3476e7c1ba29b64d0b;hpb=6aa4adb3d5660c72b9bea98b8a181f037ab50122;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 0976dca..af680a1 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
@@ -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.
@@ -432,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);
+				}
 			}
 		}
 
@@ -448,6 +452,14 @@ public class FreenetInterface {
 		 * {@inheritDoc}
 		 */
 		@Override
+		public void onGeneratedMetadata(Bucket metadata, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
+			/* ignore, we don’t care. */
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
 		public void onGeneratedURI(FreenetURI generatedUri, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
 			resultingUri = generatedUri;
 		}