Clean up ahead of PR.

Signal/src/util/OWSBackup.m

@@ -255,9 +255,8 @@ NS_ASSUME_NONNULL_BEGIN
         if (!lastExportSuccessDate && !lastExportFailureDate) {
             backupExportState = OWSBackupState_Idle;
         } else if (lastExportSuccessDate && lastExportFailureDate) {
-            backupExportState = (([lastExportSuccessDate compare:lastExportFailureDate] == NSOrderedDescending)
+            backupExportState = ([lastExportSuccessDate isAfterDate:lastExportFailureDate] ? OWSBackupState_Succeeded
-                    ? OWSBackupState_Succeeded
+                                                                                           : OWSBackupState_Failed);
-                    : OWSBackupState_Failed);
         } else if (lastExportSuccessDate) {
             backupExportState = OWSBackupState_Succeeded;
         } else if (lastExportFailureDate) {

Signal/test/util/UtilTest.m

@@ -87,17 +87,21 @@
 - (void)testDateComparison
 {
     NSDate *firstDate = [NSDate new];
-    [firstDate timeIntervalSince1970];
 
-    NSDate *sameDate = [NSDate dateWithTimeIntervalSince1970:firstDate.timeIntervalSince1970];
+    NSDate *sameDate = [NSDate dateWithTimeIntervalSinceReferenceDate:firstDate.timeIntervalSinceReferenceDate];
-    NSDate *laterDate = [NSDate dateWithTimeIntervalSince1970:firstDate.timeIntervalSince1970 + 1.f];
+    NSDate *laterDate = [NSDate dateWithTimeIntervalSinceReferenceDate:firstDate.timeIntervalSinceReferenceDate + 1.f];
 
+    XCTAssertEqual(firstDate.timeIntervalSinceReferenceDate, sameDate.timeIntervalSinceReferenceDate);
+    XCTAssertNotEqual(firstDate.timeIntervalSinceReferenceDate, laterDate.timeIntervalSinceReferenceDate);
     XCTAssertEqualObjects(firstDate, sameDate);
     XCTAssertNotEqualObjects(firstDate, laterDate);
     XCTAssertTrue(firstDate.timeIntervalSinceReferenceDate < laterDate.timeIntervalSinceReferenceDate);
     XCTAssertFalse([firstDate isBeforeDate:sameDate]);
     XCTAssertTrue([firstDate isBeforeDate:laterDate]);
     XCTAssertFalse([laterDate isBeforeDate:firstDate]);
+    XCTAssertFalse([firstDate isAfterDate:sameDate]);
+    XCTAssertFalse([firstDate isAfterDate:laterDate]);
+    XCTAssertTrue([laterDate isAfterDate:firstDate]);
 }
 
 @end

SignalServiceKit/src/Util/NSDate+OWS.h

@@ -24,6 +24,7 @@ extern const NSTimeInterval kMonthInterval;
 + (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds;
 + (uint64_t)ows_millisecondsSince1970ForDate:(NSDate *)date;
 
+- (BOOL)isAfterDate:(NSDate *)otherDate;
 - (BOOL)isBeforeDate:(NSDate *)otherDate;
 
 @end

SignalServiceKit/src/Util/NSDate+OWS.mm

@@ -32,6 +32,11 @@ const NSTimeInterval kMonthInterval = 30 * kDayInterval;
     return (uint64_t)(date.timeIntervalSince1970 * 1000);
 }
 
+- (BOOL)isAfterDate:(NSDate *)otherDate
+{
+    return [self compare:otherDate] == NSOrderedDescending;
+}
+
 - (BOOL)isBeforeDate:(NSDate *)otherDate
 {
     return [self compare:otherDate] == NSOrderedAscending;