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

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.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.webapk.shell_apk;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ skipping 49 matching lines @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         launch();
         finish();
     }
 
     /**
      * Launches WebAPK.
      */
     private void launch() {
-        String startUrl = getStartUrl();
+        String overrideUrl = getOverrideUrl();
+        String startUrl = (overrideUrl != null) ? overrideUrl : getStartUrl();
         if (startUrl == null) {
             return;
         }
-        if (launchHostBrowserInWebApkMode(startUrl)) {
+
+        if (launchHostBrowserInWebApkMode(startUrl, overrideUrl)) {
             return;
         }
         if (launchBrowser(startUrl)) {
             return;
         }
         installBrowser();
     }
 
     /**
      * Launches host browser in WebAPK mode.
      * @return True if successful.
      */
-    private boolean launchHostBrowserInWebApkMode(String startUrl) {
-        Log.v(TAG, "Url of the WebAPK: " + startUrl);
+    private boolean launchHostBrowserInWebApkMode(String startUrl, String overrideUrl) {
+        Log.v(TAG, "Url of the WebAPK: " + overrideUrl);
         String packageName = getPackageName();
         Log.v(TAG, "Package name of the WebAPK:" + packageName);
 
         String runtimeHost = WebApkUtils.getHostBrowserPackageName(this);
         int source = getIntent().getIntExtra(WebApkConstants.EXTRA_SOURCE, 0);
+        // The override URL is non null when the WebAPK is launched from a deep link. The WebAPK
+        // should navigate to the URL in the deep link even if the WebAPK is already open.
+        boolean navigateIfAlreadyOpen = (overrideUrl != null);

[dominickn, 2017/03/21 02:09:33]

Inline this in the putExtra call (but leave the comment).

         Intent intent = new Intent();
         intent.setAction(ACTION_START_WEBAPK);
         intent.setPackage(runtimeHost);
         intent.putExtra(WebApkConstants.EXTRA_URL, startUrl)
                 .putExtra(WebApkConstants.EXTRA_SOURCE, source)
-                .putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, packageName);
+                .putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, packageName)
+                .putExtra(WebApkConstants.EXTRA_WEBAPK_NAVIGATE_IF_ALREADY_OPEN,
+                        navigateIfAlreadyOpen);
 
         try {
             startActivity(intent);
             return true;
         } catch (ActivityNotFoundException e) {
             Log.w(TAG, "Unable to launch browser in WebAPK mode.");
             e.printStackTrace();
             return false;
         }
     }
@@ skipping 38 matching lines @@
         if (hostBrowserPackageName == null) {
             return;
         }
 
         try {
             startActivity(createInstallIntent(hostBrowserPackageName));
         } catch (ActivityNotFoundException e) {
         }
     }
 
-    /**
-     * Returns the URL that the browser should navigate to.
-     */
-    private String getStartUrl() {
+    /** Retrieves URL from the intent's data. Returns null if a URL could not be retrieved. */
+    private String getOverrideUrl() {
         String overrideUrl = getIntent().getDataString();
         if (overrideUrl != null && overrideUrl.startsWith("https:")) {
             return overrideUrl;
         }
+        return null;
+    }
 
+    /** Returns the start URL from the Android Manifest. */
+    private String getStartUrl() {
         ApplicationInfo appInfo;
         try {
             appInfo = getPackageManager().getApplicationInfo(
                     getPackageName(), PackageManager.GET_META_DATA);
         } catch (NameNotFoundException e) {
             return null;
         }
         return appInfo.metaData.getString(WebApkMetaDataKeys.START_URL);
     }
 }