From 5f254c3dc4246d5fe0f6d68cd2917f442c14c15e Mon Sep 17 00:00:00 2001
From: Dratwas <drapich.piotr@gmail.com>
Date: Tue, 28 May 2019 16:13:42 +0200
Subject: [PATCH] support fileRAMBundle

---
 ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp | 4 +++-
 ReactAndroid/src/main/jni/react/jni/FileRAMBundle.cpp        | 4 ++--
 ReactAndroid/src/main/jni/react/jni/FileRAMBundle.h          | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index db2d563839a8..c16f01655594 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -192,7 +192,9 @@ void CatalystInstanceImpl::jniLoadScriptFromAssets(
 
   std::unique_ptr<Bundle> bundle;
   if (FileRAMBundle::isFileRAMBundle(manager, sourceURL.c_str())) {
-    // TODO: create File RAM Bundle
+    bundle = std::make_unique<FileRAMBundle>(manager,
+                                             sourceURL,
+                                             std::move(script));
   } else if (IndexedRAMBundle::isIndexedRAMBundle(script.get())) {
     bundle = std::make_unique<IndexedRAMBundle>(std::move(script),
                                                 sourceURL,
diff --git a/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.cpp b/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.cpp
index 7344b715bea0..1e2f37640e3a 100644
--- a/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.cpp
@@ -55,9 +55,9 @@ bool FileRAMBundle::isFileRAMBundle(AAssetManager* assetManager,
 FileRAMBundle::FileRAMBundle(
     AAssetManager* assetManager,
     const std::string& moduleDirectory,
-    std::unique_ptr<JSBigString> startupScript)
+    std::unique_ptr<const JSBigString> startupScript)
     : assetManager_(assetManager),
-      moduleDirectory_(moduleDirectory),
+      moduleDirectory_(jsModulesDir(moduleDirectory.c_str())),
       startupScript_(std::move(startupScript)) {}
 
 std::unique_ptr<const JSBigString> FileRAMBundle::getStartupScript() const {
diff --git a/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.h b/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.h
index 4a1da9b143da..15fbe668158a 100644
--- a/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.h
+++ b/ReactAndroid/src/main/jni/react/jni/FileRAMBundle.h
@@ -19,7 +19,7 @@ class FileRAMBundle : public RAMBundle {
   FileRAMBundle(
       AAssetManager* assetManager,
       const std::string& moduleDirectory,
-      std::unique_ptr<JSBigString> startupScript);
+      std::unique_ptr<const JSBigString> startupScript);
   ~FileRAMBundle() {}
 
   std::string getSourcePath() const override;
@@ -31,7 +31,7 @@ class FileRAMBundle : public RAMBundle {
  private:
   AAssetManager* assetManager_ = nullptr;
   std::string moduleDirectory_;
-  std::unique_ptr<JSBigString> startupScript_;
+  std::unique_ptr<const JSBigString> startupScript_;
 };
 
 } // namespace react