Merge WebappInfo and WebApkMetaData part 2/2

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
deleted file mode 100644
index b58ea5c53d0df979359e12df15a9a1622c4c69d7..0000000000000000000000000000000000000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
+++ /dev/null
@@ -1,235 +0,0 @@
-// 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.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import org.chromium.base.ContextUtils;
-import org.chromium.base.Log;
-import org.chromium.blink_public.platform.WebDisplayMode;
-import org.chromium.chrome.browser.ShortcutHelper;
-import org.chromium.chrome.browser.util.IntentUtils;
-import org.chromium.content_public.common.ScreenOrientationValues;
-import org.chromium.webapk.lib.common.WebApkConstants;
-import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Contains methods for extracting meta data from WebAPK.
- */
-public class WebApkMetaDataUtils {
-    private static final String TAG = "cr_WebApkMetaData";
-
-    /**
-     * Populates {@link WebappInfo} with meta data extracted from WebAPK's Android Manifest.
-     * @param webApkPackageName Package name of the WebAPK to extract meta data from.
-     * @param url WebAPK start URL.
-     * @param source {@link ShortcutSource} that the WebAPK was opened from.
-     */
-    public static WebApkInfo extractWebappInfoFromWebApk(
-            String webApkPackageName, String url, int source) {
-        WebApkMetaData metaData = extractMetaDataFromWebApk(webApkPackageName);
-        if (metaData == null) return null;
-
-        PackageManager packageManager = ContextUtils.getApplicationContext().getPackageManager();
-        Resources resources;
-        try {
-            resources = packageManager.getResourcesForApplication(webApkPackageName);
-        } catch (PackageManager.NameNotFoundException e) {
-            return null;
-        }
-        Bitmap icon = BitmapFactory.decodeResource(resources, metaData.iconId);
-        String encodedIcon = ShortcutHelper.encodeBitmapAsString(icon);
-
-        return WebApkInfo.create(WebApkConstants.WEBAPK_ID_PREFIX + webApkPackageName, url,
-                metaData.scope, encodedIcon, metaData.name, metaData.shortName,
-                metaData.displayMode, metaData.orientation, source, metaData.themeColor,
-                metaData.backgroundColor, webApkPackageName);
-    }
-
-    /**
-     * Populates {@link WebApkMetaData} with meta data extracted from WebAPK's Android Manifest.
-     * @param webApkPackageName Package name of the WebAPK to extract meta data from.
-     */
-    public static WebApkMetaData extractMetaDataFromWebApk(String webApkPackageName) {
-        PackageManager packageManager = ContextUtils.getApplicationContext().getPackageManager();
-        ApplicationInfo appInfo;
-        try {
-            appInfo = packageManager.getApplicationInfo(
-                    webApkPackageName, PackageManager.GET_META_DATA);
-        } catch (PackageManager.NameNotFoundException e) {
-            return null;
-        }
-        Bundle bundle = appInfo.metaData;
-
-        WebApkMetaData metaData = new WebApkMetaData();
-        metaData.shellApkVersion =
-                IntentUtils.safeGetInt(bundle, WebApkMetaDataKeys.SHELL_APK_VERSION, 0);
-        metaData.manifestUrl =
-                IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.WEB_MANIFEST_URL);
-        metaData.startUrl = IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.START_URL);
-        metaData.name = IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.NAME);
-        metaData.shortName = IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.SHORT_NAME);
-        metaData.scope = IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.SCOPE);
-        metaData.displayMode = displayModeFromString(
-                IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.DISPLAY_MODE));
-        metaData.orientation = orientationFromString(
-                IntentUtils.safeGetString(bundle, WebApkMetaDataKeys.ORIENTATION));
-        metaData.themeColor = getLongFromMetaData(bundle, WebApkMetaDataKeys.THEME_COLOR,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING);
-        metaData.backgroundColor = getLongFromMetaData(bundle, WebApkMetaDataKeys.BACKGROUND_COLOR,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING);
-        metaData.iconId = IntentUtils.safeGetInt(bundle, WebApkMetaDataKeys.ICON_ID, 0);
-        metaData.iconUrlAndIconMurmur2HashMap =
-                WebApkMetaDataUtils.getIconUrlAndIconMurmur2HashMap(bundle);
-
-        if (TextUtils.isEmpty(metaData.scope)) {
-            metaData.scope = ShortcutHelper.getScopeFromUrl(metaData.startUrl);
-        }
-
-        return metaData;
-    }
-
-    /**
-     * Extracts long value from the WebAPK's meta data.
-     * @param metaData WebAPK meta data to extract the long from.
-     * @param name Name of the <meta-data> tag to extract the value from.
-     * @param defaultValue Value to return if long value could not be extracted.
-     * @return long value.
-     */
-    public static long getLongFromMetaData(Bundle metaData, String name, long defaultValue) {
-        String value = metaData.getString(name);
-
-        // The value should be terminated with 'L' to force the value to be a string. According to
-        // https://developer.android.com/guide/topics/manifest/meta-data-element.html numeric
-        // meta data values can only be retrieved via {@link Bundle#getInt()} and
-        // {@link Bundle#getFloat()}. We cannot use {@link Bundle#getFloat()} due to loss of
-        // precision.
-        if (value == null || !value.endsWith("L")) {
-            return defaultValue;
-        }
-        try {
-            return Long.parseLong(value.substring(0, value.length() - 1));
-        } catch (NumberFormatException e) {
-        }
-        return defaultValue;
-    }
-
-    /**
-     * Extract the icon URLs and icon hashes from the WebAPK's meta data, and returns a map of these
-     * {URL, hash} pairs. The icon URLs/icon hashes are stored in a single meta data tag in the
-     * WebAPK's AndroidManifest.xml as following:
-     * "URL1 hash1 URL2 hash2 URL3 hash3..."
-     */
-    public static Map<String, String> getIconUrlAndIconMurmur2HashMap(Bundle metaData) {
-        Map<String, String> iconUrlAndIconMurmur2HashMap = new HashMap<String, String>();
-        String iconUrlsAndIconMurmur2Hashes = metaData.getString(
-                WebApkMetaDataKeys.ICON_URLS_AND_ICON_MURMUR2_HASHES);
-        if (TextUtils.isEmpty(iconUrlsAndIconMurmur2Hashes)) {
-            // Open old WebAPKs which support single icon only.
-            // TODO(hanxi): crbug.com/665549. Clean up the following code after all the old WebAPKs
-            // are updated.
-            String iconUrl = metaData.getString(WebApkMetaDataKeys.ICON_URL);
-            if (!TextUtils.isEmpty(iconUrl)) {
-                iconUrlAndIconMurmur2HashMap.put(iconUrl, getIconMurmur2HashFromMetaData(metaData));
-            }
-            return iconUrlAndIconMurmur2HashMap;
-        }
-
-        // Parse the metadata tag which contains "URL1 hash1 URL2 hash2 URL3 hash3..." pairs and
-        // create a hash map.
-        // TODO(hanxi): crbug.com/666349. Add a test to verify that the icon URLs in WebAPKs'
-        // AndroidManifest.xml don't contain space.
-        String[] urlsAndHashes = iconUrlsAndIconMurmur2Hashes.split(" ");
-        if (urlsAndHashes.length % 2 != 0) {
-            Log.e(TAG, "The icon URLs and icon murmur2 hashes doesn't come in pairs.");
-            return iconUrlAndIconMurmur2HashMap;
-        }
-        for (int i = 0; i < urlsAndHashes.length; i += 2) {
-            iconUrlAndIconMurmur2HashMap.put(urlsAndHashes[i], urlsAndHashes[i + 1]);
-        }
-        return iconUrlAndIconMurmur2HashMap;
-    }
-
-    /**
-     * Extracts icon murmur2 hash from the WebAPK's meta data. Return value is a string because the
-     * hash can take values up to 2^64-1 which is greater than {@link Long#MAX_VALUE}.
-     * Note: keep this function for supporting old WebAPKs which have single icon only.
-     * @param metaData WebAPK meta data to extract the hash from.
-     * @return The hash. An empty string if the hash could not be extracted.
-     */
-    public static String getIconMurmur2HashFromMetaData(Bundle metaData) {
-        String value = metaData.getString(WebApkMetaDataKeys.ICON_MURMUR2_HASH);
-
-        // The value should be terminated with 'L' to force the value to be a string.
-        if (value == null || !value.endsWith("L")) {
-            return "";
-        }
-        return value.substring(0, value.length() - 1);
-    }
-
-    /**
-     * Returns the WebDisplayMode which matches {@link displayMode}.
-     * @param displayMode One of https://www.w3.org/TR/appmanifest/#dfn-display-modes-values
-     * @return The matching WebDisplayMode. {@link WebDisplayMode#Undefined} if there is no match.
-     */
-    private static int displayModeFromString(String displayMode) {
-        if (displayMode == null) {
-            return WebDisplayMode.Undefined;
-        }
-
-        if (displayMode.equals("fullscreen")) {
-            return WebDisplayMode.Fullscreen;
-        } else if (displayMode.equals("standalone")) {
-            return WebDisplayMode.Standalone;
-        } else if (displayMode.equals("minimal-ui")) {
-            return WebDisplayMode.MinimalUi;
-        } else if (displayMode.equals("browser")) {
-            return WebDisplayMode.Browser;
-        } else {
-            return WebDisplayMode.Undefined;
-        }
-    }
-
-    /**
-     * Returns the ScreenOrientationValue which matches {@link orientation}.
-     * @param orientation One of https://w3c.github.io/screen-orientation/#orientationlocktype-enum
-     * @return The matching ScreenOrientationValue. {@link ScreenOrientationValues#DEFAULT} if there
-     * is no match.
-     */
-    private static int orientationFromString(String orientation) {
-        if (orientation == null) {
-            return ScreenOrientationValues.DEFAULT;
-        }
-
-        if (orientation.equals("any")) {
-            return ScreenOrientationValues.ANY;
-        } else if (orientation.equals("natural")) {
-            return ScreenOrientationValues.NATURAL;
-        } else if (orientation.equals("landscape")) {
-            return ScreenOrientationValues.LANDSCAPE;
-        } else if (orientation.equals("landscape-primary")) {
-            return ScreenOrientationValues.LANDSCAPE_PRIMARY;
-        } else if (orientation.equals("landscape-secondary")) {
-            return ScreenOrientationValues.LANDSCAPE_SECONDARY;
-        } else if (orientation.equals("portrait")) {
-            return ScreenOrientationValues.PORTRAIT;
-        } else if (orientation.equals("portrait-primary")) {
-            return ScreenOrientationValues.PORTRAIT_PRIMARY;
-        } else if (orientation.equals("portrait-secondary")) {
-            return ScreenOrientationValues.PORTRAIT_SECONDARY;
-        } else {
-            return ScreenOrientationValues.DEFAULT;
-        }
-    }
-}