From cd2e002c9e0f10079d8c1ec7af1d4be54a9de9e0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 17 Jun 2024 02:52:06 +0200
Subject: update obfsvpn to version 1.0.0, this is a breaking API change.
 Obfsvpn requires openvpn in UDP as inner transport protocol from now on

---
 app/src/main/res/layout-xlarge/f_about.xml | 34 ------------------------------
 app/src/main/res/layout/f_about.xml        | 30 --------------------------
 app/src/main/res/values/untranslatable.xml |  4 ----
 3 files changed, 68 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index 4e0d7342..cfdf2f40 100644
--- a/app/src/main/res/layout-xlarge/f_about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
@@ -187,23 +187,6 @@
             android:layout_width="match_parent"
             android:layout_height="20dp" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_library"
-            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_shapeshifter_library" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -221,23 +204,6 @@
             android:layout_width="match_parent"
             android:layout_height="20dp" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_transports"
-            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_shapeshifter_transports" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index 28f89adf..b4d46694 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -183,21 +183,6 @@
             android:layout_width="match_parent"
             android:layout_height="20dp" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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_shapeshifter_library" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -213,21 +198,6 @@
             android:layout_width="match_parent"
             android:layout_height="20dp" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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_transports" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="20dp" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 13d0204a..80cbf7f3 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -33,10 +33,6 @@
     <string name="state_user_vpn_password" translatable="false">Waiting for user VPN password</string>
     <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) 2024, 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) 2024 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 \n yawning at schwanenlied dot me \n All rights reserved.</string>
     <string name="snowflake" translatable="false">Snowflake</string>
-- 
cgit v1.2.3