filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3166 from tobymurray/patch-1 

Related to #1793, allow cleartext to LAN domains
This commit is contained in:
Benoit Marty 2021-04-30 18:09:07 +02:00 committed by GitHub
parent 38e83e1f35 33337bd772
commit aa9f4c2e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -38,6 +38,7 @@ git branch -u origin/main main
# And optionally # And optionally
git remote prune origin git remote prune origin
``` ```
- Allow cleartext (non-SSL) connections to Matrix servers on LAN hosts (#3166)
Changes in Element 1.1.6 (2021-04-16) Changes in Element 1.1.6 (2021-04-16)
=================================================== ===================================================

10
vector/src/main/res/xml/network_security_config.xml
View File

@ -13,6 +13,16 @@
<domain includeSubdomains="true">10.0.2.2</domain> <domain includeSubdomains="true">10.0.2.2</domain>
<!-- Onion services --> <!-- Onion services -->
<domain includeSubdomains="true">onion</domain> <domain includeSubdomains="true">onion</domain>
<!-- Domains that are used for LANs -->
<!-- These are IANA recognized special use domain names, see https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml -->
<domain includeSubdomains="true">home.arpa</domain>
<domain includeSubdomains="true">local</domain> <!-- Note this has been reserved for use with mDNS -->
<domain includeSubdomains="true">test</domain>
<!-- These are observed in the wild either by convention or RFCs that have not been accepted, and are not currently TLDs -->
<domain includeSubdomains="true">home</domain>
<domain includeSubdomains="true">lan</domain>
<domain includeSubdomains="true">localdomain</domain>
</domain-config> </domain-config>
<debug-overrides> <debug-overrides>