Changing all internal methods from static to instance

Author: lostintangent

CodePush.m

@@ -7,7 +7,6 @@ @implementation CodePush
 
 RCT_EXPORT_MODULE()
 
-RCTBridge *_bridge;
 NSTimer *_timer;
 BOOL usingTestFolder = NO;
 
@@ -38,34 +37,28 @@ + (NSURL *)getBundleUrl
 }
 
 // Internal API methods
-+ (void)cancelRollbackTimer
+- (void)cancelRollbackTimer
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [_timer invalidate];
     });
 }
 
-+ (BOOL)isFailedHash:(NSString*)packageHash {
+- (BOOL)isFailedHash:(NSString*)packageHash {
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
     return (failedUpdates != nil && [failedUpdates containsObject:packageHash]);
 }
 
-+ (void)loadBundle
+- (void)loadBundle
 {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:[self getBundleUrl]
-                                                            moduleName:[CodePushConfig getRootComponent]
-                                                     initialProperties:nil
-                                                         launchOptions:nil];
-        
-        UIViewController *rootViewController = [[UIViewController alloc] init];
-        rootViewController.view = rootView;
-        [UIApplication sharedApplication].delegate.window.rootViewController = rootViewController;
-    });
+    // Reset the runtime's bundle to be
+    // the latest URL, and then force a refresh
+    _bridge.bundleURL = [CodePush getBundleUrl];
+    [_bridge reload];
 }
 
-+ (void)rollbackPackage
+- (void)rollbackPackage
 {
     NSError *error;
     NSString *packageHash = [CodePushPackage getCurrentPackageHash:&error];
@@ -79,7 +72,7 @@ + (void)rollbackPackage
     [self loadBundle];
 }
 
-+ (void)saveFailedUpdate:(NSString *)packageHash {
+- (void)saveFailedUpdate:(NSString *)packageHash {
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
     if (failedUpdates == nil) {
@@ -95,7 +88,7 @@ + (void)saveFailedUpdate:(NSString *)packageHash {
     [preferences synchronize];
 }
 
-+ (void)startRollbackTimer:(int)rollbackTimeout
+- (void)startRollbackTimer:(int)rollbackTimeout
 {
     double timeoutInSeconds = rollbackTimeout / 1000;
     _timer = [NSTimer scheduledTimerWithTimeInterval:timeoutInSeconds
@@ -121,11 +114,11 @@ + (void)startRollbackTimer:(int)rollbackTimeout
             reject(error);
         }
 
-        [CodePush loadBundle];
+        [self loadBundle];
 
         if (0 != rollbackTimeout) {
             dispatch_async(dispatch_get_main_queue(), ^{
-                [CodePush startRollbackTimer:rollbackTimeout];
+                [self startRollbackTimer:rollbackTimeout];
             });
 
         }
@@ -177,23 +170,23 @@ + (void)startRollbackTimer:(int)rollbackTimeout
 }
 
 RCT_EXPORT_METHOD(isFailedUpdate:(NSString *)packageHash
-                         resolve:(RCTPromiseResolveBlock)resolve
-                          reject:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 {
-    BOOL isFailedHash = [CodePush isFailedHash:packageHash];
+    BOOL isFailedHash = [self isFailedHash:packageHash];
     resolve(@(isFailedHash));
 }
 
 RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve
-                                rejecter:(RCTPromiseRejectBlock)reject)
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [CodePush cancelRollbackTimer];
+    [self cancelRollbackTimer];
     resolve([NSNull null]);
 }
 
 RCT_EXPORT_METHOD(setUsingTestFolder:(BOOL)shouldUseTestFolder)
 {
     usingTestFolder = shouldUseTestFolder;
 }
-                  
+
 @end