From 2dfd8339412807dcbe2cfd51dd662c4f84a91f30 Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Fri, 22 May 2020 12:15:15 +0300
Subject: [PATCH] For #10844 - Fennec page shortcuts will open in normal tabs

This comes to resolve a small regression in which they were opened in new
custom tab.
---
 .../main/java/org/mozilla/fenix/IntentReceiverActivity.kt    | 1 +
 .../java/org/mozilla/fenix/components/IntentProcessorType.kt | 3 ++-
 .../java/org/mozilla/fenix/components/IntentProcessors.kt    | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
index 05b917ee1..fff6061a4 100644
--- a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
@@ -75,6 +75,7 @@ class IntentReceiverActivity : Activity() {
 
         return listOf(components.intentProcessors.migrationIntentProcessor) +
             components.intentProcessors.externalAppIntentProcessors +
+            components.intentProcessors.fennecPageShortcutIntentProcessor +
             modeDependentProcessors +
             NewTabShortcutIntentProcessor()
     }
diff --git a/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt b/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt
index 5127f3331..ea4dca70e 100644
--- a/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt
@@ -42,6 +42,7 @@ fun IntentProcessors.getType(processor: IntentProcessor?) = when {
             customTabIntentProcessor == processor ||
             privateCustomTabIntentProcessor == processor -> IntentProcessorType.EXTERNAL_APP
     intentProcessor == processor ||
-            privateIntentProcessor == processor -> IntentProcessorType.NEW_TAB
+            privateIntentProcessor == processor ||
+            fennecPageShortcutIntentProcessor == processor -> IntentProcessorType.NEW_TAB
     else -> IntentProcessorType.OTHER
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt
index c3c7e363a..70654620d 100644
--- a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt
@@ -69,11 +69,14 @@ class IntentProcessors(
                 store = customTabsStore
             ),
             WebAppIntentProcessor(sessionManager, sessionUseCases.loadUrl, manifestStorage),
-            FennecBookmarkShortcutsIntentProcessor(sessionManager, sessionUseCases.loadUrl),
             FennecWebAppIntentProcessor(context, sessionManager, sessionUseCases.loadUrl, manifestStorage)
         )
     }
 
+    val fennecPageShortcutIntentProcessor by lazy {
+        FennecBookmarkShortcutsIntentProcessor(sessionManager, sessionUseCases.loadUrl)
+    }
+
     val migrationIntentProcessor by lazy {
         MigrationIntentProcessor(migrationStore)
     }