[Downloads] Pass more DownloadItem state to java

chrome/browser/android/download/download_manager_service.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/android/download/download_manager_service.h"
 
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 13 matching lines @@
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 bool ShouldShowDownloadItem(content::DownloadItem* item) {
   return !item->IsTemporary() &&
       !item->GetFileNameToReportUser().empty() &&
       !item->GetTargetFilePath().empty() &&
-      item->GetState() == content::DownloadItem::COMPLETE;
+      item->GetState() != content::DownloadItem::CANCELLED;
 }
 
 void updateNotifier(DownloadManagerService* service,
                     content::DownloadManager* manager,
                     std::unique_ptr<AllDownloadItemNotifier>& notifier) {
   if (manager) {
     if (!notifier || notifier->GetManager() != manager)
       notifier.reset(new AllDownloadItemNotifier(manager, service));
   } else {
     notifier.reset(nullptr);
@@ skipping 10 matching lines @@
 
   for (size_t i = 0; i < all_items.size(); i++) {
     content::DownloadItem* item = all_items[i];
     if (item->GetState() == content::DownloadItem::COMPLETE &&
         item->GetTargetFilePath() == path) {
       item->Remove();
     }
   }
 }
 
+ScopedJavaLocalRef<jobject> CreateJavaDownloadItem(
+    JNIEnv* env, content::DownloadItem* item) {
+  return Java_DownloadManagerService_createDownloadItem(
+      env,
+      ConvertUTF8ToJavaString(env, item->GetGuid()),
+      ConvertUTF8ToJavaString(env,
+                              item->GetFileNameToReportUser().value()),
+      ConvertUTF8ToJavaString(env, item->GetTargetFilePath().value()),
+      ConvertUTF8ToJavaString(env, item->GetTabUrl().spec()),
+      ConvertUTF8ToJavaString(env, item->GetMimeType()),
+      item->GetStartTime().ToJavaTime(), item->GetTotalBytes(),
+      item->GetFileExternallyRemoved(),
+      item->GetBrowserContext()->IsOffTheRecord(),
+      item->GetState(),
+      item->PercentComplete(),
+      item->IsPaused());
+}
+
 }  // namespace
 
 // static
 bool DownloadManagerService::RegisterDownloadManagerService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 void DownloadManagerService::OnDownloadCanceled(
     content::DownloadItem* download,
@@ skipping 96 matching lines @@
   // Create a Java array of all of the visible DownloadItems.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_download_item_list =
       Java_DownloadManagerService_createDownloadItemList(env, java_ref_);
 
   for (size_t i = 0; i < all_items.size(); i++) {
     content::DownloadItem* item = all_items[i];
     if (!ShouldShowDownloadItem(item))
       continue;
 
+    ScopedJavaLocalRef<jobject> j_item = CreateJavaDownloadItem(env, item);
     Java_DownloadManagerService_addDownloadItemToList(
-        env, java_ref_, j_download_item_list,
-        ConvertUTF8ToJavaString(env, item->GetGuid()),
-        ConvertUTF8ToJavaString(env, item->GetFileNameToReportUser().value()),
-        ConvertUTF8ToJavaString(env, item->GetTargetFilePath().value()),
-        ConvertUTF8ToJavaString(env, item->GetTabUrl().spec()),
-        ConvertUTF8ToJavaString(env, item->GetMimeType()),
-        item->GetStartTime().ToJavaTime(), item->GetTotalBytes(),
-        item->GetFileExternallyRemoved());
+        env, java_ref_, j_download_item_list, j_item);
   }
 
   Java_DownloadManagerService_onAllDownloadsRetrieved(
       env, java_ref_, j_download_item_list, is_off_the_record);
 }
 
 void DownloadManagerService::CheckForExternallyRemovedDownloads(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     bool is_off_the_record) {
@@ skipping 67 matching lines @@
   updateNotifier(this, GetDownloadManager(false), original_notifier_);
   updateNotifier(this, GetDownloadManager(true), off_the_record_notifier_);
 }
 
 void DownloadManagerService::OnDownloadUpdated(
     content::DownloadManager* manager, content::DownloadItem* item) {
   if (java_ref_.is_null())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> j_item = CreateJavaDownloadItem(env, item);
   Java_DownloadManagerService_onDownloadItemUpdated(
-      env,
-      java_ref_.obj(),
-      item->GetState(),
-      ConvertUTF8ToJavaString(env, item->GetGuid()).obj(),
-      ConvertUTF8ToJavaString(
-          env, item->GetFileNameToReportUser().value()).obj(),
-      ConvertUTF8ToJavaString(
-          env, item->GetTargetFilePath().value()).obj(),
-      ConvertUTF8ToJavaString(env, item->GetTabUrl().spec()).obj(),
-      ConvertUTF8ToJavaString(env, item->GetMimeType()).obj(),
-      item->GetStartTime().ToJavaTime(),
-      item->GetTotalBytes(),
-      item->GetBrowserContext()->IsOffTheRecord(),
-      item->GetFileExternallyRemoved());
+      env, java_ref_.obj(), j_item);
 }
 
 void DownloadManagerService::OnDownloadRemoved(
     content::DownloadManager* manager, content::DownloadItem* item) {
   if (java_ref_.is_null())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_DownloadManagerService_onDownloadItemRemoved(
       env,
@@ skipping 126 matching lines @@
 }
 
 // static
 jboolean IsSupportedMimeType(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jstring>& jmime_type) {
   std::string mime_type = ConvertJavaStringToUTF8(env, jmime_type);
   return mime_util::IsSupportedMimeType(mime_type);
 }