Merge pull request #4900 from ByteHamster/decouple-widget

Reduce coupling between widget and playback service

2 files changed, 13 insertions, 11 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
index f039c8bdf..ddd4fe899 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
@@ -6,6 +6,7 @@ import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.LargeTest;
 
 import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
+import de.danoeh.antennapod.core.widget.WidgetUpdater;
 import org.awaitility.Awaitility;
 import org.greenrobot.eventbus.EventBus;
 import org.junit.After;
@@ -187,8 +188,8 @@ public class PlaybackServiceTaskManagerTest {
             }
 
             @Override
-            public void onWidgetUpdaterTick() {
-
+            public WidgetUpdater.WidgetState requestWidgetState() {
+                return null;
             }
 
             @Override
@@ -248,8 +249,9 @@ public class PlaybackServiceTaskManagerTest {
             }
 
             @Override
-            public void onWidgetUpdaterTick() {
+            public WidgetUpdater.WidgetState requestWidgetState() {
                 countDownLatch.countDown();
+                return null;
             }
 
             @Override
@@ -348,8 +350,8 @@ public class PlaybackServiceTaskManagerTest {
             }
 
             @Override
-            public void onWidgetUpdaterTick() {
-
+            public WidgetUpdater.WidgetState requestWidgetState() {
+                return null;
             }
 
             @Override
@@ -391,8 +393,8 @@ public class PlaybackServiceTaskManagerTest {
             }
 
             @Override
-            public void onWidgetUpdaterTick() {
-
+            public WidgetUpdater.WidgetState requestWidgetState() {
+                return null;
             }
 
             @Override
@@ -449,8 +451,8 @@ public class PlaybackServiceTaskManagerTest {
         }
 
         @Override
-        public void onWidgetUpdaterTick() {
-
+        public WidgetUpdater.WidgetState requestWidgetState() {
+            return null;
         }
 
         @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/WidgetConfigActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/WidgetConfigActivity.java
index 1b4e8b81e..3020aba43 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/WidgetConfigActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/WidgetConfigActivity.java
@@ -19,7 +19,7 @@ import androidx.core.content.ContextCompat;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.receiver.PlayerWidget;
-import de.danoeh.antennapod.core.service.PlayerWidgetJobService;
+import de.danoeh.antennapod.core.widget.WidgetUpdaterJobService;
 
 public class WidgetConfigActivity extends AppCompatActivity {
     private int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
@@ -127,7 +127,7 @@ public class WidgetConfigActivity extends AppCompatActivity {
         resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
         setResult(RESULT_OK, resultValue);
         finish();
-        PlayerWidgetJobService.updateWidget(this);
+        WidgetUpdaterJobService.performBackgroundUpdate(this);
     }
 
     private int getColorWithAlpha(int color, int opacity) {