Fix: long-tapping a WebAPK in recents shows Chrome.

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

Index: chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
index 5a0b7d4ad695cdde432daec0b660ab4e1c15195f..aa1966d207162d0f0886412542b492a1bc016db8 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
@@ -5,19 +5,9 @@
 package org.chromium.webapk.shell_apk;
 
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
-
-import org.chromium.webapk.lib.common.WebApkConstants;
-import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
-
-import java.net.URISyntaxException;
 
 /**
  * WebAPK's main Activity.
@@ -25,160 +15,23 @@ import java.net.URISyntaxException;
 public class MainActivity extends Activity {
     private static final String TAG = "cr_MainActivity";
 
-    /**
-     * Name of class which launches browser in WebAPK mode.
-     */
-    private static final String HOST_BROWSER_LAUNCHER_CLASS_NAME =
-            "org.chromium.webapk.lib.runtime_library.HostBrowserLauncher";
-
-    // Action for launching {@link WebappLauncherActivity}. Must stay in sync with
-    // {@link WebappLauncherActivity#ACTION_START_WEBAPP}.
-    public static final String ACTION_START_WEBAPK =
-            "com.google.android.apps.chrome.webapps.WebappManager.ACTION_START_WEBAPP";
-
-    // Must stay in sync with
-    // {@link org.chromium.chrome.browser.ShortcutHelper#REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB}.
-    private static final String REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB =
-            "REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB";
-
-    /**
-     * Key for passing app icon id.
-     */
-    private static final String KEY_APP_ICON_ID = "app_icon_id";
-
-    /**
-     * Creates install Intent.
-     * @param packageName Package to install.
-     * @return The intent.
-     */
-    public static Intent createInstallIntent(String packageName) {
-        String marketUrl = "market://details?id=" + packageName;
-        return new Intent(Intent.ACTION_VIEW, Uri.parse(marketUrl));
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        launch();
-        finish();
-    }
-
-    /**
-     * Launches WebAPK.
-     */
-    private void launch() {
-        String overrideUrl = getOverrideUrl();
-        String startUrl = (overrideUrl != null) ? overrideUrl : getStartUrl();
-        if (startUrl == null) {
-            return;
-        }
-
-        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, String overrideUrl) {
-        Log.v(TAG, "Url of the WebAPK: " + startUrl);
-        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.
-        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_FORCE_NAVIGATION, (overrideUrl != null));
-
-        try {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            LaunchWebApkHelper helper = new LaunchWebApkHelper();
+            helper.launch(this);
+            finish();
+        } else {
+            // On L+, we launch {@link ShellActivity} before launching {@link WebApkActivity}.
+            // This activity is in the same task stack with {@link WebApkActivity} and as the root
+            // activity. Therefore, long-pressing WebAPK's icon in recents shows the WebAPK's title
+            // and icon, not Chrome's. See crbug.com/700157.
+            Intent intent = new Intent();
+            intent.setClassName(getPackageName(), ShellActivity.class.getName());
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             startActivity(intent);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            Log.w(TAG, "Unable to launch browser in WebAPK mode.");
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * Launches browser (not necessarily the host browser).
-     * @param startUrl URL to navigate browser to.
-     * @return True if successful.
-     */
-    private boolean launchBrowser(String startUrl) {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(startUrl));
-        intent.addCategory(Intent.CATEGORY_BROWSABLE);
-
-        // The WebAPK can handle {@link startUrl}. Set a selector to prevent the WebAPK from
-        // launching itself.
-        try {
-            Intent selectorIntent = Intent.parseUri("https://", Intent.URI_INTENT_SCHEME);
-            intent.setSelector(selectorIntent);
-        } catch (URISyntaxException e) {
-            return false;
-        }
-
-        // Add extras in case that the URL is launched in Chrome.
-        int source =
-                getIntent().getIntExtra(WebApkConstants.EXTRA_SOURCE, Intent.URI_INTENT_SCHEME);
-        intent.putExtra(REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB, true)
-              .putExtra(WebApkConstants.EXTRA_SOURCE, source);
-
-        try {
-            startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Launches the Play Store with the host browser's page.
-     */
-    private void installBrowser() {
-        String hostBrowserPackageName = WebApkUtils.getHostBrowserPackageName(this);
-        if (hostBrowserPackageName == null) {
-            return;
-        }
-
-        try {
-            startActivity(createInstallIntent(hostBrowserPackageName));
-        } catch (ActivityNotFoundException e) {
-        }
-    }
-
-    /** 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;
+            finishAndRemoveTask();
         }
-        return appInfo.metaData.getString(WebApkMetaDataKeys.START_URL);
     }
 }