From 40877694047ab5209daaa96ba96d38b62e65c1c6 Mon Sep 17 00:00:00 2001
From: y30045862 <yangjingbo10@huawei.com>
Date: Tue, 24 Oct 2023 20:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=BD=BD=E7=82=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E5=88=A0=E9=99=A4=E9=80=82=E9=85=8D=20Signed?=
 =?UTF-8?q?-off-by:=20yangjingbo10=20<yangjingbo10@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I0bc0a9bccee8edd82b0129776c0969f2b5cc2877
---
 interfaces/kits/native/trash/include/file_trash_n_exporter.h  | 3 +--
 .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 2 +-
 .../src/main/ets/FileExtensionAbility/ListScanFileInfo.ts     | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/interfaces/kits/native/trash/include/file_trash_n_exporter.h b/interfaces/kits/native/trash/include/file_trash_n_exporter.h
index 080168cb..648a3e6f 100644
--- a/interfaces/kits/native/trash/include/file_trash_n_exporter.h
+++ b/interfaces/kits/native/trash/include/file_trash_n_exporter.h
@@ -26,8 +26,7 @@ namespace OHOS {
 namespace Trash {
 using namespace FileManagement::LibN;
 using namespace std;
-// 暂时默认用户100
-const std::string TRASH_PATH = "/storage/.Trash/Users/100";
+const std::string TRASH_PATH = "/storage/Users/currentUser/.Trash";
 const std::string TRASH_SUB_DIR = "oh_trash_content";
 
 /**
diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts
index 747710b9..5697ae9e 100644
--- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts
+++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts
@@ -54,7 +54,7 @@ const DELETE_EVENT = 1;
 const MOVED_TO = 2;
 const MOVED_FROM = 3;
 const MOVED_SELF = 4;
-const TRASH_PATH = '/storage/.Trash/Users/100/';
+const TRASH_PATH = '/storage/Users/currentUser/.Trash/';
 const TRASH_SUB_FODER = '/oh_trash_content';
 const EXTERNAL_PATH = '/storage/External';
 let observerMap = new Map();
diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts
index 1610c791..b700d9b3 100644
--- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts
+++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/ListScanFileInfo.ts
@@ -22,6 +22,7 @@ import { getPath, uriReturnObject, encodePathOfUri, DOMAIN_CODE, TAG, infosRetur
 const documentFlag = fileExtensionInfo.DocumentFlag;
 const ERR_OK = 0;
 const E_GETRESULT = 14300004;
+const DOCS_TRASH_URI = 'file://docs/storage/Users/currentUser/.Trash';
 
 function hasFilter(filter: Filter) : boolean {
   if (filter === null) {
@@ -162,6 +163,9 @@ function getFileInfos(sourceFileUri: string, offset: number, count: number, filt
         mode |= documentFlag.REPRESENTS_FILE;
       }
       let newFileUri = getNewPathOrUri(sourceFileUri, fileNameList[i]);
+      if (newFileUri === DOCS_TRASH_URI) {
+        continue;
+      }
       newFileUri = encodePathOfUri(newFileUri);
       infos.push({
         uri: newFileUri,
-- 
Gitee