Skip to content
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

feat: Retry failed media uploads when re-establishing network connection #19803

Merged
merged 6 commits into from
Dec 28, 2023
Merged

feat: Retry failed media uploads when re-establishing network connection #19803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0550cc5
feat: Retry failed media uploads when re-establishing network connection
dcalhoun Dec 15, 2023
be1c1f8
docs: Add release note
dcalhoun Dec 15, 2023
47df150
feat: Limit automatic upload retries to debug builds
dcalhoun Dec 16, 2023
c114528
refactor: Remove unnecessary clearing of failed media IDs
dcalhoun Dec 16, 2023
3fb85a3
feat: Only retry media uploads if a network connection is available
dcalhoun Dec 19, 2023
d459991
Merge branch 'trunk' into feat/automatically-retry-pending-media-uploads
derekblank Dec 27, 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
2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down
2 changes: 1 addition & 1 deletion libs/editor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 4 additions & 1 deletion .../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 @@ -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);
}
});

Expand Down Expand Up @@ -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);
}
}
}
Loading