Unverified Commit 10fcc45a authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'acatgl/40078+1' into tor-browser-82.0.0b4-10.0-1

parents 4a7a5f7b 53ea7a05
......@@ -589,7 +589,7 @@ task buildTranslationArray {
foundLocales.append("new String[]{")
fileTree("src/main/res").visit { FileVisitDetails details ->
if(details.file.path.endsWith("/strings.xml")){
if(details.file.path.endsWith("/torbrowser_strings.xml")){
def languageCode = details.file.parent.tokenize('/').last().replaceAll('values-','').replaceAll('-r','-')
languageCode = (languageCode == "values") ? "en-US" : languageCode
languageCodes.add(languageCode)
......
......@@ -119,13 +119,6 @@ class TorController(
Prefs.setBridgesList(value)
}
init {
// Bug 40040: Hacky: Initialize TorService when we are instantiated. This should
// help avoid a race condition involving copying assets and starting tor in TorService.
val torServiceStatus = Intent(context, TorService::class.java)
context.startService(torServiceStatus)
}
fun start() {
// Register receiver
lbm.registerReceiver(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment