External activity failure - ignore resolveActivity

microbit-foundation · Sep 17, 2024 · 8d9c464 · 8d9c464
1 parent 590a415
commit 8d9c464
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/app/src/main/java/com/samsung/microbit/ui/UIUtils.java b/app/src/main/java/com/samsung/microbit/ui/UIUtils.java
@@ -336,25 +336,29 @@ public static int safelyStartActivity( Context context, boolean report, Intent i
         int error = 0;
         ComponentName componentName = intent.resolveActivity( context.getPackageManager());
         if ( componentName == null) {
+            /* TODO: Why is componentName null for
+                    ACTION_CREATE_DOCUMENT (unless createChooser is used)
+                    ACTION_VIEW?
+            */
             Log.i(TAG,"startActivity - no component");
-            error = 1;
-        } else {
-            try {
-                if ( forResult) {
-                    if ( !(context instanceof Activity)) {
-                        error = 3;
-                    } else {
-                        ((Activity) context).startActivityForResult(intent, requestCode, options);
-                    }
+        }
+
+        try {
+            if ( forResult) {
+                if ( !(context instanceof Activity)) {
+                    error = 3;
                 } else {
-                    context.startActivity(intent);
+                    ((Activity) context).startActivityForResult(intent, requestCode, options);
                 }
-            } catch (Exception e) {
-                Log.i(TAG, "startActivity - exception");
-                e.printStackTrace();
-                error = 2;
+            } else {
+                context.startActivity(intent);
             }
+        } catch (Exception e) {
+            Log.i(TAG, "startActivity - exception");
+            e.printStackTrace();
+            error = 2;
         }
+
         if ( report && error != 0) {
             safelyStartActivityToastGeneric( context);
         }