Rename 'basic' status to 'user' and extract conn status strings

Author: pimterry

app/src/main/java/tech/httptoolkit/android/ConnectionStatusView.kt

@@ -13,7 +13,7 @@ class ConnectionStatusView(
     init {
         LayoutInflater.from(context).inflate(
             when (whereIsCertTrusted(proxyConfig)) {
-                "user" -> R.layout.connection_status_basic
+                "user" -> R.layout.connection_status_user
                 "system" -> R.layout.connection_status_system
                 else -> R.layout.connection_status_none
             },

app/src/main/res/layout/connection_status_none.xml

@@ -12,7 +12,7 @@
     <TextView
             android:id="@+id/connectedTo"
             style="@style/ConnectedToText"
-            android:text="to ?.?.?.?"
+            android:text=""
             android:layout_marginBottom="24sp" />
 
     <com.google.android.material.card.MaterialCardView
@@ -23,7 +23,7 @@
         <TextView
                 style="@style/ConnectionStatusHeading"
                 android:drawableStart="@drawable/ic_exclamation_triangle"
-                android:text="HTTPS interception disabled" />
+                android:text="@string/disabled_connection_status_heading" />
 
     </com.google.android.material.card.MaterialCardView>
 

app/src/main/res/layout/connection_status_system.xml

@@ -12,7 +12,7 @@
     <TextView
             android:id="@+id/connectedTo"
             style="@style/ConnectedToText"
-            android:text="to ?.?.?.?"
+            android:text=""
             android:layout_marginBottom="24sp" />
 
     <com.google.android.material.card.MaterialCardView
@@ -23,7 +23,7 @@
         <TextView
                 style="@style/ConnectionStatusHeading"
                 android:drawableStart="@drawable/ic_check_circle"
-                android:text="Basic interception enabled" />
+                android:text="@string/user_connection_status_enabled_heading" />
 
     </com.google.android.material.card.MaterialCardView>
 
@@ -40,13 +40,13 @@
             <TextView
                     style="@style/ConnectionStatusHeading"
                     android:drawableStart="@drawable/ic_check_circle"
-                    android:text="System interception enabled" />
+                    android:text="@string/system_connection_status_enabled_heading" />
 
             <TextView
                     style="@style/ConnectionStatusText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Traffic will be intercepted from all installed applications, except those using explicit certificate pinning." />
+                    android:text="@string/system_connection_status_details" />
 
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>

app/src/main/res/layout/connection_status_basic.xml renamed to app/src/main/res/layout/connection_status_user.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.widget.LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -12,7 +11,7 @@
     <TextView
             android:id="@+id/connectedTo"
             style="@style/ConnectedToText"
-            android:text="to ?.?.?.?"
+            android:text=""
             android:layout_marginBottom="24sp" />
 
     <com.google.android.material.card.MaterialCardView
@@ -28,13 +27,13 @@
             <TextView
                     style="@style/ConnectionStatusHeading"
                     android:drawableStart="@drawable/ic_check_circle"
-                    android:text="Basic interception enabled" />
+                    android:text="@string/user_connection_status_enabled_heading" />
 
             <TextView
                     style="@style/ConnectionStatusText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="All plain HTTP traffic will be intercepted. HTTPS traffic will only be intercepted from apps with user certificate trust enabled." />
+                    android:text="@string/user_connection_status_details" />
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
@@ -47,7 +46,7 @@
         <TextView
                 style="@style/ConnectionStatusHeading"
                 android:drawableStart="@drawable/ic_exclamation_triangle"
-                android:text="System interception disabled" />
+                android:text="@string/system_connection_status_disabled_heading" />
     </com.google.android.material.card.MaterialCardView>
 
 </android.widget.LinearLayout>

app/src/main/res/values/strings.xml

@@ -22,6 +22,26 @@
         We couldn\'t connect to HTTP Toolkit.\n\nIs it running, and connected to the same network as this device?
     </string>
 
+    <string name="disabled_connection_status_heading">
+        HTTPS interception disabled
+    </string>
+    <string name="user_connection_status_enabled_heading">
+        User interception enabled
+    </string>
+    <string name="system_connection_status_disabled_heading">
+        System interception disabled
+    </string>
+    <string name="system_connection_status_enabled_heading">
+        System interception enabled
+    </string>
+
+    <string name="user_connection_status_details">
+        HTTPS traffic may not be intercepted from all apps, unless they are configured to trust user-installed certificates.
+    </string>
+    <string name="system_connection_status_details">
+        Traffic will be intercepted from all installed applications, except those using explicit certificate pinning.
+    </string>
+
     <string name="scan_button">Scan code</string>
     <string name="reconnect_button">Reconnect</string>
     <string name="manual_button">Connect manually</string>