Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e441b71 authored by Cary Clark's avatar Cary Clark
Browse files

if exception getMessage() is null, don't add it to the error 

Consolidate the error message construction, allowing the
exception getMessage() to fail.
parent 05c9ed9c

core/java/android/webkit/ContentLoader.java

+13 −15
Original line number Diff line number Diff line
@@ -57,6 +57,16 @@ class ContentLoader extends StreamLoader { 


    }



    private String errString(Exception ex) {

        String exMessage = ex.getMessage();

        String errString = mContext.getString(

                com.android.internal.R.string.httpErrorFileNotFound);

        if (exMessage != null) {

            errString += " " + exMessage;

        }

        return errString;

    }



    @Override

    protected boolean setupStreamAndSendStatus() {

        Uri uri = Uri.parse(mUrl);
@@ -73,28 +83,16 @@ class ContentLoader extends StreamLoader { 
            mDataStream = mContext.getContentResolver().openInputStream(uri);

            mHandler.status(1, 1, 0, "OK");

        } catch (java.io.FileNotFoundException ex) {

            mHandler.error(

                    EventHandler.FILE_NOT_FOUND_ERROR,

                    mContext.getString(

                            com.android.internal.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(

                            com.android.internal.R.string.httpErrorFileNotFound) +

                    " " + ex.getMessage());

            mHandler.error(EventHandler.FILE_ERROR, errString(ex));

            return false;

        } catch (RuntimeException ex) {

            // readExceptionWithFileNotFoundExceptionFromParcel in DatabaseUtils

            // can throw a serial of RuntimeException. Catch them all here.

            mHandler.error(

                    EventHandler.FILE_ERROR,

                    mContext.getString(

                            com.android.internal.R.string.httpErrorFileNotFound) +

                    " " + ex.getMessage());

            mHandler.error(EventHandler.FILE_ERROR, errString(ex));

            return false;

        }

        return true;

core/java/android/webkit/FileLoader.java

+11 −7
Original line number Diff line number Diff line
@@ -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;