自动提交代码

Author: JoyinJoester

Monica for Android/app/build.gradle

@@ -91,6 +91,7 @@ dependencies {
     implementation libs.androidx.core.ktx
     implementation libs.androidx.core.splashscreen  // 添加splashscreen依赖
     implementation libs.androidx.lifecycle.runtime.ktx
+    implementation "androidx.lifecycle:lifecycle-process:2.6.1"
     implementation libs.androidx.activity.compose
 
     // Compose

Monica for Android/app/src/main/java/takagi/ru/monica/MainActivity.kt

@@ -52,7 +52,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
-import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation.NavHostController
 import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.NavType
@@ -369,12 +369,19 @@ fun MonicaApp(
             val isFirstTime = runCatching {
                 !viewModel.isMasterPasswordSet()
             }.getOrDefault(false)
+            val canRestoreSession = runCatching {
+                SessionManager.canSkipVerification(context)
+            }.getOrDefault(false)
             StartupAuthState(
                 disablePasswordVerification = disablePasswordVerification,
-                isFirstTime = isFirstTime
+                isFirstTime = isFirstTime,
+                canRestoreSession = canRestoreSession
             )
         }
-        if (loadedState.disablePasswordVerification && !loadedState.isFirstTime) {
+        if (
+            (loadedState.disablePasswordVerification && !loadedState.isFirstTime) ||
+            loadedState.canRestoreSession
+        ) {
             viewModel.markAuthenticatedForBypass()
         }
         startupAuthState = loadedState
@@ -445,7 +452,8 @@ fun MonicaApp(
 
 private data class StartupAuthState(
     val disablePasswordVerification: Boolean,
-    val isFirstTime: Boolean
+    val isFirstTime: Boolean,
+    val canRestoreSession: Boolean
 )
 
 @Composable
@@ -470,6 +478,7 @@ fun MonicaContent(
     initialIsFirstTime: Boolean = false,
     onPermissionRequested: (String, (Boolean) -> Unit) -> Unit
 ) {
+    val context = LocalContext.current
     val isAuthenticated by viewModel.isAuthenticated.collectAsState()
     val settings by settingsViewModel.settings.collectAsState()
     val lifecycleOwner = LocalLifecycleOwner.current
@@ -482,31 +491,24 @@ fun MonicaContent(
     val currentSettings by rememberUpdatedState(settings)
     val currentIsFirstTime by rememberUpdatedState(isFirstTime)
 
-    // Auto-lock logic: only use lifecycleOwner as key to prevent observer recreation
-    // The settings and auth state are captured by closure and always reflect latest values
+    // Auto-lock logic: measure actual background duration and lock only when timeout is exceeded.
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             when (event) {
                 Lifecycle.Event.ON_STOP -> {
-                    // Only record timestamp when user is authenticated
-                    // 使用 currentIsAuthenticated 确保访问最新值
                     if (currentIsAuthenticated) {
                         lastBackgroundTimestamp = System.currentTimeMillis()
                     }
                 }
                 Lifecycle.Event.ON_START -> {
-                    // 如果已禁用密码验证，跳过自动锁定
-                    // 使用 currentSettings 和 currentIsFirstTime 确保访问最新值
-                    if (currentSettings.disablePasswordVerification && !currentIsFirstTime) {
-                        viewModel.refreshKeePassFromSourceForCurrentContext()
-                        lastBackgroundTimestamp = null
-                        return@LifecycleEventObserver
+                    if (!currentIsAuthenticated && SessionManager.canSkipVerification(context)) {
+                        viewModel.restoreAuthenticatedSession()
                     }
-                    
+
                     val minutes = currentSettings.autoLockMinutes
                     val timeoutMs = when {
-                        minutes == -1 -> null // Never auto-lock
-                        minutes <= 0 -> 0L // Immediate lock after background
+                        minutes == -1 -> null
+                        minutes <= 0 -> 0L
                         else -> minutes.toLong() * 60_000L
                     }
 
@@ -526,9 +528,19 @@ fun MonicaContent(
                     } else if (timeoutMs == null) {
                         lastBackgroundTimestamp = null
                     }
+
                     if (currentIsAuthenticated || (currentSettings.disablePasswordVerification && !currentIsFirstTime)) {
                         viewModel.refreshKeePassFromSourceForCurrentContext()
                     }
+                    if (!currentIsAuthenticated &&
+                        !SessionManager.canSkipVerification(context) &&
+                        !(currentSettings.disablePasswordVerification && !currentIsFirstTime)
+                    ) {
+                        navController.navigate(Screen.Login.route) {
+                            launchSingleTop = true
+                            popUpTo(0) { inclusive = true }
+                        }
+                    }
                 }
                 else -> Unit
             }
@@ -556,6 +568,21 @@ fun MonicaContent(
                     popUpTo(Screen.Login.route) { inclusive = true }
                 }
             }
+        } else if (!(settings.disablePasswordVerification && !isFirstTime)) {
+            if (SessionManager.canSkipVerification(context)) {
+                viewModel.restoreAuthenticatedSession()
+                return@LaunchedEffect
+            }
+            if (!lifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                return@LaunchedEffect
+            }
+            val currentRoute = navController.currentDestination?.route
+            if (currentRoute != Screen.Login.route) {
+                navController.navigate(Screen.Login.route) {
+                    launchSingleTop = true
+                    popUpTo(0) { inclusive = true }
+                }
+            }
         }
     }
 

Monica for Android/app/src/main/java/takagi/ru/monica/autofill_ng/AutofillPickerActivityV2.kt

@@ -320,6 +320,18 @@ class AutofillPickerActivityV2 : BaseMonicaActivity() {
         val securityManager = SecurityManager(applicationContext)
         // settingsManager 已由 BaseMonicaActivity 初始化
         val localSettingsManager = settingsManager
+
+        runCatching {
+            val autoLockMinutes = runBlocking {
+                localSettingsManager.settingsFlow.first().autoLockMinutes
+            }
+            SessionManager.updateAutoLockTimeout(autoLockMinutes)
+        }.onFailure { error ->
+            AutofillLogger.w(
+                "PICKER",
+                "Failed to sync auto-lock timeout before verification: ${error.message}"
+            )
+        }
 
         // 检查是否可以跳过验证（基于会话管理器的安全窗规则）
         val canSkipAuth = canSkipVerification()

Monica for Android/app/src/main/java/takagi/ru/monica/autofill_ng/builder/FillResponseBuilderNg.kt

@@ -195,7 +195,7 @@ class FillResponseBuilderNg(
         val menuPresentation = if (filledData.isVaultLocked) {
             AutofillDatasetBuilder.RemoteViewsFactory.createUnlockPrompt(
                 context = context,
-                message = context.getString(R.string.unlock)
+                message = context.getString(R.string.autofill_manual_entry_title)
             )
         } else {
             AutofillDatasetBuilder.RemoteViewsFactory.createManualSelection(

Monica for Android/app/src/main/java/takagi/ru/monica/autofill_ng/builder/FilledDataBuilderNg.kt

@@ -14,6 +14,9 @@ import takagi.ru.monica.autofill_ng.AutofillSecretResolver
 import takagi.ru.monica.data.PasswordEntry
 import takagi.ru.monica.security.SecurityManager
 import takagi.ru.monica.security.SessionManager
+import takagi.ru.monica.utils.SettingsManager
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 
 private const val MAX_FILLED_PARTITIONS_COUNT = 20
 private const val MAX_INLINE_SUGGESTION_COUNT = 5
@@ -23,10 +26,26 @@ class FilledDataBuilderNg(
     private val securityManager: SecurityManager,
 ) {
 
+    private fun syncAutoLockTimeoutForAutofill() {
+        runCatching {
+            val settingsManager = SettingsManager(context.applicationContext)
+            val autoLockMinutes = runBlocking {
+                settingsManager.settingsFlow.first().autoLockMinutes
+            }
+            SessionManager.updateAutoLockTimeout(autoLockMinutes)
+        }.onFailure { error ->
+            android.util.Log.w(
+                "FilledDataBuilderNg",
+                "Failed to sync auto-lock timeout for autofill: ${error.message}"
+            )
+        }
+    }
+
     fun build(
         request: AutofillRequest.Fillable,
         passwords: List<PasswordEntry>,
     ): FilledData {
+        syncAutoLockTimeoutForAutofill()
         val isVaultLocked = !SessionManager.canSkipVerification(context)
         val maxCipherInlineSuggestionsCount = (request.maxInlineSuggestionsCount - 1)
             .coerceAtMost(MAX_INLINE_SUGGESTION_COUNT)