Skip to content

Commit e129905

Browse files
authored
Simplify LcpService.injectLicense (readium#479)
1 parent 5746e7f commit e129905

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

readium/lcp/src/main/java/org/readium/r2/lcp/LcpService.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import org.readium.r2.shared.util.Try
2929
import org.readium.r2.shared.util.asset.Asset
3030
import org.readium.r2.shared.util.asset.AssetRetriever
3131
import org.readium.r2.shared.util.format.Format
32-
import org.readium.r2.shared.util.mediatype.MediaType
3332

3433
/**
3534
* Service used to acquire and open publications protected with LCP.
@@ -126,8 +125,7 @@ public interface LcpService {
126125
*/
127126
public suspend fun injectLicenseDocument(
128127
licenseDocument: LicenseDocument,
129-
publicationFile: File,
130-
mediaType: MediaType? = null
128+
publicationFile: File
131129
): Try<Unit, LcpError>
132130

133131
/**

readium/lcp/src/main/java/org/readium/r2/lcp/service/LicensesService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ internal class LicensesService(
6868

6969
override suspend fun injectLicenseDocument(
7070
licenseDocument: LicenseDocument,
71-
publicationFile: File,
72-
mediaType: MediaType?
71+
publicationFile: File
7372
): Try<Unit, LcpError> {
73+
val mediaType = licenseDocument.publicationLink.mediaType
7474
val format = assetRetriever.sniffFormat(publicationFile, FormatHints(mediaType))
7575
.getOrElse {
7676
Format(

0 commit comments

Comments
 (0)