Merge branch 'develop' into issue/682-fix-window-leaked-crash

# Conflicts: # stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt
Automattic · May 13, 2021 · 21f7ddb · 21f7ddb
2 parents 2323287 + 032e7a4
commit 21f7ddb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt b/stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt
@@ -624,11 +624,9 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
         })
     }
 
-    private fun deleteCaptureMediaAndFinishWhenEmptyStory() {
+    private fun finishWhenEmptyStory() {
         if (storyViewModel.getCurrentStorySize() == 0 &&
                 firstIntentLoaded && !permissionsRequestForCameraInProgress) {
-            // finally, delete the captured media
-            deleteCapturedMedia()
             finish()
         }
     }
@@ -885,7 +883,7 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
             } else if (intent.hasExtra(requestCodes.EXTRA_LAUNCH_WPSTORIES_MEDIA_PICKER_REQUESTED)) {
                 // if coming from the PHOTO_PICKER with a cancel action, and we launched with
                 // EXTRA_LAUNCH_WPSTORIES_MEDIA_PICKER_REQUESTED to start the Story with, we should cancel.
-                deleteCaptureMediaAndFinishWhenEmptyStory()
+                finishWhenEmptyStory()
             }
         }
     }
@@ -1089,6 +1087,8 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
                     listener = object : FrameSaveErrorDialogOk {
                         override fun OnOkClicked(dialog: DialogFragment) {
                             dialog.dismiss()
+                            // first of all, delete the backing captured media for this slide
+                            deleteCapturedMedia()
                             if (storyViewModel.getCurrentStorySize() == 1) {
                                 // discard the whole story
                                 safelyDiscardCurrentStoryAndCleanUpIntent()