From c3bbd09ef39eb5c1bc99a71b4e94af245de0a80d Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 13 Dec 2017 22:32:37 +0800
Subject: [PATCH] Fix #1500

---
 .../main/java/com/github/shadowsocks/ProfilesFragment.kt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
index 0c86f1cb..0bbb181b 100644
--- a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
@@ -76,7 +76,8 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
     }
 
     @SuppressLint("ValidFragment")
-    private class QRCodeDialog() : DialogFragment() {
+    public class QRCodeDialog() : DialogFragment() {
+
         constructor(url: String) : this() {
             val bundle = Bundle()
             bundle.putString(KEY_URL, url)
@@ -104,9 +105,11 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
         }
 
         override fun onDetach() {
-            adapter?.setNdefPushMessage(null, activity)
-            adapter = null
             super.onDetach()
+            if (activity != null && !activity!!.isFinishing() && !activity!!.isDestroyed) {
+                adapter?.setNdefPushMessage(null, activity)
+            }
+            adapter = null
         }
     }