mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-10-29 03:36:21 +00:00
Code Issues Projects Releases Wiki Activity

Run update worker hourly (#7943)

Browse Source 
Only refresh the feeds that have not been refreshed since their last interval.
This solves the problem where force-stopping the app during a long feed refresh
would start the refresh all over instead of just taking the feeds that were not
refreshed already.
This commit is contained in:
Hans-Peter Lehmann 2025-08-23 20:52:11 +02:00 committed by GitHub
parent 77888a12cc
commit 9e53b1ecec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/PreferenceUpgrader.java
View File

@ -6,6 +6,7 @@ import android.view.KeyEvent;
import androidx.core.app.NotificationManagerCompat;
import androidx.preference.PreferenceManager;
import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;
import org.apache.commons.lang3.StringUtils;
import java.util.concurrent.TimeUnit;
@ -176,5 +177,8 @@ public class PreferenceUpgrader {
// Enable bottom navigation for beta users, so only this exact app version
UserPreferences.setBottomNavigationEnabled(true);
}
if (oldVersion < 3100000) {
FeedUpdateManager.getInstance().restartUpdateAlarm(context, true);
}
}
}

2
app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/DownloadsPreferencesFragment.java
View File

@ -78,7 +78,7 @@ public class DownloadsPreferencesFragment extends AnimatedPreferenceFragment
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (UserPreferences.PREF_UPDATE_INTERVAL.equals(key)) {
if (UserPreferences.PREF_UPDATE_INTERVAL.equals(key) || UserPreferences.PREF_MOBILE_UPDATE.equals(key)) {
FeedUpdateManager.getInstance().restartUpdateAlarm(getContext(), true);
}
}

7
net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateManagerImpl.java
View File

@ -32,6 +32,7 @@ public class FeedUpdateManagerImpl extends FeedUpdateManager {
public static final String EXTRA_FEED_ID = "feed_id";
public static final String EXTRA_NEXT_PAGE = "next_page";
public static final String EXTRA_EVEN_ON_MOBILE = "even_on_mobile";
public static final String EXTRA_MANUAL = "manual";
private static final String TAG = "AutoUpdateManager";
/**
@ -43,13 +44,14 @@ public class FeedUpdateManagerImpl extends FeedUpdateManager {
WorkManager.getInstance(context).cancelUniqueWork(WORK_ID_FEED_UPDATE);
} else {
PeriodicWorkRequest workRequest = new PeriodicWorkRequest.Builder(
FeedUpdateWorker.class, UserPreferences.getUpdateInterval(), TimeUnit.HOURS)
FeedUpdateWorker.class, 1, TimeUnit.HOURS)
.setConstraints(new Constraints.Builder()
.setRequiredNetworkType(UserPreferences.isAllowMobileFeedRefresh()
? NetworkType.CONNECTED : NetworkType.UNMETERED).build())
.build();
WorkManager.getInstance(context).enqueueUniquePeriodicWork(WORK_ID_FEED_UPDATE,
replace ? ExistingPeriodicWorkPolicy.REPLACE : ExistingPeriodicWorkPolicy.KEEP, workRequest);
replace ? ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE
: ExistingPeriodicWorkPolicy.KEEP, workRequest);
}
}
@ -72,6 +74,7 @@ public class FeedUpdateManagerImpl extends FeedUpdateManager {
}
Data.Builder builder = new Data.Builder();
builder.putBoolean(EXTRA_EVEN_ON_MOBILE, true);
builder.putBoolean(EXTRA_MANUAL, true);
if (feed != null) {
builder.putLong(EXTRA_FEED_ID, feed.getId());
builder.putBoolean(EXTRA_NEXT_PAGE, nextPage);

11
net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java
View File

@ -37,6 +37,7 @@ import de.danoeh.antennapod.model.download.DownloadRequest;
import de.danoeh.antennapod.net.download.serviceinterface.DownloadRequestBuilder;
import de.danoeh.antennapod.parser.feed.FeedHandlerResult;
import de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleaner;
import de.danoeh.antennapod.storage.preferences.UserPreferences;
import de.danoeh.antennapod.ui.notifications.NotificationUtils;
import java.util.ArrayList;
import java.util.Collections;
@ -47,6 +48,7 @@ import java.util.concurrent.Executors;
public class FeedUpdateWorker extends Worker {
private static final String TAG = "FeedUpdateWorker";
private static final long JOB_SCHEDULE_TIME_VARIATION = TimeUnit.MINUTES.toMillis(15);
private final NewEpisodesNotification newEpisodesNotification;
private final NotificationManagerCompat notificationManager;
@ -66,6 +68,8 @@ public class FeedUpdateWorker extends Worker {
long feedId = getInputData().getLong(FeedUpdateManagerImpl.EXTRA_FEED_ID, -1);
boolean allAreLocal = true;
boolean force = false;
boolean isAutomaticRefresh = !getInputData().getBoolean(FeedUpdateManagerImpl.EXTRA_MANUAL, false);
boolean isAutomaticRefreshEnabled = !UserPreferences.isAutoUpdateDisabled();
if (feedId == -1) { // Update all
toUpdate = DBReader.getFeedList();
Iterator<Feed> itr = toUpdate.iterator();
@ -75,6 +79,13 @@ public class FeedUpdateWorker extends Worker {
itr.remove();
continue;
}
if (isAutomaticRefresh && isAutomaticRefreshEnabled
&& feed.getLastRefreshAttempt() > System.currentTimeMillis() - JOB_SCHEDULE_TIME_VARIATION
- TimeUnit.HOURS.toMillis(UserPreferences.getUpdateInterval())) {
// Recently updated, no need to automatically check again
itr.remove();
continue;
}
if (!feed.isLocalFeed()) {
allAreLocal = false;
}

2
storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java
View File

@ -95,7 +95,7 @@ public abstract class UserPreferences {
private static final String PREF_ENQUEUE_DOWNLOADED = "prefEnqueueDownloaded";
public static final String PREF_ENQUEUE_LOCATION = "prefEnqueueLocation";
public static final String PREF_UPDATE_INTERVAL = "prefAutoUpdateIntervall";
private static final String PREF_MOBILE_UPDATE = "prefMobileUpdateTypes";
public static final String PREF_MOBILE_UPDATE = "prefMobileUpdateTypes";
public static final String PREF_EPISODE_CLEANUP = "prefEpisodeCleanup";
public static final String PREF_EPISODE_CACHE_SIZE = "prefEpisodeCacheSize";
public static final String PREF_AUTODL_GLOBAL = "prefEnableAutoDl";