From b799fe84945a31de6c0ec35747622c6d714ef62a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 15 Nov 2016 21:36:05 +0100 Subject: [PATCH] follow "Only on WiFi" preference strictly This is a tested version of pserwlyo's suggestion in !415 https://gitlab.com/fdroid/fdroidclient/merge_requests/415#note_18469122 --- .../main/java/org/fdroid/fdroid/UpdateService.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index 6586bae3f..fbf780caa 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -356,12 +356,11 @@ public class UpdateService extends IntentService { return; } - if (manualUpdate || (netState == FLAG_NET_NO_LIMIT)) { - // triggered by the user, or by connecting to WiFi, etc. - Utils.debugLog(TAG, "manually requested update or on unlimited internet"); - } else if (Preferences.get().isUpdateOnlyOnUnmeteredNetworks() - || !verifyIsTimeForScheduledRun()) { - Utils.debugLog(TAG, "don't run update, we're on metered internet"); + if (manualUpdate) { + Utils.debugLog(TAG, "manually requested update"); + } else if (!verifyIsTimeForScheduledRun() + || (netState == FLAG_NET_METERED && Preferences.get().isUpdateOnlyOnUnmeteredNetworks())) { + Utils.debugLog(TAG, "don't run update"); return; }