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

Merge pull request #3285 from ByteHamster/fix1 

Fixed some crashes
This commit is contained in:
H. Lehmann 2019-07-23 21:56:24 +02:00 committed by GitHub
parent 0e1cac9098 8b9c31ccf0
commit 8b77782348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
View File

@ -169,6 +169,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
pager.setCurrentItem(lastPosition); pager.setCurrentItem(lastPosition);
} }
@Override
protected void onStart() { protected void onStart() {
super.onStart(); super.onStart();
EventDistributor.getInstance().register(contentUpdate); EventDistributor.getInstance().register(contentUpdate);

5
app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
View File

@ -603,8 +603,9 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
@Nullable @Nullable
private FeedItem loadInBackground() { private FeedItem loadInBackground() {
FeedItem feedItem = DBReader.getFeedItem(feedItems[feedItemPos]); FeedItem feedItem = DBReader.getFeedItem(feedItems[feedItemPos]);
if (feedItem != null) { Context context = getContext();
Timeline t = new Timeline(getContext(), feedItem); if (feedItem != null && context != null) {
Timeline t = new Timeline(context, feedItem);
webviewData = t.processShownotes(false); webviewData = t.processShownotes(false);
} }
return feedItem; return feedItem;

11
core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
View File

@ -41,6 +41,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
private PlaybackService playbackService; private PlaybackService playbackService;
private final Object waitForService = new Object(); private final Object waitForService = new Object();
private final Object waitUsingService = new Object();
private static final int JOB_ID = -17001; private static final int JOB_ID = -17001;
@ -67,7 +68,11 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
} }
} }
updateViews(); synchronized (waitUsingService) {
if (playbackService != null) {
updateViews();
}
}
if (playbackService != null) { if (playbackService != null) {
try { try {
@ -230,7 +235,9 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
@Override @Override
public void onServiceDisconnected(ComponentName name) { public void onServiceDisconnected(ComponentName name) {
playbackService = null; synchronized (waitUsingService) {
playbackService = null;
}
Log.d(TAG, "Disconnected from service"); Log.d(TAG, "Disconnected from service");
} }

2
core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
View File

@ -243,7 +243,7 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
callback.onMediaChanged(false); callback.onMediaChanged(false);
if (stream) { if (stream) {
mediaPlayer.setDataSource(media.getStreamUrl()); mediaPlayer.setDataSource(media.getStreamUrl());
} else if (new File(media.getLocalMediaUrl()).canRead()) { } else if (media.getLocalMediaUrl() != null && new File(media.getLocalMediaUrl()).canRead()) {
mediaPlayer.setDataSource(media.getLocalMediaUrl()); mediaPlayer.setDataSource(media.getLocalMediaUrl());
} else { } else {
throw new IOException("Unable to read local file " + media.getLocalMediaUrl()); throw new IOException("Unable to read local file " + media.getLocalMediaUrl());