Merge branch 'master' of https://github.com/Microsoft/react-native-code-push

Author: max-mironov

android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -321,7 +321,7 @@ protected Void doInBackground(Void... params) {
                 JSONObject currentPackage = mUpdateManager.getCurrentPackage();
 
                 if (currentPackage == null) {
-                    promise.resolve("");
+                    promise.resolve(null);
                     return null;
                 }
 
@@ -335,14 +335,14 @@ protected Void doInBackground(Void... params) {
                 if (updateState == CodePushUpdateState.PENDING.getValue() && !currentUpdateIsPending) {
                     // The caller wanted a pending update
                     // but there isn't currently one.
-                    promise.resolve("");
+                    promise.resolve(null);
                 } else if (updateState == CodePushUpdateState.RUNNING.getValue() && currentUpdateIsPending) {
                     // The caller wants the running update, but the current
                     // one is pending, so we need to grab the previous.
                     JSONObject previousPackage = mUpdateManager.getPreviousPackage();
 
                     if (previousPackage == null) {
-                        promise.resolve("");
+                        promise.resolve(null);
                         return null;
                     }
 

android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java

@@ -55,6 +55,10 @@ public static void copyDirectoryContents(String sourceDirectoryPath, String dest
     }
 
     public static void deleteDirectoryAtPath(String directoryPath) {
+        if (directoryPath == null) {
+            CodePushUtils.log("deleteDirectoryAtPath attempted with null directoryPath");
+            return;
+        }
         File file = new File(directoryPath);
         if (file.exists()) {
             deleteFileOrFolderSilently(file);

docs/setup-ios.md

@@ -117,3 +117,36 @@ To let the CodePush runtime know which deployment it should query for updates ag
 ![Deployment list](https://cloud.githubusercontent.com/assets/116461/11601733/13011d5e-9a8a-11e5-9ce2-b100498ffb34.png)
 
 In order to effectively make use of the `Staging` and `Production` deployments that were created along with your CodePush app, refer to the [multi-deployment testing](../README.md#multi-deployment-testing) docs below before actually moving your app's usage of CodePush into production.
+
+### HTTP exception domains configuration (iOS)
+
+CodePush plugin makes HTTPS requests to the following domains:
+
+- codepush.azurewebsites.net
+- codepush.blob.core.windows.net
+- codepushupdates.azureedge.net
+
+If you want to change the default HTTP security configuration for any of these domains, you have to define the [`NSAppTransportSecurity` (ATS)][ats] configuration inside your __Info.plist__ file:
+
+```xml
+<plist version="1.0">
+  <dict>
+    <!-- ...other configs... -->
+
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSExceptionDomains</key>
+      <dict>
+        <key>codepush.azurewebsites.net</key>
+        <dict><!-- read the ATS Apple Docs for available options --></dict>
+      </dict>
+    </dict>
+
+    <!-- ...other configs... -->
+  </dict>
+</plist>
+```
+
+Before doing anything, please [read the docs][ats] first.
+
+[ats]: https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html#//apple_ref/doc/uid/TP40009251-SW33