iOS update pods

iOS version bump 0.9.62
Merge branch 'master' of https://github.com/advplyr/audiobookshelf-app
2026-07-25 14:08:35 +02:00 · 2023-02-19 16:53:43 -06:00 · 2023-02-19 15:40:24 -06:00 · 2023-02-19 14:51:41 -06:00 · 2023-02-19 14:51:34 -06:00 · 2023-02-19 14:23:45 -06:00
251 changed files with 9752 additions and 3296 deletions
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang=en>
+<head>
+<meta http-equiv=content-type content="text/html; charset=utf-8" />
+<meta name=viewport content="width=device-width, initial-scale=1">
+<title>Audiobookshelf :: Testers</title>
+<style>
+body {
+  background-color: rgb(55, 56, 56);
+  font-family: Sans;
+  margin: 40px auto;
+  max-width: 500px;
+  color: #ddd;
+  text-align: center;
+  padding: 5px;
+}
+img {
+    width: 100px;
+}
+h1 {
+  font-weight: 100;
+}
+a {
+  color: #fff;
+}
+#apk {
+  display: grid;
+  grid-template-columns: auto auto;
+  justify-content: center;
+  column-gap: 15px;
+  text-align: left;
+  font-family: monospace;
+  background-color: #222;
+  padding: 20px;
+  border-radius: 5px;
+}
+</style>
+</head>
+<body>
+
+  <a href="https://audiobookshelf.org">
+    <img src=logo.png />
+  </a>
+	<h1>Audiobookshelf :: Testers</h1>
+
+  <p>
+  Here you can download the latest version of Audiobookshelf for Android for <b>testing</b>.
+  The app is automatically built for every new patch added to the project.
+  </p>
+
+  <div id=apk>
+    <div>Built on</div>
+    <div>__DATE__</div>
+
+    <div>Git commit</div>
+    <a href="https://github.com/advplyr/audiobookshelf-app/commit/__COMMIT__">__COMMIT__</a>
+
+    <div>Download</div>
+    <a href="__APK__">__APK__</a>
+  </div>
+
+  <p>
+  Using this requires some technical knowledge to install the APK manually.
+  Regular users should use the releases published on the <a href="https://play.google.com/store/apps/details?id=com.audiobookshelf.app">Play Store</a>.
+  </p>
+
+  <hr />
+
+  <p>Report bugs, request features, provide feedback, and contribute on <a href="https://github.com/advplyr/audiobookshelf-app/issues">GitHub</a></p>
+  <p>
+    <a href="https://github.com/advplyr/audiobookshelf-app/issues">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" width=32 height=32 viewBox="0 0 24 24">
+        <path
+          d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"
+        />
+      </svg>
+    </a>
+  </div>
+
+</body>
+</html>
@@ -0,0 +1,47 @@
+name: Build APK
+
+on:
+  push:
+    paths-ignore:
+      - 'ios/**'
+      - 'readme.md'
+  pull_request:
+    paths-ignore:
+      - 'ios/**'
+      - 'readme.md'
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v3
+
+    - name: use Node.js 16.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
+    - name: install dependencies
+      run: npm ci
+
+    - name: build Nuxt project
+      run: npm run generate
+
+    - name: copy to Android project
+      run: npx cap sync
+
+    - name: build Android app
+      run: ./android/gradlew assembleDebug -p android --no-daemon
+
+    - name: rename apk
+      working-directory: android/app/build/outputs/apk/debug/
+      run: |
+        build="$(date +%Y%m%d-%H%M%S)-$(git rev-parse --short HEAD)"
+        name="audiobookshelf-${build}.apk"
+        mv -v app-debug.apk "${name}"
+
+    - name: upload app
+      uses: actions/upload-artifact@v3
+      with:
+        name: audiobookshelf-apk
+        path: android/app/build/outputs/apk/debug/*.apk
@@ -0,0 +1,76 @@
+name: Publish Test App
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'ios/**'
+      - 'readme.md'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v3
+
+    - name: use Node.js 16.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
+    - name: install dependencies
+      run: npm ci
+
+    - name: build Nuxt project
+      run: npm run generate
+
+    - name: copy to Android project
+      run: npx cap sync
+
+    - name: build Android app
+      run: ./android/gradlew assembleDebug -p android --no-daemon
+
+    - name: rename apk
+      working-directory: android/app/build/outputs/apk/debug/
+      run: |
+        build="$(date +%Y%m%d-%H%M%S)-$(git rev-parse --short HEAD)"
+        name="audiobookshelf-${build}.apk"
+        mv -v app-debug.apk "${name}"
+
+    - name: prepare test page ressources
+      run: |
+        mkdir ghpages
+        cp android/app/build/outputs/apk/debug/*apk ghpages/
+        cp static/Logo.png ghpages/logo.png
+        cp .github/testing-page-template.html ghpages/index.html
+
+    - name: build test page
+      working-directory: ghpages
+      run: |
+        sed -i "s/__DATE__/$(date)/g" index.html
+        sed -i "s/__COMMIT__/$(git rev-parse --short HEAD)/g" index.html
+        sed -i "s/__APK__/$(ls *apk)/g" index.html
+
+    - name: upload test page artifact
+      uses: actions/upload-pages-artifact@v1
+      with:
+        path: ./ghpages
+
+  deploy:
+    needs: build
+
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1
@@ -22,6 +22,8 @@ kotlin {

 android {

+
+  namespace 'com.audiobookshelf.app'
  buildFeatures {
    viewBinding true
  }
@@ -33,8 +35,8 @@ android {
        applicationId "com.audiobookshelf.app"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 88
-        versionName "0.9.57-beta"
+        versionCode 93
+        versionName "0.9.62-beta"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -43,6 +45,12 @@ android {
        }
    }
    buildTypes {
+        debug {
+          applicationIdSuffix ".debug"
+          versionNameSuffix "-debug"
+          minifyEnabled false
+          proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -72,6 +80,7 @@ configurations.all {
 }

 dependencies {
+    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
  implementation project(':capacitor-android')
@@ -115,7 +124,7 @@ dependencies {
  implementation 'io.github.pilgr:paperdb:2.7.2'

  // Simple Storage
-  implementation "com.anggrayudi:storage:0.14.0"
+  implementation "com.anggrayudi:storage:1.5.4"

  // OK HTTP
  implementation 'com.squareup.okhttp3:okhttp:4.9.2'
@@ -2,8 +2,8 @@

 android {
  compileOptions {
-      sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
  }
 }

@@ -13,8 +13,8 @@ dependencies {
    implementation project(':capacitor-dialog')
    implementation project(':capacitor-haptics')
    implementation project(':capacitor-network')
+    implementation project(':capacitor-preferences')
    implementation project(':capacitor-status-bar')
-    implementation project(':capacitor-storage')

 }

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:dist="http://schemas.android.com/apk/distribution"
    xmlns:tools="http://schemas.android.com/tools"
-    package="com.audiobookshelf.app"
    android:installLocation="preferExternal" >

    <!-- Permissions -->
@@ -23,6 +22,8 @@
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        android:usesCleartextTraffic="true" >
+
+<!-- TODO: Incomplete desktop widget -->
 <!--        <receiver-->
 <!--            android:name=".NewAppWidget"-->
 <!--            android:exported="true" >-->
@@ -75,7 +76,7 @@
            </intent-filter>
        </activity>

-        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MEDIA_BUTTON" />
            </intent-filter>
@@ -84,7 +85,8 @@
        <service
            android:name=".player.PlayerNotificationService"
            android:enabled="true"
-            android:exported="true" >
+            android:exported="true"
+            android:foregroundServiceType="mediaPlayback">
            <intent-filter>
                <action android:name="android.media.browse.MediaBrowserService" />
            </intent-filter>
@@ -16,11 +16,11 @@
 		"classpath": "com.capacitorjs.plugins.network.NetworkPlugin"
 	},
 	{
-		"pkg": "@capacitor/status-bar",
-		"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
+		"pkg": "@capacitor/preferences",
+		"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
 	},
 	{
-		"pkg": "@capacitor/storage",
-		"classpath": "com.capacitorjs.plugins.storage.StoragePlugin"
+		"pkg": "@capacitor/status-bar",
+		"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
 	}
 ]
@@ -12,8 +12,8 @@ import android.util.Log
 import androidx.core.app.ActivityCompat
 import com.anggrayudi.storage.SimpleStorage
 import com.anggrayudi.storage.SimpleStorageHelper
-import com.audiobookshelf.app.data.AbsDatabase
-import com.audiobookshelf.app.data.DbManager
+import com.audiobookshelf.app.plugins.AbsDatabase
+import com.audiobookshelf.app.managers.DbManager
 import com.audiobookshelf.app.player.PlayerNotificationService
 import com.audiobookshelf.app.plugins.AbsAudioPlayer
 import com.audiobookshelf.app.plugins.AbsDownloader
@@ -51,11 +51,17 @@ class MainActivity : BridgeActivity() {
 //      .detectLeakedClosableObjects()
 //      .penaltyLog()
 //      .build())
+    DbManager.initialize(applicationContext)
+
+    registerPlugin(AbsAudioPlayer::class.java)
+    registerPlugin(AbsDownloader::class.java)
+    registerPlugin(AbsFileSystem::class.java)
+    registerPlugin(AbsDatabase::class.java)

    super.onCreate(savedInstanceState)
    Log.d(tag, "onCreate")

-    DbManager.initialize(applicationContext)
+

    val permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
    if (permission != PackageManager.PERMISSION_GRANTED) {
@@ -63,11 +69,6 @@ class MainActivity : BridgeActivity() {
        PERMISSIONS_ALL,
        REQUEST_PERMISSIONS)
    }
-
-    registerPlugin(AbsAudioPlayer::class.java)
-    registerPlugin(AbsDownloader::class.java)
-    registerPlugin(AbsFileSystem::class.java)
-    registerPlugin(AbsDatabase::class.java)
  }

  override fun onDestroy() {
@@ -0,0 +1,34 @@
+package com.audiobookshelf.app.data
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class AudioTrack(
+  var index:Int,
+  var startOffset:Double,
+  var duration:Double,
+  var title:String,
+  var contentUrl:String,
+  var mimeType:String,
+  var metadata:FileMetadata?,
+  var isLocal:Boolean,
+  var localFileId:String?,
+  var audioProbeResult:AudioProbeResult?,
+  var serverIndex:Int? // Need to know if server track index is different
+) {
+
+  @get:JsonIgnore
+  val startOffsetMs get() = (startOffset * 1000L).toLong()
+  @get:JsonIgnore
+  val durationMs get() = (duration * 1000L).toLong()
+  @get:JsonIgnore
+  val endOffsetMs get() = startOffsetMs + durationMs
+  @get:JsonIgnore
+  val relPath get() = metadata?.relPath ?: ""
+
+  @JsonIgnore
+  fun getBookChapter():BookChapter {
+    return BookChapter(index + 1,startOffset, startOffset + duration, title)
+  }
+}
@@ -1,9 +1,11 @@
 package com.audiobookshelf.app.data

+import android.content.Context
 import android.os.Bundle
 import android.support.v4.media.MediaDescriptionCompat
 import android.support.v4.media.MediaMetadataCompat
 import androidx.media.utils.MediaConstants
+import com.audiobookshelf.app.media.MediaManager
 import com.fasterxml.jackson.annotation.*

 // This auto-detects whether it is a Book or Podcast
@@ -50,7 +52,8 @@ class Podcast(
    // Add new episodes
    audioTracks.forEach { at ->
      if (episodes?.find{ it.audioTrack?.localFileId == at.localFileId } == null) {
-        val newEpisode = PodcastEpisode("local_ep_" + at.localFileId,episodes?.size ?: 0 + 1,null,null,at.title,null,null,null,at,at.duration,0, null)
+        val localEpisodeId = "local_ep_" + at.localFileId
+        val newEpisode = PodcastEpisode(localEpisodeId,(episodes?.size ?: 0) + 1,null,null,at.title,null,null,null, null, null, at,at.duration,0, null, localEpisodeId)
        episodes?.add(newEpisode)
      }
    }
@@ -63,7 +66,8 @@ class Podcast(
  }
  @JsonIgnore
  override fun addAudioTrack(audioTrack:AudioTrack) {
-    val newEpisode = PodcastEpisode("local_" + audioTrack.localFileId,(episodes?.size ?: 0) + 1,null,null,audioTrack.title,null,null,null,audioTrack,audioTrack.duration,0, null)
+    val localEpisodeId = "local_ep_" + audioTrack.localFileId
+    val newEpisode = PodcastEpisode(localEpisodeId,(episodes?.size ?: 0) + 1,null,null,audioTrack.title,null,null,null, null, null,audioTrack,audioTrack.duration,0, null, localEpisodeId)
    episodes?.add(newEpisode)

    var index = 1
@@ -82,9 +86,17 @@ class Podcast(
      index++
    }
  }
+
+  // Used for FolderScanner local podcast item to get copy of Podcast excluding episodes
+  @JsonIgnore
+  override fun getLocalCopy(): Podcast {
+    return Podcast(metadata as PodcastMetadata,coverPath,tags, mutableListOf(),autoDownloadEpisodes, 0)
+  }
+
  @JsonIgnore
  fun addEpisode(audioTrack:AudioTrack, episode:PodcastEpisode):PodcastEpisode {
-    val newEpisode = PodcastEpisode("local_" + episode.id,(episodes?.size ?: 0) + 1,episode.episode,episode.episodeType,episode.title,episode.subtitle,episode.description,null,audioTrack,audioTrack.duration,0, episode.id)
+    val localEpisodeId = "local_ep_" + episode.id
+    val newEpisode = PodcastEpisode(localEpisodeId,(episodes?.size ?: 0) + 1,episode.episode,episode.episodeType,episode.title,episode.subtitle,episode.description,null,null,null,audioTrack,audioTrack.duration,0, episode.id, localEpisodeId)
    episodes?.add(newEpisode)

    var index = 1
@@ -95,10 +107,14 @@ class Podcast(
    return newEpisode
  }

-  // Used for FolderScanner local podcast item to get copy of Podcast excluding episodes
  @JsonIgnore
-  override fun getLocalCopy(): Podcast {
-    return Podcast(metadata as PodcastMetadata,coverPath,tags, mutableListOf(),autoDownloadEpisodes, 0)
+  fun getNextUnfinishedEpisode(libraryItemId:String, mediaManager: MediaManager):PodcastEpisode? {
+    val sortedEpisodes = episodes?.sortedByDescending { it.publishedAt }
+    val podcastEpisode = sortedEpisodes?.find { episode ->
+      val progress = mediaManager.serverUserMediaProgress.find { it.libraryItemId == libraryItemId && it.episodeId == episode.id }
+      progress == null || !progress.isFinished
+    }
+    return podcastEpisode
  }
 }

@@ -122,10 +138,13 @@ class Book(
  override fun setAudioTracks(audioTracks:MutableList<AudioTrack>) {
    tracks = audioTracks
    tracks?.sortBy { it.index }
-    // TODO: Is it necessary to calculate this each time? check if can remove safely
+
    var totalDuration = 0.0
+    var currentStartOffset = 0.0
    tracks?.forEach {
      totalDuration += it.duration
+      it.startOffset = currentStartOffset
+      currentStartOffset += it.duration
    }
    duration = totalDuration
  }
@@ -158,7 +177,6 @@ class Book(
    }
    duration = totalDuration
  }
-
  @JsonIgnore
  override fun getLocalCopy(): Book {
    return Book(metadata as BookMetadata,coverPath,tags, mutableListOf(),chapters,mutableListOf(),null,null, 0)
@@ -228,21 +246,32 @@ data class PodcastEpisode(
  var title:String?,
  var subtitle:String?,
  var description:String?,
+  var pubDate:String?,
+  var publishedAt:Long?,
  var audioFile:AudioFile?,
  var audioTrack:AudioTrack?,
  var duration:Double?,
  var size:Long?,
-  var serverEpisodeId:String? // For local podcasts to match with server podcasts
+  var serverEpisodeId:String?, // For local podcasts to match with server podcasts
+  var localEpisodeId:String? // For Android Auto server episodes with local copy
 ) {
  @JsonIgnore
-  fun getMediaDescription(libraryItem:LibraryItemWrapper, progress:MediaProgressWrapper?): MediaDescriptionCompat {
-    val coverUri = if(libraryItem is LocalLibraryItem) {
+  fun getMediaDescription(libraryItem:LibraryItemWrapper, progress:MediaProgressWrapper?, ctx: Context?): MediaDescriptionCompat {
+    val coverUri = if (libraryItem is LocalLibraryItem) {
      libraryItem.getCoverUri()
    } else {
      (libraryItem as LibraryItem).getCoverUri()
    }

    val extras = Bundle()
+
+    if (localEpisodeId != null) {
+      extras.putLong(
+        MediaDescriptionCompat.EXTRA_DOWNLOAD_STATUS,
+        MediaDescriptionCompat.STATUS_DOWNLOADED
+      )
+    }
+
    if (progress != null) {
      if (progress.isFinished) {
        extras.putInt(
@@ -264,22 +293,21 @@ data class PodcastEpisode(
        MediaConstants.DESCRIPTION_EXTRAS_VALUE_COMPLETION_STATUS_NOT_PLAYED
      )
    }
-//    return MediaMetadataCompat.Builder().apply {
-//      putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, id)
-//      putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, title)
-//      putString(MediaMetadataCompat.METADATA_KEY_TITLE, title)
-//      putString(MediaMetadataCompat.METADATA_KEY_AUTHOR, podcast.metadata.getAuthorDisplayName())
-//      putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, coverUri.toString())
-//
-//    }.build()
-    val libraryItemDescription = libraryItem.getMediaDescription(null)
-    return MediaDescriptionCompat.Builder()
-      .setMediaId(id)
+
+    val libraryItemDescription = libraryItem.getMediaDescription(null, ctx)
+    val mediaId = localEpisodeId ?: id
+    val mediaDescriptionBuilder = MediaDescriptionCompat.Builder()
+      .setMediaId(mediaId)
      .setTitle(title)
      .setIconUri(coverUri)
      .setSubtitle(libraryItemDescription.title)
      .setExtras(extras)
-      .build()
+
+    libraryItemDescription.iconBitmap?.let {
+      mediaDescriptionBuilder.setIconBitmap(it)
+    }
+
+    return mediaDescriptionBuilder.build()
  }
 }

@@ -329,36 +357,6 @@ data class Folder(
  var fullPath:String
 )

-@JsonIgnoreProperties(ignoreUnknown = true)
-data class AudioTrack(
-  var index:Int,
-  var startOffset:Double,
-  var duration:Double,
-  var title:String,
-  var contentUrl:String,
-  var mimeType:String,
-  var metadata:FileMetadata?,
-  var isLocal:Boolean,
-  var localFileId:String?,
-  var audioProbeResult:AudioProbeResult?,
-  var serverIndex:Int? // Need to know if server track index is different
-) {
-
-  @get:JsonIgnore
-  val startOffsetMs get() = (startOffset * 1000L).toLong()
-  @get:JsonIgnore
-  val durationMs get() = (duration * 1000L).toLong()
-  @get:JsonIgnore
-  val endOffsetMs get() = startOffsetMs + durationMs
-  @get:JsonIgnore
-  val relPath get() = metadata?.relPath ?: ""
-
-  @JsonIgnore
-  fun getBookChapter():BookChapter {
-    return BookChapter(index + 1,startOffset, startOffset + duration, title)
-  }
-}
-
@JsonIgnoreProperties(ignoreUnknown = true)
 data class BookChapter(
  var id:Int,
@@ -372,26 +370,14 @@ data class BookChapter(
  val endMs get() = (end * 1000L).toLong()
 }

-@JsonIgnoreProperties(ignoreUnknown = true)
-class MediaProgress(
-  var id:String,
-  var libraryItemId:String,
-  var episodeId:String?,
-  var duration:Double, // seconds
-  progress:Double, // 0 to 1
-  var currentTime:Double,
-  isFinished:Boolean,
-  var lastUpdate:Long,
-  var startedAt:Long,
-  var finishedAt:Long?
-) : MediaProgressWrapper(isFinished, progress)
-
@JsonTypeInfo(use= JsonTypeInfo.Id.DEDUCTION, defaultImpl = MediaProgress::class)
@JsonSubTypes(
  JsonSubTypes.Type(MediaProgress::class),
  JsonSubTypes.Type(LocalMediaProgress::class)
 )
-open class MediaProgressWrapper(var isFinished:Boolean, var progress:Double)
+open class MediaProgressWrapper(var isFinished:Boolean, var currentTime:Double, var progress:Double) {
+  open val mediaItemId get() = ""
+}

 // Helper class
 data class LibraryItemWithEpisode(
@@ -1,11 +1,25 @@
 package com.audiobookshelf.app.data

+import android.content.Context
 import android.support.v4.media.MediaDescriptionCompat
+import android.util.Log
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo

+enum class LockOrientationSetting {
+  NONE, PORTRAIT, LANDSCAPE
+}
+
+enum class HapticFeedbackSetting {
+  OFF, LIGHT, MEDIUM, HEAVY
+}
+
+enum class ShakeSensitivitySetting {
+  VERY_LOW, LOW, MEDIUM, HIGH, VERY_HIGH
+}
+
 data class ServerConnectionConfig(
  var id:String,
  var index:Int,
@@ -17,46 +31,6 @@ data class ServerConnectionConfig(
  var customHeaders:Map<String, String>?
 )

-data class DeviceSettings(
-  var disableAutoRewind:Boolean,
-  var enableAltView:Boolean,
-  var jumpBackwardsTime:Int,
-  var jumpForwardTime:Int,
-  var disableShakeToResetSleepTimer:Boolean
-) {
-  companion object {
-    // Static method to get default device settings
-    fun default():DeviceSettings {
-      return DeviceSettings(
-        disableAutoRewind = false,
-        enableAltView = false,
-        jumpBackwardsTime = 10,
-        jumpForwardTime = 10,
-        disableShakeToResetSleepTimer = false
-      )
-    }
-  }
-
-  @get:JsonIgnore
-  val jumpBackwardsTimeMs get() = (jumpBackwardsTime ?: default().jumpBackwardsTime) * 1000L
-  @get:JsonIgnore
-  val jumpForwardTimeMs get() = (jumpForwardTime ?: default().jumpBackwardsTime) * 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 deviceSettings:DeviceSettings?
-) {
-  @JsonIgnore
-  fun getLastServerConnectionConfig():ServerConnectionConfig? {
-    return lastServerConnectionConfigId?.let { lsccid ->
-      return serverConnectionConfigs.find { it.id == lsccid }
-    }
-  }
-}
-
@JsonIgnoreProperties(ignoreUnknown = true)
 data class LocalFile(
  var id:String,
@@ -95,7 +69,7 @@ data class LocalFolder(
 )
 open class LibraryItemWrapper(var id:String) {
  @JsonIgnore
-  open fun getMediaDescription(progress:MediaProgressWrapper?): MediaDescriptionCompat { return MediaDescriptionCompat.Builder().build() }
+  open fun getMediaDescription(progress:MediaProgressWrapper?, ctx: Context?): MediaDescriptionCompat { return MediaDescriptionCompat.Builder().build() }
 }

@JsonIgnoreProperties(ignoreUnknown = true)
@@ -114,3 +88,84 @@ data class PlayItemRequestPayload(
  var forceTranscode:Boolean,
  var deviceInfo:DeviceInfo
 )
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class DeviceSettings(
+  var disableAutoRewind:Boolean,
+  var enableAltView:Boolean,
+  var jumpBackwardsTime:Int,
+  var jumpForwardTime:Int,
+  var disableShakeToResetSleepTimer:Boolean,
+  var shakeSensitivity: ShakeSensitivitySetting,
+  var lockOrientation: LockOrientationSetting,
+  var hapticFeedback: HapticFeedbackSetting,
+  var autoSleepTimer: Boolean,
+  var autoSleepTimerStartTime: String,
+  var autoSleepTimerEndTime: String,
+  var sleepTimerLength: Long, // Time in milliseconds
+  var disableSleepTimerFadeOut: Boolean,
+  var disableSleepTimerResetFeedback: Boolean
+) {
+  companion object {
+    // Static method to get default device settings
+    fun default():DeviceSettings {
+      return DeviceSettings(
+        disableAutoRewind = false,
+        enableAltView = true,
+        jumpBackwardsTime = 10,
+        jumpForwardTime = 10,
+        disableShakeToResetSleepTimer = false,
+        shakeSensitivity = ShakeSensitivitySetting.MEDIUM,
+        lockOrientation = LockOrientationSetting.NONE,
+        hapticFeedback = HapticFeedbackSetting.LIGHT,
+        autoSleepTimer = false,
+        autoSleepTimerStartTime = "22:00",
+        autoSleepTimerEndTime = "06:00",
+        sleepTimerLength = 900000L, // 15 minutes
+        disableSleepTimerFadeOut = false,
+        disableSleepTimerResetFeedback = false
+      )
+    }
+  }
+
+  @get:JsonIgnore
+  val jumpBackwardsTimeMs get() = jumpBackwardsTime * 1000L
+  @get:JsonIgnore
+  val jumpForwardTimeMs get() = jumpForwardTime * 1000L
+  @get:JsonIgnore
+  val autoSleepTimerStartHour get() = autoSleepTimerStartTime.split(":")[0].toInt()
+  @get:JsonIgnore
+  val autoSleepTimerStartMinute get() = autoSleepTimerStartTime.split(":")[1].toInt()
+  @get:JsonIgnore
+  val autoSleepTimerEndHour get() = autoSleepTimerEndTime.split(":")[0].toInt()
+  @get:JsonIgnore
+  val autoSleepTimerEndMinute get() = autoSleepTimerEndTime.split(":")[1].toInt()
+
+  @JsonIgnore
+  fun getShakeThresholdGravity() : Float { // Used in ShakeDetector
+    return if (shakeSensitivity == ShakeSensitivitySetting.VERY_HIGH) 1.2f
+    else if (shakeSensitivity == ShakeSensitivitySetting.HIGH) 1.4f
+    else if (shakeSensitivity == ShakeSensitivitySetting.MEDIUM) 1.6f
+    else if (shakeSensitivity == ShakeSensitivitySetting.LOW) 2f
+    else if (shakeSensitivity == ShakeSensitivitySetting.VERY_LOW) 2.7f
+    else {
+      Log.e("DeviceSetting", "Invalid ShakeSensitivitySetting $shakeSensitivity")
+      1.6f
+    }
+  }
+}
+
+data class DeviceData(
+  var serverConnectionConfigs:MutableList<ServerConnectionConfig>,
+  var lastServerConnectionConfigId:String?,
+  var deviceSettings: DeviceSettings?,
+  var lastPlaybackSession: PlaybackSession?
+) {
+  @JsonIgnore
+  fun getLastServerConnectionConfig(): ServerConnectionConfig? {
+    return lastServerConnectionConfigId?.let { lsccid ->
+      return serverConnectionConfigs.find { it.id == lsccid }
+    }
+  }
+}
+
@@ -1,5 +1,6 @@
 package com.audiobookshelf.app.data

+import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import android.support.v4.media.MediaDescriptionCompat
@@ -29,7 +30,8 @@ class LibraryItem(
  var mediaType:String,
  var media:MediaType,
  var libraryFiles:MutableList<LibraryFile>?,
-  var userMediaProgress:MediaProgress? // Only included when requesting library item with progress (for downloads)
+  var userMediaProgress:MediaProgress?, // Only included when requesting library item with progress (for downloads)
+  var localLibraryItemId:String? // For Android Auto
 ) : LibraryItemWrapper(id) {
  @get:JsonIgnore
  val title get() = media.metadata.title
@@ -55,8 +57,16 @@ class LibraryItem(
  }

  @JsonIgnore
-  override fun getMediaDescription(progress:MediaProgressWrapper?): MediaDescriptionCompat {
+  override fun getMediaDescription(progress:MediaProgressWrapper?, ctx: Context?): MediaDescriptionCompat {
    val extras = Bundle()
+
+    if (localLibraryItemId != null) {
+      extras.putLong(
+        MediaDescriptionCompat.EXTRA_DOWNLOAD_STATUS,
+        MediaDescriptionCompat.STATUS_DOWNLOADED
+      )
+    }
+
    if (progress != null) {
      if (progress.isFinished) {
        extras.putInt(
@@ -79,8 +89,9 @@ class LibraryItem(
      )
    }

+    val mediaId = localLibraryItemId ?: id
    return MediaDescriptionCompat.Builder()
-      .setMediaId(id)
+      .setMediaId(mediaId)
      .setTitle(title)
      .setIconUri(getCoverUri())
      .setSubtitle(authorName)
@@ -1,7 +1,12 @@
 package com.audiobookshelf.app.data

+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.ImageDecoder
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.provider.MediaStore
 import android.support.v4.media.MediaDescriptionCompat
 import android.util.Log
 import androidx.media.utils.MediaConstants
@@ -9,6 +14,7 @@ import com.audiobookshelf.app.R
 import com.audiobookshelf.app.device.DeviceManager
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.audiobookshelf.app.player.PLAYMETHOD_LOCAL
 import java.util.*

@JsonIgnoreProperties(ignoreUnknown = true)
@@ -96,10 +102,26 @@ class LocalLibraryItem(
  }

  @JsonIgnore
-  override fun getMediaDescription(progress:MediaProgressWrapper?): MediaDescriptionCompat {
+  override fun getMediaDescription(progress:MediaProgressWrapper?, ctx:Context?): MediaDescriptionCompat {
    val coverUri = getCoverUri()

+    var bitmap:Bitmap? = null
+    if (coverContentUrl != null) {
+      ctx?.let {
+        bitmap = if (Build.VERSION.SDK_INT < 28) {
+          MediaStore.Images.Media.getBitmap(it.contentResolver, coverUri)
+        } else {
+          val source: ImageDecoder.Source = ImageDecoder.createSource(it.contentResolver, coverUri)
+          ImageDecoder.decodeBitmap(source)
+        }
+      }
+    }
+
    val extras = Bundle()
+    extras.putLong(
+      MediaDescriptionCompat.EXTRA_DOWNLOAD_STATUS,
+      MediaDescriptionCompat.STATUS_DOWNLOADED
+    )
    if (progress != null) {
      if (progress.isFinished) {
        extras.putInt(
@@ -122,12 +144,17 @@ class LocalLibraryItem(
      )
    }

-    return MediaDescriptionCompat.Builder()
+    val mediaDescriptionBuilder = MediaDescriptionCompat.Builder()
      .setMediaId(id)
      .setTitle(title)
      .setIconUri(coverUri)
      .setSubtitle(authorName)
      .setExtras(extras)
-      .build()
+
+    bitmap?.let {
+      mediaDescriptionBuilder.setIconBitmap(bitmap)
+    }
+
+    return mediaDescriptionBuilder.build()
  }
 }
@@ -11,7 +11,7 @@ class LocalMediaProgress(
  var localEpisodeId:String?,
  var duration:Double,
  progress:Double, // 0 to 1
-  var currentTime:Double,
+  currentTime:Double,
  isFinished:Boolean,
  var lastUpdate:Long,
  var startedAt:Long,
@@ -22,9 +22,21 @@ class LocalMediaProgress(
  var serverUserId:String?,
  var libraryItemId:String?,
  var episodeId:String?
-) : MediaProgressWrapper(isFinished, progress) {
+) : MediaProgressWrapper(isFinished, currentTime, progress) {
  @get:JsonIgnore
  val progressPercent get() = if (progress.isNaN()) 0 else (progress * 100).roundToInt()
+  @get:JsonIgnore
+  override val mediaItemId get() = if (libraryItemId != null) {
+        if (episodeId.isNullOrEmpty()) libraryItemId ?: "" else "$libraryItemId-$episodeId"
+    } else {
+        if (localEpisodeId.isNullOrEmpty()) localLibraryItemId else "$localLibraryItemId-$localEpisodeId"
+    }
+
+  @JsonIgnore
+  fun isMatch(mediaProgress:MediaProgress):Boolean {
+    if (episodeId != null) return libraryItemId == mediaProgress.libraryItemId && episodeId == mediaProgress.episodeId
+    return libraryItemId == mediaProgress.libraryItemId
+  }

  @JsonIgnore
  fun updateIsFinished(finished:Boolean) {
@@ -41,8 +53,7 @@ class LocalMediaProgress(
  fun updateFromPlaybackSession(playbackSession:PlaybackSession) {
    currentTime = playbackSession.currentTime
    progress = playbackSession.progress
-    lastUpdate = System.currentTimeMillis()
-
+    lastUpdate = playbackSession.updatedAt
    isFinished = playbackSession.progress >= 0.99
    finishedAt = if (isFinished) lastUpdate else null
  }
@@ -0,0 +1,15 @@
+package com.audiobookshelf.app.data
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class MediaItemEvent(
+  var name:String, // e.g. Play/Pause/Stop/Seek/Save
+  var type:String, // Playback/Info
+  var description:String?,
+  var currentTime:Number?, // Seconds
+  var serverSyncAttempted:Boolean?,
+  var serverSyncSuccess:Boolean?,
+  var serverSyncMessage:String?,
+  var timestamp: Long
+)
@@ -0,0 +1,17 @@
+package com.audiobookshelf.app.data
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class MediaItemHistory(
+  var id: String, // media id
+  var mediaDisplayTitle: String,
+  var libraryItemId: String,
+  var episodeId: String?,
+  var isLocal:Boolean,
+  var serverConnectionConfigId:String?,
+  var serverAddress:String?,
+  var serverUserId:String?,
+  var createdAt: Long,
+  var events:MutableList<MediaItemEvent>,
+)
@@ -0,0 +1,22 @@
+package com.audiobookshelf.app.data
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class MediaProgress(
+  var id:String,
+  var libraryItemId:String,
+  var episodeId:String?,
+  var duration:Double, // seconds
+  progress:Double, // 0 to 1
+  currentTime:Double,
+  isFinished:Boolean,
+  var lastUpdate:Long,
+  var startedAt:Long,
+  var finishedAt:Long?
+) : MediaProgressWrapper(isFinished, currentTime, progress) {
+
+  @get:JsonIgnore
+  override val mediaItemId get() = if (episodeId.isNullOrEmpty()) libraryItemId else "$libraryItemId-$episodeId"
+}
@@ -1,10 +1,13 @@
 package com.audiobookshelf.app.data

+import android.content.Context
+import android.graphics.ImageDecoder
 import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
 import android.support.v4.media.MediaMetadataCompat
-import com.audiobookshelf.app.R
 import com.audiobookshelf.app.device.DeviceManager
-import com.audiobookshelf.app.player.MediaProgressSyncData
+import com.audiobookshelf.app.media.MediaProgressSyncData
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.google.android.exoplayer2.MediaItem
@@ -12,12 +15,7 @@ import com.google.android.exoplayer2.MediaMetadata
 import com.google.android.gms.cast.MediaInfo
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.common.images.WebImage
-
-// TODO: enum or something in kotlin?
-val PLAYMETHOD_DIRECTPLAY = 0
-val PLAYMETHOD_DIRECTSTREAM = 1
-val PLAYMETHOD_TRANSCODE = 2
-val PLAYMETHOD_LOCAL = 3
+import com.audiobookshelf.app.player.*

@JsonIgnoreProperties(ignoreUnknown = true)
 class PlaybackSession(
@@ -53,17 +51,21 @@ class PlaybackSession(
  @get:JsonIgnore
  val isLocal get() = playMethod == PLAYMETHOD_LOCAL
  @get:JsonIgnore
+  val isPodcastEpisode get() = mediaType == "podcast"
+  @get:JsonIgnore
  val currentTimeMs get() = (currentTime * 1000L).toLong()
  @get:JsonIgnore
  val totalDurationMs get() = (getTotalDuration() * 1000L).toLong()
  @get:JsonIgnore
  val localLibraryItemId get() = localLibraryItem?.id ?: ""
  @get:JsonIgnore
-  val localMediaProgressId get() = if (episodeId.isNullOrEmpty()) localLibraryItemId else "$localLibraryItemId-$localEpisodeId"
+  val localMediaProgressId get() = if (localEpisodeId.isNullOrEmpty()) localLibraryItemId else "$localLibraryItemId-$localEpisodeId"
  @get:JsonIgnore
  val progress get() = currentTime / getTotalDuration()
  @get:JsonIgnore
  val isLocalLibraryItemOnly get() = localLibraryItemId != "" && libraryItemId == null
+  @get:JsonIgnore
+  val mediaItemId get() = if (isLocalLibraryItemOnly) localMediaProgressId else if (episodeId.isNullOrEmpty()) libraryItemId ?: "" else "$libraryItemId-$episodeId"

  @JsonIgnore
  fun getCurrentTrackIndex():Int {
@@ -76,12 +78,41 @@ class PlaybackSession(
    return audioTracks.size - 1
  }

+  @JsonIgnore
+  fun getNextTrackIndex():Int {
+    for (i in 0 until audioTracks.size) {
+      val track = audioTracks[i]
+      if (currentTimeMs < track.startOffsetMs) {
+        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 getCurrentTrackEndTime():Long {
+    val currentTrack = audioTracks[this.getCurrentTrackIndex()]
+    return currentTrack.startOffsetMs + currentTrack.durationMs
+  }
+
+  @JsonIgnore
+  fun getNextChapterForTime(time:Long):BookChapter? {
+    if (chapters.isEmpty()) return null
+    return chapters.find { time < it.startMs } // First chapter where start time is > then time
+  }
+
+  @JsonIgnore
+  fun getNextTrackEndTime():Long {
+    val currentTrack = audioTracks[this.getNextTrackIndex()]
+    return currentTrack.startOffsetMs + currentTrack.durationMs
+  }
+
  @JsonIgnore
  fun getCurrentTrackTimeMs():Long {
    val currentTrack = audioTracks[this.getCurrentTrackIndex()]
@@ -105,9 +136,9 @@ class PlaybackSession(

  @JsonIgnore
  fun getCoverUri(): Uri {
-    if (localLibraryItem?.coverContentUrl != null) return Uri.parse(localLibraryItem?.coverContentUrl) ?: Uri.parse("android.resource://com.audiobookshelf.app/" + R.drawable.icon)
+    if (localLibraryItem?.coverContentUrl != null) return Uri.parse(localLibraryItem?.coverContentUrl) ?: Uri.parse("android.resource://com.audiobookshelf.app/" + com.audiobookshelf.app.R.drawable.icon)

-    if (coverPath == null) return Uri.parse("android.resource://com.audiobookshelf.app/" + R.drawable.icon)
+    if (coverPath == null) return Uri.parse("android.resource://com.audiobookshelf.app/" + com.audiobookshelf.app.R.drawable.icon)
    return Uri.parse("$serverAddress/api/items/$libraryItemId/cover?token=${DeviceManager.token}")
  }

@@ -118,13 +149,33 @@ class PlaybackSession(
  }

  @JsonIgnore
-  fun getMediaMetadataCompat(): MediaMetadataCompat {
+  fun getMediaMetadataCompat(ctx: Context): MediaMetadataCompat {
    val metadataBuilder = MediaMetadataCompat.Builder()
      .putString(MediaMetadataCompat.METADATA_KEY_TITLE, displayTitle)
      .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, displayTitle)
      .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE, displayAuthor)
      .putString(MediaMetadataCompat.METADATA_KEY_AUTHOR, displayAuthor)
+      .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, displayAuthor)
+      .putString(MediaMetadataCompat.METADATA_KEY_ALBUM, displayAuthor)
+      .putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ARTIST, displayAuthor)
+      .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_DESCRIPTION, displayAuthor)
      .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, id)
+      .putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, getCoverUri().toString())
+      .putString(MediaMetadataCompat.METADATA_KEY_ART_URI, getCoverUri().toString())
+      .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, getCoverUri().toString())
+
+    // Local covers get bitmap
+    if (localLibraryItem?.coverContentUrl != null) {
+      val bitmap = if (Build.VERSION.SDK_INT < 28) {
+        MediaStore.Images.Media.getBitmap(ctx.contentResolver, getCoverUri())
+      } else {
+        val source: ImageDecoder.Source = ImageDecoder.createSource(ctx.contentResolver, getCoverUri())
+        ImageDecoder.decodeBitmap(source)
+      }
+      metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, bitmap)
+      metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, bitmap)
+    }
+
    return metadataBuilder.build()
  }

@@ -136,6 +187,9 @@ class PlaybackSession(
      .setArtist(displayAuthor)
      .setAlbumArtist(displayAuthor)
      .setSubtitle(displayAuthor)
+      .setAlbumTitle(displayAuthor)
+      .setDescription(displayAuthor)
+      .setArtworkUri(getCoverUri())

    val contentUri = this.getContentUri(audioTrack)
    metadataBuilder.setMediaUri(contentUri)
@@ -169,7 +223,9 @@ class PlaybackSession(

    castMetadata.putString(com.google.android.gms.cast.MediaMetadata.KEY_TITLE, displayTitle ?: "")
    castMetadata.putString(com.google.android.gms.cast.MediaMetadata.KEY_ARTIST, displayAuthor ?: "")
+    castMetadata.putString(com.google.android.gms.cast.MediaMetadata.KEY_ALBUM_TITLE, displayAuthor ?: "")
    castMetadata.putString(com.google.android.gms.cast.MediaMetadata.KEY_CHAPTER_TITLE, audioTrack.title)
+
    castMetadata.putInt(com.google.android.gms.cast.MediaMetadata.KEY_TRACK_NUMBER, audioTrack.index)
    return castMetadata
  }
@@ -198,7 +254,7 @@ class PlaybackSession(
  }

  @JsonIgnore
-  fun syncData(syncData:MediaProgressSyncData) {
+  fun syncData(syncData: MediaProgressSyncData) {
    timeListening += syncData.timeListened
    updatedAt = System.currentTimeMillis()
    currentTime = syncData.currentTime
@@ -1,7 +1,11 @@
 package com.audiobookshelf.app.device

+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.util.Log
 import com.audiobookshelf.app.data.*
+import com.audiobookshelf.app.managers.DbManager
 import com.audiobookshelf.app.player.PlayerNotificationService

 interface WidgetEventEmitter {
@@ -11,8 +15,8 @@ interface WidgetEventEmitter {
 object DeviceManager {
  const val tag = "DeviceManager"

-  val dbManager:DbManager = DbManager()
-  var deviceData:DeviceData = dbManager.getDeviceData()
+  val dbManager: DbManager = DbManager()
+  var deviceData: DeviceData = dbManager.getDeviceData()
  var serverConnectionConfig: ServerConnectionConfig? = null

  val serverConnectionConfigId get() = serverConnectionConfig?.id ?: ""
@@ -20,12 +24,21 @@ object DeviceManager {
  val serverUserId get() = serverConnectionConfig?.userId ?: ""
  val token get() = serverConnectionConfig?.token ?: ""
  val isConnectedToServer get() = serverConnectionConfig != null
-  val hasLastServerConnectionConfig get() = deviceData.getLastServerConnectionConfig() != null

  var widgetUpdater:WidgetEventEmitter? = null

  init {
    Log.d(tag, "Device Manager Singleton invoked")
+
+    // Initialize new sleep timer settings and shake sensitivity added in v0.9.61
+    if (deviceData.deviceSettings?.autoSleepTimerStartTime == null || deviceData.deviceSettings?.autoSleepTimerEndTime == null) {
+      deviceData.deviceSettings?.autoSleepTimerStartTime = "22:00"
+      deviceData.deviceSettings?.autoSleepTimerStartTime = "06:00"
+      deviceData.deviceSettings?.sleepTimerLength = 900000L
+    }
+    if (deviceData.deviceSettings?.shakeSensitivity == null) {
+      deviceData.deviceSettings?.shakeSensitivity = ShakeSensitivitySetting.MEDIUM
+    }
  }

  fun getBase64Id(id:String):String {
@@ -36,4 +49,27 @@ object DeviceManager {
    if (id == null) return null
    return deviceData.serverConnectionConfigs.find { it.id == id }
  }
+
+  fun checkConnectivity(ctx:Context): Boolean {
+    val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+    if (capabilities != null) {
+      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
+        Log.i("Internet", "NetworkCapabilities.TRANSPORT_CELLULAR")
+        return true
+      } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
+        Log.i("Internet", "NetworkCapabilities.TRANSPORT_WIFI")
+        return true
+      } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
+        Log.i("Internet", "NetworkCapabilities.TRANSPORT_ETHERNET")
+        return true
+      }
+    }
+    return false
+  }
+
+  fun setLastPlaybackSession(playbackSession:PlaybackSession) {
+    deviceData.lastPlaybackSession = playbackSession
+    dbManager.saveDeviceData(deviceData)
+  }
 }
@@ -9,7 +9,7 @@ import com.arthenica.ffmpegkit.FFmpegKitConfig
 import com.arthenica.ffmpegkit.FFprobeKit
 import com.arthenica.ffmpegkit.Level
 import com.audiobookshelf.app.data.*
-import com.audiobookshelf.app.plugins.AbsDownloader
+import com.audiobookshelf.app.models.DownloadItem
 import com.fasterxml.jackson.core.json.JsonReadFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
@@ -18,7 +18,7 @@ import org.json.JSONException

 class FolderScanner(var ctx: Context) {
  private val tag = "FolderScanner"
-  var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())

  data class DownloadItemScanResult(val localLibraryItem:LocalLibraryItem, var localMediaProgress:LocalMediaProgress?)

@@ -51,7 +51,7 @@ class FolderScanner(var ctx: Context) {
     var mediaItemsUpToDate = 0

      // Search for files in media item folder
-     val foldersFound = df.search(false, DocumentFileType.FOLDER)
+     val foldersFound = df.search(true, DocumentFileType.FOLDER)

      // Match folders found with local library items already saved in db
     var existingLocalLibraryItems = DeviceManager.dbManager.getLocalLibraryItemsInFolder(localFolder.id)
@@ -72,18 +72,23 @@ class FolderScanner(var ctx: Context) {
       Log.d(tag, "Iterating over Folder Found ${itemFolder.name} | ${itemFolder.getSimplePath(ctx)} | URI: ${itemFolder.uri}")
       val existingItem = existingLocalLibraryItems.find { emi -> emi.id == getLocalLibraryItemId(itemFolder.id) }

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

-       if (result == ItemScanResult.REMOVED) mediaItemsRemoved++
-       else if (result == ItemScanResult.UPDATED) mediaItemsUpdated++
-       else if (result == ItemScanResult.ADDED) mediaItemsAdded++
-       else mediaItemsUpToDate++
+       // Do not scan folders that have no media items and not an existing item already
+       if (existingItem != null || filesInFolder.isNotEmpty()) {
+         when (scanLibraryItemFolder(itemFolder, filesInFolder, localFolder, existingItem, forceAudioProbe)) {
+           ItemScanResult.REMOVED -> mediaItemsRemoved++
+           ItemScanResult.UPDATED -> mediaItemsUpdated++
+           ItemScanResult.ADDED -> mediaItemsAdded++
+           else -> mediaItemsUpToDate++
+         }
+       }
     }

     Log.d(tag, "Folder $${localFolder.name} scan Results: $mediaItemsAdded Added | $mediaItemsUpdated Updated | $mediaItemsRemoved Removed | $mediaItemsUpToDate Up-to-date")

     return if (mediaItemsAdded > 0 || mediaItemsUpdated > 0 || mediaItemsRemoved > 0) {
-       var folderLibraryItems = DeviceManager.dbManager.getLocalLibraryItemsInFolder(localFolder.id) // Get all local media items
+       val folderLibraryItems = DeviceManager.dbManager.getLocalLibraryItemsInFolder(localFolder.id) // Get all local media items
       FolderScanResult(mediaItemsAdded, mediaItemsUpdated, mediaItemsRemoved, mediaItemsUpToDate, localFolder, folderLibraryItems)
     } else {
       Log.d(tag, "No Media Items to save")
@@ -91,7 +96,7 @@ class FolderScanner(var ctx: Context) {
     }
   }

-  fun scanLibraryItemFolder(itemFolder:DocumentFile, localFolder:LocalFolder, existingItem:LocalLibraryItem?, forceAudioProbe:Boolean):ItemScanResult {
+  private fun scanLibraryItemFolder(itemFolder:DocumentFile, filesInFolder:List<DocumentFile>, localFolder:LocalFolder, existingItem:LocalLibraryItem?, forceAudioProbe:Boolean):ItemScanResult {
    val itemFolderName = itemFolder.name ?: ""
    val itemId = getLocalLibraryItemId(itemFolder.id)

@@ -106,8 +111,6 @@ 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", "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
    }
@@ -130,7 +133,7 @@ class FolderScanner(var ctx: Context) {
      Log.d(tag, "File attributes Id:${localFileId}|ContentUrl:${localFile.contentUrl}|isDownloadsDocument:${file.isDownloadsDocument}")

      if (isAudio) {
-        var audioTrackToAdd:AudioTrack? = null
+        val audioTrackToAdd:AudioTrack?

        val existingAudioTrack = existingAudioTracks.find { eat -> eat.localFileId == localFileId }
        if (existingAudioTrack != null) { // Update existing audio track
@@ -219,16 +222,18 @@ class FolderScanner(var ctx: Context) {
  }

  // Scan item after download and create local library item
-  fun scanDownloadItem(downloadItem: AbsDownloader.DownloadItem):DownloadItemScanResult? {
+  fun scanDownloadItem(downloadItem: DownloadItem, cb: (DownloadItemScanResult?) -> Unit) {
    val folderDf = DocumentFileCompat.fromUri(ctx, Uri.parse(downloadItem.localFolder.contentUrl))
-    val foldersFound =  folderDf?.search(false, DocumentFileType.FOLDER) ?: mutableListOf()
+    val foldersFound =  folderDf?.search(true, DocumentFileType.FOLDER) ?: mutableListOf()

    var itemFolderId = ""
    var itemFolderUrl = ""
    var itemFolderBasePath = ""
    var itemFolderAbsolutePath = ""
    foldersFound.forEach {
-      if (it.name == downloadItem.itemTitle) {
+      // e.g. absolute path is "storage/emulated/0/Audiobooks/Orson Scott Card/Enders Game"
+      //        and itemSubfolder is "Orson Scott Card/Enders Game"
+      if (it.getAbsolutePath(ctx).endsWith(downloadItem.itemSubfolder)) {
        itemFolderId = it.id
        itemFolderUrl = it.uri.toString()
        itemFolderBasePath = it.getBasePath(ctx)
@@ -238,13 +243,13 @@ class FolderScanner(var ctx: Context) {

    if (itemFolderUrl == "") {
      Log.d(tag, "scanDownloadItem failed to find media folder")
-      return null
+      return cb(null)
    }
    val df: DocumentFile? = DocumentFileCompat.fromUri(ctx, Uri.parse(itemFolderUrl))

    if (df == null) {
      Log.e(tag, "Folder Doc File Invalid ${downloadItem.itemFolderPath}")
-      return null
+      return cb(null)
    }

    val localLibraryItemId = getLocalLibraryItemId(itemFolderId)
@@ -256,7 +261,7 @@ class FolderScanner(var ctx: Context) {
    Log.d(tag, "scanDownloadItem ${filesFound.size} files found in ${downloadItem.itemFolderPath}")

    var localEpisodeId:String? = null
-    var localLibraryItem:LocalLibraryItem? = null
+    var localLibraryItem:LocalLibraryItem?
    if (downloadItem.mediaType == "book") {
      localLibraryItem = LocalLibraryItem(localLibraryItemId, downloadItem.localFolder.id, itemFolderBasePath, itemFolderAbsolutePath, itemFolderUrl, false, downloadItem.mediaType, downloadItem.media.getLocalCopy(), mutableListOf(), null, null, true, downloadItem.serverConnectionConfigId, downloadItem.serverAddress, downloadItem.serverUserId, downloadItem.libraryItemId)
    } else {
@@ -268,53 +273,50 @@ class FolderScanner(var ctx: Context) {
      }
    }

-      val audioTracks:MutableList<AudioTrack> = mutableListOf()
+    val audioTracks:MutableList<AudioTrack> = mutableListOf()

-      filesFound.forEach { docFile ->
-        val itemPart = downloadItem.downloadItemParts.find { itemPart ->
-          itemPart.filename == docFile.name
-        }
-        if (itemPart == null) {
-          if (downloadItem.mediaType == "book") { // for books every download item should be a file found
-            Log.e(tag, "scanDownloadItem: Item part not found for doc file ${docFile.name} | ${docFile.getAbsolutePath(ctx)} | ${docFile.uri}")
-          }
-        } else if (itemPart.audioTrack != null) { // Is audio track
-          val audioTrackFromServer = itemPart.audioTrack
-          Log.d(tag, "scanDownloadItem: Audio Track from Server index = ${audioTrackFromServer?.index}")
-
-          val localFileId = DeviceManager.getBase64Id(docFile.id)
-          val localFile = LocalFile(localFileId,docFile.name,docFile.uri.toString(),docFile.getBasePath(ctx),docFile.getAbsolutePath(ctx),docFile.getSimplePath(ctx),docFile.mimeType,docFile.length())
-          localLibraryItem.localFiles.add(localFile)
-
-          // TODO: Make asynchronous
-          val audioProbeResult = probeAudioFile(localFile.absolutePath)
-
-          // Create new audio track
-          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}")
-
-          // Add podcast episodes to library
-          itemPart.episode?.let { podcastEpisode ->
-            val podcast = localLibraryItem.media as Podcast
-            val newEpisode = podcast.addEpisode(track, podcastEpisode)
-            localEpisodeId = newEpisode.id
-            Log.d(tag, "scanDownloadItem: Added episode to podcast ${podcastEpisode.title} ${track.title} | Track index: ${podcastEpisode.audioTrack?.index}")
-          }
-        } else { // Cover image
-          val localFileId = DeviceManager.getBase64Id(docFile.id)
-          val localFile = LocalFile(localFileId,docFile.name,docFile.uri.toString(),docFile.getBasePath(ctx),docFile.getAbsolutePath(ctx),docFile.getSimplePath(ctx),docFile.mimeType,docFile.length())
-
-          localLibraryItem.coverAbsolutePath = localFile.absolutePath
-          localLibraryItem.coverContentUrl = localFile.contentUrl
-          localLibraryItem.localFiles.add(localFile)
-        }
+    filesFound.forEach { docFile ->
+      val itemPart = downloadItem.downloadItemParts.find { itemPart ->
+        itemPart.filename == docFile.name
      }
+      if (itemPart == null) {
+        if (downloadItem.mediaType == "book") { // for books every download item should be a file found
+          Log.e(tag, "scanDownloadItem: Item part not found for doc file ${docFile.name} | ${docFile.getAbsolutePath(ctx)} | ${docFile.uri}")
+        }
+      } else if (itemPart.audioTrack != null) { // Is audio track
+        val audioTrackFromServer = itemPart.audioTrack
+        Log.d(tag, "scanDownloadItem: Audio Track from Server index = ${audioTrackFromServer.index}")
+
+        val localFileId = DeviceManager.getBase64Id(docFile.id)
+        val localFile = LocalFile(localFileId,docFile.name,docFile.uri.toString(),docFile.getBasePath(ctx),docFile.getAbsolutePath(ctx),docFile.getSimplePath(ctx),docFile.mimeType,docFile.length())
+        localLibraryItem.localFiles.add(localFile)
+
+        // Create new audio track
+        val track = AudioTrack(audioTrackFromServer.index, audioTrackFromServer.startOffset, audioTrackFromServer.duration, localFile.filename ?: "", localFile.contentUrl, localFile.mimeType ?: "", null, true, localFileId, null, audioTrackFromServer.index)
+        audioTracks.add(track)
+
+        Log.d(tag, "scanDownloadItem: Created Audio Track with index ${track.index} from local file ${localFile.absolutePath}")
+
+        // Add podcast episodes to library
+        itemPart.episode?.let { podcastEpisode ->
+          val podcast = localLibraryItem.media as Podcast
+          val newEpisode = podcast.addEpisode(track, podcastEpisode)
+          localEpisodeId = newEpisode.id
+          Log.d(tag, "scanDownloadItem: Added episode to podcast ${podcastEpisode.title} ${track.title} | Track index: ${podcastEpisode.audioTrack?.index}")
+        }
+      } else { // Cover image
+        val localFileId = DeviceManager.getBase64Id(docFile.id)
+        val localFile = LocalFile(localFileId,docFile.name,docFile.uri.toString(),docFile.getBasePath(ctx),docFile.getAbsolutePath(ctx),docFile.getSimplePath(ctx),docFile.mimeType,docFile.length())
+
+        localLibraryItem.coverAbsolutePath = localFile.absolutePath
+        localLibraryItem.coverContentUrl = localFile.contentUrl
+        localLibraryItem.localFiles.add(localFile)
+      }
+    }

    if (audioTracks.isEmpty()) {
      Log.d(tag, "scanDownloadItem did not find any audio tracks in folder for ${downloadItem.itemFolderPath}")
-      return null
+      return cb(null)
    }

    // For books sort audio tracks then set
@@ -364,7 +366,7 @@ class FolderScanner(var ctx: Context) {

    DeviceManager.dbManager.saveLocalLibraryItem(localLibraryItem)

-    return downloadItemScanResult
+    cb(downloadItemScanResult)
  }

  fun scanLocalLibraryItem(localLibraryItem:LocalLibraryItem, forceAudioProbe:Boolean):LocalLibraryItemScanResult? {
@@ -401,7 +403,7 @@ class FolderScanner(var ctx: Context) {
        localLibraryItem.localFiles.removeIf { it.id == localFileId }

        if (existingAudioTracks.find { it.localFileId == localFileId } != null) {
-          Log.d(tag, "scanLocalLibraryItem audio track file ${localFileId} was removed from ${localLibraryItem.absolutePath}")
+          Log.d(tag, "scanLocalLibraryItem audio track file $localFileId was removed from ${localLibraryItem.absolutePath}")
          localLibraryItem.media.removeAudioTrack(localFileId)
        }
        wasUpdated = true
@@ -464,7 +466,7 @@ class FolderScanner(var ctx: Context) {
    return LocalLibraryItemScanResult(wasUpdated, localLibraryItem)
  }

-  fun probeAudioFile(absolutePath:String):AudioProbeResult? {
+  private 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")

    var probeObject:JSObject? = null
@@ -475,13 +477,13 @@ class FolderScanner(var ctx: Context) {
    }

    Log.d(tag, "FFprobe output $probeObject")
-    if (probeObject == null || !probeObject.has("streams")) { // Check if output is empty
+    return if (probeObject == null || !probeObject.has("streams")) { // Check if output is empty
      Log.d(tag, "probeAudioFile Probe audio file $absolutePath failed or invalid")
-      return null
+      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
+      audioProbeResult
    }
  }
 }
@@ -1,8 +1,9 @@
-package com.audiobookshelf.app.data
+package com.audiobookshelf.app.managers

 import android.content.Context
 import android.util.Log
-import com.audiobookshelf.app.plugins.AbsDownloader
+import com.audiobookshelf.app.data.*
+import com.audiobookshelf.app.models.DownloadItem
 import io.paperdb.Paper
 import java.io.File

@@ -10,7 +11,7 @@ class DbManager {
  val tag = "DbManager"

  companion object {
-    var isDbInitialized = false
+    private var isDbInitialized = false

    fun initialize(ctx: Context) {
      if (isDbInitialized) return
@@ -21,16 +22,16 @@ class DbManager {
  }

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

  fun getLocalLibraryItems(mediaType:String? = null):MutableList<LocalLibraryItem> {
    val localLibraryItems:MutableList<LocalLibraryItem> = mutableListOf()
    Paper.book("localLibraryItems").allKeys.forEach {
-      val localLibraryItem:LocalLibraryItem? = Paper.book("localLibraryItems").read(it)
+      val localLibraryItem: LocalLibraryItem? = Paper.book("localLibraryItems").read(it)
      if (localLibraryItem != null && (mediaType.isNullOrEmpty() || mediaType == localLibraryItem.mediaType)) {
        localLibraryItems.add(localLibraryItem)
      }
@@ -45,16 +46,16 @@ class DbManager {
    }
  }

-  fun getLocalLibraryItemByLId(libraryItemId:String):LocalLibraryItem? {
+  fun getLocalLibraryItemByLId(libraryItemId:String): LocalLibraryItem? {
    return getLocalLibraryItems().find { it.libraryItemId == libraryItemId }
  }

-  fun getLocalLibraryItem(localLibraryItemId:String):LocalLibraryItem? {
+  fun getLocalLibraryItem(localLibraryItemId:String): LocalLibraryItem? {
    return Paper.book("localLibraryItems").read(localLibraryItemId)
  }

-  fun getLocalLibraryItemWithEpisode(podcastEpisodeId:String):LibraryItemWithEpisode? {
-    var podcastEpisode:PodcastEpisode? = null
+  fun getLocalLibraryItemWithEpisode(podcastEpisodeId:String): LibraryItemWithEpisode? {
+    var podcastEpisode: PodcastEpisode? = null
    val localLibraryItem = getLocalLibraryItems("podcast").find { localLibraryItem ->
      val podcast = localLibraryItem.media as Podcast
      podcastEpisode = podcast.episodes?.find { it.id == podcastEpisodeId }
@@ -77,15 +78,15 @@ class DbManager {
      }
  }

-  fun saveLocalLibraryItem(localLibraryItem:LocalLibraryItem) {
+  fun saveLocalLibraryItem(localLibraryItem: LocalLibraryItem) {
    Paper.book("localLibraryItems").write(localLibraryItem.id, localLibraryItem)
  }

-  fun saveLocalFolder(localFolder:LocalFolder) {
+  fun saveLocalFolder(localFolder: LocalFolder) {
    Paper.book("localFolders").write(localFolder.id,localFolder)
  }

-  fun getLocalFolder(folderId:String):LocalFolder? {
+  fun getLocalFolder(folderId:String): LocalFolder? {
    return Paper.book("localFolders").read(folderId)
  }

@@ -107,7 +108,7 @@ class DbManager {
    Paper.book("localFolders").delete(folderId)
  }

-  fun saveDownloadItem(downloadItem: AbsDownloader.DownloadItem) {
+  fun saveDownloadItem(downloadItem: DownloadItem) {
    Paper.book("downloadItems").write(downloadItem.id, downloadItem)
  }

@@ -115,21 +116,21 @@ class DbManager {
    Paper.book("downloadItems").delete(downloadItemId)
  }

-  fun getDownloadItems():List<AbsDownloader.DownloadItem> {
-    val downloadItems:MutableList<AbsDownloader.DownloadItem> = mutableListOf()
+  fun getDownloadItems():List<DownloadItem> {
+    val downloadItems:MutableList<DownloadItem> = mutableListOf()
    Paper.book("downloadItems").allKeys.forEach { downloadItemId ->
-      Paper.book("downloadItems").read<AbsDownloader.DownloadItem>(downloadItemId)?.let {
+      Paper.book("downloadItems").read<DownloadItem>(downloadItemId)?.let {
        downloadItems.add(it)
      }
    }
    return downloadItems
  }

-  fun saveLocalMediaProgress(mediaProgress:LocalMediaProgress) {
+  fun saveLocalMediaProgress(mediaProgress: LocalMediaProgress) {
    Paper.book("localMediaProgress").write(mediaProgress.id,mediaProgress)
  }
  // For books this will just be the localLibraryItemId for podcast episodes this will be "{localLibraryItemId}-{episodeId}"
-  fun getLocalMediaProgress(localMediaProgressId:String):LocalMediaProgress? {
+  fun getLocalMediaProgress(localMediaProgressId:String): LocalMediaProgress? {
    return Paper.book("localMediaProgress").read(localMediaProgressId)
  }
  fun getAllLocalMediaProgress():List<LocalMediaProgress> {
@@ -154,7 +155,7 @@ class DbManager {
    val localLibraryItems = getLocalLibraryItems()

    localLibraryItems.forEach { lli ->
-      var hasUpates = false
+      var hasUpdates = false

      // Check local files
      lli.localFiles = lli.localFiles.filter { localFile ->
@@ -162,7 +163,7 @@ class DbManager {
        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}")
-          hasUpates = true
+          hasUpdates = true
        }
        file.exists()
      } as MutableList<LocalFile>
@@ -173,7 +174,7 @@ class DbManager {
        podcast.episodes = podcast.episodes?.filter { ep ->
          if (lli.localFiles.find { lf -> lf.id == ep.audioTrack?.localFileId } == null) {
            Log.d(tag, "cleanLocalLibraryItems: Podcast episode ${ep.title} was removed from library item ${lli.media.metadata.title}")
-            hasUpates = true
+            hasUpdates = true
          }
          ep.audioTrack != null && lli.localFiles.find { lf -> lf.id == ep.audioTrack?.localFileId } != null
        } as MutableList<PodcastEpisode>
@@ -182,7 +183,7 @@ class DbManager {
        book.tracks = book.tracks?.filter { track ->
          if (lli.localFiles.find { lf -> lf.id == track.localFileId } == null) {
            Log.d(tag, "cleanLocalLibraryItems: Audio track ${track.title} was removed from library item ${lli.media.metadata.title}")
-            hasUpates = true
+            hasUpdates = true
          }
          lli.localFiles.find { lf -> lf.id == track.localFileId } != null
        } as MutableList<AudioTrack>
@@ -196,11 +197,11 @@ class DbManager {
          Log.d(tag, "cleanLocalLibraryItems: Cover $it was removed from library item ${lli.media.metadata.title}")
          lli.coverAbsolutePath = null
          lli.coverContentUrl = null
-          hasUpates = true
+          hasUpdates = true
        }
      }

-      if (hasUpates) {
+      if (hasUpdates) {
        Log.d(tag, "cleanLocalLibraryItems: Saving local library item ${lli.id}")
        Paper.book("localLibraryItems").write(lli.id, lli)
      }
@@ -236,10 +237,26 @@ class DbManager {
    }
  }

-  fun saveLocalPlaybackSession(playbackSession:PlaybackSession) {
-    Paper.book("localPlaybackSession").write(playbackSession.id,playbackSession)
+  fun saveMediaItemHistory(mediaItemHistory: MediaItemHistory) {
+    Paper.book("mediaItemHistory").write(mediaItemHistory.id,mediaItemHistory)
  }
-  fun getLocalPlaybackSession(playbackSessionId:String):PlaybackSession? {
-    return Paper.book("localPlaybackSession").read(playbackSessionId)
+  fun getMediaItemHistory(id:String): MediaItemHistory? {
+    return Paper.book("mediaItemHistory").read(id)
+  }
+
+  fun savePlaybackSession(playbackSession: PlaybackSession) {
+    Paper.book("playbackSession").write(playbackSession.id,playbackSession)
+  }
+  fun removePlaybackSession(playbackSessionId:String) {
+    Paper.book("playbackSession").delete(playbackSessionId)
+  }
+  fun getPlaybackSessions():List<PlaybackSession> {
+    val sessions:MutableList<PlaybackSession> = mutableListOf()
+    Paper.book("playbackSession").allKeys.forEach { playbackSessionId ->
+      Paper.book("playbackSession").read<PlaybackSession>(playbackSessionId)?.let {
+        sessions.add(it)
+      }
+    }
+    return sessions
  }
 }
@@ -0,0 +1,252 @@
+package com.audiobookshelf.app.managers
+
+import android.app.DownloadManager
+import android.net.Uri
+import android.util.Log
+import androidx.documentfile.provider.DocumentFile
+import com.anggrayudi.storage.callback.FileCallback
+import com.anggrayudi.storage.file.DocumentFileCompat
+import com.anggrayudi.storage.file.MimeType
+import com.anggrayudi.storage.file.getAbsolutePath
+import com.anggrayudi.storage.file.moveFileTo
+import com.anggrayudi.storage.media.FileDescription
+import com.audiobookshelf.app.MainActivity
+import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.device.FolderScanner
+import com.audiobookshelf.app.models.DownloadItem
+import com.audiobookshelf.app.models.DownloadItemPart
+import com.fasterxml.jackson.core.json.JsonReadFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.getcapacitor.JSObject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.util.*
+
+class DownloadItemManager(var downloadManager:DownloadManager, private var folderScanner: FolderScanner, var mainActivity: MainActivity, private var clientEventEmitter:DownloadEventEmitter) {
+  val tag = "DownloadItemManager"
+  private val maxSimultaneousDownloads = 3
+  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+
+  enum class DownloadCheckStatus {
+    InProgress,
+    Successful,
+    Failed
+  }
+
+  var downloadItemQueue: MutableList<DownloadItem> = mutableListOf() // All pending and downloading items
+  var currentDownloadItemParts: MutableList<DownloadItemPart> = mutableListOf() // Item parts currently being downloaded
+
+  interface DownloadEventEmitter {
+    fun onDownloadItem(downloadItem:DownloadItem)
+    fun onDownloadItemPartUpdate(downloadItemPart:DownloadItemPart)
+    fun onDownloadItemComplete(jsobj:JSObject)
+  }
+
+  companion object {
+    var isDownloading:Boolean = false
+  }
+
+  fun addDownloadItem(downloadItem:DownloadItem) {
+    DeviceManager.dbManager.saveDownloadItem(downloadItem)
+    Log.i(tag, "Add download item ${downloadItem.media.metadata.title}")
+
+    downloadItemQueue.add(downloadItem)
+    clientEventEmitter.onDownloadItem(downloadItem)
+    checkUpdateDownloadQueue()
+  }
+
+  private fun checkUpdateDownloadQueue() {
+    for (downloadItem in downloadItemQueue) {
+      val numPartsToGet = maxSimultaneousDownloads - currentDownloadItemParts.size
+      val nextDownloadItemParts = downloadItem.getNextDownloadItemParts(numPartsToGet)
+      Log.d(tag, "checkUpdateDownloadQueue: numPartsToGet=$numPartsToGet, nextDownloadItemParts=${nextDownloadItemParts.size}")
+
+      if (nextDownloadItemParts.size > 0) {
+        nextDownloadItemParts.forEach {
+          val dlRequest = it.getDownloadRequest()
+          val downloadId = downloadManager.enqueue(dlRequest)
+          it.downloadId = downloadId
+          Log.d(tag, "checkUpdateDownloadQueue: Starting download item part, downloadId=$downloadId")
+          currentDownloadItemParts.add(it)
+        }
+      }
+
+      if (currentDownloadItemParts.size >= maxSimultaneousDownloads) {
+        break
+      }
+    }
+
+    if (currentDownloadItemParts.size > 0) startWatchingDownloads()
+  }
+
+  private fun startWatchingDownloads() {
+    if (isDownloading) return // Already watching
+
+    GlobalScope.launch(Dispatchers.IO) {
+      Log.d(tag, "Starting watching downloads")
+      isDownloading = true
+
+      while (currentDownloadItemParts.size > 0) {
+
+        val itemParts = currentDownloadItemParts.filter { !it.isMoving }.map { it }
+        for (downloadItemPart in itemParts) {
+          val downloadCheckStatus = checkDownloadItemPart(downloadItemPart)
+          clientEventEmitter.onDownloadItemPartUpdate(downloadItemPart)
+
+          // Will move to final destination, remove current item parts, and check if download item is finished
+          handleDownloadItemPartCheck(downloadCheckStatus, downloadItemPart)
+        }
+
+        delay(500)
+
+        if (currentDownloadItemParts.size < maxSimultaneousDownloads) {
+          checkUpdateDownloadQueue()
+        }
+      }
+
+      Log.d(tag, "Finished watching downloads")
+      isDownloading = false
+    }
+  }
+
+  private fun checkDownloadItemPart(downloadItemPart:DownloadItemPart):DownloadCheckStatus {
+    val downloadId = downloadItemPart.downloadId ?: return DownloadCheckStatus.Failed
+
+    val query = DownloadManager.Query().setFilterById(downloadId)
+    downloadManager.query(query).use {
+      if (it.moveToFirst()) {
+        val bytesColumnIndex = it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
+        val statusColumnIndex = it.getColumnIndex(DownloadManager.COLUMN_STATUS)
+        val bytesDownloadedColumnIndex = it.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
+
+        val totalBytes = if (bytesColumnIndex >= 0) it.getInt(bytesColumnIndex) else 0
+        val downloadStatus = if (statusColumnIndex >= 0) it.getInt(statusColumnIndex) else 0
+        val bytesDownloadedSoFar = if (bytesDownloadedColumnIndex >= 0) it.getLong(bytesDownloadedColumnIndex) else 0
+        Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} bytes $totalBytes | bytes dled $bytesDownloadedSoFar | downloadStatus $downloadStatus")
+
+        return when (downloadStatus) {
+          DownloadManager.STATUS_SUCCESSFUL -> {
+            Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} Successful")
+            downloadItemPart.completed = true
+            downloadItemPart.progress = 1
+            downloadItemPart.bytesDownloaded = bytesDownloadedSoFar
+
+            DownloadCheckStatus.Successful
+          }
+          DownloadManager.STATUS_FAILED -> {
+            Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} Failed")
+            downloadItemPart.completed = true
+            downloadItemPart.failed = true
+
+            DownloadCheckStatus.Failed
+          }
+          else -> {
+            val percentProgress = if (totalBytes > 0) ((bytesDownloadedSoFar * 100L) / totalBytes) else 0
+            Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} Progress = $percentProgress%")
+            downloadItemPart.progress = percentProgress
+            downloadItemPart.bytesDownloaded = bytesDownloadedSoFar
+
+            DownloadCheckStatus.InProgress
+          }
+        }
+      } else {
+        Log.d(tag, "Download ${downloadItemPart.filename} not found in dlmanager")
+        downloadItemPart.completed = true
+        downloadItemPart.failed = true
+        return DownloadCheckStatus.Failed
+      }
+    }
+  }
+
+  private fun handleDownloadItemPartCheck(downloadCheckStatus:DownloadCheckStatus, downloadItemPart:DownloadItemPart) {
+    val downloadItem = downloadItemQueue.find { it.id == downloadItemPart.downloadItemId }
+    if (downloadItem == null) {
+      Log.e(tag, "Download item part finished but download item not found ${downloadItemPart.filename}")
+      currentDownloadItemParts.remove(downloadItemPart)
+    } else if (downloadCheckStatus == DownloadCheckStatus.Successful) {
+
+      val file = DocumentFileCompat.fromUri(mainActivity, downloadItemPart.destinationUri)
+      Log.d(tag, "DOWNLOAD: DESTINATION URI ${downloadItemPart.destinationUri}")
+
+      val fcb = object : FileCallback() {
+        override fun onPrepare() {
+          Log.d(tag, "DOWNLOAD: PREPARING MOVE FILE")
+        }
+        override fun onFailed(errorCode: ErrorCode) {
+          Log.e(tag, "DOWNLOAD: FAILED TO MOVE FILE $errorCode")
+          downloadItemPart.failed = true
+          downloadItemPart.isMoving = false
+          file?.delete()
+          checkDownloadItemFinished(downloadItem)
+          currentDownloadItemParts.remove(downloadItemPart)
+        }
+        override fun onCompleted(result:Any) {
+          Log.d(tag, "DOWNLOAD: FILE MOVE COMPLETED")
+          val resultDocFile = result as DocumentFile
+          Log.d(tag, "DOWNLOAD: COMPLETED FILE INFO (name=${resultDocFile.name}) ${resultDocFile.getAbsolutePath(mainActivity)}")
+
+          // Rename to fix appended .mp3 on m4b/m4a files
+          //  REF: https://github.com/anggrayudi/SimpleStorage/issues/94
+          val docNameLowerCase = resultDocFile.name?.lowercase(Locale.getDefault()) ?: ""
+          if (docNameLowerCase.endsWith(".m4b.mp3")|| docNameLowerCase.endsWith(".m4a.mp3")) {
+            resultDocFile.renameTo(downloadItemPart.filename)
+          }
+
+          downloadItemPart.moved = true
+          downloadItemPart.isMoving = false
+          checkDownloadItemFinished(downloadItem)
+          currentDownloadItemParts.remove(downloadItemPart)
+        }
+      }
+
+      val localFolderFile = DocumentFileCompat.fromUri(mainActivity, Uri.parse(downloadItemPart.localFolderUrl))
+      if (localFolderFile == null) {
+        // fAILED
+        downloadItemPart.failed = true
+        Log.e(tag, "Local Folder File from uri is null")
+        checkDownloadItemFinished(downloadItem)
+        currentDownloadItemParts.remove(downloadItemPart)
+      } else {
+        downloadItemPart.isMoving = true
+        val mimetype = if (downloadItemPart.audioTrack != null) MimeType.AUDIO else MimeType.IMAGE
+        val fileDescription = FileDescription(downloadItemPart.filename, downloadItemPart.finalDestinationSubfolder, mimetype)
+        file?.moveFileTo(mainActivity, localFolderFile, fileDescription, fcb)
+      }
+
+    } else if (downloadCheckStatus != DownloadCheckStatus.InProgress) {
+      checkDownloadItemFinished(downloadItem)
+      currentDownloadItemParts.remove(downloadItemPart)
+    }
+  }
+
+  private fun checkDownloadItemFinished(downloadItem:DownloadItem) {
+    if (downloadItem.isDownloadFinished) {
+      Log.i(tag, "Download Item finished ${downloadItem.media.metadata.title}")
+
+      GlobalScope.launch(Dispatchers.IO) {
+        folderScanner.scanDownloadItem(downloadItem) { downloadItemScanResult ->
+          Log.d(tag, "Item download complete ${downloadItem.itemTitle} | local library item id: ${downloadItemScanResult?.localLibraryItem?.id}")
+
+          val jsobj = JSObject()
+          jsobj.put("libraryItemId", downloadItem.id)
+          jsobj.put("localFolderId", downloadItem.localFolder.id)
+
+          downloadItemScanResult?.localLibraryItem?.let { localLibraryItem ->
+            jsobj.put("localLibraryItem", JSObject(jacksonMapper.writeValueAsString(localLibraryItem)))
+          }
+          downloadItemScanResult?.localMediaProgress?.let { localMediaProgress ->
+            jsobj.put("localMediaProgress", JSObject(jacksonMapper.writeValueAsString(localMediaProgress)))
+          }
+
+          launch(Dispatchers.Main) {
+            clientEventEmitter.onDownloadItemComplete(jsobj)
+            downloadItemQueue.remove(downloadItem)
+            DeviceManager.dbManager.removeDownloadItem(downloadItem.id)
+          }
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,364 @@
+package com.audiobookshelf.app.managers
+
+import android.content.Context
+import android.os.*
+import android.util.Log
+import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.player.PlayerNotificationService
+import com.audiobookshelf.app.player.SLEEP_TIMER_WAKE_UP_EXPIRATION
+import java.text.SimpleDateFormat
+import java.util.*
+import kotlin.concurrent.schedule
+import kotlin.math.roundToInt
+
+class SleepTimerManager constructor(private val playerNotificationService: PlayerNotificationService) {
+  private val tag = "SleepTimerManager"
+
+  private var sleepTimerTask:TimerTask? = null
+  private var sleepTimerRunning:Boolean = false
+  private var sleepTimerEndTime:Long = 0L
+  private var sleepTimerLength:Long = 0L
+  private var sleepTimerElapsed:Long = 0L
+  private var sleepTimerFinishedAt:Long = 0L
+  private var isAutoSleepTimer:Boolean = false // When timer was auto-set
+
+  private fun getCurrentTime():Long {
+    return playerNotificationService.getCurrentTime()
+  }
+
+  private fun getDuration():Long {
+    return playerNotificationService.getDuration()
+  }
+
+  private fun getIsPlaying():Boolean {
+    return playerNotificationService.currentPlayer.isPlaying
+  }
+
+  private fun setVolume(volume:Float) {
+    playerNotificationService.currentPlayer.volume = volume
+  }
+
+  private fun pause() {
+    playerNotificationService.currentPlayer.pause()
+  }
+
+  private fun play() {
+    playerNotificationService.currentPlayer.play()
+  }
+
+  private fun getSleepTimerTimeRemainingSeconds():Int {
+    if (sleepTimerEndTime == 0L && sleepTimerLength > 0) { // For regular timer
+      return ((sleepTimerLength - sleepTimerElapsed) / 1000).toDouble().roundToInt()
+    }
+    // For chapter end timer
+    if (sleepTimerEndTime <= 0) return 0
+    return (((sleepTimerEndTime - getCurrentTime()) / 1000).toDouble()).roundToInt()
+  }
+
+  private fun setSleepTimer(time: Long, isChapterTime: Boolean) : Boolean {
+    Log.d(tag, "Setting Sleep Timer for $time is chapter time $isChapterTime")
+    sleepTimerTask?.cancel()
+    sleepTimerRunning = true
+    sleepTimerFinishedAt = 0L
+    sleepTimerElapsed = 0L
+
+    // Register shake sensor
+    playerNotificationService.registerSensor()
+
+    val currentTime = getCurrentTime()
+    if (isChapterTime) {
+      if (currentTime > time) {
+        Log.d(tag, "Invalid sleep timer - current time is already passed chapter time $time")
+        return false
+      }
+      sleepTimerEndTime = time
+      sleepTimerLength = 0
+
+      if (sleepTimerEndTime > getDuration()) {
+        sleepTimerEndTime = getDuration()
+      }
+    } else {
+      sleepTimerLength = time
+      sleepTimerEndTime = 0L
+
+      if (sleepTimerLength + getCurrentTime() > getDuration()) {
+        sleepTimerLength = getDuration() - getCurrentTime()
+      }
+    }
+
+    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds(), isAutoSleepTimer)
+
+    sleepTimerTask = Timer("SleepTimer", false).schedule(0L, 1000L) {
+      Handler(Looper.getMainLooper()).post {
+        if (getIsPlaying()) {
+          sleepTimerElapsed += 1000L
+
+          val sleepTimeSecondsRemaining = getSleepTimerTimeRemainingSeconds()
+          Log.d(tag, "Timer Elapsed $sleepTimerElapsed | Sleep TIMER time remaining $sleepTimeSecondsRemaining s")
+
+          if (sleepTimeSecondsRemaining > 0) {
+            playerNotificationService.clientEventEmitter?.onSleepTimerSet(sleepTimeSecondsRemaining, isAutoSleepTimer)
+          }
+
+          if (sleepTimeSecondsRemaining <= 0) {
+            Log.d(tag, "Sleep Timer Pausing Player on Chapter")
+            pause()
+
+            playerNotificationService.clientEventEmitter?.onSleepTimerEnded(getCurrentTime())
+            clearSleepTimer()
+            sleepTimerFinishedAt = System.currentTimeMillis()
+          } else if (sleepTimeSecondsRemaining <= 60) {
+            if (DeviceManager.deviceData.deviceSettings?.disableSleepTimerFadeOut == true) {
+              // Set volume to 1 in case setting was enabled while fading
+              setVolume(1f)
+            } else {
+              // Start fading out audio down to 10% volume
+              val percentToReduce = 1 - (sleepTimeSecondsRemaining / 60F)
+              val volume =  1f - (percentToReduce * 0.9f)
+              Log.d(tag, "SLEEP VOLUME FADE $volume | ${sleepTimeSecondsRemaining}s remaining")
+              setVolume(volume)
+            }
+          }
+        }
+      }
+    }
+    return true
+  }
+
+  fun setManualSleepTimer(time: Long, isChapterTime:Boolean):Boolean {
+    isAutoSleepTimer = false
+    return setSleepTimer(time, isChapterTime)
+  }
+
+  private fun clearSleepTimer() {
+    sleepTimerTask?.cancel()
+    sleepTimerTask = null
+    sleepTimerEndTime = 0
+    sleepTimerRunning = false
+    isAutoSleepTimer = false
+    playerNotificationService.unregisterSensor()
+  }
+
+  fun getSleepTimerTime():Long {
+    return sleepTimerEndTime
+  }
+
+  fun cancelSleepTimer() {
+    Log.d(tag, "Canceling Sleep Timer")
+
+    if (isAutoSleepTimer) {
+      Log.i(tag, "Disabling auto sleep timer")
+      DeviceManager.deviceData.deviceSettings?.autoSleepTimer = false
+      DeviceManager.dbManager.saveDeviceData(DeviceManager.deviceData)
+    }
+
+    clearSleepTimer()
+    playerNotificationService.clientEventEmitter?.onSleepTimerSet(0, false)
+  }
+
+  // Vibrate when resetting sleep timer
+  private fun vibrateFeedback() {
+    if (DeviceManager.deviceData.deviceSettings?.disableSleepTimerResetFeedback == true) return
+
+    val context = playerNotificationService.getContext()
+    val vibrator:Vibrator
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      val vibratorManager =
+        context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager
+      vibrator = vibratorManager.defaultVibrator
+    } else {
+      @Suppress("DEPRECATION")
+      vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+    }
+
+    vibrator.let {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val vibrationEffect = VibrationEffect.createWaveform(longArrayOf(0, 150, 150, 150),-1)
+        it.vibrate(vibrationEffect)
+      } else {
+        @Suppress("DEPRECATION")
+        it.vibrate(10)
+      }
+    }
+  }
+
+  // Get the chapter end time for use in End of Chapter timers
+  //   if less than 2s remain in chapter then use the next chapter
+  private fun getChapterEndTime():Long? {
+    val currentChapterEndTimeMs = playerNotificationService.getEndTimeOfChapterOrTrack()
+    if (currentChapterEndTimeMs == null) {
+      Log.e(tag, "Getting chapter sleep timer end of chapter/track but there is no current session")
+      return null
+    }
+
+    val timeLeftInChapter = currentChapterEndTimeMs - getCurrentTime()
+    return if (timeLeftInChapter < 2000L) {
+      Log.i(tag, "Getting chapter sleep timer time and current chapter has less than 2s remaining")
+      val nextChapterEndTimeMs = playerNotificationService.getEndTimeOfNextChapterOrTrack()
+      if (nextChapterEndTimeMs == null || currentChapterEndTimeMs == nextChapterEndTimeMs) {
+        Log.e(tag, "Invalid next chapter time. No current session or equal to current chapter. $nextChapterEndTimeMs")
+        null
+      } else {
+        nextChapterEndTimeMs
+      }
+    } else {
+      currentChapterEndTimeMs
+    }
+  }
+
+  private fun resetChapterTimer() {
+    this.getChapterEndTime()?.let { chapterEndTime ->
+      Log.d(tag, "Resetting stopped sleep timer to end of chapter $chapterEndTime")
+      vibrateFeedback()
+      setSleepTimer(chapterEndTime, true)
+      play()
+    }
+  }
+
+  private fun checkShouldResetSleepTimer() {
+    if (!sleepTimerRunning) {
+      if (sleepTimerFinishedAt <= 0L) return
+
+      val finishedAtDistance = System.currentTimeMillis() - sleepTimerFinishedAt
+      if (finishedAtDistance > SLEEP_TIMER_WAKE_UP_EXPIRATION) // 2 minutes
+      {
+        Log.d(tag, "Sleep timer finished over 2 mins ago, clearing it")
+        sleepTimerFinishedAt = 0L
+        return
+      }
+
+      // Set sleep timer
+      //   When sleepTimerLength is 0 then use end of chapter/track time
+      if (sleepTimerLength == 0L) {
+        Log.d(tag, "Resetting stopped chapter sleep timer")
+        resetChapterTimer()
+      } else {
+        Log.d(tag, "Resetting stopped sleep timer to length $sleepTimerLength")
+        vibrateFeedback()
+        setSleepTimer(sleepTimerLength, false)
+        play()
+      }
+      return
+    }
+
+    // Does not apply to chapter sleep timers and timer must be running for at least 3 seconds
+    if (sleepTimerLength > 0L && sleepTimerElapsed > 3000L) {
+      Log.d(tag, "Resetting running sleep timer to length $sleepTimerLength")
+      vibrateFeedback()
+      setSleepTimer(sleepTimerLength, false)
+    } else if (sleepTimerLength == 0L) {
+      // When navigating to previous chapters make sure this is still the end of the current chapter
+      this.getChapterEndTime()?.let { chapterEndTime ->
+        if (chapterEndTime != sleepTimerEndTime) {
+          Log.d(tag, "Resetting chapter sleep timer to end of chapter $chapterEndTime from $sleepTimerEndTime")
+          vibrateFeedback()
+          setSleepTimer(chapterEndTime, true)
+          play()
+        }
+      }
+    }
+  }
+
+  fun handleShake() {
+    if (sleepTimerRunning || sleepTimerFinishedAt > 0L) {
+      if (DeviceManager.deviceData.deviceSettings?.disableShakeToResetSleepTimer == true) {
+        Log.d(tag, "Shake to reset sleep timer is disabled")
+        return
+      }
+      checkShouldResetSleepTimer()
+    }
+  }
+
+  fun increaseSleepTime(time: Long) {
+    Log.d(tag, "Increase Sleep time $time")
+    if (!sleepTimerRunning) return
+
+    if (sleepTimerEndTime == 0L) {
+      sleepTimerLength += time
+      if (sleepTimerLength + getCurrentTime() > getDuration()) sleepTimerLength = getDuration() - getCurrentTime()
+    } else {
+      val newSleepEndTime = sleepTimerEndTime + time
+      sleepTimerEndTime = if (newSleepEndTime >= getDuration()) {
+        getDuration()
+      } else {
+        newSleepEndTime
+      }
+    }
+
+    setVolume(1F)
+    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds(), isAutoSleepTimer)
+  }
+
+  fun decreaseSleepTime(time: Long) {
+    Log.d(tag, "Decrease Sleep time $time")
+    if (!sleepTimerRunning) return
+
+
+    if (sleepTimerEndTime == 0L) {
+      sleepTimerLength -= time
+      if (sleepTimerLength <= 0) sleepTimerLength = 1000L
+    } else {
+      val newSleepEndTime = sleepTimerEndTime - time
+      sleepTimerEndTime = if (newSleepEndTime <= 1000) {
+        // End sleep timer in 1 second
+        getCurrentTime() + 1000
+      } else {
+        newSleepEndTime
+      }
+    }
+
+    setVolume(1F)
+    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds(), isAutoSleepTimer)
+  }
+
+  fun checkAutoSleepTimer() {
+    if (sleepTimerRunning) { // Sleep timer already running
+      return
+    }
+    DeviceManager.deviceData.deviceSettings?.let { deviceSettings ->
+      if (!deviceSettings.autoSleepTimer) return // Check auto sleep timer is enabled
+
+      val startCalendar = Calendar.getInstance()
+      startCalendar.set(Calendar.HOUR_OF_DAY, deviceSettings.autoSleepTimerStartHour)
+      startCalendar.set(Calendar.MINUTE, deviceSettings.autoSleepTimerStartMinute)
+      val endCalendar = Calendar.getInstance()
+      endCalendar.set(Calendar.HOUR_OF_DAY, deviceSettings.autoSleepTimerEndHour)
+      endCalendar.set(Calendar.MINUTE, deviceSettings.autoSleepTimerEndMinute)
+
+      // In cases where end time is earlier then start time then we add a day to end time
+      //   e.g. start time 22:00 and end time 06:00. End time will be treated as 6am the next day.
+      //   e.g. start time 08:00 and end time 22:00. Start and end time will be the same day.
+      if (endCalendar.before(startCalendar)) {
+        endCalendar.add(Calendar.DAY_OF_MONTH, 1)
+      }
+
+      val currentCalendar = Calendar.getInstance()
+      val currentHour = SimpleDateFormat("HH:mm", Locale.getDefault()).format(currentCalendar.time)
+      if (currentCalendar.after(startCalendar) && currentCalendar.before(endCalendar)) {
+        Log.i(tag, "Current hour $currentHour is between ${deviceSettings.autoSleepTimerStartTime} and ${deviceSettings.autoSleepTimerEndTime} - starting sleep timer")
+
+        // Set sleep timer
+        //   When sleepTimerLength is 0 then use end of chapter/track time
+        if (deviceSettings.sleepTimerLength == 0L) {
+          val chapterEndTimeMs = this.getChapterEndTime()
+          if (chapterEndTimeMs == null) {
+            Log.e(tag, "Setting auto sleep timer to end of chapter/track but there is no current session")
+          } else {
+            isAutoSleepTimer = true
+            setSleepTimer(chapterEndTimeMs, true)
+          }
+        } else {
+          isAutoSleepTimer = true
+          setSleepTimer(deviceSettings.sleepTimerLength, false)
+        }
+      } else {
+        Log.d(tag, "Current hour $currentHour is NOT between ${deviceSettings.autoSleepTimerStartTime} and ${deviceSettings.autoSleepTimerEndTime}")
+      }
+    }
+  }
+
+  fun handleMediaPlayEvent() {
+    checkShouldResetSleepTimer()
+    checkAutoSleepTimer()
+  }
+}
@@ -0,0 +1,111 @@
+package com.audiobookshelf.app.media
+
+import android.util.Log
+import com.audiobookshelf.app.data.*
+import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.player.PlayerNotificationService
+
+object MediaEventManager {
+  const val tag = "MediaEventManager"
+
+  var clientEventEmitter: PlayerNotificationService.ClientEventEmitter? = null
+
+  fun playEvent(playbackSession: PlaybackSession) {
+    Log.i(tag, "Play Event for media \"${playbackSession.displayTitle}\"")
+    addPlaybackEvent("Play", playbackSession, null)
+  }
+
+  fun pauseEvent(playbackSession: PlaybackSession, syncResult: SyncResult?) {
+    Log.i(tag, "Pause Event for media \"${playbackSession.displayTitle}\"")
+    addPlaybackEvent("Pause", playbackSession, syncResult)
+  }
+
+  fun stopEvent(playbackSession: PlaybackSession, syncResult: SyncResult?) {
+    Log.i(tag, "Stop Event for media \"${playbackSession.displayTitle}\"")
+    addPlaybackEvent("Stop", playbackSession, syncResult)
+  }
+
+  fun saveEvent(playbackSession: PlaybackSession, syncResult: SyncResult?) {
+    Log.i(tag, "Save Event for media \"${playbackSession.displayTitle}\"")
+    addPlaybackEvent("Save", playbackSession, syncResult)
+  }
+
+  fun finishedEvent(playbackSession: PlaybackSession, syncResult: SyncResult?) {
+    Log.i(tag, "Finished Event for media \"${playbackSession.displayTitle}\"")
+    addPlaybackEvent("Finished", playbackSession, syncResult)
+  }
+
+  fun seekEvent(playbackSession: PlaybackSession, syncResult: SyncResult?) {
+    Log.i(tag, "Seek Event for media \"${playbackSession.displayTitle}\", currentTime=${playbackSession.currentTime}")
+    addPlaybackEvent("Seek", playbackSession, syncResult)
+  }
+
+  fun syncEvent(mediaProgress: MediaProgressWrapper, description: String) {
+    Log.i(tag, "Sync Event for media item id \"${mediaProgress.mediaItemId}\", currentTime=${mediaProgress.currentTime}")
+    addSyncEvent("Sync", mediaProgress, description)
+  }
+
+  private fun addSyncEvent(eventName:String, mediaProgress:MediaProgressWrapper, description: String) {
+    val mediaItemHistory = getMediaItemHistoryMediaItem(mediaProgress.mediaItemId)
+    if (mediaItemHistory == null) {
+      Log.w(tag, "addSyncEvent: Media Item History not created yet for media item id ${mediaProgress.mediaItemId}")
+      return
+    }
+
+    val mediaItemEvent = MediaItemEvent(
+      name = eventName,
+      type = "Sync",
+      description = description,
+      currentTime = mediaProgress.currentTime,
+      serverSyncAttempted = false,
+      serverSyncSuccess = null,
+      serverSyncMessage = null,
+      timestamp = System.currentTimeMillis()
+    )
+    mediaItemHistory.events.add(mediaItemEvent)
+    DeviceManager.dbManager.saveMediaItemHistory(mediaItemHistory)
+
+    clientEventEmitter?.onMediaItemHistoryUpdated(mediaItemHistory)
+  }
+
+  private fun addPlaybackEvent(eventName:String, playbackSession:PlaybackSession, syncResult: SyncResult?) {
+    val mediaItemHistory = getMediaItemHistoryMediaItem(playbackSession.mediaItemId) ?: createMediaItemHistoryForSession(playbackSession)
+
+    val mediaItemEvent = MediaItemEvent(
+      name = eventName,
+      type = "Playback",
+      description = "",
+      currentTime = playbackSession.currentTime,
+      serverSyncAttempted = syncResult?.serverSyncAttempted ?: false,
+      serverSyncSuccess = syncResult?.serverSyncSuccess,
+      serverSyncMessage = syncResult?.serverSyncMessage,
+      timestamp = System.currentTimeMillis()
+    )
+    mediaItemHistory.events.add(mediaItemEvent)
+    DeviceManager.dbManager.saveMediaItemHistory(mediaItemHistory)
+
+    clientEventEmitter?.onMediaItemHistoryUpdated(mediaItemHistory)
+  }
+
+  private fun getMediaItemHistoryMediaItem(mediaItemId: String) : MediaItemHistory? {
+    return DeviceManager.dbManager.getMediaItemHistory(mediaItemId)
+  }
+
+  private fun createMediaItemHistoryForSession(playbackSession: PlaybackSession):MediaItemHistory {
+    Log.i(tag, "Creating new media item history for media \"${playbackSession.displayTitle}\"")
+    val isLocalOnly = playbackSession.isLocalLibraryItemOnly
+    val libraryItemId = if (isLocalOnly) playbackSession.localLibraryItemId else playbackSession.libraryItemId ?: ""
+    val episodeId:String? = if (isLocalOnly && playbackSession.localEpisodeId != null) playbackSession.localEpisodeId else playbackSession.episodeId
+    return MediaItemHistory(
+      id = playbackSession.mediaItemId,
+      mediaDisplayTitle = playbackSession.displayTitle ?: "Unset",
+      libraryItemId,
+      episodeId,
+      isLocalOnly,
+      playbackSession.serverConnectionConfigId,
+      playbackSession.serverAddress,
+      playbackSession.userId,
+      createdAt = System.currentTimeMillis(),
+      events = mutableListOf())
+  }
+}
@@ -12,25 +12,26 @@ import java.util.*
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.runBlocking
 import org.json.JSONException
+import org.json.JSONObject
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine

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

-  var serverLibraryItems = mutableListOf<LibraryItem>() // Store all items here
-  var selectedLibraryItems = mutableListOf<LibraryItem>()
-  var selectedLibraryId = ""
+  private var serverLibraryItems = mutableListOf<LibraryItem>() // Store all items here
+  private var selectedLibraryItems = mutableListOf<LibraryItem>()
+  private var selectedLibraryId = ""

-  var selectedPodcast:Podcast? = null
-  var selectedLibraryItemId:String? = null
-  var podcastEpisodeLibraryItemMap = mutableMapOf<String, LibraryItemWithEpisode>()
-  var serverLibraryCategories = listOf<LibraryCategory>()
+  private var selectedPodcast:Podcast? = null
+  private var selectedLibraryItemId:String? = null
+  private var podcastEpisodeLibraryItemMap = mutableMapOf<String, LibraryItemWithEpisode>()
+  private var serverLibraryCategories = listOf<LibraryCategory>()
+  private var serverConfigIdUsed:String? = null
+  private var serverConfigLastPing:Long = 0L
+  var serverUserMediaProgress:MutableList<MediaProgress> = mutableListOf()
  var serverItemsInProgress = listOf<ItemInProgress>()
  var serverLibraries = listOf<Library>()
-  var serverConfigIdUsed:String? = null
-  var serverConfigLastPing:Long = 0L
-  var serverUserMediaProgress:MutableList<MediaProgress> = mutableListOf()

  var userSettingsPlaybackRate:Float? = null

@@ -61,12 +62,41 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    return 1f
  }

+  fun setSavedPlaybackRate(newRate: Float) {
+    val sharedPrefs = ctx.getSharedPreferences("CapacitorStorage", Activity.MODE_PRIVATE)
+    val sharedPrefEditor = sharedPrefs.edit()
+    if (sharedPrefs != null) {
+      val userSettingsPref = sharedPrefs.getString("userSettings", null)
+      if (userSettingsPref != null) {
+        try {
+          val userSettings = JSObject(userSettingsPref)
+          // toString().toDouble() to prevent float conversion issues (ex 1.2f becomes 1.2000000476837158d)
+          userSettings.put("playbackRate", newRate.toString().toDouble())
+          sharedPrefEditor.putString("userSettings", userSettings.toString())
+          sharedPrefEditor.apply()
+          userSettingsPlaybackRate = newRate
+          Log.d(tag, "Saved userSettings JSON from Android Auto with playbackRate=$newRate")
+        } catch(je:JSONException) {
+          Log.e(tag, "Failed to save userSettings JSON ${je.localizedMessage}")
+        }
+      } else {
+        // Not sure if this is the best place for this, but if a user has not changed any user settings in the app
+        // the object will not exist yet, could be moved to a centralized place or created on first app load
+        val userSettings = JSONObject()
+        userSettings.put("playbackRate", newRate.toString().toDouble())
+        sharedPrefEditor.putString("userSettings", userSettings.toString())
+        userSettingsPlaybackRate = newRate
+        Log.d(tag, "Created and saved userSettings JSON from Android Auto with playbackRate=$newRate")
+      }
+    }
+  }
+
  fun checkResetServerItems() {
    // When opening android auto need to check if still connected to server
    //   and reset any server data already set
    val serverConnConfig = if (DeviceManager.isConnectedToServer) DeviceManager.serverConnectionConfig else DeviceManager.deviceData.getLastServerConnectionConfig()

-    if (!DeviceManager.isConnectedToServer || !apiHandler.isOnline() || serverConnConfig == null || serverConnConfig.id !== serverConfigIdUsed) {
+    if (!DeviceManager.isConnectedToServer || !DeviceManager.checkConnectivity(ctx) || serverConnConfig == null || serverConnConfig.id !== serverConfigIdUsed) {
      podcastEpisodeLibraryItemMap = mutableMapOf()
      serverLibraryCategories = listOf()
      serverLibraries = listOf()
@@ -76,7 +106,7 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    }
  }

-  fun loadItemsInProgressForAllLibraries(cb: (List<ItemInProgress>) -> Unit) {
+  private fun loadItemsInProgressForAllLibraries(cb: (List<ItemInProgress>) -> Unit) {
    if (serverItemsInProgress.isNotEmpty()) {
      cb(serverItemsInProgress)
    } else {
@@ -109,7 +139,7 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    }
  }

-  fun loadLibraryItem(libraryItemId:String, cb: (LibraryItemWrapper?) -> Unit) {
+  private fun loadLibraryItem(libraryItemId:String, cb: (LibraryItemWrapper?) -> Unit) {
    if (libraryItemId.startsWith("local")) {
      cb(DeviceManager.dbManager.getLocalLibraryItem(libraryItemId))
    } else {
@@ -121,7 +151,7 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    }
  }

-  fun loadPodcastEpisodeMediaBrowserItems(libraryItemId:String, cb: (MutableList<MediaBrowserCompat.MediaItem>) -> Unit) {
+  fun loadPodcastEpisodeMediaBrowserItems(libraryItemId:String, ctx:Context, cb: (MutableList<MediaBrowserCompat.MediaItem>) -> Unit) {
      loadLibraryItem(libraryItemId) { libraryItemWrapper ->
        Log.d(tag, "Loaded Podcast library item $libraryItemWrapper")

@@ -138,7 +168,8 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
                Log.d(tag, "Local Podcast Episode ${podcastEpisode.title} | ${podcastEpisode.id}")

                val progress = DeviceManager.dbManager.getLocalMediaProgress("${libraryItemWrapper.id}-${podcastEpisode.id}")
-                val description = podcastEpisode.getMediaDescription(libraryItemWrapper, progress)
+                val description = podcastEpisode.getMediaDescription(libraryItemWrapper, progress, ctx)
+
                MediaBrowserCompat.MediaItem(description, MediaBrowserCompat.MediaItem.FLAG_PLAYABLE)
              }
              children?.let { cb(children as MutableList) } ?: cb(mutableListOf())
@@ -157,7 +188,15 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
              val children = podcast.episodes?.map { podcastEpisode ->

                val progress = serverUserMediaProgress.find { it.libraryItemId == libraryItemWrapper.id && it.episodeId == podcastEpisode.id }
-                val description = podcastEpisode.getMediaDescription(libraryItemWrapper, progress)
+
+                // to show download icon
+                val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItemByLId(libraryItemWrapper.id)
+                localLibraryItem?.let { lli ->
+                  val localEpisode = (lli.media as Podcast).episodes?.find { it.serverEpisodeId == podcastEpisode.id }
+                  podcastEpisode.localEpisodeId = localEpisode?.id
+                }
+
+                val description = podcastEpisode.getMediaDescription(libraryItemWrapper, progress, ctx)
                MediaBrowserCompat.MediaItem(description, MediaBrowserCompat.MediaItem.FLAG_PLAYABLE)
              }
              children?.let { cb(children as MutableList) } ?: cb(mutableListOf())
@@ -167,7 +206,7 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
      }
  }

-  fun loadLibraries(cb: (List<Library>) -> Unit) {
+  private fun loadLibraries(cb: (List<Library>) -> Unit) {
    if (serverLibraries.isNotEmpty()) {
      cb(serverLibraries)
    } else {
@@ -178,9 +217,9 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    }
  }

-  suspend fun checkServerConnection(config:ServerConnectionConfig) : Boolean {
+  private suspend fun checkServerConnection(config:ServerConnectionConfig) : Boolean {
    var successfulPing = false
-    suspendCoroutine<Boolean> { cont ->
+    suspendCoroutine { cont ->
      apiHandler.pingServer(config) {
        Log.d(tag, "checkServerConnection: Checked server conn for ${config.address} result = $it")
        successfulPing = it
@@ -190,9 +229,9 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    return successfulPing
  }

-  suspend fun authorize(config:ServerConnectionConfig) : MutableList<MediaProgress> {
+  private suspend fun authorize(config:ServerConnectionConfig) : MutableList<MediaProgress> {
    var mediaProgress:MutableList<MediaProgress> = mutableListOf()
-    suspendCoroutine<MutableList<MediaProgress>> { cont ->
+    suspendCoroutine { cont ->
      apiHandler.authorize(config) {
        Log.d(tag, "authorize: Authorized server config ${config.address} result = $it")
        if (!it.isNullOrEmpty()) {
@@ -204,11 +243,11 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
    return mediaProgress
  }

-  fun checkSetValidServerConnectionConfig(cb: (Boolean) -> Unit) = runBlocking {
+  private fun checkSetValidServerConnectionConfig(cb: (Boolean) -> Unit) = runBlocking {
    Log.d(tag, "checkSetValidServerConnectionConfig | $serverConfigIdUsed")

    coroutineScope {
-      if (!apiHandler.isOnline()) {
+      if (!DeviceManager.checkConnectivity(ctx)) {
        serverUserMediaProgress = mutableListOf()
        cb(false)
      } else {
@@ -266,6 +305,23 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {

  }

+  fun loadServerUserMediaProgress(cb: () -> Unit) {
+    Log.d(tag, "Loading server media progress")
+    if (DeviceManager.serverConnectionConfig == null) {
+      return cb()
+    }
+
+    DeviceManager.serverConnectionConfig?.let { config ->
+      apiHandler.authorize(config) {
+        Log.d(tag, "loadServerUserMediaProgress: Authorized server config ${config.address} result = $it")
+        if (!it.isNullOrEmpty()) {
+          serverUserMediaProgress = it
+        }
+        cb()
+      }
+    }
+  }
+
  fun loadAndroidAutoItems(cb: () -> Unit) {
    Log.d(tag, "Load android auto items")

@@ -314,18 +370,18 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
  }

  fun getPodcastWithEpisodeByEpisodeId(id:String) : LibraryItemWithEpisode? {
-    if (id.startsWith("local")) {
-      return DeviceManager.dbManager.getLocalLibraryItemWithEpisode(id)
+    return if (id.startsWith("local")) {
+      DeviceManager.dbManager.getLocalLibraryItemWithEpisode(id)
    } else {
-      return podcastEpisodeLibraryItemMap[id]
+      podcastEpisodeLibraryItemMap[id]
    }
  }

  fun getById(id:String) : LibraryItemWrapper? {
-    if (id.startsWith("local")) {
-      return DeviceManager.dbManager.getLocalLibraryItem(id)
+    return if (id.startsWith("local")) {
+      DeviceManager.dbManager.getLocalLibraryItem(id)
    } else {
-      return serverLibraryItems.find { it.id == id }
+      serverLibraryItems.find { it.id == id }
    }
  }

@@ -1,4 +1,4 @@
-package com.audiobookshelf.app.player
+package com.audiobookshelf.app.media

 import android.os.Handler
 import android.os.Looper
@@ -7,6 +7,7 @@ import com.audiobookshelf.app.data.LocalMediaProgress
 import com.audiobookshelf.app.data.MediaProgress
 import com.audiobookshelf.app.data.PlaybackSession
 import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.player.PlayerNotificationService
 import com.audiobookshelf.app.server.ApiHandler
 import java.util.*
 import kotlin.concurrent.schedule
@@ -17,7 +18,13 @@ data class MediaProgressSyncData(
  var currentTime:Double // seconds
 )

-class MediaProgressSyncer(val playerNotificationService:PlayerNotificationService, private val apiHandler: ApiHandler) {
+data class SyncResult(
+  var serverSyncAttempted:Boolean,
+  var serverSyncSuccess:Boolean?,
+  var serverSyncMessage:String?
+)
+
+class MediaProgressSyncer(val playerNotificationService: PlayerNotificationService, private val apiHandler: ApiHandler) {
  private val tag = "MediaProgressSync"
  private val METERED_CONNECTION_SYNC_INTERVAL = 60000

@@ -30,15 +37,15 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic
  var currentPlaybackSession: PlaybackSession? = null // copy of pb session currently syncing
  var currentLocalMediaProgress: LocalMediaProgress? = null

-  val currentDisplayTitle get() = currentPlaybackSession?.displayTitle ?: "Unset"
-  val currentIsLocal get() = currentPlaybackSession?.isLocal == true
-  val currentSessionId get() = currentPlaybackSession?.id ?: ""
-  val currentPlaybackDuration get() = currentPlaybackSession?.duration ?: 0.0
+  private val currentDisplayTitle get() = currentPlaybackSession?.displayTitle ?: "Unset"
+  private val currentIsLocal get() = currentPlaybackSession?.isLocal == true
+  private val currentSessionId get() = currentPlaybackSession?.id ?: ""
+  private val currentPlaybackDuration get() = currentPlaybackSession?.duration ?: 0.0

-  fun start() {
+  fun start(playbackSession:PlaybackSession) {
    if (listeningTimerRunning) {
      Log.d(tag, "start: Timer already running for $currentDisplayTitle")
-      if (playerNotificationService.getCurrentPlaybackSessionId() != currentSessionId) {
+      if (playbackSession.id != currentSessionId) {
        Log.d(tag, "Playback session changed, reset timer")
        currentLocalMediaProgress = null
        listeningTimerTask?.cancel()
@@ -48,25 +55,32 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic
      } else {
        return
      }
-    } else if (playerNotificationService.getCurrentPlaybackSessionId() != currentSessionId) {
+    } else if (playbackSession.id != currentSessionId) {
      currentLocalMediaProgress = null
    }

    listeningTimerRunning = true
    lastSyncTime = System.currentTimeMillis()
-    Log.d(tag, "start: init last sync time $lastSyncTime")
-    currentPlaybackSession = playerNotificationService.getCurrentPlaybackSessionCopy()
+    currentPlaybackSession = playbackSession.clone()
+    Log.d(tag, "start: init last sync time $lastSyncTime with playback session id=${currentPlaybackSession?.id}")

-    listeningTimerTask = Timer("ListeningTimer", false).schedule(0L, 5000L) {
+    listeningTimerTask = Timer("ListeningTimer", false).schedule(15000L, 15000L) {
      Handler(Looper.getMainLooper()).post() {
        if (playerNotificationService.currentPlayer.isPlaying) {
-          // Only sync with server on unmetered connection every 5s OR sync with server if last sync time is >= 60s
+          // Set auto sleep timer if enabled and within start/end time
+          playerNotificationService.sleepTimerManager.checkAutoSleepTimer()
+
+          // Only sync with server on unmetered connection every 15s OR sync with server if last sync time is >= 60s
          val shouldSyncServer = PlayerNotificationService.isUnmeteredNetwork || System.currentTimeMillis() - lastSyncTime >= METERED_CONNECTION_SYNC_INTERVAL

          val currentTime = playerNotificationService.getCurrentTimeSeconds()
          if (currentTime > 0) {
-            sync(shouldSyncServer, currentTime) {
+            sync(shouldSyncServer, currentTime) { syncResult ->
              Log.d(tag, "Sync complete")
+
+              currentPlaybackSession?.let { playbackSession ->
+                MediaEventManager.saveEvent(playbackSession, syncResult)
+              }
            }
          }
        }
@@ -74,8 +88,19 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic
    }
  }

+  fun play(playbackSession:PlaybackSession) {
+    Log.d(tag, "play ${playbackSession.displayTitle}")
+    MediaEventManager.playEvent(playbackSession)
+
+    start(playbackSession)
+  }
+
  fun stop(shouldSync:Boolean? = true, cb: () -> Unit) {
-    if (!listeningTimerRunning) return
+    if (!listeningTimerRunning) {
+      reset()
+      return cb()
+    }
+
    listeningTimerTask?.cancel()
    listeningTimerTask = null
    listeningTimerRunning = false
@@ -83,11 +108,19 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic

    val currentTime = if (shouldSync == true) playerNotificationService.getCurrentTimeSeconds() else 0.0
    if (currentTime > 0) { // Current time should always be > 0 on stop
-      sync(true, currentTime) {
+      sync(true, currentTime) { syncResult ->
+        currentPlaybackSession?.let { playbackSession ->
+          MediaEventManager.stopEvent(playbackSession, syncResult)
+        }
+
        reset()
        cb()
      }
    } else {
+      currentPlaybackSession?.let { playbackSession ->
+        MediaEventManager.stopEvent(playbackSession, null)
+      }
+
      reset()
      cb()
    }
@@ -95,6 +128,7 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic

  fun pause(cb: () -> Unit) {
    if (!listeningTimerRunning) return
+
    listeningTimerTask?.cancel()
    listeningTimerTask = null
    listeningTimerRunning = false
@@ -103,39 +137,80 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic

    val currentTime = playerNotificationService.getCurrentTimeSeconds()
    if (currentTime > 0) { // Current time should always be > 0 on pause
-      sync(true, currentTime) {
+      sync(true, currentTime) { syncResult ->
        lastSyncTime = 0L
        Log.d(tag, "pause: Set last sync time 0 $lastSyncTime")
        failedSyncs = 0
+
+        currentPlaybackSession?.let { playbackSession ->
+          MediaEventManager.pauseEvent(playbackSession, syncResult)
+        }
+
        cb()
      }
    } else {
      lastSyncTime = 0L
      Log.d(tag, "pause: Set last sync time 0 $lastSyncTime (current time < 0)")
      failedSyncs = 0
+
+      currentPlaybackSession?.let { playbackSession ->
+        MediaEventManager.pauseEvent(playbackSession, null)
+      }
+
      cb()
    }
+  }

+  fun finished(cb: () -> Unit) {
+    if (!listeningTimerRunning) return
+
+    listeningTimerTask?.cancel()
+    listeningTimerTask = null
+    listeningTimerRunning = false
+    Log.d(tag, "finished: Stopping listening for $currentDisplayTitle")
+
+    sync(true, currentPlaybackSession?.duration ?: 0.0) { syncResult ->
+      reset()
+
+      currentPlaybackSession?.let { playbackSession ->
+        MediaEventManager.finishedEvent(playbackSession, syncResult)
+      }
+
+      cb()
+    }
+  }
+
+  fun seek() {
+    currentPlaybackSession?.currentTime = playerNotificationService.getCurrentTimeSeconds()
+    Log.d(tag, "seek: $currentDisplayTitle, currentTime=${currentPlaybackSession?.currentTime}")
+
+    if (currentPlaybackSession == null) {
+      Log.e(tag, "seek: Playback session not set")
+      return
+    }
+
+    MediaEventManager.seekEvent(currentPlaybackSession!!, null)
  }

  fun syncFromServerProgress(mediaProgress: MediaProgress) {
    currentPlaybackSession?.let {
      it.updatedAt = mediaProgress.lastUpdate
      it.currentTime = mediaProgress.currentTime
-      DeviceManager.dbManager.saveLocalPlaybackSession(it)
+
+      MediaEventManager.syncEvent(mediaProgress, "Received from server get media progress request while playback session open")
      saveLocalProgress(it)
    }
  }

-  fun sync(shouldSyncServer:Boolean, currentTime:Double, cb: () -> Unit) {
+  fun sync(shouldSyncServer:Boolean, currentTime:Double, cb: (SyncResult?) -> Unit) {
    if (lastSyncTime <= 0) {
      Log.e(tag, "Last sync time is not set $lastSyncTime")
-      return
+      return cb(null)
    }

    val diffSinceLastSync = System.currentTimeMillis() - lastSyncTime
    if (diffSinceLastSync < 1000L) {
-      return cb()
+      return cb(null)
    }
    val listeningTimeToAdd = diffSinceLastSync / 1000L

@@ -145,61 +220,74 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic

    if (currentPlaybackSession?.progress?.isNaN() == true) {
      Log.e(tag, "Current Playback Session invalid progress ${currentPlaybackSession?.progress} | Current Time: ${currentPlaybackSession?.currentTime} | Duration: ${currentPlaybackSession?.getTotalDuration()}")
-      return cb()
+      return cb(null)
+    }
+
+    val hasNetworkConnection = DeviceManager.checkConnectivity(playerNotificationService)
+
+    // Save playback session to db (server linked sessions only)
+    //   Sessions are removed once successfully synced with the server
+    currentPlaybackSession?.let {
+      if (!it.isLocalLibraryItemOnly) {
+        DeviceManager.dbManager.savePlaybackSession(it)
+      }
    }

    if (currentIsLocal) {
      // Save local progress sync
      currentPlaybackSession?.let {
-        DeviceManager.dbManager.saveLocalPlaybackSession(it)
        saveLocalProgress(it)
        lastSyncTime = System.currentTimeMillis()

        // Local library item is linked to a server library item
        // Send sync to server also if connected to this server and local item belongs to this server
-        if (shouldSyncServer && !it.libraryItemId.isNullOrEmpty() && it.serverConnectionConfigId != null && DeviceManager.serverConnectionConfig?.id == it.serverConnectionConfigId) {
-          apiHandler.sendLocalProgressSync(it) { syncSuccess ->
+        if (hasNetworkConnection && shouldSyncServer && !it.libraryItemId.isNullOrEmpty() && it.serverConnectionConfigId != null && DeviceManager.serverConnectionConfig?.id == it.serverConnectionConfigId) {
+          apiHandler.sendLocalProgressSync(it) { syncSuccess, errorMsg ->
            Log.d(
              tag,
              "Local progress sync data sent to server $currentDisplayTitle for time $currentTime"
            )
+
            if (syncSuccess) {
              failedSyncs = 0
              playerNotificationService.alertSyncSuccess()
+              DeviceManager.dbManager.removePlaybackSession(it.id) // Remove session from db
            } else {
              failedSyncs++
              if (failedSyncs == 2) {
                playerNotificationService.alertSyncFailing() // Show alert in client
                failedSyncs = 0
              }
-              Log.e(tag, "Local Progress sync failed ($failedSyncs) to send to server $currentDisplayTitle for time $currentTime")
+              Log.e(tag, "Local Progress sync failed ($failedSyncs) to send to server $currentDisplayTitle for time $currentTime with session id=${it.id}")
            }

-            cb()
+            cb(SyncResult(true, syncSuccess, errorMsg))
          }
        } else {
-          cb()
+          cb(SyncResult(false, null, null))
        }
      }
-    } else if (shouldSyncServer) {
-      apiHandler.sendProgressSync(currentSessionId, syncData) {
-        if (it) {
+    } else if (hasNetworkConnection && shouldSyncServer) {
+      Log.d(tag, "sync: currentSessionId=$currentSessionId")
+      apiHandler.sendProgressSync(currentSessionId, syncData) { syncSuccess, errorMsg ->
+        if (syncSuccess) {
          Log.d(tag, "Progress sync data sent to server $currentDisplayTitle for time $currentTime")
          failedSyncs = 0
          playerNotificationService.alertSyncSuccess()
          lastSyncTime = System.currentTimeMillis()
+          DeviceManager.dbManager.removePlaybackSession(currentSessionId) // Remove session from db
        } else {
          failedSyncs++
          if (failedSyncs == 2) {
            playerNotificationService.alertSyncFailing() // Show alert in client
            failedSyncs = 0
          }
-          Log.e(tag, "Progress sync failed ($failedSyncs) to send to server $currentDisplayTitle for time $currentTime")
+          Log.e(tag, "Progress sync failed ($failedSyncs) to send to server $currentDisplayTitle for time $currentTime with session id=${currentSessionId}")
        }
-        cb()
+        cb(SyncResult(true, syncSuccess, errorMsg))
      }
    } else {
-      cb()
+      cb(SyncResult(false, null, null))
    }
  }

@@ -210,22 +298,24 @@ class MediaProgressSyncer(val playerNotificationService:PlayerNotificationServic
        currentLocalMediaProgress = playbackSession.getNewLocalMediaProgress()
      } else {
        currentLocalMediaProgress = mediaProgress
+        currentLocalMediaProgress?.updateFromPlaybackSession(playbackSession)
      }
    } else {
      currentLocalMediaProgress?.updateFromPlaybackSession(playbackSession)
    }
+
    currentLocalMediaProgress?.let {
      if (it.progress.isNaN()) {
        Log.e(tag, "Invalid progress on local media progress")
      } else {
        DeviceManager.dbManager.saveLocalMediaProgress(it)
        playerNotificationService.clientEventEmitter?.onLocalMediaProgressUpdate(it)
-
        Log.d(tag, "Saved Local Progress Current Time: ID ${it.id} | ${it.currentTime} | Duration ${it.duration} | Progress ${it.progressPercent}%")
      }
    }
  }

+
  fun reset() {
    currentPlaybackSession = null
    currentLocalMediaProgress = null
@@ -0,0 +1,41 @@
+package com.audiobookshelf.app.models
+
+import com.audiobookshelf.app.data.LocalFolder
+import com.audiobookshelf.app.data.MediaProgress
+import com.audiobookshelf.app.data.MediaType
+import com.fasterxml.jackson.annotation.JsonIgnore
+
+data class DownloadItem(
+  val id: String,
+  val libraryItemId:String,
+  val episodeId:String?,
+  val userMediaProgress: MediaProgress?,
+  val serverConnectionConfigId:String,
+  val serverAddress:String,
+  val serverUserId:String,
+  val mediaType: String,
+  val itemFolderPath:String,
+  val localFolder: LocalFolder,
+  val itemTitle: String,
+  val itemSubfolder: String,
+  val media: MediaType,
+  val downloadItemParts: MutableList<DownloadItemPart>
+) {
+  @get:JsonIgnore
+  val isDownloadFinished get() = !downloadItemParts.any { !it.completed || it.isMoving }
+
+  @JsonIgnore
+  fun getNextDownloadItemParts(limit:Int): MutableList<DownloadItemPart> {
+    val itemParts = mutableListOf<DownloadItemPart>()
+    if (limit == 0) return itemParts
+
+    for (it in downloadItemParts) {
+      if (!it.completed && it.downloadId == null) {
+        itemParts.add(it)
+        if (itemParts.size >= limit) break
+      }
+    }
+
+    return itemParts
+  }
+}
@@ -0,0 +1,82 @@
+package com.audiobookshelf.app.models
+
+import android.app.DownloadManager
+import android.net.Uri
+import android.util.Log
+import com.audiobookshelf.app.data.AudioTrack
+import com.audiobookshelf.app.data.LocalFolder
+import com.audiobookshelf.app.data.PodcastEpisode
+import com.audiobookshelf.app.device.DeviceManager
+import com.fasterxml.jackson.annotation.JsonIgnore
+import java.io.File
+
+data class DownloadItemPart(
+  val id: String,
+  val downloadItemId: String,
+  val filename: String,
+  val fileSize: Long,
+  val finalDestinationPath:String,
+  val serverPath: String,
+  val localFolderName: String,
+  val localFolderUrl: String,
+  val localFolderId: String,
+  val audioTrack: AudioTrack?,
+  val episode: PodcastEpisode?,
+  var completed:Boolean,
+  var moved:Boolean,
+  var isMoving:Boolean,
+  var failed:Boolean,
+  @JsonIgnore val uri: Uri,
+  @JsonIgnore val destinationUri: Uri,
+  @JsonIgnore val finalDestinationUri: Uri,
+  val finalDestinationSubfolder: String,
+  var downloadId: Long?,
+  var progress: Long,
+  var bytesDownloaded: Long
+) {
+  companion object {
+    fun make(downloadItemId:String, filename:String, fileSize: Long, destinationFile: File, finalDestinationFile: File, subfolder:String, serverPath:String, localFolder: LocalFolder, audioTrack: AudioTrack?, episode: PodcastEpisode?) :DownloadItemPart {
+      val destinationUri = Uri.fromFile(destinationFile)
+      val finalDestinationUri = Uri.fromFile(finalDestinationFile)
+
+      var downloadUrl = "${DeviceManager.serverAddress}${serverPath}?token=${DeviceManager.token}"
+      if (serverPath.endsWith("/cover")) downloadUrl += "&format=jpeg" // For cover images force to jpeg
+      val downloadUri = Uri.parse(downloadUrl)
+      Log.d("DownloadItemPart", "Audio File Destination Uri: $destinationUri | Final Destination Uri: $finalDestinationUri | Download URI $downloadUri")
+      return DownloadItemPart(
+        id = DeviceManager.getBase64Id(finalDestinationFile.absolutePath),
+        downloadItemId,
+        filename = filename,
+        fileSize = fileSize,
+        finalDestinationPath = finalDestinationFile.absolutePath,
+        serverPath = serverPath,
+        localFolderName = localFolder.name,
+        localFolderUrl = localFolder.contentUrl,
+        localFolderId = localFolder.id,
+        audioTrack = audioTrack,
+        episode = episode,
+        completed = false,
+        moved = false,
+        isMoving = false,
+        failed = false,
+        uri = downloadUri,
+        destinationUri = destinationUri,
+        finalDestinationUri = finalDestinationUri,
+        finalDestinationSubfolder = subfolder,
+        downloadId = null,
+        progress = 0,
+        bytesDownloaded = 0
+      )
+    }
+  }
+
+  @JsonIgnore
+  fun getDownloadRequest(): DownloadManager.Request {
+    val dlRequest = DownloadManager.Request(uri)
+    dlRequest.setTitle(filename)
+    dlRequest.setDescription("Downloading to $localFolderName with filename $filename")
+    dlRequest.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE)
+    dlRequest.setDestinationUri(destinationUri)
+    return dlRequest
+  }
+}
@@ -0,0 +1,11 @@
+package com.audiobookshelf.app.models
+
+import com.audiobookshelf.app.data.MediaProgress
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class User(
+  val id:String,
+  val username: String,
+  val mediaProgress:List<MediaProgress>
+)
@@ -2,24 +2,25 @@ package com.audiobookshelf.app.player

 import android.app.PendingIntent
 import android.graphics.Bitmap
+import android.graphics.ImageDecoder
 import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
 import android.support.v4.media.session.MediaControllerCompat
 import android.util.Log
 import com.audiobookshelf.app.R
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ui.PlayerNotificationManager
 import kotlinx.coroutines.*

 const val NOTIFICATION_LARGE_ICON_SIZE = 144 // px

-class AbMediaDescriptionAdapter constructor(private val controller: MediaControllerCompat, val playerNotificationService: PlayerNotificationService) : PlayerNotificationManager.MediaDescriptionAdapter {
+class AbMediaDescriptionAdapter constructor(private val controller: MediaControllerCompat, private val playerNotificationService: PlayerNotificationService) : PlayerNotificationManager.MediaDescriptionAdapter {
  private val tag = "MediaDescriptionAdapter"

-  var currentIconUri: Uri? = null
-  var currentBitmap: Bitmap? = null
+  private var currentIconUri: Uri? = null
+  private var currentBitmap: Bitmap? = null

  private val serviceJob = SupervisorJob()
  private val serviceScope = CoroutineScope(Dispatchers.Main + serviceJob)
@@ -42,13 +43,26 @@ class AbMediaDescriptionAdapter constructor(private val controller: MediaControl
      // `getCurrentLargeIcon` don't cause the bitmap to be recreated.
      currentIconUri = albumArtUri
      Log.d(tag, "ART $currentIconUri")
-      serviceScope.launch {
-        currentBitmap = albumArtUri?.let {
-          resolveUriAsBitmap(it)
+
+      if (currentIconUri.toString().startsWith("content://")) {
+        currentBitmap = if (Build.VERSION.SDK_INT < 28) {
+          @Suppress("DEPRECATION")
+          MediaStore.Images.Media.getBitmap(playerNotificationService.contentResolver, currentIconUri)
+        } else {
+          val source: ImageDecoder.Source = ImageDecoder.createSource(playerNotificationService.contentResolver, currentIconUri!!)
+          ImageDecoder.decodeBitmap(source)
        }
-        currentBitmap?.let { callback.onBitmap(it) }
+        currentBitmap
+      } else {
+        serviceScope.launch {
+          currentBitmap = albumArtUri?.let {
+            resolveUriAsBitmap(it)
+          }
+          currentBitmap?.let { callback.onBitmap(it) }
+        }
+        null
      }
-      null
+
    } else {
      currentBitmap
    }
@@ -17,11 +17,10 @@ class BrowseTree(

  /**
   * get uri to drawable or any other resource type if u wish
-   * @param context - context
   * @param drawableId - drawable res id
   * @return - uri
   */
-  fun getUriToDrawable(@AnyRes drawableId: Int): Uri {
+  private fun getUriToDrawable(@AnyRes drawableId: Int): Uri {
    return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE
      + "://" + context.resources.getResourcePackageName(drawableId)
      + '/' + context.resources.getResourceTypeName(drawableId)
@@ -49,7 +48,7 @@ class BrowseTree(
      putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, getUriToDrawable(R.drawable.icon_library_folder).toString())
    }.build()

-    if (!itemsInProgress.isEmpty()) {
+    if (itemsInProgress.isNotEmpty()) {
      rootList += continueListeningMetadata
    }

@@ -2,15 +2,13 @@ package com.audiobookshelf.app.player

 import android.annotation.SuppressLint
 import android.content.Intent
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.os.Message
+import android.os.*
 import android.support.v4.media.session.MediaSessionCompat
 import android.util.Log
 import android.view.KeyEvent
 import com.audiobookshelf.app.data.LibraryItemWrapper
 import com.audiobookshelf.app.data.PodcastEpisode
+import com.audiobookshelf.app.device.DeviceManager
 import java.util.*
 import kotlin.concurrent.schedule

@@ -18,7 +16,7 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
  var tag = "MediaSessionCallback"

  private var mediaButtonClickCount: Int = 0
-  var mediaButtonClickTimeout: Long = 1000  //ms
+  private var mediaButtonClickTimeout: Long = 1000  //ms

  override fun onPrepare() {
    Log.d(tag, "ON PREPARE MEDIA SESSION COMPAT")
@@ -28,7 +26,7 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
          Log.e(tag, "Failed to play library item")
        } else {
          val playbackRate = playerNotificationService.mediaManager.getSavedPlaybackRate()
-          Handler(Looper.getMainLooper()).post() {
+          Handler(Looper.getMainLooper()).post {
            playerNotificationService.preparePlayer(it,true, playbackRate)
          }
        }
@@ -54,7 +52,7 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
           Log.e(tag, "Failed to play library item")
        } else {
          val playbackRate = playerNotificationService.mediaManager.getSavedPlaybackRate()
-          Handler(Looper.getMainLooper()).post() {
+          Handler(Looper.getMainLooper()).post {
            playerNotificationService.preparePlayer(it, true, playbackRate)
          }
        }
@@ -91,9 +89,28 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
    playerNotificationService.seekPlayer(pos)
  }

+  private fun onChangeSpeed() {
+    // cycle to next speed, only contains preset android app options, as each increment needs it's own icon
+    // Rounding values in the event a non preset value (.5, 1, 1.2, 1.5, 2, 3) is selected in the phone app
+    val mediaManager = playerNotificationService.mediaManager
+    val newSpeed = when (mediaManager.getSavedPlaybackRate()) {
+      in 0.5f..0.7f -> 1.0f
+      in 0.8f..1.0f -> 1.2f
+      in 1.1f..1.2f -> 1.5f
+      in 1.3f..1.5f -> 2.0f
+      in 1.6f..2.0f -> 3.0f
+      in 2.1f..3.0f -> 0.5f
+      // anything set above 3 (can happen in the android app) will be reset to 1
+      else -> 1.0f
+    }
+    mediaManager.setSavedPlaybackRate(newSpeed)
+    playerNotificationService.setPlaybackSpeed(newSpeed)
+    playerNotificationService.clientEventEmitter?.onPlaybackSpeedChanged(newSpeed)
+  }
+
  override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) {
    Log.d(tag, "ON PLAY FROM MEDIA ID $mediaId")
-    var libraryItemWrapper: LibraryItemWrapper? = null
+    val libraryItemWrapper: LibraryItemWrapper?
    var podcastEpisode: PodcastEpisode? = null

    if (mediaId.isNullOrEmpty()) {
@@ -116,7 +133,7 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
         Log.e(tag, "Failed to play library item")
        } else {
          val playbackRate = playerNotificationService.mediaManager.getSavedPlaybackRate()
-          Handler(Looper.getMainLooper()).post() {
+          Handler(Looper.getMainLooper()).post {
            playerNotificationService.preparePlayer(it, true, playbackRate)
          }
        }
@@ -128,22 +145,49 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
    return handleCallMediaButton(mediaButtonEvent)
  }

-  fun handleCallMediaButton(intent: Intent): Boolean {
+  private fun handleCallMediaButton(intent: Intent): Boolean {
    Log.w(tag, "handleCallMediaButton $intent | ${intent.action}")

    if(Intent.ACTION_MEDIA_BUTTON == intent.action) {
-      val keyEvent = intent.getParcelableExtra<KeyEvent>(Intent.EXTRA_KEY_EVENT)
+      val keyEvent = if (Build.VERSION.SDK_INT >= 33) {
+        intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT, KeyEvent::class.java)
+      } else {
+        @Suppress("DEPRECATION")
+        intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT)
+      }
+
      Log.d(tag, "handleCallMediaButton keyEvent = $keyEvent | action ${keyEvent?.action}")

+      // Widget button intent is only sending the action down event
      if (keyEvent?.action == KeyEvent.ACTION_DOWN) {
        Log.d(tag, "handleCallMediaButton: key action_down for ${keyEvent.keyCode}")
        when (keyEvent.keyCode) {
          KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> {
            Log.d(tag, "handleCallMediaButton: Media Play/Pause")
+
+            // TODO: Play/pause event sent from widget when app is closed. Currently the service gets destroyed before anything can happen
+//            if (playerNotificationService.currentPlaybackSession == null && DeviceManager.deviceData.lastPlaybackSession != null) {
+//              Log.i(tag, "No playback session but had one in the db")
+//
+//              val connectionConfig = DeviceManager.deviceData.serverConnectionConfigs.find { it.id == DeviceManager.deviceData.lastPlaybackSession?.serverConnectionConfigId }
+//              connectionConfig?.let {
+//                Log.i(tag, "Setting playback session from db $it")
+//                DeviceManager.serverConnectionConfig = it
+//
+//                playerNotificationService.currentPlaybackSession = DeviceManager.deviceData.lastPlaybackSession
+//                playerNotificationService.startNewPlaybackSession()
+//                return true
+//              }
+//            }
+
            if (playerNotificationService.mPlayer.isPlaying) {
-              playerNotificationService.pause()
+              if (0 == mediaButtonClickCount) playerNotificationService.pause()
+              handleMediaButtonClickCount()
            } else {
-              playerNotificationService.play()
+              if (0 == mediaButtonClickCount) {
+                playerNotificationService.play()
+              }
+              handleMediaButtonClickCount()
            }
          }
        }
@@ -166,7 +210,6 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
            Log.d(tag, "handleCallMediaButton: Media Play")
            if (0 == mediaButtonClickCount) {
              playerNotificationService.play()
-              playerNotificationService.sleepTimerManager.checkShouldExtendSleepTimer()
            }
            handleMediaButtonClickCount()
          }
@@ -181,22 +224,15 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
          KeyEvent.KEYCODE_MEDIA_PREVIOUS -> {
            playerNotificationService.jumpBackward()
          }
+          KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
+            playerNotificationService.jumpForward()
+          }
+          KeyEvent.KEYCODE_MEDIA_REWIND -> {
+            playerNotificationService.jumpBackward()
+          }
          KeyEvent.KEYCODE_MEDIA_STOP -> {
            playerNotificationService.closePlayback()
          }
-          KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> {
-            Log.d(tag, "handleCallMediaButton: Media Play/Pause")
-            if (playerNotificationService.mPlayer.isPlaying) {
-              if (0 == mediaButtonClickCount) playerNotificationService.pause()
-              handleMediaButtonClickCount()
-            } else {
-              if (0 == mediaButtonClickCount) {
-                playerNotificationService.play()
-                playerNotificationService.sleepTimerManager.checkShouldExtendSleepTimer()
-              }
-              handleMediaButtonClickCount()
-            }
-          }
          else -> {
            Log.d(tag, "KeyCode:${keyEvent.keyCode}")
            return false
@@ -239,6 +275,9 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
    when (action) {
      CUSTOM_ACTION_JUMP_FORWARD -> onFastForward()
      CUSTOM_ACTION_JUMP_BACKWARD -> onRewind()
+      CUSTOM_ACTION_SKIP_FORWARD -> onSkipToNext()
+      CUSTOM_ACTION_SKIP_BACKWARD -> onSkipToPrevious()
+      CUSTOM_ACTION_CHANGE_SPEED -> onChangeSpeed()
    }
  }
 }
@@ -35,7 +35,7 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat
          Log.e(tag, "Failed to play library item")
        } else {
          val playbackRate = playerNotificationService.mediaManager.getSavedPlaybackRate()
-          Handler(Looper.getMainLooper()).post() {
+          Handler(Looper.getMainLooper()).post {
            playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
          }
        }
@@ -46,7 +46,7 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat
  override fun onPrepareFromMediaId(mediaId: String, playWhenReady: Boolean, extras: Bundle?) {
    Log.d(tag, "ON PREPARE FROM MEDIA ID $mediaId $playWhenReady")

-    var libraryItemWrapper: LibraryItemWrapper? = null
+    val libraryItemWrapper: LibraryItemWrapper?
    var podcastEpisode: PodcastEpisode? = null

    if (mediaId.startsWith("ep_") || mediaId.startsWith("local_ep_")) { // Playing podcast episode
@@ -63,7 +63,7 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat
         Log.e(tag, "Failed to play library item")
        } else {
          val playbackRate = playerNotificationService.mediaManager.getSavedPlaybackRate()
-          Handler(Looper.getMainLooper()).post() {
+          Handler(Looper.getMainLooper()).post {
            playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
          }
        }
@@ -79,7 +79,7 @@ class MediaSessionPlaybackPreparer(var playerNotificationService:PlayerNotificat
         Log.e(tag, "Failed to play library item")
        } else {
          val playbackRate = playerNotificationService.mediaManager.getSavedPlaybackRate()
-          Handler(Looper.getMainLooper()).post() {
+          Handler(Looper.getMainLooper()).post {
            playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
          }
        }
@@ -2,3 +2,20 @@ package com.audiobookshelf.app.player

 const val CUSTOM_ACTION_JUMP_FORWARD = "com.audiobookshelf.customAction.jump_forward";
 const val CUSTOM_ACTION_JUMP_BACKWARD = "com.audiobookshelf.customAction.jump_backward";
+const val CUSTOM_ACTION_SKIP_FORWARD = "com.audiobookshelf.customAction.skip_forward";
+const val CUSTOM_ACTION_SKIP_BACKWARD = "com.audiobookshelf.customAction.skip_backward";
+const val CUSTOM_ACTION_CHANGE_SPEED = "com.audiobookshelf.customAction.change_speed";
+
+const val PLAYMETHOD_DIRECTPLAY = 0
+const val PLAYMETHOD_DIRECTSTREAM = 1
+const val PLAYMETHOD_TRANSCODE = 2
+const val PLAYMETHOD_LOCAL = 3
+
+//
+// MEDIA BROWSER STUFF (ANDROID AUTO)
+//
+const val ANDROID_AUTO_PKG_NAME = "com.google.android.projection.gearhead"
+const val ANDROID_AUTO_SIMULATOR_PKG_NAME = "com.google.android.autosimulator"
+const val ANDROID_WEARABLE_PKG_NAME = "com.google.android.wearable.app"
+const val ANDROID_GSEARCH_PKG_NAME = "com.google.android.googlequicksearchbox"
+const val ANDROID_AUTOMOTIVE_PKG_NAME = "com.google.android.carassistant"
@@ -1,6 +1,7 @@
 package com.audiobookshelf.app.player

 import android.util.Log
+import com.audiobookshelf.app.data.PlaybackSession
 import com.audiobookshelf.app.data.PlayerState
 import com.audiobookshelf.app.device.DeviceManager
 import com.google.android.exoplayer2.PlaybackException
@@ -13,16 +14,101 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :

  companion object {
    var lastPauseTime: Long = 0   //ms
+    var lazyIsPlaying: Boolean = false
  }

-  private var onSeekBack: Boolean = false
-
  override fun onPlayerError(error: PlaybackException) {
    val errorMessage = error.message ?: "Unknown Error"
    Log.e(tag, "onPlayerError $errorMessage")
    playerNotificationService.handlePlayerPlaybackError(errorMessage) // If was direct playing session, fallback to transcode
  }

+  override fun onPositionDiscontinuity(
+    oldPosition: Player.PositionInfo,
+    newPosition: Player.PositionInfo,
+    reason: Int
+  ) {
+    if (reason == Player.DISCONTINUITY_REASON_SEEK) {
+      // If playing set seeking flag
+      Log.d(tag, "onPositionDiscontinuity: oldPosition=${oldPosition.positionMs}/${oldPosition.mediaItemIndex}, newPosition=${newPosition.positionMs}/${newPosition.mediaItemIndex}, isPlaying=${playerNotificationService.currentPlayer.isPlaying} reason=SEEK")
+      playerNotificationService.mediaProgressSyncer.seek()
+      lastPauseTime = 0 // When seeking while paused reset the auto-rewind
+    } else {
+      Log.d(tag, "onPositionDiscontinuity: oldPosition=${oldPosition.positionMs}/${oldPosition.mediaItemIndex}, newPosition=${newPosition.positionMs}/${newPosition.mediaItemIndex}, isPlaying=${playerNotificationService.currentPlayer.isPlaying}, reason=$reason")
+    }
+  }
+
+  override fun onIsPlayingChanged(isPlaying: Boolean) {
+    Log.d(tag, "onIsPlayingChanged to $isPlaying | ${playerNotificationService.getMediaPlayer()} | playbackState=${playerNotificationService.currentPlayer.playbackState}")
+
+    val player = playerNotificationService.currentPlayer
+
+    // Goal of these 2 if statements and the lazyIsPlaying is to ignore this event when it is triggered by a seek
+    //  When a seek occurs the player is paused and buffering, then plays again right afterwards.
+    if (!isPlaying && player.playbackState == Player.STATE_BUFFERING) {
+      Log.d(tag, "onIsPlayingChanged: Pause event when buffering is ignored")
+      return
+    }
+    if (lazyIsPlaying == isPlaying) {
+      Log.d(tag, "onIsPlayingChanged: Lazy is playing $lazyIsPlaying is already set to this so ignoring")
+      return
+    }
+
+    lazyIsPlaying = isPlaying
+
+    if (isPlaying) {
+      Log.d(tag, "SeekBackTime: Player is playing")
+      if (lastPauseTime > 0 && DeviceManager.deviceData.deviceSettings?.disableAutoRewind != true) {
+        Log.d(tag, "SeekBackTime: playing started now set seek back time $lastPauseTime")
+        var seekBackTime = calcPauseSeekBackTime()
+        if (seekBackTime > 0) {
+          // 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 - seekBackTime
+          if (newTime < minSeekBackTime) {
+            seekBackTime = currentTime - minSeekBackTime
+          }
+          Log.d(tag, "SeekBackTime $seekBackTime")
+        }
+
+        // Check if playback session still exists or sync media progress if updated
+        val pauseLength: Long = System.currentTimeMillis() - lastPauseTime
+        if (pauseLength > PAUSE_LEN_BEFORE_RECHECK) {
+          val shouldCarryOn = playerNotificationService.checkCurrentSessionProgress(seekBackTime)
+          if (!shouldCarryOn) return
+        }
+
+        if (seekBackTime > 0L) {
+          playerNotificationService.seekBackward(seekBackTime)
+        }
+      }
+    } else {
+      Log.d(tag, "SeekBackTime: Player not playing set last pause time | playbackState=${player.playbackState}")
+      lastPauseTime = System.currentTimeMillis()
+    }
+
+    // Start/stop progress sync interval
+    if (isPlaying) {
+      // Handles auto-starting sleep timer and resetting sleep timer
+      playerNotificationService.sleepTimerManager.handleMediaPlayEvent()
+
+      player.volume = 1F // Volume on sleep timer might have decreased this
+      val playbackSession: PlaybackSession? = playerNotificationService.mediaProgressSyncer.currentPlaybackSession ?: playerNotificationService.currentPlaybackSession
+      playbackSession?.let { playerNotificationService.mediaProgressSyncer.play(it) }
+    } else {
+      playerNotificationService.mediaProgressSyncer.pause {
+        Log.d(tag, "Media Progress Syncer paused and synced")
+      }
+    }
+
+    playerNotificationService.clientEventEmitter?.onPlayingUpdate(isPlaying)
+
+    DeviceManager.widgetUpdater?.onPlayerChanged(playerNotificationService)
+  }
+
  override fun onEvents(player: Player, events: Player.Events) {
    Log.d(tag, "onEvents ${playerNotificationService.getMediaPlayer()} | ${events.size()}")

@@ -41,7 +127,7 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
        Log.d(tag, "STATE_READY : " + playerNotificationService.currentPlayer.duration)

        if (lastPauseTime == 0L) {
-          lastPauseTime = -1;
+          lastPauseTime = -1
        }
        playerNotificationService.sendClientMetadata(PlayerState.READY)
      }
@@ -52,6 +138,8 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
      if (playerNotificationService.currentPlayer.playbackState == Player.STATE_ENDED) {
        Log.d(tag, "STATE_ENDED")
        playerNotificationService.sendClientMetadata(PlayerState.ENDED)
+
+        playerNotificationService.handlePlaybackEnded()
      }
      if (playerNotificationService.currentPlayer.playbackState == Player.STATE_IDLE) {
        Log.d(tag, "STATE_IDLE")
@@ -65,62 +153,6 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
    if (events.contains(Player.EVENT_PLAYLIST_METADATA_CHANGED)) {
      Log.d(tag, "EVENT_PLAYLIST_METADATA_CHANGED ${playerNotificationService.getMediaPlayer()}")
    }
-    if (events.contains(Player.EVENT_IS_PLAYING_CHANGED)) {
-      Log.d(tag, "EVENT IS PLAYING CHANGED ${playerNotificationService.getMediaPlayer()}")
-
-      if (player.isPlaying) {
-        Log.d(tag, "SeekBackTime: Player is playing")
-        if (lastPauseTime > 0 && DeviceManager.deviceData.deviceSettings?.disableAutoRewind != true) {
-          var seekBackTime = 0L
-          if (onSeekBack) onSeekBack = false
-          else {
-            Log.d(tag, "SeekBackTime: playing started now set seek back time $lastPauseTime")
-            seekBackTime = calcPauseSeekBackTime()
-            if (seekBackTime > 0) {
-              // 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 - seekBackTime
-              if (newTime < minSeekBackTime) {
-                seekBackTime = currentTime - minSeekBackTime
-              }
-              Log.d(tag, "SeekBackTime $seekBackTime")
-              onSeekBack = true
-            }
-          }
-
-          // Check if playback session still exists or sync media progress if updated
-          val pauseLength: Long = System.currentTimeMillis() - lastPauseTime
-          if (pauseLength > PAUSE_LEN_BEFORE_RECHECK) {
-            val shouldCarryOn = playerNotificationService.checkCurrentSessionProgress(seekBackTime)
-            if (!shouldCarryOn) return
-          }
-
-          if (seekBackTime > 0L) {
-            playerNotificationService.seekBackward(seekBackTime)
-          }
-        }
-      } else {
-        Log.d(tag, "SeekBackTime: Player not playing set last pause time")
-        lastPauseTime = System.currentTimeMillis()
-      }
-
-      // Start/stop progress sync interval
-      if (player.isPlaying) {
-        player.volume = 1F // Volume on sleep timer might have decreased this
-        playerNotificationService.mediaProgressSyncer.start()
-      } else {
-        playerNotificationService.mediaProgressSyncer.pause {
-          Log.d(tag, "Media Progress Syncer paused and synced")
-        }
-      }
-
-      playerNotificationService.clientEventEmitter?.onPlayingUpdate(player.isPlaying)
-
-      DeviceManager.widgetUpdater?.onPlayerChanged(playerNotificationService)
-    }
  }

  private fun calcPauseSeekBackTime() : Long {
@@ -1,21 +1,37 @@
 package com.audiobookshelf.app.player

 import android.app.Notification
+import android.content.pm.ServiceInfo
+import android.os.Build
 import android.util.Log
 import com.google.android.exoplayer2.ui.PlayerNotificationManager

 class PlayerNotificationListener(var playerNotificationService:PlayerNotificationService) : PlayerNotificationManager.NotificationListener {
  var tag = "PlayerNotificationListener"

+  companion object {
+    var isForegroundService = false
+  }
+
  override fun onNotificationPosted(
    notificationId: Int,
    notification: Notification,
    onGoing: Boolean) {

-    // Start foreground service
-    Log.d(tag, "Notification Posted $notificationId - Start Foreground | $notification")
-    PlayerNotificationService.isClosed = false
-    playerNotificationService.startForeground(notificationId, notification)
+    if (onGoing && !isForegroundService) {
+      // Start foreground service
+      Log.d(tag, "Notification Posted $notificationId - Start Foreground | $notification")
+      PlayerNotificationService.isClosed = false
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        playerNotificationService.startForeground(notificationId, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
+      } else {
+        playerNotificationService.startForeground(notificationId, notification)
+      }
+      isForegroundService = true
+    } else {
+      Log.d(tag, "Notification posted $notificationId, not starting foreground - onGoing=$onGoing | isForegroundService=$isForegroundService")
+    }
  }

  override fun onNotificationCancelled(
@@ -39,5 +55,6 @@ class PlayerNotificationListener(var playerNotificationService:PlayerNotificatio
        PlayerNotificationService.isSwitchingPlayer = false
      }
    }
+    isForegroundService = false
  }
 }
@@ -3,7 +3,9 @@ package com.audiobookshelf.app.player
 import android.app.*
 import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
 import android.graphics.Color
+import android.graphics.ImageDecoder
 import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.net.ConnectivityManager
@@ -11,8 +13,10 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import android.os.*
+import android.provider.MediaStore
 import android.support.v4.media.MediaBrowserCompat
 import android.support.v4.media.MediaDescriptionCompat
+import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaControllerCompat
 import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
@@ -27,9 +31,11 @@ import com.audiobookshelf.app.R
 import com.audiobookshelf.app.data.*
 import com.audiobookshelf.app.data.DeviceInfo
 import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.managers.DbManager
+import com.audiobookshelf.app.managers.SleepTimerManager
 import com.audiobookshelf.app.media.MediaManager
+import com.audiobookshelf.app.media.MediaProgressSyncer
 import com.audiobookshelf.app.server.ApiHandler
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.google.android.exoplayer2.*
 import com.google.android.exoplayer2.audio.AudioAttributes
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
@@ -45,6 +51,8 @@ import kotlin.concurrent.schedule


 const val SLEEP_TIMER_WAKE_UP_EXPIRATION = 120000L // 2m
+const val PLAYER_CAST = "cast-player"
+const val PLAYER_EXO = "exo-player"

 class PlayerNotificationService : MediaBrowserServiceCompat()  {

@@ -52,25 +60,28 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    var isStarted = false
    var isClosed = false
    var isUnmeteredNetwork = false
+    var hasNetworkConnectivity = false // Not 100% reliable has internet
    var isSwitchingPlayer = false // Used when switching between cast player and exoplayer
  }

+  private val tag = "PlayerNotificationService"
+
  interface ClientEventEmitter {
    fun onPlaybackSession(playbackSession:PlaybackSession)
    fun onPlaybackClosed()
    fun onPlayingUpdate(isPlaying: Boolean)
    fun onMetadata(metadata: PlaybackMetadata)
    fun onSleepTimerEnded(currentPosition: Long)
-    fun onSleepTimerSet(sleepTimeRemaining: Int)
+    fun onSleepTimerSet(sleepTimeRemaining: Int, isAutoSleepTimer:Boolean)
    fun onLocalMediaProgressUpdate(localMediaProgress: LocalMediaProgress)
    fun onPlaybackFailed(errorMessage:String)
    fun onMediaPlayerChanged(mediaPlayer:String)
    fun onProgressSyncFailing()
    fun onProgressSyncSuccess()
    fun onNetworkMeteredChanged(isUnmetered:Boolean)
+    fun onMediaItemHistoryUpdated(mediaItemHistory:MediaItemHistory)
+    fun onPlaybackSpeedChanged(playbackSpeed:Float)
  }
-
-  private val tag = "PlayerService"
  private val binder = LocalBinder()

  var clientEventEmitter:ClientEventEmitter? = null
@@ -89,13 +100,13 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  var castPlayer:CastPlayer? = null

  lateinit var sleepTimerManager:SleepTimerManager
-  lateinit var mediaProgressSyncer:MediaProgressSyncer
+  lateinit var mediaProgressSyncer: MediaProgressSyncer

  private var notificationId = 10
  private var channelId = "audiobookshelf_channel"
  private var channelName = "Audiobookshelf Channel"

-  private var currentPlaybackSession:PlaybackSession? = null
+  var currentPlaybackSession:PlaybackSession? = null
  private var initialPlaybackRate:Float? = null

  private var isAndroidAuto = false
@@ -133,6 +144,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    return START_STICKY
  }

+  @Deprecated("Deprecated in Java")
  override fun onStart(intent: Intent?, startId: Int) {
    Log.d(tag, "onStart $startId")
  }
@@ -163,7 +175,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    castPlayer?.release()
    mediaSession.release()
    mediaProgressSyncer.reset()
-    Log.d(tag, "onDestroy")
    isStarted = false

    super.onDestroy()
@@ -184,8 +195,8 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    // To listen for network change from metered to unmetered
    val networkRequest = NetworkRequest.Builder()
      .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-      .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-      .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+      .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+      .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
      .build()
    val connectivityManager = getSystemService(ConnectivityManager::class.java) as ConnectivityManager
    connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
@@ -221,7 +232,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      .apply {
        setSessionActivity(sessionActivityPendingIntent)
        isActive = true
-        setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS or MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS)
      }

    val mediaController = MediaControllerCompat(ctx, mediaSession.sessionToken)
@@ -248,6 +258,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    playerNotificationManager.setPriority(NotificationCompat.PRIORITY_MAX)
    playerNotificationManager.setUseFastForwardActionInCompactView(true)
    playerNotificationManager.setUseRewindActionInCompactView(true)
+    playerNotificationManager.setSmallIcon(R.drawable.exo_icon_localaudio)

    // Unknown action
    playerNotificationManager.setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE)
@@ -256,6 +267,10 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {

    mediaSessionConnector = MediaSessionConnector(mediaSession)
    val queueNavigator: TimelineQueueNavigator = object : TimelineQueueNavigator(mediaSession) {
+      override fun getSupportedQueueNavigatorActions(player: Player): Long {
+        return PlaybackStateCompat.ACTION_PLAY_PAUSE or PlaybackStateCompat.ACTION_PLAY or PlaybackStateCompat.ACTION_PAUSE
+      }
+
      override fun getMediaDescription(player: Player, windowIndex: Int): MediaDescriptionCompat {
        if (currentPlaybackSession == null) {
          Log.e(tag,"Playback session is not set - returning blank MediaDescriptionCompat")
@@ -264,6 +279,17 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {

        val coverUri = currentPlaybackSession!!.getCoverUri()

+        var bitmap:Bitmap? = null
+        // Local covers get bitmap
+        if (currentPlaybackSession!!.localLibraryItem?.coverContentUrl != null) {
+          bitmap = if (Build.VERSION.SDK_INT < 28) {
+            MediaStore.Images.Media.getBitmap(ctx.contentResolver, coverUri)
+          } else {
+            val source: ImageDecoder.Source = ImageDecoder.createSource(ctx.contentResolver, coverUri)
+            ImageDecoder.decodeBitmap(source)
+          }
+        }
+
        // Fix for local images crashing on Android 11 for specific devices
        // https://stackoverflow.com/questions/64186578/android-11-mediastyle-notification-crash/64232958#64232958
        try {
@@ -276,11 +302,19 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
          Log.e(tag, "Grant uri permission error $error")
        }

-        return MediaDescriptionCompat.Builder()
-          .setMediaId(currentPlaybackSession!!.id)
+        val extra = Bundle()
+        extra.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, currentPlaybackSession!!.displayAuthor)
+
+        val mediaDescriptionBuilder = MediaDescriptionCompat.Builder()
+          .setExtras(extra)
          .setTitle(currentPlaybackSession!!.displayTitle)
-          .setSubtitle(currentPlaybackSession!!.displayAuthor)
-          .setIconUri(coverUri).build()
+          .setIconUri(coverUri)
+
+        bitmap?.let {
+          mediaDescriptionBuilder.setIconBitmap(it)
+        }
+
+        return mediaDescriptionBuilder.build()
      }
    }

@@ -296,11 +330,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    mediaSessionConnector.setQueueNavigator(queueNavigator)
    mediaSessionConnector.setPlaybackPreparer(MediaSessionPlaybackPreparer(this))

-    mediaSessionConnector.setCustomActionProviders(
-      JumpForwardCustomActionProvider(),
-      JumpBackwardCustomActionProvider(),
-    )
-
    mediaSession.setCallback(MediaSessionCallback(this))

    initializeMPlayer()
@@ -342,34 +371,47 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      }
    }

+    // TODO: When an item isFinished the currentTime should be reset to 0
+    //        will reset the time if currentTime is within 5s of duration (for android auto)
+    Log.d(tag, "Prepare Player Session Current Time=${playbackSession.currentTime}, Duration=${playbackSession.duration}")
+    if (playbackSession.duration - playbackSession.currentTime < 5) {
+      Log.d(tag, "Prepare Player Session is finished, so restart it")
+      playbackSession.currentTime = 0.0
+    }
+
    isClosed = false
+
+    val metadata = playbackSession.getMediaMetadataCompat(ctx)
+    mediaSession.setMetadata(metadata)
+    val mediaItems = playbackSession.getMediaItems()
    val playbackRateToUse = playbackRate ?: initialPlaybackRate ?: 1f
    initialPlaybackRate = playbackRate

+    // Set actions on Android Auto like jump forward/backward
+    setMediaSessionConnectorCustomActions(playbackSession)
+
    playbackSession.mediaPlayer = getMediaPlayer()

-    if (playbackSession.mediaPlayer == "cast-player" && playbackSession.isLocal) {
+    if (playbackSession.mediaPlayer == PLAYER_CAST && playbackSession.isLocal) {
      Log.w(tag, "Cannot cast local media item - switching player")
      currentPlaybackSession = null
      switchToPlayer(false)
      playbackSession.mediaPlayer = getMediaPlayer()
    }

-    if (playbackSession.mediaPlayer == "cast-player") {
+    if (playbackSession.mediaPlayer == PLAYER_CAST) {
      // If cast-player is the first player to be used
      mediaSessionConnector.setPlayer(castPlayer)
      playerNotificationManager.setPlayer(castPlayer)
    }

    currentPlaybackSession = playbackSession
+    DeviceManager.setLastPlaybackSession(playbackSession) // Save playback session to use when app is closed
+
    Log.d(tag, "Set CurrentPlaybackSession MediaPlayer ${currentPlaybackSession?.mediaPlayer}")

    clientEventEmitter?.onPlaybackSession(playbackSession)

-    val metadata = playbackSession.getMediaMetadataCompat()
-    mediaSession.setMetadata(metadata)
-    val mediaItems = playbackSession.getMediaItems()
-
    if (mediaItems.isEmpty()) {
      Log.e(tag, "Invalid playback session no media items to play")
      currentPlaybackSession = null
@@ -426,6 +468,22 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    }
  }

+  private fun setMediaSessionConnectorCustomActions(playbackSession:PlaybackSession) {
+    val mediaItems = playbackSession.getMediaItems()
+    val customActionProviders = mutableListOf(
+      JumpBackwardCustomActionProvider(),
+      JumpForwardCustomActionProvider(),
+      ChangePlaybackSpeedCustomActionProvider() // Will be pushed to far left
+    )
+    if (playbackSession.mediaPlayer != PLAYER_CAST && mediaItems.size > 1) {
+      customActionProviders.addAll(listOf(
+        SkipBackwardCustomActionProvider(),
+        SkipForwardCustomActionProvider(),
+      ))
+    }
+    mediaSessionConnector.setCustomActionProviders(*customActionProviders.toTypedArray())
+  }
+
  fun handlePlayerPlaybackError(errorMessage:String) {
    // On error and was attempting to direct play - fallback to transcode
    currentPlaybackSession?.let { playbackSession ->
@@ -435,16 +493,19 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {

        val libraryItemId = playbackSession.libraryItemId ?: "" // Must be true since direct play
        val episodeId = playbackSession.episodeId
-        apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
-          if (it == null) { // Play request failed
-            clientEventEmitter?.onPlaybackFailed(errorMessage)
-            closePlayback(true)
-          } else {
-            Handler(Looper.getMainLooper()).post {
-              preparePlayer(it, true, null)
+        mediaProgressSyncer.stop(false) {
+          apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
+            if (it == null) { // Play request failed
+              clientEventEmitter?.onPlaybackFailed(errorMessage)
+              closePlayback(true)
+            } else {
+              Handler(Looper.getMainLooper()).post {
+                preparePlayer(it, true, null)
+              }
            }
          }
        }
+
      } else {
        clientEventEmitter?.onPlaybackFailed(errorMessage)
        closePlayback(true)
@@ -452,19 +513,54 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    }
  }

+  fun handlePlaybackEnded() {
+    Log.d(tag, "handlePlaybackEnded")
+    if (isAndroidAuto && currentPlaybackSession?.isPodcastEpisode == true) {
+      Log.d(tag, "Podcast playback ended on android auto")
+      val libraryItem = currentPlaybackSession?.libraryItem ?: return
+
+      // Need to sync with server to set as finished
+      mediaProgressSyncer.finished {
+        // Need to reload media progress
+        mediaManager.loadServerUserMediaProgress {
+          val podcast = libraryItem.media as Podcast
+          val nextEpisode = podcast.getNextUnfinishedEpisode(libraryItem.id, mediaManager)
+          Log.d(tag, "handlePlaybackEnded nextEpisode=$nextEpisode")
+          nextEpisode?.let { podcastEpisode ->
+            mediaManager.play(libraryItem, podcastEpisode, getPlayItemRequestPayload(false)) {
+              if (it == null) {
+                Log.e(tag, "Failed to play library item")
+              } else {
+                val playbackRate = mediaManager.getSavedPlaybackRate()
+                Handler(Looper.getMainLooper()).post {
+                  preparePlayer(it,true, playbackRate)
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
  fun startNewPlaybackSession() {
    currentPlaybackSession?.let { playbackSession ->
+      Log.i(tag, "Starting new playback session for ${playbackSession.displayTitle}")
+
      val forceTranscode = playbackSession.isHLS // If already HLS then force
      val playItemRequestPayload = getPlayItemRequestPayload(forceTranscode)

      val libraryItemId = playbackSession.libraryItemId ?: "" // Must be true since direct play
      val episodeId = playbackSession.episodeId
-      apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
-        if (it == null) {
-          Log.e(tag, "Failed to start new playback session")
-        } else {
-          Handler(Looper.getMainLooper()).post {
-            preparePlayer(it, true, null)
+      mediaProgressSyncer.stop(false) {
+        apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
+          if (it == null) {
+            Log.e(tag, "Failed to start new playback session")
+          } else {
+            Log.d(tag, "New playback session response from server with session id ${it.id} for \"${it.displayTitle}\"")
+            Handler(Looper.getMainLooper()).post {
+              preparePlayer(it, true, null)
+            }
          }
        }
      }
@@ -564,21 +660,29 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    return currentPlaybackSession?.clone()
  }

-  fun getCurrentPlaybackSessionId() :String? {
-    return currentPlaybackSession?.id
-  }
-
  fun getCurrentBookChapter():BookChapter? {
    return currentPlaybackSession?.getChapterForTime(this.getCurrentTime())
  }

+  fun getEndTimeOfChapterOrTrack():Long? {
+    return getCurrentBookChapter()?.endMs ?: currentPlaybackSession?.getCurrentTrackEndTime()
+  }
+
+  private fun getNextBookChapter():BookChapter? {
+    return currentPlaybackSession?.getNextChapterForTime(this.getCurrentTime())
+  }
+
+  fun getEndTimeOfNextChapterOrTrack():Long? {
+    return getNextBookChapter()?.endMs ?: currentPlaybackSession?.getNextTrackEndTime()
+  }
+
  // Called from PlayerListener play event
  // check with server if progress has updated since last play and sync progress update
  fun checkCurrentSessionProgress(seekBackTime:Long):Boolean {
    if (currentPlaybackSession == null) return true

    mediaProgressSyncer.currentPlaybackSession?.let { playbackSession ->
-      if (!apiHandler.isOnline() || playbackSession.isLocalLibraryItemOnly) {
+      if (!DeviceManager.checkConnectivity(ctx) || playbackSession.isLocalLibraryItemOnly) {
        return true // carry on
      }

@@ -608,7 +712,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
              seekPlayer(playbackSession.currentTimeMs)
              // Should already be playing
              currentPlayer.volume = 1F // Volume on sleep timer might have decreased this
-              mediaProgressSyncer.start()
+              currentPlaybackSession?.let { mediaProgressSyncer.play(it) }
              clientEventEmitter?.onPlayingUpdate(true)
            }
          } else {
@@ -616,9 +720,12 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
              if (seekBackTime > 0L) {
                seekBackward(seekBackTime)
              }
+
              // Should already be playing
              currentPlayer.volume = 1F // Volume on sleep timer might have decreased this
-              mediaProgressSyncer.start()
+              mediaProgressSyncer.currentPlaybackSession?.let { playbackSession ->
+                mediaProgressSyncer.play(playbackSession)
+              }
              clientEventEmitter?.onPlayingUpdate(true)
            }
          }
@@ -627,7 +734,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
        // Streaming from server so check if playback session still exists on server
        Log.d(
          tag,
-          "checkCurrentSessionProgress: Checking if playback session for server stream is still available"
+          "checkCurrentSessionProgress: Checking if playback session ${playbackSession.id} for server stream is still available"
        )
        apiHandler.getPlaybackSession(playbackSession.id) {
          if (it == null) {
@@ -648,7 +755,10 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
                }

                currentPlayer.volume = 1F // Volume on sleep timer might have decreased this
-                mediaProgressSyncer.start()
+                mediaProgressSyncer.currentPlaybackSession?.let { playbackSession ->
+                  mediaProgressSyncer.play(playbackSession)
+                }
+
                clientEventEmitter?.onPlayingUpdate(true)
              }
          }
@@ -682,14 +792,24 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  }

  fun seekPlayer(time: Long) {
-    Log.d(tag, "seekPlayer mediaCount = ${currentPlayer.mediaItemCount} | $time")
+    var timeToSeek = time
+    Log.d(tag, "seekPlayer mediaCount = ${currentPlayer.mediaItemCount} | $timeToSeek")
+    if (timeToSeek < 0) {
+      Log.w(tag, "seekPlayer invalid time $timeToSeek - setting to 0")
+      timeToSeek = 0L
+    } else if (timeToSeek > getDuration()) {
+      Log.w(tag, "seekPlayer invalid time $timeToSeek - setting to MAX - 2000")
+      timeToSeek = getDuration() - 2000L
+    }
+
    if (currentPlayer.mediaItemCount > 1) {
-      currentPlaybackSession?.currentTime = time / 1000.0
+      currentPlaybackSession?.currentTime = timeToSeek / 1000.0
      val newWindowIndex = currentPlaybackSession?.getCurrentTrackIndex() ?: 0
      val newTimeOffset = currentPlaybackSession?.getCurrentTrackTimeMs() ?: 0
+      Log.d(tag, "seekPlayer seekTo $newWindowIndex | $newTimeOffset")
      currentPlayer.seekTo(newWindowIndex, newTimeOffset)
    } else {
-      currentPlayer.seekTo(time)
+      currentPlayer.seekTo(timeToSeek)
    }
  }

@@ -718,7 +838,13 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  }

  fun setPlaybackSpeed(speed: Float) {
+    mediaManager.userSettingsPlaybackRate = speed
    currentPlayer.setPlaybackSpeed(speed)
+
+    // Refresh Android Auto actions
+    mediaProgressSyncer.currentPlaybackSession?.let {
+      setMediaSessionConnectorCustomActions(it)
+    }
  }

  fun closePlayback(calledOnError:Boolean? = false) {
@@ -738,10 +864,11 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    }

    currentPlaybackSession = null
+    mediaProgressSyncer.reset()
    clientEventEmitter?.onPlaybackClosed()
    PlayerListener.lastPauseTime = 0
    isClosed = true
-    stopForeground(true)
+    stopForeground(Service.STOP_FOREGROUND_REMOVE)
    stopSelf()
  }

@@ -751,10 +878,10 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  }

  fun getMediaPlayer():String {
-    return if(currentPlayer == castPlayer) "cast-player" else "exo-player"
+    return if(currentPlayer == castPlayer) PLAYER_CAST else PLAYER_EXO
  }

-  fun getDeviceInfo(): DeviceInfo {
+  private fun getDeviceInfo(): DeviceInfo {
    /* EXAMPLE
      manufacturer: Google
      model: Pixel 6
@@ -765,8 +892,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    return DeviceInfo(Build.MANUFACTURER, Build.MODEL, Build.BRAND, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME)
  }

-  @get:JsonIgnore
-  val deviceSettings get() = DeviceManager.deviceData.deviceSettings ?: DeviceSettings.default()
+  private val deviceSettings get() = DeviceManager.deviceData.deviceSettings ?: DeviceSettings.default()

  fun getPlayItemRequestPayload(forceTranscode:Boolean):PlayItemRequestPayload {
    return PlayItemRequestPayload(getMediaPlayer(), !forceTranscode, forceTranscode, getDeviceInfo())
@@ -787,12 +913,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  //
  // MEDIA BROWSER STUFF (ANDROID AUTO)
  //
-  private val ANDROID_AUTO_PKG_NAME = "com.google.android.projection.gearhead"
-  private val ANDROID_AUTO_SIMULATOR_PKG_NAME = "com.google.android.autosimulator"
-  private val ANDROID_WEARABLE_PKG_NAME = "com.google.android.wearable.app"
-  private val ANDROID_GSEARCH_PKG_NAME = "com.google.android.googlequicksearchbox"
-  private val ANDROID_AUTOMOTIVE_PKG_NAME = "com.google.android.carassistant"
-  private val VALID_MEDIA_BROWSERS = mutableListOf("com.audiobookshelf.app", ANDROID_AUTO_PKG_NAME, ANDROID_AUTO_SIMULATOR_PKG_NAME, ANDROID_WEARABLE_PKG_NAME, ANDROID_GSEARCH_PKG_NAME, ANDROID_AUTOMOTIVE_PKG_NAME)
+  private val VALID_MEDIA_BROWSERS = mutableListOf("com.audiobookshelf.app", "com.audiobookshelf.app.debug", "com.android.systemui", ANDROID_AUTO_PKG_NAME, ANDROID_AUTO_SIMULATOR_PKG_NAME, ANDROID_WEARABLE_PKG_NAME, ANDROID_GSEARCH_PKG_NAME, ANDROID_AUTOMOTIVE_PKG_NAME)

  private val AUTO_MEDIA_ROOT = "/"
  private val LIBRARIES_ROOT = "__LIBRARIES__"
@@ -844,7 +965,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {

    if (parentMediaId.startsWith("li_") || parentMediaId.startsWith("local_")) { // Show podcast episodes
      Log.d(tag, "Loading podcast episodes")
-      mediaManager.loadPodcastEpisodeMediaBrowserItems(parentMediaId) {
+      mediaManager.loadPodcastEpisodeMediaBrowserItems(parentMediaId, ctx) {
        result.sendResult(it)
      }
    } else if (::browseTree.isInitialized && browseTree[parentMediaId] == null && mediaManager.getIsLibrary(parentMediaId)) { // Load library items for library
@@ -852,11 +973,13 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      mediaManager.loadLibraryItemsWithAudio(parentMediaId) { libraryItems ->
        val children = libraryItems.map { libraryItem ->
          if (libraryItem.mediaType == "podcast") { // Podcasts are browseable
-            val mediaDescription = libraryItem.getMediaDescription(null)
+            val mediaDescription = libraryItem.getMediaDescription(null, ctx)
            MediaBrowserCompat.MediaItem(mediaDescription, MediaBrowserCompat.MediaItem.FLAG_BROWSABLE)
          } else {
            val progress = mediaManager.serverUserMediaProgress.find { it.libraryItemId == libraryItem.id }
-            val description = libraryItem.getMediaDescription(progress)
+            val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItemByLId(libraryItem.id)
+            libraryItem.localLibraryItemId = localLibraryItem?.id
+            val description = libraryItem.getMediaDescription(progress, ctx)
            MediaBrowserCompat.MediaItem(description, MediaBrowserCompat.MediaItem.FLAG_PLAYABLE)
          }
        }
@@ -870,13 +993,13 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {

      localBooks.forEach { localLibraryItem ->
        val progress = DeviceManager.dbManager.getLocalMediaProgress(localLibraryItem.id)
-        val description = localLibraryItem.getMediaDescription(progress)
+        val description = localLibraryItem.getMediaDescription(progress, ctx)

        localBrowseItems += MediaBrowserCompat.MediaItem(description, MediaBrowserCompat.MediaItem.FLAG_PLAYABLE)
      }

      localPodcasts.forEach { localLibraryItem ->
-        val mediaDescription = localLibraryItem.getMediaDescription(null)
+        val mediaDescription = localLibraryItem.getMediaDescription(null, ctx)
        localBrowseItems += MediaBrowserCompat.MediaItem(mediaDescription, MediaBrowserCompat.MediaItem.FLAG_BROWSABLE)
      }

@@ -892,15 +1015,26 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
             progress = DeviceManager.dbManager.getLocalMediaProgress("${itemInProgress.libraryItemWrapper.id}-${itemInProgress.episode.id}")
           } else {
             progress = mediaManager.serverUserMediaProgress.find { it.libraryItemId == itemInProgress.libraryItemWrapper.id && it.episodeId == itemInProgress.episode.id }
+
+             // to show download icon
+             val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItemByLId(itemInProgress.libraryItemWrapper.id)
+             localLibraryItem?.let { lli ->
+               val localEpisode = (lli.media as Podcast).episodes?.find { it.serverEpisodeId == itemInProgress.episode.id }
+               itemInProgress.episode.localEpisodeId = localEpisode?.id
+             }
+
           }
-          mediaDescription = itemInProgress.episode.getMediaDescription(itemInProgress.libraryItemWrapper,progress)
+          mediaDescription = itemInProgress.episode.getMediaDescription(itemInProgress.libraryItemWrapper, progress, ctx)
        } else {
          if (itemInProgress.isLocal) {
            progress = DeviceManager.dbManager.getLocalMediaProgress(itemInProgress.libraryItemWrapper.id)
          } else {
            progress = mediaManager.serverUserMediaProgress.find { it.libraryItemId == itemInProgress.libraryItemWrapper.id }
+
+            val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItemByLId(itemInProgress.libraryItemWrapper.id)
+            (itemInProgress.libraryItemWrapper as LibraryItem).localLibraryItemId = localLibraryItem?.id // To show downloaded icon
          }
-          mediaDescription = itemInProgress.libraryItemWrapper.getMediaDescription(progress)
+          mediaDescription = itemInProgress.libraryItemWrapper.getMediaDescription(progress, ctx)
        }
        localBrowseItems += MediaBrowserCompat.MediaItem(mediaDescription, MediaBrowserCompat.MediaItem.FLAG_PLAYABLE)
      }
@@ -949,7 +1083,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
  // Shake sensor used for sleep timer
  fun registerSensor() {
    if (isShakeSensorRegistered) {
-      Log.w(tag, "Shake sensor already registered")
+      Log.i(tag, "Shake sensor already registered")
      return
    }
    shakeSensorUnregisterTask?.cancel()
@@ -969,7 +1103,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
    // Unregister shake sensor after wake up expiration
    shakeSensorUnregisterTask?.cancel()
    shakeSensorUnregisterTask = Timer("ShakeUnregisterTimer", false).schedule(SLEEP_TIMER_WAKE_UP_EXPIRATION) {
-      Handler(Looper.getMainLooper()).post() {
+      Handler(Looper.getMainLooper()).post {
        Log.d(tag, "wake time expired: Unregistering shake sensor")
        mSensorManager!!.unregisterListener(mShakeDetector)
        isShakeSensorRegistered = false
@@ -984,10 +1118,11 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      networkCapabilities: NetworkCapabilities
    ) {
      super.onCapabilitiesChanged(network, networkCapabilities)
-      val unmetered = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
-      Log.i(tag, "Network capabilities changed is unmetered = $unmetered")
-      isUnmeteredNetwork = unmetered
-      clientEventEmitter?.onNetworkMeteredChanged(unmetered)
+
+      isUnmeteredNetwork = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+      hasNetworkConnectivity = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+      Log.i(tag, "Network capabilities changed. hasNetworkConnectivity=$hasNetworkConnectivity | isUnmeteredNetwork=$isUnmeteredNetwork")
+      clientEventEmitter?.onNetworkMeteredChanged(isUnmeteredNetwork)
    }
  }

@@ -1024,5 +1159,73 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
      ).build()
    }
  }
+
+  inner class SkipForwardCustomActionProvider : CustomActionProvider {
+    override fun onCustomAction(player: Player, action: String, extras: Bundle?) {
+      /*
+      This does not appear to ever get called. Instead, MediaSessionCallback.onCustomAction() is
+      responsible to reacting to a custom action.
+       */
+    }
+
+    override fun getCustomAction(player: Player): PlaybackStateCompat.CustomAction? {
+      return PlaybackStateCompat.CustomAction.Builder(
+        CUSTOM_ACTION_SKIP_FORWARD,
+        getContext().getString(R.string.action_skip_forward),
+        R.drawable.skip_next_24
+      ).build()
+    }
+  }
+
+  inner class SkipBackwardCustomActionProvider : CustomActionProvider {
+    override fun onCustomAction(player: Player, action: String, extras: Bundle?) {
+      /*
+      This does not appear to ever get called. Instead, MediaSessionCallback.onCustomAction() is
+      responsible to reacting to a custom action.
+       */
+    }
+
+    override fun getCustomAction(player: Player): PlaybackStateCompat.CustomAction? {
+      return PlaybackStateCompat.CustomAction.Builder(
+        CUSTOM_ACTION_SKIP_BACKWARD,
+        getContext().getString(R.string.action_skip_backward),
+        R.drawable.skip_previous_24
+      ).build()
+    }
+  }
+
+  inner class ChangePlaybackSpeedCustomActionProvider : CustomActionProvider {
+    override fun onCustomAction(player: Player, action: String, extras: Bundle?) {
+      /*
+      This does not appear to ever get called. Instead, MediaSessionCallback.onCustomAction() is
+      responsible to reacting to a custom action.
+       */
+    }
+
+    override fun getCustomAction(player: Player): PlaybackStateCompat.CustomAction? {
+      val playbackRate = mediaManager.getSavedPlaybackRate()
+
+      // Rounding values in the event a non preset value (.5, 1, 1.2, 1.5, 2, 3) is selected in the phone app
+      val drawable: Int = when (playbackRate) {
+        in 0.5f..0.7f -> R.drawable.ic_play_speed_0_5x
+        in 0.8f..1.0f -> R.drawable.ic_play_speed_1_0x
+        in 1.1f..1.3f -> R.drawable.ic_play_speed_1_2x
+        in 1.4f..1.7f -> R.drawable.ic_play_speed_1_5x
+        in 1.8f..2.4f -> R.drawable.ic_play_speed_2_0x
+        in 2.5f..3.0f -> R.drawable.ic_play_speed_3_0x
+        // anything set above 3 will be show the 3x to save from creating 100 icons
+        else -> R.drawable.ic_play_speed_3_0x
+      }
+      val customActionExtras = Bundle()
+      customActionExtras.putFloat("speed", playbackRate)
+      return PlaybackStateCompat.CustomAction.Builder(
+        CUSTOM_ACTION_CHANGE_SPEED,
+        getContext().getString(R.string.action_change_speed),
+        drawable
+      )
+        .setExtras(customActionExtras)
+        .build()
+    }
+  }
 }

@@ -4,6 +4,7 @@ import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
+import com.audiobookshelf.app.device.DeviceManager
 import kotlin.math.sqrt

 class ShakeDetector : SensorEventListener {
@@ -34,7 +35,8 @@ class ShakeDetector : SensorEventListener {
      val gZ = z / SensorManager.GRAVITY_EARTH
      // gForce will be close to 1 when there is no movement.
      val gForce: Float = sqrt(gX * gX + gY * gY + gZ * gZ)
-      if (gForce > SHAKE_THRESHOLD_GRAVITY) {
+      val shakeThreshold = DeviceManager.deviceData.deviceSettings?.getShakeThresholdGravity() ?: 1.6f
+      if (gForce > shakeThreshold) {
        val now = System.currentTimeMillis()
        // ignore shake events too close to each other (500ms)
        if (mShakeTimestamp + SHAKE_SLOP_TIME_MS > now) {
@@ -59,7 +61,7 @@ class ShakeDetector : SensorEventListener {
 * from the Google Play Store and run it to see how
 *  many G's it takes to register a shake
 */
-    private const val SHAKE_THRESHOLD_GRAVITY = 1.5f // orig 2.7f
+//    var SHAKE_THRESHOLD_GRAVITY = 1.5f // orig 2.7f
    private const val SHAKE_SLOP_TIME_MS = 500
    private const val SHAKE_COUNT_RESET_TIME_MS = 3000
  }
@@ -1,257 +0,0 @@
-package com.audiobookshelf.app.player
-
-import android.content.Context
-import android.os.*
-import android.util.Log
-import com.audiobookshelf.app.device.DeviceManager
-import java.util.*
-import kotlin.concurrent.schedule
-import kotlin.math.roundToInt
-
-const val SLEEP_EXTENSION_TIME = 900000L // 15m
-
-class SleepTimerManager constructor(val playerNotificationService:PlayerNotificationService) {
-  private val tag = "SleepTimerManager"
-
-  private var sleepTimerTask:TimerTask? = null
-  private var sleepTimerRunning:Boolean = false
-  private var sleepTimerEndTime:Long = 0L
-  private var sleepTimerLength:Long = 0L
-  private var sleepTimerElapsed:Long = 0L
-  private var sleepTimerExtensionTime:Long = 0L
-  private var sleepTimerFinishedAt:Long = 0L
-
-  private fun getCurrentTime():Long {
-    return playerNotificationService.getCurrentTime()
-  }
-
-  private fun getDuration():Long {
-    return playerNotificationService.getDuration()
-  }
-
-  private fun getIsPlaying():Boolean {
-    return playerNotificationService.currentPlayer.isPlaying
-  }
-
-  private fun setVolume(volume:Float) {
-    playerNotificationService.currentPlayer.volume = volume
-  }
-
-  private fun pause() {
-    playerNotificationService.currentPlayer.pause()
-  }
-
-  private fun play() {
-    playerNotificationService.currentPlayer.play()
-  }
-
-  private fun getSleepTimerTimeRemainingSeconds():Int {
-    if (sleepTimerEndTime == 0L && sleepTimerLength > 0) { // For regular timer
-      return ((sleepTimerLength - sleepTimerElapsed) / 1000).toDouble().roundToInt()
-    }
-    // For chapter end timer
-    if (sleepTimerEndTime <= 0) return 0
-    return (((sleepTimerEndTime - getCurrentTime()) / 1000).toDouble()).roundToInt()
-  }
-
-  fun setSleepTimer(time: Long, isChapterTime: Boolean) : Boolean {
-    Log.d(tag, "Setting Sleep Timer for $time is chapter time $isChapterTime")
-    sleepTimerTask?.cancel()
-    sleepTimerRunning = false
-    sleepTimerFinishedAt = 0L
-    sleepTimerElapsed = 0L
-
-    // Register shake sensor
-    playerNotificationService.registerSensor()
-
-    val currentTime = getCurrentTime()
-    if (isChapterTime) {
-      if (currentTime > time) {
-        Log.d(tag, "Invalid sleep timer - current time is already passed chapter time $time")
-        return false
-      }
-      sleepTimerEndTime = time
-      sleepTimerLength = 0
-      sleepTimerExtensionTime = SLEEP_EXTENSION_TIME
-
-      if (sleepTimerEndTime > getDuration()) {
-        sleepTimerEndTime = getDuration()
-      }
-    } else {
-      sleepTimerLength = time
-      sleepTimerEndTime = 0L
-      sleepTimerExtensionTime = time
-
-      if (sleepTimerLength + getCurrentTime() > getDuration()) {
-        sleepTimerLength = getDuration() - getCurrentTime()
-      }
-    }
-
-    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds())
-
-    sleepTimerRunning = true
-    sleepTimerTask = Timer("SleepTimer", false).schedule(0L, 1000L) {
-      Handler(Looper.getMainLooper()).post() {
-        if (getIsPlaying()) {
-          sleepTimerElapsed += 1000L
-
-          val sleepTimeSecondsRemaining = getSleepTimerTimeRemainingSeconds()
-          Log.d(tag, "Timer Elapsed $sleepTimerElapsed | Sleep TIMER time remaining $sleepTimeSecondsRemaining s")
-
-          if (sleepTimeSecondsRemaining > 0) {
-            playerNotificationService.clientEventEmitter?.onSleepTimerSet(sleepTimeSecondsRemaining)
-          }
-
-          if (sleepTimeSecondsRemaining <= 0) {
-            Log.d(tag, "Sleep Timer Pausing Player on Chapter")
-            pause()
-
-            playerNotificationService.clientEventEmitter?.onSleepTimerEnded(getCurrentTime())
-            clearSleepTimer()
-            sleepTimerFinishedAt = System.currentTimeMillis()
-          } else if (sleepTimeSecondsRemaining <= 30) {
-            // Start fading out audio
-            val volume = sleepTimeSecondsRemaining / 30F
-            Log.d(tag, "SLEEP VOLUME FADE $volume | ${sleepTimeSecondsRemaining}s remaining")
-            setVolume(volume)
-          }
-        }
-      }
-    }
-    return true
-  }
-
-  fun clearSleepTimer() {
-    sleepTimerTask?.cancel()
-    sleepTimerTask = null
-    sleepTimerEndTime = 0
-    sleepTimerRunning = false
-    playerNotificationService.unregisterSensor()
-  }
-
-  fun getSleepTimerTime():Long {
-    return sleepTimerEndTime
-  }
-
-  fun cancelSleepTimer() {
-    Log.d(tag, "Canceling Sleep Timer")
-    clearSleepTimer()
-    playerNotificationService.clientEventEmitter?.onSleepTimerSet(0)
-  }
-
-  // Vibrate when extending sleep timer by shaking
-  private fun vibrate() {
-    val context = playerNotificationService.getContext()
-    val vibrator:Vibrator
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      val vibratorManager =
-        context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager
-      vibrator = vibratorManager.defaultVibrator
-    } else {
-      @Suppress("DEPRECATION")
-      vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-    }
-
-    vibrator.let {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        val vibrationEffect = VibrationEffect.createWaveform(longArrayOf(0, 150, 150, 150),-1)
-        it.vibrate(vibrationEffect)
-      } else {
-        @Suppress("DEPRECATION")
-        it.vibrate(10)
-      }
-    }
-  }
-
-  private fun extendSleepTime() {
-    if (!sleepTimerRunning) return
-    setVolume(1F)
-    if (sleepTimerEndTime == 0L) {
-      sleepTimerLength += sleepTimerExtensionTime
-      if (sleepTimerLength + getCurrentTime() > getDuration()) sleepTimerLength = getDuration() - getCurrentTime()
-    } else {
-      sleepTimerEndTime += sleepTimerExtensionTime
-      if (sleepTimerEndTime > getDuration()) sleepTimerEndTime = getDuration()
-    }
-
-    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds())
-  }
-
-  fun checkShouldExtendSleepTimer() {
-    if (!sleepTimerRunning) {
-      if (sleepTimerFinishedAt <= 0L) return
-
-      val finishedAtDistance = System.currentTimeMillis() - sleepTimerFinishedAt
-      if (finishedAtDistance > SLEEP_TIMER_WAKE_UP_EXPIRATION) // 2 minutes
-      {
-        Log.d(tag, "Sleep timer finished over 2 mins ago, clearing it")
-        sleepTimerFinishedAt = 0L
-        return
-      }
-
-      val newSleepTime = if (sleepTimerExtensionTime >= 0) sleepTimerExtensionTime else SLEEP_EXTENSION_TIME
-      vibrate()
-      setSleepTimer(newSleepTime, false)
-      play()
-      return
-    }
-    // Only extend if within 30 seconds of finishing
-    val sleepTimeRemaining = getSleepTimerTimeRemainingSeconds()
-    if (sleepTimeRemaining <= 30) {
-      vibrate()
-      extendSleepTime()
-    }
-  }
-
-  fun handleShake() {
-    if (sleepTimerRunning || sleepTimerFinishedAt > 0L) {
-      if (DeviceManager.deviceData.deviceSettings?.disableShakeToResetSleepTimer == true) {
-        Log.d(tag, "Shake to reset sleep timer is disabled")
-        return
-      }
-      checkShouldExtendSleepTimer()
-    }
-  }
-
-  fun increaseSleepTime(time: Long) {
-    Log.d(tag, "Increase Sleep time $time")
-    if (!sleepTimerRunning) return
-
-    if (sleepTimerEndTime == 0L) {
-      sleepTimerLength += time
-      if (sleepTimerLength + getCurrentTime() > getDuration()) sleepTimerLength = getDuration() - getCurrentTime()
-    } else {
-      val newSleepEndTime = sleepTimerEndTime + time
-      sleepTimerEndTime = if (newSleepEndTime >= getDuration()) {
-        getDuration()
-      } else {
-        newSleepEndTime
-      }
-    }
-
-    setVolume(1F)
-    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds())
-  }
-
-  fun decreaseSleepTime(time: Long) {
-    Log.d(tag, "Decrease Sleep time $time")
-    if (!sleepTimerRunning) return
-
-
-    if (sleepTimerEndTime == 0L) {
-      sleepTimerLength -= time
-      if (sleepTimerLength <= 0) sleepTimerLength = 1000L
-    } else {
-      val newSleepEndTime = sleepTimerEndTime - time
-      sleepTimerEndTime = if (newSleepEndTime <= 1000) {
-        // End sleep timer in 1 second
-        getCurrentTime() + 1000
-      } else {
-        newSleepEndTime
-      }
-    }
-
-    setVolume(1F)
-    playerNotificationService.clientEventEmitter?.onSleepTimerSet(getSleepTimerTimeRemainingSeconds())
-  }
-}
@@ -6,7 +6,9 @@ import android.util.Log
 import com.audiobookshelf.app.MainActivity
 import com.audiobookshelf.app.data.*
 import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.media.MediaEventManager
 import com.audiobookshelf.app.player.CastManager
+import com.audiobookshelf.app.player.PlayerListener
 import com.audiobookshelf.app.player.PlayerNotificationService
 import com.audiobookshelf.app.server.ApiHandler
 import com.fasterxml.jackson.core.json.JsonReadFeature
@@ -21,7 +23,7 @@ import org.json.JSONObject
@CapacitorPlugin(name = "AbsAudioPlayer")
 class AbsAudioPlayer : Plugin() {
  private val tag = "AbsAudioPlayer"
-  var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())

  private lateinit var mainActivity: MainActivity
  private lateinit var apiHandler:ApiHandler
@@ -61,8 +63,11 @@ class AbsAudioPlayer : Plugin() {
          emit("onSleepTimerEnded", currentPosition)
        }

-        override fun onSleepTimerSet(sleepTimeRemaining: Int) {
-          emit("onSleepTimerSet", sleepTimeRemaining)
+        override fun onSleepTimerSet(sleepTimeRemaining: Int, isAutoSleepTimer:Boolean) {
+          val ret = JSObject()
+          ret.put("value", sleepTimeRemaining)
+          ret.put("isAuto", isAutoSleepTimer)
+          notifyListeners("onSleepTimerSet", ret)
        }

        override fun onLocalMediaProgressUpdate(localMediaProgress: LocalMediaProgress) {
@@ -88,7 +93,17 @@ class AbsAudioPlayer : Plugin() {
        override fun onNetworkMeteredChanged(isUnmetered:Boolean) {
          emit("onNetworkMeteredChanged", isUnmetered)
        }
+
+        override fun onMediaItemHistoryUpdated(mediaItemHistory:MediaItemHistory) {
+          notifyListeners("onMediaItemHistoryUpdated", JSObject(jacksonMapper.writeValueAsString(mediaItemHistory)))
+        }
+
+        override fun onPlaybackSpeedChanged(playbackSpeed:Float) {
+          emit("onPlaybackSpeedChanged", playbackSpeed)
+        }
      })
+
+      MediaEventManager.clientEventEmitter = playerNotificationService.clientEventEmitter
    }
    mainActivity.pluginCallback = foregroundServiceReady
  }
@@ -160,6 +175,8 @@ class AbsAudioPlayer : Plugin() {
    val episodeId = call.getString("episodeId", "").toString()
    val playWhenReady = call.getBoolean("playWhenReady") == true
    val playbackRate = call.getFloat("playbackRate",1f) ?: 1f
+    val startTimeOverride = call.getDouble("startTime")
+    Log.d(tag, "prepareLibraryItem lid=$libraryItemId, startTimeOverride=$startTimeOverride")

    if (libraryItemId.isEmpty()) {
      Log.e(tag, "Invalid call to play library item no library item id")
@@ -181,10 +198,16 @@ class AbsAudioPlayer : Plugin() {
        Handler(Looper.getMainLooper()).post {
          Log.d(tag, "prepareLibraryItem: Preparing Local Media item ${jacksonMapper.writeValueAsString(it)}")
          val playbackSession = it.getPlaybackSession(episode)
+          if (startTimeOverride != null) {
+            Log.d(tag, "prepareLibraryItem: Using start time override $startTimeOverride")
+            playbackSession.currentTime = startTimeOverride
+          }

          if (playerNotificationService.mediaProgressSyncer.listeningTimerRunning) { // If progress syncing then first stop before preparing next
            playerNotificationService.mediaProgressSyncer.stop {
              Log.d(tag, "Media progress syncer was already syncing - stopped")
+              PlayerListener.lazyIsPlaying = false
+
              Handler(Looper.getMainLooper()).post { // TODO: This was needed again which is probably a design a flaw
                playerNotificationService.preparePlayer(
                  playbackSession,
@@ -194,6 +217,7 @@ class AbsAudioPlayer : Plugin() {
              }
            }
          } else {
+            playerNotificationService.mediaProgressSyncer.reset()
            playerNotificationService.preparePlayer(playbackSession, playWhenReady, playbackRate)
          }
        }
@@ -201,28 +225,25 @@ class AbsAudioPlayer : Plugin() {
      }
    } else { // Play library item from server
      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 playback session ${jacksonMapper.writeValueAsString(it)}")
-
-            if (playerNotificationService.mediaProgressSyncer.listeningTimerRunning) { // If progress syncing then first stop before preparing next
-              playerNotificationService.mediaProgressSyncer.stop {
-                Log.d(tag, "Media progress syncer was already syncing - stopped")
-                Handler(Looper.getMainLooper()).post { // TODO: This was needed again which is probably a design a flaw
-                  playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
-                }
-              }
+      Handler(Looper.getMainLooper()).post {
+        playerNotificationService.mediaProgressSyncer.stop {
+          apiHandler.playLibraryItem(libraryItemId, episodeId, playItemRequestPayload) {
+            if (it == null) {
+              call.resolve(JSObject("{\"error\":\"Server play request failed\"}"))
            } else {
-              playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
+              if (startTimeOverride != null) {
+                Log.d(tag, "prepareLibraryItem: Using start time override $startTimeOverride")
+                it.currentTime = startTimeOverride
+              }
+
+              Handler(Looper.getMainLooper()).post {
+                Log.d(tag, "Preparing Player playback session ${jacksonMapper.writeValueAsString(it)}")
+                PlayerListener.lazyIsPlaying = false
+                playerNotificationService.preparePlayer(it, playWhenReady, playbackRate)
+              }
+              call.resolve(JSObject(jacksonMapper.writeValueAsString(it)))
            }
          }
-
-          call.resolve(JSObject(jacksonMapper.writeValueAsString(it)))
        }
      }
    }
@@ -267,6 +288,7 @@ class AbsAudioPlayer : Plugin() {
  @PluginMethod
  fun seek(call: PluginCall) {
    val time:Int = call.getInt("value", 0) ?: 0 // Value in seconds
+    Log.d(tag, "seek action to $time")
    Handler(Looper.getMainLooper()).post {
      playerNotificationService.seekPlayer(time * 1000L) // convert to ms
      call.resolve()
@@ -315,7 +337,7 @@ class AbsAudioPlayer : Plugin() {
    val isChapterTime:Boolean = call.getBoolean("isChapterTime", false) == true

    Handler(Looper.getMainLooper()).post {
-        val success:Boolean = playerNotificationService.sleepTimerManager.setSleepTimer(time, isChapterTime)
+        val success:Boolean = playerNotificationService.sleepTimerManager.setManualSleepTimer(time, isChapterTime)
        val ret = JSObject()
        ret.put("success", success)
        call.resolve(ret)
@@ -1,8 +1,10 @@
-package com.audiobookshelf.app.data
+package com.audiobookshelf.app.plugins

 import android.util.Log
 import com.audiobookshelf.app.MainActivity
+import com.audiobookshelf.app.data.*
 import com.audiobookshelf.app.device.DeviceManager
+import com.audiobookshelf.app.media.MediaEventManager
 import com.audiobookshelf.app.server.ApiHandler
 import com.fasterxml.jackson.core.json.JsonReadFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -12,12 +14,11 @@ import com.getcapacitor.annotation.CapacitorPlugin
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.json.JSONObject

@CapacitorPlugin(name = "AbsDatabase")
 class AbsDatabase : Plugin() {
  val tag = "AbsDatabase"
-  var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())

  lateinit var mainActivity: MainActivity
  lateinit var apiHandler: ApiHandler
@@ -189,6 +190,24 @@ class AbsDatabase : Plugin() {
    }
  }

+  @PluginMethod
+  fun getLocalMediaProgressForServerItem(call:PluginCall) {
+    val libraryItemId = call.getString("libraryItemId", "").toString()
+    var episodeId:String? = call.getString("episodeId", "").toString()
+    if (episodeId == "") episodeId = null
+
+    GlobalScope.launch(Dispatchers.IO) {
+      val allLocalMediaProgress = DeviceManager.dbManager.getAllLocalMediaProgress()
+      val localMediaProgress = allLocalMediaProgress.find { libraryItemId == it.libraryItemId && (episodeId == null || it.episodeId == episodeId) }
+
+      if (localMediaProgress == null) {
+        call.resolve()
+      } else {
+        call.resolve(JSObject(jacksonMapper.writeValueAsString(localMediaProgress)))
+      }
+    }
+  }
+
  @PluginMethod
  fun removeLocalMediaProgress(call:PluginCall) {
    val localMediaProgressId = call.getString("localMediaProgressId", "").toString()
@@ -197,13 +216,25 @@ class AbsDatabase : Plugin() {
  }

  @PluginMethod
-  fun syncLocalMediaProgressWithServer(call:PluginCall) {
+  fun syncLocalSessionsWithServer(call:PluginCall) {
    if (DeviceManager.serverConnectionConfig == null) {
-      Log.e(tag, "syncLocalMediaProgressWithServer not connected to server")
+      Log.e(tag, "syncLocalSessionsWithServer not connected to server")
      return call.resolve()
    }
-    apiHandler.syncMediaProgress {
-      call.resolve(JSObject(jacksonMapper.writeValueAsString(it)))
+
+    apiHandler.syncLocalMediaProgressForUser {
+      Log.d(tag, "Finished syncing local media progress for user")
+      val savedSessions = DeviceManager.dbManager.getPlaybackSessions().filter { it.serverConnectionConfigId == DeviceManager.serverConnectionConfigId }
+
+      if (savedSessions.isNotEmpty()) {
+        apiHandler.sendSyncLocalSessions(savedSessions) { success, errorMsg ->
+          if (!success) {
+            call.resolve(JSObject("{\"error\":\"$errorMsg\"}"))
+          } else {
+            call.resolve()
+          }
+        }
+      }
    }
  }

@@ -257,6 +288,8 @@ class AbsDatabase : Plugin() {
        Log.w(tag, "syncServerMediaProgressWithLocalMediaProgress Local media progress not found $localMediaProgressId")
        call.resolve()
      } else {
+        MediaEventManager.syncEvent(mediaProgress, "Received from webhook event")
+
        localMediaProgress.updateFromServerMediaProgress(mediaProgress)
        DeviceManager.dbManager.saveLocalMediaProgress(localMediaProgress)
        call.resolve(JSObject(jacksonMapper.writeValueAsString(localMediaProgress)))
@@ -287,8 +320,8 @@ class AbsDatabase : Plugin() {
        return call.resolve(JSObject("{\"error\":\"Invalid library item not a podcast\"}"))
      }

-      var duration = 0.0
-      var podcastEpisode:PodcastEpisode? = null
+      val duration: Double
+      var podcastEpisode: PodcastEpisode? = null
      if (!localEpisodeId.isNullOrEmpty()) {
          val podcast = localLibraryItem.media as Podcast
        podcastEpisode = podcast.episodes?.find { episode ->
@@ -407,4 +440,19 @@ class AbsDatabase : Plugin() {
      call.resolve(JSObject(jacksonMapper.writeValueAsString(DeviceManager.deviceData)))
    }
  }
+
+  @PluginMethod
+  fun getMediaItemHistory(call:PluginCall) { // Returns device data
+    Log.d(tag, "getMediaItemHistory ${call.data}")
+    val mediaId = call.getString("mediaId") ?: ""
+
+    GlobalScope.launch(Dispatchers.IO) {
+      val mediaItemHistory = DeviceManager.dbManager.getMediaItemHistory(mediaId)
+      if (mediaItemHistory == null) {
+        call.resolve()
+      } else {
+        call.resolve(JSObject(jacksonMapper.writeValueAsString(mediaItemHistory)))
+      }
+    }
+  }
 }
@@ -2,20 +2,17 @@ package com.audiobookshelf.app.plugins

 import android.app.DownloadManager
 import android.content.Context
-import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.util.Log
-import androidx.documentfile.provider.DocumentFile
-import com.anggrayudi.storage.callback.FileCallback
-import com.anggrayudi.storage.file.*
-import com.anggrayudi.storage.media.FileDescription
 import com.audiobookshelf.app.MainActivity
 import com.audiobookshelf.app.data.*
 import com.audiobookshelf.app.device.DeviceManager
 import com.audiobookshelf.app.device.FolderScanner
+import com.audiobookshelf.app.models.DownloadItem
+import com.audiobookshelf.app.models.DownloadItemPart
 import com.audiobookshelf.app.server.ApiHandler
-import com.fasterxml.jackson.annotation.JsonIgnore
+import com.audiobookshelf.app.managers.DownloadItemManager
 import com.fasterxml.jackson.core.json.JsonReadFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.getcapacitor.JSObject
@@ -23,109 +20,37 @@ import com.getcapacitor.Plugin
 import com.getcapacitor.PluginCall
 import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import java.io.File

@CapacitorPlugin(name = "AbsDownloader")
 class AbsDownloader : Plugin() {
  private val tag = "AbsDownloader"
-  var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())

  lateinit var mainActivity: MainActivity
  lateinit var downloadManager: DownloadManager
  lateinit var apiHandler: ApiHandler
  lateinit var folderScanner: FolderScanner
+  lateinit var downloadItemManager: DownloadItemManager

-  data class DownloadItemPart(
-    val id: String,
-    val filename: String,
-    val finalDestinationPath:String,
-    val itemTitle: String,
-    val serverPath: String,
-    val localFolderName: String,
-    val localFolderUrl: String,
-    val localFolderId: String,
-    val audioTrack: AudioTrack?,
-    val episode:PodcastEpisode?,
-    var completed:Boolean,
-    var moved:Boolean,
-    var failed:Boolean,
-    @JsonIgnore val uri: Uri,
-    @JsonIgnore val destinationUri: Uri,
-    @JsonIgnore val finalDestinationUri: Uri,
-    var downloadId: Long?,
-    var progress: Long
-  ) {
-    companion object {
-      fun make(filename:String, destinationFile:File, finalDestinationFile:File, itemTitle:String, serverPath:String, localFolder:LocalFolder, audioTrack:AudioTrack?, episode:PodcastEpisode?) :DownloadItemPart {
-        val destinationUri = Uri.fromFile(destinationFile)
-        val finalDestinationUri = Uri.fromFile(finalDestinationFile)
-
-        var downloadUrl = "${DeviceManager.serverAddress}${serverPath}?token=${DeviceManager.token}"
-        if (serverPath.endsWith("/cover")) downloadUrl += "&format=jpeg" // For cover images force to jpeg
-        val downloadUri = Uri.parse(downloadUrl)
-        Log.d("DownloadItemPart", "Audio File Destination Uri: $destinationUri | Final Destination Uri: $finalDestinationUri | Download URI $downloadUri")
-        return DownloadItemPart(
-          id = DeviceManager.getBase64Id(finalDestinationFile.absolutePath),
-          filename = filename, finalDestinationFile.absolutePath,
-          itemTitle = itemTitle,
-          serverPath = serverPath,
-          localFolderName = localFolder.name,
-          localFolderUrl = localFolder.contentUrl,
-          localFolderId = localFolder.id,
-          audioTrack = audioTrack,
-          episode = episode,
-          completed = false,
-          moved = false,
-          failed = false,
-          uri = downloadUri,
-          destinationUri = destinationUri,
-          finalDestinationUri = finalDestinationUri,
-          downloadId = null,
-          progress = 0
-        )
-      }
+  private val clientEventEmitter = (object : DownloadItemManager.DownloadEventEmitter {
+    override fun onDownloadItem(downloadItem:DownloadItem) {
+      notifyListeners("onDownloadItem", JSObject(jacksonMapper.writeValueAsString(downloadItem)))
    }
-
-    @JsonIgnore
-    fun getDownloadRequest(): DownloadManager.Request {
-      val dlRequest = DownloadManager.Request(uri)
-      dlRequest.setTitle(filename)
-      dlRequest.setDescription("Downloading to $localFolderName for book $itemTitle")
-      dlRequest.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-      dlRequest.setDestinationUri(destinationUri)
-      return dlRequest
+    override fun onDownloadItemPartUpdate(downloadItemPart:DownloadItemPart) {
+      notifyListeners("onDownloadItemPartUpdate", JSObject(jacksonMapper.writeValueAsString(downloadItemPart)))
    }
-  }
-
-  data class DownloadItem(
-    val id: String,
-    val libraryItemId:String,
-    val episodeId:String?,
-    val userMediaProgress:MediaProgress?,
-    val serverConnectionConfigId:String,
-    val serverAddress:String,
-    val serverUserId:String,
-    val mediaType: String,
-    val itemFolderPath:String,
-    val localFolder: LocalFolder,
-    val itemTitle: String,
-    val media:MediaType,
-    val downloadItemParts: MutableList<DownloadItemPart>
-  )
-
-  var downloadQueue: MutableList<DownloadItem> = mutableListOf()
+    override fun onDownloadItemComplete(jsobj:JSObject) {
+      notifyListeners("onItemDownloadComplete", jsobj)
+    }
+  })

  override fun load() {
    mainActivity = (activity as MainActivity)
    downloadManager = activity.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
    folderScanner = FolderScanner(mainActivity)
    apiHandler = ApiHandler(mainActivity)
-
-    Log.d(tag, "Build SDK ${Build.VERSION.SDK_INT}")
+    downloadItemManager = DownloadItemManager(downloadManager, folderScanner, mainActivity, clientEventEmitter)
  }

  @PluginMethod
@@ -137,7 +62,7 @@ class AbsDownloader : Plugin() {
    Log.d(tag, "Download library item $libraryItemId to folder $localFolderId / episode: $episodeId")

    val downloadId = if (episodeId.isEmpty()) libraryItemId else "$libraryItemId-$episodeId"
-    if (downloadQueue.find { it.id == downloadId } != null) {
+    if (downloadItemManager.downloadItemQueue.find { it.id == downloadId } != null) {
      Log.d(tag, "Download already started for this media entity $downloadId")
      return call.resolve(JSObject("{\"error\":\"Download already started for this media entity\"}"))
    }
@@ -205,74 +130,84 @@ class AbsDownloader : Plugin() {
  private fun startLibraryItemDownload(libraryItem: LibraryItem, localFolder: LocalFolder, episode:PodcastEpisode?) {
    val tempFolderPath = mainActivity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)

+    Log.d(tag, "downloadCacheDirectory=$tempFolderPath")
+
    if (libraryItem.mediaType == "book") {
      val bookTitle = cleanStringForFileSystem(libraryItem.media.metadata.title)
+      val bookAuthor = cleanStringForFileSystem(libraryItem.media.metadata.getAuthorDisplayName())

      val tracks = libraryItem.media.getAudioTracks()
      Log.d(tag, "Starting library item download with ${tracks.size} tracks")
-      val itemFolderPath = localFolder.absolutePath + "/" + bookTitle
-      val downloadItem = DownloadItem(libraryItem.id, libraryItem.id, null, libraryItem.userMediaProgress,DeviceManager.serverConnectionConfig?.id ?: "", DeviceManager.serverAddress, DeviceManager.serverUserId, libraryItem.mediaType, itemFolderPath, localFolder, bookTitle, libraryItem.media, mutableListOf())
+      val itemSubfolder = "$bookAuthor/$bookTitle"
+      val itemFolderPath = "${localFolder.absolutePath}/$itemSubfolder"
+      val downloadItem = DownloadItem(libraryItem.id, libraryItem.id, null, libraryItem.userMediaProgress,DeviceManager.serverConnectionConfig?.id ?: "", DeviceManager.serverAddress, DeviceManager.serverUserId, libraryItem.mediaType, itemFolderPath, localFolder, bookTitle, itemSubfolder, libraryItem.media, mutableListOf())

      // Create download item part for each audio track
      tracks.forEach { audioTrack ->
+        val fileSize = audioTrack.metadata?.size ?: 0
        val serverPath = "/s/item/${libraryItem.id}/${cleanRelPath(audioTrack.relPath)}"
        val destinationFilename = getFilenameFromRelPath(audioTrack.relPath)
-        Log.d(tag, "Audio File Server Path $serverPath | AF RelPath ${audioTrack.relPath} | LocalFolder Path ${localFolder.absolutePath} | DestName ${destinationFilename}")
+        Log.d(tag, "Audio File Server Path $serverPath | AF RelPath ${audioTrack.relPath} | LocalFolder Path ${localFolder.absolutePath} | DestName $destinationFilename")

        val finalDestinationFile = File("$itemFolderPath/$destinationFilename")
        val destinationFile = File("$tempFolderPath/$destinationFilename")

+        if (destinationFile.exists()) {
+          Log.d(tag, "TEMP Audio file already exists, removing it from ${destinationFile.absolutePath}")
+          destinationFile.delete()
+        }
+
        if (finalDestinationFile.exists()) {
          Log.d(tag, "Audio file already exists, removing it from ${finalDestinationFile.absolutePath}")
          finalDestinationFile.delete()
        }

-        val downloadItemPart = DownloadItemPart.make(destinationFilename,destinationFile,finalDestinationFile,bookTitle,serverPath,localFolder,audioTrack,null)
+        val downloadItemPart = DownloadItemPart.make(downloadItem.id, destinationFilename, fileSize, destinationFile,finalDestinationFile,itemSubfolder,serverPath,localFolder,audioTrack,null)
        downloadItem.downloadItemParts.add(downloadItemPart)
-
-        val dlRequest = downloadItemPart.getDownloadRequest()
-        val downloadId = downloadManager.enqueue(dlRequest)
-        downloadItemPart.downloadId = downloadId
      }

      if (downloadItem.downloadItemParts.isNotEmpty()) {
        // Add cover download item
        if (libraryItem.media.coverPath != null && libraryItem.media.coverPath?.isNotEmpty() == true) {
+          val coverLibraryFile = libraryItem.libraryFiles?.find { it.metadata.path == libraryItem.media.coverPath }
+          val coverFileSize = coverLibraryFile?.metadata?.size ?: 0
+
          val serverPath = "/api/items/${libraryItem.id}/cover"
-          val destinationFilename = "cover.jpg"
+          val destinationFilename = "cover-${libraryItem.id}.jpg"
          val destinationFile = File("$tempFolderPath/$destinationFilename")
          val finalDestinationFile = File("$itemFolderPath/$destinationFilename")

+          if (destinationFile.exists()) {
+            Log.d(tag, "TEMP Audio file already exists, removing it from ${destinationFile.absolutePath}")
+            destinationFile.delete()
+          }
+
          if (finalDestinationFile.exists()) {
            Log.d(tag, "Cover already exists, removing it from ${finalDestinationFile.absolutePath}")
            finalDestinationFile.delete()
          }

-          val downloadItemPart = DownloadItemPart.make(destinationFilename,destinationFile,finalDestinationFile,bookTitle,serverPath,localFolder,null,null)
+          val downloadItemPart = DownloadItemPart.make(downloadItem.id, destinationFilename, coverFileSize,  destinationFile,finalDestinationFile,itemSubfolder,serverPath,localFolder,null,null)
          downloadItem.downloadItemParts.add(downloadItemPart)
-
-          val dlRequest = downloadItemPart.getDownloadRequest()
-          val downloadId = downloadManager.enqueue(dlRequest)
-          downloadItemPart.downloadId = downloadId
        }

-        downloadQueue.add(downloadItem)
-        startWatchingDownloads(downloadItem)
-        DeviceManager.dbManager.saveDownloadItem(downloadItem)
+        downloadItemManager.addDownloadItem(downloadItem)
      }
    } else {
      // Podcast episode download
      val podcastTitle = cleanStringForFileSystem(libraryItem.media.metadata.title)

      val audioTrack = episode?.audioTrack
+      val fileSize = audioTrack?.metadata?.size ?: 0
+
      Log.d(tag, "Starting podcast episode download")
      val itemFolderPath = localFolder.absolutePath + "/" + podcastTitle
      val downloadItemId = "${libraryItem.id}-${episode?.id}"
-      val downloadItem = DownloadItem(downloadItemId, libraryItem.id, episode?.id, libraryItem.userMediaProgress, DeviceManager.serverConnectionConfig?.id ?: "", DeviceManager.serverAddress, DeviceManager.serverUserId, libraryItem.mediaType, itemFolderPath, localFolder, podcastTitle, libraryItem.media, mutableListOf())
+      val downloadItem = DownloadItem(downloadItemId, libraryItem.id, episode?.id, libraryItem.userMediaProgress, DeviceManager.serverConnectionConfig?.id ?: "", DeviceManager.serverAddress, DeviceManager.serverUserId, libraryItem.mediaType, itemFolderPath, localFolder, podcastTitle, podcastTitle, libraryItem.media, mutableListOf())

      var serverPath = "/s/item/${libraryItem.id}/${cleanRelPath(audioTrack?.relPath ?: "")}"
      var destinationFilename = getFilenameFromRelPath(audioTrack?.relPath ?: "")
-      Log.d(tag, "Audio File Server Path $serverPath | AF RelPath ${audioTrack?.relPath} | LocalFolder Path ${localFolder.absolutePath} | DestName ${destinationFilename}")
+      Log.d(tag, "Audio File Server Path $serverPath | AF RelPath ${audioTrack?.relPath} | LocalFolder Path ${localFolder.absolutePath} | DestName $destinationFilename")

      var destinationFile = File("$tempFolderPath/$destinationFilename")
      var finalDestinationFile = File("$itemFolderPath/$destinationFilename")
@@ -281,14 +216,13 @@ class AbsDownloader : Plugin() {
        finalDestinationFile.delete()
      }

-      var downloadItemPart = DownloadItemPart.make(destinationFilename,destinationFile,finalDestinationFile,podcastTitle,serverPath,localFolder,audioTrack,episode)
+      var downloadItemPart = DownloadItemPart.make(downloadItem.id, destinationFilename,fileSize, destinationFile,finalDestinationFile,podcastTitle,serverPath,localFolder,audioTrack,episode)
      downloadItem.downloadItemParts.add(downloadItemPart)

-      var dlRequest = downloadItemPart.getDownloadRequest()
-      var downloadId = downloadManager.enqueue(dlRequest)
-      downloadItemPart.downloadId = downloadId
-
      if (libraryItem.media.coverPath != null && libraryItem.media.coverPath?.isNotEmpty() == true) {
+        val coverLibraryFile = libraryItem.libraryFiles?.find { it.metadata.path == libraryItem.media.coverPath }
+        val coverFileSize = coverLibraryFile?.metadata?.size ?: 0
+
        serverPath = "/api/items/${libraryItem.id}/cover"
        destinationFilename = "cover.jpg"

@@ -298,134 +232,12 @@ class AbsDownloader : Plugin() {
        if (finalDestinationFile.exists()) {
          Log.d(tag, "Podcast cover already exists - not downloading cover again")
        } else {
-          downloadItemPart = DownloadItemPart.make(destinationFilename,destinationFile,finalDestinationFile,podcastTitle,serverPath,localFolder,null,null)
+          downloadItemPart = DownloadItemPart.make(downloadItem.id, destinationFilename,coverFileSize,destinationFile,finalDestinationFile,podcastTitle,serverPath,localFolder,null,null)
          downloadItem.downloadItemParts.add(downloadItemPart)
-
-          dlRequest = downloadItemPart.getDownloadRequest()
-          downloadId = downloadManager.enqueue(dlRequest)
-          downloadItemPart.downloadId = downloadId
        }
      }

-      downloadQueue.add(downloadItem)
-      startWatchingDownloads(downloadItem)
-      DeviceManager.dbManager.saveDownloadItem(downloadItem)
-    }
-  }
-
-  private fun startWatchingDownloads(downloadItem: DownloadItem) {
-    GlobalScope.launch(Dispatchers.IO) {
-      while (downloadItem.downloadItemParts.find { !it.moved && !it.failed } != null) { // While some item is not completed
-        val numPartsBefore = downloadItem.downloadItemParts.size
-        checkDownloads(downloadItem)
-
-        // Keep database updated as item parts finish downloading
-        if (downloadItem.downloadItemParts.size > 0 && downloadItem.downloadItemParts.size != numPartsBefore) {
-          Log.d(tag, "Save download item on num parts changed from $numPartsBefore to ${downloadItem.downloadItemParts.size}")
-          DeviceManager.dbManager.saveDownloadItem(downloadItem)
-        }
-
-        notifyListeners("onItemDownloadUpdate", JSObject(jacksonMapper.writeValueAsString(downloadItem)))
-        delay(500)
-      }
-
-      // Remove download notifications
-      downloadItem.downloadItemParts.forEach { downloadItemPart ->
-        downloadItemPart.downloadId?.let {
-          downloadManager.remove(it)
-        }
-      }
-
-      val downloadItemScanResult = folderScanner.scanDownloadItem(downloadItem)
-      DeviceManager.dbManager.removeDownloadItem(downloadItem.id)
-      downloadQueue.remove(downloadItem)
-
-      Log.d(tag, "Item download complete ${downloadItem.itemTitle} | local library item id: ${downloadItemScanResult?.localLibraryItem?.id} | Items remaining in Queue ${downloadQueue.size}")
-
-      val jsobj = JSObject()
-      jsobj.put("libraryItemId", downloadItem.id)
-      jsobj.put("localFolderId", downloadItem.localFolder.id)
-
-      downloadItemScanResult?.localLibraryItem?.let { localLibraryItem ->
-        jsobj.put("localLibraryItem", JSObject(jacksonMapper.writeValueAsString(localLibraryItem)))
-      }
-      downloadItemScanResult?.localMediaProgress?.let { localMediaProgress ->
-        jsobj.put("localMediaProgress", JSObject(jacksonMapper.writeValueAsString(localMediaProgress)))
-      }
-      notifyListeners("onItemDownloadComplete", jsobj)
-    }
-  }
-
-  private fun checkDownloads(downloadItem: DownloadItem) {
-    val itemParts = downloadItem.downloadItemParts.map { it }
-    for (downloadItemPart in itemParts) {
-      if (downloadItemPart.downloadId != null) {
-        val dlid = downloadItemPart.downloadId!!
-        val query = DownloadManager.Query().setFilterById(dlid)
-        downloadManager.query(query).use {
-          if (it.moveToFirst()) {
-            val bytesColumnIndex = it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-            val statusColumnIndex = it.getColumnIndex(DownloadManager.COLUMN_STATUS)
-            val bytesDownloadedColumnIndex = it.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-
-            val totalBytes = if (bytesColumnIndex >= 0) it.getInt(bytesColumnIndex) else 0
-            val downloadStatus = if (statusColumnIndex >= 0) it.getInt(statusColumnIndex) else 0
-            val bytesDownloadedSoFar = if (bytesDownloadedColumnIndex >= 0) it.getInt(bytesDownloadedColumnIndex) else 0
-            Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} bytes $totalBytes | bytes dled $bytesDownloadedSoFar | downloadStatus $downloadStatus")
-
-            if (downloadStatus == DownloadManager.STATUS_SUCCESSFUL) {
-              // Once file download is complete move the file to the final destination
-              if (!downloadItemPart.completed) {
-                Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} Done")
-                downloadItemPart.completed = true
-
-                val file = DocumentFileCompat.fromUri(mainActivity, downloadItemPart.destinationUri)
-                Log.d(tag, "DOWNLOAD: Attempt move for file at destination ${downloadItemPart.destinationUri} | ${file?.getBasePath(mainActivity)}")
-
-                val fcb = object : FileCallback() {
-                  override fun onPrepare() {
-                    Log.d(tag, "DOWNLOAD: PREPARING MOVE FILE")
-                  }
-                  override fun onFailed(errorCode:ErrorCode) {
-                    Log.e(tag, "DOWNLOAD: FAILED TO MOVE FILE $errorCode")
-                    downloadItemPart.failed = true
-                    file?.delete()
-                  }
-                  override fun onCompleted(result:Any) {
-                    Log.d(tag, "DOWNLOAD: FILE MOVE COMPLETED")
-                    val resultDocFile = result as DocumentFile
-                    Log.d(tag, "DOWNLOAD: COMPLETED FILE INFO ${resultDocFile.getAbsolutePath(mainActivity)}")
-                    downloadItemPart.moved = true
-                  }
-                }
-
-                Log.d(tag, "DOWNLOAD: Move file to final destination path: ${downloadItemPart.finalDestinationPath}")
-                val localFolderFile = DocumentFileCompat.fromUri(mainActivity,Uri.parse(downloadItemPart.localFolderUrl))
-                if (localFolderFile == null) {
-                  Log.e(tag, "Local Folder File from uri is null")
-                } else {
-                  val mimetype = if (downloadItemPart.audioTrack != null) MimeType.AUDIO else MimeType.IMAGE
-                  val fileDescription = FileDescription(downloadItemPart.filename, downloadItemPart.itemTitle, mimetype)
-                  file?.moveFileTo(mainActivity,localFolderFile,fileDescription,fcb)
-                }
-              } else {
-                // Why is kotlin requiring an else here..
-              }
-            } else if (downloadStatus == DownloadManager.STATUS_FAILED) {
-              Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} Failed")
-              downloadItem.downloadItemParts.remove(downloadItemPart)
-            } else {
-              //update progress
-              val percentProgress = if (totalBytes > 0) ((bytesDownloadedSoFar * 100L) / totalBytes) else 0
-              Log.d(tag, "checkDownloads Download ${downloadItemPart.filename} Progress = $percentProgress%")
-              downloadItemPart.progress = percentProgress
-            }
-          } else {
-            Log.d(tag, "Download ${downloadItemPart.filename} not found in dlmanager")
-            downloadItem.downloadItemParts.remove(downloadItemPart)
-          }
-        }
-      }
+      downloadItemManager.addDownloadItem(downloadItem)
    }
  }
 }
@@ -28,7 +28,7 @@ import kotlinx.coroutines.launch
 class AbsFileSystem : Plugin() {
  private val TAG = "AbsFileSystem"
  private val tag = "AbsFileSystem"
-  var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())
+  private var jacksonMapper = jacksonObjectMapper().enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature())

  lateinit var mainActivity: MainActivity

@@ -85,21 +85,28 @@ class AbsFileSystem : Plugin() {
        call.resolve(JSObject(jacksonMapper.writeValueAsString(localFolder)))
      }

-      override fun onStorageAccessDenied(requestCode: Int, folder: DocumentFile?, storageType: StorageType) {
+      override fun onStorageAccessDenied(
+        requestCode: Int,
+        folder: DocumentFile?,
+        storageType: StorageType,
+        storageId: String
+      ) {
+        Log.e(tag, "Storage Access Denied ${folder?.getAbsolutePath(mainActivity)}")
+
        val jsobj = JSObject()
        if (requestCode == REQUEST_CODE_SELECT_FOLDER) {

          val builder: AlertDialog.Builder = AlertDialog.Builder(mainActivity)
          builder.setMessage(
            "You have no write access to this storage, thus selecting this folder is useless." +
-            "\nWould you like to grant access to this folder?")
+              "\nWould you like to grant access to this folder?")
          builder.setNegativeButton("Dont Allow") { _, _ ->
            run {
              jsobj.put("error", "User Canceled, Access Denied")
              call.resolve(jsobj)
            }
          }
-          builder.setPositiveButton("Allow.") { _, _ -> mainActivity.storageHelper.requestStorageAccess(REQUEST_CODE_SDCARD_ACCESS, storageType) }
+          builder.setPositiveButton("Allow.") { _, _ -> mainActivity.storageHelper.requestStorageAccess(REQUEST_CODE_SDCARD_ACCESS, initialPath = FileFullPath(mainActivity, storageId, "")) }
          builder.show()
        } else {
          Log.d(TAG, "STORAGE ACCESS DENIED $requestCode")
@@ -131,7 +138,7 @@ class AbsFileSystem : Plugin() {

  @PluginMethod
  fun checkStoragePermission(call: PluginCall) {
-    var res: Boolean
+    val res: Boolean
    if (Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.P) {
      res = SimpleStorage.hasStoragePermission(context)
      Log.d(TAG, "checkStoragePermission: Check Storage Access $res")
@@ -140,33 +147,33 @@ class AbsFileSystem : Plugin() {
      res = true
    }

-    var jsobj = JSObject()
+    val jsobj = JSObject()
    jsobj.put("value", res)
    call.resolve(jsobj)
  }

  @PluginMethod
  fun checkFolderPermissions(call: PluginCall) {
-    var folderUrl = call.data.getString("folderUrl", "").toString()
-      Log.d(TAG, "Check Folder Permissions for $folderUrl")
+    val folderUrl = call.data.getString("folderUrl", "").toString()
+    Log.d(TAG, "Check Folder Permissions for $folderUrl")

-    var hasAccess = SimpleStorage.hasStorageAccess(context,folderUrl,true)
+    val hasAccess = SimpleStorage.hasStorageAccess(context,folderUrl,true)

-    var jsobj = JSObject()
+    val jsobj = JSObject()
    jsobj.put("value", hasAccess)
    call.resolve(jsobj)
  }

  @PluginMethod
  fun scanFolder(call: PluginCall) {
-    var folderId =  call.data.getString("folderId", "").toString()
-    var forceAudioProbe = call.data.getBoolean("forceAudioProbe")
+    val folderId =  call.data.getString("folderId", "").toString()
+    val forceAudioProbe = call.data.getBoolean("forceAudioProbe")
    Log.d(TAG, "Scan Folder $folderId | Force Audio Probe $forceAudioProbe")

-    var folder: LocalFolder? = DeviceManager.dbManager.getLocalFolder(folderId)
+    val folder: LocalFolder? = DeviceManager.dbManager.getLocalFolder(folderId)
    folder?.let {
-      var folderScanner = FolderScanner(context)
-      var folderScanResult = folderScanner.scanForMediaItems(it, forceAudioProbe)
+      val folderScanner = FolderScanner(context)
+      val folderScanResult = folderScanner.scanForMediaItems(it, forceAudioProbe)
      if (folderScanResult == null) {
        Log.d(TAG, "NO Scan DATA")
        return call.resolve(JSObject())
@@ -179,28 +186,28 @@ class AbsFileSystem : Plugin() {

  @PluginMethod
  fun removeFolder(call: PluginCall) {
-    var folderId = call.data.getString("folderId", "").toString()
+    val folderId = call.data.getString("folderId", "").toString()
    DeviceManager.dbManager.removeLocalFolder(folderId)
    call.resolve()
  }

  @PluginMethod
  fun removeLocalLibraryItem(call: PluginCall) {
-    var localLibraryItemId = call.data.getString("localLibraryItemId", "").toString()
+    val localLibraryItemId = call.data.getString("localLibraryItemId", "").toString()
    DeviceManager.dbManager.removeLocalLibraryItem(localLibraryItemId)
    call.resolve()
  }

  @PluginMethod
  fun scanLocalLibraryItem(call: PluginCall) {
-    var localLibraryItemId = call.data.getString("localLibraryItemId", "").toString()
-    var forceAudioProbe = call.data.getBoolean("forceAudioProbe")
+    val localLibraryItemId = call.data.getString("localLibraryItemId", "").toString()
+    val forceAudioProbe = call.data.getBoolean("forceAudioProbe")
    Log.d(TAG, "Scan Local library item $localLibraryItemId | Force Audio Probe $forceAudioProbe")
    GlobalScope.launch(Dispatchers.IO) {
-      var localLibraryItem: LocalLibraryItem? = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
+      val localLibraryItem: LocalLibraryItem? = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
      localLibraryItem?.let {
-        var folderScanner = FolderScanner(context)
-        var scanResult = folderScanner.scanLocalLibraryItem(it, forceAudioProbe)
+        val folderScanner = FolderScanner(context)
+        val scanResult = folderScanner.scanLocalLibraryItem(it, forceAudioProbe)
        if (scanResult == null) {
          Log.d(TAG, "NO Scan DATA")
          call.resolve(JSObject())
@@ -214,13 +221,13 @@ class AbsFileSystem : Plugin() {

  @PluginMethod
  fun deleteItem(call: PluginCall) {
-    var localLibraryItemId = call.data.getString("id", "").toString()
-    var absolutePath = call.data.getString("absolutePath", "").toString()
-    var contentUrl = call.data.getString("contentUrl", "").toString()
+    val localLibraryItemId = call.data.getString("id", "").toString()
+    val absolutePath = call.data.getString("absolutePath", "").toString()
+    val contentUrl = call.data.getString("contentUrl", "").toString()
    Log.d(tag, "deleteItem $absolutePath | $contentUrl")

-    var docfile = DocumentFileCompat.fromUri(mainActivity, Uri.parse(contentUrl))
-    var success = docfile?.delete() == true
+    val docfile = DocumentFileCompat.fromUri(mainActivity, Uri.parse(contentUrl))
+    val success = docfile?.delete() == true
    if (success) {
      DeviceManager.dbManager.removeLocalLibraryItem(localLibraryItemId)
    }
@@ -229,19 +236,19 @@ class AbsFileSystem : Plugin() {

  @PluginMethod
  fun deleteTrackFromItem(call: PluginCall) {
-    var localLibraryItemId = call.data.getString("id", "").toString()
-    var trackLocalFileId = call.data.getString("trackLocalFileId", "").toString()
-    var contentUrl = call.data.getString("trackContentUrl", "").toString()
+    val localLibraryItemId = call.data.getString("id", "").toString()
+    val trackLocalFileId = call.data.getString("trackLocalFileId", "").toString()
+    val contentUrl = call.data.getString("trackContentUrl", "").toString()
    Log.d(tag, "deleteTrackFromItem $contentUrl")

-    var localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
+    val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
    if (localLibraryItem == null) {
      Log.e(tag, "deleteTrackFromItem: LLI does not exist $localLibraryItemId")
      return call.resolve(JSObject("{\"success\":false}"))
    }

-    var docfile = DocumentFileCompat.fromUri(mainActivity, Uri.parse(contentUrl))
-    var success = docfile?.delete() == true
+    val docfile = DocumentFileCompat.fromUri(mainActivity, Uri.parse(contentUrl))
+    val success = docfile?.delete() == true
    if (success) {
      localLibraryItem.media.removeAudioTrack(trackLocalFileId)
      localLibraryItem.removeLocalFile(trackLocalFileId)
@@ -1,12 +1,13 @@
 package com.audiobookshelf.app.server

 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
 import android.util.Log
 import com.audiobookshelf.app.data.*
 import com.audiobookshelf.app.device.DeviceManager
-import com.audiobookshelf.app.player.MediaProgressSyncData
+import com.audiobookshelf.app.media.MediaEventManager
+import com.audiobookshelf.app.media.MediaProgressSyncData
+import com.audiobookshelf.app.media.SyncResult
+import com.audiobookshelf.app.models.User
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.core.json.JsonReadFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -27,14 +28,14 @@ class ApiHandler(var ctx:Context) {

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

-  data class LocalMediaProgressSyncPayload(val localMediaProgress:List<LocalMediaProgress>)
+  data class LocalSessionsSyncRequestPayload(val sessions:List<PlaybackSession>)
  @JsonIgnoreProperties(ignoreUnknown = true)
-  data class MediaProgressSyncResponsePayload(val numServerProgressUpdates:Int, val localProgressUpdates:List<LocalMediaProgress>)
-  data class LocalMediaProgressSyncResultsPayload(var numLocalMediaProgressForServer:Int, var numServerProgressUpdates:Int, var numLocalProgressUpdates:Int)
+  data class LocalSessionSyncResult(val id:String, val success:Boolean, val progressSynced:Boolean?, val error:String?)
+  data class LocalSessionsSyncResponsePayload(val results:List<LocalSessionSyncResult>)

-  fun getRequest(endpoint:String, httpClient:OkHttpClient?, config:ServerConnectionConfig?, cb: (JSObject) -> Unit) {
+  private fun getRequest(endpoint:String, httpClient:OkHttpClient?, config:ServerConnectionConfig?, cb: (JSObject) -> Unit) {
    val address = config?.address ?: DeviceManager.serverAddress
    val token = config?.token ?: DeviceManager.token

@@ -44,18 +45,20 @@ class ApiHandler(var ctx:Context) {
    makeRequest(request, httpClient, cb)
  }

-  fun postRequest(endpoint:String, payload: JSObject, config:ServerConnectionConfig?, cb: (JSObject) -> Unit) {
+  private fun postRequest(endpoint:String, payload: JSObject, config:ServerConnectionConfig?, cb: (JSObject) -> Unit) {
    val address = config?.address ?: DeviceManager.serverAddress
    val token = config?.token ?: DeviceManager.token
    val mediaType = "application/json; charset=utf-8".toMediaType()
    val requestBody = payload.toString().toRequestBody(mediaType)
+    val requestUrl = "${address}$endpoint"
+    Log.d(tag, "postRequest to $requestUrl")
    val request = Request.Builder().post(requestBody)
-      .url("${address}$endpoint").addHeader("Authorization", "Bearer ${token}")
+      .url(requestUrl).addHeader("Authorization", "Bearer ${token}")
      .build()
    makeRequest(request, null, cb)
  }

-  fun patchRequest(endpoint:String, payload: JSObject, cb: (JSObject) -> Unit) {
+  private fun patchRequest(endpoint:String, payload: JSObject, cb: (JSObject) -> Unit) {
    val mediaType = "application/json; charset=utf-8".toMediaType()
    val requestBody = payload.toString().toRequestBody(mediaType)
    val request = Request.Builder().patch(requestBody)
@@ -64,31 +67,7 @@ class ApiHandler(var ctx:Context) {
    makeRequest(request, null, cb)
  }

-  fun isOnline(): Boolean {
-    val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-    val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
-    if (capabilities != null) {
-      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-        Log.i("Internet", "NetworkCapabilities.TRANSPORT_CELLULAR")
-        return true
-      } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
-        Log.i("Internet", "NetworkCapabilities.TRANSPORT_WIFI")
-        return true
-      } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
-        Log.i("Internet", "NetworkCapabilities.TRANSPORT_ETHERNET")
-        return true
-      }
-    }
-    return false
-  }
-
-  fun isUsingCellularData(): Boolean {
-    val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-    val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
-    return capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true
-  }
-
-  fun makeRequest(request:Request, httpClient:OkHttpClient?, cb: (JSObject) -> Unit) {
+  private 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) {
@@ -134,16 +113,32 @@ class ApiHandler(var ctx:Context) {
    })
  }

+  fun getCurrentUser(cb: (User?) -> Unit) {
+    getRequest("/api/me", null, null) {
+      if (it.has("error")) {
+        Log.e(tag, it.getString("error") ?: "getCurrentUser Failed")
+        cb(null)
+      } else {
+        val user = jacksonMapper.readValue<User>(it.toString())
+        cb(user)
+      }
+    }
+  }
+
  fun getLibraries(cb: (List<Library>) -> Unit) {
    val mapper = jacksonMapper
    getRequest("/api/libraries", null,null) {
      val libraries = mutableListOf<Library>()
-      if (it.has("value")) {
-        val array = it.getJSONArray("value")
-        for (i in 0 until array.length()) {
-          val library = mapper.readValue<Library>(array.get(i).toString())
-          libraries.add(library)
-        }
+
+      var array = JSONArray()
+      if (it.has("libraries")) { // TODO: Server 2.2.9 changed to this
+        array = it.getJSONArray("libraries")
+      } else if (it.has("value")) {
+        array = it.getJSONArray("value")
+      }
+
+      for (i in 0 until array.length()) {
+        libraries.add(mapper.readValue(array.get(i).toString()))
      }
      cb(libraries)
    }
@@ -222,76 +217,30 @@ class ApiHandler(var ctx:Context) {
    }
  }

-  fun sendProgressSync(sessionId:String, syncData: MediaProgressSyncData, cb: (Boolean) -> Unit) {
+  fun sendProgressSync(sessionId:String, syncData: MediaProgressSyncData, cb: (Boolean, String?) -> Unit) {
    val payload = JSObject(jacksonMapper.writeValueAsString(syncData))

    postRequest("/api/session/$sessionId/sync", payload, null) {
      if (!it.getString("error").isNullOrEmpty()) {
-        cb(false)
+        cb(false, it.getString("error"))
      } else {
-        cb(true)
+        cb(true, null)
      }
    }
  }

-  fun sendLocalProgressSync(playbackSession:PlaybackSession, cb: (Boolean) -> Unit) {
+  fun sendLocalProgressSync(playbackSession:PlaybackSession, cb: (Boolean, String?) -> Unit) {
    val payload = JSObject(jacksonMapper.writeValueAsString(playbackSession))

    postRequest("/api/session/local", payload, null) {
      if (!it.getString("error").isNullOrEmpty()) {
-        cb(false)
+        cb(false, it.getString("error"))
      } else {
-        cb(true)
+        cb(true, null)
      }
    }
  }

-  fun syncMediaProgress(cb: (LocalMediaProgressSyncResultsPayload) -> Unit) {
-    if (!isOnline()) {
-      Log.d(tag, "Error not online")
-      cb(LocalMediaProgressSyncResultsPayload(0,0,0))
-      return
-    }
-
-    // Get all local media progress connected to items on the current connected server
-    val localMediaProgress = DeviceManager.dbManager.getAllLocalMediaProgress().filter {
-      it.serverConnectionConfigId == DeviceManager.serverConnectionConfig?.id
-    }
-
-    val localSyncResultsPayload = LocalMediaProgressSyncResultsPayload(localMediaProgress.size,0, 0)
-
-    if (localMediaProgress.isNotEmpty()) {
-      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, null) {
-        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())
-
-          localSyncResultsPayload.numLocalProgressUpdates = progressSyncResponsePayload.localProgressUpdates.size
-          localSyncResultsPayload.numServerProgressUpdates = progressSyncResponsePayload.numServerProgressUpdates
-          Log.d(tag, "Media Progress Sync | Local Updates: $localSyncResultsPayload")
-          if (progressSyncResponsePayload.localProgressUpdates.isNotEmpty()) {
-            // Update all local media progress
-            progressSyncResponsePayload.localProgressUpdates.forEach { localMediaProgress ->
-              DeviceManager.dbManager.saveLocalMediaProgress(localMediaProgress)
-            }
-          }
-        }
-
-        cb(localSyncResultsPayload)
-      }
-    } else {
-      Log.d(tag, "No local media progress to sync")
-      cb(localSyncResultsPayload)
-    }
-  }
-
  fun updateMediaProgress(libraryItemId:String,episodeId:String?,updatePayload:JSObject, cb: () -> Unit) {
    Log.d(tag, "updateMediaProgress $libraryItemId $episodeId $updatePayload")
    val endpoint = if(episodeId.isNullOrEmpty()) "/api/me/progress/$libraryItemId" else "/api/me/progress/$libraryItemId/$episodeId"
@@ -317,6 +266,7 @@ class ApiHandler(var ctx:Context) {
  }

  fun getPlaybackSession(playbackSessionId:String, cb: (PlaybackSession?) -> Unit) {
+    Log.d(tag, "getPlaybackSession for $playbackSessionId for server ${DeviceManager.serverAddress}")
    val endpoint = "/api/session/$playbackSessionId"
    getRequest(endpoint, null, null) {
      val err = it.getString("error")
@@ -362,4 +312,55 @@ class ApiHandler(var ctx:Context) {
      }
    }
  }
+
+  fun sendSyncLocalSessions(playbackSessions:List<PlaybackSession>, cb: (Boolean, String?) -> Unit) {
+    val payload = JSObject(jacksonMapper.writeValueAsString(LocalSessionsSyncRequestPayload(playbackSessions)))
+
+    postRequest("/api/session/local-all", payload, null) {
+      if (!it.getString("error").isNullOrEmpty()) {
+        cb(false, it.getString("error"))
+      } else {
+        val response = jacksonMapper.readValue<LocalSessionsSyncResponsePayload>(it.toString())
+        response.results.forEach { localSessionSyncResult ->
+          playbackSessions.find { ps -> ps.id == localSessionSyncResult.id }?.let { session ->
+            if (localSessionSyncResult.progressSynced == true) {
+              val syncResult = SyncResult(true, true, "Progress synced on server")
+              MediaEventManager.saveEvent(session, syncResult)
+              DeviceManager.dbManager.removePlaybackSession(session.id)
+              Log.i(tag, "Successfully synced session ${session.displayTitle} with server")
+            } else if (!localSessionSyncResult.success) {
+              Log.e(tag, "Failed to sync session ${session.displayTitle} with server. Error: ${localSessionSyncResult.error}")
+            }
+          }
+        }
+        cb(true, null)
+      }
+    }
+  }
+
+  fun syncLocalMediaProgressForUser(cb: () -> Unit) {
+    // Get all local media progress for this server
+    val allLocalMediaProgress = DeviceManager.dbManager.getAllLocalMediaProgress().filter { it.serverConnectionConfigId == DeviceManager.serverConnectionConfigId }
+    if (allLocalMediaProgress.isEmpty()) {
+      Log.d(tag, "No local media progress to sync")
+      return cb()
+    }
+
+    getCurrentUser { _user ->
+      _user?.let { user->
+        // Compare server user progress with local progress
+        user.mediaProgress.forEach { mediaProgress ->
+          // Get matching local media progress
+          allLocalMediaProgress.find { it.isMatch(mediaProgress) }?.let { localMediaProgress ->
+            if (mediaProgress.lastUpdate > localMediaProgress.lastUpdate) {
+              Log.d(tag, "Server progress for media item id=\"${mediaProgress.mediaItemId}\" is more recent then local. Updating local current time ${localMediaProgress.currentTime} to ${mediaProgress.currentTime}")
+              localMediaProgress.updateFromServerMediaProgress(mediaProgress)
+              MediaEventManager.syncEvent(mediaProgress, "Sync on server connection")
+            }
+          }
+        }
+      }
+      cb()
+    }
+  }
 }
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="272"
+    android:viewportHeight="181.125"
+    android:tint="#FFFFFF">
+  <group android:scaleY="0.6659007"
+      android:translateY="30.256865">
+    <group android:translateY="144.77344">
+      <path android:pathData="M7,-50.96875Q7,-69.375,10.6875,-80.84375Q14.390625,-92.328125,21.671875,-98.15625Q28.953125,-104,40,-104Q48.140625,-104,54.53125,-100.625Q60.9375,-97.265625,64.6875,-90.921875Q68.4375,-84.59375,70.71875,-75.5Q73,-66.40625,73,-50.96875Q73,-32.703125,69.34375,-21.21875Q65.6875,-9.75,58.390625,-3.875Q51.109375,2,40,2Q25.359375,2,17.015625,-8.265625Q7,-21.71875,7,-50.96875ZM20,-51Q20,-25.828125,25.765625,-17.90625Q31.53125,-10,40,-10Q48.46875,-10,54.234375,-17.953125Q60,-25.90625,60,-51Q60,-75.734375,54.359375,-83.859375Q48.71875,-92,39.859375,-92Q31.40625,-92,26.09375,-84.828125Q20,-75.671875,20,-51Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.6"/>
+      <path android:pathData="M93,0L93,-13L106,-13L106,0L93,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.6"/>
+      <path android:pathData="M127,-27L140,-28Q141.42188,-19.03125,146.32812,-14.515625Q151.25,-10,159.04688,-10Q168.59375,-10,174.29688,-16.53125Q180,-23.0625,180,-33.859375Q180,-44.140625,174.70312,-50.0625Q169.42188,-56,159.5,-56Q153.29688,-56,148.95312,-53.5Q144.625,-51,142,-47L129,-49L140,-102L188,-102L188,-89L150.54688,-89L145.28125,-61.0625Q153.875,-68,163.3125,-68Q175.8125,-68,184.40625,-58.65625Q193,-49.328125,193,-34.65625Q193,-20.671875,185.125,-10.5Q175.54688,2,158.98438,2Q145.40625,2,136.8125,-5.9375Q128.21875,-13.875,127,-27Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.6"/>
+      <path android:pathData="M201,0L228.85938,-38L203,-75L218.57812,-75L230.82812,-57.484375Q234.23438,-52.609375,236.84375,-48.890625Q239.65625,-52.71875,242.28125,-56.296875L256,-75L271.875,-75L244.59375,-37.796875L271,0L255.42188,0L239.48438,-22.796875L236.60938,-26.90625L216.875,0L201,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.6"/>
+    </group>
+  </group>
+</vector>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="272"
+    android:viewportHeight="181.125"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.0434783"
+      android:scaleY="0.69485295"
+      android:translateX="-11.826087"
+      android:translateY="27.63488">
+    <group android:translateY="144.77344">
+      <path android:pathData="M54,-0L41,-0L41,-81.03125Q36.484375,-76.65625,29.15625,-72.265625Q21.828125,-67.890625,16,-65.703125L16,-78Q26.546875,-83.015625,34.4375,-90.140625Q42.34375,-97.28125,45.625,-104L54,-104L54,-0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M93,0L93,-13L106,-13L106,0L93,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M127,-50.96875Q127,-69.375,130.6875,-80.84375Q134.39062,-92.328125,141.67188,-98.15625Q148.95312,-104,160,-104Q168.14062,-104,174.53125,-100.625Q180.9375,-97.265625,184.6875,-90.921875Q188.4375,-84.59375,190.71875,-75.5Q193,-66.40625,193,-50.96875Q193,-32.703125,189.34375,-21.21875Q185.6875,-9.75,178.39062,-3.875Q171.10938,2,160,2Q145.35938,2,137.01562,-8.265625Q127,-21.71875,127,-50.96875ZM140,-51Q140,-25.828125,145.76562,-17.90625Q151.53125,-10,160,-10Q168.46875,-10,174.23438,-17.953125Q180,-25.90625,180,-51Q180,-75.734375,174.35938,-83.859375Q168.71875,-92,159.85938,-92Q151.40625,-92,146.09375,-84.828125Q140,-75.671875,140,-51Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M201,0L228.85938,-38L203,-75L218.57812,-75L230.82812,-57.484375Q234.23438,-52.609375,236.84375,-48.890625Q239.65625,-52.71875,242.28125,-56.296875L256,-75L271.875,-75L244.59375,-37.796875L271,0L255.42188,0L239.48438,-22.796875L236.60938,-26.90625L216.875,0L201,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+    </group>
+  </group>
+</vector>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="272"
+    android:viewportHeight="181.125"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.0434783"
+      android:scaleY="0.69485295"
+      android:translateX="-11.826087"
+      android:translateY="27.63488">
+    <group android:translateY="144.77344">
+      <path android:pathData="M54,-0L41,-0L41,-81.03125Q36.484375,-76.65625,29.15625,-72.265625Q21.828125,-67.890625,16,-65.703125L16,-78Q26.546875,-83.015625,34.4375,-90.140625Q42.34375,-97.28125,45.625,-104L54,-104L54,-0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M93,0L93,-13L106,-13L106,0L93,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M192,-13L192,0L124,0Q123.859375,-4.75,125.421875,-9.125Q127.921875,-16.359375,133.4375,-23.25Q138.96875,-30.140625,149.64062,-38.6875Q166.21875,-52.625,172.10938,-60.28125Q178,-67.9375,178,-75.015625Q178,-82.171875,172.70312,-87.078125Q167.40625,-92,158.875,-92Q149.875,-92,144.46875,-86.953125Q139.0625,-81.921875,139,-73L126,-75Q127.328125,-89.15625,135.95312,-96.578125Q144.59375,-104,159.15625,-104Q173.85938,-104,182.42188,-95.71875Q191,-87.4375,191,-75.203125Q191,-68.96875,188.59375,-62.953125Q186.20312,-56.9375,180.64062,-50.28125Q175.09375,-43.640625,161.73438,-32.375Q150.35938,-23.03125,146.96875,-19.6875Q143.59375,-16.359375,141.39062,-13L192,-13Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M201,0L228.85938,-38L203,-75L218.57812,-75L230.82812,-57.484375Q234.23438,-52.609375,236.84375,-48.890625Q239.65625,-52.71875,242.28125,-56.296875L256,-75L271.875,-75L244.59375,-37.796875L271,0L255.42188,0L239.48438,-22.796875L236.60938,-26.90625L216.875,0L201,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+    </group>
+  </group>
+</vector>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="272"
+    android:viewportHeight="181.125"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.0434783"
+      android:scaleY="0.69485295"
+      android:translateX="-11.826087"
+      android:translateY="27.63488">
+    <group android:translateY="144.77344">
+      <path android:pathData="M54,-0L41,-0L41,-81.03125Q36.484375,-76.65625,29.15625,-72.265625Q21.828125,-67.890625,16,-65.703125L16,-78Q26.546875,-83.015625,34.4375,-90.140625Q42.34375,-97.28125,45.625,-104L54,-104L54,-0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M93,0L93,-13L106,-13L106,0L93,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M127,-27L140,-28Q141.42188,-19.03125,146.32812,-14.515625Q151.25,-10,159.04688,-10Q168.59375,-10,174.29688,-16.53125Q180,-23.0625,180,-33.859375Q180,-44.140625,174.70312,-50.0625Q169.42188,-56,159.5,-56Q153.29688,-56,148.95312,-53.5Q144.625,-51,142,-47L129,-49L140,-102L188,-102L188,-89L150.54688,-89L145.28125,-61.0625Q153.875,-68,163.3125,-68Q175.8125,-68,184.40625,-58.65625Q193,-49.328125,193,-34.65625Q193,-20.671875,185.125,-10.5Q175.54688,2,158.98438,2Q145.40625,2,136.8125,-5.9375Q128.21875,-13.875,127,-27Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M201,0L228.85938,-38L203,-75L218.57812,-75L230.82812,-57.484375Q234.23438,-52.609375,236.84375,-48.890625Q239.65625,-52.71875,242.28125,-56.296875L256,-75L271.875,-75L244.59375,-37.796875L271,0L255.42188,0L239.48438,-22.796875L236.60938,-26.90625L216.875,0L201,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+    </group>
+  </group>
+</vector>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="272"
+    android:viewportHeight="181.125"
+    android:tint="#FFFFFF">
+  <group android:scaleY="0.6659007"
+      android:translateY="30.256865">
+    <group android:translateY="144.77344">
+      <path android:pathData="M72,-13L72,-0L4,-0Q3.859375,-4.75,5.421875,-9.125Q7.921875,-16.359375,13.4375,-23.25Q18.96875,-30.140625,29.640625,-38.6875Q46.21875,-52.625,52.109375,-60.28125Q58,-67.9375,58,-75.015625Q58,-82.171875,52.703125,-87.078125Q47.40625,-92,38.875,-92Q29.875,-92,24.46875,-86.953125Q19.0625,-81.921875,19,-73L6,-75Q7.328125,-89.15625,15.953125,-96.578125Q24.59375,-104,39.15625,-104Q53.859375,-104,62.421875,-95.71875Q71,-87.4375,71,-75.203125Q71,-68.96875,68.59375,-62.953125Q66.203125,-56.9375,60.640625,-50.28125Q55.09375,-43.640625,41.734375,-32.375Q30.359375,-23.03125,26.96875,-19.6875Q23.59375,-16.359375,21.390625,-13L72,-13Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M93,0L93,-13L106,-13L106,0L93,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M127,-50.96875Q127,-69.375,130.6875,-80.84375Q134.39062,-92.328125,141.67188,-98.15625Q148.95312,-104,160,-104Q168.14062,-104,174.53125,-100.625Q180.9375,-97.265625,184.6875,-90.921875Q188.4375,-84.59375,190.71875,-75.5Q193,-66.40625,193,-50.96875Q193,-32.703125,189.34375,-21.21875Q185.6875,-9.75,178.39062,-3.875Q171.10938,2,160,2Q145.35938,2,137.01562,-8.265625Q127,-21.71875,127,-50.96875ZM140,-51Q140,-25.828125,145.76562,-17.90625Q151.53125,-10,160,-10Q168.46875,-10,174.23438,-17.953125Q180,-25.90625,180,-51Q180,-75.734375,174.35938,-83.859375Q168.71875,-92,159.85938,-92Q151.40625,-92,146.09375,-84.828125Q140,-75.671875,140,-51Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M201,0L228.85938,-38L203,-75L218.57812,-75L230.82812,-57.484375Q234.23438,-52.609375,236.84375,-48.890625Q239.65625,-52.71875,242.28125,-56.296875L256,-75L271.875,-75L244.59375,-37.796875L271,0L255.42188,0L239.48438,-22.796875L236.60938,-26.90625L216.875,0L201,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+    </group>
+  </group>
+</vector>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="272"
+    android:viewportHeight="181.125"
+    android:tint="#FFFFFF">
+  <group android:scaleY="0.6659007"
+      android:translateY="30.256865">
+    <group android:translateY="144.77344">
+      <path android:pathData="M7,-27L20,-29Q22.109375,-18.90625,26.90625,-14.453125Q31.71875,-10,39.484375,-10Q48.609375,-10,54.296875,-16Q60,-22.015625,60,-30.90625Q60,-39.375,54.5,-44.890625Q49,-50.40625,40.515625,-50.40625Q37.046875,-50.40625,31.890625,-49L33.25,-61Q34.46875,-60.859375,35.203125,-60.859375Q42.8125,-60.859375,48.90625,-64.796875Q55,-68.75,55,-76.953125Q55,-83.46875,50.484375,-87.734375Q45.984375,-92,38.84375,-92Q31.765625,-92,27.046875,-87.75Q22.34375,-83.5,21,-75L8,-77Q10.28125,-89.859375,18.34375,-96.921875Q26.40625,-104,38.40625,-104Q46.6875,-104,53.65625,-100.390625Q60.625,-96.796875,64.3125,-90.578125Q68,-84.359375,68,-77.359375Q68,-70.71875,64.40625,-65.265625Q60.828125,-59.8125,53.796875,-56.59375Q62.9375,-54.453125,67.96875,-47.6875Q73,-40.9375,73,-30.796875Q73,-17.078125,63.375,-7.53125Q53.75,2,39.03125,2Q25.765625,2,17,-6.078125Q8.234375,-14.15625,7,-27Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M93,0L93,-13L106,-13L106,0L93,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M127,-50.96875Q127,-69.375,130.6875,-80.84375Q134.39062,-92.328125,141.67188,-98.15625Q148.95312,-104,160,-104Q168.14062,-104,174.53125,-100.625Q180.9375,-97.265625,184.6875,-90.921875Q188.4375,-84.59375,190.71875,-75.5Q193,-66.40625,193,-50.96875Q193,-32.703125,189.34375,-21.21875Q185.6875,-9.75,178.39062,-3.875Q171.10938,2,160,2Q145.35938,2,137.01562,-8.265625Q127,-21.71875,127,-50.96875ZM140,-51Q140,-25.828125,145.76562,-17.90625Q151.53125,-10,160,-10Q168.46875,-10,174.23438,-17.953125Q180,-25.90625,180,-51Q180,-75.734375,174.35938,-83.859375Q168.71875,-92,159.85938,-92Q151.40625,-92,146.09375,-84.828125Q140,-75.671875,140,-51Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+      <path android:pathData="M201,0L228.85938,-38L203,-75L218.57812,-75L230.82812,-57.484375Q234.23438,-52.609375,236.84375,-48.890625Q239.65625,-52.71875,242.28125,-56.296875L256,-75L271.875,-75L244.59375,-37.796875L271,0L255.42188,0L239.48438,-22.796875L236.60938,-26.90625L216.875,0L201,0Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.8"/>
+    </group>
+  </group>
+</vector>
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24"
+  android:tint="#FFFFFF">
+  <group android:scaleX="1.127451"
+    android:scaleY="1.127451"
+    android:translateX="-1.5294118"
+    android:translateY="-1.5294118">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+  </group>
+</vector>
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24"
+  android:tint="#FFFFFF">
+  <group android:scaleX="1.127451"
+    android:scaleY="1.127451"
+    android:translateX="-1.5294118"
+    android:translateY="-1.5294118">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+  </group>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+  android:tint="#FFFFFF">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
--- a/Show More
+++ b/Show More