feat: support user certificates

lxjwlt · Aug 15, 2022 · 0987490 · 0987490
1 parent 79c4e43
commit 0987490
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -85,3 +85,6 @@ tests
 
 # attributions
 licenseInfos.json
+
+# map
+*.map
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -187,12 +187,19 @@ android {
 	}
 
 	signingConfigs {
+		// release {
+		// 	storeFile file('../keystores/release.keystore')
+		// 	storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
+		// 	keyAlias System.getenv("BITRISEIO_ANDROID_KEYSTORE_ALIAS")
+		// 	keyPassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
+		// }
 		release {
-			storeFile file('../keystores/release.keystore')
-			storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
-			keyAlias System.getenv("BITRISEIO_ANDROID_KEYSTORE_ALIAS")
-			keyPassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
+			storeFile file('debug.keystore')
+      storePassword 'android'
+      keyAlias 'androiddebugkey'
+      keyPassword 'android'
 		}
+
 		debug {
             storeFile file('debug.keystore')
             storePassword 'android'

diff --git a/android/app/src/main/res/xml/react_native_config.xml b/android/app/src/main/res/xml/react_native_config.xml
@@ -6,5 +6,10 @@
 		<domain includeSubdomains="false">10.0.2.2</domain>
 		<domain includeSubdomains="false">10.0.3.2</domain>
 	</domain-config>
-  <base-config cleartextTrafficPermitted="false" />
+  <base-config cleartextTrafficPermitted="false">
+    <trust-anchors>
+      <certificates src="system" />
+      <certificates src="user" />
+    </trust-anchors>
+  </base-config>
 </network-security-config>