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

Merged clock and os packages, moved events into their own package.

Browse Source
This commit is contained in:
akwizgran
2014-01-08 15:45:02 +00:00
parent 58da9c2265
commit dce70f487c
89 changed files with 288 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/net/sf/briar/android/AndroidFileUtils.java
View File

@@ -3,7 +3,7 @@ package net.sf.briar.android;
import java.io.File;
import java.io.IOException;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.FileUtils;
import android.os.Build;
import android.os.StatFs;

2
briar-android/src/net/sf/briar/android/AndroidModule.java
View File

@@ -23,12 +23,12 @@ import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginConfig;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.plugins.simplex.SimplexPluginConfig;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.api.ui.UiCallback;
import net.sf.briar.plugins.droidtooth.DroidtoothPluginFactory;
import net.sf.briar.plugins.tcp.DroidLanTcpPluginFactory;

16
briar-android/src/net/sf/briar/android/contact/ContactListActivity.java
View File

@@ -29,12 +29,12 @@ import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.event.ContactAddedEvent;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.event.ContactAddedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.transport.ConnectionListener;
@@ -51,7 +51,7 @@ import android.widget.LinearLayout;
import android.widget.ListView;
public class ContactListActivity extends RoboActivity
implements OnClickListener, OnItemClickListener, DatabaseListener,
implements OnClickListener, OnItemClickListener, EventListener,
ConnectionListener {
private static final Logger LOG =
@@ -219,7 +219,7 @@ ConnectionListener {
startActivity(i);
}
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof ContactAddedEvent) {
loadContacts();
} else if(e instanceof ContactRemovedEvent) {

14
briar-android/src/net/sf/briar/android/contact/ConversationActivity.java
View File

@@ -25,11 +25,11 @@ import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import roboguice.activity.RoboActivity;
@@ -44,7 +44,7 @@ import android.widget.LinearLayout;
import android.widget.ListView;
public class ConversationActivity extends RoboActivity
implements DatabaseListener, OnClickListener, OnItemClickListener {
implements EventListener, OnClickListener, OnItemClickListener {
private static final Logger LOG =
Logger.getLogger(ConversationActivity.class.getName());
@@ -196,7 +196,7 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
db.removeListener(this);
}
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof ContactRemovedEvent) {
ContactRemovedEvent c = (ContactRemovedEvent) e;
if(c.getContactId().equals(contactId)) {

14
briar-android/src/net/sf/briar/android/groups/GroupActivity.java
View File

@@ -27,11 +27,11 @@ import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import roboguice.activity.RoboActivity;
@@ -45,7 +45,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ListView;
public class GroupActivity extends RoboActivity implements DatabaseListener,
public class GroupActivity extends RoboActivity implements EventListener,
OnClickListener, OnItemClickListener {
private static final Logger LOG =
@@ -186,7 +186,7 @@ OnClickListener, OnItemClickListener {
db.removeListener(this);
}
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof MessageAddedEvent) {
if(((MessageAddedEvent) e).getGroup().getId().equals(groupId)) {
if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading");

18
briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
View File

@@ -31,13 +31,13 @@ import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.SubscriptionAddedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
@@ -54,7 +54,7 @@ import android.widget.LinearLayout;
import android.widget.ListView;
public class GroupListActivity extends RoboFragmentActivity
implements DatabaseListener, OnClickListener, OnItemClickListener {
implements EventListener, OnClickListener, OnItemClickListener {
private static final Logger LOG =
Logger.getLogger(GroupListActivity.class.getName());
@@ -238,7 +238,7 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
db.removeListener(this);
}
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof MessageAddedEvent) {
Group g = ((MessageAddedEvent) e).getGroup();
if(groups.containsKey(g.getId())) {

14
briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java
View File

@@ -16,11 +16,11 @@ import net.sf.briar.android.util.ListLoadingProgressBar;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.SubscriptionAddedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupStatus;
@@ -33,7 +33,7 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.ListView;
public class ManageGroupsActivity extends RoboFragmentActivity
implements DatabaseListener, OnItemClickListener {
implements EventListener, OnItemClickListener {
private static final Logger LOG =
Logger.getLogger(ManageGroupsActivity.class.getName());
@@ -111,7 +111,7 @@ implements DatabaseListener, OnItemClickListener {
db.removeListener(this);
}
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof RemoteSubscriptionsUpdatedEvent) {
if(LOG.isLoggable(INFO))
LOG.info("Remote subscriptions changed, reloading");

2
briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -28,11 +28,11 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import net.sf.briar.util.LatchedReference;
import net.sf.briar.util.StringUtils;
import android.bluetooth.BluetoothAdapter;

4
briar-android/src/net/sf/briar/plugins/droidtooth/DroidtoothPluginFactory.java
View File

@@ -5,11 +5,11 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import android.content.Context;
public class DroidtoothPluginFactory implements DuplexPluginFactory {

2
briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPlugin.java
View File

@@ -4,10 +4,10 @@ import static android.content.Context.WIFI_SERVICE;
import java.util.concurrent.Executor;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.MulticastLock;

4
briar-android/src/net/sf/briar/plugins/tcp/DroidLanTcpPluginFactory.java
View File

@@ -3,11 +3,11 @@ package net.sf.briar.plugins.tcp;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import android.content.Context;
public class DroidLanTcpPluginFactory implements DuplexPluginFactory {

6
briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
View File

@@ -12,7 +12,7 @@ import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
@@ -43,10 +43,10 @@ public interface DatabaseComponent {
void close() throws DbException, IOException;
/** Adds a listener to be notified when database events occur. */
void addListener(DatabaseListener d);
void addListener(EventListener d);
/** Removes a listener. */
void removeListener(DatabaseListener d);
void removeListener(EventListener d);
/**
* Stores a contact associated with the given local and remote pseudonyms,

6
briar-api/src/net/sf/briar/api/db/event/DatabaseEvent.java
View File

@@ -1,6 +0,0 @@
package net.sf.briar.api.db.event;
/** An abstract superclass for database events. */
public abstract class DatabaseEvent {
}

7
briar-api/src/net/sf/briar/api/db/event/DatabaseListener.java
View File

@@ -1,7 +0,0 @@
package net.sf.briar.api.db.event;
/** An interface for receiving notifications when database events occur. */
public interface DatabaseListener {
void eventOccurred(DatabaseEvent e);
}

9
briar-api/src/net/sf/briar/api/db/event/LocalTransportsUpdatedEvent.java
View File

@@ -1,9 +0,0 @@
package net.sf.briar.api.db.event;
/**
* An event that is broadcast when the local transport properties are
* updated.
*/
public class LocalTransportsUpdatedEvent extends DatabaseEvent {
}

4
briar-api/src/net/sf/briar/api/db/event/ContactAddedEvent.java → briar-api/src/net/sf/briar/api/event/ContactAddedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
/** An event that is broadcast when a contact is added. */
public class ContactAddedEvent extends DatabaseEvent {
public class ContactAddedEvent extends Event {
private final ContactId contactId;

4
briar-api/src/net/sf/briar/api/db/event/ContactRemovedEvent.java → briar-api/src/net/sf/briar/api/event/ContactRemovedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
/** An event that is broadcast when a contact is removed. */
public class ContactRemovedEvent extends DatabaseEvent {
public class ContactRemovedEvent extends Event {
private final ContactId contactId;

6
briar-api/src/net/sf/briar/api/event/Event.java Normal file
View File

@@ -0,0 +1,6 @@
package net.sf.briar.api.event;
/** An abstract superclass for events. */
public abstract class Event {
}

7
briar-api/src/net/sf/briar/api/event/EventListener.java Normal file
View File

@@ -0,0 +1,7 @@
package net.sf.briar.api.event;
/** An interface for receiving notifications when events occur. */
public interface EventListener {
void eventOccurred(Event e);
}

4
briar-api/src/net/sf/briar/api/db/event/LocalAuthorAddedEvent.java → briar-api/src/net/sf/briar/api/event/LocalAuthorAddedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.AuthorId;
/** An event that is broadcast when a local pseudonym is added. */
public class LocalAuthorAddedEvent extends DatabaseEvent {
public class LocalAuthorAddedEvent extends Event {
private final AuthorId authorId;

4
briar-api/src/net/sf/briar/api/db/event/LocalAuthorRemovedEvent.java → briar-api/src/net/sf/briar/api/event/LocalAuthorRemovedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.AuthorId;
/** An event that is broadcast when a local pseudonym is removed. */
public class LocalAuthorRemovedEvent extends DatabaseEvent {
public class LocalAuthorRemovedEvent extends Event {
private final AuthorId authorId;

4
briar-api/src/net/sf/briar/api/db/event/LocalSubscriptionsUpdatedEvent.java → briar-api/src/net/sf/briar/api/event/LocalSubscriptionsUpdatedEvent.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import java.util.Collection;
@@ -8,7 +8,7 @@ import net.sf.briar.api.ContactId;
* An event that is broadcast when the set of subscriptions visible to one or
* more contacts is updated.
*/
public class LocalSubscriptionsUpdatedEvent extends DatabaseEvent {
public class LocalSubscriptionsUpdatedEvent extends Event {
private final Collection<ContactId> affected;

9
briar-api/src/net/sf/briar/api/event/LocalTransportsUpdatedEvent.java Normal file
View File

@@ -0,0 +1,9 @@
package net.sf.briar.api.event;
/**
* An event that is broadcast when the local transport properties are
* updated.
*/
public class LocalTransportsUpdatedEvent extends Event {
}

4
briar-api/src/net/sf/briar/api/db/event/MessageAddedEvent.java → briar-api/src/net/sf/briar/api/event/MessageAddedEvent.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.messaging.Group;
/** An event that is broadcast when a message is added to the database. */
public class MessageAddedEvent extends DatabaseEvent {
public class MessageAddedEvent extends Event {
private final Group group;
private final ContactId contactId;

4
briar-api/src/net/sf/briar/api/db/event/MessageExpiredEvent.java → briar-api/src/net/sf/briar/api/event/MessageExpiredEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
/**
* An event that is broadcast when one or messages expire from the database,
* potentially changing the database's retention time.
*/
public class MessageExpiredEvent extends DatabaseEvent {
public class MessageExpiredEvent extends Event {
}

4
briar-api/src/net/sf/briar/api/db/event/MessageRequestedEvent.java → briar-api/src/net/sf/briar/api/event/MessageRequestedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
/** An event that is broadcast when a message is requested by a contact. */
public class MessageRequestedEvent extends DatabaseEvent {
public class MessageRequestedEvent extends Event {
private final ContactId contactId;

6
briar-api/src/net/sf/briar/api/db/event/MessageToAckEvent.java → briar-api/src/net/sf/briar/api/event/MessageToAckEvent.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
/**
* An event that is broadcast when a message is received or offered from a
* An event that is broadcast when a message is received from or offered by a
* contact and needs to be acknowledged.
*/
public class MessageToAckEvent extends DatabaseEvent {
public class MessageToAckEvent extends Event {
private final ContactId contactId;

4
briar-api/src/net/sf/briar/api/db/event/MessageToRequestEvent.java → briar-api/src/net/sf/briar/api/event/MessageToRequestEvent.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
@@ -6,7 +6,7 @@ import net.sf.briar.api.ContactId;
* An event that is broadcast when a message is offered by a contact and needs
* to be requested.
*/
public class MessageToRequestEvent extends DatabaseEvent {
public class MessageToRequestEvent extends Event {
private final ContactId contactId;

4
briar-api/src/net/sf/briar/api/db/event/RemoteRetentionTimeUpdatedEvent.java → briar-api/src/net/sf/briar/api/event/RemoteRetentionTimeUpdatedEvent.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
@@ -6,7 +6,7 @@ import net.sf.briar.api.ContactId;
* An event that is broadcast when the retention time of a contact's database
* changes.
*/
public class RemoteRetentionTimeUpdatedEvent extends DatabaseEvent {
public class RemoteRetentionTimeUpdatedEvent extends Event {
private final ContactId contactId;

4
briar-api/src/net/sf/briar/api/db/event/RemoteSubscriptionsUpdatedEvent.java → briar-api/src/net/sf/briar/api/event/RemoteSubscriptionsUpdatedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
/** An event that is broadcast when a contact's subscriptions are updated. */
public class RemoteSubscriptionsUpdatedEvent extends DatabaseEvent {
public class RemoteSubscriptionsUpdatedEvent extends Event {
private final ContactId contactId;

4
briar-api/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java → briar-api/src/net/sf/briar/api/event/RemoteTransportsUpdatedEvent.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
@@ -7,7 +7,7 @@ import net.sf.briar.api.TransportId;
* An event that is broadcast when a contact's remote transport properties
* are updated.
*/
public class RemoteTransportsUpdatedEvent extends DatabaseEvent {
public class RemoteTransportsUpdatedEvent extends Event {
private final ContactId contactId;
private final TransportId transportId;

4
briar-api/src/net/sf/briar/api/db/event/SubscriptionAddedEvent.java → briar-api/src/net/sf/briar/api/event/SubscriptionAddedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.messaging.Group;
/** An event that is broadcast when the user subscribes to a group. */
public class SubscriptionAddedEvent extends DatabaseEvent {
public class SubscriptionAddedEvent extends Event {
private final Group group;

4
briar-api/src/net/sf/briar/api/db/event/SubscriptionRemovedEvent.java → briar-api/src/net/sf/briar/api/event/SubscriptionRemovedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.messaging.Group;
/** An event that is broadcast when the user unsubscribes from a group. */
public class SubscriptionRemovedEvent extends DatabaseEvent {
public class SubscriptionRemovedEvent extends Event {
private final Group group;

6
briar-api/src/net/sf/briar/api/db/event/TransportAddedEvent.java → briar-api/src/net/sf/briar/api/event/TransportAddedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.TransportId;
/** An event that is broadcast when a transport is added to the database. */
public class TransportAddedEvent extends DatabaseEvent {
/** An event that is broadcast when a transport is added. */
public class TransportAddedEvent extends Event {
private final TransportId transportId;
private final long maxLatency;

4
briar-api/src/net/sf/briar/api/db/event/TransportRemovedEvent.java → briar-api/src/net/sf/briar/api/event/TransportRemovedEvent.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.api.db.event;
package net.sf.briar.api.event;
import net.sf.briar.api.TransportId;
/** An event that is broadcast when a transport is removed. */
public class TransportRemovedEvent extends DatabaseEvent {
public class TransportRemovedEvent extends Event {
private final TransportId transportId;

2
briar-api/src/net/sf/briar/api/clock/Clock.java → briar-api/src/net/sf/briar/api/system/Clock.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.clock;
package net.sf.briar.api.system;
/**
* An interface for time-related system functions that allows them to be

2
briar-api/src/net/sf/briar/api/os/FileUtils.java → briar-api/src/net/sf/briar/api/system/FileUtils.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.os;
package net.sf.briar.api.system;
import java.io.File;
import java.io.IOException;

2
briar-api/src/net/sf/briar/api/clock/SystemClock.java → briar-api/src/net/sf/briar/api/system/SystemClock.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.clock;
package net.sf.briar.api.system;
/** Default clock implementation. */
public class SystemClock implements Clock {

2
briar-api/src/net/sf/briar/api/clock/SystemTimer.java → briar-api/src/net/sf/briar/api/system/SystemTimer.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.clock;
package net.sf.briar.api.system;
import java.util.TimerTask;

2
briar-api/src/net/sf/briar/api/clock/Timer.java → briar-api/src/net/sf/briar/api/system/Timer.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.clock;
package net.sf.briar.api.system;
import java.util.TimerTask;

2
briar-core/src/net/sf/briar/db/DatabaseCleanerImpl.java
View File

@@ -8,9 +8,9 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.system.Timer;
class DatabaseCleanerImpl extends TimerTask implements DatabaseCleaner {

54
briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -30,7 +30,6 @@ import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.ContactExistsException;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
@@ -41,26 +40,26 @@ import net.sf.briar.api.db.NoSuchLocalAuthorException;
import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.db.NoSuchTransportException;
import net.sf.briar.api.db.event.ContactAddedEvent;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.LocalAuthorAddedEvent;
import net.sf.briar.api.db.event.LocalAuthorRemovedEvent;
import net.sf.briar.api.db.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.MessageRequestedEvent;
import net.sf.briar.api.db.event.MessageToAckEvent;
import net.sf.briar.api.db.event.MessageToRequestEvent;
import net.sf.briar.api.db.event.RemoteRetentionTimeUpdatedEvent;
import net.sf.briar.api.db.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.RemoteTransportsUpdatedEvent;
import net.sf.briar.api.db.event.SubscriptionAddedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.db.event.TransportAddedEvent;
import net.sf.briar.api.db.event.TransportRemovedEvent;
import net.sf.briar.api.event.ContactAddedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.LocalAuthorAddedEvent;
import net.sf.briar.api.event.LocalAuthorRemovedEvent;
import net.sf.briar.api.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.MessageRequestedEvent;
import net.sf.briar.api.event.MessageToAckEvent;
import net.sf.briar.api.event.MessageToRequestEvent;
import net.sf.briar.api.event.RemoteRetentionTimeUpdatedEvent;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.RemoteTransportsUpdatedEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.event.TransportAddedEvent;
import net.sf.briar.api.event.TransportRemovedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Group;
@@ -76,6 +75,7 @@ import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
@@ -117,8 +117,8 @@ DatabaseCleaner.Callback {
private final ShutdownManager shutdown;
private final Clock clock;
private final Collection<DatabaseListener> listeners =
new CopyOnWriteArrayList<DatabaseListener>();
private final Collection<EventListener> listeners =
new CopyOnWriteArrayList<EventListener>();
private final Object spaceLock = new Object();
private long bytesStoredSinceLastCheck = 0; // Locking: spaceLock
@@ -174,11 +174,11 @@ DatabaseCleaner.Callback {
}
}
public void addListener(DatabaseListener d) {
public void addListener(EventListener d) {
listeners.add(d);
}
public void removeListener(DatabaseListener d) {
public void removeListener(EventListener d) {
listeners.remove(d);
}
@@ -237,8 +237,8 @@ DatabaseCleaner.Callback {
}
/** Notifies all listeners of a database event. */
private void callListeners(DatabaseEvent e) {
for(DatabaseListener d : listeners) d.eventOccurred(e);
private void callListeners(Event e) {
for(EventListener d : listeners) d.eventOccurred(e);
}
public void addEndpoint(Endpoint ep) throws DbException {

6
briar-core/src/net/sf/briar/db/DatabaseModule.java
View File

@@ -12,14 +12,14 @@ import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.api.system.SystemClock;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

4
briar-core/src/net/sf/briar/db/H2Database.java
View File

@@ -10,10 +10,10 @@ import java.util.Properties;
import javax.inject.Inject;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.util.StringUtils;
/** Contains all the H2-specific code for the database. */

2
briar-core/src/net/sf/briar/db/JdbcDatabase.java
View File

@@ -32,7 +32,6 @@ import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
@@ -47,6 +46,7 @@ import net.sf.briar.api.messaging.SubscriptionAck;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportAck;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;

2
briar-core/src/net/sf/briar/invitation/AliceConnector.java
View File

@@ -15,7 +15,6 @@ import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.PseudoRandom;
@@ -28,6 +27,7 @@ import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;

2
briar-core/src/net/sf/briar/invitation/BobConnector.java
View File

@@ -15,7 +15,6 @@ import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.PseudoRandom;
@@ -28,6 +27,7 @@ import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;

2
briar-core/src/net/sf/briar/invitation/Connector.java
View File

@@ -30,7 +30,6 @@ import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.UniqueId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.KeyPair;
@@ -50,6 +49,7 @@ import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;

2
briar-core/src/net/sf/briar/invitation/ConnectorGroup.java
View File

@@ -18,7 +18,6 @@ import net.sf.briar.api.AuthorId;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.PseudoRandom;
@@ -32,6 +31,7 @@ import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;

2
briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java
View File

@@ -4,7 +4,6 @@ import javax.inject.Inject;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
@@ -14,6 +13,7 @@ import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;

2
briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java
View File

@@ -7,7 +7,6 @@ import java.security.GeneralSecurityException;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.MessageDigest;
@@ -17,6 +16,7 @@ import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.system.Clock;
class MessageVerifierImpl implements MessageVerifier {

30
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java
View File

@@ -20,19 +20,19 @@ import net.sf.briar.api.FormatException;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
import net.sf.briar.api.db.event.MessageRequestedEvent;
import net.sf.briar.api.db.event.MessageToAckEvent;
import net.sf.briar.api.db.event.MessageToRequestEvent;
import net.sf.briar.api.db.event.RemoteRetentionTimeUpdatedEvent;
import net.sf.briar.api.db.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.RemoteTransportsUpdatedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.MessageRequestedEvent;
import net.sf.briar.api.event.MessageToAckEvent;
import net.sf.briar.api.event.MessageToRequestEvent;
import net.sf.briar.api.event.RemoteRetentionTimeUpdatedEvent;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.RemoteTransportsUpdatedEvent;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageVerifier;
@@ -58,7 +58,7 @@ import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.util.ByteUtils;
abstract class DuplexConnection implements DatabaseListener {
abstract class DuplexConnection implements EventListener {
private static final Logger LOG =
Logger.getLogger(DuplexConnection.class.getName());
@@ -122,7 +122,7 @@ abstract class DuplexConnection implements DatabaseListener {
protected abstract ConnectionWriter createConnectionWriter()
throws IOException;
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof ContactRemovedEvent) {
ContactRemovedEvent c = (ContactRemovedEvent) e;
if(contactId.equals(c.getContactId())) writerTasks.add(CLOSE);

2
briar-core/src/net/sf/briar/plugins/PollerImpl.java
View File

@@ -11,9 +11,9 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionRegistry;
class PollerImpl implements Poller, Runnable {

2
briar-core/src/net/sf/briar/plugins/file/FilePlugin.java
View File

@@ -13,11 +13,11 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.system.FileUtils;
public abstract class FilePlugin implements SimplexPlugin {

2
briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
View File

@@ -23,10 +23,10 @@ import java.util.logging.Logger;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import net.sf.briar.util.ByteUtils;
import net.sf.briar.util.LatchedReference;
import net.sf.briar.util.StringUtils;

4
briar-core/src/net/sf/briar/plugins/tcp/LanTcpPluginFactory.java
View File

@@ -3,11 +3,11 @@ package net.sf.briar.plugins.tcp;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
public class LanTcpPluginFactory implements DuplexPluginFactory {

2
briar-core/src/net/sf/briar/reliability/Receiver.java
View File

@@ -6,8 +6,8 @@ import java.util.Iterator;
import java.util.SortedSet;
import java.util.TreeSet;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.reliability.ReadHandler;
import net.sf.briar.api.system.Clock;
class Receiver implements ReadHandler {

4
briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java
View File

@@ -4,12 +4,12 @@ import java.util.concurrent.Executor;
import javax.inject.Inject;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.reliability.ReliabilityExecutor;
import net.sf.briar.api.reliability.ReliabilityLayer;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
class ReliabilityLayerFactoryImpl implements ReliabilityLayerFactory {

2
briar-core/src/net/sf/briar/reliability/ReliabilityLayerImpl.java
View File

@@ -11,9 +11,9 @@ import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.Logger;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.reliability.ReliabilityLayer;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {

2
briar-core/src/net/sf/briar/reliability/Sender.java
View File

@@ -6,8 +6,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
class Sender {

10
briar-core/src/net/sf/briar/clock/ClockModule.java → briar-core/src/net/sf/briar/system/ClockModule.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.clock;
package net.sf.briar.system;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.clock.SystemTimer;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.api.system.SystemTimer;
import net.sf.briar.api.system.Timer;
import com.google.inject.AbstractModule;

18
briar-core/src/net/sf/briar/transport/KeyManagerImpl.java
View File

@@ -18,17 +18,17 @@ import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.TransportAddedEvent;
import net.sf.briar.api.db.event.TransportRemovedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.TransportAddedEvent;
import net.sf.briar.api.event.TransportRemovedEvent;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.Timer;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.Endpoint;
@@ -36,7 +36,7 @@ import net.sf.briar.api.transport.TemporarySecret;
import net.sf.briar.util.ByteUtils;
// FIXME: Don't make alien calls with a lock held
class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
class KeyManagerImpl extends TimerTask implements KeyManager, EventListener {
private static final int MS_BETWEEN_CHECKS = 60 * 1000;
@@ -324,7 +324,7 @@ class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
}
}
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof ContactRemovedEvent) {
ContactRemovedEvent c = (ContactRemovedEvent) e;
timer.schedule(new ContactRemovedTask(c), 0);

2
briar-desktop/src/net/sf/briar/plugins/DesktopPluginsModule.java
View File

@@ -6,13 +6,13 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginConfig;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.plugins.simplex.SimplexPluginConfig;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.plugins.bluetooth.BluetoothPluginFactory;
import net.sf.briar.plugins.file.RemovableDrivePluginFactory;
import net.sf.briar.plugins.modem.ModemPluginFactory;

2
briar-desktop/src/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -24,11 +24,11 @@ import javax.microedition.io.StreamConnectionNotifier;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import net.sf.briar.util.LatchedReference;
import net.sf.briar.util.OsUtils;
import net.sf.briar.util.StringUtils;

4
briar-desktop/src/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
View File

@@ -4,11 +4,11 @@ import java.security.SecureRandom;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
public class BluetoothPluginFactory implements DuplexPluginFactory {

2
briar-desktop/src/net/sf/briar/plugins/file/RemovableDrivePlugin.java
View File

@@ -13,8 +13,8 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.util.StringUtils;
class RemovableDrivePlugin extends FilePlugin

2
briar-desktop/src/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java
View File

@@ -5,10 +5,10 @@ import static net.sf.briar.api.transport.TransportConstants.MAX_FRAME_LENGTH;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.util.OsUtils;
public class RemovableDrivePluginFactory implements SimplexPluginFactory {

4
briar-desktop/src/net/sf/briar/plugins/modem/ModemFactoryImpl.java
View File

@@ -2,9 +2,9 @@ package net.sf.briar.plugins.modem;
import java.util.concurrent.Executor;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
class ModemFactoryImpl implements ModemFactory {

2
briar-desktop/src/net/sf/briar/plugins/modem/ModemImpl.java
View File

@@ -14,10 +14,10 @@ import java.util.logging.Logger;
import jssc.SerialPortEvent;
import jssc.SerialPortEventListener;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.reliability.ReliabilityLayer;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {

4
briar-desktop/src/net/sf/briar/os/DesktopOsModule.java → briar-desktop/src/net/sf/briar/system/DesktopOsModule.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.os;
package net.sf.briar.system;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.FileUtils;
import com.google.inject.AbstractModule;

4
briar-desktop/src/net/sf/briar/os/FileUtilsImpl.java → briar-desktop/src/net/sf/briar/system/FileUtilsImpl.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.os;
package net.sf.briar.system;
import java.io.File;
import java.io.IOException;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.FileUtils;
class FileUtilsImpl implements FileUtils {

2
briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
View File

@@ -41,7 +41,6 @@ import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.messaging.MessagingModule;
@@ -49,6 +48,7 @@ import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.messaging.simplex.SimplexMessagingModule;
import net.sf.briar.reliability.ReliabilityModule;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.system.ClockModule;
import net.sf.briar.transport.TransportModule;
import org.junit.Test;

2
briar-tests/src/net/sf/briar/TestDatabaseModule.java
View File

@@ -3,7 +3,7 @@ package net.sf.briar;
import java.io.File;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.FileUtils;
import com.google.inject.AbstractModule;

2
briar-tests/src/net/sf/briar/TestFileUtils.java
View File

@@ -3,7 +3,7 @@ package net.sf.briar;
import java.io.File;
import java.io.IOException;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.system.FileUtils;
public class TestFileUtils implements FileUtils {

4
briar-tests/src/net/sf/briar/db/DatabaseCleanerImplTest.java
View File

@@ -5,9 +5,9 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.concurrent.CountDownLatch;
import net.sf.briar.BriarTestCase;
import net.sf.briar.api.clock.SystemTimer;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.system.SystemTimer;
import net.sf.briar.api.system.Timer;
import net.sf.briar.db.DatabaseCleaner.Callback;
import org.junit.Test;

2
briar-tests/src/net/sf/briar/db/DatabaseComponentImplTest.java
View File

@@ -5,10 +5,10 @@ import static net.sf.briar.db.DatabaseConstants.MIN_FREE_SPACE;
import java.util.Collections;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.db.DatabaseCleaner.Callback;
import org.jmock.Expectations;

44
briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -24,18 +24,18 @@ import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.NoSuchLocalAuthorException;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.db.NoSuchTransportException;
import net.sf.briar.api.db.event.ContactAddedEvent;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.LocalAuthorAddedEvent;
import net.sf.briar.api.db.event.LocalAuthorRemovedEvent;
import net.sf.briar.api.db.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.MessageToAckEvent;
import net.sf.briar.api.db.event.MessageToRequestEvent;
import net.sf.briar.api.db.event.SubscriptionAddedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.event.ContactAddedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.LocalAuthorAddedEvent;
import net.sf.briar.api.event.LocalAuthorRemovedEvent;
import net.sf.briar.api.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageToAckEvent;
import net.sf.briar.api.event.MessageToRequestEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Group;
@@ -120,7 +120,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
exactly(11).of(database).startTransaction();
will(returnValue(txn));
@@ -278,7 +278,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -990,7 +990,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1031,7 +1031,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1093,7 +1093,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1294,7 +1294,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1326,7 +1326,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1354,7 +1354,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1389,7 +1389,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
oneOf(database).startTransaction();
will(returnValue(txn));
@@ -1421,7 +1421,7 @@ public abstract class DatabaseComponentTest extends BriarTestCase {
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final ShutdownManager shutdown = context.mock(ShutdownManager.class);
final DatabaseListener listener = context.mock(DatabaseListener.class);
final EventListener listener = context.mock(EventListener.class);
context.checking(new Expectations() {{
// setVisibility()
oneOf(database).startTransaction();

2
briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -31,7 +31,6 @@ import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.messaging.Group;
@@ -39,6 +38,7 @@ import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.GroupStatus;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;

2
briar-tests/src/net/sf/briar/messaging/ConstantsTest.java
View File

@@ -40,12 +40,12 @@ import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.messaging.simplex.SimplexMessagingModule;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.system.ClockModule;
import net.sf.briar.transport.TransportModule;
import org.junit.Test;

2
briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java
View File

@@ -26,11 +26,11 @@ import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.system.ClockModule;
import net.sf.briar.transport.TransportModule;
import org.jmock.Expectations;

12
briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java
View File

@@ -20,9 +20,9 @@ import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.Message;
@@ -36,13 +36,13 @@ import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.messaging.MessagingModule;
import net.sf.briar.messaging.duplex.DuplexMessagingModule;
import net.sf.briar.plugins.ImmediateExecutor;
import net.sf.briar.serial.SerialModule;
import net.sf.briar.system.ClockModule;
import net.sf.briar.transport.TransportModule;
import org.junit.After;
@@ -234,11 +234,11 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
TestUtils.deleteTestDirectory(testDir);
}
private static class MessageListener implements DatabaseListener {
private static class MessageListener implements EventListener {
private boolean messageAdded = false;
public void eventOccurred(DatabaseEvent e) {
public void eventOccurred(Event e) {
if(e instanceof MessageAddedEvent) messageAdded = true;
}
}

2
briar-tests/src/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
View File

@@ -10,7 +10,7 @@ import java.util.concurrent.Executors;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.plugins.DuplexClientTest;
// This is not a JUnit test - it has to be run manually while the server test

2
briar-tests/src/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
View File

@@ -8,7 +8,7 @@ import java.util.concurrent.Executors;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.plugins.DuplexServerTest;
// This is not a JUnit test - it has to be run manually while the client test

2
briar-tests/src/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
View File

@@ -15,9 +15,9 @@ import net.sf.briar.BriarTestCase;
import net.sf.briar.TestFileUtils;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.plugins.ImmediateExecutor;
import net.sf.briar.plugins.file.RemovableDriveMonitor.Callback;

4
briar-tests/src/net/sf/briar/plugins/tcp/LanTcpClientTest.java
View File

@@ -9,8 +9,8 @@ import java.util.concurrent.Executors;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.plugins.DuplexClientTest;
// This is not a JUnit test - it has to be run manually while the server test

4
briar-tests/src/net/sf/briar/plugins/tcp/LanTcpPluginTest.java
View File

@@ -17,11 +17,11 @@ import net.sf.briar.BriarTestCase;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import org.junit.Test;

4
briar-tests/src/net/sf/briar/plugins/tcp/LanTcpServerTest.java
View File

@@ -7,8 +7,8 @@ import java.util.concurrent.Executors;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.plugins.DuplexServerTest;
// This is not a JUnit test - it has to be run manually while the client test

42
briar-tests/src/net/sf/briar/transport/KeyManagerImplTest.java
View File

@@ -10,11 +10,11 @@ import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.Timer;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.Endpoint;
@@ -68,7 +68,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -78,7 +78,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(timer).scheduleAtFixedRate(with(keyManager),
with(any(long.class)), with(any(long.class)));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -110,7 +110,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -135,7 +135,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(connectionRecogniser).addSecret(s1);
oneOf(connectionRecogniser).addSecret(s2);
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -168,7 +168,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -196,7 +196,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(db).incrementConnectionCounter(contactId, transportId, 1);
will(returnValue(0L));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -237,7 +237,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -253,7 +253,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(timer).scheduleAtFixedRate(with(keyManager),
with(any(long.class)), with(any(long.class)));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -287,7 +287,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -311,7 +311,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(timer).scheduleAtFixedRate(with(keyManager),
with(any(long.class)), with(any(long.class)));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -346,7 +346,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -371,7 +371,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(timer).scheduleAtFixedRate(with(keyManager),
with(any(long.class)), with(any(long.class)));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -403,7 +403,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -425,7 +425,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(db).incrementConnectionCounter(contactId, transportId, 1);
will(returnValue(0L));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -468,7 +468,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -499,7 +499,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(db).incrementConnectionCounter(contactId, transportId, 2);
will(returnValue(0L));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});
@@ -543,7 +543,7 @@ public class KeyManagerImplTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -576,7 +576,7 @@ public class KeyManagerImplTest extends BriarTestCase {
oneOf(db).incrementConnectionCounter(contactId, transportId, 3);
will(returnValue(0L));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
oneOf(connectionRecogniser).removeSecrets();
}});

34
briar-tests/src/net/sf/briar/transport/KeyRotationIntegrationTest.java
View File

@@ -11,12 +11,12 @@ import net.sf.briar.BriarTestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.Timer;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.Endpoint;
@@ -85,7 +85,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -95,7 +95,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
oneOf(timer).scheduleAtFixedRate(with(keyManager),
with(any(long.class)), with(any(long.class)));
// stop()
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});
@@ -129,7 +129,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -217,7 +217,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
}
oneOf(k2).erase();
// Remove the listener and stop the timer
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});
@@ -252,7 +252,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -343,7 +343,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
}
oneOf(k2).erase();
// Remove the listener and stop the timer
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});
@@ -386,7 +386,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Collections.emptyList()));
oneOf(db).getTransportLatencies();
@@ -485,7 +485,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
}
oneOf(k2).erase();
// Remove the listener and stop the timer
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});
@@ -531,7 +531,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -611,7 +611,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
}
oneOf(k2).erase();
// Remove the listener and stop the timer
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});
@@ -647,7 +647,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -735,7 +735,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
}
oneOf(k3).erase();
// Remove the listener and stop the timer
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});
@@ -772,7 +772,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
context.checking(new Expectations() {{
// start()
oneOf(db).addListener(with(any(DatabaseListener.class)));
oneOf(db).addListener(with(any(EventListener.class)));
oneOf(db).getSecrets();
will(returnValue(Arrays.asList(s0, s1, s2)));
oneOf(db).getTransportLatencies();
@@ -861,7 +861,7 @@ public class KeyRotationIntegrationTest extends BriarTestCase {
}
oneOf(k4).erase();
// Remove the listener and stop the timer
oneOf(db).removeListener(with(any(DatabaseListener.class)));
oneOf(db).removeListener(with(any(EventListener.class)));
oneOf(timer).cancel();
}});