FIX: [droid;oreo] re-schedule triggered channel uodate

2 files changed, 4 insertions, 3 deletions

diff --git a/tools/android/packaging/xbmc/src/channels/SyncProgramsJobService.java.in b/tools/android/packaging/xbmc/src/channels/SyncProgramsJobService.java.in
index 0e85d93846..20ff91c2bd 100644
--- a/tools/android/packaging/xbmc/src/channels/SyncProgramsJobService.java.in
+++ b/tools/android/packaging/xbmc/src/channels/SyncProgramsJobService.java.in
@@ -74,6 +74,9 @@ public class SyncProgramsJobService extends JobService
               protected void onPostExecute(Boolean finished)
               {
                 super.onPostExecute(finished);
+                // Daisy chain listening for the next change to the channel.
+                TvUtil.scheduleTriggeredSyncingProgramsForChannel(
+                        SyncProgramsJobService.this, channelId);
                 mSyncProgramsTask = null;
                 jobFinished(jobParameters, !finished);
               }
diff --git a/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in b/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in
index 08f961a082..e9a36939d2 100644
--- a/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in
+++ b/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in
@@ -202,9 +202,6 @@ public class TvUtil
   {
     JobScheduler scheduler =
             (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
-    if (scheduler.getPendingJob(getTriggeredJobIdForChannelId(channelId)) != null)
-      return;
-
     ComponentName componentName = new ComponentName(context, SyncProgramsJobService.class);
 
     JobInfo.Builder builder =
@@ -222,6 +219,7 @@ public class TvUtil
     bundle.putLong(TvContractCompat.EXTRA_CHANNEL_ID, channelId);
     builder.setExtras(bundle);
 
+    scheduler.cancel(getTriggeredJobIdForChannelId(channelId));
     scheduler.schedule(builder.build());
   }