Merge pull request #36 from virxkane/issue32

buggins · web-flow · commit 8965f2c91b9c · 2018-08-14T13:56:27.000+03:00
Fixed converting url in OPDSUtil.LinkInfo.convertHref().
diff --git a/android/src/org/coolreader/crengine/OPDSUtil.java b/android/src/org/coolreader/crengine/OPDSUtil.java
@@ -141,7 +141,7 @@ public static String convertHref( URL baseURL, String href ) {
 				return baseURL.getProtocol() + ":" + href;
 			if ( href.startsWith("/") )
 				return baseURL.getProtocol() + "://" + hostPort + href;
-			if ( !href.startsWith("http://") ) {
+			if ( !href.startsWith("http://") && !href.startsWith("https://") ) {
 				return baseURL.getProtocol() + "://" + hostPort + dirPath(baseURL.getPath()) + "/" + href;
 			}
 			return href;

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public static String convertHref( URL baseURL, String href ) {`
`141`	`141`	`return baseURL.getProtocol() + ":" + href;`
`142`	`142`	`if ( href.startsWith("/") )`
`143`	`143`	`return baseURL.getProtocol() + "://" + hostPort + href;`
`144`		`- if ( !href.startsWith("http://") ) {`
	`144`	`+ if ( !href.startsWith("http://") && !href.startsWith("https://") ) {`
`145`	`145`	`return baseURL.getProtocol() + "://" + hostPort + dirPath(baseURL.getPath()) + "/" + href;`
`146`	`146`	`}`
`147`	`147`	`return href;`