webapps: initial addition of splash screen icon downloading

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

 // Copyright 2013 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;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ skipping 15 matching lines @@
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.webapps.WebappDataStorage;
 import org.chromium.chrome.browser.webapps.WebappLauncherActivity;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 import org.chromium.content_public.common.ScreenOrientationConstants;
 import org.chromium.ui.widget.Toast;
 
 import java.io.ByteArrayOutputStream;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * This is a helper class to create shortcuts on the Android home screen.
  */
 public class ShortcutHelper {
     public static final String EXTRA_ICON = "org.chromium.chrome.browser.webapp_icon";
     public static final String EXTRA_ID = "org.chromium.chrome.browser.webapp_id";
     public static final String EXTRA_MAC = "org.chromium.chrome.browser.webapp_mac";
     // EXTRA_TITLE is present for backward compatibility reasons
     public static final String EXTRA_TITLE = "org.chromium.chrome.browser.webapp_title";
@@ skipping 52 matching lines @@
     }
 
     /**
      * Called when we have to fire an Intent to add a shortcut to the homescreen.
      * If the webpage indicated that it was capable of functioning as a webapp, it is added as a
      * shortcut to a webapp Activity rather than as a general bookmark. User is sent to the
      * homescreen as soon as the shortcut is created.
      */
     @SuppressWarnings("unused")
     @CalledByNative
-    private static void addShortcut(Context context, String url, String userTitle, String name,
-            String shortName, Bitmap icon, boolean isWebappCapable, int orientation, int source,
-            long themeColor, long backgroundColor) {
+    private static void addShortcut(Context context, String id, String url, String userTitle,
+            String name, String shortName, Bitmap icon, boolean isWebappCapable, int orientation,
+            int source, long themeColor, long backgroundColor) {
         Intent shortcutIntent;
         if (isWebappCapable) {
             // Encode the icon as a base64 string (Launcher drops Bitmaps in the Intent).
             String encodedIcon = "";
             if (icon != null) {
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
                 icon.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
                 byte[] byteArray = byteArrayOutputStream.toByteArray();
                 encodedIcon = Base64.encodeToString(byteArray, Base64.DEFAULT);
             }
 
             // Add the shortcut as a launcher icon for a full-screen Activity.
             shortcutIntent = new Intent();
             shortcutIntent.setAction(sDelegate.getFullscreenAction());
             shortcutIntent.putExtra(EXTRA_ICON, encodedIcon);
-            shortcutIntent.putExtra(EXTRA_ID, UUID.randomUUID().toString());
+            shortcutIntent.putExtra(EXTRA_ID, id);
             shortcutIntent.putExtra(EXTRA_NAME, name);
             shortcutIntent.putExtra(EXTRA_SHORT_NAME, shortName);
             shortcutIntent.putExtra(EXTRA_URL, url);
             shortcutIntent.putExtra(EXTRA_ORIENTATION, orientation);
             shortcutIntent.putExtra(EXTRA_MAC, getEncodedMac(context, url));
             shortcutIntent.putExtra(EXTRA_THEME_COLOR, themeColor);
             shortcutIntent.putExtra(EXTRA_BACKGROUND_COLOR, backgroundColor);
         } else {
             // Add the shortcut as a launcher icon to open in the browser Activity.
             shortcutIntent = createShortcutIntent(url);
@@ skipping 14 matching lines @@
             public void run() {
                 Context applicationContext = ApplicationStatus.getApplicationContext();
                 String toastText =
                         applicationContext.getString(R.string.added_to_homescreen, shortUrl);
                 Toast toast = Toast.makeText(applicationContext, toastText, Toast.LENGTH_SHORT);
                 toast.show();
             }
         });
     }
 
     /**

[gone, 2015/08/26 02:01:19]

TODO what?

[Lalit Maganti, 2015/08/26 13:11:55]

Add javadoc which I have now done.

+     * TODO(lalitm)
+     */
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private static void addSplashscreenIconToWebappData(Context context,

[Lalit Maganti, 2015/08/26 13:11:55]

I've changed the name of this method to be more future-proof now that we have a
single update method rather than using the builder pattern. Also I've changed
splashIcon -> splashImage here to be more consistent.

+            String id, Bitmap splashIcon) {
+        WebappDataStorage.open(context, id).putSplashIcon(splashIcon);
+    }
+
+    /**
      * Creates an intent that will add a shortcut to the home screen.
      * @param shortcutIntent Intent to fire when the shortcut is activated.
      * @param url URL of the shortcut.
      * @param title Title of the shortcut.
      * @param icon Image that represents the shortcut.
      * @return Intent for the shortcut.
      */
     public static Intent createAddToHomeIntent(String url, String title,
             Bitmap icon, Intent shortcutIntent) {
         Intent i = new Intent(INSTALL_SHORTCUT);
@@ skipping 147 matching lines @@
      * @return String that can be used to verify that a WebappActivity is being started by Chrome.
      */
     public static String getEncodedMac(Context context, String url) {
         // The only reason we convert to a String here is because Android inexplicably eats a
         // byte[] when adding the shortcut -- the Bundle received by the launched Activity even
         // lacks the key for the extra.
         byte[] mac = WebappAuthenticator.getMacForUrl(context, url);
         return Base64.encodeToString(mac, Base64.DEFAULT);
     }
 }