[Android]: Hide add-to-homescreen app menu item when WebAPK is installed

chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.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.webapk.lib.client;
 
 import static org.chromium.webapk.lib.common.WebApkConstants.WEBAPK_PACKAGE_PREFIX;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.Signature;
 import android.util.Log;
 
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
  * Checks whether a URL belongs to a WebAPK, and whether a WebAPK is signed by the WebAPK Minting
  * Server.
  */
 public class WebApkValidator {
 
     private static final String TAG = "WebApkValidator";
     private static byte[] sExpectedSignature;
 
     /**
      * Queries the PackageManager to determine whether a WebAPK can handle the URL. Ignores
      * whether the user has selected a default handler for the URL and whether the default
      * handler is the WebAPK.
      *
      * NOTE(yfriedman): This can fail if multiple WebAPKs can match the supplied url.
      *
      * @param context The application context.
      * @param url The url to check.
      * @return Package name of WebAPK which can handle the URL. Null if the url should not be
      * handled by a WebAPK.
      */
     public static String queryWebApkPackage(Context context, String url) {

[pkotwicz, 2017/02/22 16:50:20]

Can you make this function use queryResolveInfo()?

[gonzalon, 2017/02/22 17:17:40]

I don't understand why. Isn't that what findWebApkPackage is doing? We'd be
repeating code, wouldn't we?

[pkotwicz, 2017/02/22 20:26:09]

I wanted to merge resolveInfosForUrl() and queryResolveInfo()

+        return findWebApkPackage(context, resolveInfosForUrl(context, url));
+    }
+
+    /**
+     * Queries the PackageManager to determine whether a WebAPK can handle the URL. Ignores
+     * whether the user has selected a default handler for the URL and whether the default
+     * handler is the WebAPK.
+     *
+     * NOTE: This can fail if multiple WebAPKs can match the supplied url.
+     *
+     * @param context The application context.
+     * @param url The url to check.
+     * @return Resolve Info of a WebAPK which can handle the URL. Null if the url should not be

[pkotwicz, 2017/02/22 20:26:09]

Nit: "Resolve Info of a WebAPK" -> "ResolveInfo of WebAPK"

+     * handled by a WebAPK.
+     */
+    public static ResolveInfo queryWebApk(Context context, String url) {

[pkotwicz, 2017/02/22 16:50:20]

Can you rename this function to queryResolveInfo() ?

[gonzalon, 2017/02/22 17:17:40]

Done.

+        for (ResolveInfo info : resolveInfosForUrl(context, url)) {
+            if (info.activityInfo != null
+                    && isValidWebApk(context, info.activityInfo.packageName)) {
+                return info;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Fetches the list of resolve infos from the PackageManager that can handle the URL.
+     *
+     * @param context The application context.
+     * @param url The url to check.
+     * @return The list of resolve infos found that can handle the URL.
+     */
+    private static List<ResolveInfo> resolveInfosForUrl(Context context, String url) {
         Intent intent;
         try {
             intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
         } catch (Exception e) {
-            return null;
+            return new LinkedList<>();
         }
 
         intent.addCategory(Intent.CATEGORY_BROWSABLE);
         intent.setComponent(null);
         Intent selector = intent.getSelector();
         if (selector != null) {
             selector.addCategory(Intent.CATEGORY_BROWSABLE);
             selector.setComponent(null);
         }
-
-        List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentActivities(
+        return context.getPackageManager().queryIntentActivities(
                 intent, PackageManager.GET_RESOLVED_FILTER);
-        return findWebApkPackage(context, resolveInfos);
     }
 
     /**
      * @param context The context to use to check whether WebAPK is valid.
      * @param infos The ResolveInfos to search.
      * @return Package name of the ResolveInfo which corresponds to a WebAPK. Null if none of the
      * ResolveInfos corresponds to a WebAPK.
      */
     public static String findWebApkPackage(Context context, List<ResolveInfo> infos) {

[pkotwicz, 2017/02/22 16:50:20]

Can you create a new function findResolveInfo() and make findWebApkPackage() use
it?

[gonzalon, 2017/02/22 17:17:40]

Done.

         for (ResolveInfo info : infos) {
             if (info.activityInfo != null
                     && isValidWebApk(context, info.activityInfo.packageName)) {
                 return info.activityInfo.packageName;
             }
         }
         return null;
     }
 
     /**
@@ skipping 39 matching lines @@
      * with for the current host.
      * @param expectedSignature
      */
     public static void initWithBrowserHostSignature(byte[] expectedSignature) {
         if (sExpectedSignature != null) {
             return;
         }
         sExpectedSignature = Arrays.copyOf(expectedSignature, expectedSignature.length);
     }
 }