UI and machinery for detecting hledger-web version

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / NetworkUtil.java

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 c0802a4547b1f0668faf3810f4852f668155649f..c9f0151ba4b84b12175bbf828eb425e7607c07f8 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/NetworkUtil.java
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright © 2019 Damyan Ivanov.
+ * 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
  * 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


@@ -17,8 +17,12 @@
 
 package net.ktnx.mobileledger.utils;
 
 
 package net.ktnx.mobileledger.utils;
 

+import androidx.annotation.NonNull;
+

 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 
 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.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;


@@ -27,14 +31,19 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public final class NetworkUtil {
     private static final int thirtySeconds = 30000;
 
 public final class NetworkUtil {
     private static final int thirtySeconds = 30000;

-    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;
-        debug("network", "Connecting to " + url);
-        HttpURLConnection http = (HttpURLConnection) new URL(url).openConnection();
+    @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.setAllowUserInteraction(true);
         http.setRequestProperty("Accept-Charset", "UTF-8");
         http.setInstanceFollowRedirects(false);