Squashed 'libs/editor/' changes from 17887d3..8818dd1

maxme · maxme · commit 990750455794 · 2016-04-27T09:10:48.000+02:00
8818dd1 Merge pull request #360 from wordpress-mobile/issue/344-remove-blockquotes a5b021d Check that parent blockquote is the first thing inside the post before applying afterKeyDownEvent fix ed096e2 Allow individual checks in afterKeyDownEvent to determine if they should go through if the HTML hasn't changed 2206af5 In afterKeyDownEvent, compare before and after HTML and quit if they're the same 23ec38e Refactored afterKeyDownEvent for readability ae65514 Added generic giveFocusToElement method cb8cccd Fixed an issue where backspacing doesn't remove a blockquote when it's at the start of a post with more content below it 8f20ff5 Added ZSSField.afterKeyDownEvent, which is called after the results of a keydown event have taken effect c949332 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Editor-Android into develop 7ce2aa7 Merge branch 'issue/315-paste-fixes' into develop a00e762 Merge pull request #358 from wordpress-mobile/issue/315-paste-fixes 4a6b534 Merge pull request #357 from wordpress-mobile/issue/350-fix-newlines-api16 edf8b4f Fixed an issue with incorrect paragraph wrapping when starting a post with a blockquote 822ce8f update comment b8a90b2 Fix newlines when switching to HTML mode on API <= 16 26b7be5 Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop 1215bdd Make sure text is wrapped in paragraph tags when adding blockquotes f16e222 Wrap hardware pastes in paragraph tags in empty posts 5e9559f Fix software paste on API<19 by wrapping the paste in paragraph tags after the fact, when a new line is entered 61e5cf3 Wrap software pastes in paragraph tags for API19+ for empty posts 458b6cf Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure 9e112be Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image cf7b400 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop 7885bca Use a static listener to handle reflection failures 182e5ef Updates the p/div conversion regex to more strictly match tags eba46dd Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread git-subtree-dir: libs/editor git-subtree-split: 8818dd1d120140283da46b40b7ad7fc59d772def
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java
@@ -28,6 +28,7 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -60,7 +61,8 @@ private void configureWebView() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 if (url != null && url.startsWith("callback") && mJsCallbackReceiver != null) {
-                    String[] split = url.split(":", 2);
+                    String data = URLDecoder.decode(url);
+                    String[] split = data.split(":", 2);
                     String callbackId = split[0];
                     String params = (split.length > 1 ? split[1] : "");
                     mJsCallbackReceiver.executeCallback(callbackId, params);
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewCompatibility.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewCompatibility.java
@@ -18,30 +18,52 @@
  * JavaScript, {@link #loadJavaScript(String)}, instead of {@link WebView#loadUrl(String)}. This is needed because
  * <code>WebView#loadUrl(String)</code> on API<19 eventually calls <code>WebViewClassic#hideSoftKeyboard()</code>,
  * hiding the keyboard whenever JavaScript is executed.</p>
- *
+ * <p/>
  * <p>This class uses reflection to access the normally inaccessible <code>WebViewCore#sendMessage(Message)</code>
  * and use it to execute JavaScript, sidestepping <code>WebView#loadUrl(String)</code> and the keyboard issue.</p>
  */
 @SuppressWarnings("TryWithIdenticalCatches")
 public class EditorWebViewCompatibility extends EditorWebViewAbstract {
+    public interface ReflectionFailureListener {
+        void onReflectionFailure(ReflectionException e);
+    }
+
+    public class ReflectionException extends Exception {
+        public ReflectionException(Throwable cause) {
+            super(cause);
+        }
+    }
+
     private static final int EXECUTE_JS = 194; // WebViewCore internal JS message code
 
     private Object mWebViewCore;
     private Method mSendMessageMethod;
 
+    // Dirty static listener, but it's impossible to set the listener during the construction if we want to keep
+    // the xml layout
+    private static ReflectionFailureListener mReflectionFailureListener;
+    private boolean mReflectionSucceed = true;
+
+    public static void setReflectionFailureListener(ReflectionFailureListener reflectionFailureListener) {
+        mReflectionFailureListener = reflectionFailureListener;
+    }
+
     public EditorWebViewCompatibility(Context context, AttributeSet attrs) {
         super(context, attrs);
         try {
             this.initReflection();
         } catch (ReflectionException e) {
             AppLog.e(T.EDITOR, e);
-            handleReflectionFailure();
+            handleReflectionFailure(e);
         }
     }
 
     private void initReflection() throws ReflectionException {
+        if (!mReflectionSucceed) {
+            // Reflection failed once already, it won't succeed on a second try
+            return;
+        }
         Object webViewProvider;
-
         try {
             if (Build.VERSION.SDK_INT >= 16) {
                 // On API >= 16, the WebViewCore instance is not defined inside WebView itself but inside a
@@ -58,7 +80,6 @@ private void initReflection() throws ReflectionException {
                 mWebViewCore = webViewCoreField.get(webViewProvider);
             } else {
                 // On API < 16, the WebViewCore is directly accessible from the WebView
-
                 // Access WebViewCore object
                 Field webViewCoreField = WebView.class.getDeclaredField("mWebViewCore");
                 webViewCoreField.setAccessible(true);
@@ -97,19 +118,22 @@ private void loadJavaScript(final String javaScript) throws ReflectionException
     public void execJavaScriptFromString(String javaScript) {
         try {
             loadJavaScript(javaScript);
-        } catch(ReflectionException e) {
+        } catch (ReflectionException e) {
             AppLog.e(T.EDITOR, e);
-            handleReflectionFailure();
+            handleReflectionFailure(e);
         }
     }
 
-    private void handleReflectionFailure() {
-        // TODO: Fallback to legacy editor and pass the error to analytics
+    private void handleReflectionFailure(ReflectionException e) {
+        if (mReflectionFailureListener != null) {
+            mReflectionFailureListener.onReflectionFailure(e);
+        }
+        mReflectionSucceed = false;
     }
 
-    public class ReflectionException extends Exception {
-        public ReflectionException(Throwable cause) {
-            super(cause);
-        }
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mReflectionFailureListener = null;
     }
-}
+}
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java
@@ -9,9 +9,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.os.Parcelable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -1023,66 +1022,83 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putString(KEY_CONTENT, mContentEditText.getText().toString());
     }
 
-    public void addMediaFile(final MediaFile mediaFile, final String imageUrl, final ImageLoader imageLoader, final int start, final int end) {
-        mediaFile.setFileURL(imageUrl);
-        mediaFile.setFilePath(imageUrl);
-        final WPEditImageSpan imageSpan = createWPEditImageSpan(getActivity(), mediaFile);
-        mEditorFragmentListener.saveMediaFile(mediaFile);
-        imageSpan.setMediaFile(mediaFile);
+    private class AddMediaFileTask extends AsyncTask<Void, Void, WPEditImageSpan> {
+        private MediaFile mMediaFile;
+        private String mImageUrl;
+        private ImageLoader mImageLoader;
+        private int mStart;
+        private int mEnd;
+
+        public AddMediaFileTask(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader, int start, int end) {
+            mMediaFile = mediaFile;
+            mImageUrl = imageUrl;
+            mImageLoader = imageLoader;
+            mStart = start;
+            mEnd = end;
+        }
 
-        Handler handler = new Handler(Looper.getMainLooper());
-        final Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                // Insert the WPImageSpan in the content field
-                int selectionStart = start;
-                int selectionEnd = end;
-
-                if (selectionStart > selectionEnd) {
-                    int temp = selectionEnd;
-                    selectionEnd = selectionStart;
-                    selectionStart = temp;
-                }
+        protected WPEditImageSpan doInBackground(Void... voids) {
+            mMediaFile.setFileURL(mImageUrl);
+            mMediaFile.setFilePath(mImageUrl);
+            WPEditImageSpan imageSpan = createWPEditImageSpan(getActivity(), mMediaFile);
+            mEditorFragmentListener.saveMediaFile(mMediaFile);
+            return imageSpan;
+        }
 
-                imageSpan.setPosition(selectionStart, selectionEnd);
+        protected void onPostExecute(WPEditImageSpan imageSpan) {
+            // Insert the WPImageSpan in the content field
+            int selectionStart = mStart;
+            int selectionEnd = mEnd;
 
-                int line, column = 0;
-                if (mContentEditText.getLayout() != null) {
-                    line = mContentEditText.getLayout().getLineForOffset(selectionStart);
-                    column = selectionStart - mContentEditText.getLayout().getLineStart(line);
-                }
+            if (selectionStart > selectionEnd) {
+                int temp = selectionEnd;
+                selectionEnd = selectionStart;
+                selectionStart = temp;
+            }
 
-                Editable s = mContentEditText.getText();
-                if (s == null) {
-                    return;
-                }
+            imageSpan.setPosition(selectionStart, selectionEnd);
 
-                WPImageSpan[] imageSpans = s.getSpans(selectionStart, selectionEnd, WPImageSpan.class);
-                if (imageSpans.length != 0) {
-                    // insert a few line breaks if the cursor is already on an image
-                    s.insert(selectionEnd, "\n\n");
-                    selectionStart = selectionStart + 2;
-                    selectionEnd = selectionEnd + 2;
-                } else if (column != 0) {
-                    // insert one line break if the cursor is not at the first column
-                    s.insert(selectionEnd, "\n");
-                    selectionStart = selectionStart + 1;
-                    selectionEnd = selectionEnd + 1;
-                }
+            int line, column = 0;
+            if (mContentEditText.getLayout() != null) {
+                line = mContentEditText.getLayout().getLineForOffset(selectionStart);
+                column = selectionStart - mContentEditText.getLayout().getLineStart(line);
+            }
 
-                s.insert(selectionStart, " ");
-                s.setSpan(imageSpan, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER);
-                s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                s.insert(selectionEnd + 1, "\n\n");
+            Editable s = mContentEditText.getText();
+            if (s == null) {
+                return;
+            }
 
-                // Fetch and replace the WPImageSpan if it's a remote media
-                if (imageLoader != null && URLUtil.isNetworkUrl(imageUrl)) {
-                    loadWPImageSpanThumbnail(mediaFile, imageUrl, imageLoader);
-                }
+            WPImageSpan[] imageSpans = s.getSpans(selectionStart, selectionEnd, WPImageSpan.class);
+            if (imageSpans.length != 0) {
+                // insert a few line breaks if the cursor is already on an image
+                s.insert(selectionEnd, "\n\n");
+                selectionStart = selectionStart + 2;
+                selectionEnd = selectionEnd + 2;
+            } else if (column != 0) {
+                // insert one line break if the cursor is not at the first column
+                s.insert(selectionEnd, "\n");
+                selectionStart = selectionStart + 1;
+                selectionEnd = selectionEnd + 1;
             }
-        };
-        handler.postDelayed(r, 1);
+
+            s.insert(selectionStart, " ");
+            s.setSpan(imageSpan, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER);
+            s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            s.insert(selectionEnd + 1, "\n\n");
+
+            // Fetch and replace the WPImageSpan if it's a remote media
+            if (mImageLoader != null && URLUtil.isNetworkUrl(mImageUrl)) {
+                loadWPImageSpanThumbnail(mMediaFile, mImageUrl, mImageLoader);
+            }
+        }
+    }
+
+    public void addMediaFile(final MediaFile mediaFile, final String imageUrl, final ImageLoader imageLoader,
+                             final int start, final int end) {
+        AddMediaFileTask addMediaFileTask = new AddMediaFileTask(mediaFile, imageUrl, imageLoader, start, end);
+        addMediaFileTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     @Override
diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js
