From 99d2e8388a8576ab4d439a2a4cd033a81a815565 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 14 Jun 2019 10:42:10 +0200
Subject: [PATCH] Fix crash

---
 .../VectorSettingsPreferencesFragment.kt       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
index f92925d0..3caad728 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
@@ -56,7 +56,6 @@ import im.vector.riotredesign.core.dialogs.ExportKeysDialog
 import im.vector.riotredesign.core.extensions.showPassword
 import im.vector.riotredesign.core.extensions.withArgs
 import im.vector.riotredesign.core.platform.SimpleTextWatcher
-import im.vector.riotredesign.core.platform.VectorBaseActivity
 import im.vector.riotredesign.core.platform.VectorPreferenceFragment
 import im.vector.riotredesign.core.preference.BingRule
 import im.vector.riotredesign.core.preference.ProgressBarPreference
@@ -1781,6 +1780,9 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref
      * @param errorMessage the error message
      */
     private fun onCommonDone(errorMessage: String?) {
+        if (!isAdded) {
+            return
+        }
         activity?.runOnUiThread {
             if (!TextUtils.isEmpty(errorMessage) && errorMessage != null) {
                 activity?.toast(errorMessage!!)
@@ -2600,13 +2602,15 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref
                                         passphrase,
                                         object : MatrixCallback<String> {
                                             override fun onSuccess(data: String) {
-                                                hideLoadingView()
+                                                if (isAdded) {
+                                                    hideLoadingView()
 
-                                                AlertDialog.Builder(activity)
-                                                        .setMessage(getString(R.string.encryption_export_saved_as, data))
-                                                        .setCancelable(false)
-                                                        .setPositiveButton(R.string.ok, null)
-                                                        .show()
+                                                    AlertDialog.Builder(activity)
+                                                            .setMessage(getString(R.string.encryption_export_saved_as, data))
+                                                            .setCancelable(false)
+                                                            .setPositiveButton(R.string.ok, null)
+                                                            .show()
+                                                }
                                             }
 
                                             override fun onFailure(failure: Throwable) {