Add support for media on private sites.

guarani · Nov 20, 2019 · 8419330 · 8419330
1 parent a59eda2
commit 8419330
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
@@ -544,7 +544,8 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
     }
 
     func gutenbergDidRequestFullscreenImage(with mediaUrl: URL) {
-        let controller = WPImageViewController(url: mediaUrl)
+        let controller = WPImageViewController(externalMediaURL: mediaUrl)
+        controller.post = self.post
         controller.modalTransitionStyle = .crossDissolve
         controller.modalPresentationStyle = .fullScreen
         self.present(controller, animated: true)

diff --git a/WordPress/Classes/ViewRelated/Reader/WPImageViewController.h b/WordPress/Classes/ViewRelated/Reader/WPImageViewController.h
@@ -4,12 +4,14 @@
 @import WPMediaPicker;
 
 @class Media;
+@class AbstractPost;
 
 NS_ASSUME_NONNULL_BEGIN
 @interface WPImageViewController : UIViewController
 
 @property (nonatomic, readonly, nullable) id<WPMediaAsset> mediaAsset;
 @property (nonatomic, assign) BOOL shouldDismissWithGestures;
+@property (nonatomic, weak) AbstractPost* post;
 
 - (instancetype)initWithImage:(UIImage *)image;
 - (instancetype)initWithURL:(NSURL *)url;

diff --git a/WordPress/Classes/ViewRelated/Reader/WPImageViewController.m b/WordPress/Classes/ViewRelated/Reader/WPImageViewController.m
@@ -314,8 +314,11 @@ - (void)loadImageFromExternalURL
 {
     self.isLoadingImage = YES;
 
-    __weak __typeof__(self) weakSelf = self;
+    __weak __typeof__(self) weakSelf = self;    
     [self.imageLoader loadImageWithURL:self.url
+                              fromPost:self.post
+                          preferredSize:CGSizeZero
+                           placeholder:nil
                                success:^{
                                    weakSelf.isLoadingImage = NO;
                                    weakSelf.image = weakSelf.imageView.image;