Skip to content
Snippets Groups Projects
Commit 3fd35b1e authored by cyberta's avatar cyberta
Browse files

add licence note for okhttp to about page

parent 957fd3d9
No related branches found
No related tags found
No related merge requests found
...@@ -134,6 +134,21 @@ ...@@ -134,6 +134,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/copyright_openssl" /> android:text="@string/copyright_openssl" />
<Space
android:layout_width="match_parent"
android:layout_height="20sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/okhttp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/copyright_okhttp" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
...@@ -4,21 +4,22 @@ ...@@ -4,21 +4,22 @@
<string name="app_name" translatable="false">Bitmask</string> <string name="app_name" translatable="false">Bitmask</string>
<string name="notifcation_title_bitmask">Bitmask - %s</string> <string name="notifcation_title_bitmask">Bitmask - %s</string>
<string name="copyright_leapgui" translatable="false">Copyright 2012-2014\nLEAP Encryption Access Project &lt;info@leap.se></string> <string name="copyright_leapgui" translatable="false">Copyright 2012-2017\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 <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> "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
<string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string> <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
<string name="copyright_openssl" translatable="false"> This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n <string name="copyright_openssl" translatable="false"> This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string> Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
<string name="copyright_okhttp" translatable="false">Copyright Copyright 2016 Square, Inc.</string>
<string name="okhttp" translatable="false">OkHttp</string>
<string name="openvpn" translatable="false">OpenVPN</string> <string name="openvpn" translatable="false">OpenVPN</string>
<string name="lzo" translatable="false">LZO</string> <string name="lzo" translatable="false">LZO</string>
<string name="openssl" translatable="false">OpenSSL</string> <string name="openssl" translatable="false">OpenSSL</string>
<string name="unknown_state" translatable="false">Unknown state</string> <string name="unknown_state" translatable="false">Unknown state</string>
<string name="copyright_blinktgui" translatable="false">Copyright 2012–2014 Arne Schwabe &lt;arne@rfc2549.org></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="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
<string name="defaultport" translatable="false">1194</string> <string name="defaultport" translatable="false">1194</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment