Fix pull request requested changes

# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
#	src/com/owncloud/android/utils/ErrorMessageAdapter.java

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1546,9 +1546,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
 
-    private void updateStatusIconFailUserName(int statusText){
+    private void updateFailedAuthStatusIconAndText(int failedStatusText){
         mAuthStatusIcon = R.drawable.ic_alert;
-        mAuthStatusText = statusText;
+        mAuthStatusText = failedStatusText;
     }
 
     private void updateServerStatusIconNoRegularAuth() {

src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -266,18 +266,15 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
                 // the thread may die before, an exception will occur, and the message will be left on the screen
                 // until the app dies
 
-                // Edited: this toast message has no sense. If operation is being passed as null to getErrorCauseMessage(),
-                // the returned message is always null and therefore an empty toast is shown. Pending to review and change/delete
-
-//                Toast.makeText(
-//                        getContext().getApplicationContext(),
-//                        ErrorMessageAdapter.getErrorCauseMessage(
-//                                result,
-//                                null,
-//                                getContext().getResources()
-//                        ),
-//                        Toast.LENGTH_SHORT
-//                ).show();
+                Toast.makeText(
+                        getContext().getApplicationContext(),
+                        ErrorMessageAdapter.getErrorCauseMessage(
+                                result,
+                                null,
+                                getContext().getResources()
+                        ),
+                        Toast.LENGTH_SHORT
+                ).show();
             }
         });
     }

src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -58,8 +58,8 @@ public class ErrorMessageAdapter {
 
         String message = null;
 
-        if (!result.isSuccess() && isNetworkError(result.getCode())) {
-            message = getErrorMessage(result, res);
+        if (!result.isSuccess() && isCommonError(result.getCode())) {
+            message = getCommonErrorMessage(result, res);
 
         } else if (operation instanceof UploadFileOperation) {
 
@@ -86,9 +86,6 @@ public class ErrorMessageAdapter {
                 } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                     message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
-                } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
-
                 } else {
                     message = String.format(
                             res.getString(R.string.uploader_upload_failed_content_single),
@@ -107,9 +104,6 @@ public class ErrorMessageAdapter {
                 if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
                     message = res.getString(R.string.downloader_download_file_not_found);
 
-                }  else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
-
                 } else {
                     message = String.format(
                             res.getString(R.string.downloader_download_failed_content), new File(
@@ -127,9 +121,6 @@ public class ErrorMessageAdapter {
                     message = String.format(res.getString(R.string.forbidden_permissions),
                             res.getString(R.string.forbidden_permissions_delete));
 
-                } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
-
                 } else {
                     message = res.getString(R.string.remove_fail_msg);
                 }
@@ -150,9 +141,6 @@ public class ErrorMessageAdapter {
             } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {
                 message = res.getString(R.string.rename_server_fail_msg);
             }
@@ -173,9 +161,6 @@ public class ErrorMessageAdapter {
             } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {
                 message = res.getString(R.string.create_dir_fail_msg);
             }
@@ -194,9 +179,6 @@ public class ErrorMessageAdapter {
                 message = String.format(res.getString(R.string.forbidden_permissions),
                         res.getString(R.string.share_link_forbidden_permissions));
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {    // Generic error
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.share_link_file_error);
@@ -215,9 +197,6 @@ public class ErrorMessageAdapter {
                 message = String.format(res.getString(R.string.forbidden_permissions),
                         res.getString(R.string.unshare_link_forbidden_permissions));
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {    // Generic error
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.unshare_link_file_error);
@@ -237,9 +216,6 @@ public class ErrorMessageAdapter {
                 message = String.format(res.getString(R.string.forbidden_permissions),
                         res.getString(R.string.update_link_forbidden_permissions));
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {    // Generic error
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.update_link_file_error);
@@ -262,9 +238,6 @@ public class ErrorMessageAdapter {
             } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {    // Generic error
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.move_file_error);
@@ -279,9 +252,6 @@ public class ErrorMessageAdapter {
                     message = String.format(res.getString(R.string.sync_current_folder_was_removed),
                             folderPathName);
 
-                } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = res.getString(R.string.maintenance_mode);
-
                 } else {    // Generic error
                     // Show a Message, operation finished without success
                     message = String.format(res.getString(R.string.sync_folder_failed_content),
@@ -303,23 +273,16 @@ public class ErrorMessageAdapter {
                 message = String.format(res.getString(R.string.forbidden_permissions),
                         res.getString(R.string.forbidden_permissions_copy));
 
-            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-
             } else {    // Generic error
                 // Show a Message, operation finished without success
                 message = res.getString(R.string.copy_file_error);
             }
-        } else if (operation instanceof GetSharesForFileOperation) {
-            if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = res.getString(R.string.maintenance_mode);
-            }
         }
 
         return message;
     }
 
-    private static String getErrorMessage(RemoteOperationResult result, Resources res) {
+    private static String getCommonErrorMessage(RemoteOperationResult result, Resources res) {
 
         String message = null;
 
@@ -339,15 +302,21 @@ public class ErrorMessageAdapter {
 
             } else if (result.getCode() == ResultCode.HOST_NOT_AVAILABLE) {
                 message = res.getString(R.string.network_host_not_available);
+            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
+                message = res.getString(R.string.maintenance_mode);
             }
         }
 
         return message;
     }
 
-    private static boolean isNetworkError(RemoteOperationResult.ResultCode code) {
+    private static boolean isCommonError(RemoteOperationResult.ResultCode code) {
         return code == ResultCode.WRONG_CONNECTION ||
                 code == ResultCode.TIMEOUT ||
-                code == ResultCode.HOST_NOT_AVAILABLE;
+                code == ResultCode.HOST_NOT_AVAILABLE ||
+                code == ResultCode.MAINTENANCE_MODE) {
+            return true;
+        } else
+            return false;
     }
 }