diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-03-03 18:26:00 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-03-03 18:26:00 -0800 |
commit | 7eafe80b36030cc9f3df5d14d01190c962f29ec7 (patch) | |
tree | 8eb055f1442386ef5100b3777c7516c89fef424c | |
parent | a0602c7759572c4af8947688132f8f7e97fb1563 (diff) | |
download | dsub-7eafe80b36030cc9f3df5d14d01190c962f29ec7.tar.gz dsub-7eafe80b36030cc9f3df5d14d01190c962f29ec7.tar.bz2 dsub-7eafe80b36030cc9f3df5d14d01190c962f29ec7.zip |
#320 Fix not using custom httpClient because factory returns Cached, not REST music service
-rw-r--r-- | src/github/daneren2005/dsub/service/CachedMusicService.java | 4 | ||||
-rw-r--r-- | src/github/daneren2005/dsub/service/RemoteController.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index 09347d1d..dec3c665 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -1325,4 +1325,8 @@ public class CachedMusicService implements MusicService { musicFolderId = newMusicFolderId; } } + + public RESTMusicService getMusicService() { + return musicService; + } } diff --git a/src/github/daneren2005/dsub/service/RemoteController.java b/src/github/daneren2005/dsub/service/RemoteController.java index 47730e8c..4483598c 100644 --- a/src/github/daneren2005/dsub/service/RemoteController.java +++ b/src/github/daneren2005/dsub/service/RemoteController.java @@ -99,8 +99,8 @@ public abstract class RemoteController { protected WebProxy createWebProxy() { MusicService musicService = MusicServiceFactory.getMusicService(downloadService); - if(musicService instanceof RESTMusicService) { - return new WebProxy(downloadService, ((RESTMusicService)musicService).getHttpClient()); + if(musicService instanceof CachedMusicService) { + return new WebProxy(downloadService, ((CachedMusicService)musicService).getMusicService().getHttpClient()); } else { return new WebProxy(downloadService); } |