Skip to content

Commit b80afc6

Browse files
committed
Ensure media upload dialog is called on UI thread
1 parent 8a2057d commit b80afc6

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,20 @@ public void onCapturePhotoButtonClicked() {
294294

295295
@Override
296296
public void onRetryUploadForMediaClicked(int mediaId) {
297-
showRetryMediaUploadDialog(mediaId);
297+
if (getActivity() != null) {
298+
getActivity().runOnUiThread(() -> {
299+
showRetryMediaUploadDialog(mediaId);
300+
});
301+
}
298302
}
299303

300304
@Override
301305
public void onCancelUploadForMediaClicked(int mediaId) {
302-
showCancelMediaUploadDialog(mediaId);
306+
if (getActivity() != null) {
307+
getActivity().runOnUiThread(() -> {
308+
showCancelMediaUploadDialog(mediaId);
309+
});
310+
}
303311
}
304312

305313
@Override
@@ -464,15 +472,27 @@ public void gutenbergDidSendButtonPressedAction(String buttonType) {
464472
}
465473

466474
@Override public void onCancelUploadForMediaCollection(ArrayList<Object> mediaFiles) {
467-
showCancelMediaCollectionUploadDialog(mediaFiles);
475+
if (getActivity() != null) {
476+
getActivity().runOnUiThread(() -> {
477+
showCancelMediaCollectionUploadDialog(mediaFiles);
478+
});
479+
}
468480
}
469481

470482
@Override public void onRetryUploadForMediaCollection(ArrayList<Object> mediaFiles) {
471-
showRetryMediaCollectionUploadDialog(mediaFiles);
483+
if (getActivity() != null) {
484+
getActivity().runOnUiThread(() -> {
485+
showRetryMediaCollectionUploadDialog(mediaFiles);
486+
});
487+
}
472488
}
473489

474490
@Override public void onCancelSaveForMediaCollection(ArrayList<Object> mediaFiles) {
475-
showCancelMediaCollectionSaveDialog(mediaFiles);
491+
if (getActivity() != null) {
492+
getActivity().runOnUiThread(() -> {
493+
showCancelMediaCollectionSaveDialog(mediaFiles);
494+
});
495+
}
476496
}
477497

478498
@Override public void onMediaFilesBlockReplaceSync(ArrayList<Object> mediaFiles, String blockId) {

0 commit comments

Comments
 (0)