From 93f1480de38ca68c725e904b984b9fcdc2dd0779 Mon Sep 17 00:00:00 2001
From: "Ibrahim M. Ghazal" <imgx64@gmail.com>
Date: Tue, 3 Apr 2018 19:29:31 +0300
Subject: Allow user-provided TLS certificates

---
 org.fox.ttrss/src/main/AndroidManifest.xml                 |  3 ++-
 org.fox.ttrss/src/main/res/xml/network_security_config.xml | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 org.fox.ttrss/src/main/res/xml/network_security_config.xml

(limited to 'org.fox.ttrss/src')

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>
+
-- 
cgit v1.2.3