Merge pull request #9956 from wordpress-mobile/issue/9951-upload-noti…

…f-on-retry Fix upload notification not shown on retry
wordpress-mobile · Jun 7, 2019 · 05e19d9 · 05e19d9
2 parents 1dac305 + f19cb43
commit 05e19d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,10 +1,12 @@
 12.7
 -----
+* Show upload in progress notification when retrying
 
 12.6
 -----
 * Add Insights management introductory card
 * Local draft pages will be automatically uploaded to the server as soon as an internet connection is available.
+
 * Block Editor: A new block is available: video block.
 * Block Editor: Added UI to display a warning when a block has invalid content.
 * Block Editor: Fixed issue with link settings where “Open in New Tab” was always OFF on open.

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
@@ -574,6 +574,8 @@ public void onPostUploaded(OnPostUploaded event) {
             String errorMessage = mUiHelpers.getTextOfUiString(context,
                     UploadUtils.getErrorMessageResIdFromPostError(event.post.isPage(), event.error));
             String notificationMessage = UploadUtils.getErrorMessage(context, event.post, errorMessage, false);
+            mPostUploadNotifier.removePostInfoFromForegroundNotification(event.post,
+                    mMediaStore.getMediaForPost(event.post));
             mPostUploadNotifier.incrementUploadedPostCountFromForegroundNotification(event.post);
             mPostUploadNotifier.updateNotificationErrorForPost(event.post, site, notificationMessage, 0);
             sFirstPublishPosts.remove(event.post.getId());

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
@@ -249,10 +249,7 @@ private void unpackPostIntent(@NonNull Intent intent) {
                         return;
                     }
                     boolean postHasGutenbergBlocks = PostUtils.contentContainsGutenbergBlocks(post.getContent());
-                    boolean processWithAztec =
-                            AppPrefs.isAztecEditorEnabled() && !AppPrefs.isGutenbergEditorEnabled()
-                            && !postHasGutenbergBlocks;
-                    retryUpload(post, processWithAztec);
+                    retryUpload(post, !postHasGutenbergBlocks);
                 } else {
                     ToastUtils.showToast(this, R.string.retry_needs_aztec);
                 }
@@ -755,7 +752,6 @@ private void retryUpload(PostModel post, boolean processWithAztec) {
 
         Set<MediaModel> failedMedia = mUploadStore.getFailedMediaForPost(post);
         ArrayList<MediaModel> mediaToRetry = new ArrayList<>(failedMedia);
-        mPostUploadNotifier.removePostInfoFromForegroundNotificationData(post, mediaToRetry);
         if (!failedMedia.isEmpty()) {
             // reset these media items to QUEUED
             for (MediaModel media : failedMedia) {
@@ -784,6 +780,7 @@ private void retryUpload(PostModel post, boolean processWithAztec) {
             // send event so Editors can handle clearing Failed statuses properly if Post is being edited right now
             EventBus.getDefault().post(new UploadService.UploadMediaRetryEvent(mediaToRetry));
         } else {
+            mPostUploadNotifier.addPostInfoToForegroundNotification(post, null);
             // retry uploading the Post
             mPostUploadHandler.upload(post);
         }