fix: Null when unbind service

Kunzisoft · Jul 28, 2023 · 68430ef · 68430ef
1 parent d46f48f
commit 68430ef
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt b/app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt
@@ -299,10 +299,15 @@ class DatabaseTaskProvider(
      * Unbind the service and assign null to the service connection to check if already unbind or not
      */
     private fun unBindService() {
-        serviceConnection?.let {
-            context.unbindService(it)
+        try {
+            serviceConnection?.let {
+                context.unbindService(it)
+            }
+        } catch (e: java.lang.Exception) {
+            Log.e(TAG, "Unable to unbind the database task service", e)
+        } finally {
+            serviceConnection = null
         }
-        serviceConnection = null
     }
 
     fun registerProgressTask() {