From 7eafe80b36030cc9f3df5d14d01190c962f29ec7 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 3 Mar 2015 18:26:00 -0800 Subject: #320 Fix not using custom httpClient because factory returns Cached, not REST music service --- src/github/daneren2005/dsub/service/CachedMusicService.java | 4 ++++ src/github/daneren2005/dsub/service/RemoteController.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/github') 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); } -- cgit v1.2.3