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

make all Downloader downloads cancelable

Browse Source 
Allowing all downloads, including updates, to be canceled simplifies the
code and if the user wants to cancel an update, they should be able to. But
canceling updates is not implemented in this commit.
This commit is contained in:
Hans-Christoph Steiner 2016-03-28 16:52:58 +02:00
parent 88b5e284b5
commit 2019b7a7c3
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ public class RepoUpdater {
repo.getCredentials()
);
downloader.setCacheTag(repo.lastetag);
downloader.downloadUninterrupted();
downloader.download();
if (downloader.isCached()) {
// The index is unchanged since we last read it. We just mark
@ -118,6 +118,9 @@ public class RepoUpdater {
}
throw new UpdateException(repo, "Error getting index file", e);
} catch (InterruptedException e) {
// ignored if canceled, the local database just won't be updated
e.printStackTrace();
}
return downloader;
}

14
app/src/main/java/org/fdroid/fdroid/net/Downloader.java
View File

@ -91,20 +91,6 @@ public abstract class Downloader {
protected abstract int totalDownloadSize();
/**
* Helper function for synchronous downloads (i.e. those *not* using AsyncDownloadWrapper),
* which don't really want to bother dealing with an InterruptedException.
* The InterruptedException thrown from download() is there to enable cancelling asynchronous
* downloads, but regular synchronous downloads cannot be cancelled because download() will
* block until completed.
* @throws IOException
*/
public void downloadUninterrupted() throws IOException {
try {
download();
} catch (InterruptedException ignored) { }
}
public abstract void download() throws IOException, InterruptedException;
public abstract boolean isCached();