X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=56fb90de8034409319be3213b6f6fd22e9038f34;hb=b171126719c983b590c51f22eb60a3e0afdf1fb9;hp=d090d645ae9fb3ef94f27835ce5e03243d9fdf59;hpb=30ce501106648904c6079bba147103750d801ce4;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
index d090d64..56fb90d 100644
--- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -307,7 +307,8 @@ public class FcpClient implements Closeable {
 	}
 
 	/**
-	 * Returns the file with the given URI.
+	 * Returns the file with the given URI. The retrieved data will be run
+	 * through Freenet’s content filter.
 	 *
 	 * @param uri
 	 *            The URI to get
@@ -318,6 +319,24 @@ public class FcpClient implements Closeable {
 	 *             if an FCP error occurs
 	 */
 	public GetResult getURI(final String uri) throws IOException, FcpException {
+		return getURI(uri, true);
+	}
+
+	/**
+	 * Returns the file with the given URI.
+	 *
+	 * @param uri
+	 *            The URI to get
+	 * @param filterData
+	 *            {@code true} to filter the retrieved data, {@code false}
+	 *            otherwise
+	 * @return The result of the get request
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public GetResult getURI(final String uri, final boolean filterData) throws IOException, FcpException {
 		checkConnected(true);
 		final GetResult getResult = new GetResult();
 		new ExtendedFcpAdapter() {
@@ -329,6 +348,7 @@ public class FcpClient implements Closeable {
 			@SuppressWarnings("synthetic-access")
 			public void run() throws IOException {
 				ClientGet clientGet = new ClientGet(uri, identifier);
+				clientGet.setFilterData(filterData);
 				fcpConnection.sendMessage(clientGet);
 			}
 
@@ -342,7 +362,9 @@ public class FcpClient implements Closeable {
 					String newUri = getFailed.getRedirectURI();
 					getResult.realUri(newUri);
 					try {
-						fcpConnection.sendMessage(new ClientGet(newUri, identifier));
+						ClientGet clientGet = new ClientGet(newUri, identifier);
+						clientGet.setFilterData(filterData);
+						fcpConnection.sendMessage(clientGet);
 					} catch (IOException ioe1) {
 						getResult.success(false).exception(ioe1);
 						completionLatch.countDown();
@@ -580,8 +602,8 @@ public class FcpClient implements Closeable {
 
 	/**
 	 * Adds a peer, reading the noderef of the peer from the given file.
-	 * <strong>Note:</strong> the file to read the noderef from has to reside on
-	 * the same machine as the node!
+	 * <strong>Note:</strong> the file to read the noderef from has to reside
+	 * on the same machine as the node!
 	 *
 	 * @param file
 	 *            The name of the file containing the peer’s noderef
@@ -891,8 +913,8 @@ public class FcpClient implements Closeable {
 	 *
 	 * @param global
 	 *            <code>true</code> to return requests from the global queue,
-	 *            <code>false</code> to only show requests from the client-local
-	 *            queue
+	 *            <code>false</code> to only show requests from the
+	 *            client-local queue
 	 * @return All requests
 	 * @throws IOException
 	 *             if an I/O error occurs