addressing comment

Author: chunhtai

shell/platform/android/io/flutter/embedding/android/FlutterActivity.java

@@ -785,8 +785,8 @@ public String getDartEntrypointFunctionName() {
   public String getInitialRoute() {
     Intent intent = getIntent();
     Uri data = intent.getData();
-    if (data != null && data.getPath() != null && !data.getPath().isEmpty()) {
-      return data.getPath();
+    if (data != null && !data.toString().isEmpty()) {
+      return data.toString();
     }
     if (intent.hasExtra(EXTRA_INITIAL_ROUTE)) {
       return intent.getStringExtra(EXTRA_INITIAL_ROUTE);

shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java

@@ -24,6 +24,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -654,8 +655,13 @@ public String getDartEntrypointFunctionName() {
    */
   @NonNull
   protected String getInitialRoute() {
-    if (getIntent().hasExtra(EXTRA_INITIAL_ROUTE)) {
-      return getIntent().getStringExtra(EXTRA_INITIAL_ROUTE);
+    Intent intent = getIntent();
+    Uri data = intent.getData();
+    if (data != null && !data.toString().isEmpty()) {
+      return data.toString();
+    }
+    if (intent.hasExtra(EXTRA_INITIAL_ROUTE)) {
+      return intent.getStringExtra(EXTRA_INITIAL_ROUTE);
     }
 
     try {

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java

@@ -127,7 +127,7 @@ public void itCreatesNewEngineIntentWithLaunchUri() {
     flutterActivity.setDelegate(new FlutterActivityAndFragmentDelegate(flutterActivity));
 
     assertEquals("main", flutterActivity.getDartEntrypointFunctionName());
-    assertEquals("/custom/route", flutterActivity.getInitialRoute());
+    assertEquals("http://myApp/custom/route", flutterActivity.getInitialRoute());
     assertArrayEquals(new String[] {}, flutterActivity.getFlutterShellArgs().toArray());
     assertTrue(flutterActivity.shouldAttachEngineToActivity());
     assertNull(flutterActivity.getCachedEngineId());

shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java

@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
@@ -19,8 +20,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
@@ -82,6 +85,17 @@ public void itRegistersPluginsAtConfigurationTime() {
     assertEquals(activity.getFlutterEngine(), registeredEngines.get(0));
   }
 
+  @Test
+  public void itSetsInitialRouteFromTheLaunchURI() {
+    Intent intent = FlutterFragmentActivity.createDefaultIntent(RuntimeEnvironment.application);
+    intent.setData(Uri.parse("http://myApp/custom/route"));
+    ActivityController<FlutterFragmentActivity> activityController =
+        Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
+    FlutterFragmentActivity flutterActivity = activityController.get();
+
+    assertEquals("http://myApp/custom/route", flutterActivity.getInitialRoute());
+  }
+
   static class FlutterFragmentActivityWithProvidedEngine extends FlutterFragmentActivity {
     @Override
     protected FlutterFragment createFlutterFragment() {