Merge pull request #342 from Microsoft/fix-rollback-status-report

Fix rollback status report

Author: geof90

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

@@ -113,11 +113,13 @@ public WritableMap getUpdateReport(WritableMap currentPackage) {
     }
 
     public void recordStatusReported(ReadableMap statusReport) {
-        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);
+        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);
+            }
         }
     }
 

ios/CodePush/CodePushTelemetryManager.m

@@ -101,11 +101,13 @@ + (NSDictionary *)getUpdateReport:(NSDictionary *)currentPackage
 
 + (void)recordStatusReported:(NSDictionary *)statusReport
 {
-    if (statusReport[AppVersionKey]) {
-        [self saveStatusReportedForIdentifier:statusReport[AppVersionKey]];
-    } else if (statusReport[PackageKey]) {
-        NSString *packageIdentifier = [self getPackageStatusReportIdentifier:statusReport[PackageKey]];
-        [self saveStatusReportedForIdentifier:packageIdentifier];
+    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];
+        }
     }
 }