Add logic for loading different application path (#608)

Author: phyr0s

src/android/CodePush.java

@@ -420,7 +420,7 @@ private void navigateToLocalDeploymentIfExists() {
         CodePushPackageMetadata deployedPackageMetadata = this.codePushPackageManager.getCurrentPackageMetadata();
         if (deployedPackageMetadata != null && deployedPackageMetadata.localPath != null) {
             File startPage = this.getStartPageForPackage(deployedPackageMetadata.localPath);
-            if (startPage != null) {
+            if (startPage != null && this.isMainBundleActivity()) {
                 /* file exists */
                 try {
                     navigateToFile(startPage);
@@ -431,6 +431,12 @@ private void navigateToLocalDeploymentIfExists() {
         }
     }
 
+    private boolean isMainBundleActivity() {
+        final String activityPackage = this.cordova.getActivity().getClass().getPackage().getName();
+        final String contextPackage = this.cordova.getContext().getPackageName();
+        return contextPackage.contains(activityPackage);
+    }
+
     private boolean execPreInstall(CordovaArgs args, CallbackContext callbackContext) {
     /* check if package is valid */
         try {

src/ios/CDVWKWebViewEngine+CodePush.m

@@ -1,6 +1,7 @@
 #if defined(__has_include)
 #if __has_include("CDVWKWebViewEngine.h")
 
+#import <Cordova/NSDictionary+CordovaPreferences.h>
 #import "CDVWKWebViewEngine.h"
 #import "CodePush.h"
 
@@ -16,6 +17,11 @@ - (id)loadRequest:(NSURLRequest *)request {
     lastLoadedURL = request.URL.absoluteString;
     NSURL *readAccessURL;
 
+    NSURL* bundleURL = [[NSBundle mainBundle] bundleURL];
+    if (![lastLoadedURL containsString:bundleURL.path] && ![lastLoadedURL containsString:IdentifierCodePushPath]) {
+        return [self loadPluginRequest:request];
+    }
+
     if (request.URL.isFileURL) {
         // All file URL requests should be handled with the setServerBasePath in case if it is Ionic app.
         if ([CodePush hasIonicWebViewEngine: self]) {
@@ -47,6 +53,36 @@ - (id)loadRequest:(NSURLRequest *)request {
     }
 }
 
+- (id)loadPluginRequest:(NSURLRequest *)request {
+    if (request.URL.fileURL) {
+        NSDictionary* settings = self.commandDelegate.settings;
+        NSString *bind = [settings cordovaSettingForKey:@"Hostname"];
+        if(bind == nil){
+            bind = @"localhost";
+        }
+        NSString *scheme = [settings cordovaSettingForKey:@"iosScheme"];
+        if(scheme == nil || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]  || [scheme isEqualToString:@"file"]){
+            scheme = @"ionic";
+        }
+        NSString *CDV_LOCAL_SERVER = [NSString stringWithFormat:@"%@://%@", scheme, bind];
+        
+        NSURL* startURL = [NSURL URLWithString:((CDVViewController *)self.viewController).startPage];
+        NSString* startFilePath = [self.commandDelegate pathForResource:[startURL path]];
+        NSURL *url = [[NSURL URLWithString:CDV_LOCAL_SERVER] URLByAppendingPathComponent:request.URL.path];
+        if ([request.URL.path isEqualToString:startFilePath]) {
+            url = [NSURL URLWithString:CDV_LOCAL_SERVER];
+        }
+        if(request.URL.query) {
+            url = [NSURL URLWithString:[@"?" stringByAppendingString:request.URL.query] relativeToURL:url];
+        }
+        if(request.URL.fragment) {
+            url = [NSURL URLWithString:[@"#" stringByAppendingString:request.URL.fragment] relativeToURL:url];
+        }
+        request = [NSURLRequest requestWithURL:url];
+    }
+    return [(WKWebView*)self.engineWebView loadRequest:request];
+}
+
 #pragma clang diagnostic pop
 
 // Fix bug related to unable WKWebView recovery after reinit with loaded codepush update

src/ios/CodePush.m

@@ -341,6 +341,11 @@ - (void)clearDeploymentsIfBinaryUpdated {
 - (void)navigateToLocalDeploymentIfExists {
     CodePushPackageMetadata* deployedPackageMetadata = [CodePushPackageManager getCurrentPackageMetadata];
     if (deployedPackageMetadata && deployedPackageMetadata.localPath) {
+        NSString* startPage = ((CDVViewController *)self.viewController).startPage;
+        NSURL* URL = [self getStartPageURLForLocalPackage:deployedPackageMetadata.localPath];
+        if (![URL.path containsString:startPage]) {
+            return;
+        }
         [self redirectStartPageToURL: deployedPackageMetadata.localPath];
     }
 }