add ServerURL preference (replaces address, port, encryption)

app/src/main/res/values/strings.xml

@@ -6,10 +6,9 @@
   <string name="shortcut_stop">Traccar - Stop</string>
   <string name="shortcut_sos">Traccar - SOS</string>
   <string name="settings_id_title">Device identifier</string>
-  <string name="settings_address_title">Server address</string>
-  <string name="settings_address_summary">Domain name or IP address</string>
-  <string name="settings_port_title">Server port</string>
-  <string name="settings_port_summary">Tracking server TCP port</string>
+  <string name="settings_url_title">Server URL</string>
+  <string name="settings_url_summary">Tracking server URL</string>
+  <string name="settings_url_default_value" translatable="false">http://demo.traccar.org</string>
   <string name="settings_interval_title">Frequency</string>
   <string name="settings_interval_summary">Reporting interval in seconds</string>
   <string name="settings_distance_title">Distance</string>
@@ -21,11 +20,6 @@
   <string name="settings_status_on">Stop</string>
   <string name="settings_status_off_summary">Service stopped</string>
   <string name="settings_status_on_summary">Service running</string>
-  <string name="settings_secure_title">Encryption</string>
-  <string name="settings_secure_off">Enable</string>
-  <string name="settings_secure_on">Disable</string>
-  <string name="settings_secure_off_summary">Encryption disabled</string>
-  <string name="settings_secure_on_summary">Encryption enabled</string>
   <string name="settings_provider_title">Location provider</string>
   <string name="settings_provider_summary">Source of location data</string>
   <string name="settings_provider_gps">GPS provider</string>
@@ -33,9 +27,7 @@
   <string name="settings_provider_mixed">Mixed provider</string>
   <string name="settings_foreground_title">Foreground service</string>
   <string name="settings_foreground_summary">Increase service priority</string>
-  <string name="error_invalid_address">Invalid server address</string>
-  <string name="error_invalid_port">Invalid server port</string>
-  <string name="error_invalid_frequency">Invalid frequency value</string>
+  <string name="settings_invalid_url_summary">Invalid server URL</string>
   <string name="menu_status">Status</string>
   <string name="menu_about">About</string>
   <string name="menu_shortcuts">Add shortcuts</string>
@@ -51,4 +43,5 @@
   <string name="status_connectivity_change">Connectivity change</string>
   <string name="hidden_app_name">Device Settings</string>
   <string name="hidden_alert">The app has been hidden. To open it again please dial 8722227 (TRACCAR).</string>
+  <string name="msg_invalid_url">Please enter a valid http:// or https:// URL</string>
 </resources>

app/src/main/res/xml-v14/preferences.xml

@@ -15,26 +15,10 @@
         android:title="@string/settings_id_title" />
 
     <EditTextPreference
-        android:defaultValue="demo.traccar.org"
-        android:key="address"
-        android:summary="@string/settings_address_summary"
-        android:title="@string/settings_address_title" />
-
-    <EditTextPreference
-        android:defaultValue="5055"
-        android:key="port"
-        android:numeric="integer"
-        android:summary="@string/settings_port_summary"
-        android:title="@string/settings_port_title" />
-
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="secure"
-        android:summaryOff="@string/settings_secure_off_summary"
-        android:summaryOn="@string/settings_secure_on_summary"
-        android:switchTextOff="@string/settings_secure_off"
-        android:switchTextOn="@string/settings_secure_on"
-        android:title="@string/settings_secure_title" />
+        android:defaultValue="@string/settings_url_default_value"
+        android:key="url"
+        android:summary="@string/settings_url_summary"
+        android:title="@string/settings_url_title" />
 
     <EditTextPreference
         android:defaultValue="300"

app/src/main/res/xml/preferences.xml

@@ -13,24 +13,10 @@
         android:title="@string/settings_id_title" />
 
     <EditTextPreference
-        android:defaultValue="demo.traccar.org"
-        android:key="address"
-        android:summary="@string/settings_address_summary"
-        android:title="@string/settings_address_title" />
-
-    <EditTextPreference
-        android:defaultValue="5055"
-        android:key="port"
-        android:numeric="integer"
-        android:summary="@string/settings_port_summary"
-        android:title="@string/settings_port_title" />
-
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="secure"
-        android:summaryOff="@string/settings_secure_off_summary"
-        android:summaryOn="@string/settings_secure_on_summary"
-        android:title="@string/settings_secure_title" />
+        android:defaultValue="@string/settings_url_default_value"
+        android:key="url"
+        android:summary="@string/settings_url_summary"
+        android:title="@string/settings_url_title" />
 
     <EditTextPreference
         android:defaultValue="300"