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

2 files changed, 101 insertions, 2 deletions

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);
     }
 
     /**