fix: 修复review问题

Author: Jeric-X

modules/native-util/android/src/main/java/expo/modules/nativeutil/FileOperations.kt

@@ -194,7 +194,8 @@ internal class SafTreeStrategy(
         val childUri = DocumentsContract.buildDocumentUriUsingTree(treeUri, childDocId)
         val childDoc = DocumentFile.fromSingleUri(context, childUri) ?: return null
         if (!childDoc.exists()) return null
-        return SafTreeStrategy(childDoc, "$relativePath$name/", treeUri, rootDocId)
+        val childPath = if (childDoc.isDirectory) "$relativePath$name/" else "$relativePath$name"
+        return SafTreeStrategy(childDoc, childPath, treeUri, rootDocId)
     }
 
     @Throws(IOException::class)
@@ -267,7 +268,8 @@ internal class FileStrategy(
     override fun findFile(context: Context, name: String): WriteStrategy? {
         val file = File(baseDir, "$relativePath$name")
         if (!file.exists()) return null
-        return FileStrategy(DocumentFile.fromFile(file), "$relativePath$name/", baseDir)
+        val childPath = if (file.isDirectory) "$relativePath$name/" else "$relativePath$name"
+        return FileStrategy(DocumentFile.fromFile(file), childPath, baseDir)
     }
 
     @Throws(IOException::class)

src/android/app/src/main/java/com/jericx/syncclipboardmobile/expo-native/ShareActivity.kt

@@ -127,13 +127,29 @@ class ShareActivity : ReactActivity() {
         NativeLogger.d(TAG, "Multiple files share: ${uris.size} files")
 
         // Copy all files to cache directory and collect per-file metadata
+        // 同名文件去重：跟踪已使用的文件名，冲突时追加 " (1)", " (2)" 等后缀
         val copiedPaths = ArrayList<String>()
         val fileNames = ArrayList<String>()
+        val usedNames = HashMap<String, Int>()
 
         for (uri in uris) {
-            val fileName = getFileName(uri, type)
+            var fileName = getFileName(uri, type)
 
-            val copiedFile = copyUriToCache(uri, type)
+            // 去重：如果文件名已被使用，追加数字后缀
+            val count = usedNames[fileName]
+            if (count != null) {
+                usedNames[fileName] = count + 1
+                val dotIndex = fileName.lastIndexOf('.')
+                if (dotIndex > 0) {
+                    fileName = "${fileName.substring(0, dotIndex)} (${count + 1})${fileName.substring(dotIndex)}"
+                } else {
+                    fileName = "$fileName (${count + 1})"
+                }
+            } else {
+                usedNames[fileName] = 1
+            }
+
+            val copiedFile = copyUriToCache(uri, type, fileName)
             if (copiedFile != null) {
                 copiedPaths.add("file://${copiedFile.absolutePath}")
                 fileNames.add(fileName)
@@ -157,7 +173,7 @@ class ShareActivity : ReactActivity() {
      * Copy content from URI to cache directory.
      * Returns the copied file, or null if failed.
      */
-    private fun copyUriToCache(uri: Uri, mimeType: String?): File? {
+    private fun copyUriToCache(uri: Uri, mimeType: String?, desiredName: String? = null): File? {
         return try {
             // Open input stream from content provider
             val inputStream: InputStream? = contentResolver.openInputStream(uri)
@@ -166,8 +182,8 @@ class ShareActivity : ReactActivity() {
                 return null
             }
 
-            // Get file name from URI or generate one
-            val fileName = getFileName(uri, mimeType)
+            // Get file name from URI or generate one (use desiredName if provided for dedup)
+            val fileName = desiredName ?: getFileName(uri, mimeType)
 
             // Create file in cache directory
             val cacheDir = cacheDir

src/components/HistoryListItem.tsx

@@ -422,7 +422,7 @@ export const HistoryListItem = forwardRef<object, HistoryListItemProps>(
                       </Text>
                     </View>
                   )}
-                {/* 未下载标识 - 本地文件未就绪，仅当启用同步且不在传输中时显示 */}
+                {/* 未下载标识 - 本地文件未就绪（所有类型通用），仅当启用同步且不在传输中时显示 */}
                 {enableHistorySync && !isTransferring && !localFileReady && (
                   <TouchableOpacity
                     style={styles.syncBadge}

src/utils/hash.ts

@@ -294,10 +294,11 @@ export interface GroupEntry {
  * 与桌面端 ByteArrayComparer 行为一致，对于包含非 ASCII 字符（如中文）的文件名
  * 至关重要——localeCompare 会产生不同的排序结果
  */
+const utf8Encoder = new TextEncoder();
+
 function compareUtf8Bytes(a: string, b: string): number {
-  const encoder = new TextEncoder();
-  const bytesA = encoder.encode(a);
-  const bytesB = encoder.encode(b);
+  const bytesA = utf8Encoder.encode(a);
+  const bytesB = utf8Encoder.encode(b);
   const minLen = Math.min(bytesA.length, bytesB.length);
   for (let i = 0; i < minLen; i++) {
     if (bytesA[i] !== bytesB[i]) {
@@ -327,14 +328,13 @@ export function calculateGroupHash(entries: GroupEntry[]): string {
 
   // Step 2-4: 流式生成条目字符串并计算 SHA256
   const hasher = sha256.create();
-  const encoder = new TextEncoder();
 
   for (const entry of sorted) {
     if (entry.isDirectory) {
-      hasher.update(encoder.encode(`D|${entry.relativePath}\0`));
+      hasher.update(utf8Encoder.encode(`D|${entry.relativePath}\0`));
     } else {
       hasher.update(
-        encoder.encode(`F|${entry.relativePath}|${entry.length}|${entry.contentHash}\0`)
+        utf8Encoder.encode(`F|${entry.relativePath}|${entry.length}|${entry.contentHash}\0`)
       );
     }
   }