Merge branch 'master' into prelive

Author: deniss-mc

widgetssdk/src/main/java/com/glia/widgets/chat/adapter/UploadAttachmentAdapter.java

@@ -120,6 +120,7 @@ private boolean isError(FileAttachment.Status status) {
                 case ERROR_PERMISSIONS_DENIED:
                 case ERROR_FORMAT_UNSUPPORTED:
                 case ERROR_FILE_TOO_LARGE:
+                case ERROR_FILE_UPLOAD_FORBIDDEN:
                 case ERROR_ENGAGEMENT_MISSING:
                 case ERROR_SUPPORTED_FILE_ATTACHMENT_COUNT_EXCEEDED:
                 case ERROR_SECURITY_SCAN_FAILED:
@@ -170,6 +171,10 @@ private void setTitleText(TextView titleText, String fileName, long byteSize, Fi
                     titleText.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.design_default_color_error));
                     titleText.setText(R.string.glia_chat_attachment_upload_error_failed_to_check_safety);
                     break;
+                case ERROR_FILE_UPLOAD_FORBIDDEN:
+                    titleText.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.design_default_color_error));
+                    titleText.setText(R.string.glia_chat_attachment_upload_error_file_upload_forbidden);
+                    break;
                 case ERROR_UNKNOWN:
                 case ERROR_INTERNAL:
                     titleText.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.design_default_color_error));
@@ -204,6 +209,7 @@ private void setProgressIndicatorState(LinearProgressIndicator progressIndicator
                 case ERROR_ENGAGEMENT_MISSING:
                 case ERROR_SUPPORTED_FILE_ATTACHMENT_COUNT_EXCEEDED:
                 case ERROR_SECURITY_SCAN_FAILED:
+                case ERROR_FILE_UPLOAD_FORBIDDEN:
                 case ERROR_UNKNOWN:
                     progressIndicator.setIndeterminate(false);
                     progressIndicator.setProgress(100);
@@ -228,6 +234,7 @@ private String getStatusIndicatorText(Context context, FileAttachment.Status sta
                 case ERROR_SUPPORTED_FILE_ATTACHMENT_COUNT_EXCEEDED:
                 case ERROR_SECURITY_SCAN_FAILED:
                 case ERROR_UNKNOWN:
+                case ERROR_FILE_UPLOAD_FORBIDDEN:
                     return context.getString(R.string.glia_chat_attachment_upload_failed_upload);
                 case UPLOADING:
                 default:

widgetssdk/src/main/java/com/glia/widgets/core/fileupload/FileAttachmentRepository.java

@@ -172,6 +172,8 @@ private void onUploadFileError(Uri uri, GliaException exception) {
 
     private FileAttachment.Status getAttachmentStatus(GliaException exception) {
         switch (exception.cause) {
+            case FILE_UPLOAD_FORBIDDEN:
+                return FileAttachment.Status.ERROR_FILE_UPLOAD_FORBIDDEN;
             case INVALID_INPUT:
                 return FileAttachment.Status.ERROR_INVALID_INPUT;
             case NETWORK_TIMEOUT:

widgetssdk/src/main/java/com/glia/widgets/core/fileupload/model/FileAttachment.java

@@ -90,6 +90,8 @@ public enum Status {
         ERROR_UNKNOWN,
         ERROR_SECURITY_SCAN_FAILED,
 
+        ERROR_FILE_UPLOAD_FORBIDDEN,
+
         ERROR_SUPPORTED_FILE_ATTACHMENT_COUNT_EXCEEDED
     }
 }

widgetssdk/src/main/res/values/strings.xml

@@ -130,6 +130,7 @@
     <string name="glia_chat_attachment_upload_error_file_count_limit_reached">Cannot upload more than 25 files</string>
     <string name="glia_chat_attachment_upload_error_internal_error">Internal error</string>
     <string name="glia_chat_attachment_upload_error_failed_to_check_safety">Failed to check the safety of the file.</string>
+    <string name="glia_chat_attachment_upload_error_file_upload_forbidden">File uploading disabled</string>
     <string name="glia_chat_attachment_upload_menu_browse">Browse</string>
     <string name="glia_chat_attachment_upload_menu_take_photo">Take Photo</string>
     <string name="glia_chat_attachment_upload_menu_gallery">Photo library</string>