| Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
|
| index 1632c42482f9883feb5bb024a5cb932ee6257e70..fa6482f79dc0e39043d5dca92ec590bca6aa9cae 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
|
| @@ -65,9 +65,9 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
|
| */
|
| private static class PendingUpdate {
|
| public WebApkInfo mUpdateInfo;
|
| - byte[] mSerializedProto;
|
| + String mSerializedProto;
|
|
|
| - public PendingUpdate(WebApkInfo info, byte[] serializedProto) {
|
| + public PendingUpdate(WebApkInfo info, String serializedProto) {
|
| mUpdateInfo = info;
|
| mSerializedProto = serializedProto;
|
| }
|
| @@ -201,9 +201,9 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
|
| i++;
|
| }
|
|
|
| - Callback<byte[]> callback = new Callback<byte[]>() {
|
| + Callback<String> callback = new Callback<String>() {
|
| @Override
|
| - public void onResult(byte[] result) {
|
| + public void onResult(String result) {
|
| scheduleUpdate(info, result);
|
| }
|
| };
|
| @@ -218,7 +218,7 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
|
| * Sends update request to WebAPK Server if the WebAPK is running in the background; caches the
|
| * fetched WebApkInfo otherwise.
|
| */
|
| - protected void scheduleUpdate(WebApkInfo info, byte[] serializedProto) {
|
| + protected void scheduleUpdate(WebApkInfo info, String serializedProto) {
|
| int numberOfUpdateRequests = mStorage.getUpdateRequests();
|
| boolean forceUpdateNow = numberOfUpdateRequests >= MAX_UPDATE_ATTEMPTS;
|
| if (!isInForeground() || forceUpdateNow) {
|
| @@ -243,7 +243,7 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
|
| /**
|
| * Sends update request to the WebAPK Server and cleanup.
|
| */
|
| - private void updateAsync(WebApkInfo info, byte[] serializedProto) {
|
| + private void updateAsync(WebApkInfo info, String serializedProto) {
|
| updateAsyncImpl(info, serializedProto);
|
| mStorage.resetUpdateRequests();
|
| mPendingUpdate = null;
|
| @@ -252,7 +252,7 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
|
| /**
|
| * Sends update request to the WebAPK Server.
|
| */
|
| - protected void updateAsyncImpl(WebApkInfo info, byte[] serializedProto) {
|
| + protected void updateAsyncImpl(WebApkInfo info, String serializedProto) {
|
| if (info == null || serializedProto == null) {
|
| return;
|
| }
|
| @@ -404,7 +404,7 @@ public class WebApkUpdateManager implements WebApkUpdateDataFetcher.Observer {
|
| String badgeIconUrl, Bitmap badgeIcon, String[] iconUrls, String[] iconHashes,
|
| int displayMode, int orientation, long themeColor, long backgroundColor,
|
| String manifestUrl, String webApkPackage, int webApkVersion, boolean isManifestStale,
|
| - Callback<byte[]> callback);
|
| + Callback<String> callback);
|
| private static native void nativeUpdateWebApk(String webApkPackage, String startUrl,
|
| - String shortName, byte[] serializedProto, WebApkUpdateCallback callback);
|
| + String shortName, String serializedProto, WebApkUpdateCallback callback);
|
| }
|
|
|