offline_items_collection : Added helper class to determine progress

chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryItemWrapper.java

 // 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.download.ui;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.text.TextUtils;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.download.DownloadInfo;
 import org.chromium.chrome.browser.download.DownloadItem;
 import org.chromium.chrome.browser.download.DownloadNotificationService;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadItem;
 import org.chromium.chrome.browser.widget.DateDividedAdapter.TimedItem;
+import org.chromium.components.offline_items_collection.OfflineItem.Progress;
+import org.chromium.components.offline_items_collection.OfflineItemProgressUnit;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.DownloadState;
 import org.chromium.ui.widget.Toast;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
@@ skipping 111 matching lines @@
 
     /** @return {@link DownloadFilter} that represents the file type. */
     public abstract int getFilterType();
 
     /** @return The mime type or null if the item doesn't have one. */
     public abstract String getMimeType();
 
     /** @return The file extension type. See list at the top of the file. */
     public abstract int getFileExtensionType();
 
-    /** @return How much of the download has completed, or -1 if there is no progress. */
-    abstract int getDownloadProgress();
+    /** @return How much of the download has completed, or null if there is no progress. */
+    abstract Progress getDownloadProgress();
 
     /** @return Whether the download has an unknown file size. */
     abstract boolean isIndeterminate();
 
     /** @return String indicating the status of the download. */
     abstract String getStatusString();
 
     /** @return Whether the file for this item has been removed through an external action. */
     abstract boolean hasBeenExternallyRemoved();
 
@@ skipping 135 matching lines @@
                             extension.toLowerCase(Locale.getDefault()));
                 } else {
                     mFileExtensionType = FILE_EXTENSION_OTHER;
                 }
             }
 
             return mFileExtensionType;
         }
 
         @Override
-        public int getDownloadProgress() {
-            return mItem.getDownloadInfo().getPercentCompleted();
+        public Progress getDownloadProgress() {
+            return mItem.getDownloadInfo().getProgress();
         }
 
         @Override
         public boolean isIndeterminate() {
             return mItem.isIndeterminate();
         }
 
         @Override
         public String getStatusString() {
             return DownloadUtils.getStatusString(mItem);
@@ skipping 79 matching lines @@
             }
 
             return true;
         }
 
         /** @return whether the given DownloadItem is visibly different from the current one. */
         private boolean isNewItemVisiblyDifferent(DownloadItem newItem) {
             DownloadInfo oldInfo = mItem.getDownloadInfo();
             DownloadInfo newInfo = newItem.getDownloadInfo();
 
-            if (oldInfo.getPercentCompleted() != newInfo.getPercentCompleted()) return true;
+            if (oldInfo.getProgress().equals(newInfo.getProgress())) return true;
             if (oldInfo.getBytesReceived() != newInfo.getBytesReceived()) return true;
             if (oldInfo.state() != newInfo.state()) return true;
             if (oldInfo.isPaused() != newInfo.isPaused()) return true;
             if (!TextUtils.equals(oldInfo.getFilePath(), newInfo.getFilePath())) return true;
 
             return false;
         }
     }
 
     /** Wraps a {@link OfflinePageDownloadItem}. */
@@ skipping 66 matching lines @@
         public String getMimeType() {
             return "text/html";
         }
 
         @Override
         public int getFileExtensionType() {
             return FILE_EXTENSION_OTHER;
         }
 
         @Override
-        public int getDownloadProgress() {
+        public Progress getDownloadProgress() {
             // Only completed offline page downloads are shown.
-            return 100;
+            return new Progress(100, 100L, OfflineItemProgressUnit.PERCENTAGE);
         }
 
         @Override
         public boolean isIndeterminate() {
             return true;
         }
 
         @Override
         public String getStatusString() {
             Context context = ContextUtils.getApplicationContext();
@@ skipping 69 matching lines @@
                     == org.chromium.components.offlinepages.downloads.DownloadState.COMPLETE;
         }
 
         @Override
         public boolean isPaused() {
             return mItem.getDownloadState()
                     == org.chromium.components.offlinepages.downloads.DownloadState.PAUSED;
         }
     }
 }