projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Process albums and images during rescue mode, too.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
FreenetInterface.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index
0976dca
..
39f342c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/
src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@
-1,5
+1,5
@@
/*
/*
- *
Freenet
Sone - 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
*
* 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 ClientPutter clientPutter;
/** The final URI. */
- private FreenetURI resultingUri;
+ private
volatile
FreenetURI resultingUri;
/**
* Creates a new insert token for the given image.
/**
* 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) {
@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);
+ }
}
}
}
}