From ede33d9278c4a5f471571dbe4fa93f2e26c37bbe Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 25 Jul 2018 14:19:31 +0100
Subject: [PATCH] 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 3dc3bf0949..e52d5b6b90 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 {
--
GitLab