From 54efad3fdf90e724de0a8ae60495365022c1bf05 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Tue, 23 Mar 2021 20:20:22 -0600
Subject: [PATCH] Fix crash with fast scroller

Fix an issue where the app would crash if the fast scroller is scrolled above the indicators. This change will be backported to 1.3.3.
---
 .../org/oxycblt/auxio/playback/system/PlaybackService.kt  | 8 ++++++--
 .../main/java/org/oxycblt/auxio/songs/FastScrollView.kt   | 2 +-
 fastlane/metadata/android/en-US/changelogs/5.txt          | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
index 2e361fe26..c05df9a1b 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
@@ -208,7 +208,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
         }
 
         // We use the wakelock to ensure that the CPU is active while music is being loaded
-        holdWakelock()
+        acquireWakeLock()
     }
 
     override fun onPlayerError(error: ExoPlaybackException) {
@@ -439,8 +439,10 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
     /**
      * Hold the wakelock for the default amount of time [25 Seconds]
      */
-    private fun holdWakelock() {
+    private fun acquireWakeLock() {
         wakeLock.acquire(WAKELOCK_TIME)
+
+        logD("Wakelock is held.")
     }
 
     /**
@@ -449,6 +451,8 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
     private fun releaseWakelock() {
         if (wakeLock.isHeld) {
             wakeLock.release()
+
+            logD("Wakelock is released.")
         }
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/songs/FastScrollView.kt b/app/src/main/java/org/oxycblt/auxio/songs/FastScrollView.kt
index 64c96b447..1ae93e5d2 100644
--- a/app/src/main/java/org/oxycblt/auxio/songs/FastScrollView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/songs/FastScrollView.kt
@@ -218,6 +218,6 @@ class FastScrollView @JvmOverloads constructor(
      * Returns if the pointer is currently in the view
      */
     private fun View.isBeingPressed(x: Int, y: Int): Boolean {
-        return (x in (left until right) && y in (top until bottom)) || isPressed
+        return y in (top until bottom)
     }
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/5.txt b/fastlane/metadata/android/en-US/changelogs/5.txt
index 04e599ad3..fd18b4015 100644
--- a/fastlane/metadata/android/en-US/changelogs/5.txt
+++ b/fastlane/metadata/android/en-US/changelogs/5.txt
@@ -1,2 +1,2 @@
 - Fixed crash that would prevent the playback state from being saved
-- Integrated fast-scroller completely in codebase
+- Completely integrated fast-scroller into codebase
\ No newline at end of file