From 9c9980bba68dcc2cde156015663f1837ee45cde7 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 23 Sep 2019 11:11:53 +0200
Subject: [PATCH] Change TimeOut default to 5 minutes

---
 .../java/com/kunzisoft/keepass/settings/PreferencesUtil.kt    | 4 ++--
 .../java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt     | 3 +--
 app/src/main/res/values/donottranslate.xml                    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt
index b49bd139f..1956471b2 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt
@@ -109,8 +109,8 @@ object PreferencesUtil {
     fun getAppTimeout(context: Context): Long {
         return try {
             val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-            java.lang.Long.parseLong(prefs.getString(context.getString(R.string.app_timeout_key),
-                    context.getString(R.string.clipboard_timeout_default)) ?: "60000")
+            (prefs.getString(context.getString(R.string.app_timeout_key),
+                    context.getString(R.string.clipboard_timeout_default)) ?: "300000").toLong()
         } catch (e: NumberFormatException) {
             TimeoutHelper.DEFAULT_TIMEOUT
         }
diff --git a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
index a799645b2..646b47601 100644
--- a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
@@ -60,8 +60,7 @@ class ClipboardHelper(private val context: Context) {
         val sClipClear = prefs.getString(context.getString(R.string.clipboard_timeout_key),
                 context.getString(R.string.clipboard_timeout_default))
 
-        val clipClearTime = java.lang.Long.parseLong(sClipClear ?: "60000")
-
+        val clipClearTime = (sClipClear ?: "300000").toLong()
         if (clipClearTime > 0) {
             mTimer.schedule(ClearClipboardTask(context, text), clipClearTime)
         }
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 17d065d87..2aa1ca90c 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -109,7 +109,7 @@
     <string name="clear_clipboard_notification_key" translatable="false">clear_clipboard_notification_key</string>
     <bool name="clear_clipboard_notification_default" translatable="false">true</bool>
     <string name="clipboard_timeout_key" translatable="false">clip_timeout_key</string>
-    <string name="clipboard_timeout_default" translatable="false">60000</string>
+    <string name="clipboard_timeout_default" translatable="false">300000</string>
     <string name="settings_autofill_enable_key" translatable="false">settings_autofill_enable_key</string>
     <bool name="settings_autofill_enable_default" translatable="false">false</bool>
     <string name="keyboard_selection_entry_key" translatable="false">keyboard_selection_entry_key</string>
@@ -119,7 +119,7 @@
     <string name="keyboard_notification_entry_clear_close_key" translatable="false">keyboard_notification_entry_clear_close_key</string>
     <bool name="keyboard_notification_entry_clear_close_default" translatable="false">true</bool>
     <string name="keyboard_entry_timeout_key" translatable="false">keyboard_entry_timeout_key</string>
-    <string name="keyboard_entry_timeout_default" translatable="false">60000</string>
+    <string name="keyboard_entry_timeout_default" translatable="false">300000</string>
     <string name="keyboard_key_vibrate_key" translatable="false">keyboard_key_vibrate_key</string>
     <bool name="keyboard_key_vibrate_default" translatable="false">true</bool>
     <string name="keyboard_key_sound_key" translatable="false">keyboard_key_sound_key</string>