Merge pull request #10010 from wordpress-mobile/issue/9384-change-email-error

Improve error messaging when changing account settings

Author: theck13

WordPress/src/main/java/org/wordpress/android/ui/prefs/AccountSettingsFragment.java

@@ -6,6 +6,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -285,7 +286,13 @@ public void onAccountChanged(OnAccountChanged event) {
             showChangePasswordProgressDialog(false);
 
             if (event.isError()) {
-                ToastUtils.showToast(getActivity(), event.error.message, ToastUtils.Duration.LONG);
+                // We usually rely on event.error.type and provide our own localized message.
+                // This case is exceptional because:
+                // 1. The server-side error type is generic, but patching this server-side is quite involved
+                // 2. We know the error string return from the server has decent localization
+                String errorMessage = !TextUtils.isEmpty(event.error.message) ? event.error.message
+                        : getString(R.string.error_post_account_settings);
+                ToastUtils.showToast(getActivity(), errorMessage, ToastUtils.Duration.LONG);
                 AppLog.e(T.SETTINGS, event.error.message);
             } else {
                 ToastUtils.showToast(getActivity(), R.string.change_password_confirmation, ToastUtils.Duration.LONG);
@@ -299,8 +306,13 @@ public void onAccountChanged(OnAccountChanged event) {
                                 ToastUtils.Duration.LONG);
                         break;
                     case SETTINGS_POST_ERROR:
-                        ToastUtils.showToast(getActivity(), R.string.error_post_account_settings,
-                                ToastUtils.Duration.LONG);
+                        // We usually rely on event.error.type and provide our own localized message.
+                        // This case is exceptional because:
+                        // 1. The server-side error type is generic, but patching this server-side is quite involved
+                        // 2. We know the error string return from the server has decent localization
+                        String errorMessage = !TextUtils.isEmpty(event.error.message) ? event.error.message
+                                : getString(R.string.error_post_account_settings);
+                        ToastUtils.showToast(getActivity(), errorMessage, ToastUtils.Duration.LONG);
                         // we optimistically show the email change snackbar, if that request fails, we should
                         // remove the snackbar
                         checkIfEmailChangeIsPending();