diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-08-16 15:33:27 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-08-16 15:33:27 -0700 |
| commit | 199576746d20729489f83d11bf89f4ab35f22b63 (patch) | |
| tree | 0f9c40e1af23b37131614ce017431d50765465c0 | |
| parent | 1b4efd1ff269650558a6a9ac874b87148c176d3a (diff) | |
| download | dsub-199576746d20729489f83d11bf89f4ab35f22b63.tar.gz dsub-199576746d20729489f83d11bf89f4ab35f22b63.tar.bz2 dsub-199576746d20729489f83d11bf89f4ab35f22b63.zip | |
Move to fragment logic so more easily expanded upon
| -rw-r--r-- | src/github/daneren2005/dsub/fragments/SubsonicFragment.java | 12 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/service/CachedMusicService.java | 19 |
2 files changed, 14 insertions, 17 deletions
diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java index 516c4c59..7e842425 100644 --- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -665,6 +665,18 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR musicService.setStarred(Arrays.asList(entry.getId()), null, null, parents, starred, null, context);
}
+ DownloadService downloadService = DownloadService.getInstance();
+ if(downloadService != null && !entry.isDirectory()) {
+ List<DownloadFile> files = downloadService.getDownloads();
+ for(DownloadFile file: files) {
+ MusicDirectory.Entry check = file.getSong();
+ if(entry.getId().equals(check.getId())) {
+ check.setStarred(starred);
+ break;
+ }
+ }
+ }
+
return null;
}
diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index e989036a..027f6694 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -440,7 +440,7 @@ public class CachedMusicService implements MusicService { @Override public void updateResult(List<Entry> objects, Entry result) { - setEntryStarred(result, starred); + result.setStarred(starred); } }.execute(); } @@ -571,7 +571,7 @@ public class CachedMusicService implements MusicService { @Override public void updateResult(List<Entry> objects, Entry result) { - setEntryStarred(result, starred); + result.setStarred(starred); } }.execute(); } @@ -596,21 +596,6 @@ public class CachedMusicService implements MusicService { }.execute(); } } - private void setEntryStarred(Entry entry, boolean starred) { - entry.setStarred(starred); - - DownloadService downloadService = DownloadService.getInstance(); - if(downloadService != null && !entry.isDirectory()) { - List<DownloadFile> files = downloadService.getDownloads(); - for(DownloadFile file: files) { - Entry check = file.getSong(); - if(entry.getId().equals(check.getId())) { - check.setStarred(starred); - break; - } - } - } - } @Override public List<Share> getShares(Context context, ProgressListener progressListener) throws Exception { |