aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-09-07 21:55:49 +1200
committerGitHub <noreply@github.com>2017-09-07 21:55:49 +1200
commit7af336df10f916a204e49893f5ef5555311decf7 (patch)
tree2acff74c979999d0fd7174404c825a2e64915d5d /app/src/main/AndroidManifest.xml
parent40eaa5e26c44c3fc826bae406263443fb04e12d5 (diff)
parentf64f585c904ca6f5d38414c7d2760200505bb24f (diff)
downloadetbsa-traccar-manager-android-7af336df10f916a204e49893f5ef5555311decf7.tar.gz
etbsa-traccar-manager-android-7af336df10f916a204e49893f5ef5555311decf7.tar.bz2
etbsa-traccar-manager-android-7af336df10f916a204e49893f5ef5555311decf7.zip
Merge pull request #56 from wico/enable-user-certs
Allow custom CAs installed by user
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
-rw-r--r--app/src/main/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79cd006..db2c290 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:networkSecurityConfig=”@xml/network_security_config”>
<activity
android:name=".MainActivity"