From ade04d02606f72f5de9ebcdbf8ac2c76216025bc Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 17 Sep 2018 18:46:17 -0700
Subject: [PATCH] Implement Image in Fabric C++ Android

Summary: This diff adds support for image views in Android

Reviewed By: shergin

Differential Revision: D9757712

fbshipit-source-id: 8d33e04c8ac4a670af6ca49bb3b9dccc69d52e40
---
 ReactCommon/fabric/components/image/ImageComponentDescriptor.h  | 2 +-
 ReactCommon/fabric/imagemanager/ImageRequest.cpp                | 2 ++
 ReactCommon/fabric/imagemanager/ImageRequest.h                  | 2 ++
 .../fabric/imagemanager/platform/android/ImageManager.cpp       | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
index d749e3be07..07e50dc50b 100644
--- a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
+++ b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
@@ -24,7 +24,7 @@ class ImageComponentDescriptor final:
 public:
   ImageComponentDescriptor(SharedEventDispatcher eventDispatcher, const SharedContextContainer &contextContainer):
     ConcreteComponentDescriptor(eventDispatcher),
-    imageManager_(contextContainer->getInstance<SharedImageManager>()) {}
+    imageManager_(contextContainer ? contextContainer->getInstance<SharedImageManager>() : nullptr) {}
 
   void adopt(UnsharedShadowNode shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.cpp b/ReactCommon/fabric/imagemanager/ImageRequest.cpp
index c95731d96d..4b9ad39b35 100644
--- a/ReactCommon/fabric/imagemanager/ImageRequest.cpp
+++ b/ReactCommon/fabric/imagemanager/ImageRequest.cpp
@@ -17,6 +17,8 @@ public:
     std::logic_error("Image no longer needed.") {}
 };
 
+ImageRequest::ImageRequest() {}
+
 ImageRequest::ImageRequest(const ImageSource &imageSource, folly::Future<ImageResponse> &&responseFuture):
   imageSource_(imageSource),
   responseFutureSplitter_(folly::splitFuture(std::move(responseFuture))) {}
diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.h b/ReactCommon/fabric/imagemanager/ImageRequest.h
index 3c9e5afd95..6b4eed864d 100644
--- a/ReactCommon/fabric/imagemanager/ImageRequest.h
+++ b/ReactCommon/fabric/imagemanager/ImageRequest.h
@@ -41,6 +41,8 @@ public:
    */
   ImageRequest(const ImageSource &imageSource, folly::Future<ImageResponse> &&responseFuture);
 
+  ImageRequest();
+
   /*
    * The move constructor.
    */
diff --git a/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp b/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp
index 96450d8328..6c81c831b6 100644
--- a/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp
+++ b/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp
@@ -20,6 +20,7 @@ ImageManager::~ImageManager() {
 
 ImageRequest ImageManager::requestImage(const ImageSource &imageSource) const {
   // Not implemented.
+  return {};
 }
 
 } // namespace react