Merge pull request #2839 from AntennaPod/bugfix/2691-auto-update-network-not-ready

When auto refreshing feeds, give network some time to get available

1 files changed, 15 insertions, 5 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java
index 24e0da9ed..afaf13390 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java
@@ -2,20 +2,30 @@ package de.danoeh.antennapod.core.util;
 
 import android.content.Context;
 import android.util.Log;
+
+import org.awaitility.core.ConditionTimeoutException;
+
+import java.util.concurrent.TimeUnit;
+
 import de.danoeh.antennapod.core.storage.DBTasks;
 
+import static org.awaitility.Awaitility.with;
+
 public class FeedUpdateUtils {
     private static final String TAG = "FeedUpdateUtils";
 
-    private FeedUpdateUtils() {
-
-    }
+    private FeedUpdateUtils() {}
 
     public static void startAutoUpdate(Context context, Runnable callback) {
-        if (NetworkUtils.networkAvailable() && NetworkUtils.isDownloadAllowed()) {
+        try {
+            with().pollInterval(1, TimeUnit.SECONDS)
+                    .await()
+                    .atMost(10, TimeUnit.SECONDS)
+                    .until(() -> NetworkUtils.networkAvailable() && NetworkUtils.isDownloadAllowed());
             DBTasks.refreshAllFeeds(context, null, callback);
-        } else {
+        } catch (ConditionTimeoutException ignore) {
             Log.d(TAG, "Blocking automatic update: no wifi available / no mobile updates allowed");
         }
     }
+
 }