blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Update IntentProcessor implementation to comply with new interface.

master
Sebastian 2020-03-04 16:44:29 +01:00 committed by Emily Kager
parent e2bfe8d0db
commit 7b170c4428
6 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
View File

@ -43,7 +43,7 @@ class FennecWebAppIntentProcessor(
/**
* Returns true if this intent should launch a progressive web app created in Fennec.
*/
override fun matches(intent: Intent) =
private fun matches(intent: Intent) =
intent.toSafeIntent().action == ACTION_FENNEC_WEBAPP
/**

2
app/src/main/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessor.kt
View File

@ -27,7 +27,7 @@ class FennecBookmarkShortcutsIntentProcessor(
/**
* Returns true if this Intent is of a Fennec pinned shortcut.
*/
override fun matches(intent: Intent): Boolean {
private fun matches(intent: Intent): Boolean {
return intent.toSafeIntent().action == ACTION_FENNEC_HOMESCREEN_SHORTCUT
}

2
app/src/main/java/org/mozilla/fenix/shortcut/NewTabShortcutIntentProcessor.kt
View File

@ -17,7 +17,7 @@ class NewTabShortcutIntentProcessor : IntentProcessor {
/**
* Returns true if this intent processor will handle the intent.
*/
override fun matches(intent: Intent): Boolean {
private fun matches(intent: Intent): Boolean {
val safeIntent = SafeIntent(intent)
return safeIntent.action == ACTION_OPEN_TAB || safeIntent.action == ACTION_OPEN_PRIVATE_TAB
}

4
app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt
View File

@ -40,9 +40,7 @@ class IntentReceiverActivityTest {
intent.flags = FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
`when`(testContext.components.intentProcessors.intentProcessor.process(intent)).thenReturn(true)
`when`(testContext.components.intentProcessors.intentProcessor.matches(intent)).thenReturn(true)
`when`(testContext.components.intentProcessors.customTabIntentProcessor.process(intent)).thenReturn(false)
`when`(testContext.components.intentProcessors.customTabIntentProcessor.matches(intent)).thenReturn(false)
val activity = Robolectric.buildActivity(IntentReceiverActivity::class.java, intent).get()
activity.processIntent(intent)
@ -155,7 +153,6 @@ class IntentReceiverActivityTest {
val intent = Intent()
`when`(testContext.components.intentProcessors.customTabIntentProcessor.process(intent)).thenReturn(true)
`when`(testContext.components.intentProcessors.customTabIntentProcessor.matches(intent)).thenReturn(true)
val activity = Robolectric.buildActivity(IntentReceiverActivity::class.java, intent).get()
activity.processIntent(intent)
@ -176,7 +173,6 @@ class IntentReceiverActivityTest {
val intent = Intent()
`when`(testContext.components.intentProcessors.privateCustomTabIntentProcessor.process(intent)).thenReturn(true)
`when`(testContext.components.intentProcessors.privateCustomTabIntentProcessor.matches(intent)).thenReturn(true)
val activity = Robolectric.buildActivity(IntentReceiverActivity::class.java, intent).get()
activity.processIntent(intent)

1
app/src/test/java/org/mozilla/fenix/components/IntentProcessorTypeTest.kt
View File

@ -103,7 +103,6 @@ class IntentProcessorTypeTest {
@Test
fun `get type for generic intent processor`() {
val processor = object : IntentProcessor {
override fun matches(intent: Intent) = true
override suspend fun process(intent: Intent) = true
}
val type = testContext.components.intentProcessors.getType(processor)

13
app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt
View File

@ -37,24 +37,13 @@ class FennecBookmarkShortcutsIntentProcessorTest {
private val sessionManager = mockk<SessionManager>(relaxed = true)
private val loadUrlUseCase = mockk<SessionUseCases.DefaultLoadUrlUseCase>(relaxed = true)
@Test
fun `only match Fennec pinned shortcut Intents`() {
val processor = FennecBookmarkShortcutsIntentProcessor(sessionManager, loadUrlUseCase)
assertAll {
assertThat(processor.matches(Intent(ACTION_FENNEC_HOMESCREEN_SHORTCUT))).isTrue()
assertThat(processor.matches(Intent("ShouldNotMatch"))).isFalse()
assertThat(processor.matches(Intent())).isFalse()
}
}
@Test
fun `do not process blank Intents`() = runBlocking {
val processor = FennecBookmarkShortcutsIntentProcessor(sessionManager, loadUrlUseCase)
val fennecShortcutsIntent = Intent(ACTION_FENNEC_HOMESCREEN_SHORTCUT)
fennecShortcutsIntent.data = Uri.parse("http://mozilla.org")
val wasEmptyIntentProcessed = processor.matches(Intent())
val wasEmptyIntentProcessed = processor.process(Intent())
assertThat(wasEmptyIntentProcessed).isFalse()
verify {