Squashed 'libs/editor/' changes from eb8d070..bed2a4e

bed2a4e Merge pull request #326 from wordpress-mobile/issue/314-html-mode-toggle-cursor
7b5bdb4 Force cursor to move to start of content field when switching back from HTML mode
dca8254 Merge pull request #3896 from wordpress-mobile/issue/300editor-broken-images-after-upload-2
ffeec5f remove debug logs
d695c87 Use remoteurl in the link wrapper
373467f Merge branch 'develop' into issue/300editor-broken-images-after-upload-2
1dd8be0 Merge branch 'develop' into issue/297editor-backspace-media
bf525c8 update to com.android.tools.build:gradle:2.0.0-beta7
196f82c Merge branch 'develop' into issue/297editor-backspace-media
c576833 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop
ddcb207 Changed MutationObserver handling to check if the WebView supports it, rather than rely on API levels
d79bc00 Refactor: grouped mutation observation methods together
eeb6373 Refactored DOM element mutation listening, delegating everything to one trackNodeForMutation method
7b54573 Changed MutationObserver behavior to track individual media nodes instead of each contenteditable div
a933e5b Moved failed media methods to the generic media method group
cfb836b Parse for failed media when returning from HTML to visual mode
c0df468 Track DOMNodeRemoved events when parsing for failed media
839b3e5 Fixed a variable name error in ZSSEditor.removeImage
392e1d7 On API<19, use DOMNodeRemoved events to track media deletions (instead of the unsupported MutationObserver used for newer APIs)
5c3bb59 Merge branch 'develop' into issue/297editor-backspace-media
4c7ca43 Merge pull request #3804 from wordpress-mobile/issue/enable-editor-debug-mode
cc332a9 Consume KEYCODE_VOLUME_UP event when debug print is called
cf492d0 broken retries
449abbd Merge branch 'issue/enable-editor-debug-mode' into issue/300editor-broken-images-after-upload-2
63bb901 use a remoteUrl attribute to avoid seeing broken image if download failed
55677b6 remove debug action bar button and log raw html when volume up button is pressed
7ba5069 fix function call errors
886e274 Add back image swapping onError
920c8d3 fix wordpress-mobile/WordPress-Editor-Android#300: Retry download onError after an upload
7fa191f add missing comment
01fbeed Fixes an issue where manually deleting uploading/failed media will cause the caret to disappear
5904f03 Notify native through a callback whenever uploading/failed media are manually deleted

git-subtree-dir: libs/editor
git-subtree-split: bed2a4ef1ea0a86e4237791da8e867f17590c5b3

Author: aforcier

WordPressEditor/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta7'
     }
 }
 

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

@@ -19,9 +19,6 @@
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -74,8 +71,6 @@ 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;
 
-    protected static final int BUTTON_ID_LOG_HTML = 555;
-
     private String mTitle = "";
     private String mContentHtml = "";
 
@@ -409,8 +404,6 @@ protected void initJsEditor() {
 
         if (mDebugModeEnabled) {
             enableWebDebugging(true);
-            // Enable the HTML logging button
-            setHasOptionsMenu(true);
         }
     }
 
@@ -457,7 +450,11 @@ public void onClick(View v) {
                 mContentHtml = mSourceViewContent.getText().toString();
                 updateVisualEditorFields();
 
-                mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_content').focus();");
+                // Update the list of failed media uploads
+                mWebView.execJavaScriptFromString("ZSSEditor.getFailedMedia();");
+
+                // Reset selection to avoid buggy cursor behavior
+                mWebView.execJavaScriptFromString("ZSSEditor.resetSelectionOnField('zss_field_content');");
             }
         } else if (id == R.id.format_bar_button_media) {
             mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
@@ -640,38 +637,11 @@ public void run() {
 
     @SuppressLint("NewApi")
     private void enableWebDebugging(boolean enable) {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             AppLog.i(T.EDITOR, "Enabling web debugging");
             WebView.setWebContentsDebuggingEnabled(enable);
         }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(0, BUTTON_ID_LOG_HTML, 0, "Log HTML")
-                .setIcon(R.drawable.ic_log_html)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == BUTTON_ID_LOG_HTML) {
-            if (mDebugModeEnabled) {
-                // Log the raw html
-                mWebView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mWebView.execJavaScriptFromString("console.log(document.body.innerHTML);");
-                    }
-                });
-            } else {
-                AppLog.d(T.EDITOR, "Could not execute JavaScript - debug mode not enabled");
-            }
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
+        mWebView.setDebugModeEnabled(mDebugModeEnabled);
     }
 
     @Override
@@ -1191,6 +1161,13 @@ public void onLinkTapped(String url, String title) {
         linkDialogFragment.show(getFragmentManager(), "LinkDialogFragment");
     }
 
+    @Override
+    public void onMediaRemoved(String mediaId) {
+        mUploadingMedia.remove(mediaId);
+        mFailedMediaIds.remove(mediaId);
+        mEditorFragmentListener.onMediaUploadCancelClicked(mediaId, true);
+    }
+
     @Override
     public void onMediaReplaced(String mediaId) {
         mUploadingMedia.remove(mediaId);

WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java

@@ -23,6 +23,7 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.HTTPUtils;
 import org.wordpress.android.util.StringUtils;
+import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.UrlUtils;
 
 import java.io.IOException;
@@ -40,6 +41,7 @@ public abstract class EditorWebViewAbstract extends WebView {
     private AuthHeaderRequestListener mAuthHeaderRequestListener;
     private ErrorListener mErrorListener;
     private JsCallbackReceiver mJsCallbackReceiver;
+    private boolean mDebugModeEnabled;
 
     private Map<String, String> mHeaderMap = new HashMap<>();
 
@@ -175,6 +177,10 @@ public void setVisibility(int visibility) {
         super.setVisibility(visibility);
     }
 
+    public void setDebugModeEnabled(boolean enabled) {
+        mDebugModeEnabled = enabled;
+    }
+
     /**
      * Handles events that should be triggered when the WebView is hidden or is shown to the user
      *
@@ -214,6 +220,13 @@ public boolean onKeyPreIme(int keyCode, KeyEvent event) {
                 mOnImeBackListener.onImeBack();
             }
         }
+        if (mDebugModeEnabled && event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP
+            && event.getAction() == KeyEvent.ACTION_DOWN) {
+            // Log the raw html
+            execJavaScriptFromString("console.log(document.body.innerHTML);");
+            ToastUtils.showToast(getContext(), "Debug: Raw HTML has been logged");
+            return true;
+        }
         return super.onKeyPreIme(keyCode, event);
     }
 

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

@@ -32,6 +32,7 @@ public class JsCallbackReceiver {
     private static final String CALLBACK_VIDEO_REPLACED = "callback-video-replaced";
     private static final String CALLBACK_IMAGE_TAP = "callback-image-tap";
     private static final String CALLBACK_LINK_TAP = "callback-link-tap";
+    private static final String CALLBACK_MEDIA_REMOVED = "callback-media-removed";
 
     private static final String CALLBACK_VIDEOPRESS_INFO_REQUEST = "callback-videopress-info-request";
 
@@ -179,6 +180,13 @@ public void executeCallback(String callbackId, String params) {
 
                 mListener.onLinkTapped(url, title);
                 break;
+            case CALLBACK_MEDIA_REMOVED:
+                AppLog.d(AppLog.T.EDITOR, "Media removed, " + params);
+                // Extract the media id from the callback string (stripping the 'id=' part of the callback string)
+                if (params.length() > 3) {
+                    mListener.onMediaRemoved(params.substring(3));
+                }
+                break;
             case CALLBACK_VIDEOPRESS_INFO_REQUEST:
                 // Extract the VideoPress id from the callback string (stripping the 'id=' part of the callback string)
                 if (params.length() > 3) {

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

@@ -12,6 +12,7 @@ public interface OnJsEditorStateChangedListener {
     void onSelectionStyleChanged(Map<String, Boolean> changeSet);
     void onMediaTapped(String mediaId, MediaType mediaType, JSONObject meta, String uploadStatus);
     void onLinkTapped(String url, String title);
+    void onMediaRemoved(String mediaId);
     void onMediaReplaced(String mediaId);
     void onVideoPressInfoRequested(String videoId);
     void onGetHtmlResponse(Map<String, String> responseArgs);

WordPressEditor/src/main/res/drawable-hdpi/ic_log_html.png

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta7'
     }
 }