mirror of
https://github.com/lone-cloud/prism-android
synced 2026-06-03 11:03:10 -07:00
allow http connections for release builds
This commit is contained in:
parent
cd68871684
commit
e6fe2e9d52
4 changed files with 5 additions and 16 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
0.1.0
|
0.1.1
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<network-security-config>
|
|
||||||
<base-config
|
|
||||||
cleartextTrafficPermitted="true">
|
|
||||||
<trust-anchors>
|
|
||||||
<!-- Trust preinstalled CAs -->
|
|
||||||
<certificates src="system" />
|
|
||||||
<!-- Additionally trust user added CAs -->
|
|
||||||
<certificates src="user" />
|
|
||||||
</trust-anchors>
|
|
||||||
</base-config>
|
|
||||||
</network-security-config>
|
|
||||||
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
<string name="testing_connection">Testing connection…</string>
|
<string name="testing_connection">Testing connection…</string>
|
||||||
<string name="connection_successful">Connection successful</string>
|
<string name="connection_successful">Connection successful</string>
|
||||||
<string name="connection_failed">Connection failed</string>
|
<string name="connection_failed">Connection failed</string>
|
||||||
<string name="test_and_save_button">Test and Save</string>
|
<string name="test_and_save_button">Connect</string>
|
||||||
<string name="clear_server_button">Remove</string>
|
<string name="clear_server_button">Remove</string>
|
||||||
<string name="clear_server_confirm_title">Remove Prism Server?</string>
|
<string name="clear_server_confirm_title">Remove Prism Server?</string>
|
||||||
<string name="clear_server_confirm_message_no_apps">This will remove your Prism server configuration.</string>
|
<string name="clear_server_confirm_message_no_apps">This will remove your Prism server configuration.</string>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
<network-security-config>
|
<network-security-config>
|
||||||
<base-config>
|
<base-config
|
||||||
|
cleartextTrafficPermitted="true">
|
||||||
<trust-anchors>
|
<trust-anchors>
|
||||||
<!-- Trust only system CAs (proper SSL certificates) -->
|
|
||||||
<certificates src="system" />
|
<certificates src="system" />
|
||||||
|
<certificates src="user" />
|
||||||
</trust-anchors>
|
</trust-anchors>
|
||||||
</base-config>
|
</base-config>
|
||||||
</network-security-config>
|
</network-security-config>
|
||||||
Loading…
Add table
Reference in a new issue