From 8d18970b4c3aacf28c352720fccd9e40aa1418cf Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 7 Dec 2020 20:34:23 +0100
Subject: [PATCH] Fix advanced unlock notification

---
 .../AdvancedUnlockNotificationService.kt             | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/AdvancedUnlockNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/AdvancedUnlockNotificationService.kt
index b56300fed..544fb2ce7 100644
--- a/app/src/main/java/com/kunzisoft/keepass/notifications/AdvancedUnlockNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/notifications/AdvancedUnlockNotificationService.kt
@@ -46,6 +46,10 @@ class AdvancedUnlockNotificationService : NotificationService() {
         return CHANNEL_ADVANCED_UNLOCK_ID
     }
 
+    override fun retrieveChannelName(): String {
+        return getString(R.string.advanced_unlock)
+    }
+
     override fun onBind(intent: Intent): IBinder? {
         super.onBind(intent)
         return mActionTaskBinder
@@ -125,9 +129,11 @@ class AdvancedUnlockNotificationService : NotificationService() {
         private const val ACTION_REMOVE_KEYS = "ACTION_REMOVE_KEYS"
 
         fun startServiceForTimeout(context: Context) {
-            context.startService(Intent(context, AdvancedUnlockNotificationService::class.java).apply {
-                action = ACTION_TIMEOUT
-            })
+            if (PreferencesUtil.isTempAdvancedUnlockEnable(context)) {
+                context.startService(Intent(context, AdvancedUnlockNotificationService::class.java).apply {
+                    action = ACTION_TIMEOUT
+                })
+            }
         }
     }
 }
\ No newline at end of file