Merge branch 'develop' into bugfix/ios-missing-drm-integrationParameters

Author: wvanhaevre

CHANGELOG.md

@@ -9,7 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
-- Fixed an issue on iOS where the integrationParameters from the contentProtection section of the source were not processed correctly, resulting failures for DRM connectors that depend on these.
+- Fixed an issue on iOS where the integrationParameters from the contentProtection section of the source were not processed correctly, resulting in failures for DRM connectors that depend on them.
+
+## [10.7.1] - 26-01-06
+
+### Added
+
+- Added a `multiSession` property to `DRMConfiguration` to enable multi-key content on Android platforms.
 
 ## [10.7.0] - 25-12-19
 

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

@@ -44,6 +44,7 @@ const val PROP_LICENSE_TYPE_TEMPORARY: String = "temporary"
 const val PROP_LICENSE_TYPE_PERSISTENT: String = "persistent"
 const val PROP_QUERY_PARAMETERS: String = "queryParameters"
 const val PROP_CERTIFICATE: String = "certificate"
+const val PROP_MULTISESSION: String = "multiSession"
 const val PROP_KEYS: String = "keys"
 const val PROP_ID: String = "id"
 const val PROP_VALUE: String = "value"
@@ -104,6 +105,9 @@ object ContentProtectionAdapter {
       if (jsonConfig.has(PROP_INTEGRATION_PARAMETERS)) {
         integrationParameters(fromJSONObjectToMap(jsonConfig.getJSONObject(PROP_INTEGRATION_PARAMETERS)))
       }
+      if (jsonConfig.has(PROP_MULTISESSION)) {
+        multiSession(jsonConfig.getBoolean(PROP_MULTISESSION))
+      }
       queryParameters(fromJSONObjectToMap(jsonConfig.optJSONObject(PROP_QUERY_PARAMETERS)))
     }.build()
   }