Closes #5847: Use IO thread when submitting crash report
parent
78bc829735
commit
e9760fb185
|
@ -5,6 +5,10 @@
|
||||||
package org.mozilla.fenix.crashes
|
package org.mozilla.fenix.crashes
|
||||||
|
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.GlobalScope
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
import mozilla.components.browser.session.Session
|
import mozilla.components.browser.session.Session
|
||||||
import mozilla.components.lib.crash.Crash
|
import mozilla.components.lib.crash.Crash
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
@ -29,22 +33,25 @@ class CrashReporterController(
|
||||||
* Closes the crash reporter fragment and tries to recover the session.
|
* Closes the crash reporter fragment and tries to recover the session.
|
||||||
*
|
*
|
||||||
* @param sendCrash If true, submit a crash report.
|
* @param sendCrash If true, submit a crash report.
|
||||||
|
* @return Job if report is submitted through an IO thread, null otherwise
|
||||||
*/
|
*/
|
||||||
fun handleCloseAndRestore(sendCrash: Boolean) {
|
fun handleCloseAndRestore(sendCrash: Boolean): Job? {
|
||||||
submitReportIfNecessary(sendCrash)
|
val job = submitReportIfNecessary(sendCrash)
|
||||||
|
|
||||||
components.useCases.sessionUseCases.crashRecovery.invoke()
|
components.useCases.sessionUseCases.crashRecovery.invoke()
|
||||||
navController.popBackStack()
|
navController.popBackStack()
|
||||||
|
return job
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Closes the crash reporter fragment and the tab.
|
* Closes the crash reporter fragment and the tab.
|
||||||
*
|
*
|
||||||
* @param sendCrash If true, submit a crash report.
|
* @param sendCrash If true, submit a crash report.
|
||||||
|
* @return Job if report is submitted through an IO thread, null otherwise
|
||||||
*/
|
*/
|
||||||
fun handleCloseAndRemove(sendCrash: Boolean) {
|
fun handleCloseAndRemove(sendCrash: Boolean): Job? {
|
||||||
session ?: return
|
session ?: return null
|
||||||
submitReportIfNecessary(sendCrash)
|
val job = submitReportIfNecessary(sendCrash)
|
||||||
|
|
||||||
components.useCases.tabsUseCases.removeTab(session)
|
components.useCases.tabsUseCases.removeTab(session)
|
||||||
components.useCases.sessionUseCases.crashRecovery.invoke()
|
components.useCases.sessionUseCases.crashRecovery.invoke()
|
||||||
|
@ -52,19 +59,28 @@ class CrashReporterController(
|
||||||
R.id.crashReporterFragment,
|
R.id.crashReporterFragment,
|
||||||
CrashReporterFragmentDirections.actionCrashReporterFragmentToHomeFragment()
|
CrashReporterFragmentDirections.actionCrashReporterFragmentToHomeFragment()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
return job
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Submits the crash report if the "Send crash" checkbox was checked and the setting is enabled.
|
* Submits the crash report if the "Send crash" checkbox was checked and the setting is enabled.
|
||||||
|
*
|
||||||
|
* @param sendCrash If true, submit a crash report.
|
||||||
|
* @return Job if report is submitted through an IO thread, null otherwise
|
||||||
*/
|
*/
|
||||||
private fun submitReportIfNecessary(sendCrash: Boolean) {
|
private fun submitReportIfNecessary(sendCrash: Boolean): Job? {
|
||||||
|
var job: Job? = null
|
||||||
val didSubmitReport = if (sendCrash && settings.isCrashReportingEnabled) {
|
val didSubmitReport = if (sendCrash && settings.isCrashReportingEnabled) {
|
||||||
components.analytics.crashReporter.submitReport(crash)
|
job = GlobalScope.launch(Dispatchers.IO) {
|
||||||
|
components.analytics.crashReporter.submitReport(crash)
|
||||||
|
}
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
components.analytics.metrics.track(Event.CrashReporterClosed(didSubmitReport))
|
components.analytics.metrics.track(Event.CrashReporterClosed(didSubmitReport))
|
||||||
|
return job
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import io.mockk.mockk
|
||||||
import io.mockk.verify
|
import io.mockk.verify
|
||||||
import mozilla.components.browser.session.Session
|
import mozilla.components.browser.session.Session
|
||||||
import mozilla.components.lib.crash.Crash
|
import mozilla.components.lib.crash.Crash
|
||||||
|
import mozilla.components.support.test.ext.joinBlocking
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
@ -49,7 +50,7 @@ class CrashReporterControllerTest {
|
||||||
@Test
|
@Test
|
||||||
fun `handle close and restore tab`() {
|
fun `handle close and restore tab`() {
|
||||||
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
||||||
controller.handleCloseAndRestore(sendCrash = false)
|
controller.handleCloseAndRestore(sendCrash = false)?.joinBlocking()
|
||||||
|
|
||||||
verify { components.analytics.metrics.track(Event.CrashReporterClosed(false)) }
|
verify { components.analytics.metrics.track(Event.CrashReporterClosed(false)) }
|
||||||
verify { components.useCases.sessionUseCases.crashRecovery.invoke() }
|
verify { components.useCases.sessionUseCases.crashRecovery.invoke() }
|
||||||
|
@ -59,7 +60,7 @@ class CrashReporterControllerTest {
|
||||||
@Test
|
@Test
|
||||||
fun `handle close and remove tab`() {
|
fun `handle close and remove tab`() {
|
||||||
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
||||||
controller.handleCloseAndRemove(sendCrash = false)
|
controller.handleCloseAndRemove(sendCrash = false)?.joinBlocking()
|
||||||
|
|
||||||
verify { components.analytics.metrics.track(Event.CrashReporterClosed(false)) }
|
verify { components.analytics.metrics.track(Event.CrashReporterClosed(false)) }
|
||||||
verify { components.useCases.tabsUseCases.removeTab(session) }
|
verify { components.useCases.tabsUseCases.removeTab(session) }
|
||||||
|
@ -72,7 +73,7 @@ class CrashReporterControllerTest {
|
||||||
every { settings.isCrashReportingEnabled } returns false
|
every { settings.isCrashReportingEnabled } returns false
|
||||||
|
|
||||||
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
||||||
controller.handleCloseAndRestore(sendCrash = true)
|
controller.handleCloseAndRestore(sendCrash = true)?.joinBlocking()
|
||||||
|
|
||||||
verify { components.analytics.metrics.track(Event.CrashReporterClosed(false)) }
|
verify { components.analytics.metrics.track(Event.CrashReporterClosed(false)) }
|
||||||
}
|
}
|
||||||
|
@ -82,7 +83,7 @@ class CrashReporterControllerTest {
|
||||||
every { settings.isCrashReportingEnabled } returns true
|
every { settings.isCrashReportingEnabled } returns true
|
||||||
|
|
||||||
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
val controller = CrashReporterController(crash, session, navContoller, components, settings)
|
||||||
controller.handleCloseAndRestore(sendCrash = true)
|
controller.handleCloseAndRestore(sendCrash = true)?.joinBlocking()
|
||||||
|
|
||||||
verify { components.analytics.crashReporter.submitReport(crash) }
|
verify { components.analytics.crashReporter.submitReport(crash) }
|
||||||
verify { components.analytics.metrics.track(Event.CrashReporterClosed(true)) }
|
verify { components.analytics.metrics.track(Event.CrashReporterClosed(true)) }
|
||||||
|
|
Loading…
Reference in New Issue