Fix #1500

2017-12-13 22:32:37 +08:00
parent ea7ede033d
commit c3bbd09ef3
1 changed files with 6 additions and 3 deletions
@@ -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
        }
    }