Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 3dd3c57

Browse files
committed
remove enclosing else
1 parent 4757ed2 commit 3dd3c57

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

CodePush.m

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -519,35 +519,36 @@ - (void)savePendingUpdate:(NSString *)packageHash
519519
if ([_bridge.bundleURL.scheme hasPrefix:@"http"]) {
520520
// Do not report metrics if running bundle from packager.
521521
resolve(nil);
522-
} else {
523-
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
524-
if (needToReportRollback) {
525-
needToReportRollback = NO;
526-
NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
527-
NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
528-
if (failedUpdates) {
529-
NSDictionary *lastFailedPackage = [failedUpdates lastObject];
530-
if (lastFailedPackage) {
531-
resolve([CodePushTelemetryManager getRollbackReport:lastFailedPackage]);
532-
return;
533-
}
534-
}
535-
} else if (_isFirstRunAfterUpdate) {
536-
NSError *error;
537-
NSDictionary *currentPackage = [CodePushPackage getCurrentPackage:&error];
538-
if (!error && currentPackage) {
539-
resolve([CodePushTelemetryManager getUpdateReport:currentPackage]);
522+
return;
523+
}
524+
525+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
526+
if (needToReportRollback) {
527+
needToReportRollback = NO;
528+
NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
529+
NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
530+
if (failedUpdates) {
531+
NSDictionary *lastFailedPackage = [failedUpdates lastObject];
532+
if (lastFailedPackage) {
533+
resolve([CodePushTelemetryManager getRollbackReport:lastFailedPackage]);
540534
return;
541535
}
542-
} else if (isRunningBinaryVersion) {
543-
NSString *appVersion = [[CodePushConfig current] appVersion];
544-
resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]);
536+
}
537+
} else if (_isFirstRunAfterUpdate) {
538+
NSError *error;
539+
NSDictionary *currentPackage = [CodePushPackage getCurrentPackage:&error];
540+
if (!error && currentPackage) {
541+
resolve([CodePushTelemetryManager getUpdateReport:currentPackage]);
545542
return;
546543
}
547-
548-
resolve(nil);
549-
});
550-
}
544+
} else if (isRunningBinaryVersion) {
545+
NSString *appVersion = [[CodePushConfig current] appVersion];
546+
resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]);
547+
return;
548+
}
549+
550+
resolve(nil);
551+
});
551552
#endif
552553
}
553554

Examples/CodePushDemoApp/iOS/CodePushDemoApp.xcodeproj/xcshareddata/xcschemes/CodePushDemoApp.xcscheme

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -67,15 +67,18 @@
6767
ReferencedContainer = "container:CodePushDemoApp.xcodeproj">
6868
</BuildableReference>
6969
</MacroExpansion>
70+
<AdditionalOptions>
71+
</AdditionalOptions>
7072
</TestAction>
7173
<LaunchAction
74+
buildConfiguration = "Debug"
7275
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7376
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7477
launchStyle = "0"
7578
useCustomWorkingDirectory = "NO"
76-
buildConfiguration = "Debug"
7779
ignoresPersistentStateOnLaunch = "NO"
7880
debugDocumentVersioning = "YES"
81+
debugServiceExtension = "internal"
7982
allowLocationSimulation = "YES">
8083
<BuildableProductRunnable
8184
runnableDebuggingMode = "0">
@@ -91,10 +94,10 @@
9194
</AdditionalOptions>
9295
</LaunchAction>
9396
<ProfileAction
97+
buildConfiguration = "Release"
9498
shouldUseLaunchSchemeArgsEnv = "YES"
9599
savedToolIdentifier = ""
96100
useCustomWorkingDirectory = "NO"
97-
buildConfiguration = "Release"
98101
debugDocumentVersioning = "YES">
99102
<BuildableProductRunnable
100103
runnableDebuggingMode = "0">

0 commit comments

Comments
 (0)