Skip to content

Skip connection check during download if files are already local #1159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flyingOwl wants to merge 1 commit into
base: edge
Choose a base branch
from
Open

Skip connection check during download if files are already local #1159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,6 @@ public synchronized void downloadBackground(List<MusicDirectory.Entry> songs, bo
}
revision++;

if(!Util.isOffline(this) && !Util.isNetworkConnected(this)) {
Util.toast(this, R.string.select_album_no_network);
}

checkDownloads();
lifecycleSupport.serializeDownloadQueue();
}
Expand Down Expand Up @@ -2269,7 +2265,17 @@ public synchronized void checkDownloads() {
checkArtistRadio();
}

if (!Util.isAllowedToDownload(this)) {
// If all files are local (like when permanently caching an already cached file) do not check if device is offline
boolean skipNetworkCheck = true;
for (DownloadFile d: downloadList) {
skipNetworkCheck &= d.isCompleteFileAvailable();
}
for (DownloadFile d: backgroundDownloadList) {
skipNetworkCheck &= d.isCompleteFileAvailable();
}

if (!skipNetworkCheck && !Util.isAllowedToDownload(this)) {
Util.toast(this, R.string.select_album_no_network);
return;
}

Expand Down