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

Use javax.inject annotations rather than the Guice versions.

Browse Source
This commit is contained in:
akwizgran
2013-11-29 14:12:39 +00:00
parent 418b3c9a9d
commit 766b6f067a
57 changed files with 105 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/net/sf/briar/android/AndroidExecutorImpl.java
View File

@@ -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;

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

@@ -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 {

4
briar-android/src/net/sf/briar/android/BriarService.java
View File

@@ -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 =

4
briar-android/src/net/sf/briar/android/HomeScreenActivity.java
View File

@@ -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

4
briar-android/src/net/sf/briar/android/SetupActivity.java
View File

@@ -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;

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

@@ -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 {

4
briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java
View File

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

4
briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
View File

@@ -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 {

3
briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
View File

@@ -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 {

4
briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
View File

@@ -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 {