Refactor: Refactored background persistence behavior (SessionKeepAliveService), NotificationHelper, and LogManager.

app/build.gradle

@@ -8,6 +8,8 @@ plugins {
     alias(libs.plugins.spotless)
 }
 
+apply from: rootProject.file('gradle/collectLogTags.gradle')
+
 /*
 abstract class InstallVulkanValidationLayerTask extends DefaultTask {
     @Input
@@ -59,6 +61,10 @@ task checkSubmodules {
 
 preBuild.dependsOn(checkSubmodules)
 
+tasks.named('preBuild') {
+    dependsOn 'collectLogTags'
+}
+
 /*
 def installVulkanValidationLayer = tasks.register("installVulkanValidationLayer", InstallVulkanValidationLayerTask) {
     layerVersion.set("1.4.341.0")
@@ -205,11 +211,13 @@ android {
     sourceSets {
         main {
             java.srcDirs = [
+//                    'src/main/java',  // Needed for Android Studio
                     'src/main/app',
                     'src/main/feature',
                     'src/main/sharedmemory',
                     'src/main/runtime',
-                    'src/main/shared'
+                    'src/main/shared',
+                    'build/generated/source/logtags'    // Generated by collectLogTags.gradle
             ]
         }
     }
@@ -229,7 +237,7 @@ android {
 }
 
 dependencies {
-    // debugImplementation "com.squareup.leakcanary:leakcanary-android:2.14"
+//    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.14"
 
     implementation libs.okhttp
     implementation libs.okhttpDnsOverHttps
@@ -277,6 +285,7 @@ dependencies {
     implementation files('libs/MidiSynth/MidiSynth.jar')
     implementation libs.recyclerview
     implementation libs.coreKtx
+    implementation(libs.lifecycleProcess)    // New = compilation errors / gradle plugin update requirement.
 
 
     implementation 'com.android.ndk.thirdparty:openssl:1.1.1q-beta-1'

app/src/main/AndroidManifest.xml

@@ -36,6 +36,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_LOGS" tools:ignore="ProtectedPermissions"/>
     <uses-permission
         android:name="android.permission.WRITE_SECURE_SETTINGS"
         tools:ignore="ProtectedPermissions" />

app/src/main/app/PluviaApp.kt

@@ -11,13 +11,15 @@ import com.winlator.cmod.feature.stores.steam.events.EventDispatcher
 import com.winlator.cmod.feature.stores.steam.service.SteamService
 import com.winlator.cmod.feature.stores.steam.utils.PrefManager
 import com.winlator.cmod.runtime.display.XServerDisplayActivity
+import com.winlator.cmod.runtime.system.LogManager
 import com.winlator.cmod.shared.android.RefreshRateUtils
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 import java.io.File
 
 @HiltAndroidApp
@@ -40,6 +42,16 @@ class PluviaApp : Application() {
             .init(this)
         scheduleColdStartWarmups()
 
+        // Initialize Timber in debug builds for app wide logging.
+        // If 'BuildConfig' give error, ignore it.
+        // The file needed will be autogenerated when building the apk.
+        if (com.winlator.cmod.BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree());
+        }
+
+        // Initialize the LogManager context in case a fallback is needed.
+        LogManager.init(this.applicationContext)
+
         Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
             Log.e("PluviaApp", "CRASH in thread ${thread.name}", throwable)
         }

app/src/main/app/shell/UnifiedActivity.kt

@@ -914,6 +914,7 @@ class UnifiedActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         instance = this
         super.onCreate(savedInstanceState)
+
         if (!SetupWizardActivity.isSetupComplete(this) || !ImageFs.find(this).isUpToDate) {
             startActivity(
                 Intent(this, SetupWizardActivity::class.java)

app/src/main/cpp/winlator/xconnector_epoll.c

@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include <sys/time.h>
 
 #define printf(...)                                                            \
   __android_log_print(ANDROID_LOG_DEBUG, "System.out", __VA_ARGS__);
@@ -74,6 +75,10 @@ Java_com_winlator_cmod_runtime_display_connector_XConnectorEpoll_doEpollIndefini
     if (events[i].data.fd == serverFd) {
       int clientFd = accept(serverFd, NULL, NULL);
       if (clientFd >= 0) {
+        // Set a write timeout to avoid hanging the XServer if a client is stopped (SIGSTOP)
+        struct timeval tv = {.tv_sec = 2, .tv_usec = 0};
+        setsockopt(clientFd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+
         if (addClientToEpoll) {
           struct epoll_event event;
           event.data.fd = clientFd;

app/src/main/feature/settings/debug/DebugFragment.kt

@@ -1,5 +1,6 @@
 // Settings > Debug fragment — hosts DebugScreen via ComposeView.
 package com.winlator.cmod.feature.settings
+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -8,11 +9,11 @@ import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
@@ -25,6 +26,8 @@ import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.winlator.cmod.R
 import com.winlator.cmod.app.config.SettingsConfig
+import com.winlator.cmod.runtime.system.GeneratedLogTags
+import com.winlator.cmod.runtime.system.LogManager
 import com.winlator.cmod.app.shell.UnifiedActivity
 import com.winlator.cmod.shared.io.AssetPaths
 import com.winlator.cmod.shared.io.FileUtils
@@ -70,6 +73,31 @@ class DebugFragment : Fragment() {
                             state = debugState,
                             wineChannelOptions = wineChannelOptions,
                             wineClassOptions = SettingsConfig.WINE_DEBUG_CLASSES,
+                            onLoggingEnabledChanged = { checked ->
+                                preferences.edit {
+                                    putBoolean("enable_application_logging", checked)
+                                    if (!checked) {
+                                        putBoolean("enable_app_debug", false)
+                                        putBoolean("enable_input_logs", false)
+                                        putBoolean("enable_download_logs", false)
+                                        putBoolean("enable_exit_reason_log", false)
+                                        putBoolean("enable_crash_log", false)
+                                        putBoolean("enable_filtered_logs", false)
+                                        putBoolean("enable_event_watch_log", false)
+                                    }
+                                }
+                                if (!checked) {
+                                    com.winlator.cmod.feature.stores.steam.utils.PrefManager.enableSteamLogs = false
+                                    com.winlator.cmod.runtime.system.ApplicationLogGate
+                                        .setEnabled(false)
+                                }
+
+                                refresh()
+                            },
+                            onLogcatGroupExpandedChanged = { expanded ->
+                                preferences.edit { putBoolean("debug_group_logcat_expanded", expanded) }
+                                refresh()
+                            },
                             onAppDebugChanged = { checked ->
                                 preferences.edit { putBoolean("enable_app_debug", checked) }
                                 com.winlator.cmod.runtime.system.ApplicationLogGate
@@ -85,6 +113,55 @@ class DebugFragment : Fragment() {
                                 }
                                 refresh()
                             },
+                            onFilteredLogsChanged = { checked ->
+                                preferences.edit { putBoolean("enable_filtered_logs", checked) }
+                                if (!checked) {
+                                    com.winlator.cmod.runtime.system.LogManager
+                                        .clearManualTextFilter()
+                                    if (!debugState.eventWatchLog) {
+                                        com.winlator.cmod.runtime.system.LogManager.clearManualTextFilter()
+                                    }
+                                }
+                                refresh()
+                            },
+                            onExitReasonLogChanged = { checked ->
+                                preferences.edit { putBoolean("enable_exit_reason_log", checked) }
+                                if (checked) {
+                                    // Capture previous exit reasons, so the user doesn't need
+                                    // to restart the app to check previous reasons.
+                                    com.winlator.cmod.runtime.system.LogManager
+                                        .logLastExitReasons(ctx)
+                                }
+                                refresh()
+                            },
+                            onCrashLogChanged = { checked ->
+                                preferences.edit { putBoolean("enable_crash_log", checked) }
+                                if (checked) {
+                                    // Capture previous crashes, so the user doesn't need
+                                    // to restart to check previous reasons.
+                                    com.winlator.cmod.runtime.system.LogManager
+                                        .logLastExitReasons(ctx)
+                                }
+                                refresh()
+                            },
+                            onEventWatchLogChanged = { checked ->
+                                preferences.edit { putBoolean("enable_event_watch_log", checked) }
+                                refresh()
+                            },
+                            onTagFilterModeChanged = { mode -> LogManager.setTagFilterMode(requireContext(), mode); refresh() },
+                            onSelectedTagsChanged = { tags -> LogManager.setSelectedTags(requireContext(), tags.toSet()); refresh() },
+                            onAddCustomTag = { tag -> LogManager.addCustomTag(requireContext(), tag); refresh() },
+                            onRemoveCustomTag = { tag -> LogManager.removeCustomTag(requireContext(), tag); refresh() },
+                            onManualTextFilterChanged = { text -> LogManager.setManualTextFilter(text) }, // no persistence, no refreshState needed
+                            allLogTagOptions = remember(debugState.customTags) { LogManager.getAllKnownTags() },
+                            onExitGroupExpandedChanged = { expanded ->
+                                preferences.edit { putBoolean("debug_group_exit_expanded", expanded) }
+                                refresh()
+                            },
+                            onFilterGroupExpandedChanged = { expanded ->
+                                preferences.edit { putBoolean("debug_group_filter_expanded", expanded) }
+                                refresh()
+                            },
                             onWineDebugChanged = { checked ->
                                 preferences.edit { putBoolean("enable_wine_debug", checked) }
                                 com.winlator.cmod.runtime.system.LogManager
@@ -127,18 +204,21 @@ class DebugFragment : Fragment() {
                                 ) {
                                     timber.log.Timber.plant(timber.log.Timber.DebugTree())
                                 }
+                                if (checked) ensureAppLoggingOn()
                                 com.winlator.cmod.runtime.system.LogManager
                                     .updateLoggingState(ctx)
                                 refresh()
                             },
                             onInputLogsChanged = { checked ->
                                 preferences.edit { putBoolean("enable_input_logs", checked) }
+                                if (checked) ensureAppLoggingOn()
                                 com.winlator.cmod.runtime.system.LogManager
                                     .updateLoggingState(ctx)
                                 refresh()
                             },
                             onDownloadLogsChanged = { checked ->
                                 preferences.edit { putBoolean("enable_download_logs", checked) }
+                                if (checked) ensureAppLoggingOn()
                                 com.winlator.cmod.runtime.system.LogManager
                                     .updateLoggingState(ctx)
                                 refresh()
@@ -205,7 +285,20 @@ class DebugFragment : Fragment() {
                 ?.filter { it.isNotBlank() } ?: emptyList()
         debugState =
             DebugState(
+                loggingEnabled = preferences.getBoolean("enable_application_logging", false),
                 appDebug = preferences.getBoolean("enable_app_debug", false),
+                filteredLogs = preferences.getBoolean("enable_filtered_logs", false),
+                exitReasonLog = preferences.getBoolean("enable_exit_reason_log", false),
+                crashLog = preferences.getBoolean("enable_crash_log", false),
+                eventWatchLog = preferences.getBoolean("enable_event_watch_log", false),
+                tagFilterMode = LogManager.getTagFilterMode(),
+                selectedTags = LogManager.getSelectedTags().toList(),
+                customTags = LogManager.getCachedCustomTags(),
+
+                logcatGroupExpanded = preferences.getBoolean("debug_group_logcat_expanded", false),
+                exitGroupExpanded = preferences.getBoolean("debug_group_exit_expanded", false),
+                filterGroupExpanded = preferences.getBoolean("debug_group_filter_expanded", false),
+
                 wineDebug = preferences.getBoolean("enable_wine_debug", false),
                 wineChannels = channels,
                 wineClasses = classes,
@@ -455,6 +548,17 @@ class DebugFragment : Fragment() {
         refresh()
     }
 
+    // Steam/input/download logs are only flags on log statements that land in the application
+    // log capture, so they produce nothing unless application logging is running.
+    private fun ensureAppLoggingOn() {
+        if (preferences.getBoolean("enable_app_debug", false)) return
+        preferences.edit { putBoolean("enable_app_debug", true) }
+        com.winlator.cmod.runtime.system.ApplicationLogGate
+            .setEnabled(true)
+        com.winlator.cmod.runtime.system.LogManager
+            .startAppLogging(requireContext(), reset = false)
+    }
+
     companion object {
         private const val KEY_DOWNLOADED_LOGS = "downloaded_log_keys"