From a912eebe5bfca3af3f636b5ce16952c0b6a9ed79 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 13 Jul 2018 17:04:21 +0200
Subject: [PATCH] stop all updates when "Over Data" and "Over WiFi" are both
 disabled

fdroid/fdroidclient#1457
fdroid/fdroidclient#1451
---
 app/src/main/java/org/fdroid/fdroid/UpdateService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
index 3598aa186..8f2bd52da 100644
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@@ -402,9 +402,9 @@ public class UpdateService extends JobIntentService {
                     sendNoInternetToast();
                 }
                 return;
-            } else if (manualUpdate || forcedUpdate) {
+            } else if ((manualUpdate || forcedUpdate) && fdroidPrefs.isOnDemandDownloadAllowed()) {
                 Utils.debugLog(TAG, "manually requested or forced update");
-            } else if (!fdroidPrefs.isBackgroundDownloadAllowed()) {
+            } else if (!fdroidPrefs.isBackgroundDownloadAllowed() && !fdroidPrefs.isOnDemandDownloadAllowed()) {
                 Utils.debugLog(TAG, "don't run update");
                 return;
             }