From 2762af8d50f397bec110a990a85bf6b69660fb4a Mon Sep 17 00:00:00 2001
From: Domingos Lopes <domingos86lopes+github@gmail.com>
Date: Tue, 12 Apr 2016 22:48:18 -0400
Subject: combine both preference listeners in PlaybackService

---
 .../de/danoeh/antennapod/core/service/playback/PlaybackService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index dd8e32702..6ea9dadeb 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -950,7 +950,7 @@ public class PlaybackService extends Service {
     }
 
     private void updateMediaSessionMetadata(Playable p) {
-        if (p == null) {
+        if (p == null || mediaSession == null) {
             return;
         }
         MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
@@ -1695,7 +1695,7 @@ public class PlaybackService extends Service {
                             castManager.disconnect();
                         }
                     }
-                } else if(key.equals(UserPreferences.PREF_LOCKSCREEN_BACKGROUND)) {
+                } else if (UserPreferences.PREF_LOCKSCREEN_BACKGROUND.equals(key)) {
                     updateMediaSessionMetadata(getPlayable());
                 }
     };
-- 
cgit v1.2.3