iOS version bump 0.9.50

Add:iOS device settings for jump forward/backward
Version bump 0.9.50
2026-07-25 14:08:35 +02:00 · 2022-07-02 18:30:22 -05:00 · 2022-07-02 18:29:41 -05:00 · 2022-07-02 16:40:31 -05:00 · 2022-07-02 15:40:37 -05:00 · 2022-07-02 15:03:21 -05:00
62 changed files with 1090 additions and 399 deletions
@@ -29,8 +29,8 @@ android {
        applicationId "com.audiobookshelf.app"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 77
-        versionName "0.9.47-beta"
+        versionCode 81
+        versionName "0.9.50-beta"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -1,10 +1,13 @@
 package com.audiobookshelf.app

 import android.Manifest
-import android.app.DownloadManager
-import android.content.*
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
 import android.content.pm.PackageManager
-import android.os.*
+import android.os.Bundle
+import android.os.IBinder
 import android.util.Log
 import androidx.core.app.ActivityCompat
 import com.anggrayudi.storage.SimpleStorage
@@ -140,9 +143,4 @@ class MainActivity : BridgeActivity() {
    // Mandatory for Activity, but not for Fragment & ComponentActivity
    storageHelper.onRequestPermissionsResult(requestCode, permissions, grantResults)
  }
-
-//  override fun onUserInteraction() {
-//    super.onUserInteraction()
-//    Log.d(tag, "USER INTERACTION")
-//  }
 }
@@ -399,7 +399,12 @@ data class BookChapter(
  var start:Double,
  var end:Double,
  var title:String?
-)
+) {
+  @get:JsonIgnore
+  val startMs get() = (start * 1000L).toLong()
+  @get:JsonIgnore
+  val endMs get() = (end * 1000L).toLong()
+}

@JsonIgnoreProperties(ignoreUnknown = true)
 data class MediaProgress(
@@ -10,7 +10,7 @@ class DbManager {
  val tag = "DbManager"

  fun getDeviceData(): DeviceData {
-    return Paper.book("device").read("data") ?: DeviceData(mutableListOf(), null, null)
+    return Paper.book("device").read("data") ?: DeviceData(mutableListOf(), null, null, DeviceSettings.default())
  }
  fun saveDeviceData(deviceData:DeviceData) {
    Paper.book("device").write("data", deviceData)
@@ -147,6 +147,7 @@ class DbManager {

      // Check local files
      lli.localFiles = lli.localFiles.filter { localFile ->
+
        val file = File(localFile.absolutePath)
        if (!file.exists()) {
          Log.d(tag, "cleanLocalLibraryItems: Local file ${localFile.absolutePath} was removed from library item ${lli.media.metadata.title}")
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
-import java.util.*

 data class ServerConnectionConfig(
  var id:String,
@@ -13,13 +12,33 @@ data class ServerConnectionConfig(
  var address:String,
  var userId:String,
  var username:String,
-  var token:String
+  var token:String,
+  var customHeaders:Map<String, String>?
 )

+data class DeviceSettings(
+  var disableAutoRewind:Boolean,
+  var jumpBackwardsTime:Int,
+  var jumpForwardTime:Int
+) {
+  companion object {
+    // Static method to get default device settings
+    fun default():DeviceSettings {
+      return DeviceSettings(false, 10, 10)
+    }
+  }
+
+  @get:JsonIgnore
+  val jumpBackwardsTimeMs get() = jumpBackwardsTime * 1000L
+  @get:JsonIgnore
+  val jumpForwardTimeMs get() = jumpForwardTime * 1000L
+}
+
 data class DeviceData(
  var serverConnectionConfigs:MutableList<ServerConnectionConfig>,
  var lastServerConnectionConfigId:String?,
-  var currentLocalPlaybackSession:PlaybackSession? // Stored to open up where left off for local media
+  var currentLocalPlaybackSession:PlaybackSession?, // Stored to open up where left off for local media
+  var deviceSettings:DeviceSettings?
 ) {
  @JsonIgnore
  fun getLastServerConnectionConfig():ServerConnectionConfig? {
@@ -67,15 +67,21 @@ class PlaybackSession(

  @JsonIgnore
  fun getCurrentTrackIndex():Int {
-    for (i in 0..(audioTracks.size - 1)) {
+    for (i in 0 until audioTracks.size) {
      val track = audioTracks[i]
-      if (currentTimeMs >= track.startOffsetMs && (track.endOffsetMs) > currentTimeMs) {
+      if (currentTimeMs >= track.startOffsetMs && (track.endOffsetMs > currentTimeMs)) {
        return i
      }
    }
    return audioTracks.size - 1
  }

+  @JsonIgnore
+  fun getChapterForTime(time:Long):BookChapter? {
+    if (chapters.isEmpty()) return null
+    return chapters.find { time >= it.startMs && it.endMs > time}
+  }
+
  @JsonIgnore
  fun getCurrentTrackTimeMs():Long {
    val currentTrack = audioTracks[this.getCurrentTrackIndex()]
@@ -26,4 +26,9 @@ object DeviceManager {
  fun getBase64Id(id:String):String {
    return android.util.Base64.encodeToString(id.toByteArray(), android.util.Base64.URL_SAFE or android.util.Base64.NO_WRAP)
  }
+
+  fun getServerConnectionConfig(id:String?):ServerConnectionConfig? {
+    if (id == null) return null
+    return deviceData.serverConnectionConfigs.find { it.id == id }
+  }
 }
@@ -105,7 +105,7 @@ class FolderScanner(var ctx: Context) {
    var coverContentUrl:String? = null
    var coverAbsolutePath:String? = null

-    val filesInFolder = itemFolder.search(false, DocumentFileType.FILE, arrayOf("audio/*", "image/*", "video/mp4"))
+    val filesInFolder = itemFolder.search(false, DocumentFileType.FILE, arrayOf("audio/*", "image/*", "video/mp4", "application/octet-stream"))

    val existingLocalFilesRemoved = existingLocalFiles.filter { elf ->
      filesInFolder.find { fif -> DeviceManager.getBase64Id(fif.id) == elf.id } == null // File was not found in media item folder
@@ -157,11 +157,11 @@ class FolderScanner(var ctx: Context) {
            audioTrackToAdd = existingAudioTrack
          } else {
            // Create new audio track
-            var track = AudioTrack(index, startOffset, audioProbeResult.duration, filename, localFile.contentUrl, mimeType, null, true, localFileId, audioProbeResult, null)
+            val track = AudioTrack(index, startOffset, audioProbeResult?.duration ?: 0.0, filename, localFile.contentUrl, mimeType, null, true, localFileId, audioProbeResult, null)
            audioTrackToAdd = track
          }

-          startOffset += audioProbeResult.duration
+          startOffset += audioProbeResult?.duration ?: 0.0
          isNewOrUpdated = true
        } else {
          audioTrackToAdd = existingAudioTrack
@@ -248,7 +248,7 @@ class FolderScanner(var ctx: Context) {

    val localLibraryItemId = getLocalLibraryItemId(itemFolderId)
    Log.d(tag, "scanDownloadItem starting for ${downloadItem.itemFolderPath} | ${df.uri} | Item Folder Id:$itemFolderId | LLI Id:$localLibraryItemId")
-    
+
    // Search for files in media item folder
    // m4b files showing as mimeType application/octet-stream on Android 10 and earlier see #154
    val filesFound = df.search(false, DocumentFileType.FILE, arrayOf("audio/*", "image/*", "video/mp4", "application/octet-stream"))
@@ -289,7 +289,7 @@ class FolderScanner(var ctx: Context) {
          val audioProbeResult = probeAudioFile(localFile.absolutePath)

          // Create new audio track
-          val track = AudioTrack(audioTrackFromServer.index, audioTrackFromServer.startOffset, audioProbeResult.duration, localFile.filename ?: "", localFile.contentUrl, localFile.mimeType ?: "", null, true, localFileId, audioProbeResult, audioTrackFromServer?.index ?: -1)
+          val track = AudioTrack(audioTrackFromServer.index, audioTrackFromServer.startOffset, audioProbeResult?.duration ?: 0.0, localFile.filename ?: "", localFile.contentUrl, localFile.mimeType ?: "", null, true, localFileId, audioProbeResult, audioTrackFromServer.index)
          audioTracks.add(track)

          Log.d(tag, "scanDownloadItem: Created Audio Track with index ${track.index} from local file ${localFile.absolutePath}")
@@ -378,7 +378,7 @@ class FolderScanner(var ctx: Context) {
    var wasUpdated = false

    // Search for files in media item folder
-    val filesFound = df.search(false, DocumentFileType.FILE, arrayOf("audio/*", "image/*", "video/mp4"))
+    val filesFound = df.search(false, DocumentFileType.FILE, arrayOf("audio/*", "image/*", "video/mp4", "application/octet-stream"))
    Log.d(tag, "scanLocalLibraryItem ${filesFound.size} files found in ${localLibraryItem.absolutePath}")

    filesFound.forEach {
@@ -431,7 +431,7 @@ class FolderScanner(var ctx: Context) {
            // Create new audio track
            val lastTrack = existingAudioTracks.lastOrNull()
            val startOffset = (lastTrack?.startOffset ?: 0.0) + (lastTrack?.duration ?: 0.0)
-            val track = AudioTrack(existingAudioTracks.size, startOffset, audioProbeResult.duration, localFile.filename ?: "", localFile.contentUrl, localFile.mimeType ?: "", null, true, localFileId, audioProbeResult, null)
+            val track = AudioTrack(existingAudioTracks.size, startOffset, audioProbeResult?.duration ?: 0.0, localFile.filename ?: "", localFile.contentUrl, localFile.mimeType ?: "", null, true, localFileId, audioProbeResult, null)
            localLibraryItem.media.addAudioTrack(track)
            Log.d(tag, "Added New Audio Track ${track.title}")
            wasUpdated = true
@@ -463,12 +463,18 @@ class FolderScanner(var ctx: Context) {
    return LocalLibraryItemScanResult(wasUpdated, localLibraryItem)
  }

-  fun probeAudioFile(absolutePath:String):AudioProbeResult {
-    var session = FFprobeKit.execute("-i \"${absolutePath}\" -print_format json -show_format -show_streams -select_streams a -show_chapters -loglevel quiet")
+  fun probeAudioFile(absolutePath:String):AudioProbeResult? {
+    val session = FFprobeKit.execute("-i \"${absolutePath}\" -print_format json -show_format -show_streams -select_streams a -show_chapters -loglevel quiet")
    Log.d(tag, "FFprobe output ${JSObject(session.output)}")

-    val audioProbeResult = jacksonMapper.readValue<AudioProbeResult>(session.output)
-    Log.d(tag, "Probe Result DATA ${audioProbeResult.duration} | ${audioProbeResult.size} | ${audioProbeResult.title} | ${audioProbeResult.artist}")
-    return audioProbeResult
+    val probeObject = JSObject(session.output)
+    if (!probeObject.has("streams")) { // Check if output is empty
+      Log.d(tag, "probeAudioFile Probe audio file $absolutePath is empty")
+      return null
+    } else {
+      val audioProbeResult = jacksonMapper.readValue<AudioProbeResult>(session.output)
+      Log.d(tag, "Probe Result DATA ${audioProbeResult.duration} | ${audioProbeResult.size} | ${audioProbeResult.title} | ${audioProbeResult.artist}")
+      return audioProbeResult
+    }
  }
 }
@@ -8,10 +8,16 @@ import com.audiobookshelf.app.device.DeviceManager
 import com.audiobookshelf.app.server.ApiHandler
 import java.util.*
 import io.paperdb.Paper
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine

 class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
  val tag = "MediaManager"

+  var isPaperInitialized = false
+
  var serverLibraryItems = listOf<LibraryItem>()
  var selectedLibraryId = ""

@@ -24,8 +30,11 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
  var serverConfigIdUsed:String? = null

  fun initializeAndroidAuto() {
-    Log.d(tag, "Android Auto started when MainActivity was never started - initializing Paper")
-    Paper.init(ctx)
+    if (!isPaperInitialized) {
+      Log.d(tag, "Android Auto started when MainActivity was never started - initializing Paper")
+      Paper.init(ctx)
+      isPaperInitialized = true
+    }
  }

  fun getIsLibrary(id:String) : Boolean {
@@ -137,6 +146,48 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    }
  }

+  suspend fun checkServerConnection(config:ServerConnectionConfig) : Boolean {
+    var successfulPing = false
+    suspendCoroutine<Boolean> { cont ->
+      apiHandler.pingServer(config) {
+        Log.d(tag, "checkServerConnection: Checked server conn for ${config.address} result = $it")
+        successfulPing = it
+        cont.resume(it)
+      }
+    }
+    return successfulPing
+  }
+
+  fun checkSetValidServerConnectionConfig(cb: (Boolean) -> Unit) = runBlocking {
+    if (!apiHandler.isOnline()) cb(false)
+    else {
+      coroutineScope {
+        var hasValidConn = false
+
+        // First check if the current selected config is pingable
+        DeviceManager.serverConnectionConfig?.let {
+          hasValidConn = checkServerConnection(it)
+          Log.d(tag, "checkSetValidServerConnectionConfig: Current config ${DeviceManager.serverAddress} is pingable? $hasValidConn")
+        }
+
+        if (!hasValidConn) {
+          // Loop through available configs and check if can connect
+          for (config: ServerConnectionConfig in DeviceManager.deviceData.serverConnectionConfigs) {
+            val result = checkServerConnection(config)
+
+            if (result) {
+              hasValidConn = true
+              DeviceManager.serverConnectionConfig = config
+              break
+            }
+          }
+        }
+
+        cb(hasValidConn)
+      }
+    }
+  }
+
  // TODO: Load currently listening category for local items
  fun loadLocalCategory():List<LibraryCategory> {
    val localBooks = DeviceManager.dbManager.getLocalLibraryItems("book")
@@ -158,35 +209,32 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    val localCategories = loadLocalCategory()
    cats.addAll(localCategories)

-    // Connected to server and has internet - load other cats
-    if (apiHandler.isOnline() && (DeviceManager.isConnectedToServer || DeviceManager.hasLastServerConnectionConfig)) {
-      if (!DeviceManager.isConnectedToServer) {
-        DeviceManager.serverConnectionConfig = DeviceManager.deviceData.getLastServerConnectionConfig()
-        Log.d(tag, "Not connected to server, set last server \"${DeviceManager.serverAddress}\"")
-      }
+    // Check if any valid server connection if not use locally downloaded books
+    checkSetValidServerConnectionConfig { isConnected ->
+      if (isConnected) {
+        serverConfigIdUsed = DeviceManager.serverConnectionConfigId

-      serverConfigIdUsed = DeviceManager.serverConnectionConfigId
+        loadLibraries { libraries ->
+          val library = libraries[0]
+          Log.d(tag, "Loading categories for library ${library.name} - ${library.id} - ${library.mediaType}")

-      loadLibraries { libraries ->
-        val library = libraries[0]
-        Log.d(tag, "Loading categories for library ${library.name} - ${library.id} - ${library.mediaType}")
+          loadLibraryCategories(library.id) { libraryCategories ->

-        loadLibraryCategories(library.id) { libraryCategories ->
-
-          // Only using book or podcast library categories for now
-          libraryCategories.forEach {
-            // Log.d(tag, "Found library category ${it.label} with type ${it.type}")
-            if (it.type == library.mediaType) {
-              // Log.d(tag, "Using library category ${it.id}")
-              cats.add(it)
+            // Only using book or podcast library categories for now
+            libraryCategories.forEach {
+              // Log.d(tag, "Found library category ${it.label} with type ${it.type}")
+              if (it.type == library.mediaType) {
+                // Log.d(tag, "Using library category ${it.id}")
+                cats.add(it)
+              }
            }
-          }

-          cb(cats)
+            cb(cats)
+          }
        }
+      } else { // Not connected/no internet sent downloaded cats only
+        cb(cats)
      }
-    } else { // Not connected/no internet sent downloaded cats only
-      cb(cats)
    }
  }

@@ -227,14 +275,18 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    }
  }

-  fun play(libraryItemWrapper:LibraryItemWrapper, episode:PodcastEpisode?, playItemRequestPayload:PlayItemRequestPayload, cb: (PlaybackSession) -> Unit) {
+  fun play(libraryItemWrapper:LibraryItemWrapper, episode:PodcastEpisode?, playItemRequestPayload:PlayItemRequestPayload, cb: (PlaybackSession?) -> Unit) {
   if (libraryItemWrapper is LocalLibraryItem) {
    val localLibraryItem = libraryItemWrapper as LocalLibraryItem
    cb(localLibraryItem.getPlaybackSession(episode))
   } else {
     val libraryItem = libraryItemWrapper as LibraryItem
     apiHandler.playLibraryItem(libraryItem.id,episode?.id ?: "",playItemRequestPayload) {
-       cb(it)
+       if (it == null) {
+         cb(null)
+       } else {
+         cb(it)
+       }
     }
   }
  }
@@ -21,9 +21,6 @@ class AbMediaDescriptionAdapter constructor(private val controller: MediaControl
  var currentIconUri: Uri? = null
  var currentBitmap: Bitmap? = null

-  private val glideOptions = RequestOptions()
-    .fallback(R.drawable.icon)
-    .diskCacheStrategy(DiskCacheStrategy.DATA)
  private val serviceJob = SupervisorJob()
  private val serviceScope = CoroutineScope(Dispatchers.Main + serviceJob)

@@ -88,7 +88,7 @@ class CastPlayer(var castContext: CastContext) : BasePlayer() {
  private var currentMediaItemIndex = 0
  private var pendingMediaItemRemovalPosition:PositionInfo? = null
  private var pendingSeekCount = 0
-  private var pendingSeekWindowIndex = 0
+  private var pendingSeekWindowIndex = C.INDEX_UNSET
  private var pendingSeekPositionMs = 0L

  init {
@@ -25,9 +25,12 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
    Log.d(tag, "ON PREPARE MEDIA SESSION COMPAT")
    playerNotificationService.mediaManager.getFirstItem()?.let { li ->
      playerNotificationService.mediaManager.play(li, null, playerNotificationService.getPlayItemRequestPayload(false)) {
-        Log.d(tag, "About to prepare player with ${it.displayTitle}")
-        Handler(Looper.getMainLooper()).post() {
-          playerNotificationService.preparePlayer(it,true,null)
+        if (it == null) {
+          Log.e(tag, "Failed to play library item")
+        } else {
+          Handler(Looper.getMainLooper()).post() {
+            playerNotificationService.preparePlayer(it,true,null)
+          }
        }
      }
    }
@@ -47,9 +50,12 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
    Log.d(tag, "ON PLAY FROM SEARCH $query")
    playerNotificationService.mediaManager.getFromSearch(query)?.let { li ->
      playerNotificationService.mediaManager.play(li, null, playerNotificationService.getPlayItemRequestPayload(false)) {
-        Log.d(tag, "About to prepare player with ${it.displayTitle}")
-        Handler(Looper.getMainLooper()).post() {
-          playerNotificationService.preparePlayer(it,true,null)
+        if (it == null) {
+           Log.e(tag, "Failed to play library item")
+        } else {
+          Handler(Looper.getMainLooper()).post() {
+            playerNotificationService.preparePlayer(it, true, null)
+          }
        }
      }
    }
@@ -105,9 +111,12 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi

    libraryItemWrapper?.let { li ->
      playerNotificationService.mediaManager.play(li, podcastEpisode, playerNotificationService.getPlayItemRequestPayload(false)) {
-        Log.d(tag, "About to prepare player with ${it.displayTitle}")
-        Handler(Looper.getMainLooper()).post() {
-          playerNotificationService.preparePlayer(it,true,null)
+        if (it == null) {
+         Log.e(tag, "Failed to play library item")
+        } else {
+          Handler(Looper.getMainLooper()).post() {
+            playerNotificationService.preparePlayer(it, true, null)
+          }
        }
      }
    }
@@ -31,8 +31,12 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat
    Log.d(tag, "ON PREPARE $playWhenReady")
    playerNotificationService.mediaManager.getFirstItem()?.let { li ->
      playerNotificationService.mediaManager.play(li, null, playerNotificationService.getPlayItemRequestPayload(false)) {
-        Handler(Looper.getMainLooper()).post() {
-          playerNotificationService.preparePlayer(it,playWhenReady,null)
+        if (it == null) {
+          Log.e(tag, "Failed to play library item")
+        } else {
+          Handler(Looper.getMainLooper()).post() {
+            playerNotificationService.preparePlayer(it, playWhenReady, null)
+          }
        }
      }
    }
@@ -54,9 +58,12 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat

    libraryItemWrapper?.let { li ->
      playerNotificationService.mediaManager.play(li, podcastEpisode, playerNotificationService.getPlayItemRequestPayload(false)) {
-        Log.d(tag, "About to prepare player with ${it.displayTitle}")
-        Handler(Looper.getMainLooper()).post() {
-          playerNotificationService.preparePlayer(it,playWhenReady,null)
+        if (it == null) {
+         Log.e(tag, "Failed to play library item")
+        } else {
+          Handler(Looper.getMainLooper()).post() {
+            playerNotificationService.preparePlayer(it, playWhenReady, null)
+          }
        }
      }
    }
@@ -66,9 +73,12 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat
    Log.d(tag, "ON PREPARE FROM SEARCH $query")
    playerNotificationService.mediaManager.getFromSearch(query)?.let { li ->
      playerNotificationService.mediaManager.play(li, null, playerNotificationService.getPlayItemRequestPayload(false)) {
-        Log.d(tag, "About to prepare player with ${it.displayTitle}")
-        Handler(Looper.getMainLooper()).post() {
-          playerNotificationService.preparePlayer(it,playWhenReady,null)
+        if (it == null) {
+         Log.e(tag, "Failed to play library item")
+        } else {
+          Handler(Looper.getMainLooper()).post() {
+            playerNotificationService.preparePlayer(it, playWhenReady, null)
+          }
        }
      }
    }
@@ -2,10 +2,11 @@ package com.audiobookshelf.app.player

 import android.util.Log
 import com.audiobookshelf.app.data.PlayerState
+import com.audiobookshelf.app.device.DeviceManager
 import com.google.android.exoplayer2.PlaybackException
 import com.google.android.exoplayer2.Player

-const val PAUSE_LEN_BEFORE_RECHECK = 60000 // 1 minute
+const val PAUSE_LEN_BEFORE_RECHECK = 30000 // 30 seconds

 class PlayerListener(var playerNotificationService:PlayerNotificationService) : Player.Listener {
  var tag = "PlayerListener"
@@ -23,7 +24,7 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
  }

  override fun onEvents(player: Player, events: Player.Events) {
-    Log.d(tag, "onEvents ${player.deviceInfo} | ${playerNotificationService.getMediaPlayer()} | ${events.size()}")
+    Log.d(tag, "onEvents ${playerNotificationService.getMediaPlayer()} | ${events.size()}")

    if (events.contains(Player.EVENT_POSITION_DISCONTINUITY)) {
      Log.d(tag, "EVENT_POSITION_DISCONTINUITY")
@@ -69,23 +70,30 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :

      if (player.isPlaying) {
        Log.d(tag, "SeekBackTime: Player is playing")
-        if (lastPauseTime > 0) {
+        if (lastPauseTime > 0 && DeviceManager.deviceData.deviceSettings?.disableAutoRewind != true) {
          if (onSeekBack) onSeekBack = false
          else {
            Log.d(tag, "SeekBackTime: playing started now set seek back time $lastPauseTime")
            var backTime = calcPauseSeekBackTime()
            if (backTime > 0) {
-              if (backTime >= playerNotificationService.getCurrentTime()) backTime = playerNotificationService.getCurrentTime() - 500
+              // Current chapter is used so that seek back does not go back to the previous chapter
+              val currentChapter = playerNotificationService.getCurrentBookChapter()
+              val minSeekBackTime = currentChapter?.startMs ?: 0
+
+              val currentTime = playerNotificationService.getCurrentTime()
+              val newTime = currentTime - backTime
+              if (newTime < minSeekBackTime) {
+                backTime = currentTime - minSeekBackTime
+              }
              Log.d(tag, "SeekBackTime $backTime")
              onSeekBack = true
              playerNotificationService.seekBackward(backTime)
-            } else {
-              Log.d(tag, "SeekBackTime: back time is 0")
            }
          }

          // Check if playback session still exists or sync media progress if updated
-          if (lastPauseTime > PAUSE_LEN_BEFORE_RECHECK) {
+          val pauseLength: Long = System.currentTimeMillis() - lastPauseTime
+          if (pauseLength > PAUSE_LEN_BEFORE_RECHECK) {
            val shouldCarryOn = playerNotificationService.checkCurrentSessionProgress()
            if (!shouldCarryOn) return
          }
@@ -112,8 +120,9 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
    if (lastPauseTime <= 0) return 0
    val time: Long = System.currentTimeMillis() - lastPauseTime
    val seekback: Long
-    if (time < 3000) seekback = 0
-    else if (time < 300000) seekback = 10000 // 3s to 5m = jump back 10s
+    if (time < 10000) seekback = 0 // 10s or less = no seekback
+    else if (time < 60000) seekback = 3000 // 10s to 1m = jump back 3s
+    else if (time < 300000) seekback = 10000 // 1m to 5m = jump back 10s
    else if (time < 1800000) seekback = 20000 // 5m to 30m = jump back 20s
    else seekback = 29500 // 30m and up = jump back 30s
    return seekback
@@ -14,6 +14,7 @@ class PlayerNotificationListener(var playerNotificationService:PlayerNotificatio

    // Start foreground service
    Log.d(tag, "Notification Posted $notificationId - Start Foreground | $notification")
+    PlayerNotificationService.isClosed = false
    playerNotificationService.startForeground(notificationId, notification)
  }

@@ -26,6 +27,12 @@ class PlayerNotificationListener(var playerNotificationService:PlayerNotificatio
      playerNotificationService.stopSelf()
    } else {
      Log.d(tag, "onNotificationCancelled not dismissed by user")
+
+      // When stop button is pressed on the notification I guess it isn't considered "dismissedByUser" so we need to close playback ourselves
+      if (!PlayerNotificationService.isClosed) {
+        Log.d(tag, "PNS is not closed - closing it now")
+        playerNotificationService.closePlayback()
+      }
    }
  }
 }
@@ -41,6 +41,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {

  companion object {
    var isStarted = false
+    var isClosed = false
  }

  interface ClientEventEmitter {
@@ -112,11 +113,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    fun getService(): PlayerNotificationService = this@PlayerNotificationService
  }

-  fun stopService(context: Context) {
-    val stopIntent = Intent(context, PlayerNotificationService::class.java)
-    context.stopService(stopIntent)
-  }
-
  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
    isStarted = true
    Log.d(tag, "onStartCommand $startId")
@@ -159,31 +155,11 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    stopSelf()
  }

-
  override fun onCreate() {
+    Log.d(tag, "onCreate")
    super.onCreate()
    ctx = this

-    // Initialize player
-    val customLoadControl:LoadControl = DefaultLoadControl.Builder().setBufferDurationsMs(
-      1000 * 20, // 20s min buffer
-      1000 * 45, // 45s max buffer
-      1000 * 5, // 5s playback start
-      1000 * 20 // 20s playback rebuffer
-    ).build()
-
-    mPlayer = ExoPlayer.Builder(this)
-      .setLoadControl(customLoadControl)
-      .setSeekBackIncrementMs(10000)
-      .setSeekForwardIncrementMs(10000)
-      .build()
-    mPlayer.setHandleAudioBecomingNoisy(true)
-    mPlayer.addListener(PlayerListener(this))
-    val audioAttributes:AudioAttributes = AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.CONTENT_TYPE_SPEECH).build()
-    mPlayer.setAudioAttributes(audioAttributes, true)
-
-    currentPlayer = mPlayer
-
    // Initialize API
    apiHandler = ApiHandler(ctx)

@@ -234,6 +210,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    playerNotificationManager.setUseNextAction(false)
    playerNotificationManager.setUsePreviousAction(false)
    playerNotificationManager.setUseChronometer(false)
+    playerNotificationManager.setUseStopAction(true)
    playerNotificationManager.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
    playerNotificationManager.setPriority(NotificationCompat.PRIORITY_MAX)
    playerNotificationManager.setUseFastForwardActionInCompactView(true)
@@ -276,17 +253,47 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    )
    mediaSessionConnector.setQueueNavigator(queueNavigator)
    mediaSessionConnector.setPlaybackPreparer(MediaSessionPlaybackPreparer(this))
-    mediaSessionConnector.setPlayer(mPlayer)
+
+    mediaSession.setCallback(MediaSessionCallback(this))
+
+    initializeMPlayer()
+    currentPlayer = mPlayer
+  }
+
+  private fun initializeMPlayer() {
+    val customLoadControl:LoadControl = DefaultLoadControl.Builder().setBufferDurationsMs(
+      1000 * 20, // 20s min buffer
+      1000 * 45, // 45s max buffer
+      1000 * 5, // 5s playback start
+      1000 * 20 // 20s playback rebuffer
+    ).build()
+
+    val seekBackTime = DeviceManager.deviceData.deviceSettings?.jumpBackwardsTimeMs ?: 10000
+    val seekForwardTime = DeviceManager.deviceData.deviceSettings?.jumpForwardTimeMs ?: 10000
+    Log.d(tag, "Seek Back Time $seekBackTime")
+    Log.d(tag, "Seek Forward Time $seekForwardTime")
+
+    mPlayer = ExoPlayer.Builder(this)
+      .setLoadControl(customLoadControl)
+      .setSeekBackIncrementMs(seekBackTime)
+      .setSeekForwardIncrementMs(seekForwardTime)
+      .build()
+    mPlayer.setHandleAudioBecomingNoisy(true)
+    mPlayer.addListener(PlayerListener(this))
+    val audioAttributes:AudioAttributes = AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.CONTENT_TYPE_SPEECH).build()
+    mPlayer.setAudioAttributes(audioAttributes, true)

    //attach player to playerNotificationManager
    playerNotificationManager.setPlayer(mPlayer)
-    mediaSession.setCallback(MediaSessionCallback(this))
+
+    mediaSessionConnector.setPlayer(mPlayer)
  }

  /*
    User callable methods
  */
  fun preparePlayer(playbackSession: PlaybackSession, playWhenReady:Boolean, playbackRate:Float?) {
+    isClosed = false
    val playbackRateToUse = playbackRate ?: initialPlaybackRate ?: 1f
    initialPlaybackRate = playbackRate

@@ -381,8 +388,13 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
        val libraryItemId = playbackSession.libraryItemId ?: "" // Must be true since direct play
        val episodeId = playbackSession.episodeId
        apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
-          Handler(Looper.getMainLooper()).post {
-            preparePlayer(it, true, null)
+          if (it == null) { // Play request failed
+            clientEventEmitter?.onPlaybackFailed(errorMessage)
+            closePlayback()
+          } else {
+            Handler(Looper.getMainLooper()).post {
+              preparePlayer(it, true, null)
+            }
          }
        }
      } else {
@@ -400,8 +412,12 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      val libraryItemId = playbackSession.libraryItemId ?: "" // Must be true since direct play
      val episodeId = playbackSession.episodeId
      apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
-        Handler(Looper.getMainLooper()).post {
-          preparePlayer(it, true, null)
+        if (it == null) {
+          Log.e(tag, "Failed to start new playback session")
+        } else {
+          Handler(Looper.getMainLooper()).post {
+            preparePlayer(it, true, null)
+          }
        }
      }
    }
@@ -498,6 +514,10 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    return currentPlaybackSession?.id
  }

+  fun getCurrentBookChapter():BookChapter? {
+    return currentPlaybackSession?.getChapterForTime(this.getCurrentTime())
+  }
+
  // Called from PlayerListener play event
  // check with server if progress has updated since last play and sync progress update
  fun checkCurrentSessionProgress():Boolean {
@@ -509,10 +529,19 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      }

      if (playbackSession.isLocal) {
+
+        // Make sure this connection config exists
+        val serverConnectionConfig = DeviceManager.getServerConnectionConfig(playbackSession.serverConnectionConfigId)
+        if (serverConnectionConfig == null) {
+          Log.d(tag, "checkCurrentSessionProgress: Local library item server connection config is not saved ${playbackSession.serverConnectionConfigId}")
+          return true // carry on
+        }
+
        // Local playback session check if server has updated media progress
        Log.d(tag, "checkCurrentSessionProgress: Checking if local media progress was updated on server")
-        apiHandler.getMediaProgress(playbackSession.libraryItemId!!, playbackSession.episodeId) { mediaProgress ->
-          if (mediaProgress.lastUpdate > playbackSession.updatedAt && mediaProgress.currentTime != playbackSession.currentTime) {
+        apiHandler.getMediaProgress(playbackSession.libraryItemId!!, playbackSession.episodeId, serverConnectionConfig) { mediaProgress ->
+
+          if (mediaProgress != null && mediaProgress.lastUpdate > playbackSession.updatedAt && mediaProgress.currentTime != playbackSession.currentTime) {
            Log.d(tag, "checkCurrentSessionProgress: Media progress was updated since last play time updating from ${playbackSession.currentTime} to ${mediaProgress.currentTime}")
            mediaProgressSyncer.syncFromServerProgress(mediaProgress)

@@ -611,11 +640,14 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  }

  fun closePlayback() {
+    Log.d(tag, "closePlayback")
    currentPlayer.clearMediaItems()
    currentPlayer.stop()
    currentPlaybackSession = null
    clientEventEmitter?.onPlaybackClosed()
    PlayerListener.lastPauseTime = 0
+    isClosed = true
+    stopForeground(true)
  }

  fun sendClientMetadata(playerState: PlayerState) {
@@ -683,11 +715,8 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      // No further calls will be made to other media browsing methods.
      null
    } else {
-      if (!isStarted) {
-        Log.d(tag, "AA Not yet started")
-        mediaManager.initializeAndroidAuto()
-        isStarted = true
-      }
+      isStarted = true
+      mediaManager.initializeAndroidAuto()
      mediaManager.checkResetServerItems() // Reset any server items if no longer connected to server

      isAndroidAuto = true
@@ -165,7 +165,7 @@ class AbsAudioPlayer : Plugin() {

    if (libraryItemId.isEmpty()) {
      Log.e(tag, "Invalid call to play library item no library item id")
-      return call.resolve()
+      return call.resolve(JSObject("{\"error\":\"Invalid request\"}"))
    }

    if (libraryItemId.startsWith("local")) { // Play local media item
@@ -176,7 +176,7 @@ class AbsAudioPlayer : Plugin() {
          episode = podcastMedia.episodes?.find { ep -> ep.id == episodeId }
          if (episode == null) {
            Log.e(tag, "prepareLibraryItem: Podcast episode not found $episodeId")
-            return call.resolve(JSObject())
+            return call.resolve(JSObject("{\"error\":\"Podcast episode not found\"}"))
          }
        }

@@ -191,13 +191,16 @@ class AbsAudioPlayer : Plugin() {
      val playItemRequestPayload = playerNotificationService.getPlayItemRequestPayload(false)

      apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
+        if (it == null) {
+          call.resolve(JSObject("{\"error\":\"Server play request failed\"}"))
+        } else {
+          Handler(Looper.getMainLooper()).post {
+            Log.d(tag, "Preparing Player TEST ${jacksonMapper.writeValueAsString(it)}")
+            playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
+          }

-        Handler(Looper.getMainLooper()).post {
-          Log.d(tag, "Preparing Player TEST ${jacksonMapper.writeValueAsString(it)}")
-          playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
+          call.resolve(JSObject(jacksonMapper.writeValueAsString(it)))
        }
-
-        call.resolve(JSObject(jacksonMapper.writeValueAsString(it)))
      }
    }
  }
@@ -25,6 +25,7 @@ class AbsDatabase : Plugin() {
  data class LocalMediaProgressPayload(val value:List<LocalMediaProgress>)
  data class LocalLibraryItemsPayload(val value:List<LocalLibraryItem>)
  data class LocalFoldersPayload(val value:List<LocalFolder>)
+  data class ServerConnConfigPayload(val id:String?, val index:Int, val name:String?, val userId:String, val username:String, val token:String, val address:String?, val customHeaders:Map<String,String>?)

  override fun load() {
    mainActivity = (activity as MainActivity)
@@ -37,7 +38,7 @@ class AbsDatabase : Plugin() {
  @PluginMethod
  fun getDeviceData(call:PluginCall) {
    GlobalScope.launch(Dispatchers.IO) {
-      var deviceData = DeviceManager.dbManager.getDeviceData()
+      val deviceData = DeviceManager.dbManager.getDeviceData()
      call.resolve(JSObject(jacksonMapper.writeValueAsString(deviceData)))
    }
  }
@@ -45,17 +46,17 @@ class AbsDatabase : Plugin() {
  @PluginMethod
  fun getLocalFolders(call:PluginCall) {
    GlobalScope.launch(Dispatchers.IO) {
-      var folders = DeviceManager.dbManager.getAllLocalFolders()
+      val folders = DeviceManager.dbManager.getAllLocalFolders()
      call.resolve(JSObject(jacksonMapper.writeValueAsString(LocalFoldersPayload(folders))))
    }
  }

  @PluginMethod
  fun getLocalFolder(call:PluginCall) {
-    var folderId = call.getString("folderId", "").toString()
+    val folderId = call.getString("folderId", "").toString()
    GlobalScope.launch(Dispatchers.IO) {
      DeviceManager.dbManager.getLocalFolder(folderId)?.let {
-        var folderObj = jacksonMapper.writeValueAsString(it)
+        val folderObj = jacksonMapper.writeValueAsString(it)
        call.resolve(JSObject(folderObj))
      } ?: call.resolve()
    }
@@ -63,10 +64,10 @@ class AbsDatabase : Plugin() {

  @PluginMethod
  fun getLocalLibraryItem(call:PluginCall) {
-    var id = call.getString("id", "").toString()
+    val id = call.getString("id", "").toString()

    GlobalScope.launch(Dispatchers.IO) {
-      var localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(id)
+      val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(id)
      if (localLibraryItem == null) {
        call.resolve()
      } else {
@@ -77,9 +78,9 @@ class AbsDatabase : Plugin() {

  @PluginMethod
  fun getLocalLibraryItemByLLId(call:PluginCall) {
-    var libraryItemId = call.getString("libraryItemId", "").toString()
+    val libraryItemId = call.getString("libraryItemId", "").toString()
    GlobalScope.launch(Dispatchers.IO) {
-      var localLibraryItem = DeviceManager.dbManager.getLocalLibraryItemByLLId(libraryItemId)
+      val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItemByLLId(libraryItemId)
      if (localLibraryItem == null) {
        call.resolve()
      } else {
@@ -90,40 +91,41 @@ class AbsDatabase : Plugin() {

  @PluginMethod
  fun getLocalLibraryItems(call:PluginCall) {
-    var mediaType = call.getString("mediaType", "").toString()
+    val mediaType = call.getString("mediaType", "").toString()

    GlobalScope.launch(Dispatchers.IO) {
-      var localLibraryItems = DeviceManager.dbManager.getLocalLibraryItems(mediaType)
+      val localLibraryItems = DeviceManager.dbManager.getLocalLibraryItems(mediaType)
      call.resolve(JSObject(jacksonMapper.writeValueAsString(LocalLibraryItemsPayload(localLibraryItems))))
    }
  }

  @PluginMethod
  fun getLocalLibraryItemsInFolder(call:PluginCall) {
-    var folderId = call.getString("folderId", "").toString()
+    val folderId = call.getString("folderId", "").toString()
    GlobalScope.launch(Dispatchers.IO) {
-      var localLibraryItems = DeviceManager.dbManager.getLocalLibraryItemsInFolder(folderId)
+      val localLibraryItems = DeviceManager.dbManager.getLocalLibraryItemsInFolder(folderId)
      call.resolve(JSObject(jacksonMapper.writeValueAsString(LocalLibraryItemsPayload(localLibraryItems))))
    }
  }

  @PluginMethod
  fun setCurrentServerConnectionConfig(call:PluginCall) {
-    var serverConnectionConfigId = call.getString("id", "").toString()
-    var serverConnectionConfig = DeviceManager.deviceData.serverConnectionConfigs.find { it.id == serverConnectionConfigId }
+    Log.d(tag, "setCurrentServerConnectionConfig ${call.data}")
+    val serverConfigPayload = jacksonMapper.readValue<ServerConnConfigPayload>(call.data.toString())
+    var serverConnectionConfig = DeviceManager.deviceData.serverConnectionConfigs.find { it.id == serverConfigPayload.id }

-    var userId = call.getString("userId", "").toString()
-    var username = call.getString("username", "").toString()
-    var token = call.getString("token", "").toString()
+    val userId =  serverConfigPayload.userId
+    val username = serverConfigPayload.username
+    val token = serverConfigPayload.token

    GlobalScope.launch(Dispatchers.IO) {
      if (serverConnectionConfig == null) { // New Server Connection
-        var serverAddress = call.getString("address", "").toString()
+        val serverAddress = call.getString("address", "").toString()

        // Create new server connection config
-        var sscId = DeviceManager.getBase64Id("$serverAddress@$username")
-        var sscIndex = DeviceManager.deviceData.serverConnectionConfigs.size
-        serverConnectionConfig = ServerConnectionConfig(sscId, sscIndex, "$serverAddress ($username)", serverAddress, userId, username, token)
+        val sscId = DeviceManager.getBase64Id("$serverAddress@$username")
+        val sscIndex = DeviceManager.deviceData.serverConnectionConfigs.size
+        serverConnectionConfig = ServerConnectionConfig(sscId, sscIndex, "$serverAddress ($username)", serverAddress, userId, username, token, serverConfigPayload.customHeaders)

        // Add and save
        DeviceManager.deviceData.serverConnectionConfigs.add(serverConnectionConfig!!)
@@ -140,8 +142,8 @@ class AbsDatabase : Plugin() {
        }

        // Set last connection config
-        if (DeviceManager.deviceData.lastServerConnectionConfigId != serverConnectionConfigId) {
-          DeviceManager.deviceData.lastServerConnectionConfigId = serverConnectionConfigId
+        if (DeviceManager.deviceData.lastServerConnectionConfigId != serverConfigPayload.id) {
+          DeviceManager.deviceData.lastServerConnectionConfigId = serverConfigPayload.id
          shouldSave = true
        }

@@ -156,7 +158,7 @@ class AbsDatabase : Plugin() {
  @PluginMethod
  fun removeServerConnectionConfig(call:PluginCall) {
    GlobalScope.launch(Dispatchers.IO) {
-      var serverConnectionConfigId = call.getString("serverConnectionConfigId", "").toString()
+      val serverConnectionConfigId = call.getString("serverConnectionConfigId", "").toString()
      DeviceManager.deviceData.serverConnectionConfigs = DeviceManager.deviceData.serverConnectionConfigs.filter { it.id != serverConnectionConfigId } as MutableList<ServerConnectionConfig>
      if (DeviceManager.deviceData.lastServerConnectionConfigId == serverConnectionConfigId) {
        DeviceManager.deviceData.lastServerConnectionConfigId = null
@@ -182,7 +184,7 @@ class AbsDatabase : Plugin() {
  @PluginMethod
  fun getAllLocalMediaProgress(call:PluginCall) {
    GlobalScope.launch(Dispatchers.IO) {
-      var localMediaProgress = DeviceManager.dbManager.getAllLocalMediaProgress()
+      val localMediaProgress = DeviceManager.dbManager.getAllLocalMediaProgress()
      call.resolve(JSObject(jacksonMapper.writeValueAsString(LocalMediaProgressPayload(localMediaProgress))))
    }
  }
@@ -331,13 +333,13 @@ class AbsDatabase : Plugin() {
    // Send update to server media progress is linked to a server and user is logged into that server
    localMediaProgress.serverConnectionConfigId?.let { configId ->
      if (DeviceManager.serverConnectionConfigId == configId) {
-        var libraryItemId = localMediaProgress.libraryItemId ?: ""
-        var episodeId = localMediaProgress.episodeId ?: ""
-        var updatePayload = JSObject()
+        val libraryItemId = localMediaProgress.libraryItemId ?: ""
+        val episodeId = localMediaProgress.episodeId ?: ""
+        val updatePayload = JSObject()
        updatePayload.put("isFinished", isFinished)
        apiHandler.updateMediaProgress(libraryItemId,episodeId,updatePayload) {
          Log.d(tag, "updateLocalMediaProgressFinished: Updated media progress isFinished on server")
-          var jsobj = JSObject()
+          val jsobj = JSObject()
          jsobj.put("local", true)
          jsobj.put("server", true)
          jsobj.put("localMediaProgress", JSObject(lmpstring))
@@ -346,7 +348,7 @@ class AbsDatabase : Plugin() {
      }
    }
    if (localMediaProgress.serverConnectionConfigId == null || DeviceManager.serverConnectionConfigId != localMediaProgress.serverConnectionConfigId) {
-      var jsobj = JSObject()
+      val jsobj = JSObject()
      jsobj.put("local", true)
      jsobj.put("server", false)
      jsobj.put("localMediaProgress", JSObject(lmpstring))
@@ -356,25 +358,25 @@ class AbsDatabase : Plugin() {

  @PluginMethod
  fun updateLocalTrackOrder(call:PluginCall) {
-    var localLibraryItemId = call.getString("localLibraryItemId", "") ?: ""
-    var localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
+    val localLibraryItemId = call.getString("localLibraryItemId", "") ?: ""
+    val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
    if (localLibraryItem == null) {
      call.resolve()
      return
    }

-    var audioTracks = localLibraryItem.media.getAudioTracks() as MutableList
+    val audioTracks = localLibraryItem.media.getAudioTracks() as MutableList

-    var tracks:JSArray = call.getArray("tracks") ?: JSArray()
+    val tracks:JSArray = call.getArray("tracks") ?: JSArray()
    Log.d(tag, "updateLocalTrackOrder $tracks")

    var index = 1
    var hasUpdates = false
    for (i in 0 until tracks.length()) {
-      var track = tracks.getJSONObject(i)
-      var localFileId = track.getString("localFileId")
+      val track = tracks.getJSONObject(i)
+      val localFileId = track.getString("localFileId")

-      var existingTrack = audioTracks.find{ it.localFileId == localFileId }
+      val existingTrack = audioTracks.find{ it.localFileId == localFileId }
      if (existingTrack != null) {
        Log.d(tag, "Found existing track ${existingTrack.localFileId} that has index ${existingTrack.index} should be index $index")
        if (existingTrack.index != index) hasUpdates = true
@@ -394,4 +396,15 @@ class AbsDatabase : Plugin() {
      call.resolve()
    }
  }
+
+  @PluginMethod
+  fun updateDeviceSettings(call:PluginCall) { // Returns device data
+    Log.d(tag, "updateDeviceSettings ${call.data}")
+    val newDeviceSettings = jacksonMapper.readValue<DeviceSettings>(call.data.toString())
+    GlobalScope.launch(Dispatchers.IO) {
+      DeviceManager.deviceData.deviceSettings = newDeviceSettings
+      DeviceManager.dbManager.saveDeviceData(DeviceManager.deviceData)
+      call.resolve(JSObject(jacksonMapper.writeValueAsString(DeviceManager.deviceData)))
+    }
+  }
 }
@@ -143,31 +143,35 @@ class AbsDownloader : Plugin() {
    }

    apiHandler.getLibraryItemWithProgress(libraryItemId, episodeId) { libraryItem ->
-      Log.d(tag, "Got library item from server ${libraryItem.id}")
+      if (libraryItem == null) {
+        call.resolve(JSObject("{\"error\":\"Server request failed\"}"))
+      } else {
+        Log.d(tag, "Got library item from server ${libraryItem.id}")

-      val localFolder = DeviceManager.dbManager.getLocalFolder(localFolderId)
-      if (localFolder != null) {
+        val localFolder = DeviceManager.dbManager.getLocalFolder(localFolderId)
+        if (localFolder != null) {

-        if (episodeId.isNotEmpty() && libraryItem.mediaType != "podcast") {
-          Log.e(tag, "Library item is not a podcast but episode was requested")
-          call.resolve(JSObject("{\"error\":\"Invalid library item not a podcast\"}"))
-        } else if (episodeId.isNotEmpty()) {
-          val podcast = libraryItem.media as Podcast
-          val episode = podcast.episodes?.find { podcastEpisode ->
-            podcastEpisode.id == episodeId
-          }
-          if (episode == null) {
-            call.resolve(JSObject("{\"error\":\"Invalid podcast episode not found\"}"))
+          if (episodeId.isNotEmpty() && libraryItem.mediaType != "podcast") {
+            Log.e(tag, "Library item is not a podcast but episode was requested")
+            call.resolve(JSObject("{\"error\":\"Invalid library item not a podcast\"}"))
+          } else if (episodeId.isNotEmpty()) {
+            val podcast = libraryItem.media as Podcast
+            val episode = podcast.episodes?.find { podcastEpisode ->
+              podcastEpisode.id == episodeId
+            }
+            if (episode == null) {
+              call.resolve(JSObject("{\"error\":\"Invalid podcast episode not found\"}"))
+            } else {
+              startLibraryItemDownload(libraryItem, localFolder, episode)
+              call.resolve()
+            }
          } else {
-            startLibraryItemDownload(libraryItem, localFolder, episode)
+            startLibraryItemDownload(libraryItem, localFolder, null)
            call.resolve()
          }
        } else {
-          startLibraryItemDownload(libraryItem, localFolder, null)
-          call.resolve()
+          call.resolve(JSObject("{\"error\":\"Local Folder Not Found\"}"))
        }
-      } else {
-        call.resolve(JSObject("{\"error\":\"Local Folder Not Found\"}"))
      }
    }
  }
@@ -19,11 +19,13 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONObject
 import java.io.IOException
+import java.util.concurrent.TimeUnit

 class ApiHandler(var ctx:Context) {
  val tag = "ApiHandler"

-  private var client = OkHttpClient()
+  private var defaultClient = OkHttpClient()
+  private var pingClient = OkHttpClient.Builder().callTimeout(3, TimeUnit.SECONDS).build()
  var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())

  var storageSharedPreferences: SharedPreferences? = null
@@ -33,11 +35,14 @@ class ApiHandler(var ctx:Context) {
  data class MediaProgressSyncResponsePayload(val numServerProgressUpdates:Int, val localProgressUpdates:List<LocalMediaProgress>)
  data class LocalMediaProgressSyncResultsPayload(var numLocalMediaProgressForServer:Int, var numServerProgressUpdates:Int, var numLocalProgressUpdates:Int)

-  fun getRequest(endpoint:String, cb: (JSObject) -> Unit) {
+  fun getRequest(endpoint:String, httpClient:OkHttpClient?, config:ServerConnectionConfig?, cb: (JSObject) -> Unit) {
+    val address = config?.address ?: DeviceManager.serverAddress
+    val token = config?.token ?: DeviceManager.token
+
    val request = Request.Builder()
-      .url("${DeviceManager.serverAddress}$endpoint").addHeader("Authorization", "Bearer ${DeviceManager.token}")
+      .url("${address}$endpoint").addHeader("Authorization", "Bearer $token")
      .build()
-    makeRequest(request, cb)
+    makeRequest(request, httpClient, cb)
  }

  fun postRequest(endpoint:String, payload: JSObject, cb: (JSObject) -> Unit) {
@@ -46,7 +51,7 @@ class ApiHandler(var ctx:Context) {
    val request = Request.Builder().post(requestBody)
      .url("${DeviceManager.serverAddress}$endpoint").addHeader("Authorization", "Bearer ${DeviceManager.token}")
      .build()
-    makeRequest(request, cb)
+    makeRequest(request, null, cb)
  }

  fun patchRequest(endpoint:String, payload: JSObject, cb: (JSObject) -> Unit) {
@@ -55,7 +60,7 @@ class ApiHandler(var ctx:Context) {
    val request = Request.Builder().patch(requestBody)
      .url("${DeviceManager.serverAddress}$endpoint").addHeader("Authorization", "Bearer ${DeviceManager.token}")
      .build()
-    makeRequest(request, cb)
+    makeRequest(request, null, cb)
  }

  fun isOnline(): Boolean {
@@ -76,18 +81,21 @@ class ApiHandler(var ctx:Context) {
    return false
  }

-  fun makeRequest(request:Request, cb: (JSObject) -> Unit) {
+  fun makeRequest(request:Request, httpClient:OkHttpClient?, cb: (JSObject) -> Unit) {
+    val client = httpClient ?: defaultClient
    client.newCall(request).enqueue(object : Callback {
      override fun onFailure(call: Call, e: IOException) {
        Log.d(tag, "FAILURE TO CONNECT")
        e.printStackTrace()
-        cb(JSObject())
+
+        val jsobj = JSObject()
+        jsobj.put("error", "Failed to connect")
+        cb(jsobj)
      }

      override fun onResponse(call: Call, response: Response) {
        response.use {
          if (!it.isSuccessful) {
-//            throw IOException("Unexpected code $response")
            val jsobj = JSObject()
            jsobj.put("error", "Unexpected code $response")
            cb(jsobj)
@@ -114,7 +122,7 @@ class ApiHandler(var ctx:Context) {

  fun getLibraries(cb: (List<Library>) -> Unit) {
    val mapper = jacksonMapper
-    getRequest("/api/libraries") {
+    getRequest("/api/libraries", null,null) {
      val libraries = mutableListOf<Library>()
      if (it.has("value")) {
        val array = it.getJSONArray("value")
@@ -127,24 +135,34 @@ class ApiHandler(var ctx:Context) {
    }
  }

-  fun getLibraryItem(libraryItemId:String, cb: (LibraryItem) -> Unit) {
-    getRequest("/api/items/$libraryItemId?expanded=1") {
-      val libraryItem = jacksonMapper.readValue<LibraryItem>(it.toString())
-      cb(libraryItem)
+  fun getLibraryItem(libraryItemId:String, cb: (LibraryItem?) -> Unit) {
+    getRequest("/api/items/$libraryItemId?expanded=1", null, null) {
+      if (it.has("error")) {
+        Log.e(tag, it.getString("error") ?: "getLibraryItem Failed")
+        cb(null)
+      } else {
+        val libraryItem = jacksonMapper.readValue<LibraryItem>(it.toString())
+        cb(libraryItem)
+      }
    }
  }

-  fun getLibraryItemWithProgress(libraryItemId:String, episodeId:String?, cb: (LibraryItem) -> Unit) {
+  fun getLibraryItemWithProgress(libraryItemId:String, episodeId:String?, cb: (LibraryItem?) -> Unit) {
    var requestUrl = "/api/items/$libraryItemId?expanded=1&include=progress"
    if (!episodeId.isNullOrEmpty()) requestUrl += "&episode=$episodeId"
-    getRequest(requestUrl) {
-      val libraryItem = jacksonMapper.readValue<LibraryItem>(it.toString())
-      cb(libraryItem)
+    getRequest(requestUrl, null, null) {
+      if (it.has("error")) {
+        Log.e(tag, it.getString("error") ?: "getLibraryItemWithProgress Failed")
+        cb(null)
+      } else {
+        val libraryItem = jacksonMapper.readValue<LibraryItem>(it.toString())
+        cb(libraryItem)
+      }
    }
  }

  fun getLibraryItems(libraryId:String, cb: (List<LibraryItem>) -> Unit) {
-    getRequest("/api/libraries/$libraryId/items?limit=100&minified=1") {
+    getRequest("/api/libraries/$libraryId/items?limit=100&minified=1", null, null) {
      val items = mutableListOf<LibraryItem>()
      if (it.has("results")) {
        val array = it.getJSONArray("results")
@@ -158,7 +176,7 @@ class ApiHandler(var ctx:Context) {
  }

  fun getLibraryCategories(libraryId:String, cb: (List<LibraryCategory>) -> Unit) {
-    getRequest("/api/libraries/$libraryId/personalized") {
+    getRequest("/api/libraries/$libraryId/personalized", null, null) {
      val items = mutableListOf<LibraryCategory>()
      if (it.has("value")) {
        val array = it.getJSONArray("value")
@@ -178,15 +196,20 @@ class ApiHandler(var ctx:Context) {
    }
  }

-  fun playLibraryItem(libraryItemId:String, episodeId:String?, playItemRequestPayload:PlayItemRequestPayload, cb: (PlaybackSession) -> Unit) {
+  fun playLibraryItem(libraryItemId:String, episodeId:String?, playItemRequestPayload:PlayItemRequestPayload, cb: (PlaybackSession?) -> Unit) {
    val payload = JSObject(jacksonMapper.writeValueAsString(playItemRequestPayload))

    val endpoint = if (episodeId.isNullOrEmpty()) "/api/items/$libraryItemId/play" else "/api/items/$libraryItemId/play/$episodeId"
    postRequest(endpoint, payload) {
-      it.put("serverConnectionConfigId", DeviceManager.serverConnectionConfig?.id)
-      it.put("serverAddress", DeviceManager.serverAddress)
-      val playbackSession = jacksonMapper.readValue<PlaybackSession>(it.toString())
-      cb(playbackSession)
+      if (it.has("error")) {
+        Log.e(tag, it.getString("error") ?: "Play Library Item Failed")
+        cb(null)
+      } else {
+        it.put("serverConnectionConfigId", DeviceManager.serverConnectionConfig?.id)
+        it.put("serverAddress", DeviceManager.serverAddress)
+        val playbackSession = jacksonMapper.readValue<PlaybackSession>(it.toString())
+        cb(playbackSession)
+      }
    }
  }

@@ -228,10 +251,12 @@ class ApiHandler(var ctx:Context) {
      Log.d(tag, "Sending sync local progress request with ${localMediaProgress.size} progress items")
      val payload = JSObject(jacksonMapper.writeValueAsString(LocalMediaProgressSyncPayload(localMediaProgress)))
      postRequest("/api/me/sync-local-progress", payload) {
-        Log.d(tag, "Media Progress Sync payload $payload - response ${it.toString()}")
+        Log.d(tag, "Media Progress Sync payload $payload - response ${it}")

        if (it.toString() == "{}") {
          Log.e(tag, "Progress sync received empty object")
+        } else if (it.has("error")) {
+          Log.e(tag, it.getString("error") ?: "Progress sync error")
        } else {
          val progressSyncResponsePayload = jacksonMapper.readValue<MediaProgressSyncResponsePayload>(it.toString())

@@ -263,17 +288,24 @@ class ApiHandler(var ctx:Context) {
    }
  }

-  fun getMediaProgress(libraryItemId:String, episodeId:String?, cb: (MediaProgress) -> Unit) {
+  fun getMediaProgress(libraryItemId:String, episodeId:String?, serverConnectionConfig:ServerConnectionConfig?, cb: (MediaProgress?) -> Unit) {
    val endpoint = if(episodeId.isNullOrEmpty()) "/api/me/progress/$libraryItemId" else "/api/me/progress/$libraryItemId/$episodeId"
-    getRequest(endpoint) {
-      val progress = jacksonMapper.readValue<MediaProgress>(it.toString())
-      cb(progress)
+
+    // TODO: Using ping client here allows for shorter timeout (3 seconds), maybe rename or make diff client for requests requiring quicker response
+    getRequest(endpoint, pingClient, serverConnectionConfig) {
+      if (it.has("error")) {
+        Log.e(tag, "getMediaProgress: Failed to get progress")
+        cb(null)
+      } else {
+        val progress = jacksonMapper.readValue<MediaProgress>(it.toString())
+        cb(progress)
+      }
    }
  }

  fun getPlaybackSession(playbackSessionId:String, cb: (PlaybackSession?) -> Unit) {
    val endpoint = "/api/session/$playbackSessionId"
-    getRequest(endpoint) {
+    getRequest(endpoint, null, null) {
      val err = it.getString("error")
      if (!err.isNullOrEmpty()) {
        cb(null)
@@ -282,4 +314,18 @@ class ApiHandler(var ctx:Context) {
      }
    }
  }
+
+  fun pingServer(config:ServerConnectionConfig, cb: (Boolean) -> Unit) {
+    Log.d(tag, "pingServer: Pinging ${config.address}")
+    getRequest("/ping", pingClient, config) {
+      val success = it.getString("success")
+      if (success.isNullOrEmpty()) {
+        Log.d(tag, "pingServer: Ping ${config.address} Failed")
+        cb(false)
+      } else {
+        Log.d(tag, "pingServer: Ping ${config.address} Successful")
+        cb(true)
+      }
+    }
+  }
 }
@@ -11,11 +11,5 @@
    <path
        android:fillColor="@android:color/white"
        android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
  </group>
 </vector>
@@ -11,11 +11,5 @@
    <path
        android:fillColor="@android:color/white"
        android:pathData="M11.99,5V1l-5,5l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.41,5 11.99,5z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10.89,16h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09V16z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15.17,14.24c0,0.32 -0.03,0.6 -0.1,0.82s-0.17,0.42 -0.29,0.57s-0.28,0.26 -0.45,0.33s-0.37,0.1 -0.59,0.1s-0.41,-0.03 -0.59,-0.1s-0.33,-0.18 -0.46,-0.33s-0.23,-0.34 -0.3,-0.57s-0.11,-0.5 -0.11,-0.82V13.5c0,-0.32 0.03,-0.6 0.1,-0.82s0.17,-0.42 0.29,-0.57s0.28,-0.26 0.45,-0.33s0.37,-0.1 0.59,-0.1s0.41,0.03 0.59,0.1c0.18,0.07 0.33,0.18 0.46,0.33s0.23,0.34 0.3,0.57s0.11,0.5 0.11,0.82V14.24zM14.32,13.38c0,-0.19 -0.01,-0.35 -0.04,-0.48s-0.07,-0.23 -0.12,-0.31s-0.11,-0.14 -0.19,-0.17s-0.16,-0.05 -0.25,-0.05s-0.18,0.02 -0.25,0.05s-0.14,0.09 -0.19,0.17s-0.09,0.18 -0.12,0.31s-0.04,0.29 -0.04,0.48v0.97c0,0.19 0.01,0.35 0.04,0.48s0.07,0.24 0.12,0.32s0.11,0.14 0.19,0.17s0.16,0.05 0.25,0.05s0.18,-0.02 0.25,-0.05s0.14,-0.09 0.19,-0.17s0.09,-0.19 0.11,-0.32s0.04,-0.29 0.04,-0.48V13.38z"/>
  </group>
 </vector>
@@ -2,6 +2,4 @@
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
 </vector>
@@ -2,6 +2,4 @@
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M11.99,5V1l-5,5l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.41,5 11.99,5z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M10.89,16h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09V16z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M15.17,14.24c0,0.32 -0.03,0.6 -0.1,0.82s-0.17,0.42 -0.29,0.57s-0.28,0.26 -0.45,0.33s-0.37,0.1 -0.59,0.1s-0.41,-0.03 -0.59,-0.1s-0.33,-0.18 -0.46,-0.33s-0.23,-0.34 -0.3,-0.57s-0.11,-0.5 -0.11,-0.82V13.5c0,-0.32 0.03,-0.6 0.1,-0.82s0.17,-0.42 0.29,-0.57s0.28,-0.26 0.45,-0.33s0.37,-0.1 0.59,-0.1s0.41,0.03 0.59,0.1c0.18,0.07 0.33,0.18 0.46,0.33s0.23,0.34 0.3,0.57s0.11,0.5 0.11,0.82V14.24zM14.32,13.38c0,-0.19 -0.01,-0.35 -0.04,-0.48s-0.07,-0.23 -0.12,-0.31s-0.11,-0.14 -0.19,-0.17s-0.16,-0.05 -0.25,-0.05s-0.18,0.02 -0.25,0.05s-0.14,0.09 -0.19,0.17s-0.09,0.18 -0.12,0.31s-0.04,0.29 -0.04,0.48v0.97c0,0.19 0.01,0.35 0.04,0.48s0.07,0.24 0.12,0.32s0.11,0.14 0.19,0.17s0.16,0.05 0.25,0.05s0.18,-0.02 0.25,-0.05s0.14,-0.09 0.19,-0.17s0.09,-0.19 0.11,-0.32s0.04,-0.29 0.04,-0.48V13.38z"/>
 </vector>
@@ -1,4 +1,5 @@
@import "./fonts.css";
+@import './defaultStyles.css';

 body {
  background-color: #262626;
@@ -0,0 +1,55 @@
+/*
+
+  This is for setting regular html styles for places where embedding HTML will be
+  like podcast episode descriptions. Otherwise TailwindCSS will have stripped all default markup.
+
+*/
+
+.default-style p {
+  display: block;
+  margin-block-start: 1em;
+  margin-block-end: 1em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+}
+
+.default-style a {
+  text-decoration: none;
+  color: #5985ff;
+}
+
+.default-style ul {
+  display: block;
+  list-style: circle;
+  list-style-type: disc;
+  margin-block-start: 1em;
+  margin-block-end: 1em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+  padding-inline-start: 40px;
+}
+
+.default-style ol {
+  display: block;
+  list-style: decimal;
+  list-style-type: decimal;
+  margin-block-start: 1em;
+  margin-block-end: 1em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+  padding-inline-start: 40px;
+}
+
+.default-style li {
+  display: list-item;
+  text-align: -webkit-match-parent;
+}
+
+.default-style li::marker {
+  unicode-bidi: isolate;
+  font-variant-numeric: tabular-nums;
+  text-transform: none;
+  text-indent: 0px !important;
+  text-align: start !important;
+  text-align-last: start !important;
+}
@@ -30,13 +30,13 @@
      </div>
    </div>

-    <div class="cover-wrapper absolute z-30 pointer-events-auto" :class="bookCoverAspectRatio === 1 ? 'square-cover' : ''" @click="clickContainer">
+    <div class="cover-wrapper absolute z-30 pointer-events-auto" @click="clickContainer">
      <div class="cover-container bookCoverWrapper bg-black bg-opacity-75 w-full h-full">
        <covers-book-cover v-if="libraryItem || localLibraryItemCoverSrc" :library-item="libraryItem" :download-cover="localLibraryItemCoverSrc" :width="bookCoverWidth" :book-cover-aspect-ratio="bookCoverAspectRatio" />
      </div>
    </div>

-    <div class="title-author-texts absolute z-30 left-0 right-0 overflow-hidden">
+    <div class="title-author-texts absolute z-30 left-0 right-0 overflow-hidden" @click="clickTitleAndAuthor">
      <p class="title-text font-book truncate">{{ title }}</p>
      <p class="author-text text-white text-opacity-75 truncate">by {{ authorName }}</p>
    </div>
@@ -63,12 +63,12 @@
      <div id="playerControls" class="absolute right-0 bottom-0 py-2">
        <div class="flex items-center justify-center">
          <span v-show="showFullscreen" class="material-icons next-icon text-white text-opacity-75 cursor-pointer" :class="isLoading ? 'text-opacity-10' : 'text-opacity-75'" @click.stop="jumpChapterStart">first_page</span>
-          <span class="material-icons jump-icon text-white cursor-pointer" :class="isLoading ? 'text-opacity-10' : 'text-opacity-75'" @click.stop="backward10">replay_10</span>
+          <span class="material-icons jump-icon text-white cursor-pointer" :class="isLoading ? 'text-opacity-10' : 'text-opacity-75'" @click.stop="jumpBackwards">{{ jumpBackwardsIcon }}</span>
          <div class="play-btn cursor-pointer shadow-sm flex items-center justify-center rounded-full text-primary mx-4" :class="{ 'animate-spin': seekLoading, 'bg-accent': !isLocalPlayMethod, 'bg-success': isLocalPlayMethod }" @mousedown.prevent @mouseup.prevent @click.stop="playPauseClick">
            <span v-if="!isLoading" class="material-icons">{{ seekLoading ? 'autorenew' : !isPlaying ? 'play_arrow' : 'pause' }}</span>
            <widgets-spinner-icon v-else class="h-8 w-8" />
          </div>
-          <span class="material-icons jump-icon text-white cursor-pointer" :class="isLoading ? 'text-opacity-10' : 'text-opacity-75'" @click.stop="forward10">forward_10</span>
+          <span class="material-icons jump-icon text-white cursor-pointer" :class="isLoading ? 'text-opacity-10' : 'text-opacity-75'" @click.stop="jumpForward">{{ jumpForwardIcon }}</span>
          <span v-show="showFullscreen" class="material-icons next-icon text-white cursor-pointer" :class="nextChapter && !isLoading ? 'text-opacity-75' : 'text-opacity-10'" @click.stop="jumpNextChapter">last_page</span>
        </div>
      </div>
@@ -109,6 +109,7 @@ export default {
  },
  data() {
    return {
+      windowHeight: 0,
      playbackSession: null,
      showChapterModal: false,
      showFullscreen: false,
@@ -122,7 +123,6 @@ export default {
      isEnded: false,
      volume: 0.5,
      readyTrackWidth: 0,
-      playedTrackWidth: 0,
      seekedTime: 0,
      seekLoading: false,
      onPlaybackSessionListener: null,
@@ -138,6 +138,11 @@ export default {
      dragPercent: 0
    }
  },
+  watch: {
+    showFullscreen() {
+      this.updateScreenSize()
+    }
+  },
  computed: {
    menuItems() {
      var items = []
@@ -153,14 +158,31 @@ export default {
      })
      return items
    },
+    jumpForwardIcon() {
+      return this.$store.getters['globals/getJumpForwardIcon'](this.jumpForwardTime)
+    },
+    jumpBackwardsIcon() {
+      return this.$store.getters['globals/getJumpBackwardsIcon'](this.jumpBackwardsTime)
+    },
+    jumpForwardTime() {
+      return this.$store.getters['getJumpForwardTime']
+    },
+    jumpBackwardsTime() {
+      return this.$store.getters['getJumpBackwardsTime']
+    },
    bookCoverAspectRatio() {
      return this.$store.getters['getBookCoverAspectRatio']
    },
    bookCoverWidth() {
+      if (this.showFullscreen) return this.fullscreenBookCoverWidth
+      return 60
+    },
+    fullscreenBookCoverWidth() {
+      var heightScale = (this.windowHeight - 200) / 651
      if (this.bookCoverAspectRatio === 1) {
-        return this.showFullscreen ? 260 : 60
+        return 260 * heightScale
      }
-      return this.showFullscreen ? 200 : 60
+      return 200 * heightScale
    },
    showCastBtn() {
      return this.$store.state.isCastAvailable
@@ -271,6 +293,14 @@ export default {
    }
  },
  methods: {
+    clickTitleAndAuthor() {
+      if (!this.showFullscreen) return
+      const llid = this.libraryItem ? this.libraryItem.id : this.localLibraryItem ? this.localLibraryItem.id : null
+      if (llid) {
+        this.$router.push(`/item/${llid}`)
+        this.showFullscreen = false
+      }
+    },
    touchstartTrack(e) {
      if (!e || !e.touches || !this.$refs.track || !this.showFullscreen) return
      this.touchTrackStart = true
@@ -331,13 +361,13 @@ export default {
    restart() {
      this.seek(0)
    },
-    backward10() {
+    jumpBackwards() {
      if (this.isLoading) return
-      AbsAudioPlayer.seekBackward({ value: 10 })
+      AbsAudioPlayer.seekBackward({ value: this.jumpBackwardsTime })
    },
-    forward10() {
+    jumpForward() {
      if (this.isLoading) return
-      AbsAudioPlayer.seekForward({ value: 10 })
+      AbsAudioPlayer.seekForward({ value: this.jumpForwardTime })
    },
    setStreamReady() {
      this.readyTrackWidth = this.trackWidth
@@ -419,12 +449,8 @@ export default {
        bufferedPercent = (this.bufferedTime - this.currentChapter.start) / this.currentChapterDuration
      }
      var ptWidth = Math.round(percentDone * this.trackWidth)
-      if (this.playedTrackWidth === ptWidth) {
-        return
-      }
      this.$refs.playedTrack.style.width = ptWidth + 'px'
      this.$refs.bufferedTrack.style.width = Math.round(bufferedPercent * this.trackWidth) + 'px'
-      this.playedTrackWidth = ptWidth

      if (this.useChapterTrack) {
        if (this.$refs.totalPlayedTrack) this.$refs.totalPlayedTrack.style.width = Math.round(totalPercentDone * this.trackWidth) + 'px'
@@ -447,7 +473,6 @@ export default {
        var perc = time / this.totalDuration
        var ptWidth = Math.round(perc * this.trackWidth)
        this.$refs.playedTrack.style.width = ptWidth + 'px'
-        this.playedTrackWidth = ptWidth

        this.$refs.playedTrack.classList.remove('bg-gray-200')
        this.$refs.playedTrack.classList.add('bg-yellow-300')
@@ -662,7 +687,6 @@ export default {
      })
    },
    onPlaybackClosed() {
-      console.log('Received onPlaybackClosed evt')
      this.endPlayback()
    },
    onPlaybackFailed(data) {
@@ -679,15 +703,32 @@ export default {
      this.onPlaybackFailedListener = AbsAudioPlayer.addListener('onPlaybackFailed', this.onPlaybackFailed)
      this.onPlayingUpdateListener = AbsAudioPlayer.addListener('onPlayingUpdate', this.onPlayingUpdate)
      this.onMetadataListener = AbsAudioPlayer.addListener('onMetadata', this.onMetadata)
+    },
+    screenOrientationChange() {
+      setTimeout(this.updateScreenSize, 50)
+    },
+    updateScreenSize() {
+      this.windowHeight = window.innerHeight
+      var coverHeight = this.fullscreenBookCoverWidth * this.bookCoverAspectRatio
+      document.documentElement.style.setProperty('--cover-image-width', this.fullscreenBookCoverWidth + 'px')
+      document.documentElement.style.setProperty('--cover-image-height', coverHeight + 'px')
    }
  },
  mounted() {
+    this.updateScreenSize()
+    if (screen.orientation) {
+      screen.orientation.addEventListener('change', this.screenOrientationChange)
+    }
    document.body.addEventListener('touchstart', this.touchstart)
    document.body.addEventListener('touchend', this.touchend)
    document.body.addEventListener('touchmove', this.touchmove)
    this.$nextTick(this.init)
  },
  beforeDestroy() {
+    if (screen.orientation) {
+      screen.orientation.removeEventListener('change', this.screenOrientationChange)
+    }
+
    if (this.playbackSession) {
      console.log('[AudioPlayer] Before destroy closing playback')
      this.closePlayback()
@@ -709,6 +750,12 @@ export default {
 </script>

 <style>
+:root {
+  --cover-image-width: 0px;
+  --cover-image-height: 0px;
+  --cover-image-width-collapsed: 60px;
+  --cover-image-height-collapsed: 60px;
+}
 .bookCoverWrapper {
  box-shadow: 3px -2px 5px #00000066;
 }
@@ -739,15 +786,12 @@ export default {
 .cover-wrapper {
  bottom: 44px;
  left: 12px;
-  height: 96px;
-  width: 60px;
+  height: var(--cover-image-height-collapsed);
+  width: var(--cover-image-width-collapsed);
  transition: all 0.25s cubic-bezier(0.39, 0.575, 0.565, 1);
  transition-property: left, bottom, width, height;
  transform-origin: left bottom;
 }
-.cover-wrapper.square-cover {
-  height: 60px;
-}

 .total-track {
  bottom: 215px;
@@ -779,16 +823,18 @@ export default {
 }

 .fullscreen .title-author-texts {
-  bottom: 36%;
+  bottom: calc(50% - var(--cover-image-height) / 2 + 50px);
  width: 80%;
  left: 10%;
  text-align: center;
+  padding-bottom: calc(((260px - var(--cover-image-height)) / 260) * 40);
+  pointer-events: auto;
 }
 .fullscreen .title-author-texts .title-text {
-  font-size: 1.2rem;
+  font-size: clamp(0.8rem, calc(var(--cover-image-height) / 260 * 20), 1.2rem);
 }
 .fullscreen .title-author-texts .author-text {
-  font-size: 1rem;
+  font-size: clamp(0.6rem, calc(var(--cover-image-height) / 260 * 16), 1rem);
 }

 #playerControls {
@@ -826,16 +872,11 @@ export default {
 }

 .fullscreen .cover-wrapper {
-  bottom: 46%;
-  left: calc(50% - 100px);
  margin: 0 auto;
-  height: 320px;
-  width: 200px;
-}
-.fullscreen .cover-wrapper.square-cover {
-  height: 260px;
-  width: 260px;
-  left: calc(50% - 130px);
+  height: var(--cover-image-height);
+  width: var(--cover-image-width);
+  left: calc(50% - (calc(var(--cover-image-width)) / 2));
+  bottom: calc(50% + 120px - (calc(var(--cover-image-height)) / 2));
 }

 .fullscreen #playerControls {
@@ -185,11 +185,17 @@ export default {
      }
      AbsAudioPlayer.prepareLibraryItem({ libraryItemId, episodeId: null, playWhenReady: false, playbackRate })
        .then((data) => {
-          console.log('Library item play response', JSON.stringify(data))
-          AbsAudioPlayer.requestSession()
+          if (data.error) {
+            const errorMsg = data.error || 'Failed to play'
+            this.$toast.error(errorMsg)
+          } else {
+            console.log('Library item play response', JSON.stringify(data))
+            AbsAudioPlayer.requestSession()
+          }
        })
        .catch((error) => {
          console.error('Failed', error)
+          this.$toast.error('Failed to play')
        })
    },
    async playLibraryItem(payload) {
@@ -220,15 +226,21 @@ export default {
      console.log('Called playLibraryItem', libraryItemId)
      AbsAudioPlayer.prepareLibraryItem({ libraryItemId, episodeId, playWhenReady: true, playbackRate })
        .then((data) => {
-          console.log('Library item play response', JSON.stringify(data))
-          if (!libraryItemId.startsWith('local')) {
-            this.serverLibraryItemId = libraryItemId
+          if (data.error) {
+            const errorMsg = data.error || 'Failed to play'
+            this.$toast.error(errorMsg)
          } else {
-            this.serverLibraryItemId = serverLibraryItemId
+            console.log('Library item play response', JSON.stringify(data))
+            if (!libraryItemId.startsWith('local')) {
+              this.serverLibraryItemId = libraryItemId
+            } else {
+              this.serverLibraryItemId = serverLibraryItemId
+            }
          }
        })
        .catch((error) => {
          console.error('Failed', error)
+          this.$toast.error('Failed to play')
        })
    },
    pauseItem() {
@@ -19,7 +19,7 @@
      </div>
      <div class="absolute bottom-0 left-0 w-full py-6 px-6 text-gray-300">
        <div v-if="serverConnectionConfig" class="mb-4 flex justify-center">
-          <p class="text-xs">{{ serverConnectionConfig.address }}</p>
+          <p class="text-xs" style="word-break: break-word">{{ serverConnectionConfig.address }} (v{{ serverSettings.version }})</p>
        </div>
        <div class="flex items-center">
          <p class="text-xs">{{ $config.version }}</p>
@@ -71,6 +71,9 @@ export default {
    serverConnectionConfig() {
      return this.$store.state.user.serverConnectionConfig
    },
+    serverSettings() {
+      return this.$store.state.serverSettings || {}
+    },
    username() {
      return this.user ? this.user.username : ''
    },
@@ -105,12 +108,12 @@ export default {
          text: 'Local Media',
          to: '/localMedia/folders'
        })
-        // items.push({
-        //   icon: 'settings',
-        //   text: 'Settings',
-        //   to: '/settings'
-        // })
      }
+      items.push({
+        icon: 'settings',
+        text: 'Settings',
+        to: '/settings'
+      })
      return items
    },
    currentRoutePath() {
@@ -122,11 +125,15 @@ export default {
      this.show = false
    },
    async logout() {
-      await this.$axios.$post('/logout').catch((error) => {
-        console.error(error)
-      })
+      if (this.user) {
+        await this.$axios.$post('/logout').catch((error) => {
+          console.error(error)
+        })
+      }
+
      this.$socket.logout()
      await this.$db.logout()
+      this.$localStore.removeLastLibraryId()
      this.$store.commit('user/logout')
      this.$router.push('/connect')
    },
@@ -302,6 +302,9 @@ export default {
      this.shelvesPerPage = Math.ceil(this.bookshelfHeight / this.shelfHeight) + 2
      this.bookshelfMarginLeft = (this.bookshelfWidth - this.entitiesPerShelf * this.totalEntityCardWidth) / 2

+      const entitiesPerPage = this.shelvesPerPage * this.entitiesPerShelf
+      this.booksPerFetch = Math.ceil(entitiesPerPage / 20) * 20 // Round up to the nearest 20
+
      if (this.totalEntities) {
        this.totalShelves = Math.ceil(this.totalEntities / this.entitiesPerShelf)
      }
@@ -382,7 +385,7 @@ export default {
        this.resetEntities()
      }
    },
-    libraryChanged(libid) {
+    libraryChanged() {
      if (this.hasFilter) {
        this.clearFilter()
      } else {
@@ -1,6 +1,6 @@
 <template>
-  <div class="w-full max-w-md mx-auto px-4 sm:px-6 lg:px-8 z-10">
-    <div v-show="!loggedIn" class="mt-8 bg-primary overflow-hidden shadow rounded-lg p-6 w-full">
+  <div class="w-full max-w-md mx-auto px-2 sm:px-4 lg:px-8 z-10">
+    <div v-show="!loggedIn" class="mt-8 bg-primary overflow-hidden shadow rounded-lg px-4 py-6 w-full">
      <template v-if="!showForm">
        <div v-for="config in serverConnectionConfigs" :key="config.id" class="flex items-center py-4 my-1 border-b border-white border-opacity-10 relative" @click="connectToServer(config)">
          <span class="material-icons-outlined text-xl text-gray-300">dns</span>
@@ -17,9 +17,14 @@
      <div v-else class="w-full">
        <form v-show="!showAuth" @submit.prevent="submit" novalidate class="w-full">
          <h2 class="text-lg leading-7 mb-2">Server address</h2>
-          <ui-text-input v-model="serverConfig.address" :disabled="processing || !networkConnected || serverConfig.id" placeholder="http://55.55.55.55:13378" type="url" class="w-full sm:w-72 h-10" />
-          <div class="flex justify-end">
-            <ui-btn :disabled="processing || !networkConnected" type="submit" :padding-x="3" class="h-10 mt-4">{{ networkConnected ? 'Submit' : 'No Internet' }}</ui-btn>
+          <ui-text-input v-model="serverConfig.address" :disabled="processing || !networkConnected || serverConfig.id" placeholder="http://55.55.55.55:13378" type="url" class="w-full h-10" />
+          <div class="flex justify-end items-center mt-6">
+            <!-- <div class="relative flex">
+              <button class="outline-none uppercase tracking-wide font-semibold text-xs text-gray-300" type="button" @click="addCustomHeaders">Add Custom Headers</button>
+              <div v-if="numCustomHeaders" class="rounded-full h-5 w-5 flex items-center justify-center text-xs bg-success bg-opacity-40 leading-3 font-semibold font-mono ml-1">{{ numCustomHeaders }}</div>
+            </div> -->
+
+            <ui-btn :disabled="processing || !networkConnected" type="submit" :padding-x="3" class="h-10">{{ networkConnected ? 'Submit' : 'No Internet' }}</ui-btn>
          </div>
        </form>
        <template v-if="showAuth">
@@ -62,6 +67,8 @@
        </svg>
      </div>
    </div>
+
+    <modals-custom-headers-modal v-model="showAddCustomHeaders" :custom-headers.sync="serverConfig.customHeaders" />
  </div>
 </template>

@@ -69,20 +76,26 @@
 import { Dialog } from '@capacitor/dialog'

 export default {
-  props: {},
+  props: {
+    deviceData: {
+      type: Object,
+      default: () => {}
+    }
+  },
  data() {
    return {
-      deviceData: null,
      loggedIn: false,
      showAuth: false,
      processing: false,
      serverConfig: {
        address: null,
-        username: null
+        username: null,
+        customHeaders: null
      },
      password: null,
      error: null,
-      showForm: false
+      showForm: false,
+      showAddCustomHeaders: false
    }
  },
  computed: {
@@ -98,9 +111,16 @@ export default {
    lastServerConnectionConfig() {
      if (!this.lastServerConnectionConfigId || !this.serverConnectionConfigs.length) return null
      return this.serverConnectionConfigs.find((s) => s.id == this.lastServerConnectionConfigId)
+    },
+    numCustomHeaders() {
+      if (!this.serverConfig.customHeaders) return 0
+      return Object.keys(this.serverConfig.customHeaders).length
    }
  },
  methods: {
+    addCustomHeaders() {
+      this.showAddCustomHeaders = true
+    },
    showServerList() {
      this.showForm = false
      this.showAuth = false
@@ -192,9 +212,13 @@ export default {
        return null
      }
    },
-    pingServerAddress(address) {
+    pingServerAddress(address, customHeaders) {
+      const options = { timeout: 3000 }
+      if (customHeaders) {
+        options.headers = customHeaders
+      }
      return this.$axios
-        .$get(`${address}/ping`, { timeout: 3000 })
+        .$get(`${address}/ping`, options)
        .then((data) => data.success)
        .catch((error) => {
          console.error('Server check failed', error)
@@ -203,8 +227,12 @@ export default {
        })
    },
    requestServerLogin() {
+      const options = {}
+      if (this.serverConfig.customHeaders) {
+        options.headers = this.serverConfig.customHeaders
+      }
      return this.$axios
-        .$post(`${this.serverConfig.address}/login`, { username: this.serverConfig.username, password: this.password })
+        .$post(`${this.serverConfig.address}/login`, { username: this.serverConfig.username, password: this.password }, options)
        .then((data) => {
          if (!data.user) {
            console.error(data.error)
@@ -236,7 +264,7 @@ export default {
      this.processing = true
      this.error = null

-      var success = await this.pingServerAddress(this.serverConfig.address)
+      var success = await this.pingServerAddress(this.serverConfig.address, this.serverConfig.customHeaders)
      this.processing = false
      if (success) this.showAuth = true
    },
@@ -298,8 +326,6 @@ export default {
      return authRes
    },
    async init() {
-      this.deviceData = await this.$db.getDeviceData()
-
      if (this.lastServerConnectionConfig) {
        this.connectToServer(this.lastServerConnectionConfig)
      } else {
@@ -0,0 +1,96 @@
+<template>
+  <modals-modal v-model="show" :width="'90%'" :max-width="'420px'" height="100%">
+    <template #outer>
+      <div class="absolute top-5 left-4 z-40">
+        <p class="text-white text-2xl truncate">Custom Headers</p>
+      </div>
+    </template>
+    <div class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center" @click="show = false">
+      <div ref="container" class="w-full rounded-lg bg-primary border border-white border-opacity-20 overflow-y-auto overflow-x-hidden" style="max-height: 80vh" @click.stop>
+        <div class="w-full h-full p-4" v-if="showAddHeader">
+          <div class="mb-4">
+            <ui-icon-btn icon="arrow_back" borderless @click="showAddHeader = false" />
+          </div>
+          <form @submit.prevent="submitForm">
+            <ui-text-input-with-label v-model="newHeaderKey" label="Name" class="mb-2" />
+            <ui-text-input-with-label v-model="newHeaderValue" label="Value" class="mb-4" />
+
+            <ui-btn type="submit" class="w-full">Submit</ui-btn>
+          </form>
+        </div>
+        <div class="w-full h-full p-4" v-else>
+          <template v-for="[key, value] in Object.entries(headersCopy)">
+            <div :key="key" class="w-full rounded-lg bg-white bg-opacity-5 py-2 pl-4 pr-12 relative mb-2">
+              <p class="text-base font-semibold text-gray-200 leading-5">{{ key }}</p>
+              <p class="text-sm text-gray-400">{{ value }}</p>
+
+              <div class="absolute top-0 bottom-0 right-0 h-full p-4 flex items-center justify-center text-error">
+                <button @click="removeHeader(key)"><span class="material-icons text-lg">delete</span></button>
+              </div>
+            </div>
+          </template>
+          <p v-if="!Object.keys(headersCopy).length" class="py-4 text-center">No Custom Headers</p>
+
+          <div class="w-full flex justify-center pt-4">
+            <ui-btn @click="showAddHeader = true" class="w-full">Add Custom Header</ui-btn>
+          </div>
+        </div>
+      </div>
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    value: Boolean,
+    customHeaders: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      newHeaderKey: '',
+      newHeaderValue: '',
+      headersCopy: {},
+      showAddHeader: false
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) this.init()
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    }
+  },
+  methods: {
+    removeHeader(key) {
+      this.$delete(this.headersCopy, key)
+      this.$emit('update:customHeaders', { ...this.headersCopy })
+    },
+    submitForm() {
+      console.log('Submit form', this.newHeaderKey, this.newHeaderValue)
+      this.headersCopy[this.newHeaderKey] = this.newHeaderValue
+      this.newHeaderKey = ''
+      this.newHeaderValue = ''
+      this.showAddHeader = false
+      this.$emit('update:customHeaders', { ...this.headersCopy })
+    },
+    init() {
+      this.newHeaderKey = ''
+      this.newHeaderValue = ''
+      this.headersCopy = this.customHeaders ? { ...this.customHeaders } : {}
+    }
+  },
+  mounted() {}
+}
+</script>
@@ -0,0 +1,74 @@
+<template>
+  <modals-modal v-model="show" width="100%" height="100%" max-width="100%">
+    <div class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center" @click="show = false">
+      <covers-book-cover :library-item="libraryItem" :width="width" :book-cover-aspect-ratio="bookCoverAspectRatio" />
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    value: Boolean,
+    libraryItem: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      width: 0
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.setWidth()
+        this.setListeners()
+      } else {
+        this.removeListeners()
+      }
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    },
+    bookCoverAspectRatio() {
+      return this.$store.getters['getBookCoverAspectRatio']
+    }
+  },
+  methods: {
+    screenOrientationChange() {
+      setTimeout(this.setWidth, 50)
+    },
+    setListeners() {
+      screen.orientation.addEventListener('change', this.screenOrientationChange)
+    },
+    removeListeners() {
+      screen.orientation.removeEventListener('change', this.screenOrientationChange)
+    },
+    setWidth() {
+      if (window.innerHeight > window.innerWidth) {
+        this.width = window.innerWidth
+      } else {
+        this.width = window.innerHeight / this.bookCoverAspectRatio
+      }
+    }
+  },
+  mounted() {
+    this.setWidth()
+  }
+}
+</script>
+
+<style>
+.filter-modal-wrapper {
+  max-height: calc(100% - 320px);
+}
+</style>
@@ -51,7 +51,7 @@ export default {
    async clickedOption(lib) {
      this.show = false
      await this.$store.dispatch('libraries/fetch', lib.id)
-      this.$eventBus.$emit('library-changed', lib.id)
+      this.$eventBus.$emit('library-changed')
      this.$localStore.setLastLibraryId(lib.id)
    }
  },
@@ -6,7 +6,7 @@
      <span class="material-icons text-4xl">close</span>
    </div>
    <slot name="outer" />
-    <div ref="content" style="max-width: 90%; min-height: 200px" class="relative text-white max-h-screen" :style="{ height: modalHeight, width: modalWidth }" v-click-outside="clickBg">
+    <div ref="content" style="min-height: 200px" class="relative text-white max-h-screen" :style="{ height: modalHeight, width: modalWidth, maxWidth: maxWidth }" v-click-outside="clickBg">
      <slot />
    </div>
  </div>
@@ -28,6 +28,10 @@ export default {
    height: {
      type: [String, Number],
      default: 'unset'
+    },
+    maxWidth: {
+      type: String,
+      default: '90%'
    }
  },
  data() {
@@ -1,12 +1,12 @@
 <template>
-  <modals-modal v-model="show" :width="200" height="100%">
+  <modals-modal v-model="show" @input="modalInput" :width="200" height="100%">
    <template #outer>
      <div class="absolute top-5 left-4 z-40">
        <p class="text-white text-2xl truncate">Playback Speed</p>
      </div>
    </template>

-    <div class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center" @click="closeMenu">
+    <div class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center">
      <div class="w-full overflow-x-hidden overflow-y-auto bg-primary rounded-lg border border-white border-opacity-20" style="max-height: 75%" @click.stop>
        <ul class="w-full" role="listbox" aria-labelledby="listbox-label">
          <template v-for="rate in rates">
@@ -91,15 +91,17 @@ export default {
      var newPlaybackRate = this.selected - 0.1
      this.selected = Number(newPlaybackRate.toFixed(1))
    },
-    closeMenu() {
-      if (this.currentPlaybackRate !== this.selected) {
-        this.$emit('change', this.selected)
+    modalInput(val) {
+      if (!val) {
+        if (this.currentPlaybackRate !== this.selected) {
+          this.$emit('change', this.selected)
+        }
      }
-      this.show = false
    },
    clickedOption(rate) {
      this.selected = Number(rate)
-      this.$nextTick(this.closeMenu)
+      this.show = false
+      this.$emit('change', Number(rate))
    }
  },
  mounted() {}
@@ -16,9 +16,8 @@
      <p class="text-sm font-semibold">
        {{ title }}
      </p>
-      <p class="text-sm text-gray-200 episode-subtitle mt-1.5 mb-0.5">
-        {{ description }}
-      </p>
+      <p class="text-sm text-gray-200 episode-subtitle mt-1.5 mb-0.5 default-style" v-html="description" />
+
      <div class="flex items-center pt-2">
        <div class="h-8 px-4 border border-white border-opacity-20 hover:bg-white hover:bg-opacity-10 rounded-full flex items-center justify-center cursor-pointer" :class="userIsFinished ? 'text-white text-opacity-40' : ''" @click="playClick">
          <span class="material-icons" :class="streamIsPlaying ? '' : 'text-success'">{{ streamIsPlaying ? 'pause' : 'play_arrow' }}</span>
@@ -27,6 +27,7 @@
 		4D66B954282EE87C008272D4 /* AbsDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D66B953282EE87C008272D4 /* AbsDownloader.swift */; };
 		4D66B956282EE951008272D4 /* AbsFileSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D66B955282EE951008272D4 /* AbsFileSystem.m */; };
 		4D66B958282EEA14008272D4 /* AbsFileSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D66B957282EEA14008272D4 /* AbsFileSystem.swift */; };
+		4DF74912287105C600AC7814 /* DeviceSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF74911287105C600AC7814 /* DeviceSettings.swift */; };
 		50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
 		504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
 		504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
@@ -59,6 +60,7 @@
 		4D66B955282EE951008272D4 /* AbsFileSystem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AbsFileSystem.m; sourceTree = "<group>"; };
 		4D66B957282EEA14008272D4 /* AbsFileSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AbsFileSystem.swift; sourceTree = "<group>"; };
 		4D8D412C26E187E400BA5F0D /* App-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "App-Bridging-Header.h"; sourceTree = "<group>"; };
+		4DF74911287105C600AC7814 /* DeviceSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSettings.swift; sourceTree = "<group>"; };
 		50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
 		504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -134,6 +136,7 @@
 				3ABF580828059BAE005DFBE5 /* PlaybackSession.swift */,
 				C4D0677428106D0C00B8F875 /* DataClasses.swift */,
 				3A90295E280968E700E1D427 /* PlaybackReport.swift */,
+				4DF74911287105C600AC7814 /* DeviceSettings.swift */,
 			);
 			path = models;
 			sourceTree = "<group>";
@@ -325,6 +328,7 @@
 				3AD4FCEB280443DD006DB301 /* Database.swift in Sources */,
 				3AD4FCE528043E50006DB301 /* AbsDatabase.swift in Sources */,
 				4D66B952282EE822008272D4 /* AbsDownloader.m in Sources */,
+				4DF74912287105C600AC7814 /* DeviceSettings.swift in Sources */,
 				3AF197102806E3DC0096F747 /* AbsAudioPlayer.m in Sources */,
 				3AF1970C2806E2590096F747 /* ApiClient.swift in Sources */,
 				C4D0677528106D0C00B8F875 /* DataClasses.swift in Sources */,
@@ -475,12 +479,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = Icons;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 7UFJ7D8V6A;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.9.47;
+				MARKETING_VERSION = 0.9.50;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.audiobookshelf.app.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -499,12 +503,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = Icons;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 7UFJ7D8V6A;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.9.47;
+				MARKETING_VERSION = 0.9.50;
 				PRODUCT_BUNDLE_IDENTIFIER = com.audiobookshelf.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -43,10 +43,10 @@ public class AbsAudioPlayer: CAPPlugin {
        initialPlayWhenReady = playWhenReady
        initialPlaybackRate = playbackRate
        
+        PlayerHandler.stopPlayback()
+        
        sendPrepareMetadataEvent(itemId: libraryItemId!, playWhenReady: playWhenReady)
        ApiClient.startPlaybackSession(libraryItemId: libraryItemId!, episodeId: episodeId, forceTranscode: false) { session in
-            PlayerHandler.startPlayback(session: session, playWhenReady: playWhenReady, playbackRate: playbackRate)
-            
            do {
                self.sendPlaybackSession(session: try session.asDictionary())
                call.resolve(try session.asDictionary())
@@ -56,6 +56,8 @@ public class AbsAudioPlayer: CAPPlugin {
                call.resolve([:])
            }
            
+            
+            PlayerHandler.startPlayback(session: session, playWhenReady: playWhenReady, playbackRate: playbackRate)
            self.sendMetadata()
        }
    }
@@ -173,7 +175,7 @@ public class AbsAudioPlayer: CAPPlugin {
            let playbackSession = PlayerHandler.getPlaybackSession()
            let libraryItemId = playbackSession?.libraryItemId ?? ""
            let episodeId = playbackSession?.episodeId ?? nil
-            NSLog("TEST: Forcing Transcode")
+            NSLog("Forcing Transcode")
            
            // If direct playing then fallback to transcode
            ApiClient.startPlaybackSession(libraryItemId: libraryItemId, episodeId: episodeId, forceTranscode: true) { session in
@@ -19,5 +19,6 @@ CAP_PLUGIN(AbsDatabase, "AbsDatabase",
           CAP_PLUGIN_METHOD(getLocalLibraryItem, CAPPluginReturnPromise);
           CAP_PLUGIN_METHOD(getLocalLibraryItemByLLId, CAPPluginReturnPromise);
           CAP_PLUGIN_METHOD(getLocalLibraryItemsInFolder, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(updateDeviceSettings, CAPPluginReturnPromise);
           )

@@ -65,11 +65,12 @@ public class AbsDatabase: CAPPlugin {
    @objc func getDeviceData(_ call: CAPPluginCall) {
        let configs = Database.shared.getServerConnectionConfigs()
        let index = Database.shared.getLastActiveConfigIndex()
+        let settings = Database.shared.getDeviceSettings()
        
        call.resolve([
            "serverConnectionConfigs": configs.map { config in convertServerConnectionConfigToJSON(config: config) },
            "lastServerConnectionConfigId": configs.first { config in config.index == index }?.id as Any,
-            // "currentLocalPlaybackSession": nil,
+            "deviceSettings": deviceSettingsToJSON(settings: settings)
        ])
    }
    
@@ -85,4 +86,18 @@ public class AbsDatabase: CAPPlugin {
    @objc func getLocalLibraryItemsInFolder(_ call: CAPPluginCall) {
        call.resolve([ "value": [] ])
    }
+    @objc func updateDeviceSettings(_ call: CAPPluginCall) {
+        let disableAutoRewind = call.getBool("disableAutoRewind") ?? false
+        let jumpBackwardsTime = call.getInt("jumpBackwardsTime") ?? 10
+        let jumpForwardTime = call.getInt("jumpForwardTime") ?? 10
+        let settings = DeviceSettings()
+        settings.disableAutoRewind = disableAutoRewind
+        settings.jumpBackwardsTime = jumpBackwardsTime
+        settings.jumpForwardTime = jumpForwardTime
+        
+        Database.shared.setDeviceSettings(deviceSettings: settings)
+        
+//        call.resolve([ "value": [] ])
+        getDeviceData(call)
+    }
 }
@@ -0,0 +1,33 @@
+//
+//  DeviceSettings.swift
+//  App
+//
+//  Created by advplyr on 7/2/22.
+//
+
+import Foundation
+import RealmSwift
+
+class DeviceSettings: Object {
+    @Persisted var disableAutoRewind: Bool
+    @Persisted var jumpBackwardsTime: Int
+    @Persisted var jumpForwardTime: Int
+}
+
+func getDefaultDeviceSettings() -> DeviceSettings {
+    let settings = DeviceSettings()
+    settings.disableAutoRewind = false
+    settings.jumpForwardTime = 10
+    settings.jumpBackwardsTime = 10
+    return settings
+}
+
+func deviceSettingsToJSON(settings: DeviceSettings) -> Dictionary<String, Any> {
+    return Database.realmQueue.sync {
+        return [
+            "disableAutoRewind": settings.disableAutoRewind,
+            "jumpBackwardsTime": settings.jumpBackwardsTime,
+            "jumpForwardTime": settings.jumpForwardTime
+        ]
+    }
+}
@@ -66,10 +66,10 @@ class AudioPlayer: NSObject {
        }
        
        self.currentTrackIndex = getItemIndexForTime(time: playbackSession.currentTime)
-        NSLog("TEST: Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)")
+        NSLog("Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)")
        
        let playerItems = self.allPlayerItems[self.currentTrackIndex..<self.allPlayerItems.count]
-        NSLog("TEST: Setting player items \(playerItems.count)")
+        NSLog("Setting player items \(playerItems.count)")
        
        for item in Array(playerItems) {
            self.audioPlayer.insert(item, after:self.audioPlayer.items().last)
@@ -123,7 +123,7 @@ class AudioPlayer: NSObject {
            self.audioPlayer.currentItem.map { item in
                self.currentTrackIndex = self.allPlayerItems.firstIndex(of:item) ?? 0
                if (self.currentTrackIndex != prevTrackIndex) {
-                    NSLog("TEST: New Current track index \(self.currentTrackIndex)")
+                    NSLog("New Current track index \(self.currentTrackIndex)")
                }
            }
        }
@@ -133,7 +133,7 @@ class AudioPlayer: NSObject {
        self.queueItemStatusObserver?.invalidate()
        self.queueItemStatusObserver = self.audioPlayer.currentItem?.observe(\.status, options: [.new, .old], changeHandler: { (playerItem, change) in
            if (playerItem.status == .readyToPlay) {
-                NSLog("TEST: queueStatusObserver: Current Item Ready to play. PlayWhenReady: \(self.playWhenReady)")
+                NSLog("queueStatusObserver: Current Item Ready to play. PlayWhenReady: \(self.playWhenReady)")
                self.updateNowPlaying()
                
                let firstReady = self.status < 0
@@ -146,7 +146,7 @@ class AudioPlayer: NSObject {
                    self.seek(self.playbackSession.currentTime, from: "queueItemStatusObserver")
                }
            } else if (playerItem.status == .failed) {
-                NSLog("TEST: queueStatusObserver: FAILED \(playerItem.error?.localizedDescription ?? "")")
+                NSLog("queueStatusObserver: FAILED \(playerItem.error?.localizedDescription ?? "")")
                
                NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.failed.rawValue), object: nil)
            }
@@ -203,16 +203,16 @@ class AudioPlayer: NSObject {
        
        pause()
        
-        NSLog("TEST: Seek to \(to) from \(from)")
+        NSLog("Seek to \(to) from \(from)")
        
        let currentTrack = self.playbackSession.audioTracks[self.currentTrackIndex]
        let ctso = currentTrack.startOffset ?? 0.0
        let trackEnd = ctso + currentTrack.duration
-        NSLog("TEST: Seek current track END = \(trackEnd)")
+        NSLog("Seek current track END = \(trackEnd)")
        
        
        let indexOfSeek = getItemIndexForTime(time: to)
-        NSLog("TEST: Seek to index \(indexOfSeek) | Current index \(self.currentTrackIndex)")
+        NSLog("Seek to index \(indexOfSeek) | Current index \(self.currentTrackIndex)")
        
        // Reconstruct queue if seeking to a different track
        if (self.currentTrackIndex != indexOfSeek) {
@@ -231,7 +231,7 @@ class AudioPlayer: NSObject {
            
            setupQueueItemStatusObserver()
        } else {
-            NSLog("TEST: Seeking in current item \(to)")
+            NSLog("Seeking in current item \(to)")
            let currentTrackStartOffset = self.playbackSession.audioTracks[self.currentTrackIndex].startOffset ?? 0.0
            let seekTime = to - currentTrackStartOffset
            
@@ -250,7 +250,7 @@ class AudioPlayer: NSObject {
    
    public func setPlaybackRate(_ rate: Float, observed: Bool = false) {
        if self.audioPlayer.rate != rate {
-            NSLog("TEST: setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)")
+            NSLog("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)")
            self.audioPlayer.rate = rate
        }
        if rate > 0.0 && !(observed && rate == 1) {
@@ -373,7 +373,7 @@ class AudioPlayer: NSObject {
    public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
        if context == &playerContext {
            if keyPath == #keyPath(AVPlayer.rate) {
-                NSLog("TEST: playerContext observer player rate")
+                NSLog("playerContext observer player rate")
                self.setPlaybackRate(change?[.newKey] as? Float ?? 1.0, observed: true)
            } else if keyPath == #keyPath(AVPlayer.currentItem) {
                NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.update.rawValue), object: nil)
@@ -128,4 +128,24 @@ class Database {
            return instance.objects(ServerConnectionConfigActiveIndex.self).first?.index ?? nil
        }
    }
+    public func setDeviceSettings(deviceSettings: DeviceSettings) {
+        Database.realmQueue.sync {
+            let existing = instance.objects(DeviceSettings.self)
+
+            do {
+                try instance.write {
+                    instance.delete(existing)
+                    instance.add(deviceSettings)
+                }
+            } catch(let exception) {
+                NSLog("failed to save device settings")
+                debugPrint(exception)
+            }
+        }
+    }
+    public func getDeviceSettings() -> DeviceSettings {
+        return Database.realmQueue.sync {
+            return instance.objects(DeviceSettings.self).first ?? getDefaultDeviceSettings()
+        }
+    }
 }
@@ -170,8 +170,8 @@ export default {
      this.inittingLibraries = true
      await this.$store.dispatch('libraries/load')
      console.log(`[default] initLibraries loaded ${this.currentLibraryId}`)
+      await this.$store.dispatch('libraries/fetch', this.currentLibraryId)
      this.$eventBus.$emit('library-changed')
-      this.$store.dispatch('libraries/fetch', this.currentLibraryId)
      this.inittingLibraries = false
    },
    async syncLocalMediaProgress() {
@@ -260,6 +260,10 @@ export default {

    if (this.$store.state.isFirstLoad) {
      this.$store.commit('setIsFirstLoad', false)
+
+      const deviceData = await this.$db.getDeviceData()
+      this.$store.commit('setDeviceData', deviceData)
+
      await this.$store.dispatch('setupNetworkListener')

      if (this.$store.state.user.serverConnectionConfig) {
@@ -1,6 +1,6 @@
 {
  "name": "audiobookshelf-app",
-  "version": "0.9.47-beta",
+  "version": "0.9.50-beta",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,6 +1,6 @@
 {
  "name": "audiobookshelf-app",
-  "version": "0.9.47-beta",
+  "version": "0.9.50-beta",
  "author": "advplyr",
  "scripts": {
    "dev": "nuxt --hostname 0.0.0.0 --port 1337",
@@ -53,10 +53,16 @@ export default {
  },
  methods: {
    async logout() {
-      await this.$axios.$post('/logout').catch((error) => {
-        console.error(error)
-      })
-      this.$server.logout()
+      if (this.user) {
+        await this.$axios.$post('/logout').catch((error) => {
+          console.error(error)
+        })
+      }
+
+      this.$socket.logout()
+      await this.$db.logout()
+      this.$localStore.removeLastLibraryId()
+      this.$store.commit('user/logout')
      this.$router.push('/connect')
    }
  },
@@ -4,10 +4,6 @@
    <home-bookshelf-toolbar v-show="!isHome" />
    <div id="bookshelf-wrapper" class="main-content overflow-y-auto overflow-x-hidden relative" :class="isHome ? 'home-page' : ''">
      <nuxt-child />
-
-      <!-- <div v-if="isLoading" class="absolute top-0 left-0 w-full h-full flex items-center justify-center">
-        <ui-loading-indicator />
-      </div>-->
    </div>
  </div>
 </template>
@@ -135,7 +135,7 @@ export default {
      }
      this.loading = false
    },
-    async libraryChanged(libid) {
+    async libraryChanged() {
      if (this.currentLibraryId) {
        await this.fetchCategories()
      }
@@ -12,7 +12,7 @@

      <!-- <p class="absolute bottom-16 left-0 right-0 px-2 text-center text-error"><strong>Important!</strong> This app requires that you are running <u>your own server</u> and does not provide any content.</p> -->

-      <connection-server-connect-form />
+      <connection-server-connect-form v-if="deviceData" :device-data="deviceData" />
    </div>

    <div class="flex items-center justify-center pt-4 fixed bottom-4 left-0 right-0">
@@ -32,7 +32,9 @@
 export default {
  layout: 'blank',
  data() {
-    return {}
+    return {
+      deviceData: null
+    }
  },
  computed: {
    networkConnected() {
@@ -41,6 +43,8 @@ export default {
  },
  methods: {
    async init() {
+      this.deviceData = await this.$db.getDeviceData()
+      this.$store.commit('setDeviceData', this.deviceData)
      await this.$store.dispatch('setupNetworkListener')
    }
  },
@@ -2,7 +2,7 @@
  <div class="w-full h-full px-3 py-4 overflow-y-auto">
    <div class="flex">
      <div class="w-16">
-        <div class="relative">
+        <div class="relative" @click="showFullscreenCover = true">
          <covers-book-cover :library-item="libraryItem" :width="64" :book-cover-aspect-ratio="bookCoverAspectRatio" />
          <div v-if="!isPodcast" class="absolute bottom-0 left-0 h-1 shadow-sm z-10" :class="userIsFinished ? 'bg-success' : 'bg-yellow-400'" :style="{ width: 64 * progressPercent + 'px' }"></div>
        </div>
@@ -21,7 +21,7 @@
            ><span :key="`${series.id}-comma`" v-if="index < seriesList.length - 1">,&nbsp;</span></template
          >
        </p>
-        <p v-if="podcastAuthor" class="text-sm text-gray-400 py-0.5">By {{ author }}</p>
+        <p v-if="podcastAuthor" class="text-sm text-gray-400 py-0.5">By {{ podcastAuthor }}</p>
        <p v-else-if="bookAuthors && bookAuthors.length" class="text-sm text-gray-400 py-0.5">
          By
          <template v-for="(author, index) in bookAuthors"
@@ -71,7 +71,7 @@
      </div>

      <div v-if="isLocal" class="flex mt-4">
-        <ui-btn color="success" :disabled="isPlaying" class="flex items-center justify-center flex-grow mr-2" :padding-x="4" @click="playClick">
+        <ui-btn v-if="showPlay" color="success" :disabled="isPlaying" class="flex items-center justify-center flex-grow mr-2" :padding-x="4" @click="playClick">
          <span v-show="!isPlaying" class="material-icons">play_arrow</span>
          <span class="px-1 text-sm">{{ isPlaying ? 'Playing' : 'Play' }}</span>
        </ui-btn>
@@ -112,6 +112,8 @@
    <modals-dialog v-model="showMoreMenu" title="" :items="moreMenuItems" @action="moreMenuAction" />

    <modals-item-details-modal v-model="showDetailsModal" :library-item="libraryItem" />
+
+    <modals-fullscreen-cover v-model="showFullscreenCover" :library-item="libraryItem" />
  </div>
 </template>

@@ -156,7 +158,8 @@ export default {
      isProcessingReadUpdate: false,
      showSelectLocalFolder: false,
      showMoreMenu: false,
-      showDetailsModal: false
+      showDetailsModal: false,
+      showFullscreenCover: false
    }
  },
  computed: {
@@ -1,6 +1,6 @@
 <template>
  <div class="w-full h-full p-8">
-    <div class="flex items-center py-3" @click="toggleDisableAutoRewind">
+    <div v-if="$platform !== 'ios'" class="flex items-center py-3" @click="toggleDisableAutoRewind">
      <div class="w-10 flex justify-center">
        <ui-toggle-switch v-model="settings.disableAutoRewind" @input="saveSettings" />
      </div>
@@ -12,9 +12,9 @@
      </div>
      <p class="pl-4">Jump backwards time</p>
    </div>
-    <div class="flex items-center py-3" @click="toggleJumpForwards">
+    <div class="flex items-center py-3" @click="toggleJumpForward">
      <div class="w-10 flex justify-center">
-        <span class="material-icons text-4xl">{{ currentJumpForwardsTimeIcon }}</span>
+        <span class="material-icons text-4xl">{{ currentJumpForwardTimeIcon }}</span>
      </div>
      <p class="pl-4">Jump forwards time</p>
    </div>
@@ -25,53 +25,34 @@
 export default {
  data() {
    return {
+      deviceData: null,
      settings: {
        disableAutoRewind: false,
-        jumpForwardsTime: 10000,
-        jumpBackwardsTime: 10000
-      },
-      jumpForwardsItems: [
-        {
-          icon: 'forward_5',
-          value: 5000
-        },
-        {
-          icon: 'forward_10',
-          value: 10000
-        },
-        {
-          icon: 'forward_30',
-          value: 30000
-        }
-      ],
-      jumpBackwardsItems: [
-        {
-          icon: 'replay_5',
-          value: 5000
-        },
-        {
-          icon: 'replay_10',
-          value: 10000
-        },
-        {
-          icon: 'replay_30',
-          value: 30000
-        }
-      ]
+        jumpForwardTime: 10,
+        jumpBackwardsTime: 10
+      }
    }
  },
  computed: {
-    currentJumpForwardsTimeIcon() {
-      return this.jumpForwardsItems[this.currentJumpForwardsTimeIndex].icon
+    jumpForwardItems() {
+      return this.$store.state.globals.jumpForwardItems || []
    },
-    currentJumpForwardsTimeIndex() {
-      return this.jumpForwardsItems.findIndex((jfi) => jfi.value === this.settings.jumpForwardsTime)
+    jumpBackwardsItems() {
+      return this.$store.state.globals.jumpBackwardsItems || []
+    },
+    currentJumpForwardTimeIcon() {
+      return this.jumpForwardItems[this.currentJumpForwardTimeIndex].icon
+    },
+    currentJumpForwardTimeIndex() {
+      var index = this.jumpForwardItems.findIndex((jfi) => jfi.value === this.settings.jumpForwardTime)
+      return index >= 0 ? index : 1
    },
    currentJumpBackwardsTimeIcon() {
      return this.jumpBackwardsItems[this.currentJumpBackwardsTimeIndex].icon
    },
    currentJumpBackwardsTimeIndex() {
-      return this.jumpBackwardsItems.findIndex((jfi) => jfi.value === this.settings.jumpBackwardsTime)
+      var index = this.jumpBackwardsItems.findIndex((jfi) => jfi.value === this.settings.jumpBackwardsTime)
+      return index >= 0 ? index : 1
    }
  },
  methods: {
@@ -79,24 +60,37 @@ export default {
      this.settings.disableAutoRewind = !this.settings.disableAutoRewind
      this.saveSettings()
    },
-    toggleJumpForwards() {
-      var next = (this.currentJumpForwardsTimeIndex + 1) % 3
-      this.settings.jumpForwardsTime = this.jumpForwardsItems[next].value
+    toggleJumpForward() {
+      var next = (this.currentJumpForwardTimeIndex + 1) % 3
+      this.settings.jumpForwardTime = this.jumpForwardItems[next].value
      this.saveSettings()
    },
    toggleJumpBackwards() {
      var next = (this.currentJumpBackwardsTimeIndex + 4) % 3
-      console.log('next', next)
      if (next > 2) return
      this.settings.jumpBackwardsTime = this.jumpBackwardsItems[next].value
      this.saveSettings()
    },
-    saveSettings() {
-      // TODO: Save settings
+    async saveSettings() {
+      const updatedDeviceData = await this.$db.updateDeviceSettings({ ...this.settings })
+      console.log('Saved device data', updatedDeviceData)
+      if (updatedDeviceData) {
+        this.$store.commit('setDeviceData', updatedDeviceData)
+        this.init()
+      }
+    },
+    async init() {
+      this.deviceData = await this.$db.getDeviceData()
+      this.$store.commit('setDeviceData', this.deviceData)
+
+      const deviceSettings = this.deviceData.deviceSettings || {}
+      this.settings.disableAutoRewind = !!deviceSettings.disableAutoRewind
+      this.settings.jumpForwardTime = deviceSettings.jumpForwardTime || 10
+      this.settings.jumpBackwardsTime = deviceSettings.jumpBackwardsTime || 10
    }
  },
  mounted() {
-    // TODO: Load settings
+    this.init()
  }
 }
 </script>
@@ -4,6 +4,14 @@ export default function ({ $axios, store }) {
    if (config.url.startsWith('http:') || config.url.startsWith('https:')) {
      return
    }
+
+    var customHeaders = store.getters['user/getCustomHeaders']
+    if (customHeaders) {
+      for (const key in customHeaders) {
+        config.headers.common[key] = customHeaders[key]
+      }
+    }
+
    var bearerToken = store.getters['user/getToken']
    if (bearerToken) {
      config.headers.common['Authorization'] = `Bearer ${bearerToken}`
@@ -13,7 +13,8 @@ class AbsDatabaseWeb extends WebPlugin {
    const deviceData = {
      serverConnectionConfigs: [],
      lastServerConnectionConfigId: null,
-      currentLocalPlaybackSession: null
+      currentLocalPlaybackSession: null,
+      deviceSettings: {}
    }
    return deviceData
  }
@@ -28,6 +29,7 @@ class AbsDatabaseWeb extends WebPlugin {
      ssc.token = serverConnectionConfig.token
      ssc.userId = serverConnectionConfig.userId
      ssc.username = serverConnectionConfig.username
+      ssc.customHeaders = serverConnectionConfig.customHeaders || {}
      localStorage.setItem('device', JSON.stringify(deviceData))
    } else {
      ssc = {
@@ -37,7 +39,8 @@ class AbsDatabaseWeb extends WebPlugin {
        userId: serverConnectionConfig.userId,
        username: serverConnectionConfig.username,
        address: serverConnectionConfig.address,
-        token: serverConnectionConfig.token
+        token: serverConnectionConfig.token,
+        customHeaders: serverConnectionConfig.customHeaders || {}
      }
      deviceData.serverConnectionConfigs.push(ssc)
      deviceData.lastServerConnectionConfigId = ssc.id
@@ -207,6 +210,13 @@ class AbsDatabaseWeb extends WebPlugin {
    // { localLibraryItemId, localEpisodeId, isFinished }
    return null
  }
+
+  async updateDeviceSettings(payload) {
+    var deviceData = await this.getDeviceData()
+    deviceData.deviceSettings = payload
+    localStorage.setItem('device', JSON.stringify(deviceData))
+    return deviceData
+  }
 }

 const AbsDatabase = registerPlugin('AbsDatabase', {
@@ -82,6 +82,10 @@ class DbService {
  updateLocalMediaProgressFinished(payload) {
    return AbsDatabase.updateLocalMediaProgressFinished(payload)
  }
+
+  updateDeviceSettings(payload) {
+    return AbsDatabase.updateDeviceSettings(payload)
+  }
 }

 export default ({ app, store }, inject) => {
@@ -83,7 +83,16 @@ class LocalStorage {
      await Storage.set({ key: 'lastLibraryId', value: libraryId })
      console.log('[LocalStorage] Set Last Library Id', libraryId)
    } catch (error) {
-      console.error('[LocalStorage] Failed to set current library', error)
+      console.error('[LocalStorage] Failed to set last library id', error)
+    }
+  }
+
+  async removeLastLibraryId() {
+    try {
+      await Storage.remove({ key: 'lastLibraryId' })
+      console.log('[LocalStorage] Remove Last Library Id')
+    } catch (error) {
+      console.error('[LocalStorage] Failed to remove last library id', error)
    }
  }

@@ -1,6 +1,6 @@
 # Audiobookshelf Mobile App

-AudioBookshelf is a self-hosted audiobook server for managing and playing your audiobooks.
+Audiobookshelf is a self-hosted audiobook and podcast server.

 ### Android (beta)
 Get the Android app on the [Google Play Store](https://play.google.com/store/apps/details?id=com.audiobookshelf.app)
@@ -3,7 +3,35 @@ export const state = () => ({
  bookshelfListView: false,
  series: null,
  localMediaProgress: [],
-  lastSearch: null
+  lastSearch: null,
+  jumpForwardItems: [
+    {
+      icon: 'forward_5',
+      value: 5
+    },
+    {
+      icon: 'forward_10',
+      value: 10
+    },
+    {
+      icon: 'forward_30',
+      value: 30
+    }
+  ],
+  jumpBackwardsItems: [
+    {
+      icon: 'replay_5',
+      value: 5
+    },
+    {
+      icon: 'replay_10',
+      value: 10
+    },
+    {
+      icon: 'replay_30',
+      value: 30
+    }
+  ]
 })

 export const getters = {
@@ -22,13 +50,16 @@ export const getters = {
    if (media.coverPath.startsWith('http:') || media.coverPath.startsWith('https:')) return media.coverPath

    var userToken = rootGetters['user/getToken']
+    var serverAddress = rootGetters['user/getServerAddress']
+    if (!userToken || !serverAddress) return placeholder
+
    var lastUpdate = libraryItem.updatedAt || Date.now()

    if (process.env.NODE_ENV !== 'production') { // Testing
      // return `http://localhost:3333/api/items/${libraryItem.id}/cover?token=${userToken}&ts=${lastUpdate}`
    }

-    var url = new URL(`/api/items/${libraryItem.id}/cover`, rootGetters['user/getServerAddress'])
+    var url = new URL(`/api/items/${libraryItem.id}/cover`, serverAddress)
    return `${url}?token=${userToken}&ts=${lastUpdate}`
  },
  getLocalMediaProgressById: (state) => (localLibraryItemId, episodeId = null) => {
@@ -42,6 +73,14 @@ export const getters = {
      if (episodeId != null && lmp.episodeId != episodeId) return false
      return lmp.libraryItemId == libraryItemId
    })
+  },
+  getJumpForwardIcon: state => (jumpForwardTime) => {
+    const item = state.jumpForwardItems.find(i => i.value == jumpForwardTime)
+    return item ? item.icon : 'forward_10'
+  },
+  getJumpBackwardsIcon: state => (jumpBackwardsTime) => {
+    const item = state.jumpBackwardsItems.find(i => i.value == jumpBackwardsTime)
+    return item ? item.icon : 'replay_10'
  }
 }

@@ -1,6 +1,7 @@
 import { Network } from '@capacitor/network'

 export const state = () => ({
+  deviceData: null,
  playerLibraryItemId: null,
  playerEpisodeId: null,
  playerIsLocal: false,
@@ -35,6 +36,14 @@ export const getters = {
    if (!state.serverSettings) return 1
    return state.serverSettings.coverAspectRatio === 0 ? 1.6 : 1
  },
+  getJumpForwardTime: state => {
+    if (!state.deviceData || !state.deviceData.deviceSettings) return 10
+    return state.deviceData.deviceSettings.jumpForwardTime || 10
+  },
+  getJumpBackwardsTime: state => {
+    if (!state.deviceData || !state.deviceData.deviceSettings) return 10
+    return state.deviceData.deviceSettings.jumpBackwardsTime || 10
+  }
 }

 export const actions = {
@@ -55,6 +64,9 @@ export const actions = {
 }

 export const mutations = {
+  setDeviceData(state, deviceData) {
+    state.deviceData = deviceData
+  },
  setLastBookshelfScrollData(state, { scrollTop, path, name }) {
    state.lastBookshelfScrollData[name] = { scrollTop, path }
  },
@@ -90,6 +90,7 @@ export const mutations = {
  },
  reset(state) {
    state.lastLoad = 0
+    state.currentLibraryId = null
    state.libraries = []
  },
  setCurrentLibrary(state, val) {
@@ -22,6 +22,9 @@ export const getters = {
  getServerAddress: (state) => {
    return state.serverConnectionConfig ? state.serverConnectionConfig.address : null
  },
+  getCustomHeaders: (state) => {
+    return state.serverConnectionConfig ? state.serverConnectionConfig.customHeaders : null
+  },
  getUserMediaProgress: (state) => (libraryItemId, episodeId = null) => {
    if (!state.user || !state.user.mediaProgress) return null
    return state.user.mediaProgress.find(li => {
Author	SHA1	Message	Date
advplyr	9be1ee1843	iOS version bump 0.9.50	2022-07-02 18:30:22 -05:00
advplyr	b5c6acc2bc	Add:iOS device settings for jump forward/backward	2022-07-02 18:29:41 -05:00
advplyr	39b137c7f1	Version bump 0.9.50	2022-07-02 16:40:31 -05:00
advplyr	b16a7342aa	Update:Tapping title/author in fullscreen player redirects to library item page #246	2022-07-02 15:40:37 -05:00
advplyr	3056c55d2f	Fix:Update total track width on open fullscreen	2022-07-02 15:03:21 -05:00
advplyr	6b416e6fc1	Fix:Podcast author on item page and use html description for podcast episodes	2022-07-02 14:33:53 -05:00
advplyr	e4c6093a82	Update:Notification player closed when closing in-app player and stop button on notification player #255 , Add:Setting for disabling auto rewind	2022-07-02 14:18:21 -05:00
advplyr	3c1120ea48	Add settings page with adjustable jump forward/backward settings	2022-07-01 20:05:11 -05:00
advplyr	a41e26e4c6	Fix:Fetch more library items per request to fill screen size #265	2022-07-01 17:01:40 -05:00
advplyr	317dc366e3	Add custom headers modal and model	2022-07-01 16:33:39 -05:00
advplyr	cd4c280950	Add:Tap cover to show fullscreen cover image #224	2022-06-24 17:20:13 -05:00
advplyr	0ca8de5916	Fix:Audio player fullscreen in landscape mode #234	2022-06-23 19:27:41 -05:00
advplyr	3840f2f344	Update:Less aggressive seek back after pausing, first seek back starts on a 10s pause and jumps back 3s #230 . Minimum seek back after a pause is the current chapter start time #244	2022-06-21 18:22:47 -05:00
advplyr	f353a44fac	Fix:Chromecast current track #253	2022-06-21 17:25:27 -05:00
advplyr	a06796d9ca	Fix initialize Paper for android auto	2022-06-19 12:03:50 -05:00
advplyr	a69054fefa	Fix crash when server requests fail	2022-06-19 11:57:19 -05:00
advplyrandGitHub	6805d7eb96	Update readme.md	2022-06-11 21:46:20 -05:00
advplyrandGitHub	c77d0f1944	Merge pull request #233 from jmt-gh/add_server_version Show server version in drawer	2022-06-09 17:36:56 -05:00
jmt-gh GitHub advplyr	c457c8eaf7	Update components/app/SideDrawer.vue Co-authored-by: advplyr <67830747+advplyr@users.noreply.github.com>	2022-06-09 15:28:49 -07:00
jmt-gh	a391db5dc2	Change what is being called for version If I tried to grab version directly in the computed section, it would throw a null error on reload in browser (didn't see any issue on an actual device). Doing it this way fixes that	2022-06-09 12:08:04 -07:00
jmt-gh	2180e2f649	Add server version to drawer This commit adds the server version next to the URL. It also adds a new style to ensure that the text wraps properly if the URL is too long. Trying text-wrap didn't work.	2022-06-09 11:57:44 -07:00
advplyr	fc6d16bdd9	Update:Make audio probe optional	2022-06-06 18:47:09 -05:00
advplyr	815529129a	Fix:Save playback speed when using custom value #226	2022-06-06 17:19:02 -05:00
advplyr	bad8d10a18	Fix:Android 9 and below scan folder for m4b #220	2022-06-05 16:46:38 -05:00
advplyr	a4412da3ed	Version bump 0.9.49-beta	2022-06-05 16:38:45 -05:00
advplyr	870774b408	Fix:Remove last saved library id when changing servers so home page shelves load on init	2022-06-05 16:32:28 -05:00
advplyr	d7dcaa22a6	Fix:Logout button on account page #222	2022-06-05 16:01:05 -05:00
advplyr	cc0b2943dd	Fix:Hide play button for local podcast	2022-06-05 15:56:23 -05:00
advplyr	50ee0b2265	Fix:Local downloaded books crash when server progress check fails, fix check pause timeout length #219	2022-06-05 15:52:54 -05:00
advplyr	910b3a2a17	Version bump 0.9.48-beta	2022-06-05 09:55:22 -05:00
advplyr	916da91ccb	Fix:Android auto check if server connection available and use first available server config, add ping api check with 3 second timeout #212 #167	2022-06-05 09:51:37 -05:00