From 8059f26befb41312ece047bce6a38f0ad31435a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E8=A5=BF?= <zhangchuanbei@cai-inc.com>
Date: Tue, 6 Aug 2024 09:47:54 +0800
Subject: [PATCH] =?UTF-8?q?getAll=20=E6=96=B9=E6=B3=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8E=9F=E5=85=88=E6=97=A0=E8=AE=BA?=
 =?UTF-8?q?=20this.preferences=20=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E9=83=BD=E4=BC=9A=E5=85=88=E5=88=9B=E5=BB=BA=20res=20=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=9C=A8=E4=B8=8D=E6=94=B9=E5=8F=98=E5=8E=9F?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=80=BB=E8=BE=91=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=BD=BF=E5=BE=97=E4=BB=A3=E7=A0=81=E6=9B=B4?=
 =?UTF-8?q?=E7=AE=80=E6=B4=81=E3=80=82=20Signed-off-by:=20zhangchuanbei=20?=
 =?UTF-8?q?<zhangchuanbei@cai-inc.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SharedPreferencesOhosPlugin.ets           | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/shared_preferences/shared_preferences_ohos/ohos/src/main/ets/shared_preferences/SharedPreferencesOhosPlugin.ets b/packages/shared_preferences/shared_preferences_ohos/ohos/src/main/ets/shared_preferences/SharedPreferencesOhosPlugin.ets
index 8f53019ca..d744df329 100644
--- a/packages/shared_preferences/shared_preferences_ohos/ohos/src/main/ets/shared_preferences/SharedPreferencesOhosPlugin.ets
+++ b/packages/shared_preferences/shared_preferences_ohos/ohos/src/main/ets/shared_preferences/SharedPreferencesOhosPlugin.ets
@@ -345,25 +345,19 @@ export default class SharedPreferencesOhosPlugin implements FlutterPlugin, Share
   }
 
   async getAll(prefix: string, allowList: Array<string>): Promise<Object> {
-    try {
-      let res = new Map<string, Object>();
-      if (this.preferences == null) {
-        return new Promise((reject) => {
-          reject("Failed to getAll");
-        })
-      }
-      await this.preferences.getAll().then((obj: Object) => {
-        res = this.filterData(obj as [string, ESObject], prefix, allowList);
-      })
-      return new Promise((resolve) => {
-        resolve(res);
-      })
-    } catch (err) {
-      Log.w(TAG, "Failed to excute getAll." + JSON.stringify(err));
+    if (this.preferences == null) {
       return new Promise((reject) => {
         reject("Failed to getAll");
       })
     }
+
+    return this.preferences.getAll().then((obj: Object) => {
+      return this.filterData(obj as [string, ESObject], prefix, allowList);
+    }).catch((_) => {
+      return new Promise((reject) => {
+        reject("Failed to getAll");
+      })
+    })
   }
 
   getCodec(): MessageCodec<Object> {
-- 
Gitee