From c336cad734eb9c5b08b785bfce30ff61f4cd0927 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 19 Aug 2025 18:55:13 -0600 Subject: [PATCH 1/3] Add dismiss statement to on history dismissed override in note editor fragment --- .../com/automattic/simplenote/NoteEditorFragment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java index 02c8c3788..80545bd36 100644 --- a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java +++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java @@ -1371,8 +1371,12 @@ public void onHistoryRestoreClicked() { @Override public void onHistoryDismissed() { - if (!mHistoryBottomSheet.didTapOnButton()) { - mContentEditText.setText(mNote.getContent()); + if (mHistoryBottomSheet != null) { + if (!mHistoryBottomSheet.didTapOnButton()) { + mContentEditText.setText(mNote.getContent()); + } + + mHistoryBottomSheet.dismiss(); } if (mHistoryTimeoutHandler != null) { From 1768499889c2e13fa887aa62a797609869d8b00d Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 19 Aug 2025 18:56:21 -0600 Subject: [PATCH 2/3] Add dismiss statement to on share dismissed override in note editor fragment --- .../java/com/automattic/simplenote/NoteEditorFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java index 80545bd36..9c49f8d82 100644 --- a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java +++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java @@ -1346,7 +1346,9 @@ public void onShareCollaborateClicked() { @Override public void onShareDismissed() { - + if (mShareBottomSheet != null) { + mShareBottomSheet.dismiss(); + } } /** From 5168dc510c255219968e62a8396b0150034d6193 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 19 Aug 2025 19:02:57 -0600 Subject: [PATCH 3/3] Add dismiss bottom sheet method to note editor fragment --- .../simplenote/NoteEditorFragment.java | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java index 9c49f8d82..f62aebd67 100644 --- a/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java +++ b/Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java @@ -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; @@ -1346,9 +1340,7 @@ public void onShareCollaborateClicked() { @Override public void onShareDismissed() { - if (mShareBottomSheet != null) { - mShareBottomSheet.dismiss(); - } + dismissBottomSheet(mShareBottomSheet); } /** @@ -1358,29 +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 != null) { - if (!mHistoryBottomSheet.didTapOnButton()) { - mContentEditText.setText(mNote.getContent()); - } - - mHistoryBottomSheet.dismiss(); + if (mHistoryBottomSheet != null && !mHistoryBottomSheet.didTapOnButton()) { + mContentEditText.setText(mNote.getContent()); } + dismissBottomSheet(mHistoryBottomSheet); + if (mHistoryTimeoutHandler != null) { mHistoryTimeoutHandler.removeCallbacks(mHistoryTimeoutRunnable); } @@ -1391,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 ||