update License strings and AboutFragment

3 files changed, 122 insertions, 36 deletions

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 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/mbetTLS"
+            android:text="@string/asio"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -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" />
 
         <Space
             android:layout_width="match_parent"
@@ -187,7 +186,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/asio"
+            android:text="@string/shapeshifter_library"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -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" />
 
         <Space
             android:layout_width="match_parent"
@@ -204,7 +203,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/openvpn3"
+            android:text="@string/obfs4"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -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" />
 
         <Space
             android:layout_width="match_parent"
@@ -221,7 +220,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_library"
+            android:text="@string/shapeshifter_transports"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -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" />
 
         <Space
             android:layout_width="match_parent"
@@ -238,7 +237,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_dispatcher"
+            android:text="@string/circleImageView"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -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" />
 
         <Space
             android:layout_width="match_parent"
@@ -255,7 +254,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_transports"
+            android:text="@string/tor_android"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -263,7 +262,57 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:text="@string/copyright_shapeshifter_transports" />
-    </LinearLayout>
+            android:text="@string/copyright_tor_android" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tor"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_tor" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/iptproxy"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_iptproxy" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snowflake"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_snowflake" />
+    </LinearLayout>
 </ScrollView>
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 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/mbetTLS"
+            android:text="@string/asio"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autoLink="web"
-            android:text="@string/copyright_mbetTLS" />
+            android:text="@string/copyright_asio" />
 
         <Space
             android:layout_width="match_parent"
@@ -183,13 +182,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/asio"
+            android:text="@string/shapeshifter_library"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_asio" />
+            android:text="@string/copyright_shapeshifter_library" />
 
         <Space
             android:layout_width="match_parent"
@@ -198,13 +197,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/openvpn3"
+            android:text="@string/obfs4"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_openvpn3" />
+            android:text="@string/copyright_obfs4" />
 
         <Space
             android:layout_width="match_parent"
@@ -213,13 +212,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_library"
+            android:text="@string/shapeshifter_transports"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_shapeshifter_library" />
+            android:text="@string/copyright_shapeshifter_transports" />
 
         <Space
             android:layout_width="match_parent"
@@ -228,13 +227,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_dispatcher"
+            android:text="@string/circleImageView"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_shapeshifter_dispatcher" />
+            android:text="@string/copyright_circleImageView" />
 
         <Space
             android:layout_width="match_parent"
@@ -243,13 +242,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_transports"
+            android:text="@string/tor_android"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_shapeshifter_transports" />
+            android:text="@string/copyright_tor_android" />
 
         <Space
             android:layout_width="match_parent"
@@ -258,13 +257,43 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/circleImageView"
+            android:text="@string/tor"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_circleImageView" />
+            android:text="@string/copyright_tor" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/iptproxy"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_iptproxy" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snowflake"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_snowflake" />
     </LinearLayout>
 
 </ScrollView>
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 @@
     <string name="copyright_openssl" translatable="false"> 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.</string>
-    <string name="copyright_okhttp" translatable="false">Copyright (c) 2019 Square, Inc.</string>
+    <string name="copyright_okhttp" translatable="false">Copyright (c) 2022 Square, Inc.</string>
     <string name="okhttp" translatable="false">OkHttp</string>
     <string name="openvpn" translatable="false">OpenVPN</string>
     <string name="lzo" translatable="false">LZO</string>
@@ -23,7 +23,7 @@
     <string name="copyright_openvpn3" translatable="false">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 (c) 2012-2019 Arne Schwabe &lt;arne@rfc2549.org></string>
+    <string name="copyright_blinktgui" translatable="false">Copyright (c) 2012-2022 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>
@@ -36,13 +36,21 @@
     <string name="state_user_vpn_password_cancelled" translatable="false">VPN password input dialog cancelled</string>
     <string name="state_user_vpn_permission_cancelled" translatable="false">VPN API permission dialog cancelled</string>
     <string name="shapeshifter_library" translatable="false">Shapeshifter Library</string>
-    <string name="copyright_shapeshifter_library" translatable="false">Copyright (c) 2019, LEAP Encryption Access Project (info@leap.se)</string>
+    <string name="copyright_shapeshifter_library" translatable="false">Copyright (c) 2022, LEAP Encryption Access Project (info@leap.se)</string>
     <string name="shapeshifter_transports" translatable="false">Shapeshifter Transports</string>
-    <string name="copyright_shapeshifter_transports" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string>
-    <string name="shapeshifter_dispatcher" translatable="false">Shapeshifter Dispatcher</string>
-    <string name="copyright_shapeshifter_dispatcher" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string>
+    <string name="copyright_shapeshifter_transports" translatable="false">Copyright (c) 2020 Operator Foundation. Distributed under MIT license.</string>
+    <string name="obfs4" translatable="false">obfs4 - The obfourscator</string>
+    <string name="copyright_obfs4" translatable="false">Copyright (c) 2014, Yawning Angel yawning at schwanenlied dot me \n All rights reserved.</string>
+    <string name="snowflake" translatable="false">Snowflake</string>
+    <string name="copyright_snowflake" translatable="false">Copyright (c) 2016, Serene Han, Arlo Breault \n Copyright (c) 2019-2020, The Tor Project, Inc.\nDistributed under 3-clause BSD license.</string>
+    <string name="iptproxy" translatable="false">IPtProxy</string>
+    <string name="copyright_iptproxy" translatable="false">Copyright (c) 2020 - 2021 Benjamin Erhart (berhart@netzarchitekten.com). Distributed under the MIT License</string>
+    <string name="tor" translatable="false">Tor</string>
+    <string name="copyright_tor" translatable="false">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</string>
+    <string name="tor_android" translatable="false">Tor Android</string>
+    <string name="copyright_tor_android" translatable="false">Copyright (c) 2009-2010, Nathan Freitas, The Guardian Project. Distributed under the 3-clause BSD license.</string>
     <string name="circleImageView" translatable="false">CircleImageView</string>
-    <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string>
+    <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2022 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string>
 
    <!-- gateway selector, move to strings.xml, once the wording is clear -->
     <string name="no_location" translatable="false">---</string>