@@ -80,7 +80,7 @@ - (void)checkForPendingUpdate:(BOOL)isAppStart {
80
80
if ([pendingHash isEqualToString: currentHash]) {
81
81
// We only want to initialize the rollback timer in two scenarios:
82
82
// 1) The app has been restarted, and therefore, the pending update is already applied
83
- // 2) The app has been resumed, and the pending update indicates it supports being restarted on resume
83
+ // 2) The app has been resumed, and the pending update indicates it supports being restarted on resume, so we need to restart the app and the kickoff the rollback timer
84
84
if (isAppStart || (!isAppStart && [pendingUpdate[PendingUpdateAllowsRestartOnResumeKey] boolValue ]))
85
85
{
86
86
int rollbackTimeout = [pendingUpdate[PendingUpdateRollbackTimeoutKey] intValue ];
@@ -109,7 +109,7 @@ - (NSDictionary *)constantsToExport
109
109
return @{ @" codePushRestartModeNone" : @(CodePushRestartModeNone),
110
110
@" codePushRestartModeImmediate" : @(CodePushRestartModeImmediate),
111
111
@" codePushRestartModeOnNextResume" : @(CodePushRestartModeOnNextResume)
112
- };
112
+ };
113
113
};
114
114
115
115
- (void )dealloc {
@@ -179,7 +179,8 @@ - (void)rollbackPackage
179
179
[self loadBundle ];
180
180
}
181
181
182
- - (void )saveFailedUpdate : (NSString *)packageHash {
182
+ - (void )saveFailedUpdate : (NSString *)packageHash
183
+ {
183
184
NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults ];
184
185
NSMutableArray *failedUpdates = [preferences objectForKey: FailedUpdatesKey];
185
186
if (failedUpdates == nil ) {
@@ -224,10 +225,10 @@ - (void)startRollbackTimer:(int)rollbackTimeout
224
225
225
226
// JavaScript-exported module methods
226
227
RCT_EXPORT_METHOD (applyUpdate:(NSDictionary *)updatePackage
227
- rollbackTimeout:(int )rollbackTimeout
228
+ rollbackTimeout:(int )rollbackTimeout
228
229
restartMode:(CodePushRestartMode)restartMode
229
- resolver:(RCTPromiseResolveBlock)resolve
230
- rejecter:(RCTPromiseRejectBlock)reject)
230
+ resolver:(RCTPromiseResolveBlock)resolve
231
+ rejecter:(RCTPromiseRejectBlock)reject)
231
232
{
232
233
dispatch_async (dispatch_get_global_queue (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0 ), ^{
233
234
NSError *error;
@@ -250,8 +251,8 @@ - (void)startRollbackTimer:(int)rollbackTimeout
250
251
}
251
252
252
253
RCT_EXPORT_METHOD (downloadUpdate:(NSDictionary *)updatePackage
253
- resolver:(RCTPromiseResolveBlock)resolve
254
- rejecter:(RCTPromiseRejectBlock)reject)
254
+ resolver:(RCTPromiseResolveBlock)resolve
255
+ rejecter:(RCTPromiseRejectBlock)reject)
255
256
{
256
257
[CodePushPackage downloadPackage: updatePackage
257
258
progressCallback: ^(long expectedContentLength, long receivedContentLength) {
@@ -280,13 +281,13 @@ - (void)startRollbackTimer:(int)rollbackTimeout
280
281
}
281
282
282
283
RCT_EXPORT_METHOD (getConfiguration:(RCTPromiseResolveBlock)resolve
283
- rejecter:(RCTPromiseRejectBlock)reject)
284
+ rejecter:(RCTPromiseRejectBlock)reject)
284
285
{
285
286
resolve ([CodePushConfig getConfiguration ]);
286
287
}
287
288
288
289
RCT_EXPORT_METHOD (getCurrentPackage:(RCTPromiseResolveBlock)resolve
289
- rejecter:(RCTPromiseRejectBlock)reject)
290
+ rejecter:(RCTPromiseRejectBlock)reject)
290
291
{
291
292
dispatch_async (dispatch_get_main_queue (), ^{
292
293
NSError *error;
@@ -300,16 +301,16 @@ - (void)startRollbackTimer:(int)rollbackTimeout
300
301
}
301
302
302
303
RCT_EXPORT_METHOD (isFailedUpdate:(NSString *)packageHash
303
- resolve:(RCTPromiseResolveBlock)resolve
304
- reject:(RCTPromiseRejectBlock)reject)
304
+ resolve:(RCTPromiseResolveBlock)resolve
305
+ reject:(RCTPromiseRejectBlock)reject)
305
306
{
306
307
BOOL isFailedHash = [self isFailedHash: packageHash];
307
308
resolve (@(isFailedHash));
308
309
}
309
310
310
311
RCT_EXPORT_METHOD (isFirstRun:(NSString *)packageHash
311
- resolve:(RCTPromiseResolveBlock)resolve
312
- rejecter:(RCTPromiseRejectBlock)reject)
312
+ resolve:(RCTPromiseResolveBlock)resolve
313
+ rejecter:(RCTPromiseRejectBlock)reject)
313
314
{
314
315
NSError *error;
315
316
BOOL isFirstRun = didUpdate
@@ -321,7 +322,7 @@ - (void)startRollbackTimer:(int)rollbackTimeout
321
322
}
322
323
323
324
RCT_EXPORT_METHOD (notifyApplicationReady:(RCTPromiseResolveBlock)resolve
324
- rejecter:(RCTPromiseRejectBlock)reject)
325
+ rejecter:(RCTPromiseRejectBlock)reject)
325
326
{
326
327
[self cancelRollbackTimer ];
327
328
resolve ([NSNull null ]);
0 commit comments