Provide default error strings in BrowserFrame.onReceivedError().
This method is called from both the Android and Chrome HTTP stacks.
We want the same user-facing behaviour in each case, but the Chrome
code does not have easy access to the same error message strings.
Therefore, I'll have the Chrome HTTP stack provide empty strings
for the descriptions. (See change I9042a2ee in external/webkit).
This CL makes BrowserFrame check for empty or null strings and use
the standard error messages instead.
The strings were package-private, so I did a little cleaning up
to make them public (but still hidden from the API). Using a switch
statement instead of an array because it's more robust and should
be comparably efficient.
Bug: 3172265
Test: Load http://google.com:81 to force a timeout error, check
that the correct message is displayed.
Change-Id: I7dec8dffe8ad9e513fdb90877e0b466e707174a8
diff --git a/core/java/android/net/http/ErrorStrings.java b/core/java/android/net/http/ErrorStrings.java
new file mode 100644
index 0000000..8383681
--- /dev/null
+++ b/core/java/android/net/http/ErrorStrings.java
@@ -0,0 +1,99 @@
+/*
+ * 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;
+ }
+ }
+}