diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-01-19 15:27:56 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-01-19 15:27:56 -0800 |
| commit | 411e408140025f433f0c92f0eca6ca0961ead8ea (patch) | |
| tree | cf8479737583b3aa2dfe78d5c75106e6dde2fd79 | |
| parent | 9835dedc90ea55ecbc01aeaa6ea6cba61c8d57d3 (diff) | |
| download | dsub-411e408140025f433f0c92f0eca6ca0961ead8ea.tar.gz dsub-411e408140025f433f0c92f0eca6ca0961ead8ea.tar.bz2 dsub-411e408140025f433f0c92f0eca6ca0961ead8ea.zip | |
Closes #95 Fixed cache not actually caching files
| -rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java | 2 | ||||
| -rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/view/SongView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java index 8c12372c..72198850 100644 --- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java +++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java @@ -1033,7 +1033,7 @@ public class DownloadServiceImpl extends Service implements DownloadService { if((preloaded + 1 == n || preloaded >= Util.getPreloadCount(this) || downloadList.isEmpty()) && !backgroundDownloadList.isEmpty()) { for(int i = 0; i < backgroundDownloadList.size(); i++) { DownloadFile downloadFile = backgroundDownloadList.get(i); - if(downloadFile.isWorkDone()) { + if(downloadFile.isWorkDone() && (!downloadFile.shouldSave() || downloadFile.isSaved())) { // Don't need to keep list like active song list backgroundDownloadList.remove(downloadFile); i--; diff --git a/subsonic-android/src/github/daneren2005/dsub/view/SongView.java b/subsonic-android/src/github/daneren2005/dsub/view/SongView.java index 013edcb8..1042546a 100644 --- a/subsonic-android/src/github/daneren2005/dsub/view/SongView.java +++ b/subsonic-android/src/github/daneren2005/dsub/view/SongView.java @@ -118,7 +118,7 @@ public class SongView extends UpdateView implements Checkable { int rightImage = 0; if (downloadFile.isWorkDone()) { - leftImage = downloadFile.shouldSave() ? R.drawable.saved : R.drawable.downloaded; + leftImage = downloadFile.isSaved() ? R.drawable.saved : R.drawable.downloaded; moreButton.setImageResource(R.drawable.list_item_more_shaded); } else { moreButton.setImageResource(R.drawable.list_item_more); |