Merge "Don't allow empty or null filenames" into ub-mail-master

2014-05-05 16:14:56 +00:00 · 2014-05-05 16:14:56 +00:00 · 564a5343cc
parent 2fc13087e7 d0b54a2948
commit 564a5343cc
1 changed files with 1 additions and 1 deletions
--- a/emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java
+++ b/emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java
@ -410,7 +410,7 @@ public class AttachmentUtilities {
                size = copyFile(in, resolver.openOutputStream(attUri));
                contentUri = attUri.toString();
            } else if (Utility.isExternalStorageMounted()) {
-                if (attachment.mFileName == null) {
+                if (TextUtils.isEmpty(attachment.mFileName)) {
                    // TODO: This will prevent a crash but does not surface the underlying problem
                    // to the user correctly.
                    LogUtils.w(Logging.LOG_TAG, "Trying to save an attachment with no name: %d",