fix(android_intent_plus): adds error catching and forwarding (#3452)

fluttercommunity · Feb 1, 2025 · 37f533c · 37f533c
1 parent deff1d0
commit 37f533c
Showing 1 changed file with 49 additions and 44 deletions.
diff --git a/.../android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java b/.../android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java
@@ -73,56 +73,61 @@ void stopListening() {
    */
   @Override
   public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
-    String action = convertAction((String) call.argument("action"));
-    Integer flags = call.argument("flags");
-    String category = call.argument("category");
-    Uri data = call.argument("data") != null ? Uri.parse((String) call.argument("data")) : null;
-    Bundle arguments = convertArguments((Map<String, ?>) call.argument("arguments"));
-    Bundle arrayArguments = convertArrayArguments((Map<String, ?>) call.argument("arrayArguments"));
-    arguments.putAll(arrayArguments);
-    String packageName = call.argument("package");
-    ComponentName componentName =
-        (!TextUtils.isEmpty(packageName)
-                && !TextUtils.isEmpty((String) call.argument("componentName")))
-            ? new ComponentName(packageName, (String) call.argument("componentName"))
-            : null;
-    String type = call.argument("type");
+    try {
+      String action = convertAction((String) call.argument("action"));
+      Integer flags = call.argument("flags");
+      String category = call.argument("category");
+      Uri data = call.argument("data") != null ? Uri.parse((String) call.argument("data")) : null;
+      Bundle arguments = convertArguments((Map<String, ?>) call.argument("arguments"));
+      Bundle arrayArguments =
+          convertArrayArguments((Map<String, ?>) call.argument("arrayArguments"));
+      arguments.putAll(arrayArguments);
+      String packageName = call.argument("package");
+      ComponentName componentName =
+          (!TextUtils.isEmpty(packageName)
+                  && !TextUtils.isEmpty((String) call.argument("componentName")))
+              ? new ComponentName(packageName, (String) call.argument("componentName"))
+              : null;
+      String type = call.argument("type");
 
-    Intent intent =
-        sender.buildIntent(
-            action, flags, category, data, arguments, packageName, componentName, type);
+      Intent intent =
+          sender.buildIntent(
+              action, flags, category, data, arguments, packageName, componentName, type);
+
+      if ("parseAndLaunch".equalsIgnoreCase(call.method)) {
+        try {
+          intent = sender.parse(call.argument("uri"));
+          sender.send(intent);
+          result.success(null);
+        } catch (URISyntaxException e) {
+          result.error("parse_error", "Failed to parse URI", e.getMessage());
+        }
+      } else if ("launch".equalsIgnoreCase(call.method)) {
+
+        if (intent != null && !sender.canResolveActivity(intent)) {
+          Log.i(TAG, "Cannot resolve explicit intent, falling back to implicit");
+          intent.setPackage(null);
+        }
 
-    if ("parseAndLaunch".equalsIgnoreCase(call.method)) {
-      try {
-        intent = sender.parse(call.argument("uri"));
         sender.send(intent);
         result.success(null);
-      } catch (URISyntaxException e) {
-        result.error("parse_error", "Failed to parse URI", e.getMessage());
-      }
-    } else if ("launch".equalsIgnoreCase(call.method)) {
+      } else if ("launchChooser".equalsIgnoreCase(call.method)) {
+        String title = call.argument("chooserTitle");
 
-      if (intent != null && !sender.canResolveActivity(intent)) {
-        Log.i(TAG, "Cannot resolve explicit intent, falling back to implicit");
-        intent.setPackage(null);
+        sender.launchChooser(intent, title);
+        result.success(null);
+      } else if ("sendBroadcast".equalsIgnoreCase(call.method)) {
+        sender.sendBroadcast(intent);
+        result.success(null);
+      } else if ("canResolveActivity".equalsIgnoreCase(call.method)) {
+        result.success(sender.canResolveActivity(intent));
+      } else if ("getResolvedActivity".equalsIgnoreCase(call.method)) {
+        result.success(sender.getResolvedActivity(intent));
+      } else {
+        result.notImplemented();
       }
-
-      sender.send(intent);
-      result.success(null);
-    } else if ("launchChooser".equalsIgnoreCase(call.method)) {
-      String title = call.argument("chooserTitle");
-
-      sender.launchChooser(intent, title);
-      result.success(null);
-    } else if ("sendBroadcast".equalsIgnoreCase(call.method)) {
-      sender.sendBroadcast(intent);
-      result.success(null);
-    } else if ("canResolveActivity".equalsIgnoreCase(call.method)) {
-      result.success(sender.canResolveActivity(intent));
-    } else if ("getResolvedActivity".equalsIgnoreCase(call.method)) {
-      result.success(sender.getResolvedActivity(intent));
-    } else {
-      result.notImplemented();
+    } catch (Throwable e) {
+      result.error("error", e.getMessage(), null);
     }
   }