From 74c3c24f0abd71b850b0b4bc3c1b116fbecdeb5b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 May 2019 10:44:15 +0200 Subject: [PATCH] reset idle timer each time a new swap screen is loaded This means that as long as the user is using swap, it'll stay running. --- .../full/java/org/fdroid/fdroid/localrepo/SwapService.java | 6 +++++- .../org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java index 57b307158..427f3a40b 100644 --- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java +++ b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java @@ -484,7 +484,11 @@ public class SwapService extends Service { } } - private void initTimer() { + /** + * Sets or resets the idel timer for {@link #TIMEOUT}ms, once the timer + * expires, this service and all things that rely on it will be stopped. + */ + public void initTimer() { if (timer != null) { Utils.debugLog(TAG, "Cancelling existing timeout timer so timeout can be reset."); timer.cancel(); diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 4939df3f4..5949b15c8 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -472,6 +472,8 @@ public class SwapWorkflowActivity extends AppCompatActivity { } public void inflateSwapView(@LayoutRes int viewRes) { + getSwapService().initTimer(); + container.removeAllViews(); View view = ((LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE)).inflate(viewRes, container, false); currentView = (SwapView) view;