[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-06-13 Thread Dan Ballard (@dan) via tor-commits


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/190065c7e400134a15cb5f29480703261598d2fb

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/190065c7e400134a15cb5f29480703261598d2fb
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-06-11 Thread Dan Ballard (@dan) via tor-commits


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 = 
value?.split("\n")?.filter { it.length > 4 }?.toTypedArray() ?: 
arrayOf()
 it.bridgesSource = BridgeSource.UserProvided
-it.bridgeBridgeStrings = value?.split("\r\n")?.toTypedArray() 
?: arrayOf()
+it.bridgeBridgeStrings = userProvidedLines
 getTorIntegration().setSettings(it, true, true)
 }
 }



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d483554e3c1b34ba0d64e9ec35647097d5080532

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d483554e3c1b34ba0d64e9ec35647097d5080532
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-06-07 Thread richard (@richard) via tor-commits


richard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / 
Applications / firefox-android


Commits:
1cf0ae40 by Dan Ballard at 2024-06-07T11:08:19-07:00
fixup! Add Tor integration and UI

Bug 42593: Also persisting of bridges set to off, support enabling bridges once 
a previous selection is remembered

- - - - -


2 changed files:

- fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt
- fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt


Changes:

=
fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt
=
@@ -103,7 +103,7 @@ class TorBridgeConfigFragment : PreferenceFragmentCompat() {
 
preference.context.components.torController.bridgeTransport = bridge
 previousTransportConfig = bridge
 updateCurrentConfiguredBridgePref(preference)
-context.components.torController.restartTor()
+preference.context.components.torController.restartTor()
 }
 true
 }


=
fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt
=
@@ -89,13 +89,13 @@ class TorControllerGV(
 }
 
 
-// Bridges Enabled is a cache variable. The TorController interface we are 
locked into at the
-// moment to support the TAS backend calls setting `bridgesEnabled = true` 
and setting
-// the bridge type seperately so to support that,
-// while at the same time it being invalid states to not submit them 
together to the TorSettings
-// backend where TorSettings.sys.mjs's #cleanupSettings will remove a lone 
bridgeEnabled
-// we thus have to hold it here to support the UI but not submit to the 
backend until
-// bridgeTransport is also set (below)
+// On a fresh install bridgeEnagled can be set to true without a valid 
bridgeSource
+// having been selected. After first use this will not happen because last 
selected bridge
+// will be remembered and reused.
+// However, on first use, submitting this to TorSettings is an invalid 
state.
+// TorSettings.sys.mjs's #cleanupSettings will remove a lone bridgeEnabled 
with no source
+// selected. Therefore we check and don't call setSettings if bridgeSource 
isn't selected
+// (when trying to enable). Disabeling is always valid.
 private var _bridgesEnabled: Boolean? = null
 override var bridgesEnabled: Boolean
 get() {
@@ -103,6 +103,12 @@ class TorControllerGV(
 }
 set(value) {
 _bridgesEnabled = value
+getTorSettings()?.let {
+if (!value || it.bridgesSource != BridgeSource.Invalid) {
+it.bridgesEnabled = value
+getTorIntegration().setSettings(it, true, true)
+}
+}
 }
 
 
@@ -146,8 +152,9 @@ class TorControllerGV(
 
 
 // Currently the UI takes a user provided string and sets this in one step 
so there is where we
-// actually set it.bridgesSource = BridgeSource.UserProvided, not above, 
as TorSettings.sys.mjs #cleanupSettings
-// could reject BridgeSource.UserProvided with no bridge strings
+// actually set it.bridgesSource = BridgeSource.UserProvided, not above,
+// as TorSettings.sys.mjs #cleanupSettings could reject 
BridgeSource.UserProvided
+// with no bridge strings
 override var userProvidedBridges: String?
 get() {
 return getTorSettings()?.bridgeBridgeStrings?.joinToString("\r\n")



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/1cf0ae407817280d9770d09560d289568a046a04

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/1cf0ae407817280d9770d09560d289568a046a04
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-05-15 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
110d8f18 by clairehurst at 2024-05-15T19:04:04+00:00
fixup! Add Tor integration and UI

- - - - -


4 changed files:

- fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt
- fenix/app/src/main/res/navigation/nav_graph.xml
- fenix/app/src/main/res/xml/preferences.xml


Changes:

=
fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
=
@@ -65,6 +65,7 @@ import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.perf.ProfilerViewModel
 import org.mozilla.fenix.settings.account.AccountUiView
 import org.mozilla.fenix.tor.QuickStartPreference
+import org.mozilla.fenix.tor.SecurityLevel
 import org.mozilla.fenix.tor.TorBridgeTransportConfig
 import org.mozilla.fenix.tor.TorEvents
 import org.mozilla.fenix.utils.Settings
@@ -537,6 +538,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 setupAmoCollectionOverridePreference(requireContext().settings())
 setupGeckoLogsPreference(requireContext().settings())
 setupAllowDomesticChinaFxaServerPreference()
+setupSecurityLevelPreference()
 setupHttpsOnlyPreferences()
 setupNotificationPreference()
 setupSearchPreference()
@@ -772,6 +774,19 @@ class SettingsFragment : PreferenceFragmentCompat() {
 }
 }
 
+@VisibleForTesting
+internal fun setupSecurityLevelPreference() {
+val securityLevelPreference =
+
requirePreference(R.string.pref_key_tor_security_level_settings)
+securityLevelPreference.summary = 
context?.settings()?.torSecurityLevel()?.let {
+when (it) {
+SecurityLevel.STANDARD -> 
getString(R.string.tor_security_level_standard_option)
+SecurityLevel.SAFER -> 
getString(R.string.tor_security_level_safer_option)
+SecurityLevel.SAFEST -> 
getString(R.string.tor_security_level_safest_option)
+}
+}
+}
+
 @VisibleForTesting
 internal fun setupHttpsOnlyPreferences() {
 val httpsOnlyPreference =


=
fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt
=
@@ -24,11 +24,6 @@ class TorSecurityLevelFragment : PreferenceFragmentCompat() {
 private val securityLevelRadioGroups = 
mutableListOf()
 private var previousSecurityLevel: SecurityLevel? = null
 
-override fun onResume() {
-super.onResume()
-showToolbar(getString(R.string.preferences_tor_security_level_options))
-}
-
 override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: 
String?) {
 setPreferencesFromResource(R.xml.tor_security_level_preferences, 
rootKey)
 


=
fenix/app/src/main/res/navigation/nav_graph.xml
=
@@ -956,7 +956,7 @@
 
+android:label="@string/preferences_tor_security_level_options" />
 
+android:title="@string/preferences_tor_security_level_options" />
 
 https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/110d8f1868b14b009d69b1a4e76fd6a69b21e866

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/110d8f1868b14b009d69b1a4e76fd6a69b21e866
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-05-14 Thread richard (@richard) via tor-commits


richard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / 
Applications / firefox-android


Commits:
6abe2084 by Richard Pospesel at 2024-05-14T18:44:55+00:00
fixup! Add Tor integration and UI

removed vestigal comment

- - - - -


1 changed file:

- fenix/app/src/main/AndroidManifest.xml


Changes:

=
fenix/app/src/main/AndroidManifest.xml
=
@@ -366,7 +366,6 @@
 android:value="androidx.startup"
 tools:node="remove" />
 
-
 
 
 



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6abe2084dea0bb314f5256f30fd16a0d17b378f1

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6abe2084dea0bb314f5256f30fd16a0d17b378f1
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-05-14 Thread Pier Angelo Vendrame (@pierov) via tor-commits


Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor 
Project / Applications / firefox-android


Commits:
7b6f9fcc by Pier Angelo Vendrame at 2024-05-14T10:14:58+02:00
fixup! Add Tor integration and UI

Bug 4 (Build): Use Lyrebird to provide WebTunnel PT Client

- - - - -


1 changed file:

- fenix/app/src/main/assets/common/torrc-defaults


Changes:

=
fenix/app/src/main/assets/common/torrc-defaults
=
@@ -4,7 +4,6 @@ AvoidDiskWrites 1
 Log notice stdout
 CookieAuthentication 1
 DormantCanceledByStartup 1
-ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec 
./libObfs4proxy.so
+ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit,webtunnel exec 
./libObfs4proxy.so
 ClientTransportPlugin snowflake exec ./libSnowflake.so
-ClientTransportPlugin webtunnel exec ./libWebtunnel.so
 ClientTransportPlugin conjure exec ./libConjure.so -registerURL 
https://registration.refraction.network/api



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7b6f9fccde0772cbd32269520fe3c05e4cbd76b9

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7b6f9fccde0772cbd32269520fe3c05e4cbd76b9
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-04-17 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
8cc03c8e by Dan Ballard at 2024-04-17T14:08:42-07:00
fixup! Add Tor integration and UI

Bug 42486: Fixing controller use of TorSettings so cleanupSettings doesn't 
reject partial states

- - - - -


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
=
@@ -88,15 +88,21 @@ class TorControllerGV(
 return getTorIntegration().getSettings()
 }
 
+
+// Bridges Enabled is a cache variable. The TorController interface we are 
locked into at the
+// moment to support the TAS backend calls setting `bridgesEnabled = true` 
and setting
+// the bridge type seperately so to support that,
+// while at the same time it being invalid states to not submit them 
together to the TorSettings
+// backend where TorSettings.sys.mjs's #cleanupSettings will remove a lone 
bridgeEnabled
+// we thus have to hold it here to support the UI but not submit to the 
backend until
+// bridgeTransport is also set (below)
+private var _bridgesEnabled: Boolean? = null
 override var bridgesEnabled: Boolean
 get() {
-return getTorSettings()?.bridgesEnabled ?: false
+return _bridgesEnabled ?: getTorSettings()?.bridgesEnabled ?: false
 }
 set(value) {
-getTorSettings()?.let {
-it.bridgesEnabled = value
-getTorIntegration().setSettings(it, true, true)
-}
+_bridgesEnabled = value
 }
 
 
@@ -119,9 +125,13 @@ class TorControllerGV(
 }
 set(value) {
 getTorSettings()?.let {
+it.bridgesEnabled = true
 if (value == TorBridgeTransportConfig.USER_PROVIDED) {
-it.bridgesSource = BridgeSource.BuiltIn
+// NOOP: all settings will be set in call to set 
userProvidedBridges and submited
+// at the same time to clear TorSettings.sys.mjs 
#cleanupSettings
+return
 } else {
+it.bridgesSource = BridgeSource.BuiltIn
 val bbt: BridgeBuiltinType = when (value) {
 TorBridgeTransportConfig.BUILTIN_OBFS4 -> 
BridgeBuiltinType.Obfs4
 TorBridgeTransportConfig.BUILTIN_MEEK_AZURE -> 
BridgeBuiltinType.MeekAzure
@@ -135,12 +145,16 @@ class TorControllerGV(
 }
 
 
+// Currently the UI takes a user provided string and sets this in one step 
so there is where we
+// actually set it.bridgesSource = BridgeSource.UserProvided, not above, 
as TorSettings.sys.mjs #cleanupSettings
+// could reject BridgeSource.UserProvided with no bridge strings
 override var userProvidedBridges: String?
 get() {
 return getTorSettings()?.bridgeBridgeStrings?.joinToString("\r\n")
 }
 set(value) {
 getTorSettings()?.let {
+it.bridgesSource = BridgeSource.UserProvided
 it.bridgeBridgeStrings = value?.split("\r\n")?.toTypedArray() 
?: arrayOf()
 getTorIntegration().setSettings(it, true, true)
 }



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/8cc03c8ec5d85b61ac16d60447f9e3ff08a695d9

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/8cc03c8ec5d85b61ac16d60447f9e3ff08a695d9
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-04-04 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
7e46e5e3 by clairehurst at 2024-04-04T20:16:41+00:00
fixup! Add Tor integration and UI

- - - - -


1 changed file:

- fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsFragment.kt


Changes:

=
fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsFragment.kt
=
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.tor
 
 import android.os.Bundle
@@ -8,15 +12,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.Components
-import org.mozilla.fenix.databinding.FragmentHomeBinding
-import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding
 import org.mozilla.fenix.databinding.TorBootstrapLoggerBinding
-import 
org.mozilla.fenix.databinding.TorNetworkSettingsBetaConnectionFeaturesBinding
-import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.tor.view.TorBootstrapLoggerViewHolder
 
-class TorLogsFragment(): Fragment(), TorLogs {
+class TorLogsFragment : Fragment(), TorLogs {
 
 private var entries = mutableListOf()
 internal var _binding: TorBootstrapLoggerBinding? = null
@@ -35,15 +35,17 @@ class TorLogsFragment(): Fragment(), TorLogs {
 
 components.torController.registerTorLogListener(this)
 
-val currentEntries = components.torController.logEntries
-.filter { it.second != null }
+val currentEntries = components.torController.logEntries.filter { 
it.second != null }
 .filter { !(it.second!!.startsWith("Circuit") && it.first == "ON") 
}
 // Keep synchronized with format in onTorStatusUpdate
 .flatMap { listOf("(${it.first}) '${it.second}'") }
 val entriesLen = currentEntries.size
-val subListOffset = if (entriesLen > 
TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES) 
TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES else entriesLen
-entries = currentEntries.subList((entriesLen - subListOffset), 
entriesLen) as MutableList
-val initLog = "---" + 
getString(R.string.tor_initializing_log) + "---"
+val subListOffset =
+if (entriesLen > TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES) 
TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES else entriesLen
+entries =
+currentEntries.subList((entriesLen - subListOffset), entriesLen) 
as MutableList
+val initLog =
+"---" + getString(R.string.tor_initializing_log) + 
"---"
 entries.add(0, initLog)
 
 with(binding.torBootstrapLogEntries) {



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7e46e5e3c7a3b8eb37bab035b35aba0499ed962a

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7e46e5e3c7a3b8eb37bab035b35aba0499ed962a
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-02-07 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
f276a2cb by clairehurst at 2024-02-07T23:25:03+00:00
fixup! Add Tor integration and UI

- - - - -


1 changed file:

- fenix/app/src/main/res/navigation/nav_graph.xml


Changes:

=
fenix/app/src/main/res/navigation/nav_graph.xml
=
@@ -683,10 +683,6 @@
 app:exitAnim="@anim/slide_out_left"
 app:popEnterAnim="@anim/slide_in_left"
 app:popExitAnim="@anim/slide_out_right" />
-app:enterAnim="@anim/slide_in_right"
-app:exitAnim="@anim/slide_out_left"
-app:popEnterAnim="@anim/slide_in_left"
-app:popExitAnim="@anim/slide_out_right" />
 https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/f276a2cb4bb8d67633ebb1635d52353a8c919905

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/f276a2cb4bb8d67633ebb1635d52353a8c919905
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-01-31 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
54d46f59 by Dan Ballard at 2024-01-31T12:42:11-08:00
fixup! Add Tor integration and UI

Bug 42252: Fix safely using iterators while possibly modifying List

- - - - -


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
=
@@ -143,28 +143,28 @@ class TorControllerGV(
 // TorEvents
 override fun onTorConnecting() {
 synchronized(torListeners) {
-torListeners.forEach { it.onTorConnecting() }
+torListeners.toList().forEach { it.onTorConnecting() }
 }
 }
 
 // TorEvents
 override fun onTorConnected() {
 synchronized(torListeners) {
-torListeners.forEach { it.onTorConnected() }
+torListeners.toList().forEach { it.onTorConnected() }
 }
 }
 
 // TorEvents
 override fun onTorStatusUpdate(entry: String?, status: String?) {
 synchronized(torListeners) {
-torListeners.forEach { it.onTorStatusUpdate(entry, status) }
+torListeners.toList().forEach { it.onTorStatusUpdate(entry, 
status) }
 }
 }
 
 // TorEvents
 override fun onTorStopped() {
 synchronized(torListeners) {
-torListeners.forEach { it.onTorStopped() }
+torListeners.toList().forEach { it.onTorStopped() }
 }
 }
 



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/54d46f592b4b69ab6c8efd2be8138c1930d89c9f

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/54d46f592b4b69ab6c8efd2be8138c1930d89c9f
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2024-01-29 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
faf7e9bd by clairehurst at 2024-01-29T16:07:17-07:00
fixup! Add Tor integration and UI

- - - - -


30 changed files:

- − fenix/app/src/beta/ic_launcher_monochrome-playstore.png
- − fenix/app/src/debug/ic_launcher-web.png
- − fenix/app/src/main/ic_launcher-web.png
- 
fenix/app/src/main/java/org/mozilla/fenix/experiments/view/ResearchSurfaceSurvey.kt
- − fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.png
- − fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.png
- − fenix/app/src/main/res/drawable-hdpi/onboarding_default_browser.webp
- − fenix/app/src/main/res/drawable-hdpi/onboarding_notification.webp
- − fenix/app/src/main/res/drawable-hdpi/onboarding_sync.webp
- − fenix/app/src/main/res/drawable-ldrtl/onboarding_dark_theme.xml
- − fenix/app/src/main/res/drawable-ldrtl/onboarding_light_theme.xml
- − fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.png
- − fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.png
- − fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml
- − fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_normal.png
- − fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.png
- − fenix/app/src/main/res/drawable-xhdpi/onboarding_default_browser.webp
- − fenix/app/src/main/res/drawable-xhdpi/onboarding_notification.webp
- − fenix/app/src/main/res/drawable-xhdpi/onboarding_sync.webp
- − fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_normal.png
- − fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.png
- − fenix/app/src/main/res/drawable-xxhdpi/onboarding_default_browser.webp
- − fenix/app/src/main/res/drawable-xxhdpi/onboarding_notification.webp
- − fenix/app/src/main/res/drawable-xxhdpi/onboarding_sync.webp
- − fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_normal.png
- − fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.png
- − fenix/app/src/main/res/drawable/ic_firefox.xml
- − fenix/app/src/main/res/drawable/ic_launcher_monochrome.xml
- − fenix/app/src/main/res/drawable/ic_scan.xml
- − fenix/app/src/main/res/drawable/ic_wordmark_logo.png


The diff was not included because it is too large.


View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/faf7e9bd219e7815db2de00ad1e0913079df5f32

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/faf7e9bd219e7815db2de00ad1e0913079df5f32
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2023-12-21 Thread Pier Angelo Vendrame (@pierov) via tor-commits


Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor 
Project / Applications / firefox-android


Commits:
4fbe1f59 by Pier Angelo Vendrame at 2023-12-21T21:58:05+00:00
fixup! Add Tor integration and UI

Bug 42248: Allow GeckoView to launch tor

Add a torrc-defaults with the configuration of pluggable transports.
We should remove it once we remove tor-android-service and
tor-onion-proxy-library, and include it in their replacement.

- - - - -


1 changed file:

- + fenix/app/src/main/assets/common/torrc-defaults


Changes:

=
fenix/app/src/main/assets/common/torrc-defaults
=
@@ -0,0 +1,10 @@
+## torrc-defaults for Tor Browser for Android
+AvoidDiskWrites 1
+# (stderr|stdout|syslog|file FILENAME).
+Log notice stdout
+CookieAuthentication 1
+DormantCanceledByStartup 1
+ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec 
./libObfs4proxy.so
+ClientTransportPlugin snowflake exec ./libSnowflake.so
+ClientTransportPlugin webtunnel exec ./libWebtunnel.so
+ClientTransportPlugin conjure exec ./libConjure.so -registerURL 
https://registration.refraction.network/api



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/4fbe1f59bf766ebb302dd769ae0c9c450d9341fd

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/4fbe1f59bf766ebb302dd769ae0c9c450d9341fd
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2023-12-21 Thread Pier Angelo Vendrame (@pierov) via tor-commits


Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor 
Project / Applications / firefox-android


Commits:
a61486e2 by Pier Angelo Vendrame at 2023-12-21T17:15:26+00:00
fixup! Add Tor integration and UI

Bug 42324: Onion location does not work after a browser restart

- - - - -


2 changed files:

- 
android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt


Changes:

=
android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
=
@@ -798,11 +798,7 @@ class GeckoEngine(
 }
 override var prioritizeOnions: Boolean
 get() = runtime.settings.prioritizeOnions
-set(value) {
-value.let {
-runtime.settings.prioritizeOnions = it
-}
-}
+set(value) { runtime.settings.prioritizeOnions = value }
 }.apply {
 defaultSettings?.let {
 this.javascriptEnabled = it.javascriptEnabled


=
fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
=
@@ -485,7 +485,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
 }
 
 preferencePrioritizeOnions?.setOnPreferenceChangeListener { 
preference, newValue ->
-
preference.context.components.core.engine.settings.prioritizeOnions = newValue
+preference.context.settings().preferences.edit()
+.putBoolean(preference.key, newValue).apply()
+requireComponents.core.engine.settings.prioritizeOnions = newValue
 true
 }
 



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/a61486e240b278dac4183557b183291d178adffc

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/a61486e240b278dac4183557b183291d178adffc
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/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI

2023-11-16 Thread Dan Ballard (@dan) via tor-commits


Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project 
/ Applications / firefox-android


Commits:
a5d2aca3 by Pier Angelo Vendrame at 2023-11-16T17:30:37+00:00
fixup! Add Tor integration and UI

Bug 42285: Update the gitignore to use the correct paths for tor stuff

- - - - -


1 changed file:

- .gitignore


Changes:

=
.gitignore
=
@@ -104,7 +104,7 @@ DerivedData
 .experimenter.json
 
 # Tor libraries for local builds
-app/android-release.aar
-app/jsocksAndroid-release.aar
-app/service-release.aar
-app/universal-0.0.3.jar
+fenix/app/android-release.aar
+fenix/app/jsocksAndroid-release.aar
+fenix/app/service-release.aar
+fenix/app/universal-0.0.3.jar



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/a5d2aca35d8bea28cac09f247d951af5fb335dfd

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/a5d2aca35d8bea28cac09f247d951af5fb335dfd
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