diff --git a/briar-android/src/org/briarproject/android/BaseActivity.java b/briar-android/src/org/briarproject/android/BaseActivity.java index 33d66909c879b6880e5ce0777ee477dbb455ae0b..92f31ef7e52f5d526e5d534fd72e341648329506 100644 --- a/briar-android/src/org/briarproject/android/BaseActivity.java +++ b/briar-android/src/org/briarproject/android/BaseActivity.java @@ -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; diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java index cffc9727e6c8e0761176872dbf361ba049e1968b..d13dda3826ef2670ea7c6234eb292d2af17c48ed 100644 --- a/briar-android/src/org/briarproject/android/BriarActivity.java +++ b/briar-android/src/org/briarproject/android/BriarActivity.java @@ -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(); diff --git a/briar-android/src/org/briarproject/android/Destroyable.java b/briar-android/src/org/briarproject/android/DestroyableActivity.java similarity index 60% rename from briar-android/src/org/briarproject/android/Destroyable.java rename to briar-android/src/org/briarproject/android/DestroyableActivity.java index 17c7dc8503367e81337d47f0e984e8c5d0ef0077..94622406de1415117f2cbb3e1776e8d56bc759e4 100644 --- a/briar-android/src/org/briarproject/android/Destroyable.java +++ b/briar-android/src/org/briarproject/android/DestroyableActivity.java @@ -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(); diff --git a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java index 41791e962cd69bbca1106f91f53a2f99c51cdf97..c7ed7062211c8169284d52089d007522bb7b2f06 100644 --- a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java @@ -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; diff --git a/briar-android/src/org/briarproject/android/controller/handler/UiResultExceptionHandler.java b/briar-android/src/org/briarproject/android/controller/handler/UiResultExceptionHandler.java index 1f9cab0937b755488ff56313f564d2aa1553df91..04ea2ebad2e08ac7fc982767325a1a75542dc555 100644 --- a/briar-android/src/org/briarproject/android/controller/handler/UiResultExceptionHandler.java +++ b/briar-android/src/org/briarproject/android/controller/handler/UiResultExceptionHandler.java @@ -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; } diff --git a/briar-android/src/org/briarproject/android/controller/handler/UiResultHandler.java b/briar-android/src/org/briarproject/android/controller/handler/UiResultHandler.java index 03c68d7ac6c694882f37e923f764c4ff93f0bba2..9c2fbe614285339c57cc3c7917161bb8b29d19a7 100644 --- a/briar-android/src/org/briarproject/android/controller/handler/UiResultHandler.java +++ b/briar-android/src/org/briarproject/android/controller/handler/UiResultHandler.java @@ -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; } diff --git a/briar-android/src/org/briarproject/android/fragment/BaseFragment.java b/briar-android/src/org/briarproject/android/fragment/BaseFragment.java index d6f4ed363a1a125c5e88fe74de44e4f6fc779f2a..82d8f8ebc635df03feaaa59b4227e0c830bee8ab 100644 --- a/briar-android/src/org/briarproject/android/fragment/BaseFragment.java +++ b/briar-android/src/org/briarproject/android/fragment/BaseFragment.java @@ -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