X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=a3e872b76f92960282e8c70310a6a0c40c396f44;hb=e3a3dccdfcb0f7390f8bf30ec1af0f9d9fb69496;hp=d2da454cedd1067c50d7a55e286ca6ea8fbca81e;hpb=cce88f819ae0ef84b5a86c6a826f88ce0208107f;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index d2da454..a3e872b 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Sone.java - Copyright © 2010–2012 David Roden
+ * Sone - Sone.java - Copyright © 2010–2013 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
@@ -38,6 +38,8 @@ import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.util.logging.Logging;
 
 import com.google.common.base.Predicate;
+import com.google.common.hash.Hasher;
+import com.google.common.hash.Hashing;
 
 import freenet.keys.FreenetURI;
 
@@ -228,7 +230,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	private final List<Album> albums = new CopyOnWriteArrayList<Album>();
 
 	/** Sone-specific options. */
-	private final Options options = new Options();
+	private Options options = new Options();
 
 	/**
 	 * Creates a new Sone.
@@ -895,6 +897,17 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		return options;
 	}
 
+	/**
+	 * Sets the options of this Sone.
+	 *
+	 * @param options
+	 *            The options of this Sone
+	 */
+	/* TODO - remove this method again, maybe add an option provider */
+	public void setOptions(Options options) {
+		this.options = options;
+	}
+
 	//
 	// FINGERPRINTABLE METHODS
 	//
@@ -904,46 +917,46 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 */
 	@Override
 	public synchronized String getFingerprint() {
-		StringBuilder fingerprint = new StringBuilder();
-		fingerprint.append(profile.getFingerprint());
+		Hasher hash = Hashing.sha256().newHasher();
+		hash.putString(profile.getFingerprint());
 
-		fingerprint.append("Posts(");
+		hash.putString("Posts(");
 		for (Post post : getPosts()) {
-			fingerprint.append("Post(").append(post.getId()).append(')');
+			hash.putString("Post(").putString(post.getId()).putString(")");
 		}
-		fingerprint.append(")");
+		hash.putString(")");
 
 		List<PostReply> replies = new ArrayList<PostReply>(getReplies());
 		Collections.sort(replies, Reply.TIME_COMPARATOR);
-		fingerprint.append("Replies(");
+		hash.putString("Replies(");
 		for (PostReply reply : replies) {
-			fingerprint.append("Reply(").append(reply.getId()).append(')');
+			hash.putString("Reply(").putString(reply.getId()).putString(")");
 		}
-		fingerprint.append(')');
+		hash.putString(")");
 
 		List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
 		Collections.sort(likedPostIds);
-		fingerprint.append("LikedPosts(");
+		hash.putString("LikedPosts(");
 		for (String likedPostId : likedPostIds) {
-			fingerprint.append("Post(").append(likedPostId).append(')');
+			hash.putString("Post(").putString(likedPostId).putString(")");
 		}
-		fingerprint.append(')');
+		hash.putString(")");
 
 		List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
 		Collections.sort(likedReplyIds);
-		fingerprint.append("LikedReplies(");
+		hash.putString("LikedReplies(");
 		for (String likedReplyId : likedReplyIds) {
-			fingerprint.append("Reply(").append(likedReplyId).append(')');
+			hash.putString("Reply(").putString(likedReplyId).putString(")");
 		}
-		fingerprint.append(')');
+		hash.putString(")");
 
-		fingerprint.append("Albums(");
+		hash.putString("Albums(");
 		for (Album album : albums) {
-			fingerprint.append(album.getFingerprint());
+			hash.putString(album.getFingerprint());
 		}
-		fingerprint.append(')');
+		hash.putString(")");
 
-		return fingerprint.toString();
+		return hash.hash().toString();
 	}
 
 	//