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

Merge branch 'fix-master-ui-handlers' into 'master'

Browse Source 
Introduce a DestroyableActivity for UI result handlers



See merge request !314
This commit is contained in:
akwizgran
2016-09-08 14:52:07 +00:00
parent 49e9ee2b6d af5b246d7b
commit fd4275733f
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
public abstract class BaseActivity extends AppCompatActivity
implements Destroyable {
implements DestroyableActivity {
protected ActivityComponent activityComponent;

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

@@ -59,7 +59,6 @@ public abstract class BriarActivity extends BaseActivity {
protected void signOut(final boolean removeFromRecentApps) {
briarController.signOut(new UiResultHandler<Void>(this) {
@Override
public void onResultUi(Void result) {
if (removeFromRecentApps) startExitActivity();

4
briar-android/src/org/briarproject/android/Destroyable.java → briar-android/src/org/briarproject/android/DestroyableActivity.java
View File

@@ -2,7 +2,9 @@ package org.briarproject.android;
import android.support.annotation.UiThread;
public interface Destroyable {
public interface DestroyableActivity {
void runOnUiThread(Runnable runnable);
@UiThread
boolean hasBeenDestroyed();

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

@@ -100,7 +100,7 @@ public class FeedFragment extends BaseFragment implements
super.onStart();
feedController.onStart();
feedController.loadPersonalBlog(
new UiResultHandler<Blog>(getActivity()) {
new UiResultHandler<Blog>(listener) {
@Override
public void onResultUi(Blog b) {
personalBlog = b;

6
briar-android/src/org/briarproject/android/controller/handler/UiResultExceptionHandler.java
View File

@@ -2,14 +2,14 @@ package org.briarproject.android.controller.handler;
import android.support.annotation.UiThread;
import org.briarproject.android.fragment.BaseFragment.BaseFragmentListener;
import org.briarproject.android.DestroyableActivity;
public abstract class UiResultExceptionHandler<R, E extends Exception>
implements ResultExceptionHandler<R, E> {
private final BaseFragmentListener listener;
private final DestroyableActivity listener;
protected UiResultExceptionHandler(BaseFragmentListener listener) {
protected UiResultExceptionHandler(DestroyableActivity listener) {
this.listener = listener;
}

5
briar-android/src/org/briarproject/android/controller/handler/UiResultHandler.java
View File

@@ -2,13 +2,14 @@ package org.briarproject.android.controller.handler;
import android.support.annotation.UiThread;
import org.briarproject.android.DestroyableActivity;
import org.briarproject.android.fragment.BaseFragment.BaseFragmentListener;
public abstract class UiResultHandler<R> implements ResultHandler<R> {
private final BaseFragmentListener listener;
private final DestroyableActivity listener;
protected UiResultHandler(BaseFragmentListener listener) {
protected UiResultHandler(DestroyableActivity listener) {
this.listener = listener;
}

6
briar-android/src/org/briarproject/android/fragment/BaseFragment.java
View File

@@ -7,7 +7,7 @@ import android.support.annotation.UiThread;
import android.support.v4.app.Fragment;
import org.briarproject.android.ActivityComponent;
import org.briarproject.android.Destroyable;
import org.briarproject.android.DestroyableActivity;
public abstract class BaseFragment extends Fragment {
@@ -46,7 +46,7 @@ public abstract class BaseFragment extends Fragment {
getActivity().supportFinishAfterTransition();
}
public interface BaseFragmentListener extends Destroyable {
public interface BaseFragmentListener extends DestroyableActivity {
@UiThread
void showLoadingScreen(boolean isBlocking, int stringId);
@@ -54,8 +54,6 @@ public abstract class BaseFragment extends Fragment {
@UiThread
void hideLoadingScreen();
void runOnUiThread(Runnable runnable);
void runOnDbThread(Runnable runnable);
@UiThread