bug fix

nuclearfog · Apr 23, 2024 · 413c92f · 413c92f
1 parent fbd305c
commit 413c92f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/app/src/main/java/org/nuclearfog/apollo/ApolloApplication.java b/app/src/main/java/org/nuclearfog/apollo/ApolloApplication.java
@@ -16,7 +16,6 @@
 import androidx.core.app.NotificationManagerCompat;
 
 import org.nuclearfog.apollo.cache.ImageCache;
-import org.nuclearfog.apollo.player.AudioEffects;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,6 +26,7 @@
  * released within {@link ImageCache}.
  *
  * @author Andrew Neal ([email protected])
+ * @author nuclearfog
  */
 public class ApolloApplication extends Application {
 
@@ -59,8 +59,6 @@ public void onTerminate() {
 			// remove notification
 			NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
 			notificationManager.cancelAll();
-			// release audioeffects
-			AudioEffects.release();
 		} catch (SecurityException exception) {
 			// ignore
 		}

diff --git a/app/src/main/java/org/nuclearfog/apollo/NotificationHelper.java b/app/src/main/java/org/nuclearfog/apollo/NotificationHelper.java
@@ -34,6 +34,7 @@
  * expanded notification by default.
  *
  * @author Andrew Neal ([email protected])
+ * @author nuclearfog
  */
 public class NotificationHelper {
 
@@ -160,9 +161,9 @@ public void updateNotification() {
 	}
 
 	/**
-	 * cancel notification when app is in foreground
+	 * dismiss notification when app is in foreground
 	 */
-	public void cancelNotification() {
+	public void dismissNotification() {
 		postNotification(null);
 	}
 

diff --git a/app/src/main/java/org/nuclearfog/apollo/service/MusicPlaybackService.java b/app/src/main/java/org/nuclearfog/apollo/service/MusicPlaybackService.java
@@ -52,6 +52,7 @@
 import org.nuclearfog.apollo.cache.ImageFetcher;
 import org.nuclearfog.apollo.model.Album;
 import org.nuclearfog.apollo.model.Song;
+import org.nuclearfog.apollo.player.AudioEffects;
 import org.nuclearfog.apollo.player.MultiPlayer;
 import org.nuclearfog.apollo.player.MusicPlayerHandler;
 import org.nuclearfog.apollo.provider.FavoritesStore;
@@ -74,6 +75,8 @@
 /**
  * A background {@link Service} used to keep music playing between activities
  * and when the user moves Apollo into the background.
+ *
+ * @author nuclearfog
  */
 public class MusicPlaybackService extends MediaBrowserServiceCompat implements OnAudioFocusChangeListener {
 	/**
@@ -550,6 +553,7 @@ public void onDestroy() {
 		audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, getAudioSessionId());
 		audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, APOLLO_PACKAGE_NAME);
 		sendBroadcast(audioEffectsIntent);
+		AudioEffects.release();
 		// remove any pending alarms
 		mAlarmManager.cancel(mShutdownIntent);
 		// Release the player
@@ -562,7 +566,7 @@ public void onDestroy() {
 		unregisterReceiver(mUnmountReceiver);
 		unregisterReceiver(mIntentReceiver);
 		// remove notification
-		mNotificationHelper.cancelNotification();
+		mNotificationHelper.dismissNotification();
 		super.onDestroy();
 	}
 
@@ -593,12 +597,14 @@ public void onAudioFocusChange(int focusChange) {
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		mServiceStartId = startId;
+		// set empty notification to keep service alive
+		mNotificationHelper.createNotification(false);
 		if (intent != null) {
 			if (intent.hasExtra(EXTRA_FOREGROUND)) {
 				isForeground = intent.getBooleanExtra(EXTRA_FOREGROUND, false);
 				if (isForeground) {
 					stopForeground(true);
-					mNotificationHelper.cancelNotification();
+					mNotificationHelper.dismissNotification();
 				} else if (isPlaying()) {
 					mNotificationHelper.createNotification(true);
 				}
@@ -654,7 +660,7 @@ else if (CMDSTOP.equals(command) || ACTION_STOP.equals(action)) {
 			mPausedByTransientLossOfFocus = false;
 			seek(0);
 			releaseServiceUiAndStop();
-			mNotificationHelper.cancelNotification();
+			mNotificationHelper.dismissNotification();
 		}
 		// repeat set
 		else if (ACTION_REPEAT.equals(action)) {

diff --git a/app/src/main/java/org/nuclearfog/apollo/utils/MusicUtils.java b/app/src/main/java/org/nuclearfog/apollo/utils/MusicUtils.java
@@ -1482,7 +1482,7 @@ public static void notifyForegroundStateChanged(Context context, boolean inForeg
 			Intent intent = new Intent(context, MusicPlaybackService.class);
 			intent.setAction(MusicPlaybackService.CHANGED_FOREGROUND_STATE);
 			intent.putExtra(MusicPlaybackService.EXTRA_FOREGROUND, sForegroundActivities != 0);
-			context.startService(intent);                      //todo
+			context.startService(intent);
 		}
 	}
 

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -108,8 +108,8 @@
 	<string name="settings_download_missing_artwork_title">Fehlende Albencover laden</string>
 	<string name="settings_download_artist_images_title">Fehlende Interpretenbilder laden</string>
 	<string name="settings_open_source_licenses">Open-Source-Lizenzen</string>
-	<string name="settings_disable_bat_opt_title">Batterie-Optimierungen deaktivieren</string>
-	<string name="settings_disable_bat_opt_summary">Batterie-Optimierungen deaktivieren falls es Unterbrechungen beim Abspielen kommt</string>
+	<string name="settings_disable_bat_opt_title">Akku-Optimierungen deaktivieren</string>
+	<string name="settings_disable_bat_opt_summary">Akku-Optimierungen deaktivieren falls es zu Unterbrechungen beim Abspielen kommt</string>
 	<string name="settings_use_old_notification">Altes Benachrichtigungs-Layout verwenden</string>
 	<string name="settings_use_old_notification_summary">Aktivieren, falls es zu Darstellungsproblemen kommt</string>
 	<string name="settings_version_title">Version</string>