commit 8c039141f004207c9b2bd374b70e9cbc7051ebaf
author Alon Albert <aalbert@google.com> Thu Mar 21 22:24:39 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 21 22:24:39 2013 +0000
tree 17fbcf90cc9934e937d7d5cf0a45c976223cc635
parent c4085da1caa7655e6874ad69588dec6c542c9cd7
parent e65828e4bf8aa907bc8055b48d80c1e78bb8de05

am e65828e4: Merge "Try to get size of non content:// Attachments" into jb-ub-mail-ur9

* commit 'e65828e4bf8aa907bc8055b48d80c1e78bb8de05':
  Try to get size of non content:// Attachments

src/com/android/mail/compose/AttachmentsView.java

diff --git a/src/com/android/mail/compose/AttachmentsView.java b/src/com/android/mail/compose/AttachmentsView.java
index f0ace50..88290ef 100644
--- a/src/com/android/mail/compose/AttachmentsView.java
+++ b/src/com/android/mail/compose/AttachmentsView.java
@@ -282,6 +282,10 @@
         if (attachment.getName() == null) {
             attachment.setName(contentUri.getLastPathSegment());
         }
+        if (attachment.size == 0) {
+            // if the attachment is not a content:// for example, a file:// URI
+            attachment.size = getSizeFromFile(contentUri, contentResolver);
+        }
 
         attachment.setContentType(contentType);
         return attachment;