Merge branch 'main' into feature/lcp-streaming

ThePalaceProject · Oct 25, 2024 · e8ee010 · e8ee010
2 parents a21ee42 + 3a533ae
commit e8ee010
Show file tree

Hide file tree

Showing 132 changed files with 6,961 additions and 1,521 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -522,7 +522,7 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2024-06-05T19:03:47+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.13.0">
+    <c:release date="2024-09-27T00:00:00+00:00" is-open="false" ticket-system="org.lyrasis.jira" version="1.13.0">
       <c:changes>
         <c:change date="2024-05-03T00:00:00+00:00" summary="Integrate the new audiobook player components.">
           <c:tickets>
@@ -535,11 +535,44 @@
         <c:change date="2024-05-31T00:00:00+00:00" summary="Require APK 26 (Android 8.0)"/>
         <c:change date="2024-05-31T00:00:00+00:00" summary="Upgrade to R2 3.0.0-beta.1."/>
         <c:change date="2024-05-31T00:00:00+00:00" summary="Upgrade to liblcp-4.1.0."/>
-        <c:change date="2024-06-05T19:03:47+00:00" summary="Implement the new audiobooks TOC.">
+        <c:change date="2024-06-05T00:00:00+00:00" summary="Implement the new audiobooks TOC.">
           <c:tickets>
             <c:ticket id="PP-1301"/>
           </c:tickets>
         </c:change>
+        <c:change date="2024-09-24T00:00:00+00:00" summary="Upgrade to Readium 2 3.0.0.">
+          <c:tickets>
+            <c:ticket id="PP-1731"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
+    </c:release>
+    <c:release date="2024-10-03T00:00:00+00:00" is-open="false" ticket-system="org.lyrasis.jira" version="1.13.1">
+      <c:changes>
+        <c:change date="2024-10-01T00:00:00+00:00" summary="Fix a lifecycle crash in the audiobook TOC.">
+          <c:tickets>
+            <c:ticket id="PP-1772"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
+    </c:release>
+    <c:release date="2024-10-17T16:11:02+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.14.0">
+      <c:changes>
+        <c:change date="2024-10-03T00:00:00+00:00" summary="Repair book previews.">
+          <c:tickets>
+            <c:ticket id="PP-1765"/>
+          </c:tickets>
+        </c:change>
+        <c:change date="2024-10-03T00:00:00+00:00" summary="Fix an unlikely crash in the audiobooks toolbar.">
+          <c:tickets>
+            <c:ticket id="PP-1789"/>
+          </c:tickets>
+        </c:change>
+        <c:change date="2024-10-17T16:11:02+00:00" summary="Rewrite time tracking.">
+          <c:tickets>
+            <c:ticket id="PP-1704"/>
+          </c:tickets>
+        </c:change>
       </c:changes>
     </c:release>
   </c:releases>

diff --git a/gradle.properties b/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.13.0-SNAPSHOT
+VERSION_NAME=1.14.0-SNAPSHOT
 VERSION_CODE_BASE=70000
 
 android.useAndroidX=true

diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -262,7 +262,6 @@ include(":simplified-buildconfig-api")
 include(":simplified-content-api")
 include(":simplified-crashlytics")
 include(":simplified-crashlytics-api")
-include(":simplified-deeplinks-controller-api")
 include(":simplified-documents")
 include(":simplified-feeds-api")
 include(":simplified-files")

diff --git a/.../main/java/org/nypl/simplified/accounts/json/AccountAuthenticationCredentialsStoreJSON.kt b/.../main/java/org/nypl/simplified/accounts/json/AccountAuthenticationCredentialsStoreJSON.kt
@@ -130,7 +130,7 @@ object AccountAuthenticationCredentialsStoreJSON {
         result[accountID] =
           AccountAuthenticationCredentialsJSON.deserializeFromJSON(credentials.get(key))
       } catch (e: Exception) {
-        this.logger.error("error deserializing credential: ", e)
+        this.logger.debug("error deserializing credential: ", e)
       }
     }
 

diff --git a/...d-accounts-json/src/main/java/org/nypl/simplified/accounts/json/AccountPreferencesJSON.kt b/...d-accounts-json/src/main/java/org/nypl/simplified/accounts/json/AccountPreferencesJSON.kt
@@ -50,12 +50,12 @@ object AccountPreferencesJSON {
         try {
           results.add(UUID.fromString(JSONParserUtilities.checkString(item)))
         } catch (e: Exception) {
-          this.logger.error("unable to parse acknowledgement: ", e)
+          this.logger.debug("unable to parse acknowledgement: ", e)
         }
       }
       return results.toList()
     } catch (e: Exception) {
-      this.logger.error("unable to parse acknowledgements: ", e)
+      this.logger.debug("unable to parse acknowledgements: ", e)
       return emptyList()
     }
   }

diff --git a/...ied-accounts-json/src/main/java/org/nypl/simplified/accounts/json/AccountProvidersJSON.kt b/...ied-accounts-json/src/main/java/org/nypl/simplified/accounts/json/AccountProvidersJSON.kt
@@ -361,7 +361,7 @@ object AccountProvidersJSON {
         try {
           items.add(AnnouncementJSON.deserializeFromJSON(node))
         } catch (e: Exception) {
-          this.logger.error("unable to parse announcement: ", e)
+          this.logger.debug("unable to parse announcement: ", e)
         }
       }
       items.toList()

diff --git a/...s-registry/src/main/java/org/nypl/simplified/accounts/registry/AccountProviderRegistry.kt b/...s-registry/src/main/java/org/nypl/simplified/accounts/registry/AccountProviderRegistry.kt
@@ -218,7 +218,7 @@ class AccountProviderRegistry private constructor(
       )
       return taskRecorder.finishFailure()
     } catch (e: Exception) {
-      this.logger.error("resolution exception: ", e)
+      this.logger.debug("resolution exception: ", e)
       val message = e.message ?: e.javaClass.canonicalName ?: "unknown"
       taskRecorder.currentStepFailedAppending(
         message = message,

diff --git a/...main/java/org/nypl/simplified/accounts/source/filebased/AccountProviderSourceFileBased.kt b/...main/java/org/nypl/simplified/accounts/source/filebased/AccountProviderSourceFileBased.kt
@@ -47,7 +47,7 @@ class AccountProviderSourceFileBased(
         SourceResult.SourceSucceeded(this.mapResult(newResult))
       }
     } catch (e: Exception) {
-      this.logger.error("failed to load providers from file: ", e)
+      this.logger.debug("failed to load providers from file: ", e)
       SourceResult.SourceFailed(mapOf(), e)
     }
   }

diff --git a/...c/main/java/org/nypl/simplified/accounts/source/nyplregistry/AccountProviderResolution.kt b/...c/main/java/org/nypl/simplified/accounts/source/nyplregistry/AccountProviderResolution.kt
@@ -139,7 +139,7 @@ class AccountProviderResolution(
 
       taskRecorder.finishSuccess(accountProvider)
     } catch (e: Exception) {
-      this.logger.error("failed to resolve account provider: ", e)
+      this.logger.debug("failed to resolve account provider: ", e)
       taskRecorder.currentStepFailedAppending(
         message = this.stringResources.resolvingUnexpectedException,
         errorCode = unexpectedException(this.description),

diff --git a/...ava/org/nypl/simplified/accounts/source/nyplregistry/AccountProviderSourceNYPLRegistry.kt b/...ava/org/nypl/simplified/accounts/source/nyplregistry/AccountProviderSourceNYPLRegistry.kt
@@ -110,7 +110,7 @@ class AccountProviderSourceNYPLRegistry(
       this.cacheServerResults(files, mergedResults)
       SourceResult.SourceSucceeded(mergedResults)
     } catch (e: Exception) {
-      this.logger.error("failed to fetch providers: ", e)
+      this.logger.debug("failed to fetch providers: ", e)
       SourceResult.SourceFailed(diskResults, e)
     }
   }

diff --git a/simplified-analytics-api/src/main/java/org/nypl/simplified/analytics/api/Analytics.kt b/simplified-analytics-api/src/main/java/org/nypl/simplified/analytics/api/Analytics.kt
@@ -59,7 +59,7 @@ class Analytics private constructor(
       try {
         system.onAnalyticsEvent(event)
       } catch (e: Exception) {
-        this.logger.error("failed to publish analytics event: ", e)
+        this.logger.debug("failed to publish analytics event: ", e)
       }
     }
 }
diff --git a/simplified-app-palace/build.gradle.kts b/simplified-app-palace/build.gradle.kts
@@ -270,7 +270,6 @@ dependencies {
     implementation(project(":simplified-content-api"))
     implementation(project(":simplified-crashlytics"))
     implementation(project(":simplified-crashlytics-api"))
-    implementation(project(":simplified-deeplinks-controller-api"))
     implementation(project(":simplified-documents"))
     implementation(project(":simplified-feeds-api"))
     implementation(project(":simplified-files"))
@@ -497,6 +496,8 @@ dependencies {
     implementation(libs.androidx.webkit)
 
     implementation(libs.azam.ulidj)
+    implementation(libs.commons.compress)
+    implementation(libs.commons.io)
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.annotations)
     implementation(libs.firebase.common)
@@ -522,7 +523,9 @@ dependencies {
     implementation(libs.google.gson)
     implementation(libs.google.guava)
     implementation(libs.google.material)
+    implementation(libs.io7m.jattribute.core)
     implementation(libs.io7m.jfunctional)
+    implementation(libs.io7m.jmulticlose)
     implementation(libs.io7m.jnull)
     implementation(libs.irradia.fieldrush.api)
     implementation(libs.irradia.fieldrush.vanilla)
@@ -575,6 +578,7 @@ dependencies {
     implementation(libs.palace.audiobook.manifest.parser.webpub)
     implementation(libs.palace.audiobook.media3)
     implementation(libs.palace.audiobook.parser.api)
+    implementation(libs.palace.audiobook.time.tracking)
     implementation(libs.palace.audiobook.views)
     implementation(libs.palace.drm.core)
     implementation(libs.palace.http.api)

diff --git a/simplified-bookmarks-api/build.gradle.kts b/simplified-bookmarks-api/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(libs.palace.audiobook.api)
     implementation(libs.rxjava2)
+    implementation(libs.slf4j)
 
     compileOnly(libs.google.auto.value)
     annotationProcessor(libs.google.auto.value.processor)

diff --git a/...fied-bookmarks-api/src/main/java/org/nypl/simplified/bookmarks/api/BookmarkAnnotations.kt b/...fied-bookmarks-api/src/main/java/org/nypl/simplified/bookmarks/api/BookmarkAnnotations.kt
@@ -5,7 +5,7 @@ import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.ISODateTimeFormat
 import org.nypl.simplified.books.api.bookmark.BookmarkKind
 import org.nypl.simplified.books.api.bookmark.SerializedBookmark
-import org.nypl.simplified.books.api.bookmark.SerializedBookmark20210828
+import org.nypl.simplified.books.api.bookmark.SerializedBookmark20240424
 import org.nypl.simplified.books.api.bookmark.SerializedLocators
 import java.net.URI
 
@@ -108,7 +108,7 @@ object BookmarkAnnotations {
     val location =
       SerializedLocators.parseLocator(objectMapper.readTree(annotation.target.selector.value))
 
-    return SerializedBookmark20210828(
+    return SerializedBookmark20240424(
       deviceID = annotation.body.device,
       kind = annotation.kind,
       location = location,

diff --git a/...-bookmarks-api/src/main/java/org/nypl/simplified/bookmarks/api/BookmarkAnnotationsJSON.kt b/...-bookmarks-api/src/main/java/org/nypl/simplified/bookmarks/api/BookmarkAnnotationsJSON.kt
@@ -1,6 +1,5 @@
 package org.nypl.simplified.bookmarks.api
 
-import android.util.Log
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
@@ -11,9 +10,13 @@ import com.io7m.jfunctional.Some
 import org.nypl.simplified.books.api.bookmark.SerializedLocators
 import org.nypl.simplified.json.core.JSONParseException
 import org.nypl.simplified.json.core.JSONParserUtilities
+import org.slf4j.LoggerFactory
 
 object BookmarkAnnotationsJSON {
 
+  private val logger =
+    LoggerFactory.getLogger(BookmarkAnnotationsJSON::class.java)
+
   @Throws(JSONParseException::class)
   fun deserializeSelectorNodeFromJSON(
     objectMapper: ObjectMapper,
@@ -224,7 +227,7 @@ object BookmarkAnnotationsJSON {
         )
         bookmarkAnnotations.add(bookmarkAnnotation)
       } catch (exception: JSONParseException) {
-        Log.d("BookmarkAnnotationsJSON", "Error deserializing bookmark annotation")
+        this.logger.debug("Error deserializing bookmark annotation: ", exception)
       }
     }
 

diff --git a/simplified-bookmarks/src/main/java/org/nypl/simplified/bookmarks/internal/BService.kt b/simplified-bookmarks/src/main/java/org/nypl/simplified/bookmarks/internal/BService.kt
@@ -131,7 +131,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("sync: unable to sync profile: ", e)
+      this.logger.debug("sync: unable to sync profile: ", e)
       this.failedFuture<Void>(e)
     }
   }
@@ -179,7 +179,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("sync: unable to sync account: ", e)
+      this.logger.debug("sync: unable to sync account: ", e)
       this.failedFuture(e)
     }
   }
@@ -207,7 +207,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("bookmarkLoad: ", e)
+      this.logger.debug("bookmarkLoad: ", e)
       this.failedFuture(e)
     }
   }
@@ -227,7 +227,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("bookmarkCreateLocal: ", e)
+      this.logger.debug("bookmarkCreateLocal: ", e)
       this.failedFuture(e)
     }
   }
@@ -248,7 +248,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("bookmarkCreateRemote: ", e)
+      this.logger.debug("bookmarkCreateRemote: ", e)
       this.failedFuture(e)
     }
   }
@@ -272,7 +272,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("bookmarkCreate: ", e)
+      this.logger.debug("bookmarkCreate: ", e)
       this.failedFuture(e)
     }
   }
@@ -294,7 +294,7 @@ class BService(
         )
       )
     } catch (e: Throwable) {
-      this.logger.error("bookmarkLoad: ", e)
+      this.logger.debug("bookmarkLoad: ", e)
       this.failedFuture(e)
     }
   }

diff --git a/...rks/src/main/java/org/nypl/simplified/bookmarks/internal/BServiceOpCreateLocalBookmark.kt b/...rks/src/main/java/org/nypl/simplified/bookmarks/internal/BServiceOpCreateLocalBookmark.kt
@@ -53,7 +53,7 @@ internal class BServiceOpCreateLocalBookmark(
 
       this.bookmark
     } catch (e: Exception) {
-      this.logger.error("error saving bookmark locally: ", e)
+      this.logger.debug("error saving bookmark locally: ", e)
       throw e
     }
   }

diff --git a/...ks/src/main/java/org/nypl/simplified/bookmarks/internal/BServiceOpCreateRemoteBookmark.kt b/...ks/src/main/java/org/nypl/simplified/bookmarks/internal/BServiceOpCreateRemoteBookmark.kt
@@ -57,7 +57,7 @@ internal class BServiceOpCreateRemoteBookmark(
 
       return this.bookmark.withURI(bookmarkUri)
     } catch (e: Exception) {
-      this.logger.error("error sending bookmark: ", e)
+      this.logger.debug("error sending bookmark: ", e)
       throw e
     }
   }