Skip to content

Commit f6ef4ce

Browse files
committed
fix local draft style saving by introducing an awful "getSpannedContent()" method :(
1 parent 8f9d5e4 commit f6ef4ce

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import android.annotation.SuppressLint;
44
import android.content.res.AssetManager;
55
import android.os.Bundle;
6+
import android.text.Editable;
7+
import android.text.Spanned;
8+
import android.text.style.CharacterStyle;
69
import android.view.LayoutInflater;
710
import android.view.View;
811
import android.view.ViewGroup;
@@ -151,4 +154,9 @@ public CharSequence getContent() {
151154
public void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader) {
152155
// TODO
153156
}
157+
158+
@Override
159+
public Spanned getSpannedContent() {
160+
return null;
161+
}
154162
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import android.app.Activity;
44
import android.app.Fragment;
5+
import android.text.Editable;
6+
import android.text.Spanned;
7+
import android.text.style.CharacterStyle;
58

69
import com.android.volley.toolbox.ImageLoader;
710

@@ -13,6 +16,8 @@ public abstract class EditorFragmentAbstract extends Fragment {
1316
public abstract CharSequence getTitle();
1417
public abstract CharSequence getContent();
1518
public abstract void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader);
19+
// TODO: remove this as soon as we can (we'll need to drop the legacy editor or fix html2spanned translation)
20+
public abstract Spanned getSpannedContent();
1621

1722
protected EditorFragmentListener mEditorFragmentListener;
1823
protected boolean mFeaturedImageSupported;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
import android.text.Layout;
1717
import android.text.Selection;
1818
import android.text.Spannable;
19+
import android.text.Spanned;
1920
import android.text.TextUtils;
2021
import android.text.TextWatcher;
2122
import android.text.method.ArrowKeyMovementMethod;
2223
import android.text.style.AlignmentSpan;
24+
import android.text.style.CharacterStyle;
2325
import android.text.style.QuoteSpan;
2426
import android.text.style.StrikethroughSpan;
2527
import android.text.style.StyleSpan;
@@ -141,6 +143,11 @@ public void setContent(CharSequence text) {
141143
}
142144
}
143145

146+
@Override
147+
public Spanned getSpannedContent() {
148+
return mContentEditText.getText();
149+
}
150+
144151
public void setLocalDraft(boolean isLocalDraft) {
145152
mIsLocalDraft = isLocalDraft;
146153
}

0 commit comments

Comments
 (0)