Fixed host name can't be null

daneren2005 · Sep 26, 2012 · d7c91c4 · d7c91c4
1 parent 66a15e9
commit d7c91c4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -753,7 +753,14 @@ private void increaseTimeouts(HttpParams requestParams) {
     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/"));