Download a local Sone from Freenet, too.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 265b8e1..abebdd7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -389,7 +389,7 @@ public class Core implements IdentityListener {
        public Set<Sone> getLikes(Reply reply) {
                Set<Sone> sones = new HashSet<Sone>();
                for (Sone sone : getSones()) {
-                       if (sone.getLikedPostIds().contains(reply.getId())) {
+                       if (sone.getLikedReplyIds().contains(reply.getId())) {
                                sones.add(sone);
                        }
                }
@@ -436,10 +436,6 @@ public class Core implements IdentityListener {
                        return null;
                }
                synchronized (localSones) {
-                       if (localSones.containsKey(ownIdentity.getId())) {
-                               logger.log(Level.FINE, "Tried to add known local Sone: %s", ownIdentity);
-                               return localSones.get(ownIdentity.getId());
-                       }
                        final Sone sone;
                        try {
                                sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
@@ -455,6 +451,15 @@ public class Core implements IdentityListener {
                        soneInserter.start();
                        setSoneStatus(sone, SoneStatus.idle);
                        loadSone(sone);
+                       new Thread(new Runnable() {
+
+                               @Override
+                               @SuppressWarnings("synthetic-access")
+                               public void run() {
+                                       soneDownloader.fetchSone(sone);
+                               }
+
+                       }, "Sone Downloader").start();
                        return sone;
                }
        }
@@ -489,14 +494,20 @@ public class Core implements IdentityListener {
                        return null;
                }
                synchronized (remoteSones) {
-                       if (remoteSones.containsKey(identity.getId())) {
-                               logger.log(Level.FINE, "Identity already exists: %s", identity);
-                               return remoteSones.get(identity.getId());
-                       }
-                       Sone sone = new Sone(identity);
-                       sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
+                       final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+                       sone.setRequestUri(getSoneUri(identity.getRequestUri()));
+                       sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
                        remoteSones.put(identity.getId(), sone);
                        soneDownloader.addSone(sone);
+                       new Thread(new Runnable() {
+
+                               @Override
+                               @SuppressWarnings("synthetic-access")
+                               public void run() {
+                                       soneDownloader.fetchSone(sone);
+                               }
+
+                       }, "Sone Downloader").start();
                        setSoneStatus(sone, SoneStatus.idle);
                        return sone;
                }
@@ -563,9 +574,15 @@ public class Core implements IdentityListener {
                                return;
                        }
                        localSones.remove(sone.getId());
-                       soneInserters.remove(sone.getId()).stop();
+                       soneInserters.remove(sone).stop();
                }
                identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+               identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+               try {
+                       configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
+               } catch (ConfigurationException ce1) {
+                       logger.log(Level.WARNING, "Could not remove Sone from configuration!", ce1);
+               }
        }
 
        /**
@@ -583,7 +600,11 @@ public class Core implements IdentityListener {
 
                /* load Sone. */
                String sonePrefix = "Sone/" + sone.getId();
-               long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0);
+               Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null);
+               if (soneTime == null) {
+                       logger.log(Level.INFO, "Could not load Sone because no Sone has been saved.");
+                       return;
+               }
                long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
 
                /* load profile. */
@@ -946,13 +967,11 @@ public class Core implements IdentityListener {
         *
         * @param uriString
         *            The URI to derive the Sone URI from
-        * @param latestEditionString
-        *            The latest edition as a {@link String}, or {@code null}
         * @return The derived URI
         */
-       private FreenetURI getSoneUri(String uriString, String latestEditionString) {
+       private FreenetURI getSoneUri(String uriString) {
                try {
-                       FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]).setSuggestedEdition(Numbers.safeParseLong(latestEditionString, (long) 0));
+                       FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
                        return uri;
                } catch (MalformedURLException mue1) {
                        logger.log(Level.WARNING, "Could not create Sone URI from URI: " + uriString, mue1);
@@ -980,7 +999,7 @@ public class Core implements IdentityListener {
         */
        @Override
        public void ownIdentityRemoved(OwnIdentity ownIdentity) {
-               /* TODO */
+               logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
        }
 
        /**
@@ -996,8 +1015,16 @@ public class Core implements IdentityListener {
         * {@inheritDoc}
         */
        @Override
-       public void identityUpdated(Identity identity) {
-               /* TODO */
+       public void identityUpdated(final Identity identity) {
+               new Thread(new Runnable() {
+
+                       @Override
+                       @SuppressWarnings("synthetic-access")
+                       public void run() {
+                               Sone sone = getRemoteSone(identity.getId());
+                               soneDownloader.fetchSone(sone);
+                       }
+               }).start();
        }
 
        /**