kylefang/react-native-code-push
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-code-push.git synced 2026-05-19 19:39:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Converting pending update keys to consts

Browse Source
This commit is contained in:
Jonathan Carter
2015-11-15 15:39:11 -08:00
parent 18469b593d
commit 8cd36cd169
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CodePush.m
View File

@@ -16,6 +16,12 @@ BOOL didUpdate = NO;
NSString * const FailedUpdatesKey = @"CODE_PUSH_FAILED_UPDATES";
NSString * const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
// These keys are already "namespaced" by the PendingUpdateKey, so
// their values don't need to be obfuscated to prevent collision with app data
NSString * const PendingUpdateAllowsRestartOnResumeKey = @"allowsRestartOnResume";
NSString * const PendingUpdateHashKey = @"hash";
NSString * const PendingUpdateRollbackTimeoutKey = @"rollbackTimeout";
@synthesize bridge = _bridge;
// Public Obj-C API
@@ -65,7 +71,7 @@ NSString * const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
if (pendingUpdate)
{
NSError *error;
NSString *pendingHash = pendingUpdate[@"hash"];
NSString *pendingHash = pendingUpdate[PendingUpdateHashKey];
NSString *currentHash = [CodePushPackage getCurrentPackageHash:&error];
// If the current hash is equivalent to the pending hash, then the app
@@ -75,9 +81,9 @@ NSString * const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
// We only want to initialize the rollback timer in two scenarios:
// 1) The app has been restarted, and therefore, the pending update is already applied
// 2) The app has been resumed, and the pending update indicates it supports being restarted on resume
if (isAppStart || (!isAppStart && [pendingUpdate[@"allowRestartOnResume"] boolValue]))
if (isAppStart || (!isAppStart && [pendingUpdate[PendingUpdateAllowsRestartOnResumeKey] boolValue]))
{
int rollbackTimeout = [pendingUpdate[@"rollbackTimeout"] intValue];
int rollbackTimeout = [pendingUpdate[PendingUpdateRollbackTimeoutKey] intValue];
// If the app wasn't restarted "naturally", then we need to restart it manually
BOOL needsRestart = !isAppStart;
@@ -197,9 +203,9 @@ NSString * const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
// was applied, but hasn't yet become "active".
NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
NSDictionary *pendingUpdate = [[NSDictionary alloc] initWithObjectsAndKeys:
packageHash,@"hash",
[NSNumber numberWithInt:rollbackTimeout],@"rollbackTimeout",
[NSNumber numberWithBool:allowRestartOnResume],@"allowRestartOnResume",
packageHash,PendingUpdateHashKey,
[NSNumber numberWithInt:rollbackTimeout],PendingUpdateRollbackTimeoutKey,
[NSNumber numberWithBool:allowRestartOnResume],PendingUpdateAllowsRestartOnResumeKey,
nil];
[preferences setObject:pendingUpdate forKey:PendingUpdateKey];