X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FNetworkUtil.java;h=28663b6601cbfb6a5aa67c9a3fdab70b95e66c24;hp=7fc769abaec1be169449cdc9fc024fa6fb099f76;hb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438;hpb=998dd32a089d199a2569069415755eb3169b35b0 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 7fc769ab..28663b66 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java @@ -18,9 +18,7 @@ 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; @@ -28,15 +26,18 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; +import static net.ktnx.mobileledger.utils.Logger.debug; + 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 { + 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 += "/"; + url += path; + debug("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();