From 0e0b356f6b45600119a9779650f49fb2626f5f5a Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 22 May 2022 16:24:38 -0500
Subject: [PATCH] Fix:Reset volume when playing from notification after sleep
 timer decreases volume #182

---
 .../java/com/audiobookshelf/app/player/PlayerListener.kt     | 3 ++-
 .../audiobookshelf/app/player/PlayerNotificationService.kt   | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerListener.kt b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerListener.kt
index c363e2d0..17aff650 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerListener.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerListener.kt
@@ -15,7 +15,7 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
   private var onSeekBack: Boolean = false
 
   override fun onPlayerError(error: PlaybackException) {
-    var errorMessage = error.message ?: "Unknown Error"
+    val errorMessage = error.message ?: "Unknown Error"
     Log.e(tag, "onPlayerError $errorMessage")
     playerNotificationService.handlePlayerPlaybackError(errorMessage) // If was direct playing session, fallback to transcode
   }
@@ -90,6 +90,7 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
       // Start/stop progress sync interval
       Log.d(tag, "Playing ${playerNotificationService.getCurrentBookTitle()}")
       if (player.isPlaying) {
+        player.volume = 1F // Volume on sleep timer might have decreased this
         playerNotificationService.mediaProgressSyncer.start()
       } else {
         playerNotificationService.mediaProgressSyncer.stop()
diff --git a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt
index 39310a9b..b4fa95b4 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt
@@ -9,7 +9,6 @@ import android.hardware.SensorManager
 import android.os.*
 import android.support.v4.media.MediaBrowserCompat
 import android.support.v4.media.MediaDescriptionCompat
-import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaControllerCompat
 import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
@@ -357,7 +356,9 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
       Log.d(tag, "Prepare complete for session ${currentPlaybackSession?.displayTitle} | ${currentPlayer.mediaItemCount}")
       currentPlayer.playWhenReady = playWhenReady
       currentPlayer.setPlaybackSpeed(playbackRateToUse)
+
       currentPlayer.prepare()
+
     } else if (castPlayer != null) {
       val currentTrackIndex = playbackSession.getCurrentTrackIndex()
       val currentTrackTime = playbackSession.getCurrentTrackTimeMs()
@@ -521,12 +522,10 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
 
   fun seekForward(amount: Long) {
    seekPlayer(getCurrentTime() + amount)
-//    currentPlayer.seekTo(currentPlayer.currentPosition + amount)
   }
 
   fun seekBackward(amount: Long) {
     seekPlayer(getCurrentTime() - amount)
-//    currentPlayer.seekTo(currentPlayer.currentPosition - amount)
   }
 
   fun setPlaybackSpeed(speed: Float) {