fixup! Add Tor integration and UI

Bug 42479: Improve TorConnect error handling

Updated the prototype of onBootstrapError.

fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt

@@ -14,7 +14,9 @@ interface TorEvents {
 }
 class TorError(
     var message: String,
-    var details: String
+    var details: String,
+    var phase: String,
+    var reason: String,
 ) { }
 
 interface TorLogs {

fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt

@@ -301,8 +301,8 @@ class TorControllerGV(
     }
 
     // TorEventsBootstrapStateChangeListener
-    override fun onBootstrapProgress(progress: Double, status: String?, hasWarnings: Boolean) {
-        Log.d(TAG, "onBootstrapProgress($progress, $status, $hasWarnings)")
+    override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) {
+        Log.d(TAG, "onBootstrapProgress($progress, $hasWarnings)")
         if (progress == 100.0) {
             lastKnownStatus = TorConnectState.Bootstrapped
             wasTorBootstrapped = true
@@ -312,7 +312,7 @@ class TorControllerGV(
             onTorConnecting()
 
         }
-        onTorStatusUpdate(status, lastKnownStatus.toTorStatus().status, progress)
+        onTorStatusUpdate("", lastKnownStatus.toTorStatus().status, progress)
     }
 
     // TorEventsBootstrapStateChangeListener
@@ -322,8 +322,8 @@ class TorControllerGV(
     }
 
     // TorEventsBootstrapStateChangeListener
-    override fun onBootstrapError(message: String?, details: String?) {
-        lastKnownError = TorError(message ?: "", details ?: "")
+    override fun onBootstrapError(code: String?, message: String?, phase: String?, reason: String?) {
+        lastKnownError = TorError(code ?: "", message ?: "", phase ?: "", reason ?: "")
         onBootstrapStateChange(TorConnectState.Error.state)
     }