Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show "Updates Available" if auto updates is enabled.

Browse Source 
This notification is redundant in this circumstance.
This commit is contained in:
Peter Serwylo 2016-04-27 07:08:56 +10:00
parent 99840b5bba
commit 51e48f4416
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/UpdateService.java
View File

@ -355,6 +355,7 @@ public class UpdateService extends IntentService implements ProgressListener {
ArrayList<CharSequence> repoErrors = new ArrayList<>(); ArrayList<CharSequence> repoErrors = new ArrayList<>();
boolean changes = false; boolean changes = false;
boolean singleRepoUpdate = !TextUtils.isEmpty(address); boolean singleRepoUpdate = !TextUtils.isEmpty(address);
final Preferences fdroidPrefs = Preferences.get();
for (final Repo repo : repos) { for (final Repo repo : repos) {
if (!repo.inuse) { if (!repo.inuse) {
continue; continue;
@ -389,7 +390,7 @@ public class UpdateService extends IntentService implements ProgressListener {
localBroadcastManager.unregisterReceiver(downloadProgressReceiver); localBroadcastManager.unregisterReceiver(downloadProgressReceiver);
// now that downloading the index is done, start downloading updates // now that downloading the index is done, start downloading updates
if (changes && Preferences.get().isAutoDownloadEnabled()) { if (changes && fdroidPrefs.isAutoDownloadEnabled()) {
autoDownloadUpdates(repo.address); autoDownloadUpdates(repo.address);
} }
} }
@ -399,7 +400,7 @@ public class UpdateService extends IntentService implements ProgressListener {
} else { } else {
notifyContentProviders(); notifyContentProviders();
if (Preferences.get().isUpdateNotificationEnabled()) { if (fdroidPrefs.isUpdateNotificationEnabled() && !fdroidPrefs.isAutoDownloadEnabled()) {
performUpdateNotification(); performUpdateNotification();
} }
} }