Skip to content

Commit b88435d

Browse files
Merge pull request #717 from THEOplayer/release/v10.7.1
Release/v10.7.1
2 parents 8279a34 + 3e54e79 commit b88435d

6 files changed

Lines changed: 14780 additions & 14737 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [10.7.1] - 26-01-06
9+
10+
### Added
11+
12+
- Added a `multiSession` property to `DRMConfiguration` to enable multi-key content on Android platforms.
13+
814
## [10.7.0] - 25-12-19
915

1016
### Added

android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const val PROP_LICENSE_TYPE_TEMPORARY: String = "temporary"
4444
const val PROP_LICENSE_TYPE_PERSISTENT: String = "persistent"
4545
const val PROP_QUERY_PARAMETERS: String = "queryParameters"
4646
const val PROP_CERTIFICATE: String = "certificate"
47+
const val PROP_MULTISESSION: String = "multiSession"
4748
const val PROP_KEYS: String = "keys"
4849
const val PROP_ID: String = "id"
4950
const val PROP_VALUE: String = "value"
@@ -104,6 +105,9 @@ object ContentProtectionAdapter {
104105
if (jsonConfig.has(PROP_INTEGRATION_PARAMETERS)) {
105106
integrationParameters(fromJSONObjectToMap(jsonConfig.getJSONObject(PROP_INTEGRATION_PARAMETERS)))
106107
}
108+
if (jsonConfig.has(PROP_MULTISESSION)) {
109+
multiSession(jsonConfig.getBoolean(PROP_MULTISESSION))
110+
}
107111
queryParameters(fromJSONObjectToMap(jsonConfig.optJSONObject(PROP_QUERY_PARAMETERS)))
108112
}.build()
109113
}

0 commit comments

Comments
 (0)