blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #4155: Sets pastedText default value

master
Sawyer Blatz 2019-09-10 17:12:35 -07:00
parent 9d30d7bb03
commit 53b3f105ca
7 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
View File

@ -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

6
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -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)
}

3
app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt
View File

@ -26,8 +26,7 @@ class StartSearchIntentProcessor(
val directions = NavGraphDirections.actionGlobalSearch(
sessionId = null,
showShortcutEnginePicker = true,
pastedText = null
showShortcutEnginePicker = true
)
navController.nav(null, directions)
true

1
app/src/main/res/navigation/nav_graph.xml
View File

@ -108,6 +108,7 @@
app:popUpTo="@+id/searchFragment" />
<argument
android:name="pastedText"
android:defaultValue="@null"
app:argType="string"
app:nullable="true"/>
</fragment>

1
app/src/main/res/values/strings.xml
View File

@ -422,7 +422,6 @@
<!-- Content Description for session item share button -->
<string name="content_description_session_share">Share session</string>
<string name="paste">Paste</string>
<!-- Bookmarks -->
<!-- Content description for bookmarks library menu -->
<string name="bookmark_menu_content_description">Bookmark menu</string>

9
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
View File

@ -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)
}
}

3
app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
View File

@ -67,8 +67,7 @@ class StartSearchIntentProcessorTest {
navController.navigate(
NavGraphDirections.actionGlobalSearch(
sessionId = null,
showShortcutEnginePicker = true,
pastedText = null
showShortcutEnginePicker = true
)
)
}