From 4394c0a783d0bd648416d7105f1cf1af91cdeec6 Mon Sep 17 00:00:00 2001
From: Tom Van Laerhoven <tom.vanlaerhoven@gmail.com>
Date: Thu, 12 Oct 2023 12:13:55 +0200
Subject: [PATCH 1/6] Update documentation

---
 doc/features.svg     | 17 ++++++++++++-----
 doc/media_caching.md |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/doc/features.svg b/doc/features.svg
index d4ae81fe1..43d0d653e 100644
--- a/doc/features.svg
+++ b/doc/features.svg
@@ -1,4 +1,4 @@
-<svg fill="none" viewBox="0 0 690 710" width="800" height="900" xmlns="http://www.w3.org/2000/svg">
+<svg fill="none" viewBox="0 0 690 725" width="800" height="900" xmlns="http://www.w3.org/2000/svg">
   <foreignObject width="100%" height="100%">
     <div xmlns="http://www.w3.org/1999/xhtml">
       <style>
@@ -104,14 +104,21 @@
 
       <div class="section">
         <div class="feature">Audio Control Management</div>
-        <div class="item">Audio focus &amp; Audio-Becoming-Noisy mgmt</div>
+        <div class="item">Audio focus &amp; Audio-Becoming-Noisy mgmt<br/></div>
         <div class="item" style="flex:2">(Audio control management by platform)</div>
       </div>
 
       <div class="section">
-        <div class="feature">Advanced APIs</div>
-        <div class="item" style="flex:2">Background playback, Media Session, Media Cache</div>
-        <div class="item">Background playback, NowPlaying, Media Cache</div>
+        <div class="feature">Advanced APIs<br/><br/><br/></div>
+        <div class="item" style="flex:2">
+          Background playback,<br/>
+          Media Session,<br/>
+          Media Cache (offline playback)
+        </div>
+        <div class="item">
+          Background playback,<br/>
+          NowPlaying,<br/>
+          Media Cache (iOS only)</div>
       </div>
 
       <div class="section">
diff --git a/doc/media_caching.md b/doc/media_caching.md
index 3c4ed6c2e..be4496b8b 100644
--- a/doc/media_caching.md
+++ b/doc/media_caching.md
@@ -10,6 +10,8 @@ The process of caching a media asset involves several steps to enable offline pl
 It starts with the creation and initiation of a CachingTask, which downloads the media content for local storage.
 Once cached, the asset can be played offline seamlessly.
 
+The Media Cache feature is accessible on all platforms except for tvOS.
+
 This page is structured as follows:
 
 - [Caching Workflow](#caching-workflow)

From 8b1580502c593069e334e6c937ff6b25bd858ea5 Mon Sep 17 00:00:00 2001
From: William Van Haevre <william.vanhaevre@gmail.com>
Date: Thu, 12 Oct 2023 13:33:15 +0200
Subject: [PATCH 2/6] Add HLS with VMAP example source

---
 example/src/custom/sources.json | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/example/src/custom/sources.json b/example/src/custom/sources.json
index 3d09d312a..814c47669 100644
--- a/example/src/custom/sources.json
+++ b/example/src/custom/sources.json
@@ -315,6 +315,37 @@
       }
     }
   },
+  {
+    "name": "HLS - CSAI - Google IMA VMAP",
+    "os": [
+      "ios",
+      "web"
+    ],
+    "source": {
+      "sources": [
+        {
+          "src": "https://cdn.theoplayer.com/video/elephants-dream/playlistCorrectionENG.m3u8",
+          "type": "application/x-mpegurl"
+        }
+      ],
+      "ads": [
+        {
+          "integration": "google-ima",
+          "sources": {
+            "src": "https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpostpodbumper&cmsid=496&vid=short_onecue&correlator="
+          }
+        }
+      ],
+      "poster": "https://theoplayer-cdn.s3.eu-west-1.amazonaws.com/react-native-theoplayer/temp/THEOPlayer-1200x1200.png",
+      "metadata": {
+        "title": "Elephants Dream with VMAP",
+        "subtitle": "Elephants Dream with VMAP Subtitle",
+        "album": "Ellies Album",
+        "displayIconUri": "https://theoplayer-cdn.s3.eu-west-1.amazonaws.com/react-native-theoplayer/temp/THEOPlayer-200x200.png",
+        "artist": "Ellie"
+      }
+    }
+  },
   {
     "name": "DASH - SSAI - Google DAI",
     "os": [

From 77ab910e05dadee11d36aa9e3272271134782181 Mon Sep 17 00:00:00 2001
From: Tom Van Laerhoven <tom.vanlaerhoven@gmail.com>
Date: Mon, 16 Oct 2023 18:28:23 +0200
Subject: [PATCH 3/6] Make return type non-null

---
 .../src/main/java/com/theoplayer/track/QualityListAdapter.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt b/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt
index 50ec99f33..96d1e58dd 100644
--- a/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt
+++ b/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt
@@ -33,8 +33,8 @@ class QualityListAdapter<Q : Quality> : QualityList<Q> {
     return qualities.size
   }
 
-  override fun getItem(i: Int): Q? {
-    return if (i >= 0 && i < length()) qualities[i] else null
+  override fun getItem(i: Int): Q {
+    return qualities[i]
   }
 
   override fun iterator(): MutableIterator<Q?> {

From 7b1e8b1f5c0700365b211a2493f346c1d9698d71 Mon Sep 17 00:00:00 2001
From: Tom Van Laerhoven <tom.vanlaerhoven@gmail.com>
Date: Mon, 16 Oct 2023 18:30:14 +0200
Subject: [PATCH 4/6] Add changelog entry

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80cc50302..1b102c932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed an issue on Android where compilation would fail when depending on player SDK 6.2.0.
+
 ## [3.0.1] - 23-10-12
 
 ### Fixed

From 4aae9dec146792b9697df6b9253193a2685cfdbb Mon Sep 17 00:00:00 2001
From: Tom Van Laerhoven <tom.vanlaerhoven@gmail.com>
Date: Tue, 17 Oct 2023 09:48:35 +0200
Subject: [PATCH 5/6] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b102c932..245ac3dd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [3.0.2] - 23-10-17
 
 ### Fixed
 

From b74b91b97c782b52006fb939802586cd2ea702e9 Mon Sep 17 00:00:00 2001
From: Tom Van Laerhoven <tom.vanlaerhoven@gmail.com>
Date: Tue, 17 Oct 2023 09:49:36 +0200
Subject: [PATCH 6/6] 3.0.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 937dd1645..01217c28e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "react-native-theoplayer",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "react-native-theoplayer",
-      "version": "3.0.1",
+      "version": "3.0.2",
       "license": "SEE LICENSE AT https://www.theoplayer.com/terms",
       "dependencies": {
         "buffer": "^6.0.3"
diff --git a/package.json b/package.json
index 231307248..0fdfe7b2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",