Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +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

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