[Android WebAPKs] Don't navigate WebAPK when launching it from launcher

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java

 // Copyright 2016 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.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ skipping 13 matching lines @@
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Stores info for WebAPK.
  */
 public class WebApkInfo extends WebappInfo {
     private static final String TAG = "WebApkInfo";
 
+    private boolean mForceNavigation;
     private String mWebApkPackageName;
     private int mShellApkVersion;
     private String mManifestUrl;
     private String mManifestStartUrl;
     private Map<String, String> mIconUrlToMurmur2HashMap;
 
     public static WebApkInfo createEmpty() {
         return new WebApkInfo();
     }
 
     /**
      * Constructs a WebApkInfo from the passed in Intent and <meta-data> in the WebAPK's Android
      * manifest.
      * @param intent Intent containing info about the app.
      */
     public static WebApkInfo create(Intent intent) {
         String webApkPackageName =
                 IntentUtils.safeGetStringExtra(intent, WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME);
         if (TextUtils.isEmpty(webApkPackageName)) {
             return null;
         }
 
         String url = urlFromIntent(intent);
         int source = sourceFromIntent(intent);
-        return create(webApkPackageName, url, source);
+        boolean forceNavigation = IntentUtils.safeGetBooleanExtra(
+                intent, WebApkConstants.EXTRA_WEBAPK_FORCE_NAVIGATION, false);
+
+        return create(webApkPackageName, url, source, forceNavigation);
     }
 
     /**
      * Constructs a WebApkInfo from the passed in parameters and <meta-data> in the WebAPK's Android
      * manifest.
      *
      * @param webApkPackageName The package name of the WebAPK.
      * @param url Url that the WebAPK should navigate to when launched.
      * @param source Source that the WebAPK was launched from.
+     * @param forceNavigation Whether the WebAPK should navigate to {@link url} if it is already
+     *     running.
      */
-    public static WebApkInfo create(String webApkPackageName, String url, int source) {
+    public static WebApkInfo create(
+            String webApkPackageName, String url, int source, boolean forceNavigation) {
         // Unlike non-WebAPK web apps, WebAPK ids are predictable. A malicious actor may send an
         // intent with a valid start URL and arbitrary other data. Only use the start URL, the
         // package name and the ShortcutSource from the launch intent and extract the remaining data
         // from the <meta-data> in the WebAPK's Android manifest.
 
         Bundle bundle = extractWebApkMetaData(webApkPackageName);
         if (bundle == null) {
             return null;
         }
 
@@ skipping 13 matching lines @@
         int shellApkVersion =
                 IntentUtils.safeGetInt(bundle, WebApkMetaDataKeys.SHELL_APK_VERSION, 0);
 
         String manifestUrl = IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.WEB_MANIFEST_URL);
         String manifestStartUrl = IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.START_URL);
         Map<String, String> iconUrlToMurmur2HashMap = getIconUrlAndIconMurmur2HashMap(bundle);
 
         int iconId = IntentUtils.safeGetInt(bundle, WebApkMetaDataKeys.ICON_ID, 0);
         Bitmap icon = decodeImageResource(webApkPackageName, iconId);
 
-        return create(WebApkConstants.WEBAPK_ID_PREFIX + webApkPackageName, url, scope,
-                new Icon(icon), name, shortName, displayMode, orientation, source, themeColor,
-                backgroundColor, webApkPackageName, shellApkVersion, manifestUrl, manifestStartUrl,
-                iconUrlToMurmur2HashMap);
+        return create(WebApkConstants.WEBAPK_ID_PREFIX + webApkPackageName, url, forceNavigation,
+                scope, new Icon(icon), name, shortName, displayMode, orientation, source,
+                themeColor, backgroundColor, webApkPackageName, shellApkVersion, manifestUrl,
+                manifestStartUrl, iconUrlToMurmur2HashMap);
     }
 
     /**
      * Construct a {@link WebApkInfo} instance.
      *
      * @param id                      ID for the WebAPK.
      * @param url                     URL that the WebAPK should navigate to when launched.
+     * @param forceNavigation         Whether the WebAPK should navigate to {@link url} if the
+     *                                WebAPK is already open.
      * @param scope                   Scope for the WebAPK.
      * @param icon                    Icon to show for the WebAPK.
      * @param name                    Name of the WebAPK.
      * @param shortName               The short name of the WebAPK.
      * @param displayMode             Display mode of the WebAPK.
      * @param orientation             Orientation of the WebAPK.
      * @param source                  Source that the WebAPK was launched from.
      * @param themeColor              The theme color of the WebAPK.
      * @param backgroundColor         The background color of the WebAPK.
      * @param webApkPackageName       The package of the WebAPK.
      * @param shellApkVersion         Version of the code in //chrome/android/webapk/shell_apk.
      * @param manifestUrl             URL of the Web Manifest.
      * @param manifestStartUrl        URL that the WebAPK should navigate to when launched from the
      *                                homescreen. Different from the {@link url} parameter if the
      *                                WebAPK is launched from a deep link.
      * @param iconUrlToMurmur2HashMap Map of the WebAPK's icon URLs to Murmur2 hashes of the
      *                                icon untransformed bytes.
      */
-    public static WebApkInfo create(String id, String url, String scope, Icon icon, String name,
-            String shortName, int displayMode, int orientation, int source, long themeColor,
-            long backgroundColor, String webApkPackageName, int shellApkVersion, String manifestUrl,
-            String manifestStartUrl, Map<String, String> iconUrlToMurmur2HashMap) {
+    public static WebApkInfo create(String id, String url, boolean forceNavigation, String scope,
+            Icon icon, String name, String shortName, int displayMode, int orientation, int source,
+            long themeColor, long backgroundColor, String webApkPackageName, int shellApkVersion,
+            String manifestUrl, String manifestStartUrl,
+            Map<String, String> iconUrlToMurmur2HashMap) {
         if (id == null || url == null || manifestStartUrl == null || webApkPackageName == null) {
             Log.e(TAG,
                     "Incomplete data provided: " + id + ", " + url + ", " + manifestStartUrl + ", "
                             + webApkPackageName);
             return null;
         }
 
         // The default scope should be computed from the Web Manifest start URL. If the WebAPK was
         // launched from a deep link {@link startUrl} may be different from the Web Manifest start
         // URL.
         if (TextUtils.isEmpty(scope)) {
             scope = ShortcutHelper.getScopeFromUrl(manifestStartUrl);
         }
 
-        return new WebApkInfo(id, url, scope, icon, name, shortName, displayMode,
+        return new WebApkInfo(id, url, forceNavigation, scope, icon, name, shortName, displayMode,
                 orientation, source, themeColor, backgroundColor, webApkPackageName,
                 shellApkVersion, manifestUrl, manifestStartUrl, iconUrlToMurmur2HashMap);
     }
 
-    protected WebApkInfo(String id, String url, String scope, Icon icon, String name,
-            String shortName, int displayMode, int orientation, int source, long themeColor,
-            long backgroundColor, String webApkPackageName, int shellApkVersion, String manifestUrl,
-            String manifestStartUrl, Map<String, String> iconUrlToMurmur2HashMap) {
+    protected WebApkInfo(String id, String url, boolean forceNavigation, String scope, Icon icon,
+            String name, String shortName, int displayMode, int orientation, int source,
+            long themeColor, long backgroundColor, String webApkPackageName, int shellApkVersion,
+            String manifestUrl, String manifestStartUrl,
+            Map<String, String> iconUrlToMurmur2HashMap) {
         super(id, url, scope, icon, name, shortName, displayMode, orientation, source, themeColor,
                 backgroundColor, false);
+        mForceNavigation = forceNavigation;
         mWebApkPackageName = webApkPackageName;
         mShellApkVersion = shellApkVersion;
         mManifestUrl = manifestUrl;
         mManifestStartUrl = manifestStartUrl;
         mIconUrlToMurmur2HashMap = iconUrlToMurmur2HashMap;
     }
 
     protected WebApkInfo() {}
 
     @Override
+    public boolean shouldForceNavigation() {
+        return mForceNavigation;
+    }
+
+    @Override
     public String webApkPackageName() {
         return mWebApkPackageName;
     }
 
     public int shellApkVersion() {
         return mShellApkVersion;
     }
 
     public String manifestUrl() {
         return mManifestUrl;
     }
 
     public String manifestStartUrl() {
         return mManifestStartUrl;
     }
 
     public Map<String, String> iconUrlToMurmur2HashMap() {
         return mIconUrlToMurmur2HashMap;
     }
 
     @Override
     public void setWebappIntentExtras(Intent intent) {
         // For launching a {@link WebApkActivity}.
         intent.putExtra(ShortcutHelper.EXTRA_URL, uri().toString());
         intent.putExtra(ShortcutHelper.EXTRA_SOURCE, source());
         intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName());
+        intent.putExtra(WebApkConstants.EXTRA_WEBAPK_FORCE_NAVIGATION, mForceNavigation);
     }
 
     /**
      * Extracts meta data from a WebAPK's Android Manifest.
      * @param webApkPackageName WebAPK's package name.
      * @return Bundle with the extracted meta data.
      */
     private static Bundle extractWebApkMetaData(String webApkPackageName) {
         PackageManager packageManager = ContextUtils.getApplicationContext().getPackageManager();
         try {
@@ skipping 143 matching lines @@
             return ScreenOrientationValues.PORTRAIT;
         } else if (orientation.equals("portrait-primary")) {
             return ScreenOrientationValues.PORTRAIT_PRIMARY;
         } else if (orientation.equals("portrait-secondary")) {
             return ScreenOrientationValues.PORTRAIT_SECONDARY;
         } else {
             return ScreenOrientationValues.DEFAULT;
         }
     }
 }