pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #9508 from alexzatsepin/MAPSME-8613-ssl-support

Browse source 
Mapsme 8613 ssl support
This commit is contained in:
Victor Popov 2018-09-21 19:06:45 +03:00 • committed by GitHub
commit 8604558cd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/.gitignore vendored
View file

@ -38,3 +38,5 @@ res/drawable-mdpi/uk_england.png
res/drawable-mdpi/uk_northern_ireland.png
res/drawable-mdpi/uk_scotland.png
res/drawable-mdpi/uk_wales.png
res/xml/network_security_config.xml

4
android/res/xml/network_security_config.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<!-- Do nothing by default. -->
</network-security-config>

4
configure.sh
View file

@ -10,6 +10,7 @@ PRIVATE_PROPERTIES="$BASE_PATH/android/secure.properties"
PRIVATE_FABRIC_PROPERTIES="$BASE_PATH/android/fabric.properties"
PRIVATE_PUSHWOOSH_PROPERTIES="$BASE_PATH/android/pushwoosh.properties"
PRIVATE_LIBNOTIFY_PROPERTIES="$BASE_PATH/android/libnotify.properties"
PRIVATE_NETWORK_CONFIG="$BASE_PATH/android/res/xml/network_security_config.xml"
SAVED_PRIVATE_REPO_FILE="$BASE_PATH/.private_repository_url"
TMP_REPO_DIR="$BASE_PATH/.tmp.private.repo"
@ -123,6 +124,9 @@ apiKey=0000000000000000000000000000000000000000
echo 'pwAppId=XXXXX
pwProjectId=A123456789012
' > "$PRIVATE_PUSHWOOSH_PROPERTIES"
echo '<?xml version="1.0" encoding="utf-8"?>
<network-security-config/>
' > "$PRIVATE_NETWORK_CONFIG"
exit
fi
fi