Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'run-unless-activity-not-added' into 'master'

Browse Source 
Run UI actions only when the activity is added to the fragment.

Closes #1336

See merge request briar/briar!858
This commit is contained in:
akwizgran
2018-07-25 13:33:15 +00:00
parent 912dd0eb4a ede33d9278
commit 1bee58e70d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import android.os.Bundle;
import android.support.annotation.CallSuper; import android.support.annotation.CallSuper;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.view.MenuItem; import android.view.MenuItem;
import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.DbException;
@@ -56,8 +57,8 @@ public abstract class BaseFragment extends Fragment
@UiThread @UiThread
protected void finish() { protected void finish() {
if (!isDetached()) FragmentActivity activity = getActivity();
getActivity().supportFinishAfterTransition(); if (activity != null) activity.supportFinishAfterTransition();
} }
public interface BaseFragmentListener { public interface BaseFragmentListener {
@@ -85,7 +86,7 @@ public abstract class BaseFragment extends Fragment
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
// Note that we don't have to check if the activity has // Note that we don't have to check if the activity has
// been destroyed as the Fragment has not been detached yet // been destroyed as the Fragment has not been detached yet
if (!isDetached() && !activity.isFinishing()) { if (isAdded() && !activity.isFinishing()) {
r.run(); r.run();
} }
}); });