Merge pull request #3002 from sametcl2/master

IMA SDK null object reference crash fix.
This commit is contained in:
Olivier Bouillet 2023-01-25 22:31:09 +01:00 committed by GitHub
commit 242637421a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -638,7 +638,9 @@ class ReactExoplayerView extends FrameLayout implements
.build(); .build();
player.addListener(self); player.addListener(self);
exoPlayerView.setPlayer(player); exoPlayerView.setPlayer(player);
adsLoader.setPlayer(player); if (adsLoader != null) {
adsLoader.setPlayer(player);
}
audioBecomingNoisyReceiver.setListener(self); audioBecomingNoisyReceiver.setListener(self);
bandwidthMeter.addEventListener(new Handler(), self); bandwidthMeter.addEventListener(new Handler(), self);
setPlayWhenReady(!isPaused); setPlayWhenReady(!isPaused);
@ -863,14 +865,18 @@ class ReactExoplayerView extends FrameLayout implements
private void releasePlayer() { private void releasePlayer() {
if (player != null) { if (player != null) {
adsLoader.setPlayer(null); if (adsLoader != null) {
adsLoader.setPlayer(null);
}
updateResumePosition(); updateResumePosition();
player.release(); player.release();
player.removeListener(this); player.removeListener(this);
trackSelector = null; trackSelector = null;
player = null; player = null;
} }
adsLoader.release(); if (adsLoader != null) {
adsLoader.release();
}
adsLoader = null; adsLoader = null;
progressHandler.removeMessages(SHOW_PROGRESS); progressHandler.removeMessages(SHOW_PROGRESS);
themedReactContext.removeLifecycleEventListener(this); themedReactContext.removeLifecycleEventListener(this);