Add support for webapk without runtimeHost

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;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 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.
  */
 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 =
@@ skipping 37 matching lines @@
     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);
+        if (runtimeHost == null) return false;
+
         boolean isFromExternalIntent = (overrideUrl != null);
         int source = getIntent().getIntExtra(WebApkConstants.EXTRA_SOURCE, 0);
         if (isFromExternalIntent && source == WebApkConstants.SHORTCUT_SOURCE_UNKNOWN) {
             source = WebApkConstants.SHORTCUT_SOURCE_EXTERNAL_INTENT;
         }
 
         // 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, isFromExternalIntent);
 
         try {
             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;
-        }
+        String hostBrowserPackageName = WebApkConstants.DEFAULT_HOST_BROWSER;
 
         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;
         }
         return appInfo.metaData.getString(WebApkMetaDataKeys.START_URL);
     }
 }