From 51e48f4416f657f3c04ef98318712b110b60bd21 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Wed, 27 Apr 2016 07:08:56 +1000 Subject: [PATCH] Don't show "Updates Available" if auto updates is enabled. This notification is redundant in this circumstance. --- app/src/main/java/org/fdroid/fdroid/UpdateService.java | 5 +++-- 1 file changed, 3 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 a9a631a4a..8511f9956 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -355,6 +355,7 @@ public class UpdateService extends IntentService implements ProgressListener { ArrayList repoErrors = new ArrayList<>(); boolean changes = false; boolean singleRepoUpdate = !TextUtils.isEmpty(address); + final Preferences fdroidPrefs = Preferences.get(); for (final Repo repo : repos) { if (!repo.inuse) { continue; @@ -389,7 +390,7 @@ public class UpdateService extends IntentService implements ProgressListener { localBroadcastManager.unregisterReceiver(downloadProgressReceiver); // now that downloading the index is done, start downloading updates - if (changes && Preferences.get().isAutoDownloadEnabled()) { + if (changes && fdroidPrefs.isAutoDownloadEnabled()) { autoDownloadUpdates(repo.address); } } @@ -399,7 +400,7 @@ public class UpdateService extends IntentService implements ProgressListener { } else { notifyContentProviders(); - if (Preferences.get().isUpdateNotificationEnabled()) { + if (fdroidPrefs.isUpdateNotificationEnabled() && !fdroidPrefs.isAutoDownloadEnabled()) { performUpdateNotification(); } }