chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java - Issue 1286973003: webapps: introduce helper class to store extended set of data

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1286973003: webapps: introduce helper class to store extended set of data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix minor issue Created 5 years, 4 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java

index 5a8880630ac0d67af762cbaa2a11c05bb48b9577..8befb21e498bfc134e51389290cec5af65f4e691 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java

@@ -6,10 +6,7 @@ package org.chromium.chrome.browser.webapps;

import android.content.Intent;

import android.graphics.Bitmap;

-import android.graphics.BitmapFactory;

import android.net.Uri;

-import android.text.TextUtils;

-import android.util.Base64;

import android.util.Log;

import org.chromium.chrome.browser.ShortcutHelper;

@@ -197,10 +194,7 @@ public class WebappInfo {

public Bitmap icon() {

if (mDecodedIcon != null) return mDecodedIcon;

- if (TextUtils.isEmpty(mEncodedIcon)) return null;

- byte[] decoded = Base64.decode(mEncodedIcon, Base64.DEFAULT);

- mDecodedIcon = BitmapFactory.decodeByteArray(decoded, 0, decoded.length);

+ mDecodedIcon = ShortcutHelper.decodeBitmapFromString(mEncodedIcon);

return mDecodedIcon;

}