Merge 1499335 into 31261c6

button · Jun 25, 2019 · bd9977e · bd9977e
2 parents 31261c6 + 1499335
commit bd9977e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/button-merchant/src/main/AndroidManifest.xml b/button-merchant/src/main/AndroidManifest.xml
@@ -27,5 +27,6 @@
     package="com.usebutton.merchant">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <application android:networkSecurityConfig="@xml/network_security_config"/>
 
 </manifest>
diff --git a/.../main/res/xml/network_security_config.xml → .../main/res/xml/network_security_config.xml b/.../main/res/xml/network_security_config.xml → .../main/res/xml/network_security_config.xml
@@ -2,7 +2,7 @@
 <!--
   ~ network_security_config.xml
   ~
-  ~ Copyright (c) 2018 Button, Inc. (https://usebutton.com)
+  ~ Copyright (c) 2019 Button, Inc. (https://usebutton.com)
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,17 @@
   -->
 
 <network-security-config>
+    <domain-config>
+        <domain includeSubdomains="true">usebutton.com</domain>
+        <pin-set>
+            <pin digest="SHA-256">++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=</pin>
+            <pin digest="SHA-256">f0KW/FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=</pin>
+            <pin digest="SHA-256">47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=</pin>
+        </pin-set>
+    </domain-config>
     <debug-overrides>
         <trust-anchors>
-            <!-- Trust user added CAs while debuggable only -->
-            <certificates src="user" />
+            <certificates src="user"/>
         </trust-anchors>
     </debug-overrides>
-</network-security-config>
+</network-security-config>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -32,7 +32,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">