tbb-commits

Download

tbb-commits@lists.torproject.org

April 2024

1 participants
152 discussions

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI
by Dan Ballard (＠dan) 04 Apr '24

04 Apr '24

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<String>() 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<String> - 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<String> + 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/7e4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7e4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Bug 42195: Fix "Whats new URL"
by Dan Ballard (＠dan) 04 Apr '24

04 Apr '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 6b497d60 by clairehurst at 2024-04-04T12:25:17-07:00 fixup! Bug 42195: Fix "Whats new URL" Fix Whats New Url for dev/debug build add to whats new url, remove autoformatting - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -101,9 +101,18 @@ object SupportUtils { } fun getTorWhatsNewUrl(): String { - val alpha = if (BuildConfig.VERSION_NAME.contains('a')) "alpha-" else "" - val versionNumberNoDecimals = BuildConfig.VERSION_NAME.split('.').joinToString("") - return "https://blog.torproject.org/new-${alpha}release-tor-browser-${versionNumber…" + val fullVersionName: String = BuildConfig.VERSION_NAME // e.g. "115.2.1-beta (13.5a5)" + if (!fullVersionName.contains('(') || !fullVersionName.contains(')')) { + return "https://blog.torproject.org/" + } + val versionNumber: String = fullVersionName.substring( + fullVersionName.indexOf('(') + 1, + fullVersionName.indexOf(')'), + ) // e.g. "13.5a5" + val alpha: String = if (versionNumber.contains('a')) "alpha-" else "" + val versionNumberNoDecimals: String = + versionNumber.split('.').joinToString("") // e.g. "135a5" + return "https://blog.torproject.org/new-${alpha}release-tor-browser-${versionNumber…" // e.g. "https://blog.torproject.org/new-alpha-release-tor-browser-135a5/ } fun getMozillaPageUrl(page: MozillaPage, locale: Locale = Locale.getDefault()): String { View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6b4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6b4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

Jump to page: