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

Do not hide notification on audio focus loss

Browse Source
This commit is contained in:
ByteHamster 2019-08-30 10:13:10 +02:00
parent f35286f1dc
commit f0acfa4263
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -326,7 +326,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
public void onDestroy() {
super.onDestroy();
Log.d(TAG, "Service is about to be destroyed");
stateManager.stopForeground(true);
stateManager.stopForeground(!UserPreferences.isPersistNotify());
isRunning = false;
currentMediaType = MediaType.UNKNOWN;
@ -733,7 +733,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
@Override
public void shouldStop() {
stateManager.stopService();
setupNotification(getPlayable()); // Stops foreground if not playing
}
@Override

13
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceStateManager.java
View File

@ -1,6 +1,8 @@
package de.danoeh.antennapod.core.service.playback;
import android.app.Notification;
import android.app.Service;
import android.os.Build;
class PlaybackServiceStateManager {
private final PlaybackService playbackService;
@ -19,12 +21,19 @@ class PlaybackServiceStateManager {
void stopService() {
stopForeground(true);
isInForeground = false;
playbackService.stopSelf();
}
void stopForeground(boolean removeNotification) {
playbackService.stopForeground(removeNotification);
if (isInForeground) {
if (Build.VERSION.SDK_INT < 24) {
playbackService.stopForeground(removeNotification);
} else if (removeNotification) {
playbackService.stopForeground(Service.STOP_FOREGROUND_REMOVE);
} else {
playbackService.stopForeground(Service.STOP_FOREGROUND_DETACH);
}
}
isInForeground = false;
hasReceivedValidStartCommand = false;
}