From 4d4bb4044da7c6d33e57a01400852d104f1d7b41 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 4 Feb 2022 12:54:57 +0100 Subject: update License strings and AboutFragment --- app/src/main/res/layout-xlarge/f_about.xml | 77 ++++++++++++++++++++++++------ app/src/main/res/layout/f_about.xml | 59 +++++++++++++++++------ app/src/main/res/values/untranslatable.xml | 22 ++++++--- 3 files changed, 122 insertions(+), 36 deletions(-) (limited to 'app/src') diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml index e018c8fc..f2432e04 100644 --- a/app/src/main/res/layout-xlarge/f_about.xml +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -169,7 +169,7 @@ @@ -177,8 +177,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:autoLink="web" - android:text="@string/copyright_mbetTLS" /> + android:text="@string/copyright_asio" /> @@ -195,7 +194,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:text="@string/copyright_asio" /> + android:text="@string/copyright_shapeshifter_library" /> @@ -212,7 +211,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:text="@string/copyright_openvpn3" /> + android:text="@string/copyright_obfs4" /> @@ -229,7 +228,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:text="@string/copyright_shapeshifter_library" /> + android:text="@string/copyright_shapeshifter_transports" /> @@ -246,7 +245,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:text="@string/copyright_shapeshifter_dispatcher" /> + android:text="@string/copyright_circleImageView" /> @@ -263,7 +262,57 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:text="@string/copyright_shapeshifter_transports" /> - + android:text="@string/copyright_tor_android" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index b10cc555..acf686eb 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -167,14 +167,13 @@ + android:text="@string/copyright_asio" /> + android:text="@string/copyright_shapeshifter_library" /> + android:text="@string/copyright_obfs4" /> + android:text="@string/copyright_shapeshifter_transports" /> + android:text="@string/copyright_circleImageView" /> + android:text="@string/copyright_tor_android" /> + android:text="@string/copyright_tor" /> + + + + + + + + + + + + diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 2459e146..41be935f 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -8,7 +8,7 @@ Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.\n\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. - Copyright (c) 2019 Square, Inc. + Copyright (c) 2022 Square, Inc. OkHttp OpenVPN LZO @@ -23,7 +23,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE\n Version 3, 19 November 2007 Unknown state - Copyright (c) 2012-2019 Arne Schwabe <arne@rfc2549.org> + Copyright (c) 2012-2022 Arne Schwabe <arne@rfc2549.org> openvpn.uni-paderborn.de 1194 File Dialog based on work by Alexander Ponomarev @@ -36,13 +36,21 @@ VPN password input dialog cancelled VPN API permission dialog cancelled Shapeshifter Library - Copyright (c) 2019, LEAP Encryption Access Project (info@leap.se) + Copyright (c) 2022, LEAP Encryption Access Project (info@leap.se) Shapeshifter Transports - Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved. - Shapeshifter Dispatcher - Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved. + Copyright (c) 2020 Operator Foundation. Distributed under MIT license. + obfs4 - The obfourscator + Copyright (c) 2014, Yawning Angel yawning at schwanenlied dot me \n All rights reserved. + Snowflake + Copyright (c) 2016, Serene Han, Arlo Breault \n Copyright (c) 2019-2020, The Tor Project, Inc.\nDistributed under 3-clause BSD license. + IPtProxy + Copyright (c) 2020 - 2021 Benjamin Erhart (berhart@netzarchitekten.com). Distributed under the MIT License + Tor + Copyright (c) 2001-2004, Roger Dingledine \n Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson \n Copyright (c) 2007-2019, The Tor Project, Inc. \n Distributed under the 3-clause BSD license + Tor Android + Copyright (c) 2009-2010, Nathan Freitas, The Guardian Project. Distributed under the 3-clause BSD license. CircleImageView - Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 + Copyright 2014 - 2022 Henning Dodenhof. Licensed under the Apache License, Version 2.0 --- -- cgit v1.2.3