From 3dd3c57a9cc13e1811ecef4e18a1066d2e926281 Mon Sep 17 00:00:00 2001
From: Geoffrey Goh <kg422@cornell.edu>
Date: Tue, 2 Feb 2016 13:52:24 -0800
Subject: [PATCH] remove enclosing else

---
 CodePush.m                                    | 51 ++++++++++---------
 .../xcschemes/CodePushDemoApp.xcscheme        | 11 ++--
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/CodePush.m b/CodePush.m
index 94c6017..a7aa7b3 100644
--- a/CodePush.m
+++ b/CodePush.m
@@ -519,35 +519,36 @@ RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve
     if ([_bridge.bundleURL.scheme hasPrefix:@"http"]) {
         // Do not report metrics if running bundle from packager.
         resolve(nil);
-    } else {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            if (needToReportRollback) {
-                needToReportRollback = NO;
-                NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
-                NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
-                if (failedUpdates) {
-                    NSDictionary *lastFailedPackage = [failedUpdates lastObject];
-                    if (lastFailedPackage) {
-                        resolve([CodePushTelemetryManager getRollbackReport:lastFailedPackage]);
-                        return;
-                    }
-                }
-            } else if (_isFirstRunAfterUpdate) {
-                NSError *error;
-                NSDictionary *currentPackage = [CodePushPackage getCurrentPackage:&error];
-                if (!error && currentPackage) {
-                    resolve([CodePushTelemetryManager getUpdateReport:currentPackage]);
+        return;
+    }
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        if (needToReportRollback) {
+            needToReportRollback = NO;
+            NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
+            NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
+            if (failedUpdates) {
+                NSDictionary *lastFailedPackage = [failedUpdates lastObject];
+                if (lastFailedPackage) {
+                    resolve([CodePushTelemetryManager getRollbackReport:lastFailedPackage]);
                     return;
                 }
-            } else if (isRunningBinaryVersion) {
-                NSString *appVersion = [[CodePushConfig current] appVersion];
-                resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]);
+            }
+        } else if (_isFirstRunAfterUpdate) {
+            NSError *error;
+            NSDictionary *currentPackage = [CodePushPackage getCurrentPackage:&error];
+            if (!error && currentPackage) {
+                resolve([CodePushTelemetryManager getUpdateReport:currentPackage]);
                 return;
             }
-            
-            resolve(nil);
-        });
-    }
+        } else if (isRunningBinaryVersion) {
+            NSString *appVersion = [[CodePushConfig current] appVersion];
+            resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]);
+            return;
+        }
+        
+        resolve(nil);
+    });
 #endif
 }
 
diff --git a/Examples/CodePushDemoApp/iOS/CodePushDemoApp.xcodeproj/xcshareddata/xcschemes/CodePushDemoApp.xcscheme b/Examples/CodePushDemoApp/iOS/CodePushDemoApp.xcodeproj/xcshareddata/xcschemes/CodePushDemoApp.xcscheme
index a61b64b..36f7a76 100644
--- a/Examples/CodePushDemoApp/iOS/CodePushDemoApp.xcodeproj/xcshareddata/xcschemes/CodePushDemoApp.xcscheme
+++ b/Examples/CodePushDemoApp/iOS/CodePushDemoApp.xcodeproj/xcshareddata/xcschemes/CodePushDemoApp.xcscheme
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -67,15 +67,18 @@
             ReferencedContainer = "container:CodePushDemoApp.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -91,10 +94,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">