Merge pull request #19803 from wordpress-mobile/feat/automatically-re…

…try-pending-media-uploads feat: Retry failed media uploads when re-establishing network connection
wordpress-mobile · Dec 28, 2023 · c719762 · c719762
2 parents 0d069d0 + d459991
commit c719762
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -3300,7 +3300,7 @@ public void onRequestDragAndDropPermissions(DragEvent dragEvent) {
     }
 
     @Override
-    public void onMediaRetryAllClicked(Set<String> failedMediaIds) {
+    public void onMediaRetryAll(Set<String> failedMediaIds) {
         UploadService.cancelFinalNotification(this, mEditPostRepository.getPost());
         UploadService.cancelFinalNotificationForMedia(this, mSite);
         ArrayList<Integer> localMediaIds = new ArrayList<>();

diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
@@ -199,7 +199,7 @@ public interface EditorFragmentListener extends DialogVisibilityProvider {
         void onAddDeviceMediaClicked(boolean allowMultipleSelection);
         void onCaptureVideoClicked();
         boolean onMediaRetryClicked(String mediaId);
-        void onMediaRetryAllClicked(Set<String> mediaIdSet);
+        void onMediaRetryAll(Set<String> mediaIdSet);
         void onMediaUploadCancelClicked(String mediaId);
         void onMediaDeleted(String mediaId);
         void onUndoMediaCheck(String undoedContent);

diff --git a/.../editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/.../editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
@@ -926,7 +926,7 @@ private void showRetryMediaUploadDialog(final int mediaId) {
                 new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         dialog.dismiss();
-                        mEditorFragmentListener.onMediaRetryAllClicked(mFailedMediaIds);
+                        mEditorFragmentListener.onMediaRetryAll(mFailedMediaIds);
                     }
                 });
 
@@ -1583,5 +1583,8 @@ public void onGutenbergDialogNegativeClicked(@NonNull String instanceTag) {
     @Override
     public void onConnectionStatusChange(boolean isConnected) {
         getGutenbergContainerFragment().onConnectionStatusChange(isConnected);
+        if (BuildConfig.DEBUG && isConnected && hasFailedMediaUploads()) {
+            mEditorFragmentListener.onMediaRetryAll(mFailedMediaIds);
+        }
     }
 }