Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Added ConnectionListener interface for contact list and supporting code.

Browse Source
This commit is contained in:
akwizgran
2013-02-22 17:36:37 +00:00
parent f0e9bcc164
commit 75cab35864
3 changed files with 81 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-api/src/net/sf/briar/api/transport/ConnectionListener.java Normal file
View File

@@ -0,0 +1,13 @@
package net.sf.briar.api.transport;
import net.sf.briar.api.ContactId;
/** An interface for listening for connection and disconnection events. */
public interface ConnectionListener {
/** Called when a contact connects and has no existing connections. */
void contactConnected(ContactId c);
/** Called when a contact disconnects and has no remaining connections. */
void contactDisconnected(ContactId c);
}

6
briar-api/src/net/sf/briar/api/transport/ConnectionRegistry.java
View File

@@ -10,9 +10,15 @@ import net.sf.briar.api.messaging.TransportId;
*/ */
public interface ConnectionRegistry { public interface ConnectionRegistry {
void addListener(ConnectionListener c);
void removeListener(ConnectionListener c);
void registerConnection(ContactId c, TransportId t); void registerConnection(ContactId c, TransportId t);
void unregisterConnection(ContactId c, TransportId t); void unregisterConnection(ContactId c, TransportId t);
Collection<ContactId> getConnectedContacts(TransportId t); Collection<ContactId> getConnectedContacts(TransportId t);
boolean isConnected(ContactId c);
} }

80
briar-core/src/net/sf/briar/transport/ConnectionRegistryImpl.java
View File

@@ -6,41 +6,81 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.messaging.TransportId; import net.sf.briar.api.messaging.TransportId;
import net.sf.briar.api.transport.ConnectionListener;
import net.sf.briar.api.transport.ConnectionRegistry; import net.sf.briar.api.transport.ConnectionRegistry;
class ConnectionRegistryImpl implements ConnectionRegistry { class ConnectionRegistryImpl implements ConnectionRegistry {
// Locking: this // Locking: this
private final Map<TransportId, Map<ContactId, Integer>> connections; private final Map<TransportId, Map<ContactId, Integer>> connections;
// Locking: this
private final Map<ContactId, Integer> contactCounts;
private final List<ConnectionListener> listeners;
ConnectionRegistryImpl() { ConnectionRegistryImpl() {
connections = new HashMap<TransportId, Map<ContactId, Integer>>(); connections = new HashMap<TransportId, Map<ContactId, Integer>>();
contactCounts = new HashMap<ContactId, Integer>();
listeners = new CopyOnWriteArrayList<ConnectionListener>();
} }
public synchronized void registerConnection(ContactId c, TransportId t) { public void addListener(ConnectionListener c) {
Map<ContactId, Integer> m = connections.get(t); listeners.add(c);
if(m == null) {
m = new HashMap<ContactId, Integer>();
connections.put(t, m);
}
Integer count = m.get(c);
if(count == null) m.put(c, 1);
else m.put(c, count + 1);
} }
public synchronized void unregisterConnection(ContactId c, TransportId t) { public void removeListener(ConnectionListener c) {
Map<ContactId, Integer> m = connections.get(t); listeners.remove(c);
if(m == null) throw new IllegalArgumentException(); }
Integer count = m.remove(c);
if(count == null) throw new IllegalArgumentException(); public void registerConnection(ContactId c, TransportId t) {
if(count == 1) { boolean firstConnection = false;
if(m.isEmpty()) connections.remove(t); synchronized(this) {
} else { Map<ContactId, Integer> m = connections.get(t);
m.put(c, count - 1); if(m == null) {
m = new HashMap<ContactId, Integer>();
connections.put(t, m);
}
Integer count = m.get(c);
if(count == null) m.put(c, 1);
else m.put(c, count + 1);
count = contactCounts.get(c);
if(count == null) {
firstConnection = true;
contactCounts.put(c, 1);
} else {
contactCounts.put(c, count + 1);
}
} }
if(firstConnection)
for(ConnectionListener l : listeners) l.contactConnected(c);
}
public void unregisterConnection(ContactId c, TransportId t) {
boolean lastConnection = false;
synchronized(this) {
Map<ContactId, Integer> m = connections.get(t);
if(m == null) throw new IllegalArgumentException();
Integer count = m.remove(c);
if(count == null) throw new IllegalArgumentException();
if(count == 1) {
if(m.isEmpty()) connections.remove(t);
} else {
m.put(c, count - 1);
}
count = contactCounts.get(c);
if(count == null) throw new IllegalArgumentException();
if(count == 1) {
lastConnection = true;
contactCounts.remove(c);
} else {
contactCounts.put(c, count - 1);
}
}
if(lastConnection)
for(ConnectionListener l : listeners) l.contactDisconnected(c);
} }
public synchronized Collection<ContactId> getConnectedContacts( public synchronized Collection<ContactId> getConnectedContacts(
@@ -50,4 +90,8 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
List<ContactId> keys = new ArrayList<ContactId>(m.keySet()); List<ContactId> keys = new ArrayList<ContactId>(m.keySet());
return Collections.unmodifiableList(keys); return Collections.unmodifiableList(keys);
} }
public synchronized boolean isConnected(ContactId c) {
return contactCounts.containsKey(c);
}
} }