fix(android)!: change Image getSize failure parameter type

BREAKING CHANGE:: failure parameter on Android used to be a String, now is an object
Tencent · Nov 22, 2023 · 4dbb0fe · 4dbb0fe
1 parent 7ed0049
commit 4dbb0fe
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...id/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/image/ImageLoaderModule.java b/...id/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/image/ImageLoaderModule.java
@@ -34,6 +34,7 @@
 public class ImageLoaderModule extends HippyNativeModuleBase {
 
     private final VfsManager mVfsManager;
+    private static final String ERROR_KEY_MESSAGE = "message";
 
     public ImageLoaderModule(HippyEngineContext context) {
         super(context);
@@ -50,7 +51,9 @@ private void decodeImageData(@NonNull final String url, @NonNull byte[] data, fi
             jsObject.set("height", options.outHeight);
             promise.resolve(jsObject);
         } catch (OutOfMemoryError | Exception e) {
-            promise.reject("Fetch image failed, url=" + url + ", msg=" + e.getMessage());
+            JSObject jsObject = new JSObject();
+            jsObject.set(ERROR_KEY_MESSAGE, "Fetch image failed, url=" + url + ", msg=" + e.getMessage());
+            promise.reject(jsObject);
         }
     }
 
@@ -64,7 +67,9 @@ private HashMap<String, String> generateRequestParams() {
     @HippyMethod(name = "getSize")
     public void getSize(final String url, final Promise promise) {
         if (TextUtils.isEmpty(url)) {
-            promise.reject("Url parameter is empty!");
+            JSObject jsObject = new JSObject();
+            jsObject.set(ERROR_KEY_MESSAGE, "Url parameter is empty!");
+            promise.reject(jsObject);
             return;
         }
         mVfsManager.fetchResourceAsync(url, null, generateRequestParams(),
@@ -77,7 +82,10 @@ public void onFetchCompleted(@NonNull final ResourceDataHolder dataHolder) {
                                 || bytes.length <= 0) {
                             String message =
                                     dataHolder.errorMessage != null ? dataHolder.errorMessage : "";
-                            promise.reject("Fetch image failed, url=" + url + ", msg=" + message);
+                            String errorMsg = "Fetch image failed, url=" + url + ", msg=" + message;
+                            JSObject jsObject = new JSObject();
+                            jsObject.set(ERROR_KEY_MESSAGE, errorMsg);
+                            promise.reject(jsObject);
                         } else {
                             decodeImageData(url, bytes, promise);
                         }