X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FNetworkUtil.java;h=12758b10cb4b3f127d5bf36cc4cf96f80e71f6ac;hb=32585e83b4165668a384eb43414d216601c16b31;hp=864175104a2b6612fd9c9b31aa72cc3afabee502;hpb=e3872d583f324e225580a6fd05568d36e4ba0db0;p=mobile-ledger-staging.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 86417510..12758b10 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
@@ -1,18 +1,18 @@
/*
* 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;
@@ -20,27 +20,28 @@ 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;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
public final class NetworkUtil {
private static final int thirtySeconds = 30000;
- public static HttpURLConnection prepare_connection(String path) throws IOException {
- MobileLedgerProfile profile = Data.profile.get();
- final String backend_url = profile.getUrl();
- final boolean use_auth = profile.isUseAuthentication();
- Log.d("network", "Connecting to " + backend_url + "/" + path);
- HttpURLConnection http =
- (HttpURLConnection) new URL(backend_url + "/" + path).openConnection();
+ public static HttpURLConnection prepareConnection(MobileLedgerProfile profile, String path)
+ throws IOException {
+ String url = profile.getUrl();
+ final boolean use_auth = profile.isAuthEnabled();
+ if (!url.endsWith("/")) url += "/";
+ url += 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();
- final byte[] bytes =
- (String.format("%s:%s", auth_user, auth_password)).getBytes("UTF-8");
+ final byte[] bytes = (String.format("%s:%s", auth_user, auth_password))
+ .getBytes(StandardCharsets.UTF_8);
final String value = Base64.encodeToString(bytes, Base64.DEFAULT);
http.setRequestProperty("Authorization", "Basic " + value);
}