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

Follow up to I684ab2ed.

Browse Source 
Catch RuntimeException so that it won't crash even with malformed URLs.

Change-Id: I58da906860ac30b5c9daf68bb672f19917ad0ece
This commit is contained in:
Makoto Onuki 2010-08-20 17:46:53 -07:00
parent d755cdce13
commit 567ed19f7b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -856,22 +856,27 @@ public class Utility {
public static boolean attachmentExists(Context context, long accountId, Attachment attachment) {
if ((attachment == null) || (TextUtils.isEmpty(attachment.mContentUri))) {
Log.w(Email.LOG_TAG, "ContentUri null.");
Log.w(Email.LOG_TAG, "attachmentExists 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);
Uri fileUri = Uri.parse(attachment.mContentUri);
try {
inStream.close();
} catch (IOException e) {
// Nothing to be done if can't close the stream
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;
}
return true;
} catch (FileNotFoundException e) {
} catch (RuntimeException re) {
Log.w(Email.LOG_TAG, "attachmentExists RuntimeException=" + re);
return false;
}
}