apirequest/apiloader: use canonical API url just in case

2 files changed, 10 insertions, 2 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiLoader.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiLoader.java
index 49f4c9e1..ba9e930b 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiLoader.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiLoader.java
@@ -16,6 +16,7 @@ import com.google.gson.JsonParser;
 
 import org.fox.ttrss.ApiCommon.ApiError;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
@@ -111,7 +112,10 @@ public class ApiLoader extends AsyncTaskLoader<JsonElement> {
 		URL url;
 
 		try {
-			url = new URL(m_api + "/api/");
+			// canonicalize url just in case
+			URL baseUrl = new URL(m_api);
+			File f = new File(baseUrl.getPath() + "/api");
+			url = new URL(baseUrl, f.getCanonicalPath() + "/");
 		} catch (Exception e) {
 			m_lastError = ApiError.INVALID_URL;
 			e.printStackTrace();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
index ab52a0c3..d839d624 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
@@ -16,6 +16,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
@@ -94,7 +95,10 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 		URL url;
 
 		try {
-			url = new URL(m_api + "/api/");
+			// canonicalize url just in case
+			URL baseUrl = new URL(m_api);
+			File f = new File(baseUrl.getPath() + "/api");
+			url = new URL(baseUrl, f.getCanonicalPath() + "/");
 		} catch (Exception e) {
 			m_lastError = ApiError.INVALID_URL;
 			e.printStackTrace();