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

Code cleanup.

Browse Source
This commit is contained in:
akwizgran
2014-02-04 19:05:48 +00:00
parent 5419a9e10c
commit 3842a5c70d
22 changed files with 125 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/org/briarproject/android/AndroidExecutorImpl.java
View File

@@ -10,6 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
import org.briarproject.api.android.AndroidExecutor;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;

9
briar-android/src/org/briarproject/android/BriarService.java
View File

@@ -6,12 +6,15 @@ import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
import static java.util.logging.Level.INFO;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.lifecycle.LifecycleManager;
@@ -26,6 +29,7 @@ import android.support.v4.app.NotificationCompat;
public class BriarService extends RoboService {
private static final int NOTIFICATION_ID = 1;
private static final Logger LOG =
Logger.getLogger(BriarService.class.getName());
@@ -36,6 +40,8 @@ public class BriarService extends RoboService {
// Fields that are accessed from background threads must be volatile
@Inject private volatile LifecycleManager lifecycleManager;
@Inject private volatile AndroidExecutor androidExecutor;
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
@Inject private volatile DatabaseComponent db;
private volatile boolean started = false;
@Override
@@ -54,12 +60,11 @@ public class BriarService extends RoboService {
b.setContentText(getText(R.string.notification_text));
b.setWhen(0); // Don't show the time
b.setOngoing(true);
// Touch the notification to show the home screen
Intent i = new Intent(this, HomeScreenActivity.class);
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
FLAG_ACTIVITY_SINGLE_TOP);
b.setContentIntent(PendingIntent.getActivity(this, 0, i, 0));
startForeground(1, b.build());
startForeground(NOTIFICATION_ID, b.build());
// Start the services in a background thread
new Thread() {
@Override

1
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -32,6 +32,7 @@ import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;

1
briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java
View File

@@ -7,6 +7,7 @@ import java.util.Set;
import org.briarproject.R;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;

1
briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
View File

@@ -27,6 +27,7 @@ import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;

1
briar-android/src/org/briarproject/android/groups/GroupActivity.java
View File

@@ -34,6 +34,7 @@ import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;

3
briar-android/src/org/briarproject/android/groups/GroupListActivity.java
View File

@@ -23,8 +23,8 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
@@ -42,6 +42,7 @@ import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.GroupStatus;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;

1
briar-android/src/org/briarproject/android/groups/ManageGroupsActivity.java
View File

@@ -24,6 +24,7 @@ import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupStatus;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;

1
briar-android/src/org/briarproject/android/groups/NoContactsDialog.java
View File

@@ -1,6 +1,7 @@
package org.briarproject.android.groups;
import org.briarproject.R;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;

1
briar-android/src/org/briarproject/android/identity/LocalAuthorSpinnerAdapter.java
View File

@@ -9,6 +9,7 @@ import java.util.Comparator;
import java.util.List;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.view.View;

1
briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
View File

@@ -31,6 +31,7 @@ import org.briarproject.api.invitation.InvitationState;
import org.briarproject.api.invitation.InvitationTask;
import org.briarproject.api.invitation.InvitationTaskFactory;
import org.briarproject.api.lifecycle.LifecycleManager;
import roboguice.activity.RoboActivity;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;

2
briar-android/src/org/briarproject/android/invitation/ConnectedView.java
View File

@@ -1,7 +1,9 @@
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import org.briarproject.R;
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;

2
briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
View File

@@ -2,7 +2,9 @@ package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import org.briarproject.R;
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;

2
briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
View File

@@ -1,7 +1,9 @@
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER_HORIZONTAL;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.widget.TextView;

2
briar-android/src/org/briarproject/android/invitation/NetworkSetupView.java
View File

@@ -4,11 +4,13 @@ import static android.view.Gravity.CENTER;
import static org.briarproject.android.identity.LocalAuthorItem.NEW;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import org.briarproject.R;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
import org.briarproject.api.AuthorId;
import android.content.Context;
import android.content.Intent;
import android.view.View;

2
briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
View File

@@ -2,7 +2,9 @@ package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
import org.briarproject.R;
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;