X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FNetworkUtil.java;h=c0802a4547b1f0668faf3810f4852f668155649f;hb=34ab3549cf6cbd1e9db2da1707b5932514f5e3a7;hp=12758b10cb4b3f127d5bf36cc4cf96f80e71f6ac;hpb=3c985e9dd973d78572e119dc21aa9b87ffc611df;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 12758b10..c0802a45 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java @@ -17,15 +17,13 @@ package net.ktnx.mobileledger.utils; -import android.util.Base64; -import android.util.Log; - import net.ktnx.mobileledger.model.MobileLedgerProfile; import java.io.IOException; 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; @@ -35,17 +33,9 @@ public final class NetworkUtil { final boolean use_auth = profile.isAuthEnabled(); if (!url.endsWith("/")) url += "/"; url += path; - Log.d("network", "Connecting to " + url); + 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(); - 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); - } - http.setAllowUserInteraction(false); + http.setAllowUserInteraction(true); http.setRequestProperty("Accept-Charset", "UTF-8"); http.setInstanceFollowRedirects(false); http.setUseCaches(false);