Squashed 'libs/editor/' changes from b556dfa99f..60e13dd828

60e13dd828 Merge pull request #461 from wordpress-mobile/travis-25
6b4f78a59c Update example app to API 25
3d0a8c8fcc Update Travis to use API25
5cafc2f59a Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into develop
c5023cca1c Fix EditorFragmentTest after adding getContent exception throw
702a7241c5 Fix an issue in the Hybrid editor that could lead to an empty post title and content on save
fead4827bb Merge pull request #4927 from wordpress-mobile/issue/460editor-content-loss
a9ae13d377 Fix EditorFragmentTest after adding getContent exception throw
93a6017bd1 Fix an issue in the Hybrid editor that could lead to an empty post title and content on save
2069d60cbf Updating grade plugin
c5ee8a976e Upgrade to Support Lib, build tools v25.0.1
141e508e98 Updating build tools and compile/targetSDK to 25 along with support libraries
b6f8331feb update missing build files to 2.2.2
f36efa05b9 Updated to gradle v2.2.2
8a0b518157 Update to Android Gradle Plugin 2.2.1

git-subtree-dir: libs/editor
git-subtree-split: 60e13dd828824b308252c9842d9c459db26a9f56

Author: malinajirka

.travis.yml

@@ -7,8 +7,8 @@ android:
     - extra-android-support
     - platform-tools
     - tools
-    - build-tools-24.0.2
-    - android-24
+    - build-tools-25.0.1
+    - android-25
 
 env:
   global:

WordPressEditor/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -18,14 +18,14 @@ repositories {
 android {
     publishNonDefault true
 
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         versionCode 13
         versionName "1.3"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
     }
     buildTypes {
         release {
@@ -45,9 +45,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:support-v4:24.2.1'
-    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:support-v4:25.0.1'
+    compile 'com.android.support:design:25.0.1'
     compile 'org.wordpress:utils:1.11.0'
 }
 

WordPressEditor/src/androidTest/java/org.wordpress.android.editor/EditorFragmentTest.java

@@ -5,6 +5,8 @@
 import android.view.View;
 import android.widget.ToggleButton;
 
+import org.wordpress.android.editor.EditorFragment.IllegalEditorStateException;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -99,7 +101,7 @@ public void testFormatBarToggledOnSelectedFieldChanged() {
         assertTrue(htmlButton.isEnabled());
     }
 
-    public void testHtmlModeToggleTextTransfer() throws InterruptedException {
+    public void testHtmlModeToggleTextTransfer() throws InterruptedException, IllegalEditorStateException {
         waitForOnDomLoaded();
 
         final View view = mFragment.getView();
@@ -148,8 +150,12 @@ public void run() {
                 contentText.setText("new <b>content</b>");
 
                 // Check that getTitle() and getContent() return latest version even in HTML mode
-                assertEquals("new title", mFragment.getTitle());
-                assertEquals("new <b>content</b>", mFragment.getContent());
+                try {
+                    assertEquals("new title", mFragment.getTitle());
+                    assertEquals("new <b>content</b>", mFragment.getContent());
+                } catch (IllegalEditorStateException e) {
+                    throw new RuntimeException();
+                }
 
                 htmlButton.performClick(); // Turn off HTML mode
 
@@ -174,4 +180,4 @@ private void waitForOnDomLoaded() {
             }
         }
     }
-}
+}

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

@@ -68,6 +68,11 @@
 public class EditorFragment extends EditorFragmentAbstract implements View.OnClickListener, View.OnTouchListener,
         OnJsEditorStateChangedListener, OnImeBackListener, EditorWebViewAbstract.AuthHeaderRequestListener,
         EditorMediaUploadListener {
+
+    public class IllegalEditorStateException extends Exception {
+
+    }
+
     private static final String ARG_PARAM_TITLE = "param_title";
     private static final String ARG_PARAM_CONTENT = "param_content";
 
@@ -423,8 +428,12 @@ public void setUserVisibleHint(boolean isVisibleToUser) {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putCharSequence(KEY_TITLE, getTitle());
-        outState.putCharSequence(KEY_CONTENT, getContent());
+        try {
+            outState.putCharSequence(KEY_TITLE, getTitle());
+            outState.putCharSequence(KEY_CONTENT, getContent());
+        } catch (IllegalEditorStateException e) {
+            AppLog.e(T.EDITOR, "onSaveInstanceState: unable to get title or content");
+        }
     }
 
     private ActionBar getActionBar() {
@@ -636,9 +645,19 @@ public void run() {
                     }
 
                     // Update mTitle and mContentHtml with the latest state from the ZSSEditor
-                    getTitle();
-                    getContent();
-
+                    try {
+                        getTitle();
+                        getContent();
+                    } catch (IllegalEditorStateException e) {
+                        AppLog.e(T.EDITOR, "toggleHtmlMode: unable to get title or content");
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                toggleButton.setChecked(false);
+                            }
+                        });
+                        return;
+                    }
                     getActivity().runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
@@ -922,9 +941,9 @@ public void setContent(CharSequence text) {
      * where possible.
      */
     @Override
-    public CharSequence getTitle() {
+    public CharSequence getTitle() throws IllegalEditorStateException {
         if (!isAdded()) {
-            return "";
+            throw new IllegalEditorStateException();
         }
 
         if (mSourceView != null && mSourceView.getVisibility() == View.VISIBLE) {
@@ -961,9 +980,9 @@ public void run() {
      * where possible.
      */
     @Override
-    public CharSequence getContent() {
+    public CharSequence getContent() throws IllegalEditorStateException {
         if (!isAdded()) {
-            return "";
+            throw new IllegalEditorStateException();
         }
 
         if (mSourceView != null && mSourceView.getVisibility() == View.VISIBLE) {

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

@@ -9,6 +9,7 @@
 
 import com.android.volley.toolbox.ImageLoader;
 
+import org.wordpress.android.editor.EditorFragment.IllegalEditorStateException;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
 
@@ -18,8 +19,8 @@
 public abstract class EditorFragmentAbstract extends Fragment {
     public abstract void setTitle(CharSequence text);
     public abstract void setContent(CharSequence text);
-    public abstract CharSequence getTitle();
-    public abstract CharSequence getContent();
+    public abstract CharSequence getTitle() throws IllegalEditorStateException;
+    public abstract CharSequence getContent() throws IllegalEditorStateException;
     public abstract void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader);
     public abstract void appendGallery(MediaGallery mediaGallery);
     public abstract void setUrlForVideoPressId(String videoPressId, String url, String posterUrl);

example/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -14,13 +14,13 @@ repositories {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         applicationId "org.wordpress.editorexample"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -53,4 +53,4 @@ dependencies {
 android.testOptions.unitTests.all {
     include '**/*Test.class'
     exclude '**/ApplicationTest.class'
-}
+}