From fe6a0e47121d17d08c7d913f1db086687a569446 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 23 Jun 2021 03:27:17 +0200
Subject: initial tor-integration to circumvent blocking attempts of the
 provider api

---
 app/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e883b974..b43a0683 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,4 +155,9 @@
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
 
+  <string name="tor_starting">Starting Tor with bridges.</string>
+  <string name="tor_stopping">Stopping Tor with bridges.</string>
+  <string name="tor_started">Running Tor with bridges to fetch provider configuration.</string>
+  <string name="tor_provider_setup">Using Bridges to configure provider.</string>
+
 </resources>
-- 
cgit v1.2.3


From fca60f51acf8eea48fc4086db00cba1097d097b7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 24 Jun 2021 23:12:45 +0200
Subject: tweak wording

---
 app/src/main/res/values/strings.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b43a0683..7c0e6334 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,9 +155,8 @@
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
 
-  <string name="tor_starting">Starting Tor with bridges.</string>
-  <string name="tor_stopping">Stopping Tor with bridges.</string>
-  <string name="tor_started">Running Tor with bridges to fetch provider configuration.</string>
-  <string name="tor_provider_setup">Using Bridges to configure provider.</string>
+  <string name="tor_starting">Starting bridges for censorship circumvention. Please hold on…</string>
+  <string name="tor_stopping">Stopping bridges.</string>
+  <string name="tor_started">Using bridges for censorship circumvention.</string>
 
 </resources>
-- 
cgit v1.2.3


From 236c17ec3f4348a9f0d4ec4a2454b9fbfaf8707f Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 24 Jun 2021 23:15:41 +0200
Subject: show tor status info in provider setup activies

---
 .../main/res/layout-xlarge/v_loading_screen.xml    | 22 ++++++++++++++++++++--
 app/src/main/res/layout/v_add_provider.xml         | 20 ++++++++++++++++++--
 app/src/main/res/layout/v_loading_screen.xml       | 22 ++++++++++++++++++++--
 3 files changed, 58 insertions(+), 6 deletions(-)

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

diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index a002665f..adcbfabc 100644
--- a/app/src/main/res/layout-xlarge/v_loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loading_screen"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:visibility="gone">
+    android:visibility="gone"
+    tools:visibility="visible"
+    >
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="32dp"
@@ -18,7 +21,7 @@
         />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/progressbar_description"
+        android:id="@+id/progressbar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdge="horizontal"
@@ -29,6 +32,21 @@
         android:layout_marginBottom="@dimen/standard_margin"
         />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/progressbar_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fadingEdge="horizontal"
+        android:singleLine="true"
+        android:text="@string/configuring_provider"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin"
+        tools:text="test"
+        tools:visibility="visible"
+
+        />
+
     <ProgressBar
         android:id="@+id/progressbar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
diff --git a/app/src/main/res/layout/v_add_provider.xml b/app/src/main/res/layout/v_add_provider.xml
index afcae4af..1448e7e7 100644
--- a/app/src/main/res/layout/v_add_provider.xml
+++ b/app/src/main/res/layout/v_add_provider.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loading_screen"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:visibility="gone">
+    android:visibility="gone"
+    tools:visibility="visible">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
@@ -18,7 +20,7 @@
         />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/progressbar_description"
+        android:id="@+id/progressbar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdge="horizontal"
@@ -29,6 +31,20 @@
         android:layout_marginBottom="@dimen/standard_margin"
         />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/progressbar_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fadingEdge="horizontal"
+        android:singleLine="true"
+        android:text="@string/configuring_provider"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin"
+        tools:text="test"
+        tools:visibility="visible"
+        />
+
     <ProgressBar
         android:id="@+id/progressbar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index a3498e97..9bda063d 100644
--- a/app/src/main/res/layout/v_loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loading_screen"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:visibility="gone">
+    android:visibility="gone"
+    tools:visibility="visible"
+    >
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
@@ -18,7 +21,7 @@
         />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/progressbar_description"
+        android:id="@+id/progressbar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdge="horizontal"
@@ -27,6 +30,21 @@
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_margin"
+        tools:text="title"
+        />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/progressbar_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fadingEdge="horizontal"
+        android:singleLine="true"
+        android:text="@string/configuring_provider"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin"
+        tools:text="test"
+        tools:visibility="visible"
         />
 
     <ProgressBar
-- 
cgit v1.2.3


From b22698c2c4933f43e58379693f615bda235cb040 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 24 Jun 2021 23:27:21 +0200
Subject: let the tor state description in provider setup activities grow up to
 2 lines

---
 app/src/main/res/layout-xlarge/v_loading_screen.xml | 2 +-
 app/src/main/res/layout/v_add_provider.xml          | 2 +-
 app/src/main/res/layout/v_loading_screen.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index adcbfabc..ed25f07b 100644
--- a/app/src/main/res/layout-xlarge/v_loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
@@ -37,7 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdge="horizontal"
-        android:singleLine="true"
+        android:maxLines="2"
         android:text="@string/configuring_provider"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
         android:layout_marginTop="@dimen/standard_margin"
diff --git a/app/src/main/res/layout/v_add_provider.xml b/app/src/main/res/layout/v_add_provider.xml
index 1448e7e7..933f19d0 100644
--- a/app/src/main/res/layout/v_add_provider.xml
+++ b/app/src/main/res/layout/v_add_provider.xml
@@ -36,7 +36,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdge="horizontal"
-        android:singleLine="true"
+        android:maxLines="2"
         android:text="@string/configuring_provider"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
         android:layout_marginTop="@dimen/standard_margin"
diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index 9bda063d..f7f58e7b 100644
--- a/app/src/main/res/layout/v_loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdge="horizontal"
-        android:singleLine="true"
+        android:maxLines="2"
         android:text="@string/configuring_provider"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
         android:layout_marginTop="@dimen/standard_margin"
-- 
cgit v1.2.3


From fcec92a0042477347338a25cd072d622edfa03c9 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 16 Oct 2021 11:59:42 +0200
Subject: show tor bootstrapping progress in notifications

---
 app/src/main/res/values/strings.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c0e6334..dfb0db0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,8 +155,24 @@
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="gateway_selection_current_location">Your traffic is currently routed through: </string>
 
-  <string name="tor_starting">Starting bridges for censorship circumvention. Please hold on…</string>
+  <string name="tor_starting">Starting bridges for censorship circumvention…</string>
   <string name="tor_stopping">Stopping bridges.</string>
   <string name="tor_started">Using bridges for censorship circumvention.</string>
+  <string name="log_conn_done_pt">Connected to pluggable transport</string>
+  <string name="log_conn_pt">Connecting to pluggable transport</string>
+  <string name="log_conn_done">Connected to a relay</string>
+  <string name="log_handshake">Handshaking with a relay</string>
+  <string name="log_handshake_done">Handshake with a relay done</string>
+  <string name="log_onehop_create">Establishing an encrypted directory connection</string>
+  <string name="log_requesting_status">Asking for networkstatus consensus</string>
+  <string name="log_loading_status">Loading networkstatus consensus</string>
+  <string name="log_loading_keys">Loading authority key certs</string>
+  <string name="log_requesting_desccriptors">Asking for relay descriptors</string>
+  <string name="log_loading_descriptors">Loading relay descriptors</string>
+  <string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
+  <string name="log_ap_handshake_done">Handshake finished with a relay to build circuits</string>
+  <string name="log_circuit_create">Establishing a Tor circuit</string>
+  <string name="log_done">Done!</string>
+
 
 </resources>
-- 
cgit v1.2.3


From 527c814c56626ed147778ac1e0ddabe70cb51280 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 16 Oct 2021 14:12:05 +0200
Subject: tweak tor done progess string

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dfb0db0e..4c5cffd4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,7 +172,7 @@
   <string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
   <string name="log_ap_handshake_done">Handshake finished with a relay to build circuits</string>
   <string name="log_circuit_create">Establishing a Tor circuit</string>
-  <string name="log_done">Done!</string>
+  <string name="log_done">Running</string>
 
 
 </resources>
-- 
cgit v1.2.3


From 213e42d82d360cdf7f5632782a9a0cb879c1b4f5 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 22 Oct 2021 23:36:34 +0200
Subject: show tor and snowflake connection status in provider setup screens

---
 app/src/main/res/drawable/ic_snowflake.png         | Bin 0 -> 2653 bytes
 app/src/main/res/drawable/ic_tor.png               | Bin 0 -> 10221 bytes
 app/src/main/res/drawable/v_vertical_gradient.xml  |   8 ++
 .../main/res/layout-xlarge/v_loading_screen.xml    | 138 ++++++++++++++++++++
 app/src/main/res/layout/v_add_provider.xml         |  57 ---------
 app/src/main/res/layout/v_loading_screen.xml       | 139 ++++++++++++++++++++-
 app/src/main/res/layout/v_log_item.xml             |  16 +++
 app/src/main/res/values/strings.xml                |   1 +
 8 files changed, 301 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_snowflake.png
 create mode 100644 app/src/main/res/drawable/ic_tor.png
 create mode 100644 app/src/main/res/drawable/v_vertical_gradient.xml
 delete mode 100644 app/src/main/res/layout/v_add_provider.xml
 create mode 100644 app/src/main/res/layout/v_log_item.xml

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

diff --git a/app/src/main/res/drawable/ic_snowflake.png b/app/src/main/res/drawable/ic_snowflake.png
new file mode 100644
index 00000000..992662ee
Binary files /dev/null and b/app/src/main/res/drawable/ic_snowflake.png differ
diff --git a/app/src/main/res/drawable/ic_tor.png b/app/src/main/res/drawable/ic_tor.png
new file mode 100644
index 00000000..a5f9ae89
Binary files /dev/null and b/app/src/main/res/drawable/ic_tor.png differ
diff --git a/app/src/main/res/drawable/v_vertical_gradient.xml b/app/src/main/res/drawable/v_vertical_gradient.xml
new file mode 100644
index 00000000..877634b5
--- /dev/null
+++ b/app/src/main/res/drawable/v_vertical_gradient.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="270"
+        android:startColor="#00FFFFFF"
+        android:endColor="#FFFFFFFF"
+        android:type="linear" />
+</shape>
diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index ed25f07b..0b71099e 100644
--- a/app/src/main/res/layout-xlarge/v_loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
@@ -56,4 +56,142 @@
         android:layout_marginTop="@dimen/standard_margin"
         />
 
+    <RelativeLayout
+        android:id="@+id/connection_detail_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/connection_details_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/connection_details"
+            android:gravity="start"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:paddingBottom="@dimen/stdpadding"
+            android:paddingStart="4dp"
+            android:paddingLeft="4dp"
+            android:paddingEnd="4dp"
+            android:paddingRight="4dp"
+            />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/tor_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_tor"
+            android:layout_below="@id/connection_details_title"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginBottom="@dimen/stdpadding"
+            />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tor_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/connection_details_title"
+            android:fadingEdge="horizontal"
+            android:maxLines="2"
+            android:text="@string/configuring_provider"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+            android:layout_alignBottom="@id/tor_icon"
+            android:layout_toEndOf="@id/tor_icon"
+            android:layout_toRightOf="@+id/tor_icon"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:gravity="bottom"
+            tools:text="test 12321 123 \n sdf,sdf,m\nn 123 "
+            android:ellipsize="end"
+
+            tools:visibility="visible"
+            />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/snowflake_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_snowflake"
+            android:layout_below="@id/tor_icon"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginBottom="@dimen/stdpadding"
+            />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/snowflake_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tor_state"
+            android:fadingEdge="horizontal"
+            android:maxLines="2"
+            android:text="@string/configuring_provider"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+            android:layout_alignTop="@id/snowflake_icon"
+            android:layout_alignBottom="@+id/snowflake_icon"
+            android:layout_toEndOf="@+id/snowflake_icon"
+            android:layout_toRightOf="@+id/snowflake_icon"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:paddingBottom="1dp"
+            android:gravity="bottom"
+            tools:text="test \n another \n and a third \n blkud"
+            android:ellipsize="end"
+            tools:visibility="visible"
+            />
+        <Button
+            android:id="@+id/btn_connection_detail"
+            android:layout_marginTop="30dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/snowflake_icon"
+            android:text="@string/show_log"
+            android:visibility="visible"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/log_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/connection_detail_logs_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/log_fragment_title"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:layout_alignParentTop="true"
+            android:paddingStart="4dp"
+            android:paddingLeft="4dp"
+            android:paddingEnd="4dp"
+            android:paddingRight="4dp"
+            android:paddingTop="@dimen/stdpadding"
+            android:paddingBottom="@dimen/stdpadding"
+            />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/connection_detail_logs"
+            android:layout_below="@+id/connection_detail_logs_title"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/v_log_item"
+            android:isScrollContainer="false"
+            />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/connection_detail_logs"
+            android:layout_alignTop="@id/connection_detail_logs"
+            android:src="@drawable/v_vertical_gradient"
+            android:layout_marginTop="200dp"
+            android:importantForAccessibility="no"
+            />
+    </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_add_provider.xml b/app/src/main/res/layout/v_add_provider.xml
deleted file mode 100644
index 933f19d0..00000000
--- a/app/src/main/res/layout/v_add_provider.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/loading_screen"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:visibility="gone"
-    tools:visibility="visible">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        app:tint="@color/colorPrimary"
-        app:srcCompat="@drawable/action_history"
-        android:layout_marginTop="@dimen/loading_screen_icon_vertical_margin"
-        android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/progressbar_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:text="@string/introduce_new_provider"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-        android:layout_marginTop="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_margin"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/progressbar_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:maxLines="2"
-        android:text="@string/configuring_provider"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-        android:layout_marginTop="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_margin"
-        tools:text="test"
-        tools:visibility="visible"
-        />
-
-    <ProgressBar
-        android:id="@+id/progressbar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:layout_marginTop="@dimen/standard_margin"
-        />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index f7f58e7b..9942a1c5 100644
--- a/app/src/main/res/layout/v_loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
@@ -30,7 +30,6 @@
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_margin"
-        tools:text="title"
         />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -56,4 +55,142 @@
         android:layout_marginTop="@dimen/standard_margin"
         />
 
+    <RelativeLayout
+        android:id="@+id/connection_detail_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/connection_details_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_log"
+            android:gravity="start"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:paddingBottom="@dimen/stdpadding"
+            android:paddingStart="4dp"
+            android:paddingLeft="4dp"
+            android:paddingEnd="4dp"
+            android:paddingRight="4dp"
+            />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/tor_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_tor"
+            android:layout_below="@id/connection_details_title"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginBottom="@dimen/stdpadding"
+            />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tor_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/connection_details_title"
+            android:fadingEdge="horizontal"
+            android:maxLines="2"
+            android:text="@string/configuring_provider"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+            android:layout_alignBottom="@id/tor_icon"
+            android:layout_toEndOf="@id/tor_icon"
+            android:layout_toRightOf="@+id/tor_icon"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:gravity="bottom"
+            tools:text="test 12321 123 \n sdf,sdf,m\nn 123 "
+            android:ellipsize="end"
+
+            tools:visibility="visible"
+            />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/snowflake_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_snowflake"
+            android:layout_below="@id/tor_icon"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginBottom="@dimen/stdpadding"
+            />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/snowflake_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tor_state"
+            android:fadingEdge="horizontal"
+            android:maxLines="2"
+            android:text="@string/configuring_provider"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+            android:layout_alignTop="@id/snowflake_icon"
+            android:layout_alignBottom="@+id/snowflake_icon"
+            android:layout_toEndOf="@+id/snowflake_icon"
+            android:layout_toRightOf="@+id/snowflake_icon"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:paddingBottom="1dp"
+            android:gravity="bottom"
+            tools:text="test \n another \n and a third \n blkud"
+            android:ellipsize="end"
+            tools:visibility="visible"
+            />
+        <Button
+            android:id="@+id/btn_connection_detail"
+            android:layout_marginTop="30dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/snowflake_icon"
+            android:text="@string/show_log"
+            android:visibility="visible"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/log_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/connection_detail_logs_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/log_fragment_title"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:layout_alignParentTop="true"
+            android:paddingStart="4dp"
+            android:paddingLeft="4dp"
+            android:paddingEnd="4dp"
+            android:paddingRight="4dp"
+            android:paddingTop="@dimen/stdpadding"
+            android:paddingBottom="@dimen/stdpadding"
+            />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/connection_detail_logs"
+            android:layout_below="@+id/connection_detail_logs_title"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/v_log_item"
+            android:isScrollContainer="false"
+            />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/connection_detail_logs"
+            android:layout_alignTop="@id/connection_detail_logs"
+            android:src="@drawable/v_vertical_gradient"
+            android:layout_marginTop="200dp"
+            android:importantForAccessibility="no"
+            />
+    </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml
new file mode 100644
index 00000000..c3039f46
--- /dev/null
+++ b/app/src/main/res/layout/v_log_item.xml
@@ -0,0 +1,16 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+    android:gravity="center_vertical"
+    tools:text="test \ntest2\ntest3"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp"
+    />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c5cffd4..0b3d1d9b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
   <string name="switch_provider_menu_option">Switch provider</string>
   <string name="info">info</string>
   <string name="show_connection_details">Show connection details</string>
+  <string name="connection_details">Connection details</string>
   <string name="routes_info">Routes: %s</string>
   <string name="routes_info6">IPv6 routes: %s</string>
   <string name="error_empty_username">The username must not be empty.</string>
-- 
cgit v1.2.3


From 7b9cb67eb7aa3eadf99a5187d2ea79b83ab57380 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 5 Nov 2021 22:53:07 +0100
Subject: localize notification channel description for tor notifications

---
 app/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b3d1d9b..dbaf0f0b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,6 +174,8 @@
   <string name="log_ap_handshake_done">Handshake finished with a relay to build circuits</string>
   <string name="log_circuit_create">Establishing a Tor circuit</string>
   <string name="log_done">Running</string>
+  <string name="channel_name_tor_service">%s Bridges Service</string>
+  <string name="channel_description_tor_service">Informs about usage of bridges while configuring %s.</string>
 
 
 </resources>
-- 
cgit v1.2.3


From aecd8ca5ecf984b581e0b0165cd168976dc6c0f2 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 6 Nov 2021 00:21:05 +0100
Subject: implement tiomeout error handling + UI if tor doesn't start within 3
 minutes

---
 app/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dbaf0f0b..dbe386b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,6 +176,8 @@
   <string name="log_done">Running</string>
   <string name="channel_name_tor_service">%s Bridges Service</string>
   <string name="channel_description_tor_service">Informs about usage of bridges while configuring %s.</string>
+  <string name="error_tor_timeout">Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?</string>
+  <string name="retry_unobfuscated">Retry unobfuscated</string>
 
 
 </resources>
-- 
cgit v1.2.3


From 07f09531ebe51c36d110371d847776079962df4c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 7 Nov 2021 18:14:24 +0100
Subject: fix connection detail section title

---
 app/src/main/res/layout/v_loading_screen.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index 9942a1c5..b489f71f 100644
--- a/app/src/main/res/layout/v_loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
@@ -67,7 +67,7 @@
             android:id="@+id/connection_details_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/show_log"
+            android:text="@string/connection_details"
             android:gravity="start"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
             android:paddingBottom="@dimen/stdpadding"
-- 
cgit v1.2.3


From 6ef5241baf6a1fa2bc4e6f3ecd805edf4827e712 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 7 Nov 2021 19:54:46 +0100
Subject: tweak loading screen - hide connection details behind a clickable
 lable

---
 .../main/res/layout-xlarge/v_loading_screen.xml    | 52 ++++++++++++++--------
 app/src/main/res/layout/v_loading_screen.xml       | 50 ++++++++++++++-------
 app/src/main/res/values/strings.xml                |  1 +
 3 files changed, 68 insertions(+), 35 deletions(-)

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

diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml
index 0b71099e..24b44f9a 100644
--- a/app/src/main/res/layout-xlarge/v_loading_screen.xml
+++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml
@@ -57,17 +57,36 @@
         />
 
     <RelativeLayout
-        android:id="@+id/connection_detail_container"
+        android:id="@+id/connection_detail_header_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:visibility="gone"
-        tools:visibility="visible"
+        android:layout_marginTop="@dimen/stdpadding"
         >
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/btn_connection_detail"
+            android:layout_marginTop="@dimen/stdpadding"
+            android:paddingLeft="@dimen/stdpadding"
+            android:paddingStart="@dimen/stdpadding"
+            android:paddingEnd="@dimen/stdpadding"
+            android:paddingRight="@dimen/stdpadding"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:text="@string/show_connection_details"
+            android:textColor="@color/colorPrimaryDark"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:visibility="visible"
+            tools:text="@string/hide_connection_details"
+            />
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/connection_details_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignBaseline="@id/btn_connection_detail"
             android:text="@string/connection_details"
             android:gravity="start"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
@@ -76,14 +95,24 @@
             android:paddingLeft="4dp"
             android:paddingEnd="4dp"
             android:paddingRight="4dp"
+            tools:visibility="visible"
+            android:visibility="gone"
             />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/connection_detail_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
+
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/tor_icon"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:src="@drawable/ic_tor"
-            android:layout_below="@id/connection_details_title"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_marginBottom="@dimen/stdpadding"
@@ -92,7 +121,6 @@
             android:id="@+id/tor_state"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/connection_details_title"
             android:fadingEdge="horizontal"
             android:maxLines="2"
             android:text="@string/configuring_provider"
@@ -105,7 +133,6 @@
             android:gravity="bottom"
             tools:text="test 12321 123 \n sdf,sdf,m\nn 123 "
             android:ellipsize="end"
-
             tools:visibility="visible"
             />
 
@@ -140,17 +167,6 @@
             android:ellipsize="end"
             tools:visibility="visible"
             />
-        <Button
-            android:id="@+id/btn_connection_detail"
-            android:layout_marginTop="30dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_below="@id/snowflake_icon"
-            android:text="@string/show_log"
-            android:visibility="visible"
-            />
     </RelativeLayout>
     <RelativeLayout
         android:id="@+id/log_container"
diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml
index b489f71f..26ab25cc 100644
--- a/app/src/main/res/layout/v_loading_screen.xml
+++ b/app/src/main/res/layout/v_loading_screen.xml
@@ -55,18 +55,37 @@
         android:layout_marginTop="@dimen/standard_margin"
         />
 
+
     <RelativeLayout
-        android:id="@+id/connection_detail_container"
+        android:id="@+id/connection_detail_header_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:visibility="gone"
-        tools:visibility="visible"
+        android:layout_marginTop="@dimen/stdpadding"
         >
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/btn_connection_detail"
+            android:layout_marginTop="@dimen/stdpadding"
+            android:paddingLeft="@dimen/stdpadding"
+            android:paddingStart="@dimen/stdpadding"
+            android:paddingEnd="@dimen/stdpadding"
+            android:paddingRight="@dimen/stdpadding"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:text="@string/show_connection_details"
+            android:textColor="@color/colorPrimaryDark"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:visibility="visible"
+            />
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/connection_details_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignBaseline="@id/btn_connection_detail"
             android:text="@string/connection_details"
             android:gravity="start"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
@@ -75,14 +94,23 @@
             android:paddingLeft="4dp"
             android:paddingEnd="4dp"
             android:paddingRight="4dp"
+            android:visibility="gone"
             />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/connection_detail_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="visible"
+        >
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/tor_icon"
             android:layout_width="35dp"
             android:layout_height="35dp"
             android:src="@drawable/ic_tor"
-            android:layout_below="@id/connection_details_title"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_marginBottom="@dimen/stdpadding"
@@ -91,7 +119,6 @@
             android:id="@+id/tor_state"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/connection_details_title"
             android:fadingEdge="horizontal"
             android:maxLines="2"
             android:text="@string/configuring_provider"
@@ -139,17 +166,6 @@
             android:ellipsize="end"
             tools:visibility="visible"
             />
-        <Button
-            android:id="@+id/btn_connection_detail"
-            android:layout_marginTop="30dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_below="@id/snowflake_icon"
-            android:text="@string/show_log"
-            android:visibility="visible"
-            />
     </RelativeLayout>
     <RelativeLayout
         android:id="@+id/log_container"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dbe386b3..c700231d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,6 +178,7 @@
   <string name="channel_description_tor_service">Informs about usage of bridges while configuring %s.</string>
   <string name="error_tor_timeout">Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?</string>
   <string name="retry_unobfuscated">Retry unobfuscated</string>
+  <string name="hide_connection_details">Hide connection details</string>
 
 
 </resources>
-- 
cgit v1.2.3


From 62c28b219a85aa3074356e1e49e92e30c1166c3b Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 7 Nov 2021 22:45:29 +0100
Subject: tweak log item cell, get rid of DividerItemDecorator and use simple
 view as separator per cell, fixes cell height and text positioning issues

---
 app/src/main/res/layout/v_log_item.xml | 41 ++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 14 deletions(-)

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

diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml
index c3039f46..713c3b1f 100644
--- a/app/src/main/res/layout/v_log_item.xml
+++ b/app/src/main/res/layout/v_log_item.xml
@@ -1,16 +1,29 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
+    android:orientation="vertical"
     android:layout_height="wrap_content"
-    android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-    android:gravity="center_vertical"
-    tools:text="test \ntest2\ntest3"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:paddingTop="2dp"
-    android:paddingBottom="2dp"
-    />
\ No newline at end of file
+    android:layout_width="match_parent"
+    >
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_gravity="center_vertical"
+        tools:text="test"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:background="?android:attr/activatedBackgroundIndicator"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:minHeight="10dp"
+        />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/black800_high_transparent"
+        />
+
+</LinearLayout>
-- 
cgit v1.2.3


From 1657571812f6585bd2883c97d114f8d9861505c0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 10 Nov 2021 02:25:47 +0100
Subject: add a more specific error if provider api communication is attempted
 without any working internet connection

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c700231d..298f4038 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,6 +179,7 @@
   <string name="error_tor_timeout">Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?</string>
   <string name="retry_unobfuscated">Retry unobfuscated</string>
   <string name="hide_connection_details">Hide connection details</string>
+  <string name="error_network_connection">It seems you have no working internet connection. You should check your WiFi or cellular data connection.</string>
 
 
 </resources>
-- 
cgit v1.2.3


From d391c8dbf8fff278c7c18d60778a464f67f3726c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 12 Nov 2021 01:36:34 +0100
Subject: add an test for no network error handling

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 298f4038..22696c12 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,7 +179,7 @@
   <string name="error_tor_timeout">Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?</string>
   <string name="retry_unobfuscated">Retry unobfuscated</string>
   <string name="hide_connection_details">Hide connection details</string>
-  <string name="error_network_connection">It seems you have no working internet connection. You should check your WiFi or cellular data connection.</string>
+  <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
 
 
 </resources>
-- 
cgit v1.2.3