Merge branch 'feature/last-position-store'

Author: io7m

VERSIONING.txt

@@ -10,3 +10,5 @@
 #
 #   ./gradlew verifySemanticVersioning
 #
+
+org.librarysimplified.audiobook.persistence.internal

build.gradle.kts

@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.de.undercouch.gradle.tasks.download.Verify
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
-val gradleVersionRequired = "8.10.2"
+val gradleVersionRequired = "8.14.3"
 val gradleVersionReceived = gradle.gradleVersion
 
 if (gradleVersionRequired != gradleVersionReceived) {
@@ -40,11 +40,11 @@ plugins {
         .apply(false)
 
     id("com.android.library")
-        .version("8.5.0")
+        .version("8.11.0")
         .apply(false)
 
     id("com.android.application")
-        .version("8.5.0")
+        .version("8.11.0")
         .apply(false)
 
     /*

gradle.properties

@@ -21,11 +21,11 @@ VERSION_PREVIOUS=16.1.0
 android.useAndroidX=true
 android.enableJetifier=true
 
-org.thepalaceproject.build.androidSDKCompile=34
-org.thepalaceproject.build.androidSDKTarget=34
+org.thepalaceproject.build.androidSDKCompile=35
+org.thepalaceproject.build.androidSDKTarget=35
 org.thepalaceproject.build.androidSDKMinimum=26
 org.thepalaceproject.build.checkSemanticVersioning=true
 org.thepalaceproject.build.enableKtLint=true
-org.thepalaceproject.build.jdkBytecodeTarget=11
+org.thepalaceproject.build.jdkBytecodeTarget=17
 org.thepalaceproject.build.jdkBuild=17
 org.thepalaceproject.build.publishSources=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -26,6 +26,7 @@ dependencies {
     implementation(project(":org.librarysimplified.audiobook.manifest_parser.webpub"))
     implementation(project(":org.librarysimplified.audiobook.media3"))
     implementation(project(":org.librarysimplified.audiobook.parser.api"))
+    implementation(project(":org.librarysimplified.audiobook.persistence"))
     implementation(project(":org.librarysimplified.audiobook.time_tracking"))
     implementation(project(":org.librarysimplified.audiobook.views"))
 
@@ -149,6 +150,23 @@ dependencies {
     implementation(libs.rxjava2)
     implementation(libs.slf4j)
 
+    // SQLite
+    implementation(libs.io7m.anethum.api)
+    implementation(libs.io7m.blackthorne.core)
+    implementation(libs.io7m.blackthorne.jxe)
+    implementation(libs.io7m.jaffirm.core)
+    implementation(libs.io7m.jattribute.core)
+    implementation(libs.io7m.jlexing.core)
+    implementation(libs.io7m.junreachable)
+    implementation(libs.io7m.jxe.core)
+    implementation(libs.io7m.seltzer.api)
+    implementation(libs.io7m.trasco.api)
+    implementation(libs.io7m.trasco.vanilla)
+    implementation(libs.io7m.trasco.xml.schemas)
+    implementation(libs.io7m.xyloid.natives)
+    implementation(libs.xerces)
+    implementation(libs.xerial.sqlite)
+
     if (lcpDRM) {
         implementation(libs.palace.liblcp) {
             artifact {

org.librarysimplified.audiobook.demo/build.gradle.kts

@@ -174,6 +174,17 @@ class ExamplePlayerActivity : AppCompatActivity(R.layout.example_player_activity
         )
 
         PlayerBookmarkModel.setBookmarks(bookmarkDatabase.bookmarkList(bookId))
+
+        PlayerUIThread.runOnUIThread {
+          try {
+            Toast.makeText(this, "" +
+              "Created bookmark",
+              Toast.LENGTH_LONG
+            ).show()
+          } catch (e: Throwable) {
+            // Don't care
+          }
+        }
       }
 
       is PlayerEvent.PlayerEventDeleteBookmark -> {
@@ -189,6 +200,17 @@ class ExamplePlayerActivity : AppCompatActivity(R.layout.example_player_activity
           bookId,
           event.bookmark
         )
+
+        PlayerUIThread.runOnUIThread {
+          try {
+            Toast.makeText(this, "" +
+              "Deleted bookmark",
+              Toast.LENGTH_LONG
+            ).show()
+          } catch (e: Throwable) {
+            // Don't care
+          }
+        }
       }
 
       is PlayerEvent.PlayerEventError,
@@ -241,25 +263,14 @@ class ExamplePlayerActivity : AppCompatActivity(R.layout.example_player_activity
           ExampleApplication.application.bookmarkDatabase
         val bookmarksAll =
           bookmarkDatabase.bookmarkList(bookId)
-        val bookmarkLastRead =
-          bookmarkDatabase.bookmarkFindLastRead(bookId)
 
         PlayerBookmarkModel.setBookmarks(bookmarksAll)
 
-        val initialPosition =
-          if (bookmarkLastRead != null) {
-            this.logger.debug("Restoring last-read position: {}", bookmarkLastRead.position)
-            bookmarkLastRead.position
-          } else {
-            null
-          }
-
         PlayerModel.openPlayerForManifest(
           context = ExampleApplication.application,
           userAgent = PlayerUserAgent("AudioBookDemo"),
           manifest = state.manifest,
           fetchAll = true,
-          initialPosition = initialPosition,
           bookSource = state.bookSource,
           bookCredentials = state.bookCredentials
         )
@@ -281,6 +292,19 @@ class ExamplePlayerActivity : AppCompatActivity(R.layout.example_player_activity
           PlayerModel.bookTitle = manifest.metadata.title
           PlayerModel.bookAuthor = "An Example Author."
         }
+
+        val start = state.positionOnOpen
+        if (start != null) {
+          try {
+            Toast.makeText(this, "" +
+              "Starting at saved position: ${start.readingOrderID.text} ${start.offsetMilliseconds.value}",
+              Toast.LENGTH_LONG
+            ).show()
+          } catch (e: Throwable) {
+            // Don't care
+          }
+        }
+
         this.switchFragment(PlayerFragment())
       }
 

org.librarysimplified.audiobook.demo/src/main/java/org/librarysimplified/audiobook/demo/ExamplePlayerActivity.kt

@@ -21,6 +21,7 @@ import org.librarysimplified.audiobook.api.PlayerEvent.PlayerEventWithPosition.P
 import org.librarysimplified.audiobook.api.PlayerEvent.PlayerEventWithPosition.PlayerEventPlaybackStarted
 import org.librarysimplified.audiobook.api.PlayerEvent.PlayerEventWithPosition.PlayerEventPlaybackStopped
 import org.librarysimplified.audiobook.api.PlayerEvent.PlayerEventWithPosition.PlayerEventPlaybackWaitingForAction
+import org.librarysimplified.audiobook.api.PlayerPlaybackStatus
 import org.librarysimplified.audiobook.api.PlayerType
 import org.librarysimplified.audiobook.manifest.api.PlayerMillisecondsReadingOrderItem
 import org.slf4j.LoggerFactory
@@ -87,6 +88,16 @@ class ExoBookmarkObserver private constructor(
       return
     }
 
+    /*
+     * Paranoia: Do not create bookmarks unless the player says that it is actually playing. We
+     * have seen player bugs in the past where the player gives nonsense position updates when
+     * it is stopped.
+     */
+
+    if (this.player.playbackStatus != PlayerPlaybackStatus.PLAYING) {
+      return
+    }
+
     /*
      * Do not create bookmarks any more frequently than the waiting period.
      */