summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/calyx.net.json2
-rw-r--r--app/assets/riseup.net.json2
-rw-r--r--app/src/main/res/layout-xlarge/about.xml52
-rw-r--r--app/src/main/res/layout/about.xml46
-rw-r--r--app/src/main/res/values/untranslatable.xml20
5 files changed, 110 insertions, 12 deletions
diff --git a/app/assets/calyx.net.json b/app/assets/calyx.net.json
index 30ab43c5..69e1c2a6 100644
--- a/app/assets/calyx.net.json
+++ b/app/assets/calyx.net.json
@@ -1,5 +1,5 @@
{
- "api_uri": "https://calyx.net:4430",
+ "api_uri": "https://api.calyx.net:4430",
"api_version": "1",
"ca_cert_fingerprint": "SHA256: 43683c9ba3862c5384a8c1885072fcac40b5d2d4dd67331443f13a3077fa2e69",
"ca_cert_uri": "https://calyx.net/ca.crt",
diff --git a/app/assets/riseup.net.json b/app/assets/riseup.net.json
index 9a5ec79e..82290ecd 100644
--- a/app/assets/riseup.net.json
+++ b/app/assets/riseup.net.json
@@ -16,7 +16,7 @@
"en": "Riseup Networks"
},
"service": {
- "allow_anonymous": false,
+ "allow_anonymous": true,
"allow_free": true,
"allow_limited_bandwidth": false,
"allow_paid": false,
diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/about.xml
index ea2251cf..c7896917 100644
--- a/app/src/main/res/layout-xlarge/about.xml
+++ b/app/src/main/res/layout-xlarge/about.xml
@@ -152,6 +152,58 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:text="@string/copyright_okhttp" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/mbetTLS"
+ android:textSize="24sp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:autoLink="web"
+ android:text="@string/copyright_mbetTLS" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/asio"
+ android:textSize="24sp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:text="@string/copyright_asio" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/openvpn3"
+ android:textSize="24sp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:text="@string/copyright_openvpn3" />
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index abc12566..aba51141 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -150,6 +150,52 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/copyright_okhttp" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/mbetTLS"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:autoLink="web"
+ android:text="@string/copyright_mbetTLS" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/asio"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/copyright_asio" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/openvpn3"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/copyright_openvpn3" />
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 59605609..2e91366a 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="notifcation_title_bitmask">Bitmask - %s</string>
-
- <string name="copyright_leapgui" translatable="false">Copyright 2012-2017\nLEAP Encryption Access Project &lt;info@leap.se></string>
+ <string name="copyright_leapgui" translatable="false">Copyright 2012-2018\nLEAP Encryption Access Project &lt;info@leap.se></string>
<string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
"OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
<string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
@@ -15,20 +14,21 @@
<string name="openvpn" translatable="false">OpenVPN</string>
<string name="lzo" translatable="false">LZO</string>
<string name="openssl" translatable="false">OpenSSL</string>
+ <string name="mbetTLS" translatable="false">Mbed TLS</string>
+ <string name="copyright_mbetTLS" translatable="false">Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, as can be found in: apache-2.0.txt. \n
+ https://github.com/schwabe/polarssl/blob/icsopenvpn_270/apache-2.0.txt
+ </string>
+ <string name="asio">Asio</string>
+ <string name="copyright_asio">Boost Software License - Version 1.0 - August 17th, 2003</string>
+ <string name="openvpn3">OpenVPN 3</string>
+ <string name="copyright_openvpn3">GNU AFFERO GENERAL PUBLIC LICENSE\n
+ Version 3, 19 November 2007</string>
<string name="unknown_state" translatable="false">Unknown state</string>
-
<string name="copyright_blinktgui" translatable="false">Copyright 2012–2017 Arne Schwabe &lt;arne@rfc2549.org></string>
-
<string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
<string name="defaultport" translatable="false">1194</string>
<string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string>
-
-
-
<string name="file_dialog" translatable="false">File Dialog</string>
-
-
-
<string name="permission_description">Allows another app to control OpenVPN</string>
<string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string>
<string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:45:59 +0000