Merge pull request #429 from Microsoft/prepend-subdir-assets-path

Prepend subdirectory to assets path

Author: geof90

ios/CodePush/CodePush.h

@@ -27,6 +27,8 @@
 
 + (NSString *)getApplicationSupportDirectory;
 
++ (NSString *)bundleAssetsPath;
+
 /*
  * This methods allows dynamically setting the app's
  * deployment key, in addition to setting it via
@@ -89,7 +91,6 @@ failCallback:(void (^)(NSError *err))failCallback;
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback;
 
-+ (NSString *)getBinaryAssetsPath;
 + (NSDictionary *)getCurrentPackage:(NSError **)error;
 + (NSDictionary *)getPreviousPackage:(NSError **)error;
 + (NSString *)getCurrentPackageFolderPath:(NSError **)error;

ios/CodePush/CodePush.m

@@ -67,6 +67,16 @@ + (NSURL *)binaryBundleURL
                                     subdirectory:bundleResourceSubdirectory];
 }
 
++ (NSString *)bundleAssetsPath
+{
+    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+    if (bundleResourceSubdirectory) {
+        resourcePath = [resourcePath stringByAppendingPathComponent:bundleResourceSubdirectory];
+    }
+    
+    return [resourcePath stringByAppendingPathComponent:[CodePushUpdateUtils assetsFolderName]];
+}
+
 + (NSURL *)bundleURL
 {
     return [self bundleURLForResource:bundleResourceName];

ios/CodePush/CodePushPackage.m

@@ -128,7 +128,7 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                                                                     return;
                                                                 }
 
-                                                                [[NSFileManager defaultManager] copyItemAtPath:[self getBinaryAssetsPath]
+                                                                [[NSFileManager defaultManager] copyItemAtPath:[CodePush bundleAssetsPath]
                                                                                                         toPath:[newUpdateCodePushPath stringByAppendingPathComponent:[CodePushUpdateUtils assetsFolderName]]
                                                                                                          error:&error];
                                                                 if (error) {
@@ -280,11 +280,6 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
     [downloadHandler download:updatePackage[@"downloadUrl"]];
 }
 
-+ (NSString *)getBinaryAssetsPath
-{
-    return [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:[CodePushUpdateUtils assetsFolderName]];
-}
-
 + (NSString *)getCodePushPath
 {
     NSString* codePushPath = [[CodePush getApplicationSupportDirectory] stringByAppendingPathComponent:@"CodePush"];

ios/CodePush/CodePushUpdateUtils.m

@@ -189,7 +189,7 @@ + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
 
     // If the app is using assets, then add
     // them to the generated content manifest.
-    NSString *assetsPath = [CodePushPackage getBinaryAssetsPath];
+    NSString *assetsPath = [CodePush bundleAssetsPath];
     if ([[NSFileManager defaultManager] fileExistsAtPath:assetsPath]) {
         [self addContentsOfFolderToManifest:assetsPath
                                  pathPrefix:[NSString stringWithFormat:@"%@/%@", [self manifestFolderPrefix], @"assets"]