From 3fa38c29f653dc9b332ebfcf16e0a3b15c89f3f3 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 14 Oct 2022 21:06:52 +0200
Subject: [PATCH] fix: fix channel closing

---
 .../services/DatabaseTaskNotificationService.kt      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
index d75b02c0c..2b6686f8a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
@@ -124,6 +124,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
             mActionTaskListeners.remove(actionTaskListener)
         }
 
+        @ExperimentalCoroutinesApi
         fun addRequestChallengeListener(requestChallengeListener: RequestChallengeListener) {
             mainScope.launch {
                 val requestChannel = mRequestChallengeListenerChannel
@@ -138,7 +139,11 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
 
         fun removeRequestChallengeListener() {
             mainScope.launch {
-                mRequestChallengeListenerChannel?.cancel()
+                try {
+                    mRequestChallengeListenerChannel?.cancel()
+                } catch (e: Exception) {
+                    Log.w(TAG, "Request challenge listener cannot be closed.", e)
+                }
                 mRequestChallengeListenerChannel = null
             }
         }
@@ -265,6 +270,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
         mResponseChallengeChannel = null
     }
 
+    @ExperimentalCoroutinesApi
     fun respondToChallenge(response: ByteArray) {
         mainScope.launch {
             val responseChannel = mResponseChallengeChannel
@@ -416,7 +422,9 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                                         try {
                                             startService(Intent(applicationContext,
                                                     DatabaseTaskNotificationService::class.java))
-                                        } catch (e: IllegalStateException) {}
+                                        } catch (e: IllegalStateException) {
+                                            Log.w(TAG, "Cannot restart the database task service", e)
+                                        }
                                     }
                                 }
                                 mTaskRemovedRequested = false