[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Implement Android-native Connection Assist UI
Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project
/ Applications / firefox-android
Commits:
fe6b5622 by clairehurst at 2024-05-08T15:01:58-06:00
fixup! Implement Android-native Connection Assist UI
- - - - -
2 changed files:
- fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
- fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt
Changes:
=
fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
=
@@ -27,7 +27,6 @@ import kotlinx.coroutines.launch
import mozilla.components.support.base.feature.UserInteractionHandler
import org.mozilla.fenix.R
import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding
-import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.hideToolbar
class TorConnectionAssistFragment : Fragment(), UserInteractionHandler {
@@ -75,6 +74,20 @@ class TorConnectionAssistFragment : Fragment(),
UserInteractionHandler {
}
}
+viewModel.quickstartToggle().observe(
+viewLifecycleOwner,
+) {
+binding.quickstartSwitch.isChecked = it == true
+}
+
+viewModel.shouldOpenHome().observe(
+viewLifecycleOwner,
+) {
+if (it) {
+openHome()
+}
+}
+
}
override fun onDestroyView() {
@@ -136,7 +149,7 @@ class TorConnectionAssistFragment : Fragment(),
UserInteractionHandler {
titleDescription.text =
getString(screen.titleDescriptionTextStringResource)
}
quickstartSwitch.visibility = if (screen.quickstartSwitchVisible)
View.VISIBLE else View.GONE
-quickstartSwitch.isChecked =
requireContext().components.torController.quickstart
+quickstartSwitch.isChecked = viewModel.quickstartToggle().value ==
true
quickstartSwitch.setOnCheckedChangeListener { _, isChecked ->
viewModel.handleQuickstartChecked(isChecked)
}
@@ -198,7 +211,7 @@ class TorConnectionAssistFragment : Fragment(),
UserInteractionHandler {
}
private fun openHome() {
-Log.d(TAG, "openHome()") //This doesn't seem to be ever called
+Log.d(TAG, "openHome()")
findNavController().navigate(TorConnectionAssistFragmentDirections.actionStartupHome())
}
=
fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt
=
@@ -26,6 +26,18 @@ class TorConnectionAssistViewModel(
private val _torConnectScreen =
MutableStateFlow(ConnectAssistUiState.Splash)
internal val torConnectScreen: StateFlow =
_torConnectScreen
+private val _quickStartToggle = MutableLiveData() // don't
initialize with quickstart off the bat
+fun quickstartToggle(): LiveData {
+_quickStartToggle.value = _torController.quickstart // quickstart
isn't ready until torSettings is ready
+return _quickStartToggle
+}
+
+
+private val _shouldOpenHome = MutableLiveData(false)
+fun shouldOpenHome(): LiveData {
+return _shouldOpenHome
+}
+
private val _progress = MutableLiveData(0)
fun progress(): LiveData {
return _progress
@@ -49,6 +61,7 @@ class TorConnectionAssistViewModel(
fun handleQuickstartChecked(checked: Boolean) {
_torController.quickstart = checked
+_quickStartToggle.value = checked
}
fun handleButton1Pressed(
@@ -87,8 +100,9 @@ class TorConnectionAssistViewModel(
TorConnectState.Configuring -> handleConfiguring()
TorConnectState.AutoBootstrapping -> handleBootstrap()
TorConnectState.Bootstrapping -> handleBootstrap()
+TorConnectState.Bootstrapped -> _shouldOpenHome.value = true
+TorConnectState.Disabled -> _shouldOpenHome.value = true
TorConnectState.Error -> handleError()
-else -> {}
}
}
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/fe6b56225e5fdfed6e7623496ec64a7670b765ab
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/fe6b56225e5fdfed6e7623496ec64a7670b765ab
You're receiving this email because of your account on gitlab.torproject.org.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.5-1] fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages
Pier Angelo Vendrame pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor
Project / Applications / Tor Browser
Commits:
75ac830c by Henry Wilkes at 2024-05-08T16:05:56+01:00
fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages
Bug 42573: Avoid async l10n.formatValue.
- - - - -
1 changed file:
- browser/base/content/languageNotification.js
Changes:
=
browser/base/content/languageNotification.js
=
@@ -2,7 +2,7 @@
// Show a prompt to suggest to the user that they can change the UI language.
// Show it only the first time, and then do not show it anymore
-window.addEventListener("load", async () => {
+window.addEventListener("load", () => {
const PREF_NAME = "intl.language_notification.shown";
if (Services.prefs.getBoolPref(PREF_NAME, false)) {
@@ -35,12 +35,12 @@ window.addEventListener("load", async () => {
Services.locale.requestedLocales,
Services.locale.availableLocales
).length;
- const label = await document.l10n.formatValue(
-matchingSystem
+ const label = {
+"l10n-id": matchingSystem
? "language-notification-label-system"
: "language-notification-label",
-{ language }
- );
+"l10n-args": { language },
+ };
const buttons = [
{
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/75ac830cbf3c25d50a92027ee24cf9a29da46352
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/75ac830cbf3c25d50a92027ee24cf9a29da46352
You're receiving this email because of your account on gitlab.torproject.org.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.5-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
ma1 pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project /
Applications / Tor Browser
Commits:
02b5bf73 by hackademix at 2024-05-08T12:48:22+02:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42557: Fix regression in Onion Services authentication prompt focus
- - - - -
1 changed file:
- browser/components/onionservices/content/authPrompt.js
Changes:
=
browser/components/onionservices/content/authPrompt.js
=
@@ -356,6 +356,13 @@ var OnionAuthPrompt = {
this._showWarning(undefined);
});
+// Force back focus on click: tor-browser#41856
+document
+ .getElementById("tor-clientauth-notification")
+ .addEventListener("click", () => {
+window.focus();
+ });
+
Services.obs.addObserver(this, this._topics.clientAuthMissing);
Services.obs.addObserver(this, this._topics.clientAuthIncorrect);
},
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/02b5bf73b39d480db8a8f85530aff89011386c17
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/02b5bf73b39d480db8a8f85530aff89011386c17
You're receiving this email because of your account on gitlab.torproject.org.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.11.0esr-13.0-1-build1
Pier Angelo Vendrame pushed new tag mullvad-browser-115.11.0esr-13.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullvad-browser-115.11.0esr-13.0-1-build1 You're receiving this email because of your account on gitlab.torproject.org. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.11.0esr-13.0-1-build1
Pier Angelo Vendrame pushed new tag base-browser-115.11.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-browser-115.11.0esr-13.0-1-build1 You're receiving this email because of your account on gitlab.torproject.org. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.11.0esr-13.5-1-build1
Pier Angelo Vendrame pushed new tag tor-browser-115.11.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-browser-115.11.0esr-13.5-1-build1 You're receiving this email because of your account on gitlab.torproject.org. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
