Merge branch 'mkirk/rotation-time'

SignalServiceKit/src/Account/TSPreKeyManager.m

@@ -13,19 +13,13 @@
 #import "TSStorageHeaders.h"
 
 // Time before deletion of signed prekeys (measured in seconds)
-//
-// Currently we retain signed prekeys for at least 7 days.
-#define kSignedPreKeysDeletionTime ((NSTimeInterval)7 * kDayInterval)
+#define kSignedPreKeysDeletionTime (7 * kDayInterval)
 
 // Time before rotation of signed prekeys (measured in seconds)
-//
-// Currently we rotate signed prekeys every 2 days (48 hours).
-#define kSignedPreKeyRotationTime ((NSTimeInterval)7 * kDayInterval)
+#define kSignedPreKeyRotationTime (2 * kDayInterval)
 
 // How often we check prekey state on app activation.
-//
-// Currently we check prekey state every 12 hours.
-#define kPreKeyCheckFrequencySeconds ((NSTimeInterval)12 * kHourInterval)
+#define kPreKeyCheckFrequencySeconds (12 * kHourInterval)
 
 // We generate 100 one-time prekeys at a time.  We should replenish
 // whenever ~2/3 of them have been consumed.
@@ -40,9 +34,7 @@ static const NSUInteger kMaxPrekeyUpdateFailureCount = 5;
 
 // Maximum amount of time that can elapse without updating signed prekeys
 // before the message sending is disabled.
-//
-// Current value is 10 days (240 hours).
-#define kSignedPreKeyUpdateFailureMaxFailureDuration ((NSTimeInterval)10 * kDayInterval)
+#define kSignedPreKeyUpdateFailureMaxFailureDuration (10 * kDayInterval)
 
 #pragma mark -