mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
feat: add retention period to meshLog. Defaults to 7 days, with a settings dropdown to change (#4078)
This commit is contained in:
parent
dc9e51f18f
commit
6f338c4cde
12 changed files with 396 additions and 8 deletions
|
|
@ -18,7 +18,15 @@
|
|||
package com.geeksville.mesh
|
||||
|
||||
import android.app.Application
|
||||
import androidx.hilt.work.HiltWorkerFactory
|
||||
import androidx.work.Configuration
|
||||
import androidx.work.ExistingPeriodicWorkPolicy
|
||||
import androidx.work.ExistingWorkPolicy
|
||||
import androidx.work.OneTimeWorkRequestBuilder
|
||||
import androidx.work.PeriodicWorkRequestBuilder
|
||||
import androidx.work.WorkManager
|
||||
import co.touchlab.kermit.Logger
|
||||
import com.geeksville.mesh.worker.MeshLogCleanupWorker
|
||||
import dagger.hilt.EntryPoint
|
||||
import dagger.hilt.InstallIn
|
||||
import dagger.hilt.android.EntryPointAccessors
|
||||
|
|
@ -29,6 +37,9 @@ import kotlinx.coroutines.Dispatchers
|
|||
import kotlinx.coroutines.launch
|
||||
import org.meshtastic.core.database.DatabaseManager
|
||||
import org.meshtastic.core.prefs.mesh.MeshPrefs
|
||||
import org.meshtastic.core.prefs.meshlog.MeshLogPrefs
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
|
||||
/**
|
||||
* The main application class for Meshtastic.
|
||||
|
|
@ -38,16 +49,65 @@ import org.meshtastic.core.prefs.mesh.MeshPrefs
|
|||
* user preferences.
|
||||
*/
|
||||
@HiltAndroidApp
|
||||
class MeshUtilApplication : Application() {
|
||||
class MeshUtilApplication :
|
||||
Application(),
|
||||
Configuration.Provider {
|
||||
@Inject lateinit var workerFactory: HiltWorkerFactory
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
initializeMaps(this)
|
||||
|
||||
// Schedule periodic MeshLog cleanup
|
||||
scheduleMeshLogCleanup()
|
||||
enqueueImmediateCleanupIfNeeded()
|
||||
|
||||
// Initialize DatabaseManager asynchronously with current device address so DAO consumers have an active DB
|
||||
val entryPoint = EntryPointAccessors.fromApplication(this, AppEntryPoint::class.java)
|
||||
CoroutineScope(Dispatchers.Default).launch {
|
||||
entryPoint.databaseManager().init(entryPoint.meshPrefs().deviceAddress)
|
||||
}
|
||||
}
|
||||
|
||||
private fun scheduleMeshLogCleanup() {
|
||||
val cleanupRequest =
|
||||
PeriodicWorkRequestBuilder<MeshLogCleanupWorker>(
|
||||
repeatInterval = 1,
|
||||
repeatIntervalTimeUnit = TimeUnit.HOURS,
|
||||
)
|
||||
.build()
|
||||
|
||||
WorkManager.getInstance(this)
|
||||
.enqueueUniquePeriodicWork(
|
||||
MeshLogCleanupWorker.WORK_NAME,
|
||||
ExistingPeriodicWorkPolicy.UPDATE,
|
||||
cleanupRequest,
|
||||
)
|
||||
}
|
||||
|
||||
private fun enqueueImmediateCleanupIfNeeded() {
|
||||
// Use entry point to access prefs outside of Hilt graph
|
||||
val entryPoint = EntryPointAccessors.fromApplication(this, AppEntryPoint::class.java)
|
||||
val meshLogPrefs = entryPoint.meshLogPrefs()
|
||||
val retentionDays = meshLogPrefs.retentionDays
|
||||
if (!meshLogPrefs.loggingEnabled || retentionDays == MeshLogPrefs.NEVER_CLEAR_RETENTION_DAYS) {
|
||||
Logger.i {
|
||||
"Skipping immediate MeshLog cleanup; " +
|
||||
"loggingEnabled=${meshLogPrefs.loggingEnabled}, retention=$retentionDays"
|
||||
}
|
||||
return
|
||||
}
|
||||
Logger.i { "Enqueuing immediate MeshLog cleanup with retentionDays=$retentionDays" }
|
||||
WorkManager.getInstance(this)
|
||||
.enqueueUniqueWork(
|
||||
"${MeshLogCleanupWorker.WORK_NAME}_immediate",
|
||||
ExistingWorkPolicy.REPLACE,
|
||||
OneTimeWorkRequestBuilder<MeshLogCleanupWorker>().build(),
|
||||
)
|
||||
}
|
||||
|
||||
override val workManagerConfiguration: Configuration
|
||||
get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
|
||||
}
|
||||
|
||||
@EntryPoint
|
||||
|
|
@ -56,6 +116,8 @@ interface AppEntryPoint {
|
|||
fun databaseManager(): DatabaseManager
|
||||
|
||||
fun meshPrefs(): MeshPrefs
|
||||
|
||||
fun meshLogPrefs(): MeshLogPrefs
|
||||
}
|
||||
|
||||
fun logAssert(executeReliableWrite: Boolean) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue