diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java b/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java index a7be71dce0789..4d5cfcac0dbeb 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java @@ -398,8 +398,8 @@ private void doInitialFlutterViewRun() { private String maybeGetInitialRouteFromIntent(Intent intent) { if (host.shouldHandleDeeplinking()) { Uri data = intent.getData(); - if (data != null && !data.toString().isEmpty()) { - return data.toString(); + if (data != null && !data.getPath().isEmpty()) { + return data.getPath(); } } return null; diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java index bf49fb6871c94..e4c02d7492807 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java @@ -452,8 +452,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { delegate.onStart(); // Verify that the navigation channel was given the initial route message. - verify(mockFlutterEngine.getNavigationChannel(), times(1)) - .setInitialRoute("http://myApp/custom/route"); + verify(mockFlutterEngine.getNavigationChannel(), times(1)).setInitialRoute("/custom/route"); } @Test @@ -497,8 +496,7 @@ public void itSendsPushRouteMessageWhenOnNewIntent() { delegate.onNewIntent(mockIntent); // Verify that the navigation channel was given the push route message. - verify(mockFlutterEngine.getNavigationChannel(), times(1)) - .pushRoute("http://myApp/custom/route"); + verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRoute("/custom/route"); } @Test