Skip to content

History and Share Bottom Sheets Do Appear Manually and Do Not Reappear Automatically After Dismiss #1766

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

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

History and Share Bottom Sheets Do Appear Manually and Do Not Reappear Automatically After Dismiss #1766

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c336cad
Add dismiss statement to on history dismissed override in note editor…
theck13 Aug 20, 2025
1768499
Add dismiss statement to on share dismissed override in note editor f…
theck13 Aug 20, 2025
5168dc5
Add dismiss bottom sheet method to note editor fragment
theck13 Aug 20, 2025
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
32 changes: 15 additions & 17 deletions Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,24 +1303,18 @@ private String getNoteContentString() {
@Override
public void onSharePublishClicked() {
publishNote();
if (mShareBottomSheet != null) {
mShareBottomSheet.dismiss();
}
dismissBottomSheet(mShareBottomSheet);
}

@Override
public void onShareUnpublishClicked() {
unpublishNote();
if (mShareBottomSheet != null) {
mShareBottomSheet.dismiss();
}
dismissBottomSheet(mShareBottomSheet);
}

@Override
public void onWordPressPostClicked() {
if (mShareBottomSheet != null) {
mShareBottomSheet.dismiss();
}
dismissBottomSheet(mShareBottomSheet);

if (getFragmentManager() == null) {
return;
Expand All @@ -1346,7 +1340,7 @@ public void onShareCollaborateClicked() {

@Override
public void onShareDismissed() {

dismissBottomSheet(mShareBottomSheet);
}

/**
Expand All @@ -1356,25 +1350,23 @@ public void onShareDismissed() {
@Override
public void onHistoryCancelClicked() {
mContentEditText.setText(mNote.getContent());
if (mHistoryBottomSheet != null) {
mHistoryBottomSheet.dismiss();
}
dismissBottomSheet(mHistoryBottomSheet);
}

@Override
public void onHistoryRestoreClicked() {
if (mHistoryBottomSheet != null) {
mHistoryBottomSheet.dismiss();
}
dismissBottomSheet(mHistoryBottomSheet);
saveAndSyncNote();
}

@Override
public void onHistoryDismissed() {
if (!mHistoryBottomSheet.didTapOnButton()) {
if (mHistoryBottomSheet != null && !mHistoryBottomSheet.didTapOnButton()) {
mContentEditText.setText(mNote.getContent());
}

dismissBottomSheet(mHistoryBottomSheet);

if (mHistoryTimeoutHandler != null) {
mHistoryTimeoutHandler.removeCallbacks(mHistoryTimeoutRunnable);
}
Expand All @@ -1385,6 +1377,12 @@ public void onHistoryUpdateNote(String content) {
mContentEditText.setText(content);
}

private void dismissBottomSheet(BottomSheetDialogBase bottomSheet) {
if (bottomSheet != null) {
bottomSheet.dismiss();
}
}

private void saveNote() {
try {
if (mNote == null || mNotesBucket == null || mContentEditText == null || mIsLoadingNote ||
Expand Down