X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FNetworkUtil.java;h=28663b6601cbfb6a5aa67c9a3fdab70b95e66c24;hb=431f39f54e46ffbad03159c1881bac8edcf30d75;hp=67adef060db0c0b77031a66c3cc6a9db491c60ea;hpb=4cdedb2eecf4b8fa1570eff713db7c0d1b3095f7;p=mobile-ledger.git
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 67adef06..28663b66 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
@@ -1,26 +1,24 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
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();