From b74b5040b11a3e45355346993a4d7e55a0cc0ee8 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 29 Apr 2021 21:57:25 +0200
Subject: [PATCH] Better timeout setting integration #974

---
 .../services/ClipboardEntryNotificationService.kt      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt
index 83cb4534d..58a9d0a7d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt
@@ -37,7 +37,6 @@ class ClipboardEntryNotificationService : LockNotificationService() {
     override val notificationId = 485
     private var mEntryInfo: EntryInfo? = null
     private var clipboardHelper: ClipboardHelper? = null
-    private var mNotificationTimeoutMilliSecs: Long = 0
 
     override fun retrieveChannelId(): String {
         return CHANNEL_CLIPBOARD_ID
@@ -68,9 +67,6 @@ class ClipboardEntryNotificationService : LockNotificationService() {
         // Get entry info from intent
         mEntryInfo = intent?.getParcelableExtra(EXTRA_ENTRY_INFO)
 
-        //Get settings
-        mNotificationTimeoutMilliSecs = PreferencesUtil.getClipboardTimeout(this)
-
         when {
             intent == null -> Log.w(TAG, "null intent")
             ACTION_NEW_NOTIFICATION == intent.action -> {
@@ -169,8 +165,10 @@ class ClipboardEntryNotificationService : LockNotificationService() {
                     this, 0, cleanIntent, PendingIntent.FLAG_UPDATE_CURRENT)
             builder.setDeleteIntent(cleanPendingIntent)
 
-            if (mNotificationTimeoutMilliSecs != NEVER) {
-                defineTimerJob(builder, mNotificationTimeoutMilliSecs, {
+            //Get settings
+            val notificationTimeoutMilliSecs = PreferencesUtil.getClipboardTimeout(this)
+            if (notificationTimeoutMilliSecs != NEVER) {
+                defineTimerJob(builder, notificationTimeoutMilliSecs, {
                     val newGeneratedValue = fieldToCopy.getGeneratedValue(mEntryInfo)
                     // New auto generated value
                     if (generatedValue != newGeneratedValue) {