From 17c87d9bfc1b3af594befa8356b40535267d9d0d Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Wed, 16 Sep 2015 01:44:45 +0200
Subject: Lockscreen background defaults to true, more detailed description,
 NPE fixed

---
 app/src/main/res/xml/preferences.xml                                  | 2 +-
 .../antennapod/core/service/playback/PlaybackServiceMediaPlayer.java  | 3 +++
 core/src/main/res/values/strings.xml                                  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 8d7297e95..c9be65f2b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -45,7 +45,7 @@
             android:summary="@string/pref_persistNotify_sum"
             android:title="@string/pref_persistNotify_title"/>
         <CheckBoxPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:enabled="true"
             android:key="prefLockscreenBackground"
             android:summary="@string/pref_lockscreen_background_sum"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index 6a7271cd3..4704bb207 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -273,6 +273,9 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
     }
 
     private void updateMediaSessionMetadata() {
+        if(this.media == null) {
+            return;
+        }
         executor.execute(() -> {
             Playable p = this.media;
             MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 7c38374a9..68c5150e5 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -334,8 +334,8 @@
     <string name="pref_expandNotify_sum">Always expand the notification to show playback buttons.</string>
     <string name="pref_persistNotify_title">Persistent Playback Controls</string>
     <string name="pref_persistNotify_sum">Keep notification and lockscreen controls when playback is paused.</string>
-    <string name="pref_lockscreen_background_title">Lockscreen Background</string>
-    <string name="pref_lockscreen_background_sum">Set the lockscreen background to the current episode\'s image.</string>
+    <string name="pref_lockscreen_background_title">Set Lockscreen Background</string>
+    <string name="pref_lockscreen_background_sum">Set the lockscreen background to the current episode\'s image. As a side effect, this will also show the image in third party apps.</string>
     <string name="pref_showDownloadReport_title">Show Download Report</string>
     <string name="pref_showDownloadReport_sum">If downloads fail, generate a report that shows the details of the failure.</string>
     <string name="pref_expand_notify_unsupport_toast">Android versions before 4.1 do not support expanded notifications.</string>
-- 
cgit v1.2.3