Skip to content

Commit 191fc51

Browse files
committed
remove duplicate functions
1 parent 003d616 commit 191fc51

File tree

1 file changed

+0
-48
lines changed

1 file changed

+0
-48
lines changed

Source/GPGMailBundle.m

-48
Original file line numberDiff line numberDiff line change
@@ -849,10 +849,6 @@ - (BOOL)hasActiveContractOrActiveTrial {
849849
return [self hasActiveContract] || [[self remainingTrialDays] integerValue] > 0;
850850
}
851851

852-
- (BOOL)hasActiveContractOrActiveTrial {
853-
return [self hasActiveContract] || [[self remainingTrialDays] integerValue] > 0;
854-
}
855-
856852
- (NSNumber *)remainingTrialDays {
857853
NSDictionary *contractInformation = [self contractInformation];
858854
if(!contractInformation[@"ActivationRemainingTrialDays"]) {
@@ -924,50 +920,6 @@ - (void)saveDateActivationDialogWasLastShown {
924920
[[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:@"__gme3_spd_last_shown_date"];
925921
}
926922

927-
- (BOOL)shouldShowSupportPlanActivationDialog {
928-
if(![self hasActiveContractOrActiveTrial]) {
929-
[self saveDateActivationDialogWasLastShown];
930-
return YES;
931-
}
932-
NSDictionary *contractInfo = [self contractInformation];
933-
// Trial has never been started?
934-
if(![contractInfo valueForKey:@"ActivationRemainingTrialDays"]) {
935-
[self saveDateActivationDialogWasLastShown];
936-
return YES;
937-
}
938-
NSDate *date = [[NSUserDefaults standardUserDefaults] objectForKey:@"__gme3_spd_last_shown_date"];
939-
if(!date) {
940-
[self saveDateActivationDialogWasLastShown];
941-
return YES;
942-
}
943-
// Check if between date now and date last are 3 days.
944-
945-
NSDate *fromDateTime = date;
946-
NSDate *toDateTime = [NSDate date];
947-
948-
NSDate *fromDate;
949-
NSDate *toDate;
950-
951-
NSCalendar *calendar = [NSCalendar currentCalendar];
952-
953-
[calendar rangeOfUnit:NSCalendarUnitDay startDate:&fromDate
954-
interval:NULL forDate:fromDateTime];
955-
[calendar rangeOfUnit:NSCalendarUnitDay startDate:&toDate
956-
interval:NULL forDate:toDateTime];
957-
958-
NSDateComponents *difference = [calendar components:NSCalendarUnitDay
959-
fromDate:fromDate toDate:toDate options:0];
960-
if([difference day] >= 3) {
961-
[self saveDateActivationDialogWasLastShown];
962-
return YES;
963-
}
964-
return NO;
965-
}
966-
967-
- (void)saveDateActivationDialogWasLastShown {
968-
[[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:@"__gme3_spd_last_shown_date"];
969-
}
970-
971923
- (void)checkSupportContractAndStartWizardIfNecessary {
972924
if(![self hasActiveContract]) {
973925
if([self hasActivationCodeForAutomaticActivation] || [self shouldShowSupportPlanActivationDialog]) {

0 commit comments

Comments
 (0)