- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] fixup! [android] TBA strings
by Dan Ballard (＠dan) 17 Mar '25

17 Mar '25

Dan Ballard pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 642c18d0 by Henry Wilkes at 2025-03-17T10:17:33+00:00 fixup! [android] TBA strings TB 43091: Remove unused android strings. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -5,26 +5,12 @@  <string name="tor_about_content">%1$s is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.</string> -  - <string name="preferences_disable_normal_mode">Allow Only Private Browsing Mode</string>  <string name="preferences_donate">Donate to The Tor Project</string>  <string name="preferences_allow_screenshots">Allow screenshots</string> <string name="tor_bootstrap_connect">Connect</string> - <string name="tor_bootstrap_connecting">Connecting</string> - <string name="tor_bootstrap_connecting_failed">Connecting Failed</string> - <string name="tor_bootstrap_swipe_for_logs">Swipe to the left to see Tor logs</string> - <string name="tor_initializing_log">Initializing Tor Log</string> - - <string name="tor_onboarding_security_level">Set your Security Level</string> - <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> - <string name="tor_onboarding_chosen_security_level_label">Current Security Level: %s</string> - <string name="tor_onboarding_security_settings_button">Open Security Settings</string> - <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> - <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> - <string name="tor_onboarding_donate_button">Donate Now</string> <string name="tor_explore_privately">Explore. Privately.</string> @@ -34,8 +20,6 @@ <string name="preferences_tor_network_settings_explanation">Tor Browser routes your traffic over the Tor network, run by thousands of volunteers around the world.</string> <string name="preferences_tor_network_settings_bridge_config">Config Bridge</string> <string name="preferences_tor_network_settings_bridge_config_description">Use a Bridge to connect to Tor</string> - <string name="preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled">You’re using a built-in bridge to connect to Tor</string> - <string name="preferences_tor_network_settings_bridge_config_description_user_provided_enabled">You provided a bridge to connect to Tor</string> <string name="preferences_tor_network_settings_bridge_config_explanation">Bridges are unlisted relays that make it more difficult to block connections to the Tor network. Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.</string> <string name="preferences_tor_network_settings_bridge_config_toggle">Use a Bridge</string> <string name="preferences_tor_network_settings_bridge_config_toggle_description">Config a bridge to connect to Tor</string> @@ -46,21 +30,9 @@ <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Enter bridge information from a trusted source</string> <string name="preferences_tor_network_settings_bridge_config_current_bridge">Current Configured Bridge: %s</string> <string name="tor_network_settings_bridge_not_configured">Not Configured</string> - <string name="preferences_tor_network_settings_status">Current Status</string> - <string name="preferences_tor_network_settings_tor_ready">Is Tor Ready: %s</string> - <string name="preferences_tor_network_settings_state">State: %s</string> - <string name="preferences_tor_network_settings_yes">Yes</string> - <string name="preferences_tor_network_settings_no">No</string> - <string name="preferences_tor_network_settings_disconnected">Disconnected</string> - <string name="preferences_tor_network_settings_connecting">Connecting</string> - <string name="preferences_tor_network_settings_connected">Connected</string> - <string name="preferences_tor_network_settings_restarting">Restarting</string> - <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</string> <string name="preferences_tor_logs">Tor Logs</string> <string name="preferences_tor_logs_description">View and copy your Tor logs</string> -  - <string name="preferences_tor_security_level_settings">Security Settings</string> <string name="preferences_tor_security_level_options">Security Level</string>  View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/642c18d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/642c18d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Update the Tor Browser Stable release-prep template to notify Tails devs...
by morgan (＠morgan) 17 Mar '25

17 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2356d9d7 by Morgan at 2025-03-17T13:54:18+00:00 Update the Tor Browser Stable release-prep template to notify Tails devs earlier in the release process - - - - - fe816f62 by Morgan at 2025-03-17T13:56:36+00:00 Update release-prep templates with updated devmole build notes - - - - - 5 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -117,8 +117,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - - **NOTE** this requires a devmole authentication token - - **NOTE** this also requires you be connected to Gothenburg Mulvad VPN exit `se-got-wg-101` + - **NOTE** this requires a github authentication token - Run: ```bash make mullvadbrowser-kick-devmole-build ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -113,11 +113,10 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS ```bash make mullvadbrowser-release && make mullvadbrowser-incrementals-release ``` - - Tor Project build machine - - Local developer machine + - [ ] Tor Project build machine + - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - - **NOTE** this requires a devmole authentication token - - **NOTE** this also requires you be connected to Gothenburg Mulvad VPN exit `se-got-wg-101` + - **NOTE** this requires a github authentication token - Run: ```bash make mullvadbrowser-kick-devmole-build ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -141,8 +141,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - - **NOTE** this requires a devmole authentication token - - **NOTE** this also requires you be connected to Gothenburg Mulvad VPN exit `se-got-wg-101` + - **NOTE** this requires a github authentication token - Run: ```bash make torbrowser-kick-devmole-build ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md ===================================== @@ -133,8 +133,7 @@ Tor Browser Legacy is on the `maint-13.5` branch - [ ] Tor Project build machine - [ ] Local developer machine - [ ] Submit build request to Mullvad infrastructure: - - **NOTE** this requires a devmole authentication token - - **NOTE** this also requires you be connected to Gothenburg Mulvad VPN exit `se-got-wg-101` + - **NOTE** this requires a github authentication token - Run: ```bash make torbrowser-kick-devmole-build ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -142,12 +142,33 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b - Tor Project build machine - Local developer machine - [ ] Submit build request to Mullvad infrastructure: - - **NOTE** this requires a devmole authentication token - - **NOTE** this also requires you be connected to Gothenburg Mulvad VPN exit `se-got-wg-101` + - **NOTE** this requires a github authentication token - Run: ```bash make torbrowser-kick-devmole-build ``` +- [ ] Notify Tails of pending builds + - **Recipients** + ``` + tails-dev(a)boum.org + ``` + - **Subject** + ``` + Tor Browser ${TOR_BROWSER_VERSION} Building + ``` + - **Body** + ``` + Hello, + + Tor Browser Stable is being built and should be ready for Tails in the coming hours. Build artifacts and hashes will be available here: + - ${BUILD_ARTIFACTS_URL} + - ${BUIDL_HASHES_URL} + + ⚠️ WARNING: We have not yet verified the builds match, so make sure you do so before prepping the Tails release! + + Changelog: + # paste changelog as quote here + ``` </details> @@ -321,14 +342,13 @@ popd ### packagers - [ ] Email packagers: - **Recipients** - - Tails dev mailing list: tails-dev(a)boum.org - Guardian Project: nathan(a)guardianproject.info - FreeBSD port: freebsd(a)sysctl.cz  - OpenBSD port: caspar(a)schutijser.com  - torbrowser-launcher: mail(a)asciiwolf.com  - Anti-Censorship: meskio(a)torproject.org  ``` - tails-dev(a)boum.org, nathan(a)guardianproject.info, freebsd(a)sysctl.cz, caspar(a)schutijser.com, mail(a)asciiwolf.com, meskio(a)torproject.org, + nathan(a)guardianproject.info, freebsd(a)sysctl.cz, caspar(a)schutijser.com, mail(a)asciiwolf.com, meskio(a)torproject.org, ``` - **Subject** ``` View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 2 commits: fixup! [android] Implement Android-native Connection Assist UI
by clairehurst (＠clairehurst) 13 Mar '25

13 Mar '25

clairehurst pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: d7dfb3f5 by clairehurst at 2025-03-13T15:41:50-06:00 fixup! [android] Implement Android-native Connection Assist UI tor-browser#43361 - - - - - ec07d29a by clairehurst at 2025-03-13T15:41:57-06:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap tor-browser#43361 - - - - - 5 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -137,8 +137,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider { isDeviceRamAboveThreshold() } - var terminating = false - open val components by lazy { Components(this) } var visibilityLifecycleCallback: VisibilityLifecycleCallback? = null @@ -188,20 +186,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider { } } - fun isTerminating() = terminating - - fun terminate() { - onTerminate() - } - - override fun onTerminate() { - terminating = true - - super.onTerminate() - components.torController.stop() - components.torController.stopTor() - } - @OptIn(DelicateCoroutinesApi::class) // GlobalScope usage @VisibleForTesting protected open fun initializeGlean() { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -158,6 +158,7 @@ import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.tor.UrlQuickLoadViewModel import org.mozilla.geckoview.TorAndroidIntegration import org.mozilla.geckoview.TorConnectStage +import kotlin.system.exitProcess /** * The main activity of the application. The application is primarily a single Activity (this one) @@ -653,22 +654,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn if (this !is ExternalAppBrowserActivity && !activityStartedWithLink) { stopMediaSession() } - - if (isFinishing && !(application as FenixApplication).isTerminating()) { - // We assume the Activity is being destroyed because the user - // swiped away the app on the Recent screen. When this happens, - // we assume the user expects the entire Application is destroyed - // and not only the top Activity/Task. Therefore we kill the - // underlying Application, as well. - (application as FenixApplication).terminate() - if (settings().useHtmlConnectionUi) { - val engine = components.core.engine - if (engine is GeckoEngine) { - val torIntegration = engine.getTorIntegrationController() - torIntegration.unregisterBootstrapStateChangeListener(this) - } - } - } } final override fun onConfigurationChanged(newConfig: Configuration) { @@ -1453,6 +1438,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn private const val PWA_RECENTLY_USED_THRESHOLD = DateUtils.DAY_IN_MILLIS * 30L } + fun shutDown() : Nothing { + finishAndRemoveTask() + exitProcess(0) + } + override fun onBootstrapStateChange(state: String) = Unit override fun onBootstrapStageChange(stage: TorConnectStage) = Unit override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) = Unit ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -1394,7 +1394,6 @@ class HomeFragment : Fragment(), UserInteractionHandler { } override fun onBackPressed(): Boolean { - requireActivity().finish() - return true + (requireActivity() as HomeActivity).shutDown() } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -149,7 +149,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { private fun setBackButton(screen: ConnectAssistUiState) { binding.backButton.visibility = if (screen.backButtonVisible) View.VISIBLE else View.INVISIBLE binding.backButton.setOnClickListener { - torConnectionAssistViewModel.handleBackButtonPressed() + onBackPressed() } } @@ -314,7 +314,8 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { } override fun onBackPressed(): Boolean { - return torConnectionAssistViewModel.handleBackButtonPressed() + torConnectionAssistViewModel.handleBackButtonPressed(requireActivity() as HomeActivity) + return true } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -10,6 +10,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.ext.components class TorConnectionAssistViewModel( @@ -150,10 +151,10 @@ class TorConnectionAssistViewModel( return true } - fun handleBackButtonPressed(): Boolean { + fun handleBackButtonPressed(homeActivity: HomeActivity) { when (torConnectScreen.value) { - ConnectAssistUiState.Splash -> return false - ConnectAssistUiState.Configuring -> return false + ConnectAssistUiState.Splash -> homeActivity.shutDown() + ConnectAssistUiState.Configuring -> homeActivity.shutDown() ConnectAssistUiState.Connecting -> cancelTorBootstrap() ConnectAssistUiState.InternetError -> { _torController.lastKnownError = null @@ -191,6 +192,5 @@ class TorConnectionAssistViewModel( _torConnectScreen.value = ConnectAssistUiState.LocationCheck } } - return true } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/da17f7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/da17f7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 4 commits: fixup! TB 42247: Android helpers for the TorProvider
by Dan Ballard (＠dan) 13 Mar '25

13 Mar '25

Dan Ballard pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6199983c by Dan Ballard at 2025-03-13T11:17:04-07:00 fixup! TB 42247: Android helpers for the TorProvider Bug 41188: Add staging event wiring - - - - - d9c0e220 by Dan Ballard at 2025-03-13T11:17:04-07:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 41188: Add staging event wiring - - - - - f545b853 by Dan Ballard at 2025-03-13T11:17:04-07:00 fixup! [android] Implement Android-native Connection Assist UI Bug 41188: Add staging event wiring - - - - - da17f78c by Dan Ballard at 2025-03-13T11:17:05-07:00 fixup! TB 40597: Implement TorSettings module Bug 41188: pt1 add android stages - - - - - 9 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapProgressViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorBootstrappingStatus.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStage.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStageName.java - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -157,6 +157,7 @@ import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.tor.UrlQuickLoadViewModel import org.mozilla.geckoview.TorAndroidIntegration +import org.mozilla.geckoview.TorConnectStage /** * The main activity of the application. The application is primarily a single Activity (this one) @@ -1453,6 +1454,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn } override fun onBootstrapStateChange(state: String) = Unit + override fun onBootstrapStageChange(stage: TorConnectStage) = Unit override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) = Unit override fun onBootstrapComplete() { if (settings().useHtmlConnectionUi) { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapProgressViewModel.kt ===================================== @@ -5,6 +5,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import org.mozilla.fenix.ext.components import org.mozilla.geckoview.TorAndroidIntegration.BootstrapStateChangeListener +import org.mozilla.geckoview.TorConnectStage class TorBootstrapProgressViewModel( application: Application, @@ -27,6 +28,7 @@ class TorBootstrapProgressViewModel( } override fun onBootstrapStateChange(state: String?) {} + override fun onBootstrapStageChange(stage: TorConnectStage) = Unit override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) { this.progress.value = progress.toInt() ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -11,6 +11,7 @@ import org.mozilla.fenix.ext.components import org.mozilla.geckoview.TorAndroidIntegration import org.mozilla.geckoview.TorAndroidIntegration.BootstrapStateChangeListener import org.mozilla.geckoview.TorAndroidIntegration.TorLogListener +import org.mozilla.geckoview.TorConnectStage import org.mozilla.geckoview.TorSettings import org.mozilla.geckoview.TorSettings.BridgeBuiltinType import org.mozilla.geckoview.TorSettings.BridgeSource @@ -322,6 +323,8 @@ class TorControllerGV( onTorStatusUpdate(null, newStateVal, null) } + override fun onBootstrapStageChange(stage: TorConnectStage) = Unit + // TorEventsBootstrapStateChangeListener override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) { Log.d(TAG, "onBootstrapProgress(progress = $progress, hasWarnings = $hasWarnings)") ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java ===================================== @@ -37,7 +37,8 @@ public class TorAndroidIntegration implements BundleEventListener { private static final String EVENT_TOR_STOP = "GeckoView:Tor:StopTor"; private static final String EVENT_MEEK_START = "GeckoView:Tor:StartMeek"; private static final String EVENT_MEEK_STOP = "GeckoView:Tor:StopMeek"; - private static final String EVENT_CONNECT_STATE_CHANGED = "GeckoView:Tor:ConnectStateChanged"; + private static final String EVENT_CONNECT_STATE_CHANGED = "GeckoView:Tor:ConnectStateChanged"; // deprecation path + private static final String EVENT_CONNECT_STAGE_CHANGED = "GeckoView:Tor:ConnectStageChanged"; // replacement path private static final String EVENT_CONNECT_ERROR = "GeckoView:Tor:ConnectError"; private static final String EVENT_BOOTSTRAP_PROGRESS = "GeckoView:Tor:BootstrapProgress"; private static final String EVENT_BOOTSTRAP_COMPLETE = "GeckoView:Tor:BootstrapComplete"; @@ -114,6 +115,7 @@ public class TorAndroidIntegration implements BundleEventListener { EVENT_SETTINGS_READY, EVENT_SETTINGS_CHANGED, EVENT_CONNECT_STATE_CHANGED, + EVENT_CONNECT_STAGE_CHANGED, EVENT_CONNECT_ERROR, EVENT_BOOTSTRAP_PROGRESS, EVENT_BOOTSTRAP_COMPLETE, @@ -150,6 +152,11 @@ public class TorAndroidIntegration implements BundleEventListener { for (BootstrapStateChangeListener listener : mBootstrapStateListeners) { listener.onBootstrapStateChange(state); } + } else if (EVENT_CONNECT_STAGE_CHANGED.equals(event)) { + TorConnectStage stage = new TorConnectStage(message.getBundle("stage")); + for (BootstrapStateChangeListener listener : mBootstrapStateListeners) { + listener.onBootstrapStageChange(stage); + } } else if (EVENT_CONNECT_ERROR.equals(event)) { String code = message.getString("code"); String msg = message.getString("message"); @@ -629,7 +636,9 @@ public class TorAndroidIntegration implements BundleEventListener { } public interface BootstrapStateChangeListener { - void onBootstrapStateChange(String state); + void onBootstrapStateChange(String state); // depreaction path + + void onBootstrapStageChange(TorConnectStage stage); // new upgrade void onBootstrapProgress(double progress, boolean hasWarnings); ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorBootstrappingStatus.java ===================================== @@ -0,0 +1,14 @@ +package org.mozilla.geckoview; + +import org.mozilla.gecko.util.GeckoBundle; + +// Class to receive BootstrappingStatus object from TorConnect.sys.mjs ~ln698 +public class TorBootstrappingStatus { + public int progress; // percent of bootstrap progress + public boolean hasWarning; // Whether this bootstrap has a warning in the tor log + + public TorBootstrappingStatus(GeckoBundle bundle) { + progress = bundle.getInt("progress"); + hasWarning = bundle.getBoolean("hasWarning"); + } +} ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStage.java ===================================== @@ -0,0 +1,48 @@ +package org.mozilla.geckoview; + +import org.mozilla.gecko.util.GeckoBundle; + +// Class to receive ConnectStage object from TorConnect.sys.mjs ~ln677 +public class TorConnectStage { + + public class Error { + public String code; + public String message; + public String phase; + public String reason; + + public Error(GeckoBundle bundle) { + code = bundle.getString("code"); + message = bundle.getString("message"); + phase = bundle.getString("phase"); + reason = bundle.getString("reason"); + } + } + + public TorConnectStageName name; + // The TorConnectStage prior to this bootstrap attempt. Only set during the "Bootstrapping" stage. + public TorConnectStageName bootstrapTrigger; + public Error error; + public String defaultRegion; + public Boolean potentiallyBlocked; + public Boolean tryAgain; + public TorBootstrappingStatus bootstrappingStatus; + + public TorConnectStage(GeckoBundle bundle) { + name = TorConnectStageName.fromString(bundle.getString("name")); + if (bundle.getString("bootstrapTrigger") != null) { + bootstrapTrigger = TorConnectStageName.fromString(bundle.getString("bootstrapTrigger")); + } + defaultRegion = bundle.getString("defaultRegion"); + potentiallyBlocked = bundle.getBoolean("potentiallyBlocked"); + tryAgain = bundle.getBoolean("tryAgain"); + if (bundle.getBundle("error") != null) { + error = new Error(bundle.getBundle("error")); + } + bootstrappingStatus = new TorBootstrappingStatus(bundle.getBundle("bootstrappingStatus")); + } + + public Boolean isBootstrapped() { + return name.isBootstrapped(); + } +} ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStageName.java ===================================== @@ -0,0 +1,43 @@ +package org.mozilla.geckoview; + +import java.security.InvalidParameterException; + +public enum TorConnectStageName { + // These names should match entries from TorConnectStage in TorConnect.sys.mjs at ~ln163. + Disabled("Disabled"), + Loading("Loading"), + Start("Start"), + Bootstrapping("Bootstrapping"), + Offline("Offline"), + ChooseRegion("ChooseRegion"), + RegionNotFound("RegionNotFound"), + ConfirmRegion("ConfirmRegion"), + FinalError("FinalError"), + Bootstrapped("Bootstrapped"); + + private String valueText; + + TorConnectStageName(String valueText) { + this.valueText = valueText; + } + + public Boolean isBootstrapped() { + return this == Bootstrapped; + } + + public String getString() { + return this.valueText; + } + + public static TorConnectStageName fromString(String text) { + for (TorConnectStageName tcs : TorConnectStageName.values()) { + if (tcs.valueText.equalsIgnoreCase(text)) { + return tcs; + } + } + if (BuildConfig.BUILD_TYPE == "debug") { + throw new InvalidParameterException("Unknown TorConnectStageName " + text); + } + return null; + } +} ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -25,7 +25,8 @@ const logger = console.createInstance({ const EmittedEvents = Object.freeze({ settingsReady: "GeckoView:Tor:SettingsReady", settingsChanged: "GeckoView:Tor:SettingsChanged", - connectStateChanged: "GeckoView:Tor:ConnectStateChanged", + connectStateChanged: "GeckoView:Tor:ConnectStateChanged", // deprecation path + connectStageChanged: "GeckoView:Tor:ConnectStageChanged", // new replacement path connectError: "GeckoView:Tor:ConnectError", bootstrapProgress: "GeckoView:Tor:BootstrapProgress", bootstrapComplete: "GeckoView:Tor:BootstrapComplete", @@ -106,6 +107,12 @@ class TorAndroidIntegrationImpl { state: subj.wrappedJSObject.state ?? "", }); break; + case lazy.TorConnectTopics.StageChange: + lazy.EventDispatcher.instance.sendRequest({ + type: EmittedEvents.connectStageChanged, + stage: subj.wrappedJSObject ?? "", + }); + break; case lazy.TorConnectTopics.BootstrapProgress: lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.bootstrapProgress, ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -660,6 +660,7 @@ export const InternetStatus = Object.freeze({ Online: 1, }); +// This enum is mirrored for Android in TorConnectStageName.java. Changes should be mirrored there export const TorConnectStage = Object.freeze({ Disabled: "Disabled", Loading: "Loading", @@ -677,6 +678,7 @@ export const TorConnectStage = Object.freeze({ * @typedef {object} ConnectStage * * A summary of the user stage. + * (This class is mirrored for Android in TorConnectStage.java. Changes should be mirrored there) * * @property {string} name - The name of the stage. * @property {string} defaultRegion - The default region to show in the UI. @@ -698,6 +700,7 @@ export const TorConnectStage = Object.freeze({ * @typedef {object} BootstrappingStatus * * The status of a bootstrap. + * (This class is mirrored for Android in TorBootstrapping.java. Changes should be mirrored there) * * @property {number} progress - The percent progress. * @property {boolean} hasWarning - Whether this bootstrap has a warning in the @@ -708,6 +711,7 @@ export const TorConnectStage = Object.freeze({ * @typedef {object} BootstrapError * * Details about the error that caused bootstrapping to fail. + * (This class is mirrored for Android in TorError.java. Changes should be mirrored there) * * @property {string} code - The error code type. * @property {string} message - The error message. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8fec31… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8fec31… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] 7 commits: alpha: new version, 14.5a4 (linux-i686)
by boklm (＠boklm) 13 Mar '25

13 Mar '25

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: e17c7051 by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 (linux-i686) - - - - - 744b4515 by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 (linux-x86_64) - - - - - 8a7bae89 by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 (macos) - - - - - c691cfaf by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 (windows-i686) - - - - - cae24212 by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 (windows-x86_64) - - - - - cfa892da by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 (android) - - - - - ad49bab4 by Nicolas Vigier at 2025-03-13T19:39:44+01:00 alpha: new version, 14.5a4 - - - - - 49 changed files: - update_3/alpha/.htaccess - − update_3/alpha/14.0a9-14.5a3-windows-i686-ALL.xml - − update_3/alpha/14.0a9-14.5a3-windows-x86_64-ALL.xml - − update_3/alpha/14.5a1-14.5a3-windows-i686-ALL.xml - − update_3/alpha/14.5a1-14.5a3-windows-x86_64-ALL.xml - − update_3/alpha/14.5a2-14.5a3-windows-i686-ALL.xml - − update_3/alpha/14.5a2-14.5a3-windows-x86_64-ALL.xml - − update_3/alpha/14.5a3-windows-i686-ALL.xml - − update_3/alpha/14.5a3-windows-x86_64-ALL.xml - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json - update_3/alpha/download-linux-i686.json - update_3/alpha/download-linux-x86_64.json - update_3/alpha/download-macos.json - update_3/alpha/download-windows-i686.json - update_3/alpha/download-windows-x86_64.json - update_3/alpha/downloads.json - + update_3/alpha/linux-i686/.htaccess - update_3/alpha/14.0a9-14.5a3-linux-i686-ALL.xml → update_3/alpha/linux-i686/14.5a1-14.5a4-linux-i686.xml - update_3/alpha/14.5a1-14.5a3-linux-i686-ALL.xml → update_3/alpha/linux-i686/14.5a2-14.5a4-linux-i686.xml - update_3/alpha/14.5a2-14.5a3-linux-i686-ALL.xml → update_3/alpha/linux-i686/14.5a3-14.5a4-linux-i686.xml - update_3/alpha/14.5a3-linux-i686-ALL.xml → update_3/alpha/linux-i686/14.5a4-linux-i686.xml - update_3/alpha/no-update.xml → update_3/alpha/linux-i686/no-update.xml - + update_3/alpha/linux-x86_64/.htaccess - update_3/alpha/14.0a9-14.5a3-linux-x86_64-ALL.xml → update_3/alpha/linux-x86_64/14.5a1-14.5a4-linux-x86_64.xml - update_3/alpha/14.5a1-14.5a3-linux-x86_64-ALL.xml → update_3/alpha/linux-x86_64/14.5a2-14.5a4-linux-x86_64.xml - update_3/alpha/14.5a2-14.5a3-linux-x86_64-ALL.xml → update_3/alpha/linux-x86_64/14.5a3-14.5a4-linux-x86_64.xml - update_3/alpha/14.5a3-linux-x86_64-ALL.xml → update_3/alpha/linux-x86_64/14.5a4-linux-x86_64.xml - + update_3/alpha/linux-x86_64/no-update.xml - + update_3/alpha/macos/.htaccess - update_3/alpha/14.5a1-14.5a3-macos-ALL.xml → update_3/alpha/macos/14.5a1-14.5a4-macos.xml - update_3/alpha/14.5a2-14.5a3-macos-ALL.xml → update_3/alpha/macos/14.5a2-14.5a4-macos.xml - update_3/alpha/14.0a9-14.5a3-macos-ALL.xml → update_3/alpha/macos/14.5a3-14.5a4-macos.xml - update_3/alpha/14.5a3-macos-ALL.xml → update_3/alpha/macos/14.5a4-macos.xml - + update_3/alpha/macos/no-update.xml - + update_3/alpha/windows-i686/.htaccess - + update_3/alpha/windows-i686/14.5a1-14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/14.5a2-14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/14.5a3-14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/14.5a4-windows-i686.xml - + update_3/alpha/windows-i686/no-update.xml - + update_3/alpha/windows-x86_64/.htaccess - + update_3/alpha/windows-x86_64/14.5a1-14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a2-14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a3-14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/14.5a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/no-update.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 2 commits: fixup! [android] TBA strings
by Dan Ballard (＠dan) 13 Mar '25

13 Mar '25

Dan Ballard pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 8e24a7bc by Dan Ballard at 2025-03-13T10:14:34-07:00 fixup! [android] TBA strings Bug 43473: change quickstart to connect automatically in settings - - - - - 8fec318e by Dan Ballard at 2025-03-13T10:18:42-07:00 fixup! TB 40041 [android]: Implement Tor Network Settings Bug 43473: change quickstart to connect automatically in settings - - - - - 2 changed files: - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/preferences.xml Changes: ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -15,7 +15,6 @@ <string name="tor_bootstrap_connect">Connect</string> <string name="tor_bootstrap_connecting">Connecting</string> <string name="tor_bootstrap_connecting_failed">Connecting Failed</string> - <string name="tor_bootstrap_quick_start_label">Quick Start</string> <string name="tor_bootstrap_swipe_for_logs">Swipe to the left to see Tor logs</string> <string name="tor_initializing_log">Initializing Tor Log</string> @@ -80,6 +79,7 @@  <string name="connection_assist_tor_connect_title">Connect to Tor</string>  + <string name="tor_connect_automatically_label">Connect automatically</string> <string name="connection_assist_always_connect_automatically_toggle_description">Always connect automatically</string>  <string name="connection_assist_configure_connection_button">Configure connection…</string> ===================================== mobile/android/fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -178,8 +178,7 @@ <SwitchPreference android:key="@string/pref_key_quick_start" - android:summary="@string/connection_assist_always_connect_automatically_toggle_description" - android:title="@string/tor_bootstrap_quick_start_label" + android:title="@string/tor_connect_automatically_label" app:iconSpaceReserved="false" /> <SwitchPreference View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b36372… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b36372… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-132.0a1-15.0-2
by Pier Angelo Vendrame (＠pierov) 13 Mar '25

13 Mar '25

Pier Angelo Vendrame pushed new branch mullvad-browser-132.0a1-15.0-2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-132.0a1-15.0-2-build1
by Pier Angelo Vendrame (＠pierov) 13 Mar '25

13 Mar '25

Pier Angelo Vendrame pushed new tag base-browser-132.0a1-15.0-2-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-132.0a1-15.0-2-build1
by Pier Angelo Vendrame (＠pierov) 13 Mar '25

13 Mar '25

Pier Angelo Vendrame pushed new tag base-browser-132.0a1-15.0-2-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-132.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 13 Mar '25

13 Mar '25

Pier Angelo Vendrame pushed new tag base-browser-132.0a1-15.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0