Skip to content

[Gutenberg] Fix crash when showing media upload dialog #18544

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

Merged
merged 2 commits into from
May 30, 2023
Merged

[Gutenberg] Fix crash when showing media upload dialog #18544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac8a1e3
Ensure media upload dialog is called on UI thread
fluiddot May 29, 2023
47c5a52
Add `@UiThread` annotation to Gutenberg dialog-related functions
fluiddot May 30, 2023
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
38 changes: 33 additions & 5 deletions .../editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
Expand Down Expand Up @@ -294,12 +295,20 @@ public void onCapturePhotoButtonClicked() {

@Override
public void onRetryUploadForMediaClicked(int mediaId) {
showRetryMediaUploadDialog(mediaId);
if (getActivity() != null) {
getActivity().runOnUiThread(() -> {
showRetryMediaUploadDialog(mediaId);
});
}
}

@Override
public void onCancelUploadForMediaClicked(int mediaId) {
showCancelMediaUploadDialog(mediaId);
if (getActivity() != null) {
getActivity().runOnUiThread(() -> {
showCancelMediaUploadDialog(mediaId);
});
}
}

@Override
Expand Down Expand Up @@ -464,15 +473,27 @@ public void gutenbergDidSendButtonPressedAction(String buttonType) {
}

@Override public void onCancelUploadForMediaCollection(ArrayList<Object> mediaFiles) {
showCancelMediaCollectionUploadDialog(mediaFiles);
if (getActivity() != null) {
getActivity().runOnUiThread(() -> {
showCancelMediaCollectionUploadDialog(mediaFiles);
});
}
}

@Override public void onRetryUploadForMediaCollection(ArrayList<Object> mediaFiles) {
showRetryMediaCollectionUploadDialog(mediaFiles);
if (getActivity() != null) {
getActivity().runOnUiThread(() -> {
showRetryMediaCollectionUploadDialog(mediaFiles);
});
}
}

@Override public void onCancelSaveForMediaCollection(ArrayList<Object> mediaFiles) {
showCancelMediaCollectionSaveDialog(mediaFiles);
if (getActivity() != null) {
getActivity().runOnUiThread(() -> {
showCancelMediaCollectionSaveDialog(mediaFiles);
});
}
}

@Override public void onMediaFilesBlockReplaceSync(ArrayList<Object> mediaFiles, String blockId) {
Expand Down Expand Up @@ -828,6 +849,7 @@ private void cancelMediaUploadForDeletedBlock(int localMediaId) {
}
}

@UiThread
private void showCancelMediaUploadDialog(final int localMediaId) {
// Display 'cancel upload' dialog
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
Expand Down Expand Up @@ -859,6 +881,7 @@ public void onClick(DialogInterface dialog, int id) {
dialog.show();
}

@UiThread
private void showRetryMediaUploadDialog(final int mediaId) {
// Display 'retry upload' dialog
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
Expand Down Expand Up @@ -888,6 +911,7 @@ public void onClick(DialogInterface dialog, int id) {
dialog.show();
}

@UiThread
public void showFeaturedImageConfirmationDialog(final int mediaId) {
GutenbergDialogFragment dialog = new GutenbergDialogFragment();
dialog.initialize(
Expand Down Expand Up @@ -917,6 +941,7 @@ public void sendToJSFeaturedImageId(int mediaId) {
getGutenbergContainerFragment().sendToJSFeaturedImageId(mediaId);
}

@UiThread
private void showCancelMediaCollectionUploadDialog(ArrayList<Object> mediaFiles) {
// Display 'cancel upload' dialog
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
Expand Down Expand Up @@ -949,6 +974,7 @@ public void onClick(DialogInterface dialog, int id) {
dialog.show();
}

@UiThread
private void showRetryMediaCollectionUploadDialog(ArrayList<Object> mediaFiles) {
// Display 'retry upload' dialog
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
Expand All @@ -971,6 +997,7 @@ public void onClick(DialogInterface dialog, int id) {
dialog.show();
}

@UiThread
private void showCancelMediaCollectionSaveDialog(ArrayList<Object> mediaFiles) {
// Display 'cancel upload' dialog
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
Expand Down Expand Up @@ -1340,6 +1367,7 @@ public void removeAllFailedMediaUploads() {
public void removeMedia(String mediaId) {
}

@UiThread
private boolean showSavingProgressDialogIfNeeded() {
if (!isAdded()) {
return false;
Expand Down