From 7d53607f49f82fea5d9c7be82782eaffb43c38e3 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 29 Mar 2021 13:07:55 +0200
Subject: [PATCH] Capture exception when launching cipher action

---
 .../keepass/app/database/CipherDatabaseAction.kt      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
index eec183cda..f49d8a1d9 100644
--- a/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/app/database/CipherDatabaseAction.kt
@@ -25,6 +25,7 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.net.Uri
 import android.os.IBinder
+import android.util.Log
 import com.kunzisoft.keepass.services.AdvancedUnlockNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
@@ -76,7 +77,11 @@ class CipherDatabaseAction(context: Context) {
                     mServiceConnection!!,
                     Context.BIND_ABOVE_CLIENT)
             if (mBinder == null) {
-                applicationContext.startService(mIntentAdvancedUnlockService)
+                try {
+                    applicationContext.startService(mIntentAdvancedUnlockService)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to start cipher action", e)
+                }
             }
         }
     }
@@ -173,5 +178,7 @@ class CipherDatabaseAction(context: Context) {
         ).execute()
     }
 
-    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction)
+    companion object : SingletonHolderParameter<CipherDatabaseAction, Context>(::CipherDatabaseAction) {
+        private val TAG = CipherDatabaseAction::class.java.name
+    }
 }
\ No newline at end of file