Fixed crash #237: stop using objectForKeyedSubscript during +load method

Added support for separated assemblies in plist for iPhone and iPad
appsquickly · Jul 8, 2014 · 5faa974 · 5faa974
1 parent e0d9454
commit 5faa974
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Source/Configuration/Startup/TyphoonStartup.m b/Source/Configuration/Startup/TyphoonStartup.m
@@ -42,7 +42,7 @@ + (TyphoonComponentFactory *)factoryFromPlist
 {
     TyphoonComponentFactory *result = nil;
 
-    NSArray *assemblyNames = [[NSBundle mainBundle] infoDictionary][@"TyphoonInitialAssemblies"];
+    NSArray *assemblyNames = [self plistAssemblyNames];
     NSAssert(!assemblyNames || [assemblyNames isKindOfClass:[NSArray class]], @"Value for 'TyphoonInitialAssemblies' key must be array");
 
     if ([assemblyNames count] > 0) {
@@ -60,6 +60,25 @@ + (TyphoonComponentFactory *)factoryFromPlist
     return result;
 }
 
++ (NSArray *)plistAssemblyNames
+{
+    NSArray *names = nil;
+
+    NSDictionary *bundleInfoDictionary = [[NSBundle mainBundle] infoDictionary];
+#if TARGET_OS_IPHONE
+    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
+        names = [bundleInfoDictionary objectForKey:@"TyphoonInitialAssemblies(iPad)"];
+    } else {
+        names = [bundleInfoDictionary objectForKey:@"TyphoonInitialAssemblies(iPhone)"];
+    }
+#endif
+    if (!names) {
+        names = [bundleInfoDictionary objectForKey:@"TyphoonInitialAssemblies"];
+    }
+
+    return names;
+}
+
 + (TyphoonComponentFactory *)factoryFromAppDelegate:(id)appDelegate
 {
     TyphoonComponentFactory *result = nil;

diff --git a/Source/ios/Storyboard/TyphoonInitialStoryboardResolver.m b/Source/ios/Storyboard/TyphoonInitialStoryboardResolver.m
@@ -42,7 +42,7 @@ + (void)swizzleUIStoryboardWithName:(NSString *)storyboardName
 
 + (NSString *)initialStoryboardName
 {
-    return [[NSBundle mainBundle] infoDictionary][@"UIMainStoryboardFile"];
+    return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"UIMainStoryboardFile"];
 }
 
 @end