mirror of
https://github.com/mastodon/mastodon-android.git
synced 2025-02-08 16:08:51 +01:00
Merge pull request #846 from Evil2000/master
Added network security config
This commit is contained in:
commit
c5197975c5
@ -31,6 +31,7 @@
|
||||
android:allowBackup="true"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:networkSecurityConfig="@xml/network_security_config"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:theme="@style/Theme.Mastodon.AutoLightDark"
|
||||
android:largeHeap="true"
|
||||
|
10
mastodon/src/main/res/xml/network_security_config.xml
Normal file
10
mastodon/src/main/res/xml/network_security_config.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<?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>
|
Loading…
x
Reference in New Issue
Block a user