From f557975d72b64d7ed13c53c153b40c0fb5522757 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 26 Nov 2021 10:58:56 +0100
Subject: disable location entries that are not supporting current transport,
 show hint in GatewaySelectionFragment and an option to disable bridges

---
 app/src/main/res/layout/f_gateway_selection.xml | 15 +++++++++++++++
 app/src/main/res/values/strings.xml             |  4 ++--
 app/src/main/res/values/untranslatable.xml      |  1 -
 3 files changed, 17 insertions(+), 3 deletions(-)

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

diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index 643ae988..8ab2b1c3 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -56,6 +56,21 @@
             android:text="@string/gateway_selection_manually"
             android:layout_gravity="bottom"
             />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/manual_subtitle"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:text="@string/hint_bridges"
+
+                />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/disable_bridges"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/option_disable_bridges"
+                android:textColor="@color/primary"
+                />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df37b5ba..53ba5e8f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,6 +190,6 @@
   <string name="vpn_settings">VPN settings</string>
   <string name="prefer_udp">Use UDP if available</string>
   <string name="prefer_udp_subtitle">UDP can be faster and better for streaming, but does not work for all networks.</string>
-
-
+  <string name="hint_bridges">Only locations supporting bridges are currently selectable.</string>
+  <string name="option_disable_bridges">Disable bridges</string>
 </resources>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index ec795f57..8c478b33 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -48,7 +48,6 @@
     <string name="warning_no_more_gateways_manual_gw_selection" translatable="false">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string>
     <string name="warning_option_try_best" translatable="false">Try best location</string>
     <string name="warning_bridges_not_supported" translatable="false">%1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges?</string>
-    <string name="option_disable_bridges" translatable="false">Disable bridges</string>
     <string name="option_different_location" translatable="false">Choose different location</string>
     <string name="eip_state_insecure" translatable="false">Connection Insecure</string>
     <string name="eip_state_connected_recommended" translatable="false">You are connected to the recommended location</string>
-- 
cgit v1.2.3