From f1a9b1bc249161fe1a9b0d85d4ed31153e4421c1 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Thu, 27 Nov 2014 17:20:21 +0000 Subject: Stop using ErrorStrings for apache. These strings only ever end up in logcat (at best), so there's no point having them translated. Also, rename the ErrorStrings class and move it android.webkit where the last remaining caller lives. (congrats webview people, this is now your mess to maintain.) Change-Id: I04dae37c34191b26a69282970318c1b782af1edf --- core/java/android/net/http/Connection.java | 57 ++++++++++++- core/java/android/net/http/ErrorStrings.java | 99 ---------------------- core/java/android/webkit/LegacyErrorStrings.java | 100 +++++++++++++++++++++++ core/java/android/webkit/WebViewDelegate.java | 3 +- 4 files changed, 157 insertions(+), 102 deletions(-) delete mode 100644 core/java/android/net/http/ErrorStrings.java create mode 100644 core/java/android/webkit/LegacyErrorStrings.java diff --git a/core/java/android/net/http/Connection.java b/core/java/android/net/http/Connection.java index 834ad69..831bd0e 100644 --- a/core/java/android/net/http/Connection.java +++ b/core/java/android/net/http/Connection.java @@ -436,7 +436,7 @@ abstract class Connection { ret = false; String error; if (errorId < 0) { - error = ErrorStrings.getString(errorId, mContext); + error = getEventHandlerErrorString(errorId); } else { Throwable cause = e.getCause(); error = cause != null ? cause.toString() : e.getMessage(); @@ -451,6 +451,61 @@ abstract class Connection { return ret; } + private static String getEventHandlerErrorString(int errorId) { + switch (errorId) { + case EventHandler.OK: + return "OK"; + + case EventHandler.ERROR: + return "ERROR"; + + case EventHandler.ERROR_LOOKUP: + return "ERROR_LOOKUP"; + + case EventHandler.ERROR_UNSUPPORTED_AUTH_SCHEME: + return "ERROR_UNSUPPORTED_AUTH_SCHEME"; + + case EventHandler.ERROR_AUTH: + return "ERROR_AUTH"; + + case EventHandler.ERROR_PROXYAUTH: + return "ERROR_PROXYAUTH"; + + case EventHandler.ERROR_CONNECT: + return "ERROR_CONNECT"; + + case EventHandler.ERROR_IO: + return "ERROR_IO"; + + case EventHandler.ERROR_TIMEOUT: + return "ERROR_TIMEOUT"; + + case EventHandler.ERROR_REDIRECT_LOOP: + return "ERROR_REDIRECT_LOOP"; + + case EventHandler.ERROR_UNSUPPORTED_SCHEME: + return "ERROR_UNSUPPORTED_SCHEME"; + + case EventHandler.ERROR_FAILED_SSL_HANDSHAKE: + return "ERROR_FAILED_SSL_HANDSHAKE"; + + case EventHandler.ERROR_BAD_URL: + return "ERROR_BAD_URL"; + + case EventHandler.FILE_ERROR: + return "FILE_ERROR"; + + case EventHandler.FILE_NOT_FOUND_ERROR: + return "FILE_NOT_FOUND_ERROR"; + + case EventHandler.TOO_MANY_REQUESTS_ERROR: + return "TOO_MANY_REQUESTS_ERROR"; + + default: + return "UNKNOWN_ERROR"; + } + } + HttpContext getHttpContext() { return mHttpContext; } diff --git a/core/java/android/net/http/ErrorStrings.java b/core/java/android/net/http/ErrorStrings.java deleted file mode 100644 index 8383681..0000000 --- a/core/java/android/net/http/ErrorStrings.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.http; - -import android.content.Context; -import android.util.Log; - -/** - * Localized strings for the error codes defined in EventHandler. - * - * {@hide} - */ -public class ErrorStrings { - private ErrorStrings() { /* Utility class, don't instantiate. */ } - - private static final String LOGTAG = "Http"; - - /** - * Get the localized error message resource for the given error code. - * If the code is unknown, we'll return a generic error message. - */ - public static String getString(int errorCode, Context context) { - return context.getText(getResource(errorCode)).toString(); - } - - /** - * Get the localized error message resource for the given error code. - * If the code is unknown, we'll return a generic error message. - */ - public static int getResource(int errorCode) { - switch(errorCode) { - case EventHandler.OK: - return com.android.internal.R.string.httpErrorOk; - - case EventHandler.ERROR: - return com.android.internal.R.string.httpError; - - case EventHandler.ERROR_LOOKUP: - return com.android.internal.R.string.httpErrorLookup; - - case EventHandler.ERROR_UNSUPPORTED_AUTH_SCHEME: - return com.android.internal.R.string.httpErrorUnsupportedAuthScheme; - - case EventHandler.ERROR_AUTH: - return com.android.internal.R.string.httpErrorAuth; - - case EventHandler.ERROR_PROXYAUTH: - return com.android.internal.R.string.httpErrorProxyAuth; - - case EventHandler.ERROR_CONNECT: - return com.android.internal.R.string.httpErrorConnect; - - case EventHandler.ERROR_IO: - return com.android.internal.R.string.httpErrorIO; - - case EventHandler.ERROR_TIMEOUT: - return com.android.internal.R.string.httpErrorTimeout; - - case EventHandler.ERROR_REDIRECT_LOOP: - return com.android.internal.R.string.httpErrorRedirectLoop; - - case EventHandler.ERROR_UNSUPPORTED_SCHEME: - return com.android.internal.R.string.httpErrorUnsupportedScheme; - - case EventHandler.ERROR_FAILED_SSL_HANDSHAKE: - return com.android.internal.R.string.httpErrorFailedSslHandshake; - - case EventHandler.ERROR_BAD_URL: - return com.android.internal.R.string.httpErrorBadUrl; - - case EventHandler.FILE_ERROR: - return com.android.internal.R.string.httpErrorFile; - - case EventHandler.FILE_NOT_FOUND_ERROR: - return com.android.internal.R.string.httpErrorFileNotFound; - - case EventHandler.TOO_MANY_REQUESTS_ERROR: - return com.android.internal.R.string.httpErrorTooManyRequests; - - default: - Log.w(LOGTAG, "Using generic message for unknown error code: " + errorCode); - return com.android.internal.R.string.httpError; - } - } -} diff --git a/core/java/android/webkit/LegacyErrorStrings.java b/core/java/android/webkit/LegacyErrorStrings.java new file mode 100644 index 0000000..11fc05d --- /dev/null +++ b/core/java/android/webkit/LegacyErrorStrings.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.webkit; + +import android.content.Context; +import android.net.http.EventHandler; +import android.util.Log; + +/** + * Localized strings for the error codes defined in EventHandler. + * + * {@hide} + */ +class LegacyErrorStrings { + private LegacyErrorStrings() { /* Utility class, don't instantiate. */ } + + private static final String LOGTAG = "Http"; + + /** + * Get the localized error message resource for the given error code. + * If the code is unknown, we'll return a generic error message. + */ + static String getString(int errorCode, Context context) { + return context.getText(getResource(errorCode)).toString(); + } + + /** + * Get the localized error message resource for the given error code. + * If the code is unknown, we'll return a generic error message. + */ + private static int getResource(int errorCode) { + switch(errorCode) { + case EventHandler.OK: + return com.android.internal.R.string.httpErrorOk; + + case EventHandler.ERROR: + return com.android.internal.R.string.httpError; + + case EventHandler.ERROR_LOOKUP: + return com.android.internal.R.string.httpErrorLookup; + + case EventHandler.ERROR_UNSUPPORTED_AUTH_SCHEME: + return com.android.internal.R.string.httpErrorUnsupportedAuthScheme; + + case EventHandler.ERROR_AUTH: + return com.android.internal.R.string.httpErrorAuth; + + case EventHandler.ERROR_PROXYAUTH: + return com.android.internal.R.string.httpErrorProxyAuth; + + case EventHandler.ERROR_CONNECT: + return com.android.internal.R.string.httpErrorConnect; + + case EventHandler.ERROR_IO: + return com.android.internal.R.string.httpErrorIO; + + case EventHandler.ERROR_TIMEOUT: + return com.android.internal.R.string.httpErrorTimeout; + + case EventHandler.ERROR_REDIRECT_LOOP: + return com.android.internal.R.string.httpErrorRedirectLoop; + + case EventHandler.ERROR_UNSUPPORTED_SCHEME: + return com.android.internal.R.string.httpErrorUnsupportedScheme; + + case EventHandler.ERROR_FAILED_SSL_HANDSHAKE: + return com.android.internal.R.string.httpErrorFailedSslHandshake; + + case EventHandler.ERROR_BAD_URL: + return com.android.internal.R.string.httpErrorBadUrl; + + case EventHandler.FILE_ERROR: + return com.android.internal.R.string.httpErrorFile; + + case EventHandler.FILE_NOT_FOUND_ERROR: + return com.android.internal.R.string.httpErrorFileNotFound; + + case EventHandler.TOO_MANY_REQUESTS_ERROR: + return com.android.internal.R.string.httpErrorTooManyRequests; + + default: + Log.w(LOGTAG, "Using generic message for unknown error code: " + errorCode); + return com.android.internal.R.string.httpError; + } + } +} diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java index 3dcfda3..a247c46 100644 --- a/core/java/android/webkit/WebViewDelegate.java +++ b/core/java/android/webkit/WebViewDelegate.java @@ -22,7 +22,6 @@ import android.app.Application; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; -import android.net.http.ErrorStrings; import android.os.SystemProperties; import android.os.Trace; import android.util.SparseArray; @@ -150,7 +149,7 @@ public final class WebViewDelegate { * Returns the error string for the given {@code errorCode}. */ public String getErrorString(Context context, int errorCode) { - return ErrorStrings.getString(errorCode, context); + return LegacyErrorStrings.getString(errorCode, context); } /** -- cgit v1.1