Use javax.inject annotations rather than the Guice versions.

briar-android/.classpath

@@ -8,5 +8,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
 	<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="lib" path="/briar-api/libs/javax.inject.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

briar-android/src/net/sf/briar/android/AndroidExecutorImpl.java

@@ -7,13 +7,13 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.android.AndroidExecutor;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
-import com.google.inject.Inject;
-
 class AndroidExecutorImpl implements AndroidExecutor {
 
 	private static final int SHUTDOWN = 0, RUN = 1;

briar-android/src/net/sf/briar/android/AndroidModule.java

@@ -12,6 +12,8 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.android.AndroidExecutor;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.android.ReferenceManager;
@@ -32,7 +34,6 @@ import android.content.Context;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class AndroidModule extends AbstractModule {
 

briar-android/src/net/sf/briar/android/BriarService.java

@@ -7,6 +7,8 @@ import static java.util.logging.Level.INFO;
 import java.util.concurrent.CountDownLatch;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.api.android.AndroidExecutor;
 import net.sf.briar.api.lifecycle.LifecycleManager;
@@ -19,8 +21,6 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
 
-import com.google.inject.Inject;
-
 public class BriarService extends RoboService {
 
 	private static final Logger LOG =

briar-android/src/net/sf/briar/android/HomeScreenActivity.java

@@ -19,6 +19,8 @@ import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.BriarService.BriarBinder;
 import net.sf.briar.android.BriarService.BriarServiceConnection;
@@ -56,8 +58,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.google.inject.Inject;
-
 public class HomeScreenActivity extends RoboActivity {
 
 	// This build expires on 30 November 2013

briar-android/src/net/sf/briar/android/SetupActivity.java

@@ -16,6 +16,8 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.concurrent.Executor;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.api.AuthorFactory;
 import net.sf.briar.api.LocalAuthor;
@@ -39,8 +41,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.google.inject.Inject;
-
 public class SetupActivity extends RoboActivity implements OnClickListener {
 
 	private static final int MIN_PASSWORD_LENGTH = 8;

briar-android/src/net/sf/briar/android/contact/ContactListActivity.java

@@ -21,6 +21,8 @@ import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.invitation.AddContactActivity;
 import net.sf.briar.android.util.HorizontalBorder;
@@ -50,8 +52,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import com.google.inject.Inject;
-
 public class ContactListActivity extends RoboActivity
 implements OnClickListener, OnItemClickListener, DatabaseListener,
 ConnectionListener {

briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java

@@ -14,6 +14,8 @@ import java.util.Collections;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.contact.SelectContactsDialog;
 import net.sf.briar.android.invitation.AddContactActivity;
@@ -40,8 +42,6 @@ import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
-import com.google.inject.Inject;
-
 public class ConfigureGroupActivity extends RoboFragmentActivity
 implements OnClickListener, NoContactsDialog.Listener,
 SelectContactsDialog.Listener {

briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java

@@ -19,6 +19,8 @@ import java.util.Collections;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.contact.SelectContactsDialog;
 import net.sf.briar.android.invitation.AddContactActivity;
@@ -49,8 +51,6 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.google.inject.Inject;
-
 public class CreateGroupActivity extends RoboFragmentActivity
 implements OnEditorActionListener, OnClickListener, NoContactsDialog.Listener,
 SelectContactsDialog.Listener {

briar-android/src/net/sf/briar/android/groups/GroupActivity.java

@@ -15,6 +15,8 @@ import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.AscendingHeaderComparator;
 import net.sf.briar.android.util.HorizontalBorder;
@@ -43,8 +45,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import com.google.inject.Inject;
-
 public class GroupActivity extends RoboActivity implements DatabaseListener,
 OnClickListener, OnItemClickListener {
 

briar-android/src/net/sf/briar/android/groups/GroupListActivity.java

@@ -18,6 +18,8 @@ import java.util.Comparator;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.util.HorizontalBorder;
 import net.sf.briar.android.util.HorizontalSpace;
@@ -49,8 +51,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import com.google.inject.Inject;
-
 public class GroupListActivity extends RoboFragmentActivity
 implements DatabaseListener, OnClickListener, NoGroupsDialog.Listener,
 OnItemClickListener {

briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java

@@ -10,6 +10,8 @@ import java.util.Comparator;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.android.util.ListLoadingProgressBar;
 import net.sf.briar.api.android.DatabaseUiExecutor;
 import net.sf.briar.api.db.DatabaseComponent;
@@ -30,8 +32,6 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.google.inject.Inject;
-
 public class ManageGroupsActivity extends RoboFragmentActivity
 implements DatabaseListener, OnItemClickListener {
 

briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java

@@ -15,6 +15,8 @@ import java.io.UnsupportedEncodingException;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.util.HorizontalBorder;
 import net.sf.briar.android.util.HorizontalSpace;
@@ -37,8 +39,6 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import com.google.inject.Inject;
-
 public class ReadGroupPostActivity extends RoboActivity
 implements OnClickListener {
 

briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java

@@ -15,6 +15,8 @@ import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.identity.CreateIdentityActivity;
 import net.sf.briar.android.identity.LocalAuthorItem;
@@ -49,8 +51,6 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.google.inject.Inject;
-
 public class WriteGroupPostActivity extends RoboActivity
 implements OnItemSelectedListener, OnClickListener {
 

briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java

@@ -4,13 +4,14 @@ import static android.content.Context.MODE_PRIVATE;
 
 import java.io.File;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.db.DatabaseConfig;
 import net.sf.briar.api.ui.UiCallback;
 import android.app.Application;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class HelloWorldModule extends AbstractModule {
 

briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java

@@ -17,6 +17,8 @@ import java.io.IOException;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.api.AuthorFactory;
 import net.sf.briar.api.LocalAuthor;
@@ -40,8 +42,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.google.inject.Inject;
-
 public class CreateIdentityActivity extends RoboActivity
 implements OnEditorActionListener, OnClickListener {
 

briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java

@@ -12,6 +12,8 @@ import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.android.identity.LocalAuthorItem;
 import net.sf.briar.android.identity.LocalAuthorItemComparator;
 import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter;
@@ -37,8 +39,6 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 
-import com.google.inject.Inject;
-
 public class AddContactActivity extends RoboActivity
 implements InvitationListener {
 

briar-android/src/net/sf/briar/android/messages/ConversationActivity.java

@@ -13,6 +13,8 @@ import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.AscendingHeaderComparator;
 import net.sf.briar.android.util.HorizontalBorder;
@@ -41,8 +43,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import com.google.inject.Inject;
-
 public class ConversationActivity extends RoboActivity
 implements DatabaseListener, OnClickListener, OnItemClickListener {
 

briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java

@@ -14,6 +14,8 @@ import java.util.Comparator;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.invitation.AddContactActivity;
 import net.sf.briar.android.util.HorizontalBorder;
@@ -42,8 +44,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import com.google.inject.Inject;
-
 public class ConversationListActivity extends RoboFragmentActivity
 implements OnClickListener, DatabaseListener, NoContactsDialog.Listener {
 

briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java

@@ -15,6 +15,8 @@ import java.io.UnsupportedEncodingException;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.util.HorizontalBorder;
 import net.sf.briar.android.util.HorizontalSpace;
@@ -37,8 +39,6 @@ import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import com.google.inject.Inject;
-
 public class ReadPrivateMessageActivity extends RoboActivity
 implements OnClickListener {
 

briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java

@@ -16,6 +16,8 @@ import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.R;
 import net.sf.briar.android.contact.ContactItem;
 import net.sf.briar.android.contact.ContactItemComparator;
@@ -47,8 +49,6 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.google.inject.Inject;
-
 public class WritePrivateMessageActivity extends RoboActivity
 implements OnItemSelectedListener, OnClickListener {
 

briar-core/.classpath

@@ -3,10 +3,10 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
 	<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
-	<classpathentry kind="lib" path="libs/javax.inject.jar"/>
 	<classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="libs/h2small-1.3.174.jar"/>
 	<classpathentry kind="lib" path="libs/weupnp-0.1.3-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="/briar-api/libs/javax.inject.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java

@@ -4,8 +4,8 @@ import static javax.crypto.Cipher.DECRYPT_MODE;
 import static javax.crypto.Cipher.ENCRYPT_MODE;
 import static net.sf.briar.api.invitation.InvitationConstants.CODE_BITS;
 import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
-import static net.sf.briar.crypto.EllipticCurveConstants.PARAMETERS;
 import static net.sf.briar.crypto.EllipticCurveConstants.P;
+import static net.sf.briar.crypto.EllipticCurveConstants.PARAMETERS;
 import static net.sf.briar.util.ByteUtils.MAX_32_BIT_UNSIGNED;
 
 import java.io.ByteArrayOutputStream;

briar-core/src/net/sf/briar/crypto/CryptoModule.java

@@ -9,13 +9,14 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.crypto.CryptoComponent;
 import net.sf.briar.api.crypto.CryptoExecutor;
 import net.sf.briar.api.lifecycle.LifecycleManager;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class CryptoModule extends AbstractModule {
 

briar-core/src/net/sf/briar/db/DatabaseCleanerImpl.java

@@ -6,12 +6,12 @@ import static java.util.logging.Level.WARNING;
 import java.util.TimerTask;
 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 com.google.inject.Inject;
-
 class DatabaseCleanerImpl extends TimerTask implements DatabaseCleaner {
 
 	private static final Logger LOG =

briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java

@@ -22,6 +22,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.Author;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.Contact;
@@ -76,8 +78,6 @@ import net.sf.briar.api.messaging.TransportUpdate;
 import net.sf.briar.api.transport.Endpoint;
 import net.sf.briar.api.transport.TemporarySecret;
 
-import com.google.inject.Inject;
-
 /**
  * An implementation of DatabaseComponent using reentrant read-write locks.
  * Depending on the JVM's lock implementation, this implementation may allow

briar-core/src/net/sf/briar/db/DatabaseModule.java

@@ -10,6 +10,8 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 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;
@@ -21,7 +23,6 @@ import net.sf.briar.api.os.FileUtils;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class DatabaseModule extends AbstractModule {
 

briar-core/src/net/sf/briar/db/H2Database.java

@@ -8,14 +8,14 @@ import java.sql.SQLException;
 import java.sql.Statement;
 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.util.StringUtils;
 
-import com.google.inject.Inject;
-
 /** Contains all the H2-specific code for the database. */
 class H2Database extends JdbcDatabase {
 

briar-core/src/net/sf/briar/invitation/InvitationModule.java

@@ -1,9 +1,10 @@
 package net.sf.briar.invitation;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.invitation.InvitationTaskFactory;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
 
 public class InvitationModule extends AbstractModule {
 

briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java

@@ -1,5 +1,7 @@
 package net.sf.briar.invitation;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.AuthorFactory;
 import net.sf.briar.api.AuthorId;
 import net.sf.briar.api.clock.Clock;
@@ -15,8 +17,6 @@ import net.sf.briar.api.transport.ConnectionDispatcher;
 import net.sf.briar.api.transport.ConnectionReaderFactory;
 import net.sf.briar.api.transport.ConnectionWriterFactory;
 
-import com.google.inject.Inject;
-
 class InvitationTaskFactoryImpl implements InvitationTaskFactory {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/lifecycle/LifecycleManagerImpl.java

@@ -10,13 +10,13 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.db.DbException;
 import net.sf.briar.api.lifecycle.LifecycleManager;
 import net.sf.briar.api.lifecycle.Service;
 
-import com.google.inject.Inject;
-
 class LifecycleManagerImpl implements LifecycleManager {
 
 	private static final Logger LOG =

briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java

@@ -1,10 +1,11 @@
 package net.sf.briar.lifecycle;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.lifecycle.LifecycleManager;
 import net.sf.briar.api.lifecycle.ShutdownManager;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
 
 public class LifecycleModule extends AbstractModule {
 

briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java

@@ -5,6 +5,8 @@ import static net.sf.briar.api.messaging.Types.AUTHOR;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.Author;
 import net.sf.briar.api.AuthorFactory;
 import net.sf.briar.api.AuthorId;
@@ -14,8 +16,6 @@ import net.sf.briar.api.crypto.MessageDigest;
 import net.sf.briar.api.serial.Writer;
 import net.sf.briar.api.serial.WriterFactory;
 
-import com.google.inject.Inject;
-
 class AuthorFactoryImpl implements AuthorFactory {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java

@@ -6,6 +6,8 @@ import static net.sf.briar.api.messaging.Types.GROUP;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.crypto.CryptoComponent;
 import net.sf.briar.api.crypto.MessageDigest;
 import net.sf.briar.api.messaging.Group;
@@ -14,8 +16,6 @@ import net.sf.briar.api.messaging.GroupId;
 import net.sf.briar.api.serial.Writer;
 import net.sf.briar.api.serial.WriterFactory;
 
-import com.google.inject.Inject;
-
 class GroupFactoryImpl implements GroupFactory {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java

@@ -18,6 +18,8 @@ import java.nio.charset.CharsetDecoder;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.Author;
 import net.sf.briar.api.clock.Clock;
 import net.sf.briar.api.crypto.CryptoComponent;
@@ -35,8 +37,6 @@ import net.sf.briar.api.serial.SigningConsumer;
 import net.sf.briar.api.serial.Writer;
 import net.sf.briar.api.serial.WriterFactory;
 
-import com.google.inject.Inject;
-
 class MessageFactoryImpl implements MessageFactory {
 
 	private final Signature signature;

briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java

@@ -2,6 +2,8 @@ package net.sf.briar.messaging;
 
 import java.security.GeneralSecurityException;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.Author;
 import net.sf.briar.api.crypto.CryptoComponent;
 import net.sf.briar.api.crypto.KeyParser;
@@ -13,8 +15,6 @@ import net.sf.briar.api.messaging.MessageId;
 import net.sf.briar.api.messaging.MessageVerifier;
 import net.sf.briar.api.messaging.UnverifiedMessage;
 
-import com.google.inject.Inject;
-
 class MessageVerifierImpl implements MessageVerifier {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/messaging/PacketReaderFactoryImpl.java

@@ -2,6 +2,8 @@ package net.sf.briar.messaging;
 
 import java.io.InputStream;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.messaging.PacketReader;
 import net.sf.briar.api.messaging.PacketReaderFactory;
 import net.sf.briar.api.messaging.SubscriptionUpdate;
@@ -9,8 +11,6 @@ import net.sf.briar.api.messaging.UnverifiedMessage;
 import net.sf.briar.api.serial.ReaderFactory;
 import net.sf.briar.api.serial.StructReader;
 
-import com.google.inject.Inject;
-
 class PacketReaderFactoryImpl implements PacketReaderFactory {
 
 	private final ReaderFactory readerFactory;

briar-core/src/net/sf/briar/messaging/PacketWriterFactoryImpl.java

@@ -2,13 +2,13 @@ package net.sf.briar.messaging;
 
 import java.io.OutputStream;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.messaging.PacketWriter;
 import net.sf.briar.api.messaging.PacketWriterFactory;
 import net.sf.briar.api.serial.SerialComponent;
 import net.sf.briar.api.serial.WriterFactory;
 
-import com.google.inject.Inject;
-
 class PacketWriterFactoryImpl implements PacketWriterFactory {
 
 	private final SerialComponent serial;

briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java

@@ -5,6 +5,8 @@ import static java.util.logging.Level.WARNING;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportId;
 import net.sf.briar.api.crypto.CryptoExecutor;
@@ -21,8 +23,6 @@ import net.sf.briar.api.transport.ConnectionReaderFactory;
 import net.sf.briar.api.transport.ConnectionRegistry;
 import net.sf.briar.api.transport.ConnectionWriterFactory;
 
-import com.google.inject.Inject;
-
 class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {
 
 	private static final Logger LOG =

briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java

@@ -1,9 +1,10 @@
 package net.sf.briar.messaging.duplex;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
 
 public class DuplexMessagingModule extends AbstractModule {
 

briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java

@@ -5,6 +5,8 @@ import static java.util.logging.Level.WARNING;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportId;
 import net.sf.briar.api.crypto.CryptoExecutor;
@@ -22,8 +24,6 @@ import net.sf.briar.api.transport.ConnectionReaderFactory;
 import net.sf.briar.api.transport.ConnectionRegistry;
 import net.sf.briar.api.transport.ConnectionWriterFactory;
 
-import com.google.inject.Inject;
-
 class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {
 
 	private static final Logger LOG =

briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java

@@ -1,9 +1,10 @@
 package net.sf.briar.messaging.simplex;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
 
 public class SimplexMessagingModule extends AbstractModule {
 

briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java

@@ -14,6 +14,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportConfig;
 import net.sf.briar.api.TransportId;
@@ -38,8 +40,6 @@ import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
 import net.sf.briar.api.transport.ConnectionDispatcher;
 import net.sf.briar.api.ui.UiCallback;
 
-import com.google.inject.Inject;
-
 // FIXME: Don't make alien calls with a lock held (that includes waiting on a
 // latch that depends on an alien call)
 class PluginManagerImpl implements PluginManager {

briar-core/src/net/sf/briar/plugins/PluginsModule.java

@@ -9,13 +9,14 @@ import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.lifecycle.LifecycleManager;
 import net.sf.briar.api.plugins.PluginExecutor;
 import net.sf.briar.api.plugins.PluginManager;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class PluginsModule extends AbstractModule {
 

briar-core/src/net/sf/briar/plugins/PollerImpl.java

@@ -8,14 +8,14 @@ import java.util.TreeSet;
 import java.util.concurrent.Executor;
 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.transport.ConnectionRegistry;
 
-import com.google.inject.Inject;
-
 class PollerImpl implements Poller, Runnable {
 
 	private static final Logger LOG =

briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java

@@ -2,6 +2,8 @@ package net.sf.briar.reliability;
 
 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;
@@ -9,8 +11,6 @@ import net.sf.briar.api.reliability.ReliabilityLayer;
 import net.sf.briar.api.reliability.ReliabilityLayerFactory;
 import net.sf.briar.api.reliability.WriteHandler;
 
-import com.google.inject.Inject;
-
 class ReliabilityLayerFactoryImpl implements ReliabilityLayerFactory {
 
 	private final Executor executor;

briar-core/src/net/sf/briar/reliability/ReliabilityModule.java

@@ -9,13 +9,14 @@ import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.lifecycle.LifecycleManager;
 import net.sf.briar.api.reliability.ReliabilityExecutor;
 import net.sf.briar.api.reliability.ReliabilityLayerFactory;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class ReliabilityModule extends AbstractModule {
 

briar-core/src/net/sf/briar/serial/SerialModule.java

@@ -1,11 +1,12 @@
 package net.sf.briar.serial;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.serial.ReaderFactory;
 import net.sf.briar.api.serial.SerialComponent;
 import net.sf.briar.api.serial.WriterFactory;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Singleton;
 
 public class SerialModule extends AbstractModule {
 

briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java

@@ -9,6 +9,8 @@ import java.io.InputStream;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportId;
 import net.sf.briar.api.db.DbException;
@@ -22,8 +24,6 @@ import net.sf.briar.api.transport.ConnectionDispatcher;
 import net.sf.briar.api.transport.ConnectionRecogniser;
 import net.sf.briar.api.transport.IncomingConnectionExecutor;
 
-import com.google.inject.Inject;
-
 class ConnectionDispatcherImpl implements ConnectionDispatcher {
 
 	private static final Logger LOG =

briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java

@@ -2,14 +2,14 @@ package net.sf.briar.transport;
 
 import java.io.InputStream;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.crypto.CryptoComponent;
 import net.sf.briar.api.crypto.SecretKey;
 import net.sf.briar.api.transport.ConnectionContext;
 import net.sf.briar.api.transport.ConnectionReader;
 import net.sf.briar.api.transport.ConnectionReaderFactory;
 
-import com.google.inject.Inject;
-
 class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java

@@ -3,6 +3,8 @@ package net.sf.briar.transport;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportId;
 import net.sf.briar.api.crypto.CryptoComponent;
@@ -12,8 +14,6 @@ import net.sf.briar.api.transport.ConnectionContext;
 import net.sf.briar.api.transport.ConnectionRecogniser;
 import net.sf.briar.api.transport.TemporarySecret;
 
-import com.google.inject.Inject;
-
 class ConnectionRecogniserImpl implements ConnectionRecogniser {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java

@@ -4,14 +4,14 @@ import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
 
 import java.io.OutputStream;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.crypto.CryptoComponent;
 import net.sf.briar.api.crypto.SecretKey;
 import net.sf.briar.api.transport.ConnectionContext;
 import net.sf.briar.api.transport.ConnectionWriter;
 import net.sf.briar.api.transport.ConnectionWriterFactory;
 
-import com.google.inject.Inject;
-
 class ConnectionWriterFactoryImpl implements ConnectionWriterFactory {
 
 	private final CryptoComponent crypto;

briar-core/src/net/sf/briar/transport/KeyManagerImpl.java

@@ -14,6 +14,8 @@ import java.util.Map.Entry;
 import java.util.TimerTask;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportId;
 import net.sf.briar.api.clock.Clock;
@@ -33,8 +35,6 @@ import net.sf.briar.api.transport.Endpoint;
 import net.sf.briar.api.transport.TemporarySecret;
 import net.sf.briar.util.ByteUtils;
 
-import com.google.inject.Inject;
-
 // FIXME: Don't make alien calls with a lock held
 class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {
 

briar-core/src/net/sf/briar/transport/TransportModule.java

@@ -9,6 +9,8 @@ import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.inject.Singleton;
+
 import net.sf.briar.api.crypto.KeyManager;
 import net.sf.briar.api.lifecycle.LifecycleManager;
 import net.sf.briar.api.transport.ConnectionDispatcher;
@@ -20,7 +22,6 @@ import net.sf.briar.api.transport.IncomingConnectionExecutor;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
 
 public class TransportModule extends AbstractModule {
 

briar-tests/src/net/sf/briar/crypto/KeyAgreementTest.java

@@ -1,7 +1,6 @@
 package net.sf.briar.crypto;
 
 import static org.junit.Assert.assertArrayEquals;
-
 import net.sf.briar.BriarTestCase;
 import net.sf.briar.api.crypto.CryptoComponent;
 import net.sf.briar.api.crypto.KeyPair;

briar-tests/src/net/sf/briar/crypto/KeyEncodingAndParsingTest.java

@@ -1,7 +1,6 @@
 package net.sf.briar.crypto;
 
 import static org.junit.Assert.assertArrayEquals;
-
 import net.sf.briar.BriarTestCase;
 import net.sf.briar.api.crypto.KeyPair;
 import net.sf.briar.api.crypto.KeyParser;