Skip to content
Snippets Groups Projects
Commit db1d2b30 authored by clairehurst's avatar clairehurst Committed by Pier Angelo Vendrame
Browse files

fixup! TB 41878: [android] Add standalone Tor Bootstrap

Bug 43222: Fix tor logs timestamps
parent a1c22a73
No related branches found
No related tags found
1 merge request!1313Bug_43222: Fix tor logs timestamps
......@@ -20,7 +20,7 @@ class TorError(
) { }
interface TorLogs {
fun onLog(type: String?, message: String?)
fun onLog(type: String?, message: String?, timestamp: String?)
}
internal enum class TorStatus(val status: String) {
......@@ -32,7 +32,7 @@ internal enum class TorStatus(val status: String) {
}
interface TorController: TorEvents {
val logEntries: MutableList<Pair<String?, String?>>
val logEntries: MutableList<TorLog>
val isStarting: Boolean
val isRestarting: Boolean
val isBootstrapped: Boolean
......
......@@ -66,7 +66,7 @@ class TorControllerGV(
private var isTorBootstrapped = false
get() = ((_lastKnownStatus.value.isStarted()) && wasTorBootstrapped)
private val entries = mutableListOf<Pair<String?, String?>>()
private val entries = mutableListOf<TorLog>()
override val logEntries get() = entries
override val isStarting get() = _lastKnownStatus.value.isStarting()
override val isRestarting get() = isTorRestarting
......@@ -217,10 +217,10 @@ class TorControllerGV(
}
}
override fun onLog(type: String?, message: String?) {
override fun onLog(type: String?, message: String?, timestamp: String?) {
synchronized(torLogListeners) {
entries.add(Pair(type, message))
torLogListeners.toList().forEach { it.onLog(type, message) }
entries.add(TorLog(type ?: "null", message ?: "null", timestamp ?: "null"))
torLogListeners.toList().forEach { it.onLog(type ?: "null", message ?: "null", timestamp) }
}
}
......
package org.mozilla.fenix.tor
import androidx.compose.runtime.Stable
@Stable
data class TorLog(
val type: String,
val text: String,
val timestamp: String,
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment