Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[android] apply Network Security Config file (fixes #22375) (part 2 of #23105) #23135

Closed
wants to merge 9 commits into from
Closed

[android] apply Network Security Config file (fixes #22375) (part 2 of #23105) #23135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dedd9a5
prefix network security config xml with 'rn' (to match preferences)
Salakar Jan 24, 2019
a89e878
apply networkSecurityConfig to androidTest
Salakar Jan 24, 2019
1f15078
apply networkSecurityConfig to debug
Salakar Jan 24, 2019
57c3f77
apply network security config to template project
Salakar Feb 1, 2019
d1c60ca
Revert "apply networkSecurityConfig to debug"
Salakar Feb 1, 2019
004bb92
Revert "apply networkSecurityConfig to androidTest"
Salakar Feb 1, 2019
223e265
Revert "prefix network security config xml with 'rn' (to match prefer…
Salakar Feb 1, 2019
3df598a
Revert "Add Network Security Config file (fixes #22375) (#23105)"
Salakar Feb 1, 2019
bcef899
Merge branch 'master' of https://github.com/facebook/react-native
Salakar Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...evsupport/xml/network_security_config.xml → ...debug/res/xml/network_security_config.xml
View file
Open in desktop
File renamed without changes.
7 changes: 5 additions & 2 deletions template/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.helloworld">
xmlns:tools="http://schemas.android.com/tools"
package="com.helloworld">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
Expand All @@ -10,7 +11,9 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
android:networkSecurityConfig="@xml/network_security_config"
tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
Expand Down
8 changes: 8 additions & 0 deletions template/android/app/src/release/res/xml/network_security_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<domain-config cleartextTrafficPermitted="false">
<domain includeSubdomains="false">localhost</domain>
<domain includeSubdomains="false">10.0.2.2</domain>
<domain includeSubdomains="false">10.0.3.2</domain>
</domain-config>
</network-security-config>