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

Make all activities inherit from BriarActivity.

Browse Source 
This will allow any activity to show the expiry warning and password
prompt, and to start and stop BriarService.

SplashScreenActivity, SetupActivity, ExpiryActivity and PasswordActivity
are special cases.
This commit is contained in:
akwizgran
2014-02-05 15:17:17 +00:00
parent 843ad55163
commit cd49254559
14 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public class BriarActivity extends RoboFragmentActivity {
}
@Override
public void onActivityResult(int request, int result, Intent data) {
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
if(request == REQUEST_PASSWORD) {
if(result == RESULT_OK) startAndBindService();

4
briar-android/src/org/briarproject/android/contact/ContactListActivity.java
View File

@@ -18,6 +18,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
@@ -40,7 +41,6 @@ import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.transport.ConnectionListener;
import org.briarproject.api.transport.ConnectionRegistry;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -51,7 +51,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ListView;
public class ContactListActivity extends RoboActivity
public class ContactListActivity extends BriarActivity
implements OnClickListener, OnItemClickListener, EventListener,
ConnectionListener {

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

@@ -17,6 +17,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.AuthorId;
@@ -34,7 +35,6 @@ 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;
import android.view.View;
@@ -45,7 +45,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ListView;
public class ConversationActivity extends RoboActivity
public class ConversationActivity extends BriarActivity
implements EventListener, OnClickListener, OnItemClickListener {
private static final int REQUEST_READ_MESSAGE = 2;
@@ -181,7 +181,7 @@ implements EventListener, OnClickListener, OnItemClickListener {
}
@Override
public void onActivityResult(int request, int result, Intent data) {
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
if(request == REQUEST_READ_MESSAGE && result == RESULT_PREV_NEXT) {
int position = data.getIntExtra("briar.POSITION", -1);

4
briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
View File

@@ -19,6 +19,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.AuthorView;
import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.HorizontalBorder;
@@ -32,7 +33,6 @@ import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
@@ -44,7 +44,7 @@ import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
public class ReadPrivateMessageActivity extends RoboActivity
public class ReadPrivateMessageActivity extends BriarActivity
implements OnClickListener {
static final int RESULT_REPLY = RESULT_FIRST_USER;

4
briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java
View File

@@ -19,6 +19,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.AuthorId;
@@ -36,7 +37,6 @@ import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
@@ -49,7 +49,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
public class WritePrivateMessageActivity extends RoboActivity
public class WritePrivateMessageActivity extends BriarActivity
implements OnClickListener {
private static final Logger LOG =

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

@@ -17,6 +17,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.contact.SelectContactsDialog;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.api.Contact;
@@ -28,7 +29,6 @@ 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;
import android.support.v4.app.Fragment;
@@ -42,7 +42,7 @@ import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.RadioGroup;
public class ConfigureGroupActivity extends RoboFragmentActivity
public class ConfigureGroupActivity extends BriarActivity
implements OnClickListener, NoContactsDialog.Listener,
SelectContactsDialog.Listener {

4
briar-android/src/org/briarproject/android/groups/CreateGroupActivity.java
View File

@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.contact.SelectContactsDialog;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.android.util.LayoutUtils;
@@ -35,7 +36,6 @@ import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -53,7 +53,7 @@ import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
public class CreateGroupActivity extends RoboFragmentActivity
public class CreateGroupActivity extends BriarActivity
implements OnEditorActionListener, OnClickListener, NoContactsDialog.Listener,
SelectContactsDialog.Listener {

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

@@ -18,6 +18,7 @@ import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.AscendingHeaderComparator;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.Author;
@@ -34,7 +35,6 @@ 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;
import android.view.View;
@@ -45,7 +45,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ListView;
public class GroupActivity extends RoboActivity implements EventListener,
public class GroupActivity extends BriarActivity implements EventListener,
OnClickListener, OnItemClickListener {
private static final int REQUEST_READ_POST = 2;
@@ -169,7 +169,7 @@ OnClickListener, OnItemClickListener {
}
@Override
public void onActivityResult(int request, int result, Intent data) {
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
if(request == REQUEST_READ_POST && result == RESULT_PREV_NEXT) {
int position = data.getIntExtra("briar.POSITION", -1);

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

@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
@@ -43,7 +44,6 @@ 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;
import android.view.View;
@@ -54,7 +54,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ListView;
public class GroupListActivity extends RoboFragmentActivity
public class GroupListActivity extends BriarActivity
implements EventListener, OnClickListener, OnItemClickListener {
private static final Logger LOG =

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

@@ -12,6 +12,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
@@ -25,7 +26,6 @@ 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;
import android.view.View;
@@ -33,7 +33,7 @@ import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ListView;
public class ManageGroupsActivity extends RoboFragmentActivity
public class ManageGroupsActivity extends BriarActivity
implements EventListener, OnItemClickListener {
private static final Logger LOG =

4
briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
View File

@@ -18,6 +18,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.AuthorView;
import org.briarproject.android.util.ElasticHorizontalSpace;
import org.briarproject.android.util.HorizontalBorder;
@@ -31,7 +32,6 @@ import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
@@ -43,7 +43,7 @@ import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
public class ReadGroupPostActivity extends RoboActivity
public class ReadGroupPostActivity extends BriarActivity
implements OnClickListener {
static final int RESULT_REPLY = RESULT_FIRST_USER;

4
briar-android/src/org/briarproject/android/groups/WriteGroupPostActivity.java
View File

@@ -20,6 +20,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorItemComparator;
@@ -42,7 +43,6 @@ import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageId;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
@@ -58,7 +58,7 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
public class WriteGroupPostActivity extends RoboActivity
public class WriteGroupPostActivity extends BriarActivity
implements OnItemSelectedListener, OnClickListener {
private static final int REQUEST_CREATE_IDENTITY = 2;

4
briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java
View File

@@ -21,6 +21,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.LocalAuthor;
@@ -32,7 +33,6 @@ import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.KeyEvent;
@@ -46,7 +46,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
public class CreateIdentityActivity extends RoboActivity
public class CreateIdentityActivity extends BriarActivity
implements OnEditorActionListener, OnClickListener {
private static final Logger LOG =

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

@@ -16,6 +16,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorItemComparator;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
@@ -32,7 +33,6 @@ 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;
import android.content.Context;
@@ -43,7 +43,7 @@ import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.widget.Toast;
public class AddContactActivity extends RoboActivity
public class AddContactActivity extends BriarActivity
implements InvitationListener {
private static final Logger LOG =