Send all of the icon URLs listed in Web Manifest to WebAPK Server.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.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.chrome.browser.webapps;
 
 import android.content.ContentResolver;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.provider.Settings;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.webapps.ManifestUpgradeDetectorFetcher.FetchedManifestData;
 import org.chromium.webapk.lib.client.WebApkVersion;
 
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
  * WebApkUpdateManager manages when to check for updates to the WebAPK's Web Manifest, and sends
  * an update request to the WebAPK Server when an update is needed.
  */
 public class WebApkUpdateManager implements ManifestUpgradeDetector.Callback {
     private static final String TAG = "WebApkUpdateManager";
 
     /** Number of milliseconds between checks for whether the WebAPK's Web Manifest has changed. */
@@ skipping 46 matching lines @@
         mUpgradeDetector = buildManifestUpgradeDetector(tab, mMetaData);
         mUpgradeDetector.start();
     }
 
     public void destroy() {
         destroyUpgradeDetector();
     }
 
     @Override
     public void onFinishedFetchingWebManifestForInitialUrl(
-            boolean needsUpgrade, ManifestUpgradeDetector.FetchedManifestData data) {
+            boolean needsUpgrade, FetchedManifestData data) {
         onGotManifestData(needsUpgrade, data);
     }
 
     @Override
-    public void onGotManifestData(
-            boolean needsUpgrade, ManifestUpgradeDetector.FetchedManifestData data) {
+    public void onGotManifestData(boolean needsUpgrade, FetchedManifestData data) {
         WebappDataStorage storage = WebappRegistry.getInstance().getWebappDataStorage(mId);
         storage.updateTimeOfLastCheckForUpdatedWebManifest();
 
         boolean gotManifest = (data != null);
         needsUpgrade |= isShellApkVersionOutOfDate(mMetaData);
         Log.v(TAG, "Got Manifest: " + gotManifest);
         Log.v(TAG, "WebAPK upgrade needed: " + needsUpgrade);
 
         // If the Web Manifest was not found and an upgrade is requested, stop fetching Web
         // Manifests as the user navigates to avoid sending multiple WebAPK update requests. In
@@ skipping 16 matching lines @@
                 recordUpdate(storage, true);
             }
             return;
         }
 
         // Set WebAPK update as having failed in case that Chrome is killed prior to
         // {@link onBuiltWebApk} being called.
         recordUpdate(storage, false);
 
         if (data != null) {
-            updateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.iconUrl,
-                    data.iconMurmur2Hash, data.icon, data.displayMode, data.orientation,
-                    data.themeColor, data.backgroundColor);
+            updateAsync(data.startUrl, data.scopeUrl, data.name, data.shortName, data.bestIconUrl,
+                    data.bestIconMurmur2Hash, data.bestIcon, data.iconUrls, data.displayMode,
+                    data.orientation, data.themeColor, data.backgroundColor);
             return;
         }
 
         updateAsyncUsingAndroidManifestMetaData();
     }
 
     /**
      * Builds {@link ManifestUpgradeDetector}. In a separate function for the sake of tests.
      */
     protected ManifestUpgradeDetector buildManifestUpgradeDetector(
             Tab tab, WebApkMetaData metaData) {
         return new ManifestUpgradeDetector(tab, metaData, this);
     }
 
     /**
      * Sends a request to WebAPK Server to update WebAPK using the meta data from the WebAPK's
      * Android Manifest.
      */
     private void updateAsyncUsingAndroidManifestMetaData() {
+        // If the Web Manifest isn't available anymore, it is impossible to know which is the best
+        // icon URL. In this case, pass an empty URL to tell the server that there isn't a best
+        // icon URL.
+        Set<String> iconUrlsSet = mMetaData.iconUrlAndIconMurmur2HashMap.keySet();
+        String[] iconUrls = new String[iconUrlsSet.size()];
         updateAsync(mMetaData.startUrl, mMetaData.scope, mMetaData.name, mMetaData.shortName,
-                mMetaData.iconUrl, mMetaData.iconMurmur2Hash, mIcon, mMetaData.displayMode,
+                "", "", mIcon, iconUrlsSet.toArray(iconUrls), mMetaData.displayMode,
                 mMetaData.orientation, mMetaData.themeColor, mMetaData.backgroundColor);
     }
 
     /**
      * Sends request to WebAPK Server to update WebAPK.
      */
     protected void updateAsync(String startUrl, String scopeUrl, String name, String shortName,
-            String iconUrl, String iconMurmur2Hash, Bitmap icon, int displayMode, int orientation,
-            long themeColor, long backgroundColor) {
+            String bestIconUrl, String bestIconMurmur2Hash, Bitmap bestIcon, String[] iconUrls,
+            int displayMode, int orientation, long themeColor, long backgroundColor) {
         int versionCode = readVersionCodeFromAndroidManifest(mWebApkPackageName);
-        nativeUpdateAsync(mId, startUrl, scopeUrl, name, shortName, iconUrl, iconMurmur2Hash, icon,
-                displayMode, orientation, themeColor, backgroundColor, mMetaData.manifestUrl,
-                mWebApkPackageName, versionCode);
+        nativeUpdateAsync(mId, startUrl, scopeUrl, name, shortName, bestIconUrl,
+                bestIconMurmur2Hash, bestIcon, iconUrls, displayMode, orientation, themeColor,
+                backgroundColor, mMetaData.manifestUrl, mWebApkPackageName, versionCode);
     }
 
     /**
      * Destroys {@link mUpgradeDetector}. In a separate function for the sake of tests.
      */
     protected void destroyUpgradeDetector() {
         if (mUpgradeDetector == null) return;
 
         mUpgradeDetector.destroy();
         mUpgradeDetector = null;
@@ skipping 104 matching lines @@
      * Called after either a request to update the WebAPK has been sent or the update process
      * fails.
      */
     @CalledByNative
     private static void onBuiltWebApk(String id, boolean success) {
         WebappDataStorage storage = WebappRegistry.getInstance().getWebappDataStorage(id);
         recordUpdate(storage, success);
     }
 
     private static native void nativeUpdateAsync(String id, String startUrl, String scope,
-            String name, String shortName, String iconUrl, String iconMurmur2Hash, Bitmap icon,
-            int displayMode, int orientation, long themeColor, long backgroundColor,
-            String manifestUrl, String webApkPackage, int webApkVersion);
+            String name, String shortName, String bestIconUrl, String bestIconMurmur2Hash,
+            Bitmap bestIcon, String[] iconUrls, int displayMode, int orientation, long themeColor,
+            long backgroundColor, String manifestUrl, String webApkPackage, int webApkVersion);
 }