Merge branch 'fp2-1825' into 'master'
FPII-1825: Queue "copy file to cache" operation in FP Updater
Make sure only one CopyFileToCacheTask gets executed.
See merge request !7
diff --git a/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java b/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
index 397bc8c..d176505 100644
--- a/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
+++ b/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
@@ -70,6 +70,8 @@
private DownloadManager mDownloadManager;
+ private CopyFileToCacheTask copyTask;
+
private DownloadBroadCastReceiver mDownloadBroadCastReceiver;
private BroadcastReceiver mNetworkStateReceiver;
@@ -735,12 +737,14 @@
{
if (Utils.canCopyToCache(file))
{
-
DownloadableItem item = mIsVersion ? mSelectedVersion : mSelectedStore;
- CopyFileToCacheTask copyTask = new CopyFileToCacheTask();
if (item != null)
{
+ if (copyTask != null) {
+ return;
+ }
+ copyTask = new CopyFileToCacheTask();
copyTask.execute(file.getPath(), Environment.getDownloadCacheDirectory() + "/" + Utils.getFilenameFromDownloadableItem(item, mIsVersion));
}
else