prepareConnection: append '/' to the backend URL only if it not already there

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / NetworkUtil.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
index 7fc769abaec1be169449cdc9fc024fa6fb099f76..821a7125e401dac71bab5c92ad94c865a1483799 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
@@ -20,7 +20,6 @@ package net.ktnx.mobileledger.utils;
 import android.util.Base64;
 import android.util.Log;
 
-import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 
 import java.io.IOException;
@@ -30,13 +29,14 @@ import java.nio.charset.StandardCharsets;
 
 public final class NetworkUtil {
     private static final int thirtySeconds = 30000;
-    public static HttpURLConnection prepareConnection(String path) throws IOException {
-        MobileLedgerProfile profile = Data.profile.get();
-        final String backend_url = profile.getUrl();
+    public static HttpURLConnection prepareConnection(MobileLedgerProfile profile, String path)
+            throws IOException {
+        final String url = profile.getUrl();
         final boolean use_auth = profile.isAuthEnabled();
-        Log.d("network", "Connecting to " + backend_url + "/" + path);
-        HttpURLConnection http =
-                (HttpURLConnection) new URL(backend_url + "/" + path).openConnection();
+        if (!url.endsWith("/")) url.concat("/");
+        url.concat(path);
+        Log.d("network", "Connecting to " + url);
+        HttpURLConnection http = (HttpURLConnection) new URL(url).openConnection();
         if (use_auth) {
             final String auth_user = profile.getAuthUserName();
             final String auth_password = profile.getAuthPassword();