Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix removeSpan crash on Android #469

Merged
merged 11 commits into from
Sep 12, 2024
Merged

Fix removeSpan crash on Android #469

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c974bdc
Fix android crash when modifying the markdown through selection
wildan-m Sep 3, 2024
15652dc
Merge branch 'Expensify:main' into wildan/fix/46908-delete-markdown-c…
wildan-m Sep 5, 2024
0dfd7b9
Merge branch 'main' of https://github.com/wildan-m/react-native-live-…
wildan-m Sep 11, 2024
c176a5e
compare with prev text value to avoid multiple applyMarkdownFormattin…
wildan-m Sep 11, 2024
ade58bc
store mPreviousEditable as string to minimize conversion
wildan-m Sep 11, 2024
88baac1
Update android/src/main/java/com/expensify/livemarkdown/MarkdownTextW…
wildan-m Sep 11, 2024
24a7e7f
refactor
wildan-m Sep 11, 2024
c6186b4
revert unnecessary change
wildan-m Sep 11, 2024
f160781
revert unnecessary change
wildan-m Sep 11, 2024
1864419
Update android/src/main/java/com/expensify/livemarkdown/MarkdownTextW…
wildan-m Sep 11, 2024
feb5cd7
remove optimization
wildan-m Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions android/src/main/java/com/expensify/livemarkdown/MarkdownTextWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

public class MarkdownTextWatcher implements TextWatcher {
private final MarkdownUtils mMarkdownUtils;

private boolean mShouldSkip = false;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also remove this field as it's no longer used.

private Editable mPreviousEditable;

public MarkdownTextWatcher(@NonNull MarkdownUtils markdownUtils) {
mMarkdownUtils = markdownUtils;
Expand All @@ -22,17 +22,17 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {

@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (mShouldSkip) {
return;
}
if (s instanceof SpannableStringBuilder) {
mMarkdownUtils.applyMarkdownFormatting((SpannableStringBuilder) s);
mShouldSkip = true;
}

}

@Override
public void afterTextChanged(Editable editable) {
mShouldSkip = false;
if (editable instanceof SpannableStringBuilder) {
if (mPreviousEditable != null && mPreviousEditable.toString().equals(editable.toString())) {
return;
}
mMarkdownUtils.applyMarkdownFormatting((SpannableStringBuilder) editable);
mPreviousEditable = new SpannableStringBuilder(editable);
Copy link
Collaborator

@tomekzaw tomekzaw Sep 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to store mPreviousEditable as a SpannableStringBuilder? We just use mPreviousEditable.toString() so maybe let's keep it as a string?

How about mPreviousText?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's make sense, please wait

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

}
}
}
}
Copy link
Collaborator

@tomekzaw tomekzaw Sep 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's restore the trailing newline

tomekzaw marked this conversation as resolved.
Show resolved Hide resolved
Loading