Pass the filename obtained from content-disposition header for download

content/browser/android/download_controller_android_impl.cc

 // Copyright (c) 2012 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 "content/browser/android/download_controller_android_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/download/download_item_impl.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/referrer.h"
 #include "jni/DownloadController_jni.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_store.h"
+#include "net/http/http_content_disposition.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
@@ skipping 174 matching lines @@
       ConvertUTF8ToJavaString(env, info.user_agent);
   ScopedJavaLocalRef<jstring> jcontent_disposition =
       ConvertUTF8ToJavaString(env, info.content_disposition);
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, info.original_mime_type);
   ScopedJavaLocalRef<jstring> jcookie =
       ConvertUTF8ToJavaString(env, info.cookie);
   ScopedJavaLocalRef<jstring> jreferer =
       ConvertUTF8ToJavaString(env, info.referer);
 
+  // Try parsing the content disposition header to get a
+  // explicitly specified filename if available.
+  net::HttpContentDisposition header(info.content_disposition, "");

[boliu, 2014/02/07 18:11:47]

Hmm...

If we use the full blown GetSuggestedFilename in net_util.cc here (ie take into
account whatever mimetype we have here as well), then there should be no need
for any filename guessing in java code.

Win?

[shashi, 2014/02/07 18:59:12]

I agree with Bo, that should be the best way and even easier to keep desktop and
Android implementations in sync. and we will be able to even reduce our
temporary/incomplete parsing implementation in Java.

*Slight tricky to make sure we do not break any existing scenarios (I hope we
have regression tests for different download bugs on Android over years).


On 2014/02/07 18:11:47, boliu wrote:

[Jinsuk Kim, 2014/02/08 02:49:28]

I'd like to upstream the filename decision logic eventually. I guess it takes
more understanding on other parts like Yaron mentioned in the bug entry. Mind if
I started it in the next CL while letting this one handle the bug fix only?

[Jinsuk Kim, 2014/02/08 02:49:28]

I was not aware of GetSuggestedFilename and it is a great suggestion. Thanks!
I'd like to do it in the follow up CL if you're okay.

[boliu, 2014/02/08 02:51:23]

sgtm, yaron already gave lgtm, which is all you need

+  ScopedJavaLocalRef<jstring> jfilename =
+      ConvertUTF8ToJavaString(env, header.filename());
+
   Java_DownloadController_newHttpGetDownload(
       env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(),
       juser_agent.obj(), jcontent_disposition.obj(), jmime_type.obj(),
-      jcookie.obj(), jreferer.obj(), info.total_bytes);
+      jcookie.obj(), jreferer.obj(), jfilename.obj(), info.total_bytes);
 }
 
 void DownloadControllerAndroidImpl::OnDownloadStarted(
     DownloadItem* download_item) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!download_item->GetWebContents())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
 
@@ skipping 170 matching lines @@
     referer = referer_url.spec();
   if (!request->url_chain().empty()) {
     original_url = request->url_chain().front();
     url = request->url_chain().back();
   }
 }
 
 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {}
 
 }  // namespace content