Update trust values in a dedicated background thread.

This will decouple Sone’s web interface from WoT’s excessive (b)locking.

diff --combined src/main/java/net/pterodactylus/sone/core/Core.java
index 886da4b,d496c35..9a40e5c
--- 1/src/main/java/net/pterodactylus/sone/core/Core.java
--- 2/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@@ -112,6 -112,9 +112,9 @@@ public class Core extends AbstractServi
        /** The update checker. */
        private final UpdateChecker updateChecker;
  
+       /** The trust updater. */
+       private final TrustUpdater trustUpdater;
+ 
        /** The FCP interface. */
        private volatile FcpInterface fcpInterface;
  
@@@ -185,7 -188,7 +188,7 @@@
         * @param identityManager
         *            The identity manager
         */
-       public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager) {
+       public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, TrustUpdater trustUpdater) {
                super("Sone Core");
                this.configuration = configuration;
                this.freenetInterface = freenetInterface;
@@@ -193,6 -196,7 +196,7 @@@
                this.soneDownloader = new SoneDownloader(this, freenetInterface);
                this.imageInserter = new ImageInserter(this, freenetInterface);
                this.updateChecker = new UpdateChecker(freenetInterface);
+               this.trustUpdater = trustUpdater;
        }
  
        //
@@@ -1054,6 -1058,7 +1058,7 @@@
                        logger.log(Level.WARNING, String.format("Tried to get trust from remote Sone: %s", origin));
                        return null;
                }
+               trustUpdater.getTrust((OwnIdentity) origin.getIdentity(), target.getIdentity());
                return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
        }
  
@@@ -1069,11 -1074,7 +1074,7 @@@
         */
        public void setTrust(Sone origin, Sone target, int trustValue) {
                Validation.begin().isNotNull("Trust Origin", origin).check().isInstanceOf("Trust Origin", origin.getIdentity(), OwnIdentity.class).isNotNull("Trust Target", target).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
-               try {
-                       ((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment());
-               } catch (WebOfTrustException wote1) {
-                       logger.log(Level.WARNING, String.format("Could not set trust for Sone: %s", target), wote1);
-               }
+               trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
        }
  
        /**
@@@ -1086,11 -1087,7 +1087,7 @@@
         */
        public void removeTrust(Sone origin, Sone target) {
                Validation.begin().isNotNull("Trust Origin", origin).isNotNull("Trust Target", target).check().isInstanceOf("Trust Origin Identity", origin.getIdentity(), OwnIdentity.class).check();
-               try {
-                       ((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
-               } catch (WebOfTrustException wote1) {
-                       logger.log(Level.WARNING, String.format("Could not remove trust for Sone: %s", target), wote1);
-               }
+               trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
        }
  
        /**
@@@ -1967,6 -1964,7 +1964,7 @@@
                loadConfiguration();
                updateChecker.addUpdateListener(this);
                updateChecker.start();
+               trustUpdater.start();
        }
  
        /**
@@@ -1999,6 -1997,7 +1997,7 @@@
                                soneInserter.stop();
                        }
                }
+               trustUpdater.stop();
                updateChecker.stop();
                updateChecker.removeUpdateListener(this);
                soneDownloader.stop();
@@@ -2174,6 -2173,9 +2173,6 @@@
                        configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
                        configuration.getBooleanValue("Option/ActivateFcpInterface").setValue(options.getBooleanOption("ActivateFcpInterface").getReal());
                        configuration.getIntValue("Option/FcpFullAccessRequired").setValue(options.getIntegerOption("FcpFullAccessRequired").getReal());
 -                      configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
 -                      configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
 -                      configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
  
                        /* save known Sones. */
                        int soneCounter = 0;
@@@ -2273,6 -2275,20 +2272,6 @@@
                        }
  
                }));
 -              options.addBooleanOption("SoneRescueMode", new DefaultOption<Boolean>(false));
 -              options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
 -              options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
 -
 -              /* read options from configuration. */
 -              options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
 -              options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
 -              boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
 -              options.getBooleanOption("ClearOnNextRestart").set(null);
 -              options.getBooleanOption("ReallyClearOnNextRestart").set(null);
 -              if (clearConfiguration) {
 -                      /* stop loading the configuration. */
 -                      return;
 -              }
  
                loadConfigurationValue("InsertionDelay");
                loadConfigurationValue("PostsPerPage");
@@@ -2285,6 -2301,7 +2284,6 @@@
                options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
                options.getBooleanOption("ActivateFcpInterface").set(configuration.getBooleanValue("Option/ActivateFcpInterface").getValue(null));
                options.getIntegerOption("FcpFullAccessRequired").set(configuration.getIntValue("Option/FcpFullAccessRequired").getValue(null));
 -              options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
  
                /* load known Sones. */
                int soneCounter = 0;
@@@ -2922,6 -2939,58 +2921,6 @@@
                        return this;
                }
  
 -              /**
 -               * Returns whether Sone should clear its settings on the next restart.
 -               * In order to be effective, {@link #isReallyClearOnNextRestart()} needs
 -               * to return {@code true} as well!
 -               *
 -               * @return {@code true} if Sone should clear its settings on the next
 -               *         restart, {@code false} otherwise
 -               */
 -              public boolean isClearOnNextRestart() {
 -                      return options.getBooleanOption("ClearOnNextRestart").get();
 -              }
 -
 -              /**
 -               * Sets whether Sone will clear its settings on the next restart.
 -               *
 -               * @param clearOnNextRestart
 -               *            {@code true} if Sone should clear its settings on the next
 -               *            restart, {@code false} otherwise
 -               * @return This preferences
 -               */
 -              public Preferences setClearOnNextRestart(Boolean clearOnNextRestart) {
 -                      options.getBooleanOption("ClearOnNextRestart").set(clearOnNextRestart);
 -                      return this;
 -              }
 -
 -              /**
 -               * Returns whether Sone should really clear its settings on next
 -               * restart. This is a confirmation option that needs to be set in
 -               * addition to {@link #isClearOnNextRestart()} in order to clear Sone’s
 -               * settings on the next restart.
 -               *
 -               * @return {@code true} if Sone should really clear its settings on the
 -               *         next restart, {@code false} otherwise
 -               */
 -              public boolean isReallyClearOnNextRestart() {
 -                      return options.getBooleanOption("ReallyClearOnNextRestart").get();
 -              }
 -
 -              /**
 -               * Sets whether Sone should really clear its settings on the next
 -               * restart.
 -               *
 -               * @param reallyClearOnNextRestart
 -               *            {@code true} if Sone should really clear its settings on
 -               *            the next restart, {@code false} otherwise
 -               * @return This preferences
 -               */
 -              public Preferences setReallyClearOnNextRestart(Boolean reallyClearOnNextRestart) {
 -                      options.getBooleanOption("ReallyClearOnNextRestart").set(reallyClearOnNextRestart);
 -                      return this;
 -              }
 -
        }
  
  }