Merge branch 'next' into new-database-38

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / IdentityManager.java

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
index 3c3c9f9..568a637 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -59,21 +59,28 @@ public class IdentityManager extends AbstractService {
        private final WebOfTrustConnector webOfTrustConnector;
 
        /** The context to filter for. */
-       private volatile String context;
+       private final String context;
 
        /** The currently known own identities. */
        /* synchronize access on syncObject. */
-       private Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
+       private final Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
+
+       /** The last time all identities were loaded. */
+       private volatile long identitiesLastLoaded;
 
        /**
         * Creates a new identity manager.
         *
         * @param webOfTrustConnector
         *            The Web of Trust connector
+        * @param context
+        *            The context to focus on (may be {@code null} to ignore
+        *            contexts)
         */
-       public IdentityManager(WebOfTrustConnector webOfTrustConnector) {
+       public IdentityManager(WebOfTrustConnector webOfTrustConnector, String context) {
                super("Sone Identity Manager", false);
                this.webOfTrustConnector = webOfTrustConnector;
+               this.context = context;
        }
 
        //
@@ -105,13 +112,13 @@ public class IdentityManager extends AbstractService {
        //
 
        /**
-        * Sets the context to filter own identities and trusted identities for.
+        * Returns the last time all identities were loaded.
         *
-        * @param context
-        *            The context to filter for, or {@code null} to not filter
+        * @return The last time all identities were loaded (in milliseconds since
+        *         Jan 1, 1970 UTC)
         */
-       public void setContext(String context) {
-               this.context = context;
+       public long getIdentitiesLastLoaded() {
+               return identitiesLastLoaded;
        }
 
        /**
@@ -179,19 +186,23 @@ public class IdentityManager extends AbstractService {
 
                                /* load trusted identities. */
                                for (OwnIdentity ownIdentity : ownIdentities) {
+                                       currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
+                                       Map<String, Identity> identities = new HashMap<String, Identity>();
+                                       currentIdentities.put(ownIdentity, identities);
+
+                                       /* if the context doesn’t match, skip getting trusted identities. */
                                        if ((context != null) && !ownIdentity.hasContext(context)) {
                                                continue;
                                        }
-                                       currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
 
+                                       /* load trusted identities. */
                                        Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context);
-                                       Map<String, Identity> identities = new HashMap<String, Identity>();
-                                       currentIdentities.put(ownIdentity, identities);
                                        for (Identity identity : trustedIdentities) {
                                                identities.put(identity.getId(), identity);
                                        }
                                }
                                identitiesLoaded = true;
+                               identitiesLastLoaded = System.currentTimeMillis();
                        } catch (WebOfTrustException wote1) {
                                logger.log(Level.WARNING, "WoT has disappeared!", wote1);
                        }