From 6a163c035815ffe981804ff318155587fc2324e4 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 20 Jul 2018 13:28:34 -0300 Subject: [PATCH 1/2] Run UI actions only when the activity is added to the fragment. This is different from the previous behavior where we only check if it is not detached. --- .../org/briarproject/briar/android/fragment/BaseFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java index f45d7c54f..3dc3bf094 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java @@ -85,7 +85,7 @@ public abstract class BaseFragment extends Fragment activity.runOnUiThread(() -> { // Note that we don't have to check if the activity has // been destroyed as the Fragment has not been detached yet - if (!isDetached() && !activity.isFinishing()) { + if (isAdded() && !activity.isFinishing()) { r.run(); } }); From ede33d9278c4a5f471571dbe4fa93f2e26c37bbe Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 25 Jul 2018 14:19:31 +0100 Subject: [PATCH 2/2] Check for null activity in finish(). --- .../briarproject/briar/android/fragment/BaseFragment.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java index 3dc3bf094..e52d5b6b9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.support.annotation.CallSuper; import android.support.annotation.UiThread; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; import android.view.MenuItem; import org.briarproject.bramble.api.db.DbException; @@ -56,8 +57,8 @@ public abstract class BaseFragment extends Fragment @UiThread protected void finish() { - if (!isDetached()) - getActivity().supportFinishAfterTransition(); + FragmentActivity activity = getActivity(); + if (activity != null) activity.supportFinishAfterTransition(); } public interface BaseFragmentListener {