diff options
Diffstat (limited to 'core/java/android/webkit/FileLoader.java')
| -rw-r--r-- | core/java/android/webkit/FileLoader.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/core/java/android/webkit/FileLoader.java b/core/java/android/webkit/FileLoader.java index 54a4c1d..085f1f4 100644 --- a/core/java/android/webkit/FileLoader.java +++ b/core/java/android/webkit/FileLoader.java @@ -72,6 +72,15 @@ class FileLoader extends StreamLoader { } } + private String errString(Exception ex) { + String exMessage = ex.getMessage(); + String errString = mContext.getString(R.string.httpErrorFileNotFound); + if (exMessage != null) { + errString += " " + exMessage; + } + return errString; + } + @Override protected boolean setupStreamAndSendStatus() { try { @@ -95,16 +104,11 @@ class FileLoader extends StreamLoader { mHandler.status(1, 1, 0, "OK"); } catch (java.io.FileNotFoundException ex) { - mHandler.error( - EventHandler.FILE_NOT_FOUND_ERROR, - mContext.getString(R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_NOT_FOUND_ERROR, errString(ex)); return false; } catch (java.io.IOException ex) { - mHandler.error(EventHandler.FILE_ERROR, - mContext.getString(R.string.httpErrorFileNotFound) + - " " + ex.getMessage()); + mHandler.error(EventHandler.FILE_ERROR, errString(ex)); return false; } return true; |