aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/org/traccar/manager/MainFragment.java3
-rw-r--r--app/src/main/java/org/traccar/manager/StartFragment.java4
2 files changed, 3 insertions, 4 deletions
diff --git a/app/src/main/java/org/traccar/manager/MainFragment.java b/app/src/main/java/org/traccar/manager/MainFragment.java
index 0fd79d1..d63c19e 100644
--- a/app/src/main/java/org/traccar/manager/MainFragment.java
+++ b/app/src/main/java/org/traccar/manager/MainFragment.java
@@ -60,9 +60,6 @@ public class MainFragment extends WebViewFragment {
String url = PreferenceManager.getDefaultSharedPreferences(
getActivity()).getString(MainActivity.PREFERENCE_URL, null);
- if (url.endsWith("/")) {
- url = url.substring(0, url.length() - 1);
- }
getWebView().loadUrl(url);
}
diff --git a/app/src/main/java/org/traccar/manager/StartFragment.java b/app/src/main/java/org/traccar/manager/StartFragment.java
index 6d41fb2..429e8d1 100644
--- a/app/src/main/java/org/traccar/manager/StartFragment.java
+++ b/app/src/main/java/org/traccar/manager/StartFragment.java
@@ -18,6 +18,7 @@ package org.traccar.manager;
import android.app.AlertDialog;
import android.app.Fragment;
import android.content.DialogInterface;
+import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -63,7 +64,8 @@ public class StartFragment extends Fragment implements View.OnClickListener {
protected Boolean doInBackground(String... urls) {
try {
- URL url = new URL(urls[0] + "/api/server");
+ Uri uri = Uri.parse(urls[0]).buildUpon().appendPath("api/server").build();
+ URL url = new URL(uri.toString());
HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));