Code cleanup

3 files changed, 12 insertions, 16 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
index 3e9a0123f..2e592bdf5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
@@ -13,11 +13,10 @@ import de.danoeh.antennapod.core.service.PlayerWidgetJobService;
 
 public class PlayerWidget extends AppWidgetProvider {
     private static final String TAG = "PlayerWidget";
-    private static final String PREFS_NAME = "PlayerWidgetPrefs";
+    public static final String PREFS_NAME = "PlayerWidgetPrefs";
     private static final String KEY_ENABLED = "WidgetEnabled";
-
-    public static final String WIDGET_PREFS = "widget_preferences";
-    public static final String WIDGET_COLOR = "widget_color";
+    public static final String KEY_WIDGET_COLOR = "widget_color";
+    public static final int DEFAULT_COLOR = 0x00262C31;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -49,12 +48,10 @@ public class PlayerWidget extends AppWidgetProvider {
 
     @Override
     public void onDeleted(Context context, int[] appWidgetIds) {
-        Log.d(TAG,"OnDeleted");
+        Log.d(TAG, "OnDeleted");
         for (int appWidgetId : appWidgetIds) {
-            SharedPreferences prefs = context.getSharedPreferences(WIDGET_PREFS, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.remove(WIDGET_COLOR + appWidgetId);
-            Log.d(TAG, "Widget deleted ID " + appWidgetId);
+            SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+            prefs.edit().remove(KEY_WIDGET_COLOR + appWidgetId).apply();
         }
         super.onDeleted(context, appWidgetIds);
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
index 61fd11bee..d1b4d8d3b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
@@ -45,9 +45,6 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
     private final Object waitForService = new Object();
     private final Object waitUsingService = new Object();
 
-    private static final String WIDGET_PREFS = "widget_preferences";
-    private static final String WIDGET_COLOR = "widget_color";
-
     private static final int JOB_ID = -17001;
 
     public static void updateWidget(Context context) {
@@ -196,9 +193,11 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
                 } else {
                     views.setViewVisibility(R.id.layout_center, View.VISIBLE);
                 }
-                SharedPreferences prefs = getSharedPreferences(WIDGET_PREFS, Context.MODE_PRIVATE);
-                int backgroundColor = prefs.getInt(WIDGET_COLOR + id, 0x262C31);
-                views.setInt(R.id.widgetLayout,"setBackgroundColor", backgroundColor);
+
+                SharedPreferences prefs = getSharedPreferences(PlayerWidget.PREFS_NAME, Context.MODE_PRIVATE);
+                int backgroundColor = prefs.getInt(PlayerWidget.KEY_WIDGET_COLOR + id, PlayerWidget.DEFAULT_COLOR);
+                views.setInt(R.id.widgetLayout, "setBackgroundColor", backgroundColor);
+
                 manager.updateAppWidget(id, views);
             }
         } else {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 9ff65e65c..42c7a4f61 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -754,5 +754,5 @@
 
     <!-- Widget settings -->
     <string name="widget_create_button">Create widget</string>
-    <string name="widget_opacity">Widget opacity</string>
+    <string name="widget_opacity">Opacity</string>
 </resources>