Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More workarounds for devices that crash when getting a cast context (#6378)

Browse Source
This commit is contained in:
ByteHamster 2023-03-14 19:56:23 +01:00 committed by GitHub
parent 870fe2be56
commit 07b59d8b32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
View File

@ -59,11 +59,14 @@ public class CastPsmp extends PlaybackServiceMediaPlayer {
if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) != ConnectionResult.SUCCESS) { if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) != ConnectionResult.SUCCESS) {
return null; return null;
} }
try {
if (CastContext.getSharedInstance(context).getCastState() == CastState.CONNECTED) { if (CastContext.getSharedInstance(context).getCastState() == CastState.CONNECTED) {
return new CastPsmp(context, callback); return new CastPsmp(context, callback);
} else {
return null;
} }
} catch (Exception e) {
e.printStackTrace();
}
return null;
} }
public CastPsmp(@NonNull Context context, @NonNull PSMPCallback callback) { public CastPsmp(@NonNull Context context, @NonNull PSMPCallback callback) {

11
playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastStateListener.java
View File

@ -16,8 +16,15 @@ public class CastStateListener implements SessionManagerListener<CastSession> {
castContext = null; castContext = null;
return; return;
} }
castContext = CastContext.getSharedInstance(context); CastContext castCtx;
castContext.getSessionManager().addSessionManagerListener(this, CastSession.class); try {
castCtx = CastContext.getSharedInstance(context);
castCtx.getSessionManager().addSessionManagerListener(this, CastSession.class);
} catch (Exception e) {
e.printStackTrace();
castCtx = null;
}
castContext = castCtx;
} }
public void destroy() { public void destroy() {