From 108f9664bffd1a4e0a7b2c2da3dc3810f1b29de2 Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Mon, 5 Feb 2018 11:35:15 -0800 Subject: [PATCH] Do not expose `BundleDownloader` from `DevServerHelper` Summary: Adds `downloadBundleFromURL` as a delegating method to `DevServerHelper` rather than exposing the underlying `BundleDownloader`. The additional encapsulation will allow futher factoring of `BundleDownloader` to make logic for different delta bundler clients easier to implement and maintain. Reviewed By: pakoito Differential Revision: D6871225 fbshipit-source-id: 6adcab5e69869a234baf38f1f1e60abd34d6b555 --- .../com/facebook/react/devsupport/DevServerHelper.java | 7 +++++-- .../facebook/react/devsupport/DevSupportManagerImpl.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java index 69b22f49c..73d98a763 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java @@ -19,6 +19,7 @@ import com.facebook.react.R; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.network.OkHttpCallUtil; +import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener; import com.facebook.react.devsupport.interfaces.PackagerStatusCallback; import com.facebook.react.devsupport.interfaces.StackFrame; import com.facebook.react.modules.systeminfo.AndroidInfoHelpers; @@ -391,8 +392,10 @@ public class DevServerHelper { AndroidInfoHelpers.getFriendlyDeviceName()); } - public BundleDownloader getBundleDownloader() { - return mBundleDownloader; + public void downloadBundleFromURL( + DevBundleDownloadListener callback, + File outputFile, String bundleURL, BundleDownloader.BundleInfo bundleInfo) { + mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo); } /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index b29f562f1..2af62749c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -1039,7 +1039,7 @@ public class DevSupportManagerImpl implements final BundleDownloader.BundleInfo bundleInfo = new BundleDownloader.BundleInfo(); - mDevServerHelper.getBundleDownloader().downloadBundleFromURL( + mDevServerHelper.downloadBundleFromURL( new DevBundleDownloadListener() { @Override public void onSuccess() {