From aaab8adce90c5e9aff23c185bb2175813fd6bd6d Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 30 Jan 2020 19:08:43 +0100 Subject: [PATCH] ExportAsyncTask: always get a wakelock. --- .../io/file/exporter/ExportAsyncTask.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java index 2ab3ef5b2..a5b984dc1 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java @@ -32,7 +32,6 @@ import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.data.TracksColumns; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.io.file.TrackFileFormat; -import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.SystemUtils; /** @@ -98,17 +97,12 @@ public class ExportAsyncTask extends AsyncTask { protected Boolean doInBackground(Void... params) { try { Thread.currentThread().setPriority(Thread.MAX_PRIORITY); - boolean isRecording = PreferencesUtils.isRecording(exportActivity); - boolean isPaused = PreferencesUtils.isRecordingTrackPaused(exportActivity); - // Get the wake lock if not recording or paused - if (!isRecording || isPaused) { - wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock); - } + + wakeLock = SystemUtils.acquireWakeLock(exportActivity, wakeLock); + return exportAllTracks(); } finally { - if (wakeLock != null && wakeLock.isHeld()) { - wakeLock.release(); - } + wakeLock = SystemUtils.releaseWakeLock(wakeLock); } }