From f64f585c904ca6f5d38414c7d2760200505bb24f Mon Sep 17 00:00:00 2001
From: Martin Wilhelm <martin@system4.net>
Date: Thu, 7 Sep 2017 10:43:05 +0200
Subject: [PATCH] Adds a new network_security_config to allow custom CAs
 installed by user. This is needed for Android 7+, see
 https://android-developers.googleblog.com/2016/07/changes-to-trusted-certificate.html.

---
 app/src/main/AndroidManifest.xml                 | 3 ++-
 app/src/main/res/xml/network_security_config.xml | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/xml/network_security_config.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79cd006..db2c290 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig=”@xml/network_security_config”>
 
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..8a76775
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?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>