Redirecting off-origin navigations in PWAs to CCT.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.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.webapps;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ skipping 148 matching lines @@
         Intent launchIntent = new Intent();
         launchIntent.setClassName(this, activityName);
         info.setWebappIntentExtras(launchIntent);
 
         // On L+, firing intents with the exact same data should relaunch a particular
         // Activity.
         launchIntent.setAction(Intent.ACTION_VIEW);
         launchIntent.setData(Uri.parse(WebappActivity.WEBAPP_SCHEME + "://" + info.id()));
         launchIntent.setFlags(
                 Intent.FLAG_ACTIVITY_NEW_TASK | ApiCompatibilityUtils.getActivityNewDocumentFlag());
-
-        if (!isWebApk) {
-            // If this is launching from a notification, we want to ensure that the URL being
-            // launched is the URL in the intent. If a paused WebappActivity exists for this id,
-            // then by default it will be focused and we have no way of sending the desired URL to
-            // it (the intent is swallowed). As a workaround, set the CLEAR_TOP flag to ensure that
-            // the existing Activity is cleared and relaunched with this intent.
-            // TODO(dominickn): ideally, we want be able to route an intent to
-            // WebappActivity.onNewIntent instead of restarting the Activity.
-            if (source == ShortcutSource.NOTIFICATION) {
-                launchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            }
-        }
+        // Setting FLAG_ACTIVITY_CLEAR_TOP handles 2 edge cases:
+        // - If a plain PWA is launching from a notification, we want to ensure that the URL being

[dominickn, 2017/05/23 03:20:13]

Nit: "legacy" PWA, not "plain" PWA.

[piotrs, 2017/05/23 04:11:11]

Done.

+        // launched is the URL in the intent. If a paused WebappActivity exists for this id,
+        // then by default it will be focused and we have no way of sending the desired URL to
+        // it (the intent is swallowed). As a workaround, set the CLEAR_TOP flag to ensure that
+        // the existing Activity is cleared and relaunched with this intent.
+        // - If a WebAPK is having a CustomTabActivity on top of it in the same Task, and user
+        // clicks a link to takes them back to the scope of a WebAPK, we want to destroy the
+        // CustomTabActivity activity and go back to the WebAPK activity. It is intentional that
+        // Custom Tab will not be reachable with a back button.
+        // TODO(dominickn): ideally, we want be able to route an intent to onNewIntent() instead of
+        // restarting the Activity.
+        launchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         return launchIntent;
     }
 
     /**
      * Brings a live WebappActivity back to the foreground if one exists for the given tab ID.
      * @param tabId ID of the Tab to bring back to the foreground.
      * @return True if a live WebappActivity was found, false otherwise.
      */
     public static boolean bringWebappToFront(int tabId) {
         if (tabId == Tab.INVALID_TAB_ID) return false;
@@ skipping 31 matching lines @@
         String url = IntentUtils.safeGetStringExtra(intent, ShortcutHelper.EXTRA_URL);
         if (TextUtils.isEmpty(url)) return false;
 
         if (!webApkPackage.equals(WebApkValidator.queryWebApkPackage(this, url))) {
             Log.d(TAG, "%s is not within scope of %s WebAPK", url, webApkPackage);
             return false;
         }
         return true;
     }
 }