save changes

JoyinJoester · JoyinJoester · commit 6a5fcfd7eebe · 2026-03-07T20:19:56.000+08:00
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/ui/screens/DeveloperSettingsScreen.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/ui/screens/DeveloperSettingsScreen.kt
@@ -559,7 +559,7 @@ private data class ClearLogsResult(
 
 private object DeveloperLogDebugHelper {
     private const val LOG_LINE_LIMIT = 1200
-    private const val SHARE_DIR = "temp_photos"
+    private const val SHARE_DIR = "temp_share"
     private const val SHARE_PREFIX = "monica_logs_"
     private val AUTOFILL_LOG_TAGS = arrayOf(
         "MonicaAutofill:V",
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/ui/screens/KeePassWebDavViewModel.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/ui/screens/KeePassWebDavViewModel.kt
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/util/ImageManager.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/util/ImageManager.kt
@@ -33,7 +33,7 @@ class ImageManager(private val context: Context) {
     
     companion object {
         private const val IMAGE_DIR = "secure_images"
-        private const val TEMP_IMAGE_DIR = "temp_photos"
+        private const val TEMP_IMAGE_DIR = "temp_share"
         private const val ALGORITHM = "AES/CBC/PKCS5Padding"
         private const val KEY_ALGORITHM = "AES"
         
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/util/PhotoPickerHelper.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/util/PhotoPickerHelper.kt
@@ -221,7 +221,7 @@ object PhotoPickerHelper {
         val timeStamp = java.text.SimpleDateFormat("yyyyMMdd_HHmmss", java.util.Locale.getDefault()).format(java.util.Date())
         val imageFileName = "JPEG_${timeStamp}_"
         // 确保使用正确的目录，与file_paths.xml中的配置匹配
-        val storageDir = File(context.cacheDir, "temp_photos")
+        val storageDir = File(context.cacheDir, "temp_share")
         if (!storageDir.exists()) {
             storageDir.mkdirs()
         }
@@ -358,4 +358,4 @@ object PhotoPickerHelper {
     
     // 临时照片文件
     private var tempPhotoFile: File? = null
-}
+}
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/utils/KeePassKdbxService.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/utils/KeePassKdbxService.kt
@@ -110,6 +110,8 @@ class KeePassKdbxService(
         // Global single-writer queue, shared across all service instances.
         private val persistScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
         private val persistQueue = Channel<suspend () -> Unit>(Channel.UNLIMITED)
+        // 跨实例缓存失效信号：某实例更新数据库绑定后，其他实例的本地缓存应立即失效。
+        private val externallyInvalidatedDatabaseIds = mutableSetOf<Long>()
         @Volatile
         private var persistWorkerStarted = false
 
@@ -132,6 +134,16 @@ class KeePassKdbxService(
         suspend fun <T> withGlobalDecodeLock(block: () -> T): T {
             return globalDecodeMutex.withLock { block() }
         }
+
+        @Synchronized
+        fun invalidateProcessCache(databaseId: Long) {
+            externallyInvalidatedDatabaseIds += databaseId
+        }
+
+        @Synchronized
+        private fun consumeProcessCacheInvalidation(databaseId: Long): Boolean {
+            return externallyInvalidatedDatabaseIds.remove(databaseId)
+        }
     }
     
     init {
@@ -1540,6 +1552,11 @@ class KeePassKdbxService(
     }
 
     private suspend fun getCachedLoadedDatabase(databaseId: Long): LoadedDatabase? {
+        if (consumeProcessCacheInvalidation(databaseId)) {
+            invalidateLoadedDatabaseCache(databaseId)
+            return null
+        }
+
         val now = System.currentTimeMillis()
         val cached = synchronized(loadedDatabaseCache) { loadedDatabaseCache[databaseId] } ?: return null
 
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/utils/WebDavHelper.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/utils/WebDavHelper.kt
@@ -324,6 +324,7 @@ class WebDavHelper(
         private const val KEY_KEEPASS_CONFLICT_PROTECTION_MODE = "conflict_protection_mode"
         private const val KEEPASS_CONFLICT_MODE_AUTO = "auto"
         private const val KEEPASS_CONFLICT_MODE_STRICT = "strict"
+        private const val BACKUP_FOLDER_NAME = "Monica_Backups"
     }
     
     // 加密相关
@@ -339,7 +340,7 @@ class WebDavHelper(
      * 配置 WebDAV 连接
      */
     fun configure(url: String, user: String, pass: String) {
-        serverUrl = url.trimEnd('/')
+        serverUrl = normalizeServerUrl(url)
         username = user
         password = pass
         // 创建新的 Sardine 实例并立即设置凭证
@@ -370,7 +371,8 @@ class WebDavHelper(
      */
     private fun loadConfig() {
         val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-        val url = prefs.getString(KEY_SERVER_URL, "") ?: ""
+        val storedUrl = prefs.getString(KEY_SERVER_URL, "") ?: ""
+        val url = normalizeServerUrl(storedUrl)
         val user = prefs.getString(KEY_USERNAME, "") ?: ""
         val pass = prefs.getString(KEY_PASSWORD, "") ?: ""
         enableEncryption = prefs.getBoolean(KEY_ENABLE_ENCRYPTION, false)
@@ -384,6 +386,9 @@ class WebDavHelper(
             sardine = OkHttpSardine()
             sardine?.setCredentials(username, password)
             android.util.Log.d("WebDavHelper", "Loaded WebDAV config: url=$serverUrl, user=$username, encryption=$enableEncryption")
+            if (url != storedUrl) {
+                saveConfig()
+            }
         }
     }
     
@@ -3179,6 +3184,23 @@ class WebDavHelper(
             }
         }.trim('_').ifEmpty { "_root" }
     }
+
+    private fun normalizeServerUrl(url: String): String {
+        return url.trim().trimEnd('/')
+    }
+
+    private fun getBackupDirectoryPath(): String {
+        val normalizedBase = normalizeServerUrl(serverUrl)
+        return if (normalizedBase.endsWith("/$BACKUP_FOLDER_NAME", ignoreCase = true)) {
+            normalizedBase
+        } else {
+            "$normalizedBase/$BACKUP_FOLDER_NAME"
+        }
+    }
+
+    private fun getBackupFilePath(fileName: String): String {
+        return "${getBackupDirectoryPath()}/$fileName"
+    }
     
     /**
      * 上传备份文件
@@ -3197,7 +3219,7 @@ class WebDavHelper(
             }
             
             // 创建 Monica 备份目录
-            val backupDir = "$serverUrl/Monica_Backups"
+            val backupDir = getBackupDirectoryPath()
             if (!sardine!!.exists(backupDir)) {
                 sardine!!.createDirectory(backupDir)
             }
@@ -3249,7 +3271,7 @@ class WebDavHelper(
                 return@withContext Result.failure(Exception("WebDAV not configured"))
             }
             
-            val backupDir = "$serverUrl/Monica_Backups"
+            val backupDir = getBackupDirectoryPath()
             
             // 检查目录是否存在
             if (!sardine!!.exists(backupDir)) {
@@ -3286,7 +3308,7 @@ class WebDavHelper(
                 return@withContext Result.failure(Exception("WebDAV not configured"))
             }
             
-            val remotePath = "$serverUrl/Monica_Backups/${backupFile.name}"
+            val remotePath = getBackupFilePath(backupFile.name)
             
             // 下载文件
             sardine!!.get(remotePath).use { inputStream ->
@@ -3351,10 +3373,10 @@ class WebDavHelper(
                 return@withContext Result.success(true)
             }
 
-            val oldPath = "$serverUrl/Monica_Backups/${backup.name}"
+            val oldPath = getBackupFilePath(backup.name)
             // Insert _permanent before .zip
             val newName = backup.name.replace(".zip", "${PERMANENT_SUFFIX}.zip")
-            val newPath = "$serverUrl/Monica_Backups/$newName"
+            val newPath = getBackupFilePath(newName)
 
             sardine!!.move(oldPath, newPath)
             android.util.Log.d("WebDavHelper", "Marked backup as permanent: ${backup.name} -> $newName")
@@ -3378,10 +3400,10 @@ class WebDavHelper(
                 return@withContext Result.success(true)
             }
 
-            val oldPath = "$serverUrl/Monica_Backups/${backup.name}"
+            val oldPath = getBackupFilePath(backup.name)
             // Remove _permanent suffix
             val newName = backup.name.replace(PERMANENT_SUFFIX, "")
-            val newPath = "$serverUrl/Monica_Backups/$newName"
+            val newPath = getBackupFilePath(newName)
 
             sardine!!.move(oldPath, newPath)
             android.util.Log.d("WebDavHelper", "Unmarked permanent backup: ${backup.name} -> $newName")
@@ -3403,7 +3425,7 @@ class WebDavHelper(
                 return@withContext Result.failure(Exception("WebDAV not configured"))
             }
             
-            val remotePath = "$serverUrl/Monica_Backups/${backupFile.name}"
+            val remotePath = getBackupFilePath(backupFile.name)
             android.util.Log.d("WebDavHelper", "Deleting backup: $remotePath")
             
             sardine!!.delete(remotePath)
diff --git a/Monica for Android/app/src/main/java/takagi/ru/monica/viewmodel/LocalKeePassViewModel.kt b/Monica for Android/app/src/main/java/takagi/ru/monica/viewmodel/LocalKeePassViewModel.kt
@@ -426,18 +426,35 @@ class LocalKeePassViewModel(
                             ?: throw Exception("无法访问密钥文件")
                     }
                     
-                    val database = LocalKeePassDatabase(
-                        name = name,
-                        filePath = uri.toString(),
-                        keyFileUri = keyFileUri?.toString(),
-                        storageLocation = KeePassStorageLocation.EXTERNAL,
-                        encryptedPassword = encryptedPassword,
-                        description = description,
-                        entryCount = entryCount,
-                        isDefault = allDatabases.value.isEmpty()
-                    )
-                    
-                    dao.insertDatabase(database)
+                    val uriPath = uri.toString()
+                    val existing = dao.getAllDatabasesSync().firstOrNull { it.filePath == uriPath }
+                    if (existing != null) {
+                        dao.updateDatabase(
+                            existing.copy(
+                                name = name,
+                                keyFileUri = keyFileUri?.toString() ?: existing.keyFileUri,
+                                storageLocation = KeePassStorageLocation.EXTERNAL,
+                                encryptedPassword = encryptedPassword,
+                                description = description ?: existing.description,
+                                entryCount = entryCount,
+                                lastAccessedAt = System.currentTimeMillis()
+                            )
+                        )
+                        KeePassKdbxService.invalidateProcessCache(existing.id)
+                    } else {
+                        val database = LocalKeePassDatabase(
+                            name = name,
+                            filePath = uriPath,
+                            keyFileUri = keyFileUri?.toString(),
+                            storageLocation = KeePassStorageLocation.EXTERNAL,
+                            encryptedPassword = encryptedPassword,
+                            description = description,
+                            entryCount = entryCount,
+                            isDefault = allDatabases.value.isEmpty()
+                        )
+                        val newId = dao.insertDatabase(database)
+                        KeePassKdbxService.invalidateProcessCache(newId)
+                    }
                 }
                 
                 _operationState.value = OperationState.Success("数据库添加成功")
diff --git a/Monica for Android/app/src/main/res/xml/file_paths.xml b/Monica for Android/app/src/main/res/xml/file_paths.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 缓存目录,用于临时拍照 -->
-    <cache-path name="camera_photos" path="temp_photos/" />
+    <!-- 缓存目录,用于临时拍照与日志分享 -->
+    <cache-path name="shared_temp" path="temp_share/" />
     
     <!-- 内部存储,用于加密图片 -->
     <files-path name="secure_images" path="secure_images/" />
diff --git a/test(1)/keepass_test1_plaintext_dump.md b/test(1)/keepass_test1_plaintext_dump.md
