Skip to content

Fail HeartbeatWorker cleanly when session is inactive #3552

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

Merged
avazirna merged 3 commits into from
Mar 3, 2026
Merged

Fail HeartbeatWorker cleanly when session is inactive #3552

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92b2980
Fail HeartbeatWorker when session expires
avazirna Feb 16, 2026
6927be7
Lint
avazirna Mar 2, 2026
4cd7db0
Merge branch 'master' into fix-heartbeat-exception-logging-on-session…
avazirna Mar 2, 2026
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
16 changes: 10 additions & 6 deletions app/src/org/commcare/heartbeat/HeartbeatWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.content.Context
import androidx.work.Worker
import androidx.work.WorkerParameters
import org.commcare.CommCareApplication
import org.commcare.util.LogTypes
import org.javarosa.core.services.Logger
import java.io.IOException
import java.lang.IllegalStateException
Expand All @@ -13,13 +12,18 @@ import java.net.UnknownHostException
/**
* @author $|-|!˅@M
*/
class HeartbeatWorker(context: Context, workerParams: WorkerParameters):
Worker(context, workerParams) {
class HeartbeatWorker(
context: Context,
workerParams: WorkerParameters,
) : Worker(context, workerParams) {
private val requester = CommCareApplication.instance().heartbeatRequester

override fun doWork(): Result {
try {
if (CommCareApplication.instance().session.isActive &&
!CommCareApplication.instance().session.heartbeatSucceededForSession()) {
if (!CommCareApplication.isSessionActive()) {
return Result.failure()
}
if (!CommCareApplication.instance().session.heartbeatSucceededForSession()) {
requester.makeRequest()
}
} catch (e: Exception) {
Expand All @@ -31,7 +35,7 @@ class HeartbeatWorker(context: Context, workerParams: WorkerParameters):
else -> {
Logger.exception(
"Encountered unexpected exception during heartbeat communications, stopping the heartbeat thread.",
e
e,
)
Result.failure()
}
Expand Down
Loading