X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FNetworkUtil.java;h=c9f0151ba4b84b12175bbf828eb425e7607c07f8;hb=667ce42731c95a98926657fea359b56209f9348e;hp=67adef060db0c0b77031a66c3cc6a9db491c60ea;hpb=4cdedb2eecf4b8fa1570eff713db7c0d1b3095f7;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 67adef06..c9f0151b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
@@ -1,51 +1,50 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2020 Damyan Ivanov.
+ * 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 <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.utils;
 
-import android.util.Base64;
-import android.util.Log;
+import androidx.annotation.NonNull;
 
-import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 
+import org.jetbrains.annotations.NotNull;
+
 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;
-    public static HttpURLConnection prepareConnection(String path) throws IOException {
-        MobileLedgerProfile profile = Data.profile.get();
-        final String backend_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 (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);
+    @NotNull
+    public static HttpURLConnection prepareConnection(@NonNull MobileLedgerProfile profile,
+                                                      @NonNull String path) throws IOException {
+        return prepareConnection(profile.getUrl(), path, profile.isAuthEnabled());
+    }
+    public static HttpURLConnection prepareConnection(@NonNull String url, @NonNull String path,
+                                                      boolean authEnabled) throws IOException {
+        String connectURL = url;
+        if (!connectURL.endsWith("/"))
+            connectURL += "/";
+        connectURL += path;
+        debug("network", "Connecting to " + connectURL);
+        HttpURLConnection http = (HttpURLConnection) new URL(connectURL).openConnection();
+        http.setAllowUserInteraction(true);
         http.setRequestProperty("Accept-Charset", "UTF-8");
         http.setInstanceFollowRedirects(false);
         http.setUseCaches(false);