Merge branch 'feature/new-audiobook-player'

.ci-local/tag-prefix.conf

@@ -0,0 +1,8 @@
+palace
+
+#
+# The first line of this file specifies a prefix to use to generate tags when releases are tagged
+# by CI. Everything else in the file is ignored.
+#
+# The final name of the tag will be ${TAG_PREFIX}-${VERSION_NAME}.
+#

.github/workflows/android-release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Verify release branch
         run: .ci/ci-verify-release-branch.sh
       - name: Finish release
-        run: .ci/ci-release-finish.sh --tag
+        run: .ci/ci-release-finish.sh
       - name: Create GitHub release
         uses: softprops/action-gh-release@v2
         env:

README-CHANGES.xml

@@ -522,8 +522,17 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2024-04-09T09:52:40+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.12.0">
-      <c:changes/>
+    <c:release date="2024-05-03T11:05:31+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.13.0">
+      <c:changes>
+        <c:change date="2024-05-03T11:05:31+00:00" summary="Integrate the new audiobook player components.">
+          <c:tickets>
+            <c:ticket id="PP-1074"/>
+            <c:ticket id="PP-1075"/>
+            <c:ticket id="PP-1076"/>
+            <c:ticket id="PP-1082"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
     </c:release>
   </c:releases>
   <c:ticket-systems>

gradle.properties

@@ -11,7 +11,7 @@ POM_SCM_CONNECTION=scm:git:git://github.com/ThePalaceProject/android-core
 POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/ThePalaceProject/android-core
 POM_SCM_URL=http://github.com/ThePalaceProject/android-core
 POM_URL=http://github.com/ThePalaceProject/android-core
-VERSION_NAME=1.12.0-SNAPSHOT
+VERSION_NAME=1.13.0-SNAPSHOT
 VERSION_CODE_BASE=70000
 
 android.useAndroidX=true

simplified-viewer-audiobook/src/main/java/org/librarysimplified/viewer/audiobook/AudioBookPlayerActivity.kt → junk/AudioBookPlayerActivity.kt

@@ -167,7 +167,7 @@ class AudioBookPlayerActivity :
   private val reloadingManifest = AtomicBoolean(false)
 
   private val currentBookmarks =
-    Collections.synchronizedList(arrayListOf<Bookmark.AudiobookBookmark>())
+    Collections.synchronizedList(arrayListOf<Bookmark.ObsoleteAudiobookBookmark>())
 
   @Volatile
   private var destroying: Boolean = false
@@ -353,7 +353,7 @@ class AudioBookPlayerActivity :
 
   private fun savePlayerPosition(event: PlayerEventCreateBookmark) {
     try {
-      val bookmark = Bookmark.AudiobookBookmark.create(
+      val bookmark = Bookmark.ObsoleteAudiobookBookmark.create(
         opdsId = this.parameters.opdsEntry.id,
         location = PlayerPosition(
           title = event.spineElement.position.title,
@@ -690,7 +690,7 @@ class AudioBookPlayerActivity :
 
     try {
       val audiobookBookmarks = bookmarks
-        .filterIsInstance<Bookmark.AudiobookBookmark>()
+        .filterIsInstance<Bookmark.ObsoleteAudiobookBookmark>()
 
       val bookMarkLastReadPosition = audiobookBookmarks.find { bookmark ->
         bookmark.kind == BookmarkKind.BookmarkLastReadLocation
@@ -1058,7 +1058,7 @@ class AudioBookPlayerActivity :
           bookmark = bookmark,
           ignoreRemoteFailures = true
         ).map { savedBookmark ->
-          this.currentBookmarks.add(savedBookmark as Bookmark.AudiobookBookmark)
+          this.currentBookmarks.add(savedBookmark as Bookmark.ObsoleteAudiobookBookmark)
           this.showToastMessage(R.string.audio_book_player_bookmark_added)
         }.onAnyError {
           /* Otherwise, something in the chain failed. */

simplified-accounts-api/src/main/java/org/nypl/simplified/accounts/api/AccountDescription.java

@@ -2,8 +2,6 @@
 
 import com.google.auto.value.AutoValue;
 
-import java.net.URI;
-
 /**
  * A description of an account.
  */

simplified-accounts-api/src/main/java/org/nypl/simplified/accounts/api/AccountUnknownProviderException.kt

@@ -1,7 +1,5 @@
 package org.nypl.simplified.accounts.api
 
-import java.lang.Exception
-
 /**
  * An unrecognized provider was specified when trying to create an account.
  */

simplified-accounts-api/src/main/java/org/nypl/simplified/accounts/api/AccountUnresolvableProviderException.kt

@@ -1,7 +1,5 @@
 package org.nypl.simplified.accounts.api
 
-import java.lang.Exception
-
 /**
  * An unresolvable provider was specified when trying to create an account.
  */

simplified-accounts-json/src/main/java/org/nypl/simplified/accounts/json/AccountPreferencesJSON.kt

@@ -8,7 +8,6 @@ import org.nypl.simplified.accounts.api.AccountPreferences
 import org.nypl.simplified.json.core.JSONParseException
 import org.nypl.simplified.json.core.JSONParserUtilities
 import org.slf4j.LoggerFactory
-import java.lang.Exception
 import java.util.UUID
 
 /**

simplified-accounts-json/src/main/java/org/nypl/simplified/accounts/json/AccountProvidersJSON.kt

@@ -17,8 +17,8 @@ import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.BasicToken
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.COPPAAgeGate
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.ANONYMOUS_TYPE
-import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.BASIC_TYPE
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.BASIC_TOKEN_TYPE
+import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.BASIC_TYPE
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.COPPA_TYPE
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.OAUTH_INTERMEDIARY_TYPE
 import org.nypl.simplified.accounts.api.AccountProviderAuthenticationDescription.Companion.SAML_2_0_TYPE
@@ -486,7 +486,7 @@ object AccountProvidersJSON {
         val logoURI =
           JSONParserUtilities.getURIOrNull(container, "logo")
         val authenticationURI =
-          JSONParserUtilities.getURIOrNull(container, "authenticationURI")
+          JSONParserUtilities.getURI(container, "authenticationURI")
 
         BasicToken(
           authenticationURI = authenticationURI,
@@ -503,9 +503,9 @@ object AccountProvidersJSON {
       COPPA_TYPE -> {
         COPPAAgeGate(
           greaterEqual13 =
-          JSONParserUtilities.getURIOrNull(container, "greaterEqual13"),
+          JSONParserUtilities.getURI(container, "greaterEqual13"),
           under13 =
-          JSONParserUtilities.getURIOrNull(container, "under13")
+          JSONParserUtilities.getURI(container, "under13")
         )
       }
       else -> {

simplified-accounts-json/src/main/java/org/nypl/simplified/accounts/json/internal/AccountAuthenticationCredentialsAdobeJSON.kt

@@ -2,13 +2,13 @@ package org.nypl.simplified.accounts.json.internal
 
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.io7m.jfunctional.Some
+import org.nypl.drm.core.AdobeDeviceID
+import org.nypl.drm.core.AdobeUserID
+import org.nypl.drm.core.AdobeVendorID
 import org.nypl.simplified.accounts.api.AccountAuthenticationAdobeClientToken
 import org.nypl.simplified.accounts.api.AccountAuthenticationAdobePostActivationCredentials
 import org.nypl.simplified.accounts.api.AccountAuthenticationAdobePreActivationCredentials
 import org.nypl.simplified.json.core.JSONParserUtilities
-import org.nypl.drm.core.AdobeDeviceID
-import org.nypl.drm.core.AdobeUserID
-import org.nypl.drm.core.AdobeVendorID
 
 object AccountAuthenticationCredentialsAdobeJSON {
 

simplified-adobe-extensions/src/main/java/org/nypl/simplified/adobe/extensions/AdobeDRMExtensions.kt

@@ -2,9 +2,6 @@ package org.nypl.simplified.adobe.extensions
 
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
-import org.nypl.simplified.accounts.api.AccountAuthenticationAdobeClientToken
-import org.nypl.simplified.accounts.api.AccountAuthenticationAdobePostActivationCredentials
-import org.nypl.simplified.files.FileUtilities
 import org.nypl.drm.core.AdobeAdeptActivationReceiverType
 import org.nypl.drm.core.AdobeAdeptConnectorType
 import org.nypl.drm.core.AdobeAdeptDeactivationReceiverType
@@ -15,6 +12,9 @@ import org.nypl.drm.core.AdobeAdeptLoanReturnListenerType
 import org.nypl.drm.core.AdobeDeviceID
 import org.nypl.drm.core.AdobeUserID
 import org.nypl.drm.core.AdobeVendorID
+import org.nypl.simplified.accounts.api.AccountAuthenticationAdobeClientToken
+import org.nypl.simplified.accounts.api.AccountAuthenticationAdobePostActivationCredentials
+import org.nypl.simplified.files.FileUtilities
 import java.io.File
 import java.util.concurrent.CancellationException
 

simplified-adobe-extensions/src/main/java/org/nypl/simplified/adobe/extensions/AdobeDRMServices.java

@@ -20,10 +20,6 @@
 
 import org.joda.time.Instant;
 import org.librarysimplified.adobe.extensions.BuildConfig;
-import org.nypl.simplified.files.DirectoryUtilities;
-import org.nypl.simplified.json.core.JSONParserUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.nypl.drm.core.AdobeAdeptConnectorFactory;
 import org.nypl.drm.core.AdobeAdeptConnectorFactoryType;
 import org.nypl.drm.core.AdobeAdeptConnectorParameters;
@@ -38,6 +34,10 @@
 import org.nypl.drm.core.AdobeAdeptResourceProviderType;
 import org.nypl.drm.core.DRMException;
 import org.nypl.drm.core.DRMUnsupportedException;
+import org.nypl.simplified.files.DirectoryUtilities;
+import org.nypl.simplified.json.core.JSONParserUtilities;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

simplified-app-palace/build.gradle.kts

@@ -356,6 +356,9 @@ dependencies {
      */
 
     if (findawayDRM) {
+        implementation(libs.palace.audiobook.audioengine)
+
+        // Findaway transitive dependencies.
         implementation(libs.dagger)
         implementation(libs.exoplayer2.core)
         implementation(libs.findaway)
@@ -373,12 +376,12 @@ dependencies {
         implementation(libs.moshi.kotlin)
         implementation(libs.okhttp3)
         implementation(libs.okhttp3.logging.interceptor)
-        implementation(libs.palace.findaway)
         implementation(libs.retrofit2)
         implementation(libs.retrofit2.adapter.rxjava)
         implementation(libs.retrofit2.converter.gson)
         implementation(libs.retrofit2.converter.moshi)
         implementation(libs.rxandroid)
+        implementation(libs.rxjava)
         implementation(libs.rxrelay)
         implementation(libs.sqlbrite)
         implementation(libs.stately.common)
@@ -492,6 +495,7 @@ dependencies {
     implementation(libs.androidx.viewpager)
     implementation(libs.androidx.viewpager2)
     implementation(libs.androidx.webkit)
+
     implementation(libs.azam.ulidj)
     implementation(libs.commons.compress)
     implementation(libs.firebase.analytics)
@@ -538,6 +542,7 @@ dependencies {
     implementation(libs.javax.inject)
     implementation(libs.joda.time)
     implementation(libs.jsoup)
+    implementation(libs.kabstand)
     implementation(libs.koi.core)
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
@@ -557,7 +562,6 @@ dependencies {
     implementation(libs.palace.audiobook.http)
     implementation(libs.palace.audiobook.json.canon)
     implementation(libs.palace.audiobook.json.web.token)
-    implementation(libs.palace.audiobook.lcp)
     implementation(libs.palace.audiobook.lcp.license.status)
     implementation(libs.palace.audiobook.license.check.api)
     implementation(libs.palace.audiobook.license.check.spi)
@@ -569,9 +573,8 @@ dependencies {
     implementation(libs.palace.audiobook.manifest.parser.api)
     implementation(libs.palace.audiobook.manifest.parser.extension.spi)
     implementation(libs.palace.audiobook.manifest.parser.webpub)
-    implementation(libs.palace.audiobook.open.access)
+    implementation(libs.palace.audiobook.media3)
     implementation(libs.palace.audiobook.parser.api)
-    implementation(libs.palace.audiobook.rbdigital)
     implementation(libs.palace.audiobook.views)
     implementation(libs.palace.drm.core)
     implementation(libs.palace.http.api)

simplified-app-palace/src/main/AndroidManifest.xml

@@ -88,7 +88,7 @@
       android:label="@string/app_name" />
 
     <activity
-      android:name="org.librarysimplified.viewer.audiobook.AudioBookPlayerActivity"
+      android:name="org.librarysimplified.viewer.audiobook.AudioBookPlayerActivity2"
       android:contentDescription="@string/app_name"
       android:exported="false"
       android:label="@string/app_name"

simplified-app-palace/src/main/java/org/thepalaceproject/palace/PalaceBuildConfigurationService.kt

@@ -1,9 +1,9 @@
 package org.thepalaceproject.palace
 
+import org.librarysimplified.main.BuildConfig
 import org.nypl.simplified.buildconfig.api.BuildConfigOAuthScheme
 import org.nypl.simplified.buildconfig.api.BuildConfigurationAccountsRegistryURIs
 import org.nypl.simplified.buildconfig.api.BuildConfigurationServiceType
-import org.librarysimplified.main.BuildConfig
 import java.net.URI
 
 class PalaceBuildConfigurationService : BuildConfigurationServiceType {