|
|
@ -10,6 +10,7 @@ import android.os.Bundle
|
|
|
|
import android.os.StrictMode
|
|
|
|
import android.os.StrictMode
|
|
|
|
import androidx.annotation.VisibleForTesting
|
|
|
|
import androidx.annotation.VisibleForTesting
|
|
|
|
import mozilla.components.feature.intent.processing.IntentProcessor
|
|
|
|
import mozilla.components.feature.intent.processing.IntentProcessor
|
|
|
|
|
|
|
|
import org.mozilla.fenix.HomeActivity.Companion.PRIVATE_BROWSING_MODE
|
|
|
|
import org.mozilla.fenix.components.IntentProcessorType
|
|
|
|
import org.mozilla.fenix.components.IntentProcessorType
|
|
|
|
import org.mozilla.fenix.components.getType
|
|
|
|
import org.mozilla.fenix.components.getType
|
|
|
|
import org.mozilla.fenix.components.metrics.Event
|
|
|
|
import org.mozilla.fenix.components.metrics.Event
|
|
|
@ -43,7 +44,15 @@ class IntentReceiverActivity : Activity() {
|
|
|
|
|
|
|
|
|
|
|
|
fun processIntent(intent: Intent) {
|
|
|
|
fun processIntent(intent: Intent) {
|
|
|
|
// Call process for side effects, short on the first that returns true
|
|
|
|
// Call process for side effects, short on the first that returns true
|
|
|
|
val processor = getIntentProcessors().firstOrNull { it.process(intent) }
|
|
|
|
val private = settings().openLinksInAPrivateTab
|
|
|
|
|
|
|
|
intent.putExtra(PRIVATE_BROWSING_MODE, private)
|
|
|
|
|
|
|
|
if (private) {
|
|
|
|
|
|
|
|
components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.PRIVATE))
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.NORMAL))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val processor = getIntentProcessors(private).firstOrNull { it.process(intent) }
|
|
|
|
val intentProcessorType = components.intentProcessors.getType(processor)
|
|
|
|
val intentProcessorType = components.intentProcessors.getType(processor)
|
|
|
|
|
|
|
|
|
|
|
|
launch(intent, intentProcessorType)
|
|
|
|
launch(intent, intentProcessorType)
|
|
|
@ -65,17 +74,14 @@ class IntentReceiverActivity : Activity() {
|
|
|
|
finish() // must finish() after starting the other activity
|
|
|
|
finish() // must finish() after starting the other activity
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private fun getIntentProcessors(): List<IntentProcessor> {
|
|
|
|
private fun getIntentProcessors(private: Boolean): List<IntentProcessor> {
|
|
|
|
val modeDependentProcessors = if (settings().openLinksInAPrivateTab) {
|
|
|
|
val modeDependentProcessors = if (private) {
|
|
|
|
components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.PRIVATE))
|
|
|
|
|
|
|
|
intent.putExtra(HomeActivity.PRIVATE_BROWSING_MODE, true)
|
|
|
|
|
|
|
|
listOf(
|
|
|
|
listOf(
|
|
|
|
components.intentProcessors.privateCustomTabIntentProcessor,
|
|
|
|
components.intentProcessors.privateCustomTabIntentProcessor,
|
|
|
|
components.intentProcessors.privateIntentProcessor
|
|
|
|
components.intentProcessors.privateIntentProcessor
|
|
|
|
)
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.NORMAL))
|
|
|
|
components.analytics.metrics.track(Event.OpenedLink(Event.OpenedLink.Mode.NORMAL))
|
|
|
|
intent.putExtra(HomeActivity.PRIVATE_BROWSING_MODE, false)
|
|
|
|
|
|
|
|
listOf(
|
|
|
|
listOf(
|
|
|
|
components.intentProcessors.customTabIntentProcessor,
|
|
|
|
components.intentProcessors.customTabIntentProcessor,
|
|
|
|
components.intentProcessors.intentProcessor
|
|
|
|
components.intentProcessors.intentProcessor
|
|
|
|