From 2a0d5fb490e1f9453f4cf4b3d638cc8a9849f326 Mon Sep 17 00:00:00 2001
From: Anonymous <anon@example.com>
Date: Mon, 25 Dec 2023 16:44:00 +0800
Subject: [PATCH] fah

Signed-off-by: Anonymous <anon@example.com>
---
 .../file_access/src/file_access_helper.cpp    | 90 +++++--------------
 1 file changed, 20 insertions(+), 70 deletions(-)

diff --git a/interfaces/inner_api/file_access/src/file_access_helper.cpp b/interfaces/inner_api/file_access/src/file_access_helper.cpp
index cfd22d1d..50678c72 100644
--- a/interfaces/inner_api/file_access/src/file_access_helper.cpp
+++ b/interfaces/inner_api/file_access/src/file_access_helper.cpp
@@ -187,6 +187,7 @@ std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
         HILOG_ERROR("FileAccessHelper::Creator check IsSystemAppByFullTokenID failed");
         return {nullptr, E_PERMISSION_SYS};
     }
+
     sptr<AppExecFwk::IBundleMgr> bm = FileAccessHelper::GetBundleMgrProxy();
     FileAccessHelper::wants_.clear();
     std::unordered_map<std::string, std::shared_ptr<ConnectInfo>> cMap;
@@ -197,6 +198,7 @@ std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
         HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed");
         return {nullptr, E_GETINFO};
     }
+
     for (size_t i = 0; i < extensionInfos.size(); i++) {
         AAFwk::Want wantTem;
         wantTem.SetElementName(extensionInfos[i].bundleName, extensionInfos[i].name);
@@ -219,16 +221,8 @@ std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
             return {nullptr, E_GETRESULT};
         }
         FileAccessHelper::wants_.push_back(wantTem);
-        connectInfo->want = wantTem;
-        connectInfo->fileAccessExtConnection = fileAccessExtConnection;
-        cMap.emplace(extensionInfos[i].bundleName, connectInfo);
-    }
-    FileAccessHelper *ptrFileAccessHelper = new (std::nothrow) FileAccessHelper(context, cMap);
-    if (ptrFileAccessHelper == nullptr) {
-        HILOG_ERROR("FileAccessHelper::Creator failed, create FileAccessHelper failed");
-        return {nullptr, E_GETRESULT};
     }
-    return {std::shared_ptr<FileAccessHelper>(ptrFileAccessHelper), ERR_OK};
+        return FileAccessHelper::Creator(context, wants_);
 }
 
 std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
@@ -250,52 +244,25 @@ std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
         HILOG_ERROR("FileAccessHelper::Creator check IsSystemAppByFullTokenID failed");
         return {nullptr, E_PERMISSION_SYS};
     }
+ 
+    return FileAccessHelper::Creator(context -> GetToken(), wants);
+}
 
-    if (GetRegisteredFileAccessExtAbilityInfo(FileAccessHelper::wants_) != ERR_OK) {
-        HILOG_ERROR("GetRegisteredFileAccessExtAbilityInfo failed");
-        return {nullptr, E_GETINFO};
+int CheckCreatorConditionsForToken(const sptr<IRemoteObject>& token, const std::vector<AAFwk::Want>& wants) 
+{
+    if (token == nullptr) {
+        HILOG_ERROR("FileAccessHelper::Creator failed, token is nullptr");
+        return EINVAL;
     }
-
-    std::unordered_map<std::string, std::shared_ptr<ConnectInfo>> cMap;
-    for (size_t i = 0; i < wants.size(); i++) {
-        sptr<FileAccessExtConnection> fileAccessExtConnection(new(std::nothrow) FileAccessExtConnection());
-        if (fileAccessExtConnection == nullptr) {
-            HILOG_ERROR("new fileAccessExtConnection fail");
-            return {nullptr, E_GETRESULT};
-        }
-
-        if (!fileAccessExtConnection->IsExtAbilityConnected()) {
-            fileAccessExtConnection->ConnectFileExtAbility(wants[i], context->GetToken());
-        }
-
-        sptr<IFileAccessExtBase> fileExtProxy = fileAccessExtConnection->GetFileExtProxy();
-        if (fileExtProxy == nullptr) {
-            HILOG_ERROR("Creator get invalid fileExtProxy");
-            return {nullptr, E_CONNECT};
-        }
-
-        std::shared_ptr<ConnectInfo> connectInfo = std::make_shared<ConnectInfo>();
-        if (connectInfo == nullptr) {
-            HILOG_ERROR("Creator, connectInfo == nullptr");
-            return {nullptr, E_GETRESULT};
-        }
-
-        connectInfo->want = wants[i];
-        connectInfo->fileAccessExtConnection = fileAccessExtConnection;
-        string bundleName = FileAccessHelper::GetKeyOfWants(wants[i]);
-        if (bundleName.length() == 0) {
-            HILOG_ERROR("Creator GetKeyOfWants bundleName not found");
-            return {nullptr, E_GETRESULT};
-        }
-        cMap.insert(std::pair<std::string, std::shared_ptr<ConnectInfo>>(bundleName, connectInfo));
+    if (wants.empty()) {
+        HILOG_ERROR("FileAccessHelper::Creator failed, wants is empty");
+        return EINVAL;
     }
-    FileAccessHelper *ptrFileAccessHelper = new (std::nothrow) FileAccessHelper(context, cMap);
-    if (ptrFileAccessHelper == nullptr) {
-        HILOG_ERROR("Creator failed, create FileAccessHelper failed");
-        return {nullptr, E_GETRESULT};
+    if (!IsSystemApp()) {
+        HILOG_ERROR("FileAccessHelper::Creator check IsSystemAppByFullTokenID failed");
+        return E_PERMISSION_SYS;
     }
-
-    return {std::shared_ptr<FileAccessHelper>(ptrFileAccessHelper), ERR_OK};
+    return ERR_OK;
 }
 
 std::shared_ptr<FileAccessHelper> FileAccessHelper::Creator(const sptr<IRemoteObject> &token,
@@ -303,26 +270,14 @@ std::shared_ptr<FileAccessHelper> FileAccessHelper::Creator(const sptr<IRemoteOb
 {
     UserAccessTracer trace;
     trace.Start("Creator");
-    if (token == nullptr) {
-        HILOG_ERROR("FileAccessHelper::Creator failed, token == nullptr");
+    int checkResult = CheckCreatorConditionsForToken(token, wants);
+    if (checkResult != ERR_OK) {
         return nullptr;
     }
-
-    if (wants.size() == 0) {
-        HILOG_ERROR("FileAccessHelper::Creator failed, wants is empty");
-        return nullptr;
-    }
-
-    if (!IsSystemApp()) {
-        HILOG_ERROR("FileAccessHelper::Creator check IsSystemAppByFullTokenID failed");
-        return nullptr;
-    }
-
     if (GetRegisteredFileAccessExtAbilityInfo(FileAccessHelper::wants_) != ERR_OK) {
         HILOG_ERROR("GetRegisteredFileAccessExtAbilityInfo failed");
         return nullptr;
     }
-
     std::unordered_map<std::string, std::shared_ptr<ConnectInfo>> cMap;
     for (size_t i = 0; i < wants.size(); i++) {
         sptr<FileAccessExtConnection> fileAccessExtConnection(new(std::nothrow) FileAccessExtConnection());
@@ -330,23 +285,19 @@ std::shared_ptr<FileAccessHelper> FileAccessHelper::Creator(const sptr<IRemoteOb
             HILOG_ERROR("new fileAccessExtConnection fail");
             return nullptr;
         }
-
         if (!fileAccessExtConnection->IsExtAbilityConnected()) {
             fileAccessExtConnection->ConnectFileExtAbility(wants[i], token);
         }
-
         sptr<IFileAccessExtBase> fileExtProxy = fileAccessExtConnection->GetFileExtProxy();
         if (fileExtProxy == nullptr) {
             HILOG_ERROR("Creator get invalid fileExtProxy");
             return nullptr;
         }
-
         std::shared_ptr<ConnectInfo> connectInfo = std::make_shared<ConnectInfo>();
         if (!connectInfo) {
             HILOG_ERROR("Creator, connectInfo == nullptr");
             return nullptr;
         }
-
         connectInfo->want = wants[i];
         connectInfo->fileAccessExtConnection = fileAccessExtConnection;
         string bundleName = FileAccessHelper::GetKeyOfWants(wants[i]);
@@ -361,7 +312,6 @@ std::shared_ptr<FileAccessHelper> FileAccessHelper::Creator(const sptr<IRemoteOb
         HILOG_ERROR("Creator failed, create FileAccessHelper failed");
         return nullptr;
     }
-
     return std::shared_ptr<FileAccessHelper>(ptrFileAccessHelper);
 }
 
-- 
Gitee