diff options
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/emailcommon/mail/MessagingException.java | 2 | ||||
| -rw-r--r-- | src/com/android/mail/browse/ConversationListFooterView.java | 3 | ||||
| -rw-r--r-- | src/com/android/mail/providers/UIProvider.java | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d31bfd66a..d69f82e4d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -543,6 +543,7 @@ <item>Security error.</item> <item>Couldn\'t sync.</item> <item>Internal Error</item> + <item>Server Error</item> </string-array> <!-- Widget strings --> @@ -653,7 +654,7 @@ <item>All Folders</item> </string-array> - <!-- Button text for the button to click to have the user sign in again. [CHAR LIMIT=20]--> + <!-- Button text for the button to click to have the user sign in again or adjust their credentials. [CHAR LIMIT=20]--> <string name="signin">Sign-in</string> <!-- Button text for the button to click for more information. [CHAR LIMIT=20]--> <string name="info">Info</string> diff --git a/src/com/android/emailcommon/mail/MessagingException.java b/src/com/android/emailcommon/mail/MessagingException.java index 4d376f535..9b7e8a0fd 100644 --- a/src/com/android/emailcommon/mail/MessagingException.java +++ b/src/com/android/emailcommon/mail/MessagingException.java @@ -68,6 +68,8 @@ public class MessagingException extends Exception { public static final int CLIENT_CERTIFICATE_ERROR = 17; /** The server indicates it does not support OAuth authentication */ public static final int OAUTH_NOT_SUPPORTED = 18; + /** The server indicates it experienced an internal error */ + public static final int SERVER_ERROR = 19; protected int mExceptionType; // Exception type-specific data diff --git a/src/com/android/mail/browse/ConversationListFooterView.java b/src/com/android/mail/browse/ConversationListFooterView.java index 68ef61681..4e77b2ec2 100644 --- a/src/com/android/mail/browse/ConversationListFooterView.java +++ b/src/com/android/mail/browse/ConversationListFooterView.java @@ -132,6 +132,9 @@ public final class ConversationListFooterView extends LinearLayout implements Vi case UIProvider.LastSyncResult.CONNECTION_ERROR: actionTextResourceId = R.string.retry; break; + case UIProvider.LastSyncResult.SERVER_ERROR: + actionTextResourceId = R.string.retry; + break; case UIProvider.LastSyncResult.AUTH_ERROR: actionTextResourceId = R.string.signin; break; diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java index a4f661ca6..6e9bc371e 100644 --- a/src/com/android/mail/providers/UIProvider.java +++ b/src/com/android/mail/providers/UIProvider.java @@ -102,6 +102,8 @@ public class UIProvider { public static final int STORAGE_ERROR = 4; /** The sync wasn't completed due to an internal error/exception */ public static final int INTERNAL_ERROR = 5; + /** The sync wasn't completed due to an error in the mail server */ + public static final int SERVER_ERROR = 6; } // The actual content provider should define its own authority |