diff --git a/README-CHANGES.xml b/README-CHANGES.xml index 963e98786..eb0f6f284 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -522,7 +522,7 @@ - + @@ -535,11 +535,16 @@ - + + + + + + diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform index 2da3a8034..83d23654c 160000 --- a/org.thepalaceproject.android.platform +++ b/org.thepalaceproject.android.platform @@ -1 +1 @@ -Subproject commit 2da3a80343cb4e95262ab1f087bc2ca42c81e034 +Subproject commit 83d23654c656881f97502fd2e316e4b7a38d3583 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 index 3d2a1d2db..7b3f67385 100644 --- 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 { + 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/simplified-viewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderDocument.kt b/simplified-viewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderDocument.kt index c9f40d863..91c21ed73 100644 --- a/simplified-viewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderDocument.kt +++ b/simplified-viewer-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,