Avoid crash when application is leaving and you try to dissmiss a dialog

AirVantage · Mar 26, 2018 · bbf1dec · bbf1dec
1 parent 4fa825c
commit bbf1dec
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/mainActivity/src/main/AndroidManifest.xml b/mainActivity/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.sierrawireless.avphone"
-    android:versionCode="47">
+    android:versionCode="48">
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

diff --git a/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressDeleteSystemTask.kt b/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressDeleteSystemTask.kt
@@ -10,6 +10,7 @@ import android.text.Html
 import android.view.View
 import android.widget.TextView
 import com.sierrawireless.avphone.R
+import com.sierrawireless.avphone.activity.MainActivity
 
 class ProgressDeleteSystemTask internal constructor(systemClient: ISystemClient, userClient: IUserClient, private val alertRuleClient: IAlertRuleClient, context: Context) : DeleteSystemTask(systemClient, userClient, alertRuleClient, context) {
 
@@ -66,8 +67,16 @@ class ProgressDeleteSystemTask internal constructor(systemClient: ISystemClient,
     }
 
     override fun onPostExecute(result: DeleteSystemResult) {
-        if (dialog!!.isShowing) {
-            dialog!!.dismiss()
+        if (!MainActivity.instance.isFinishing && !MainActivity.instance.isDestroyed) {
+            try {
+                if (dialog != null && dialog!!.isShowing) {
+                    dialog!!.dismiss()
+                }
+            } catch (e: IllegalArgumentException) {
+            } catch (e: Exception) {
+            } finally {
+                dialog = null
+            }
         }
         super.onPostExecute(result)
     }

diff --git a/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressGetUserTask.kt b/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressGetUserTask.kt
@@ -8,6 +8,7 @@ import android.support.v4.content.ContextCompat
 import android.view.View
 import android.widget.TextView
 import com.sierrawireless.avphone.R
+import com.sierrawireless.avphone.activity.MainActivity
 
 class ProgressGetUserTask internal constructor(userClient: IUserClient, context: Context) : GetUserTask(userClient, context) {
 
@@ -50,8 +51,16 @@ class ProgressGetUserTask internal constructor(userClient: IUserClient, context:
 
 
     override fun onPostExecute(result: GetUserResult) {
-        if (dialog!!.isShowing) {
-            dialog!!.dismiss()
+        if (!MainActivity.instance.isFinishing && !MainActivity.instance.isDestroyed) {
+            try {
+                if (dialog != null && dialog!!.isShowing) {
+                    dialog!!.dismiss()
+                }
+            } catch (e: IllegalArgumentException) {
+            } catch (e: Exception) {
+            } finally {
+                dialog = null
+            }
         }
         super.onPostExecute(result)
     }

diff --git a/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressSyncWithAvTask.kt b/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressSyncWithAvTask.kt
@@ -10,6 +10,7 @@ import android.text.Html
 import android.view.View
 import android.widget.TextView
 import com.sierrawireless.avphone.R
+import com.sierrawireless.avphone.activity.MainActivity
 
 class ProgressSyncWithAvTask internal constructor(applicationClient: IApplicationClient, systemClient: ISystemClient,
                                                   alertRuleClient: IAlertRuleClient, userClient: IUserClient, context: Context) : SyncWithAvTask(applicationClient, systemClient, alertRuleClient, userClient, context) {
@@ -64,8 +65,16 @@ class ProgressSyncWithAvTask internal constructor(applicationClient: IApplicatio
     }
 
     override fun onPostExecute(result: SyncWithAvResult) {
-        if (dialog!!.isShowing) {
-            dialog!!.dismiss()
+        if (!MainActivity.instance.isFinishing && !MainActivity.instance.isDestroyed) {
+            try {
+                if (dialog != null && dialog!!.isShowing) {
+                    dialog!!.dismiss()
+                }
+            } catch (e: IllegalArgumentException) {
+            } catch (e: Exception) {
+            } finally {
+                dialog = null
+            }
         }
         super.onPostExecute(result)
     }

diff --git a/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressUpdateTask.kt b/mainActivity/src/main/java/com/sierrawireless/avphone/task/ProgressUpdateTask.kt
@@ -8,6 +8,7 @@ import android.text.Html
 import android.view.View
 import android.widget.TextView
 import com.sierrawireless.avphone.R
+import com.sierrawireless.avphone.activity.MainActivity
 
 class ProgressUpdateTask internal constructor(applicationClient: IApplicationClient, systemClient: ISystemClient,
                                                   alertRuleClient: IAlertRuleClient, userClient: IUserClient, context: Context) : UpdateTask(applicationClient, systemClient, alertRuleClient, userClient, context) {
@@ -62,8 +63,16 @@ class ProgressUpdateTask internal constructor(applicationClient: IApplicationCli
     }
 
     override fun onPostExecute(result: UpdateResult) {
-        if (dialog!!.isShowing) {
-            dialog!!.dismiss()
+        if (!MainActivity.instance.isFinishing && !MainActivity.instance.isDestroyed) {
+            try {
+                if (dialog != null && dialog!!.isShowing) {
+                    dialog!!.dismiss()
+                }
+            } catch (e: IllegalArgumentException) {
+            } catch (e: Exception) {
+            } finally {
+                dialog = null
+            }
         }
         super.onPostExecute(result)
     }