Commit 71228b66 by Sebastián Katzer

Add internal `isRepeating method`

parent ed982a76
...@@ -35,5 +35,7 @@ ...@@ -35,5 +35,7 @@
// Encode the user info dict to JSON // Encode the user info dict to JSON
- (NSString*) encodeToJSON; - (NSString*) encodeToJSON;
// If it's a repeating notification
- (BOOL) isRepeating;
@end @end
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
- (BOOL) autoCancel - (BOOL) autoCancel
{ {
if (IsAtLeastiOSVersion(@"8.0")){ if (IsAtLeastiOSVersion(@"8.0")){
return self.repeatInterval == NSCalendarUnitEra; return ![self isRepeating];
} else { } else {
return [[dict objectForKey:@"autoCancel"] boolValue]; return [[dict objectForKey:@"autoCancel"] boolValue];
} }
...@@ -201,6 +201,9 @@ ...@@ -201,6 +201,9 @@
return NSCalendarUnitEra; return NSCalendarUnitEra;
} }
#pragma mark -
#pragma mark Methods
/** /**
* The notification's user info dict. * The notification's user info dict.
*/ */
...@@ -231,6 +234,16 @@ ...@@ -231,6 +234,16 @@
withString:@""]; withString:@""];
} }
/**
* If it's a repeating notification.
*/
- (BOOL) isRepeating
{
NSCalendarUnit interval = self.repeatInterval;
return !(interval == NSCalendarUnitEra || interval == 0);
}
#pragma mark - #pragma mark -
#pragma mark Helpers #pragma mark Helpers
......
...@@ -33,5 +33,7 @@ ...@@ -33,5 +33,7 @@
- (BOOL) wasInThePast; - (BOOL) wasInThePast;
// If the notification was already triggered // If the notification was already triggered
- (BOOL) wasTriggered; - (BOOL) wasTriggered;
// If it's a repeating notification
- (BOOL) isRepeating;
@end @end
...@@ -61,6 +61,9 @@ static char optionsKey; ...@@ -61,6 +61,9 @@ static char optionsKey;
self.soundName = options.soundName; self.soundName = options.soundName;
} }
#pragma mark -
#pragma mark Methods
/** /**
* The options provided by the plug-in. * The options provided by the plug-in.
*/ */
...@@ -128,7 +131,7 @@ static char optionsKey; ...@@ -128,7 +131,7 @@ static char optionsKey;
int timespan = [now timeIntervalSinceDate:fireDate]; int timespan = [now timeIntervalSinceDate:fireDate];
if (self.repeatInterval != NSCalendarUnitEra) { if ([self isRepeating]) {
timespan = timespan % [self repeatIntervalInSeconds]; timespan = timespan % [self repeatIntervalInSeconds];
} }
...@@ -156,4 +159,12 @@ static char optionsKey; ...@@ -156,4 +159,12 @@ static char optionsKey;
return isLaterThanOrEqualTo; return isLaterThanOrEqualTo;
} }
/**
* If it's a repeating notification.
*/
- (BOOL) isRepeating
{
return [self.options isRepeating];
}
@end @end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment