Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent onServiceConnected ClassCastException

This commit is contained in:
Martin Fietz 2016-06-03 12:56:30 +02:00
parent 1048735327
commit eca8fc90b8
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
View File

@ -196,9 +196,10 @@ public class PlayerWidgetService extends Service {
public void onServiceConnected(ComponentName className, IBinder service) {
Log.d(TAG, "Connection to service established");
synchronized (psLock) {
playbackService = ((PlaybackService.LocalBinder) service)
.getService();
startViewUpdaterIfNotRunning();
if(service instanceof PlaybackService.LocalBinder == false) {
playbackService = ((PlaybackService.LocalBinder) service).getService();
startViewUpdaterIfNotRunning();
}
}
}

17
core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
View File

@ -258,14 +258,15 @@ public abstract class PlaybackController {
private final ServiceConnection mConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder service) {
playbackService = ((PlaybackService.LocalBinder) service)
.getService();
if (!released) {
queryService();
Log.d(TAG, "Connection to Service established");
} else {
Log.i(TAG, "Connection to playback service has been established, " +
"but controller has already been released");
if(service instanceof PlaybackService.LocalBinder) {
playbackService = ((PlaybackService.LocalBinder) service).getService();
if (!released) {
queryService();
Log.d(TAG, "Connection to Service established");
} else {
Log.i(TAG, "Connection to playback service has been established, " +
"but controller has already been released");
}
}
}