Merge pull request #16 from thisisthekap/br_15_graceful_null_handling…

…_on_detach
thisisthekap · Mar 2, 2022 · 93673fa · 93673fa
2 parents 24a82ff + 0510444
commit 93673fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -449,3 +449,5 @@ FodyWeavers.xsd
 *.tlog
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudio,rider
+
+.DS_Store
diff --git a/Xamarin.ExoPlayerSlim.UsageChecker/Xamarin.ExoPlayerSlim.UsageChecker.csproj b/Xamarin.ExoPlayerSlim.UsageChecker/Xamarin.ExoPlayerSlim.UsageChecker.csproj
@@ -112,7 +112,7 @@
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
     <PackageReference Include="Xamarin.ExoPlayerSlim">
-      <Version>2.16.1.11</Version>
+      <Version>2.16.1.12</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj b/Xamarin.ExoPlayerSlim/Xamarin.ExoPlayerSlim.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>Xamarin.ExoPlayerSlim</PackageId>
-    <Version>2.16.1.11</Version>
+    <Version>2.16.1.12</Version>
     <Description>Contains bindings for https://exoplayer.dev</Description>
     <Authors>Christian Kapplmüller</Authors>
     <Company>fun.music IT GmbH</Company>

diff --git a/...oPlayerSlim/exoplayerslim/src/main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java b/...oPlayerSlim/exoplayerslim/src/main/java/com/tonestro/exoplayerslim/ExoPlayerSlimImpl.java
@@ -123,7 +123,7 @@ public void attachPlayerView(View playerView, boolean useNativeControls, int asp
     @Override
     public void detachPlayerView(View playerView) {
         if (playerView == null) {
-            throw new NullPointerException("playerView must not be null");
+            return;
         }
         if (!(playerView instanceof PlayerView)) {
             throw new ClassCastException("playerView is not instance of PlayerView");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -449,3 +449,5 @@ FodyWeavers.xsd
		*.tlog

		# End of https://www.toptal.com/developers/gitignore/api/visualstudio,rider

		.DS_Store