aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-03-09 19:36:30 +0100
committerChristian Schneppe <christian@pix-art.de>2017-03-09 19:36:30 +0100
commitc8b893780f9f7c931eb4ff1b4fbff2d840fcad27 (patch)
tree8ded9c8216bca77dccb1e4d54cead2aada0e8e85 /src
parent521456c9487ce518e7a5c1268c96eeb3e031a7e3 (diff)
allow app to access user trust store
Diffstat (limited to 'src')
-rw-r--r--src/main/AndroidManifest.xml1
-rw-r--r--src/main/res/xml/network_security_configuration.xml9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 77af7c88a..8f814795d 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
<uses-sdk tools:overrideLibrary="net.ypresto.androidtranscoder" />
<application
+ android:networkSecurityConfig="@xml/network_security_configuration"
android:name="android.support.multidex.MultiDexApplication"
android:allowBackup="false"
android:icon="@drawable/ic_launcher"
diff --git a/src/main/res/xml/network_security_configuration.xml b/src/main/res/xml/network_security_configuration.xml
new file mode 100644
index 000000000..02ecb3485
--- /dev/null
+++ b/src/main/res/xml/network_security_configuration.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <base-config>
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="user" />
+ </trust-anchors>
+ </base-config>
+</network-security-config> \ No newline at end of file