Upgrade to Readium 2 3.0.0 (PP-1731)

ThePalaceProject · Sep 24, 2024 · 49d4144 · 49d4144
1 parent 6117ae8
commit 49d4144
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 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-24T10:46:30+00:00" is-open="true" 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,16 @@
         <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-24T10:46:30+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:releases>

diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
diff --git a/simplified-tests/src/test/java/org/nypl/simplified/tests/mocking/MockLCPService.kt b/simplified-tests/src/test/java/org/nypl/simplified/tests/mocking/MockLCPService.kt
@@ -11,6 +11,7 @@ import org.readium.r2.lcp.license.model.LicenseDocument
 import org.readium.r2.shared.publication.protection.ContentProtection
 import org.readium.r2.shared.util.Try
 import org.readium.r2.shared.util.asset.Asset
+import org.readium.r2.shared.util.asset.ContainerAsset
 import java.io.File
 
 class MockLCPService(
@@ -76,6 +77,12 @@ class MockLCPService(
     return Try.failure(LcpError.LicenseProfileNotSupported)
   }
 
+  override suspend fun retrieveLicenseDocument(
+    asset: ContainerAsset
+  ): Try<LicenseDocument, LcpError> {
+    return Try.failure(LcpError.LicenseProfileNotSupported)
+  }
+
   @Deprecated(
     "Use an AssetSniffer and check the conformance of the returned format to LcpSpecification",
     level = DeprecationLevel.ERROR

diff --git a/...iewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderDocument.kt b/...iewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderDocument.kt
@@ -19,6 +19,10 @@ class PdfReaderDocument(
   override val title: String?
     get() = metadata.title
 
+  override fun close() {
+    // Nothing required
+  }
+
   override val author: String?
     get() = metadata.author
 
@@ -57,10 +61,6 @@ class PdfReaderDocument(
     core.getTableOfContents(document).map { it.toOutlineNode() }
   }
 
-  override suspend fun close() {
-    // do nothing
-  }
-
   private fun PdfiumDocument.Bookmark.toOutlineNode(): PdfDocument.OutlineNode {
     return PdfDocument.OutlineNode(
       title = title,