Upstream: Add URL intent filter to WebAPK

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.ComponentName;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ skipping 36 matching lines @@
         String name = null;
         String url = null;
         String scope = null;
         String encodedIcon = null;
         String runtimeHost = null;
         try {
             ApplicationInfo appInfo = getPackageManager().getApplicationInfo(
                     packageName, PackageManager.GET_META_DATA);
             Bundle bundle = appInfo.metaData;
             url = bundle.getString(META_DATA_HOST_URL);
+
+            String overrideUrl = getIntent().getDataString();
+            // TODO(pkotwicz): Use same logic as {@code IntentHandler#shouldIgnoreIntent()}
+            if (overrideUrl != null && overrideUrl.startsWith("https:")) {
+                url = overrideUrl;
+            }
+
             scope = bundle.getString(META_DATA_SCOPE);
             webappId = WebApkConstants.WEBAPK_ID_PREFIX + packageName;
             mac = bundle.getString(META_DATA_MAC);
             runtimeHost = bundle.getString(META_DATA_RUNTIME_HOST);
             name = (String) getPackageManager().getApplicationLabel(appInfo);
             // TODO(hanxi): find a neat solution to avoid encode/decode each time launch the
             // activity.
             Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.app_icon);
             encodedIcon = encodeBitmapAsString(icon);
             Log.w(TAG, "Url of the WebAPK: " + url);
@@ skipping 21 matching lines @@
      * The encoded string can be decoded using {@link decodeBitmapFromString(String)}.
      * @param bitmap The Bitmap to compress and encode.
      * @return the String encoding the Bitmap.
      */
     private static String encodeBitmapAsString(Bitmap bitmap) {
         if (bitmap == null) return "";
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, output);
         return Base64.encodeToString(output.toByteArray(), Base64.DEFAULT);
     }
+
+    /**
+     * Returns whether a url is valid.
+     * @param url The url to check.
+     * @return Whether the url is valid.
+     */
+    private static boolean isUrlValid(String url) {

[Yaron, 2016/05/12 13:45:12]

nit: remove

+        return url != null && url.startsWith("https:");
+    }
 }