Merge pull request #96 from rerobins/master
Allow User Trusted Credentials
This commit is contained in:
commit
79ea6cb082
|
@ -47,6 +47,7 @@
|
||||||
android:icon="@drawable/launch"
|
android:icon="@drawable/launch"
|
||||||
android:label="@string/common.appname"
|
android:label="@string/common.appname"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
android:theme="@style/LaunchScreen">
|
android:theme="@style/LaunchScreen">
|
||||||
|
|
||||||
<uses-library android:name="android.test.runner" />
|
<uses-library android:name="android.test.runner" />
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<network-security-config>
|
||||||
|
<base-config cleartextTrafficPermitted="true">
|
||||||
|
<trust-anchors>
|
||||||
|
<!-- Trust preinstalled CAs -->
|
||||||
|
<certificates src="system"/>
|
||||||
|
|
||||||
|
<!-- Additionally trust user added CAs -->
|
||||||
|
<certificates src="user"/>
|
||||||
|
</trust-anchors>
|
||||||
|
</base-config>
|
||||||
|
</network-security-config>
|
Loading…
Reference in New Issue