aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2022-07-01 14:48:45 -0300
committerTorsten Grote <t@grobox.de>2022-07-01 14:48:45 -0300
commit08213e48d4f4d16f8814b996474c3e098bd2c702 (patch)
tree1f23c1bf623719e057618fe7be9ebf7670e4be2c
parent58a3e4589823f61ec89ed4e709ed50d958733140 (diff)
downloadtaler-android-08213e48d4f4d16f8814b996474c3e098bd2c702.tar.gz
taler-android-08213e48d4f4d16f8814b996474c3e098bd2c702.tar.bz2
taler-android-08213e48d4f4d16f8814b996474c3e098bd2c702.zip
Allow cleartext traffic to int.taler.net for debug builds
-rw-r--r--.idea/gradle.xml1
-rw-r--r--cashier/src/debug/res/xml/network_security_config.xml6
-rw-r--r--cashier/src/main/AndroidManifest.xml2
-rw-r--r--cashier/src/main/res/xml/network_security_config.xml2
4 files changed, 10 insertions, 1 deletions
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index caf1ba4..4cc0060 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -21,6 +21,7 @@
<option value="$PROJECT_DIR$/wallet" />
</set>
</option>
+ <option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
diff --git a/cashier/src/debug/res/xml/network_security_config.xml b/cashier/src/debug/res/xml/network_security_config.xml
new file mode 100644
index 0000000..a85875e
--- /dev/null
+++ b/cashier/src/debug/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <domain-config cleartextTrafficPermitted="true">
+ <domain includeSubdomains="true">int.taler.net</domain>
+ </domain-config>
+</network-security-config>
diff --git a/cashier/src/main/AndroidManifest.xml b/cashier/src/main/AndroidManifest.xml
index 36a3b72..2947e83 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -11,10 +11,10 @@
android:fullBackupContent="@xml/backup_descriptor"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
+ android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:theme="@style/AppTheme"
- android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
<activity
diff --git a/cashier/src/main/res/xml/network_security_config.xml b/cashier/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..81cd5ce
--- /dev/null
+++ b/cashier/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config />