Block upload and switch to HTML mode until insert image or video has finished

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -589,7 +589,8 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         MediaUploadService mediaUploadService = MediaUploadService.getInstance();
 
         // Disable format bar buttons while a media upload is in progress
-        if ((mediaUploadService != null && mediaUploadService.hasUploads()) || mEditorFragment.isUploadingMedia()) {
+        if ((mediaUploadService != null && mediaUploadService.hasUploads()) || mEditorFragment.isUploadingMedia() ||
+                mEditorFragment.isActionInProgress()) {
             ToastUtils.showToast(this, R.string.editor_toast_uploading_please_wait, Duration.SHORT);
             return false;
         }

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java

@@ -71,6 +71,7 @@ public class EditorFragment extends EditorFragmentAbstract implements View.OnCli
 
     private static final float TOOLBAR_ALPHA_ENABLED = 1;
     private static final float TOOLBAR_ALPHA_DISABLED = 0.5f;
+    public static final int MAX_ACTION_TIME_MS = 2000;
 
     private String mTitle = "";
     private String mContentHtml = "";
@@ -106,6 +107,8 @@ public class EditorFragment extends EditorFragmentAbstract implements View.OnCli
 
     private final Map<String, ToggleButton> mTagToggleButtonMap = new HashMap<>();
 
+    private long mActionStartedAt = -1;
+
     public static EditorFragment newInstance(String title, String content) {
         EditorFragment fragment = new EditorFragment();
         Bundle args = new Bundle();
@@ -435,6 +438,10 @@ public void onClick(DialogInterface dialog, int which) {
         }
     }
 
+    public boolean isActionInProgress() {
+        return System.currentTimeMillis() - mActionStartedAt < MAX_ACTION_TIME_MS;
+    }
+
     private void toggleHtmlMode(final ToggleButton toggleButton) {
         if (!isAdded()) {
             return;
@@ -443,10 +450,9 @@ private void toggleHtmlMode(final ToggleButton toggleButton) {
         mEditorFragmentListener.onTrackableEvent(TrackableEvent.HTML_BUTTON_TAPPED);
 
         // Don't switch to HTML mode if currently uploading media
-        if (!mUploadingMedia.isEmpty()) {
+        if (!mUploadingMedia.isEmpty() || isActionInProgress()) {
             toggleButton.setChecked(false);
-
-            ToastUtils.showToast(getActivity(), R.string.alert_html_toggle_uploading, ToastUtils.Duration.LONG);
+            ToastUtils.showToast(getActivity(), R.string.alert_action_while_uploading, ToastUtils.Duration.LONG);
             return;
         }
 
@@ -578,6 +584,11 @@ public void onClick(View v) {
             mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
             ((ToggleButton) v).setChecked(false);
 
+            if (isActionInProgress()) {
+                ToastUtils.showToast(getActivity(), R.string.alert_action_while_uploading, ToastUtils.Duration.LONG);
+                return;
+            }
+
             if (mSourceView.getVisibility() == View.VISIBLE) {
                 ToastUtils.showToast(getActivity(), R.string.alert_insert_image_html_mode, ToastUtils.Duration.LONG);
             } else {
@@ -843,6 +854,7 @@ public void run() {
                         mWebView.execJavaScriptFromString("ZSSEditor.insertImage('" + safeMediaUrl + "', '" + mediaId +
                                 "');");
                     }
+                    mActionStartedAt = System.currentTimeMillis();
                 } else {
                     String id = mediaFile.getMediaId();
                     if (mediaFile.isVideo()) {
@@ -1471,4 +1483,9 @@ private void applyFormattingHtmlMode(ToggleButton toggleButton, String tag) {
             mSourceViewContent.setSelection(selectionEnd + endTag.length());
         }
     }
+
+    @Override
+    public void onActionFinished() {
+        mActionStartedAt = -1;
+    }
 }

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java

@@ -21,6 +21,7 @@ public abstract class EditorFragmentAbstract extends Fragment {
     public abstract void appendGallery(MediaGallery mediaGallery);
     public abstract void setUrlForVideoPressId(String videoPressId, String url, String posterUrl);
     public abstract boolean isUploadingMedia();
+    public abstract boolean isActionInProgress();
     public abstract boolean hasFailedMediaUploads();
     public abstract void removeAllFailedMediaUploads();
     public abstract void setTitlePlaceholder(CharSequence text);

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/JsCallbackReceiver.java

@@ -40,6 +40,8 @@ public class JsCallbackReceiver {
 
     private static final String CALLBACK_RESPONSE_STRING = "callback-response-string";
 
+    private static final String CALLBACK_ACTION_FINISHED = "callback-action-finished";
+
     private final OnJsEditorStateChangedListener mListener;
 
     private Set<String> mPreviousStyleSet = new HashSet<>();
@@ -224,6 +226,9 @@ public void executeCallback(String callbackId, String params) {
                 }
                 mListener.onGetHtmlResponse(Utils.buildMapFromKeyValuePairs(responseDataSet));
                 break;
+            case CALLBACK_ACTION_FINISHED:
+                mListener.onActionFinished();
+                break;
             default:
                 AppLog.d(AppLog.T.EDITOR, "Unhandled callback: " + callbackId + ":" + params);
         }

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java

@@ -1164,11 +1164,14 @@ public void removeAllFailedMediaUploads() {}
 
     @Override
     public void setTitlePlaceholder(CharSequence text) {
-
     }
 
     @Override
     public void setContentPlaceholder(CharSequence text) {
+    }
 
+    @Override
+    public boolean isActionInProgress() {
+        return false;
     }
 }

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/OnJsEditorStateChangedListener.java

@@ -16,4 +16,5 @@ public interface OnJsEditorStateChangedListener {
     void onMediaReplaced(String mediaId);
     void onVideoPressInfoRequested(String videoId);
     void onGetHtmlResponse(Map<String, String> responseArgs);
+    void onActionFinished();
 }

libs/editor/WordPressEditor/src/main/res/values/strings.xml

@@ -15,7 +15,7 @@
     <string name="uploading_gallery_placeholder">Uploading gallery…</string>
 
     <string name="alert_insert_image_html_mode">Can\'t insert media directly in HTML mode. Please switch back to visual mode.</string>
-    <string name="alert_html_toggle_uploading">You are currently uploading media. Please wait until this completes.</string>
+    <string name="alert_action_while_uploading">You are currently uploading media. Please wait until this completes.</string>
 
     <string name="stop_upload_dialog_title">Stop uploading?</string>
     <string name="stop_upload_button">Stop Upload</string>

libs/editor/WordPressEditor/src/test/java/org/wordpress/android/editor/EditorFragmentAbstractTest.java

@@ -79,6 +79,11 @@ public boolean isUploadingMedia() {
             return false;
         }
 
+        @Override
+        public boolean isActionInProgress() {
+            return false;
+        }
+
         @Override
         public boolean hasFailedMediaUploads() {
             return false;

libs/editor/libs/editor-common/assets/ZSSRichTextEditor.js

@@ -1205,6 +1205,7 @@ ZSSEditor.insertImage = function(url, remoteId, alt) {
     this.insertHTMLWrappedInParagraphTags(html);
 
     this.sendEnabledStyles();
+    this.callback("callback-action-finished");
 };
 
 /**
@@ -1516,6 +1517,7 @@ ZSSEditor.insertVideo = function(videoURL, posterURL, videopressID) {
     this.insertHTMLWrappedInParagraphTags(html);
 
     this.sendEnabledStyles();
+    this.callback("callback-action-finished");
 };
 
 /**