Check whether a second intent should be ignored in custom tabs

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.customtabs;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 
 import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.appmenu.ChromeAppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;
 import org.chromium.chrome.browser.document.BrandColorUtils;
 import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationEntry;
 
 /**
  * The activity for custom tabs. It will be launched on top of a client's task.
  */
 public class CustomTabActivity extends ChromeActivity {
+    private static final String TAG = "cr.CustomTabActivity";
     private static CustomTabContentHandler sActiveContentHandler;
 
     private CustomTab mTab;
     private FindToolbarManager mFindToolbarManager;
     private CustomTabIntentDataProvider mIntentDataProvider;
     private long mSessionId;
     private CustomTabContentHandler mCustomTabContentHandler;
 
     // This is to give the right package name while using the client's resources during an
     // overridePendingTransition call.
@@ skipping 12 matching lines @@
     }
 
     /**
      * Used to check whether an incoming intent can be handled by the
      * current {@link CustomTabContentHandler}.
      * @return Whether the active {@link CustomTabContentHandler} has handled the intent.
      */
     public static boolean handleInActiveContentIfNeeded(Intent intent) {
         if (sActiveContentHandler == null) return false;
 
+        if (sActiveContentHandler.shouldIgnoreIntent(intent)) {
+            Log.w(TAG, "Incoming intent to Custom Tab was ignored.");
+            return false;
+        }
+
         long intentSessionId = intent.getLongExtra(
                 CustomTabIntentDataProvider.EXTRA_CUSTOM_TABS_SESSION_ID,
                 CustomTabIntentDataProvider.INVALID_SESSION_ID);
         if (intentSessionId == CustomTabIntentDataProvider.INVALID_SESSION_ID) return false;
 
         if (sActiveContentHandler.getSessionId() != intentSessionId) return false;
         String url = IntentHandler.getUrlFromIntent(intent);
         if (TextUtils.isEmpty(url)) return false;
         sActiveContentHandler.loadUrlAndTrackFromTimestamp(new LoadUrlParams(url),
                 IntentHandler.getTimestampFromIntent(intent));
@@ skipping 90 matching lines @@
         mCustomTabContentHandler = new CustomTabContentHandler() {
             @Override
             public void loadUrlAndTrackFromTimestamp(LoadUrlParams params, long timestamp) {
                 loadUrlInCurrentTab(params, timestamp);
             }
 
             @Override
             public long getSessionId() {
                 return mSessionId;
             }
+
+            @Override
+            public boolean shouldIgnoreIntent(Intent intent) {
+                return mIntentHandler.shouldIgnoreIntent(CustomTabActivity.this, intent);
+            }
         };
         super.finishNativeInitialization();
     }
 
     @Override
     public void onStartWithNative() {
         super.onStartWithNative();
         setActiveContentHandler(mCustomTabContentHandler);
 
         if (!mRecordedStartupUma) {
@@ skipping 156 matching lines @@
 
     /**
      * @return The {@link CustomTabIntentDataProvider} for this {@link CustomTabActivity}. For test
      *         purposes only.
      */
     @VisibleForTesting
     CustomTabIntentDataProvider getIntentDataProvider() {
         return mIntentDataProvider;
     }
 }