Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VPN-6629: Fix debug daemon timer on Android #9951

Merged
merged 1 commit into from
Oct 14, 2024
Merged

VPN-6629: Fix debug daemon timer on Android #9951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions android/daemon/src/main/java/org/mozilla/firefox/vpn/daemon/VPNService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,23 @@ class VPNService : android.net.VpnService() {
private var mCityname = ""
private var mBackgroundPingTimerMSec: Long = 3 * 60 * 60 * 1000 // 3 hours, in milliseconds
private var mShortTimerBackgroundPingMSec: Long = 3 * 60 * 1000 // 3 minutes, in milliseconds
private val mMetricsTimer: CountDownTimer = object : CountDownTimer(
if (isUsingShortTimerSessionPing) mShortTimerBackgroundPingMSec else mBackgroundPingTimerMSec,
if (isUsingShortTimerSessionPing) mShortTimerBackgroundPingMSec / 4 else mBackgroundPingTimerMSec / 4,
) {
override fun onTick(millisUntilFinished: Long) {}

// `isUsingShortTimerSessionPing` is not reliable until mConfig has been set, so it cannot be set upon
// class initialization (VPN-6629). And this cannot be a lazy var, as that caused a crash (PR #8555)
// Thus, the interval ticks are for the debug timer mode (but `isUsingShortTimerSessionPing` determines
// if a ping is actually sent), and countdown finishes are for typical sending times.
private val mMetricsTimer: CountDownTimer = object : CountDownTimer(mBackgroundPingTimerMSec, mShortTimerBackgroundPingMSec) {
override fun onTick(millisUntilFinished: Long) {
// We want to skip the first onTick, which is called as the timer is started.
// (The Start ping is sent then, so there is no need for a Timer ping.)
var wasTimerJustStarted = (millisUntilFinished == mBackgroundPingTimerMSec)
if (!wasTimerJustStarted && isUsingShortTimerSessionPing && shouldRecordTimerAndEndMetrics) {
Log.i(tag, "Sending daemon_timer ping (on short timer debug schedule)")
Pings.daemonsession.submit(
Pings.daemonsessionReasonCodes.daemonTimer,
)
}
}
override fun onFinish() {
Log.i(tag, "Sending daemon_timer ping")
if (shouldRecordTimerAndEndMetrics) {
Expand Down
Loading