Merge pull request #504 from Microsoft/fix-main-bundle-search

Fix main bundle search regression

Author: geof90

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

@@ -1,6 +1,7 @@
 package com.microsoft.codepush.react;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
@@ -10,7 +11,6 @@
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;

ios/CodePush/CodePushUpdateUtils.m

@@ -158,10 +158,6 @@ + (NSString *)findMainBundleInFolder:(NSString *)folderPath
             NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath
                                                            expectedFileName:expectedFileName
                                                                       error:error];
-            if (!mainBundlePathInFolder) {
-                return nil;
-            }
-            
             if (mainBundlePathInFolder) {
                 return [fileName stringByAppendingPathComponent:mainBundlePathInFolder];
             }