X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FUpdateChecker.java;h=5ccc96dbe9e7f356add7a23b92d9b8a310920b67;hb=036c6fa20ce11ce8093f46fc0fce1c1da1839789;hp=9c50f3766dd675a94eeee2434fe075edb99d676c;hpb=6b0e11557d6602598086e0bb00082848c450cc46;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index 9c50f37..5ccc96d 100644
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UpdateChecker.java - Copyright © 2011 David Roden
+ * Sone - UpdateChecker.java - Copyright © 2011–2012 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
@@ -26,12 +26,11 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.FreenetInterface.Fetched;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.util.collection.Pair;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.version.Version;
-import freenet.client.FetchResult;
 import freenet.keys.FreenetURI;
 import freenet.support.api.Bucket;
 
@@ -49,7 +48,7 @@ public class UpdateChecker {
 	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
 
 	/** The current latest known edition. */
-	private static final int LATEST_EDITION = 36;
+	private static final int LATEST_EDITION = 55;
 
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
@@ -166,19 +165,19 @@ public class UpdateChecker {
 			@Override
 			@SuppressWarnings("synthetic-access")
 			public void editionFound(FreenetURI uri, long edition, boolean newKnownGood, boolean newSlot) {
-				logger.log(Level.FINEST, "Found update for %s: %d, %s, %s", new Object[] { uri, edition, newKnownGood, newSlot });
+				logger.log(Level.FINEST, String.format("Found update for %s: %d, %s, %s", uri, edition, newKnownGood, newSlot));
 				if (newKnownGood || newSlot) {
-					Pair<FreenetURI, FetchResult> uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" }));
+					Fetched uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" }));
 					if (uriResult == null) {
-						logger.log(Level.WARNING, "Could not fetch properties of latest homepage: %s", uri);
+						logger.log(Level.WARNING, String.format("Could not fetch properties of latest homepage: %s", uri));
 						return;
 					}
-					Bucket resultBucket = uriResult.getRight().asBucket();
+					Bucket resultBucket = uriResult.getFetchResult().asBucket();
 					try {
 						parseProperties(resultBucket.getInputStream(), edition);
 						latestEdition = edition;
 					} catch (IOException ioe1) {
-						logger.log(Level.WARNING, "Could not parse sone.properties of " + uri, ioe1);
+						logger.log(Level.WARNING, String.format("Could not parse sone.properties of %s!", uri), ioe1);
 					} finally {
 						resultBucket.free();
 					}
@@ -240,7 +239,7 @@ public class UpdateChecker {
 		if (version.compareTo(currentLatestVersion) > 0) {
 			currentLatestVersion = version;
 			latestVersionDate = releaseTime;
-			logger.log(Level.INFO, "Found new version: %s (%tc)", new Object[] { version, new Date(releaseTime) });
+			logger.log(Level.INFO, String.format("Found new version: %s (%tc)", version, new Date(releaseTime)));
 			updateListenerManager.fireUpdateFound(version, releaseTime, edition);
 		}
 	}