Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
190065c7 by clairehurst at 2024-06-13T17:51:18-06:00
fixup! Add Tor integration and UI
- - - - -
1 changed file:
- − fenix/app/src/main/res/drawable/connectoncropped.png
Changes:
=====================================
fenix/app/src/main/res/drawable/connectoncropped.png deleted
=====================================
Binary files a/fenix/app/src/main/res/drawable/connectoncropped.png and /dev/null differ
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/190…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/190…
You're receiving this email because of your account on gitlab.torproject.org.
Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
ce547718 by Dan Ballard at 2024-06-13T09:09:12-07:00
fixup! Implement Android-native Connection Assist UI
Bug 42648: Don't cancel tor bootstrap when opening settings from bootstrap
- - - - -
1 changed file:
- fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
Changes:
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
=====================================
@@ -124,7 +124,6 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler {
private fun setSettingsButton(screen: ConnectAssistUiState) {
binding.settingsButton.visibility = if (screen.settingsButtonVisible) View.VISIBLE else View.GONE
binding.settingsButton.setOnClickListener {
- viewModel.cancelTorBootstrap()
openSettings()
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ce5…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ce5…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-115.12.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
1d8abcb1 by Pier Angelo Vendrame at 2024-06-12T16:01:14+02:00
fixup! Bug 40933: Add tor-launcher functionality
Bug 42636: A bad bridge line might get TBA stuck.
A while ago I reworked the relationship between TorSettings and
TorProvider. While doing so I was too strict, and a failure to push
settings during initialization will stop the initialization itself,
which will result in TBA stuck at the splash screen.
The problem appears also on desktop (the user will get a prompt that
asks to restart Tor, even though it is not perfect, see #21053).
However, on desktop the user can go to the settings and deleting the
bridges from there (which is not an optimal experience anyway).
- - - - -
1 changed file:
- toolkit/components/tor-launcher/TorProvider.sys.mjs
Changes:
=====================================
toolkit/components/tor-launcher/TorProvider.sys.mjs
=====================================
@@ -232,11 +232,9 @@ export class TorProvider {
await this.writeSettings(lazy.TorSettings.getSettings());
} catch (e) {
logger.warn(
- "Failed to initialize TorSettings or to write our settings, so uninitializing.",
+ "Failed to initialize TorSettings or to write our initial settings. Continuing the initialization anyway.",
e
);
- this.uninit();
- throw e;
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1d8abcb…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1d8abcb…
You're receiving this email because of your account on gitlab.torproject.org.
Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
d483554e by Dan Ballard at 2024-06-11T12:38:20-07:00
fixup! Add Tor integration and UI
Bug 42632: Don't display builtin bridges in provide bridge popup;
Also fix saving user provided bridges by splitting on \n instead of \r\n and prune empty lines
- - - - -
1 changed file:
- fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt
Changes:
=====================================
fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt
=====================================
@@ -157,12 +157,20 @@ class TorControllerGV(
// with no bridge strings
override var userProvidedBridges: String?
get() {
- return getTorSettings()?.bridgeBridgeStrings?.joinToString("\r\n")
+ return getTorSettings()?.let {
+ if (it.bridgesSource == BridgeSource.UserProvided) {
+ return getTorSettings()?.bridgeBridgeStrings?.joinToString("\n")
+ }
+ return ""
+ }
}
set(value) {
getTorSettings()?.let {
+ Log.i(TAG, "setUserProvidedBridges: '$value'");
+ // Hack: we don't have validation so lets do something quick and dirty (each line has a length)
+ val userProvidedLines: Array<String> = value?.split("\n")?.filter { it.length > 4 }?.toTypedArray() ?: arrayOf<String>()
it.bridgesSource = BridgeSource.UserProvided
- it.bridgeBridgeStrings = value?.split("\r\n")?.toTypedArray() ?: arrayOf<String>()
+ it.bridgeBridgeStrings = userProvidedLines
getTorIntegration().setSettings(it, true, true)
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d48…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d48…
You're receiving this email because of your account on gitlab.torproject.org.