Merge pull request #14139 from wordpress-mobile/release/14.9

Merge Release/14.9 into develop
wordpress-mobile · May 19, 2020 · 521b768 · 521b768
2 parents 85afe07 + 63a7d71
commit 521b768
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -19,6 +19,10 @@
 * Support the superscript and subscript HTML formatting on the Block Editor and Classic Editor.
 * [***] You can now draw on images to annotate them using the Edit image feature in the post editor.
 
+14.8.1
+-----
+* Fix adding and removing of featured images to posts.
+
 14.8
 -----
 * Block editor: Prefill caption for image blocks when available on the Media library

diff --git a/WordPress/Classes/Networking/MediaRequestAuthenticator.swift b/WordPress/Classes/Networking/MediaRequestAuthenticator.swift
@@ -52,7 +52,7 @@ class MediaRequestAuthenticator {
 
         // We want to make sure we're never sending credentials
         // to a URL that's not safe.
-        guard url.isHostedAtWPCom || url.isPhoton() else {
+        guard !url.isFileURL || url.isHostedAtWPCom || url.isPhoton() else {
             let request = URLRequest(url: url)
             provide(request)
             return

diff --git a/WordPress/Classes/Utility/Media/ImageLoader.swift b/WordPress/Classes/Utility/Media/ImageLoader.swift
@@ -64,7 +64,9 @@ import AutomatticTracks
     ///   - size: The preferred size of the image to load.
     ///
     func loadImage(with url: URL, from host: MediaHost, preferredSize size: CGSize = .zero) {
-        if url.isGif {
+        if url.isFileURL {
+            downloadImage(from: url)
+        } else if url.isGif {
             loadGif(with: url, from: host, preferredSize: size)
         } else {
             imageView.clean()

diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
@@ -1461,6 +1461,7 @@ - (void)FeaturedImageViewControllerOnRemoveImageButtonPressed:(FeaturedImageView
     self.animatedFeaturedImageData = nil;
     [self.apost setFeaturedImage:nil];
     [self dismissViewControllerAnimated:YES completion:nil];
+    [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:PostSettingsSectionFeaturedImage]  withRowAnimation:UITableViewRowAnimationNone];
 }
 
 @end
diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=14.9
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=14.9.0.20200518
+VERSION_LONG=14.9.0.20200519
diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=14.9
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=14.9.0.0
+VERSION_LONG=14.9.0.1