JMR-dev/LibreMail
1
0
Fork 0
Code Issues 40 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

Merge main into fix-219-empty-state-flash

Browse Source
This commit is contained in:
Jason Ross
2026-07-03 20:26:56 -05:00
committed by GitHub
parent e190dc3191 ea470e065c
commit 5e581d4b52
5 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/test/kotlin/org/libremail/reporting/CrashReporterInstallTest.kt
+7 -2
View File
@@ -4,12 +4,14 @@ package org.libremail.reporting
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import kotlinx.coroutines.flow.flowOf
import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import org.libremail.data.settings.SettingsRepository
import org.libremail.domain.repository.AccountRepository
import kotlin.test.assertEquals
import kotlin.test.assertTrue
@@ -30,6 +32,9 @@ class CrashReporterInstallTest {
every { versionCode } returns 1L
}
private val settingsRepository = mockk<SettingsRepository>()
private val accountRepository = mockk<AccountRepository> {
every { observeAccounts() } returns flowOf(emptyList())
}
private var original: Thread.UncaughtExceptionHandler? = null
@@ -49,7 +54,7 @@ class CrashReporterInstallTest {
Thread.setDefaultUncaughtExceptionHandler(previous)
val store = ReportStore(tempFolder.root)
val buffer = RingLogBuffer()
val collector = DiagnosticsCollector(appVersion, settingsRepository, buffer)
val collector = DiagnosticsCollector(appVersion, settingsRepository, accountRepository, buffer)
val reporter = CrashReporter(collector, store, buffer)
reporter.install()
@@ -70,7 +75,7 @@ class CrashReporterInstallTest {
Thread.setDefaultUncaughtExceptionHandler(mockk(relaxed = true))
val store = ReportStore(tempFolder.root)
val buffer = RingLogBuffer()
val collector = DiagnosticsCollector(appVersion, settingsRepository, buffer)
val collector = DiagnosticsCollector(appVersion, settingsRepository, accountRepository, buffer)
val reporter = CrashReporter(collector, store, buffer)
reporter.install()
val installed = requireNotNull(Thread.getDefaultUncaughtExceptionHandler())
app/src/test/kotlin/org/libremail/reporting/CrashReporterTest.kt
+4 -2
View File
@@ -7,6 +7,7 @@ import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import org.libremail.data.settings.SettingsRepository
import org.libremail.domain.repository.AccountRepository
import kotlin.test.assertEquals
import kotlin.test.assertTrue
@@ -20,12 +21,13 @@ class CrashReporterTest {
every { versionCode } returns 1L
}
private val settingsRepository = mockk<SettingsRepository>()
private val accountRepository = mockk<AccountRepository>()
@Test
fun `persisting a forced crash saves a report offered on next launch`() {
val store = ReportStore(tempFolder.root)
val buffer = RingLogBuffer()
val collector = DiagnosticsCollector(appVersion, settingsRepository, buffer)
val collector = DiagnosticsCollector(appVersion, settingsRepository, accountRepository, buffer)
val reporter = CrashReporter(collector, store, buffer)
reporter.persist(IllegalStateException("forced crash"))
@@ -48,7 +50,7 @@ class CrashReporterTest {
// written to the local store. Nothing here can send data off the device.
val store = ReportStore(tempFolder.root)
val buffer = RingLogBuffer()
val collector = DiagnosticsCollector(appVersion, settingsRepository, buffer)
val collector = DiagnosticsCollector(appVersion, settingsRepository, accountRepository, buffer)
val reporter = CrashReporter(collector, store, buffer)
reporter.persist(RuntimeException("boom"))
app/src/test/kotlin/org/libremail/reporting/DiagnosticsCollectorTest.kt
+39 -1
View File
@@ -9,6 +9,11 @@ import org.junit.Test
import org.libremail.data.settings.AppSettings
import org.libremail.data.settings.FetchPolicy
import org.libremail.data.settings.SettingsRepository
import org.libremail.domain.model.Account
import org.libremail.domain.model.AuthType
import org.libremail.domain.model.MailSecurity
import org.libremail.domain.model.ServerConfig
import org.libremail.domain.repository.AccountRepository
import kotlin.test.assertEquals
import kotlin.test.assertNull
import kotlin.test.assertTrue
@@ -20,8 +25,11 @@ class DiagnosticsCollectorTest {
every { versionCode } returns 42L
}
private val settingsRepository = mockk<SettingsRepository>()
private val accountRepository = mockk<AccountRepository> {
every { observeAccounts() } returns flowOf(emptyList())
}
private val logBuffer = RingLogBuffer()
private val collector = DiagnosticsCollector(appVersion, settingsRepository, logBuffer)
private val collector = DiagnosticsCollector(appVersion, settingsRepository, accountRepository, logBuffer)
@Test
fun `crash report includes stack trace and app version`() = runTest {
@@ -78,4 +86,34 @@ class DiagnosticsCollectorTest {
assertTrue(report.logs.any { it.contains("hello-breadcrumb") })
}
@Test
fun `manual report summarizes accounts as PII-free provider labels`() = runTest {
every { settingsRepository.settings } returns flowOf(AppSettings())
every { accountRepository.observeAccounts() } returns flowOf(
listOf(
account("a@example.com", AuthType.OAUTH_OUTLOOK, "outlook.office365.com"),
account("b@gmail.com", AuthType.PASSWORD_IMAP, "imap.gmail.com"),
account("c@corp.example", AuthType.PASSWORD_IMAP, "mail.corp.example"),
),
)
val report = collector.collectManual()
assertEquals(
listOf("Outlook (OAUTH_OUTLOOK)", "Gmail (PASSWORD_IMAP)", "Other (PASSWORD_IMAP)"),
report.accounts,
)
// No email address or server hostname leaks — a custom host buckets to "Other".
assertTrue(report.accounts.none { it.contains("@") || it.contains("example") || it.contains(".com") })
}
private fun account(email: String, authType: AuthType, imapHost: String) = Account(
id = "id:$email",
email = email,
displayName = email,
authType = authType,
imap = ServerConfig(imapHost, 993, MailSecurity.SSL_TLS),
smtp = ServerConfig(imapHost, 587, MailSecurity.STARTTLS),
)
}