ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix attaching from Gallery.

Browse Source 
Fix the attachmentExists test, so that now it works with the content: URL.

Bug 2937846

Change-Id: I684ab2ed0e4fbe4784a165697084b868610bd274
This commit is contained in:
Makoto Onuki 2010-08-20 16:50:57 -07:00
parent 0e6d972641
commit d755cdce13
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/email/Utility.java
View File

@ -54,6 +54,7 @@ import android.widget.Toast;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@ -854,9 +855,25 @@ public class Utility {
}
public static boolean attachmentExists(Context context, long accountId, Attachment attachment) {
File saveToFile =
AttachmentProvider.getAttachmentFilename(context, accountId, attachment.mId);
return saveToFile.exists() && attachment.mContentUri != null;
if ((attachment == null) || (TextUtils.isEmpty(attachment.mContentUri))) {
Log.w(Email.LOG_TAG, "ContentUri null.");
return false;
}
if (Email.DEBUG) {
Log.d(Email.LOG_TAG, "attachmentExists URI=" + attachment.mContentUri);
}
Uri fileUri = Uri.parse(attachment.mContentUri);
try {
InputStream inStream = context.getContentResolver().openInputStream(fileUri);
try {
inStream.close();
} catch (IOException e) {
// Nothing to be done if can't close the stream
}
return true;
} catch (FileNotFoundException e) {
return false;
}
}
/**