Allow all non-https outgoing traffic, use https for osmose and textual

MarcusWolschon · Aug 28, 2019 · 1a9890c · 1a9890c
1 parent a5d6a2d
commit 1a9890c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/src/main/res/xml-v11/advancedpreferences.xml b/src/main/res/xml-v11/advancedpreferences.xml
@@ -266,13 +266,13 @@
             android:summary="@string/config_username_summary"
             android:title="@string/config_loginbutton_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://offsets.textual.ru/"
+            android:defaultValue="https://offsets.textual.ru/"
             android:key="@string/config_offsetServer_key"
             android:summary="@string/config_offsetServer_summary"
             android:dialogMessage="@string/config_offsetServer_summary"
             android:title="@string/config_offsetServer_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://osmose.openstreetmap.fr/"
+            android:defaultValue="https://osmose.openstreetmap.fr/"
             android:key="@string/config_osmoseServer_key"
             android:summary="@string/config_osmoseServer_summary"
             android:dialogMessage="@string/config_osmoseServer_summary"

diff --git a/src/main/res/xml-v14/advancedpreferences.xml b/src/main/res/xml-v14/advancedpreferences.xml
@@ -327,13 +327,13 @@
             android:summary="@string/config_username_summary"
             android:title="@string/config_loginbutton_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://offsets.textual.ru/"
+            android:defaultValue="https://offsets.textual.ru/"
             android:key="@string/config_offsetServer_key"
             android:summary="@string/config_offsetServer_summary"
             android:dialogMessage="@string/config_offsetServer_summary"
             android:title="@string/config_offsetServer_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://osmose.openstreetmap.fr/"
+            android:defaultValue="https://osmose.openstreetmap.fr/"
             android:key="@string/config_osmoseServer_key"
             android:summary="@string/config_osmoseServer_summary"
             android:dialogMessage="@string/config_osmoseServer_summary"

diff --git a/src/main/res/xml-v19/advancedpreferences.xml b/src/main/res/xml-v19/advancedpreferences.xml
@@ -334,13 +334,13 @@
             android:summary="@string/config_username_summary"
             android:title="@string/config_loginbutton_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://offsets.textual.ru/"
+            android:defaultValue="https://offsets.textual.ru/"
             android:key="@string/config_offsetServer_key"
             android:summary="@string/config_offsetServer_summary"
             android:dialogMessage="@string/config_offsetServer_summary"
             android:title="@string/config_offsetServer_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://osmose.openstreetmap.fr/"
+            android:defaultValue="https://osmose.openstreetmap.fr/"
             android:key="@string/config_osmoseServer_key"
             android:summary="@string/config_osmoseServer_summary"
             android:dialogMessage="@string/config_osmoseServer_summary"

diff --git a/src/main/res/xml-v24/advancedpreferences.xml b/src/main/res/xml-v24/advancedpreferences.xml
@@ -332,13 +332,13 @@
             android:summary="@string/config_username_summary"
             android:title="@string/config_loginbutton_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://offsets.textual.ru/"
+            android:defaultValue="https://offsets.textual.ru/"
             android:key="@string/config_offsetServer_key"
             android:summary="@string/config_offsetServer_summary"
             android:dialogMessage="@string/config_offsetServer_summary"
             android:title="@string/config_offsetServer_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://osmose.openstreetmap.fr/"
+            android:defaultValue="https://osmose.openstreetmap.fr/"
             android:key="@string/config_osmoseServer_key"
             android:summary="@string/config_osmoseServer_summary"
             android:dialogMessage="@string/config_osmoseServer_summary"

diff --git a/src/main/res/xml/advancedpreferences.xml b/src/main/res/xml/advancedpreferences.xml
@@ -259,12 +259,12 @@
             android:summary="@string/config_username_summary"
             android:title="@string/config_loginbutton_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://offsets.textual.ru/"
+            android:defaultValue="https://offsets.textual.ru/"
             android:key="@string/config_offsetServer_key"
             android:summary="@string/config_offsetServer_summary"
             android:title="@string/config_offsetServer_title" />
         <android.support.v7.preference.EditTextPreference
-            android:defaultValue="http://osmose.openstreetmap.fr/"
+            android:defaultValue="https://osmose.openstreetmap.fr/"
             android:key="@string/config_osmoseServer_key"
             android:summary="@string/config_osmoseServer_summary"
             android:title="@string/config_osmoseServer_title" />

diff --git a/src/main/res/xml/network_security_config.xml b/src/main/res/xml/network_security_config.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">localhost</domain>
-        <domain includeSubdomains="true">127.0.0.1</domain>
-    </domain-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
 </network-security-config>