Fixed host name can't be null

1 files changed, 8 insertions, 1 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
index 748eacee..f475d9d5 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -753,7 +753,14 @@ public class RESTMusicService implements MusicService {
     private void detectRedirect(String originalUrl, Context context, HttpContext httpContext) {
         HttpUriRequest request = (HttpUriRequest) httpContext.getAttribute(ExecutionContext.HTTP_REQUEST);
         HttpHost host = (HttpHost) httpContext.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
-        String redirectedUrl = host.toURI() + request.getURI();
+		
+		// Sometimes the request doesn't contain the "http://host" part
+		String redirectedUrl;
+		if (request.getURI().getScheme() == null) {
+			redirectedUrl = host.toURI() + request.getURI();
+		} else {
+			redirectedUrl = request.getURI().toString();
+		}
 
         redirectFrom = originalUrl.substring(0, originalUrl.indexOf("/rest/"));
         redirectTo = redirectedUrl.substring(0, redirectedUrl.indexOf("/rest/"));