Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(781)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java

Issue 2409483002: Read the bare minimum of data from the WebAPK launch intent. (Closed)
Patch Set: Merge branch 'startup_crash0' into security Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
index c95dcbafbbf93c0712685a7e71a78be8bfcc55c0..3020fae90ce1c6d949f7fad5e14e10de6b0a83ed 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
@@ -69,24 +69,6 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
private Callback mCallback;
/**
- * Gets the Murmur2 hash from a Bundle. Returns an empty string if the value could not be
- * parsed.
- */
- private static String getMurmur2HashFromBundle(Bundle bundle) {
- String value = bundle.getString(WebApkMetaDataKeys.ICON_MURMUR2_HASH);
-
- // The Murmur2 hash 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 "";
- }
- return value.substring(0, value.length() - 1);
- }
-
- /**
* Creates an instance of {@link ManifestUpgradeDetector}.
*
* @param tab WebAPK's tab.
@@ -137,7 +119,8 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
mManifestUrl = IntentUtils.safeGetString(metadata, WebApkMetaDataKeys.WEB_MANIFEST_URL);
mStartUrl = IntentUtils.safeGetString(metadata, WebApkMetaDataKeys.START_URL);
mIconUrl = IntentUtils.safeGetString(metadata, WebApkMetaDataKeys.ICON_URL);
- mIconMurmur2Hash = getMurmur2HashFromBundle(metadata);
+ mIconMurmur2Hash = Long.toString(WebApkMetaDataUtils.getLongFromMetaData(
+ metadata, WebApkMetaDataKeys.ICON_MURMUR2_HASH, 0));
}
/**

Powered by Google App Engine
This is Rietveld 408576698