Merge pull request #4275 from element-hq/feature/bma/userCertificates

Allow user certificate in production builds.

Author: bmarty

app/src/main/res/xml/network_security_config.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
     <!-- Ref: https://developer.android.com/training/articles/security-config.html -->
     <!-- By default, do not allow clearText traffic -->
-    <base-config cleartextTrafficPermitted="false" />
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates
+                src="user"
+                tools:ignore="AcceptsUserCertificates" />
+        </trust-anchors>
+    </base-config>
 
     <!-- Allow clearText traffic on some specified host -->
     <domain-config cleartextTrafficPermitted="true">
@@ -24,12 +31,4 @@
         <domain includeSubdomains="true">lan</domain>
         <domain includeSubdomains="true">localdomain</domain>
     </domain-config>
-
-    <debug-overrides>
-        <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
-        </trust-anchors>
-    </debug-overrides>
-
 </network-security-config>