Merge pull request #346 from Microsoft/metric_fix

Metrics fix

Author: lostintangent

android/app/src/main/java/com/microsoft/codepush/react/CodePushTelemetryManager.java

@@ -113,13 +113,16 @@ public WritableMap getUpdateReport(WritableMap currentPackage) {
     }
 
     public void recordStatusReported(ReadableMap statusReport) {
-        if (statusReport.hasKey(STATUS_KEY) && DEPLOYMENT_SUCCEEDED_STATUS.equals(statusReport.getString(STATUS_KEY))) {
-            if (statusReport.hasKey(APP_VERSION_KEY)) {
-                saveStatusReportedForIdentifier(statusReport.getString(APP_VERSION_KEY));
-            } else if (statusReport.hasKey(PACKAGE_KEY)) {
-                String packageIdentifier = getPackageStatusReportIdentifier(statusReport.getMap(PACKAGE_KEY));
-                saveStatusReportedForIdentifier(packageIdentifier);
-            }
+        // We don't need to record rollback reports, so exit early if that's what was specified.
+        if (statusReport.hasKey(STATUS_KEY) && DEPLOYMENT_FAILED_STATUS.equals(statusReport.getString(STATUS_KEY))) {
+            return;
+        }
+        
+        if (statusReport.hasKey(APP_VERSION_KEY)) {
+            saveStatusReportedForIdentifier(statusReport.getString(APP_VERSION_KEY));
+        } else if (statusReport.hasKey(PACKAGE_KEY)) {
+            String packageIdentifier = getPackageStatusReportIdentifier(statusReport.getMap(PACKAGE_KEY));
+            saveStatusReportedForIdentifier(packageIdentifier);
         }
     }
 

ios/CodePush/CodePushTelemetryManager.m

@@ -101,13 +101,16 @@ + (NSDictionary *)getUpdateReport:(NSDictionary *)currentPackage
 
 + (void)recordStatusReported:(NSDictionary *)statusReport
 {
-    if ([DeploymentSucceeded isEqualToString:statusReport[StatusKey]]) {
-        if (statusReport[AppVersionKey]) {
-            [self saveStatusReportedForIdentifier:statusReport[AppVersionKey]];
-        } else if (statusReport[PackageKey]) {
-            NSString *packageIdentifier = [self getPackageStatusReportIdentifier:statusReport[PackageKey]];
-            [self saveStatusReportedForIdentifier:packageIdentifier];
-        }
+    // We don't need to record rollback reports, so exit early if that's what was specified.
+    if ([DeploymentFailed isEqualToString:statusReport[StatusKey]]) {
+        return;
+    }
+    
+    if (statusReport[AppVersionKey]) {
+        [self saveStatusReportedForIdentifier:statusReport[AppVersionKey]];
+    } else if (statusReport[PackageKey]) {
+        NSString *packageIdentifier = [self getPackageStatusReportIdentifier:statusReport[PackageKey]];
+        [self saveStatusReportedForIdentifier:packageIdentifier];
     }
 }