diff options
author | fox <[email protected]> | 2018-04-03 17:31:46 +0000 |
---|---|---|
committer | Gogs <[email protected]> | 2018-04-03 17:31:46 +0000 |
commit | daca89d17214fd9ed7c8d9e7acf9f7c0f4dce1ed (patch) | |
tree | 25e19990048e67ca7609661d403e113e4faf2c0c | |
parent | 036d6c6913dfa03c33a5f29b9cad22d670fa6d00 (diff) | |
parent | 93f1480de38ca68c725e904b984b9fcdc2dd0779 (diff) |
Merge branch 'master' of imgx64/tt-rss-android into master
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 3 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/xml/network_security_config.xml | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index abed9b59..277a51b5 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:fullBackupOnly="true" android:hardwareAccelerated="true" android:icon="@drawable/ic_launcher" - android:label="@string/app_name" > + android:label="@string/app_name" + android:networkSecurityConfig="@xml/network_security_config" > <!-- <meta-data android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule" tools:node="remove" /> --> diff --git a/org.fox.ttrss/src/main/res/xml/network_security_config.xml b/org.fox.ttrss/src/main/res/xml/network_security_config.xml new file mode 100644 index 00000000..b6502b19 --- /dev/null +++ b/org.fox.ttrss/src/main/res/xml/network_security_config.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config> + <base-config cleartextTrafficPermitted="true"> + <trust-anchors> + <certificates src="system" /> + <certificates src="user" /> + </trust-anchors> + </base-config> +</network-security-config> + |