X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=fc77b2da82b76939b9c4742d5253aec95d6803be;hp=e6fa3bed0c6432ff0a6e5fba1bde9f5da2b15e01;hb=8c1a4ad1d3f11ba0a11a077c47df48425360e0ac;hpb=ed021c5354d1e31a407d1446b5baaae9bea66ef9
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 e6fa3be..fc77b2d 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -27,16 +27,25 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.freenet.plugin.PluginException;
+import net.pterodactylus.sone.freenet.wot.event.IdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityRemovedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityUpdatedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityRemovedEvent;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.service.AbstractService;
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
/**
* The identity manager takes care of loading and storing identities, their
* contexts, and properties. It does so in a way that does not expose errors via
* exceptions but it only logs them and tries to return sensible defaults.
*
* It is also responsible for polling identities from the Web of Trust plugin
- * and notifying registered {@link IdentityListener}s when {@link Identity}s and
+ * and sending events to the {@link EventBus} when {@link Identity}s and
* {@link OwnIdentity}s are discovered or disappearing.
*
* @author David âBombeâ Roden
@@ -52,8 +61,8 @@ public class IdentityManager extends AbstractService {
/** The logger. */
private static final Logger logger = Logging.getLogger(IdentityManager.class);
- /** The event manager. */
- private final IdentityListenerManager identityListenerManager = new IdentityListenerManager();
+ /** The event bus. */
+ private final EventBus eventBus;
/** The Web of Trust connector. */
private final WebOfTrustConnector webOfTrustConnector;
@@ -63,52 +72,45 @@ public class IdentityManager extends AbstractService {
/** The currently known own identities. */
/* synchronize access on syncObject. */
- private Map currentOwnIdentities = new HashMap();
+ private final Map currentOwnIdentities = new HashMap();
+
+ /** The last time all identities were loaded. */
+ private volatile long identitiesLastLoaded;
/**
* Creates a new identity manager.
*
+ * @param eventBus
+ * The event bus
* @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, String context) {
+ @Inject
+ public IdentityManager(EventBus eventBus, WebOfTrustConnector webOfTrustConnector, @Named("WebOfTrustContext") String context) {
super("Sone Identity Manager", false);
+ this.eventBus = eventBus;
this.webOfTrustConnector = webOfTrustConnector;
this.context = context;
}
//
- // LISTENER MANAGEMENT
+ // ACCESSORS
//
/**
- * Adds a listener for identity events.
+ * Returns the last time all identities were loaded.
*
- * @param identityListener
- * The listener to add
+ * @return The last time all identities were loaded (in milliseconds since
+ * Jan 1, 1970 UTC)
*/
- public void addIdentityListener(IdentityListener identityListener) {
- identityListenerManager.addListener(identityListener);
+ public long getIdentitiesLastLoaded() {
+ return identitiesLastLoaded;
}
/**
- * Removes a listener for identity events.
- *
- * @param identityListener
- * The listener to remove
- */
- public void removeIdentityListener(IdentityListener identityListener) {
- identityListenerManager.removeListener(identityListener);
- }
-
- //
- // ACCESSORS
- //
-
- /**
* Returns whether the Web of Trust plugin could be reached during the last
* try.
*
@@ -173,19 +175,26 @@ public class IdentityManager extends AbstractService {
/* load trusted identities. */
for (OwnIdentity ownIdentity : ownIdentities) {
+ currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
+ Map identities = new HashMap();
+ 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 trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context);
- Map identities = new HashMap();
- 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);
}
@@ -201,7 +210,7 @@ public class IdentityManager extends AbstractService {
/* find new identities. */
for (Identity currentIdentity : currentIdentities.get(ownIdentity).values()) {
if (!oldIdentities.containsKey(ownIdentity) || !oldIdentities.get(ownIdentity).containsKey(currentIdentity.getId())) {
- identityListenerManager.fireIdentityAdded(ownIdentity, currentIdentity);
+ eventBus.post(new IdentityAddedEvent(ownIdentity, currentIdentity));
}
}
@@ -209,7 +218,7 @@ public class IdentityManager extends AbstractService {
if (oldIdentities.containsKey(ownIdentity)) {
for (Identity oldIdentity : oldIdentities.get(ownIdentity).values()) {
if (!currentIdentities.get(ownIdentity).containsKey(oldIdentity.getId())) {
- identityListenerManager.fireIdentityRemoved(ownIdentity, oldIdentity);
+ eventBus.post(new IdentityRemovedEvent(ownIdentity, oldIdentity));
}
}
@@ -222,12 +231,12 @@ public class IdentityManager extends AbstractService {
Set oldContexts = oldIdentity.getContexts();
Set newContexts = newIdentity.getContexts();
if (oldContexts.size() != newContexts.size()) {
- identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+ eventBus.post(new IdentityUpdatedEvent(ownIdentity, newIdentity));
continue;
}
for (String oldContext : oldContexts) {
if (!newContexts.contains(oldContext)) {
- identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+ eventBus.post(new IdentityUpdatedEvent(ownIdentity, newIdentity));
break;
}
}
@@ -242,12 +251,12 @@ public class IdentityManager extends AbstractService {
Map oldProperties = oldIdentity.getProperties();
Map newProperties = newIdentity.getProperties();
if (oldProperties.size() != newProperties.size()) {
- identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+ eventBus.post(new IdentityUpdatedEvent(ownIdentity, newIdentity));
continue;
}
for (Entry oldProperty : oldProperties.entrySet()) {
if (!newProperties.containsKey(oldProperty.getKey()) || !newProperties.get(oldProperty.getKey()).equals(oldProperty.getValue())) {
- identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+ eventBus.post(new IdentityUpdatedEvent(ownIdentity, newIdentity));
break;
}
}
@@ -282,7 +291,7 @@ public class IdentityManager extends AbstractService {
for (OwnIdentity oldOwnIdentity : currentOwnIdentities.values()) {
OwnIdentity newOwnIdentity = newOwnIdentities.get(oldOwnIdentity.getId());
if ((newOwnIdentity == null) || ((context != null) && oldOwnIdentity.hasContext(context) && !newOwnIdentity.hasContext(context))) {
- identityListenerManager.fireOwnIdentityRemoved(new DefaultOwnIdentity(oldOwnIdentity));
+ eventBus.post(new OwnIdentityRemovedEvent(new DefaultOwnIdentity(oldOwnIdentity)));
}
}
@@ -290,7 +299,7 @@ public class IdentityManager extends AbstractService {
for (OwnIdentity currentOwnIdentity : newOwnIdentities.values()) {
OwnIdentity oldOwnIdentity = currentOwnIdentities.get(currentOwnIdentity.getId());
if (((oldOwnIdentity == null) && ((context == null) || currentOwnIdentity.hasContext(context))) || ((oldOwnIdentity != null) && (context != null) && (!oldOwnIdentity.hasContext(context) && currentOwnIdentity.hasContext(context)))) {
- identityListenerManager.fireOwnIdentityAdded(new DefaultOwnIdentity(currentOwnIdentity));
+ eventBus.post(new OwnIdentityAddedEvent(new DefaultOwnIdentity(currentOwnIdentity)));
}
}