From 6c4fb28b7963a0de22836258aef61a440ff8975e Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Mon, 18 Mar 2019 08:03:28 +0200 Subject: [PATCH] prepareConnection: append '/' to the backend URL only if it not already there avoids URLs like http://server//accounts, which lead to redirects, which (1) are superflous and (2) MoLe can't handle yet --- .../net/ktnx/mobileledger/utils/NetworkUtil.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 b1eb36bb..821a7125 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java @@ -29,12 +29,14 @@ import java.nio.charset.StandardCharsets; public final class NetworkUtil { private static final int thirtySeconds = 30000; - public static HttpURLConnection prepareConnection(MobileLedgerProfile profile, String path) throws IOException { - 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(); -- 2.39.5