From 4fcb2de2bb38efe225ff82f929bb152cbf7f1526 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 19 Dec 2018 17:20:37 +0100 Subject: [PATCH] Rename lock or reset timeout method --- .../java/com/kunzisoft/keepass/activities/GroupActivity.java | 2 +- .../com/kunzisoft/keepass/activities/lock/LockingActivity.kt | 4 ++-- .../main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java index 7a36a9b71..7b7c9fd13 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java @@ -345,7 +345,7 @@ public class GroupActivity extends LockingActivity private void openGroup(PwGroup group, boolean isASearch) { // Check TimeoutHelper - TimeoutHelper.INSTANCE.resetTime(this, () -> { + TimeoutHelper.INSTANCE.lockOrResetTimeout(this, () -> { // Open a group in a new fragment ListNodesFragment newListNodeFragment = ListNodesFragment.newInstance(group, getReadOnly(), isASearch); FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt index 62249797b..b582539c2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt @@ -134,14 +134,14 @@ abstract class LockingActivity : StylishActivity() { views.forEach { it.setOnFocusChangeListener { _, hasFocus -> if (hasFocus) { - TimeoutHelper.resetTime(this) + TimeoutHelper.lockOrResetTimeout(this) } } } } override fun onBackPressed() { - TimeoutHelper.resetTime(this) { + TimeoutHelper.lockOrResetTimeout(this) { super.onBackPressed() } } diff --git a/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt index bfd9a8044..19ea18219 100644 --- a/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt @@ -136,7 +136,7 @@ object TimeoutHelper { return true } - fun resetTime(activity: Activity, action: (() -> Unit)? = null) { + fun lockOrResetTimeout(activity: Activity, action: (() -> Unit)? = null) { if (checkTime(activity)) { recordTime(activity) action?.invoke()