diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 3379b9d7ae..f26d6fe01b 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -57,8 +57,7 @@ class DefaultBrowserToolbarController(
navController.nav(
R.id.browserFragment,
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
- sessionId = customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id,
- pastedText = text
+ sessionId = customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id
)
)
}
@@ -75,8 +74,7 @@ class DefaultBrowserToolbarController(
navController.nav(
R.id.browserFragment,
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
- customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id,
- pastedText = null
+ customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id
)
)
}
@@ -120,16 +118,14 @@ class DefaultBrowserToolbarController(
}
ToolbarMenu.Item.NewTab -> {
val directions = BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
- sessionId = null,
- pastedText = null
+ sessionId = null
)
navController.nav(R.id.browserFragment, directions)
browsingModeManager.mode = BrowsingMode.Normal
}
ToolbarMenu.Item.NewPrivateTab -> {
val directions = BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
- sessionId = null,
- pastedText = null
+ sessionId = null
)
navController.nav(R.id.browserFragment, directions)
browsingModeManager.mode = BrowsingMode.Private
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index ad07f09cdd..6f1ed818ba 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -235,8 +235,7 @@ class HomeFragment : Fragment(), AccountObserver {
onboarding.finish()
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(
sessionId = null,
- showShortcutEnginePicker = true,
- pastedText = null
+ showShortcutEnginePicker = true
)
val extras =
FragmentNavigator.Extras.Builder()
@@ -390,8 +389,7 @@ class HomeFragment : Fragment(), AccountObserver {
invokePendingDeleteJobs()
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(
sessionId = null,
- showShortcutEnginePicker = true,
- pastedText = null
+ showShortcutEnginePicker = true
)
nav(R.id.homeFragment, directions)
}
diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt
index 05420900dd..ab2491aeb8 100644
--- a/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt
@@ -26,8 +26,7 @@ class StartSearchIntentProcessor(
val directions = NavGraphDirections.actionGlobalSearch(
sessionId = null,
- showShortcutEnginePicker = true,
- pastedText = null
+ showShortcutEnginePicker = true
)
navController.nav(null, directions)
true
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 2c3c2e5cbd..e2b64706f3 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -108,6 +108,7 @@
app:popUpTo="@+id/searchFragment" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 60eaa1591f..b0a9549496 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -422,7 +422,6 @@
Share session
- Paste
Bookmark menu
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index eb2d6d5ba3..5813159d73 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -128,8 +128,7 @@ class DefaultBrowserToolbarControllerTest {
navController.nav(
R.id.browserFragment,
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
- sessionId = "1",
- pastedText = null
+ sessionId = "1"
)
)
}
@@ -276,7 +275,7 @@ class DefaultBrowserToolbarControllerTest {
verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.NEW_PRIVATE_TAB)) }
verify {
val directions = BrowserFragmentDirections
- .actionBrowserFragmentToSearchFragment(sessionId = null, pastedText = null)
+ .actionBrowserFragmentToSearchFragment(sessionId = null)
navController.nav(R.id.browserFragment, directions)
}
verify { browsingModeManager.mode = BrowsingMode.Private }
@@ -343,7 +342,7 @@ class DefaultBrowserToolbarControllerTest {
verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.NEW_TAB)) }
verify {
val directions = BrowserFragmentDirections
- .actionBrowserFragmentToSearchFragment(sessionId = null, pastedText = null)
+ .actionBrowserFragmentToSearchFragment(sessionId = null)
navController.nav(R.id.browserFragment, directions)
}
verify { browsingModeManager.mode = BrowsingMode.Normal }
@@ -370,7 +369,7 @@ class DefaultBrowserToolbarControllerTest {
verify { viewModel.previousFragmentId = R.id.browserFragment }
verify {
val directions = BrowserFragmentDirections
- .actionBrowserFragmentToSearchFragment(sessionId = null, pastedText = null)
+ .actionBrowserFragmentToSearchFragment(sessionId = null)
navController.nav(R.id.browserFragment, directions)
}
}
diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
index 8d34007962..ab6a63bcba 100644
--- a/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
@@ -67,8 +67,7 @@ class StartSearchIntentProcessorTest {
navController.navigate(
NavGraphDirections.actionGlobalSearch(
sessionId = null,
- showShortcutEnginePicker = true,
- pastedText = null
+ showShortcutEnginePicker = true
)
)
}