Skip to content

Commit 3e22a04

Browse files
Merge pull request #55 from readium/fixes/various-lcp
various lcp fixes
2 parents b5be090 + 82a1ae5 commit 3e22a04

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/license/License.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class License(private var documents: ValidatedDocuments,
171171
} catch (e: LCPError) {
172172
completion(LCPError.wrap(e))
173173
}
174-
174+
completion(null)
175175
}
176176

177177
override val canReturnPublication: Boolean
@@ -197,6 +197,7 @@ class License(private var documents: ValidatedDocuments,
197197
}
198198
completion(null)
199199
}
200+
completion(null)
200201
}
201202

202203
init {

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/public/LCPError.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ sealed class StatusError : LCPError() {
113113
override val errorDescription: String?
114114
get() {
115115
return when (this) {
116-
is cancelled -> "You have cancelled this license on ${date.toLocalDate()}."
116+
is cancelled -> "This license was cancelled on ${date.toLocalDate()}."
117117
is returned -> "This license has been returned on ${date.toLocalDate()}."
118118
is expired -> {
119119
if (start > DateTime()) {
@@ -122,7 +122,7 @@ sealed class StatusError : LCPError() {
122122
"This license expired on ${end.toLocalDate()}."
123123
}
124124
}
125-
is revoked -> "This license has been revoked by its provider on ${date.toLocalDate()}. The license was registered by $devicesCount device${if (devicesCount > 1) "s" else ""}."
125+
is revoked -> "This license was revoked by its provider on ${date.toLocalDate()}. It was registered by $devicesCount device${if (devicesCount > 1) "s" else ""}."
126126
}
127127
}
128128

0 commit comments

Comments
 (0)