From e1b84a7a087a6163330b7b7b7d668c6618bd5ae6 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Tue, 17 Sep 2019 15:20:06 -0700
Subject: [PATCH] For #5396: Reverts broken activity alias

---
 app/src/main/AndroidManifest.xml              | 48 -------------------
 .../mozilla/fenix/IntentReceiverActivity.kt   | 10 +---
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07df0726c..c29b36552 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -123,54 +123,6 @@
                 android:resource="@mipmap/ic_launcher" />
         </activity>
 
-        <activity-alias
-                android:name="org.mozilla.fenix.alias.IntentReceiverActivity"
-                android:label="@string/app_name_private"
-                android:icon="@mipmap/ic_launcher_private"
-                android:roundIcon="@mipmap/ic_launcher_private_round"
-                android:targetActivity=".IntentReceiverActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:mimeType="text/html" />
-                <data android:mimeType="text/plain" />
-                <data android:mimeType="application/xhtml+xml" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.ASSIST" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <meta-data
-                android:name="com.android.systemui.action_assist_icon"
-                android:resource="@mipmap/ic_launcher_private" />
-            <meta-data
-                android:name="private"
-                android:value="true" />
-        </activity-alias>
-
         <activity
             android:name=".browser.BrowserPerformanceTestActivity"
             android:enabled="${isRaptorEnabled}"
diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
index cd88cf842..d5832ebc5 100644
--- a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix
 
 import android.app.Activity
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.speech.RecognizerIntent
 import kotlinx.coroutines.MainScope
@@ -17,7 +16,6 @@ import org.mozilla.fenix.customtabs.AuthCustomTabActivity.Companion.EXTRA_AUTH_C
 import org.mozilla.fenix.customtabs.CustomTabActivity
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.metrics
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.intent.StartSearchIntentProcessor
 
 class IntentReceiverActivity : Activity() {
@@ -35,11 +33,6 @@ class IntentReceiverActivity : Activity() {
             return
         }
 
-        val isPrivate = packageManager
-            ?.getActivityInfo(componentName, PackageManager.GET_META_DATA)
-            ?.metaData
-            ?.getBoolean(PRIVATE_MODE) ?: this.settings.usePrivateMode
-
         MainScope().launch {
             // The intent property is nullable, but the rest of the code below
             // assumes it is not. If it's null, then we make a new one and open
@@ -48,7 +41,7 @@ class IntentReceiverActivity : Activity() {
 
             val intentProcessors = listOf(
                 components.utils.customTabIntentProcessor,
-                if (isPrivate) components.utils.privateIntentProcessor else components.utils.intentProcessor
+                components.utils.intentProcessor
             )
 
             if (intent.getBooleanExtra(SPEECH_PROCESSING, false)) {
@@ -148,7 +141,6 @@ class IntentReceiverActivity : Activity() {
         private const val SPEECH_REQUEST_CODE = 0
         const val SPEECH_PROCESSING = "speech_processing"
         const val PREVIOUS_INTENT = "previous_intent"
-        const val PRIVATE_MODE = "private"
         const val ACTION_OPEN_TAB = "org.mozilla.fenix.OPEN_TAB"
         const val ACTION_OPEN_PRIVATE_TAB = "org.mozilla.fenix.OPEN_PRIVATE_TAB"
     }