public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly showing premium expiration date.

Browse source
This commit is contained in:
Samuel Clay 2017-11-15 11:14:05 -08:00
parent f4142a498f
commit bc78c54b1b
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/ios/Classes/NewsBlurAppDelegate.h
View file

@ -255,7 +255,7 @@ SFSafariViewControllerDelegate> {
@property (nonatomic) NSDictionary *dictUserProfile;
@property (nonatomic) NSDictionary *dictSocialServices;
@property (nonatomic) BOOL isPremium;
@property (nonatomic) NSString *premiumExpire;
@property (nonatomic) NSInteger premiumExpire;
@property (nonatomic, strong) NSMutableDictionary *dictUnreadCounts;
@property (nonatomic, strong) NSMutableDictionary *dictTextFeeds;
@property (nonatomic) NSArray *userInteractionsArray;

2
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -233,7 +233,7 @@
cachedFavicons = [[PINCache alloc] initWithName:@"NBFavicons"];
cachedStoryImages = [[PINCache alloc] initWithName:@"NBStoryImages"];
isPremium = NO;
premiumExpire = nil;
premiumExpire = 0;
NBURLCache *urlCache = [[NBURLCache alloc] init];
[NSURLCache setSharedURLCache:urlCache];

4
clients/ios/Classes/NewsBlurViewController.m
View file

@ -598,8 +598,8 @@ static UIFont *userLabelFont;
appDelegate.isPremium = [[appDelegate.dictUserProfile objectForKey:@"is_premium"] integerValue] == 1;
id premiumExpire = [appDelegate.dictUserProfile objectForKey:@"premium_expire"];
if (premiumExpire && ![premiumExpire isKindOfClass:[NSNull class]]) {
appDelegate.premiumExpire = [premiumExpire stringValue];
if (premiumExpire && ![premiumExpire isKindOfClass:[NSNull class]] && premiumExpire != 0) {
appDelegate.premiumExpire = [premiumExpire integerValue];
}
// Set up dictSocialFeeds

13
clients/ios/Classes/PremiumViewController.m
View file

@ -112,8 +112,11 @@
[confettiView stopConfetti];
[confettiView startConfetti];
if (appDelegate.premiumExpire != nil) {
labelPremiumExpire.text = [NSString stringWithFormat:@"Your premium subscription will renew on %@", appDelegate.premiumExpire];
if (appDelegate.premiumExpire != 0) {
NSDate *date = [NSDate dateWithTimeIntervalSince1970:appDelegate.premiumExpire];
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
[dateFormatter setDateFormat:@"MMMM d, yyyy"];
labelPremiumExpire.text = [NSString stringWithFormat:@"Your premium subscription will renew on %@", [dateFormatter stringFromDate:date]];
} else {
labelPremiumExpire.text = @"Your premium subscription is set to never expire. Whoa!";
}
@ -231,9 +234,9 @@
spinner.hidden = YES;
NSDictionary *results = (NSDictionary *)responseObject;
appDelegate.isPremium = [[results objectForKey:@"is_premium"] integerValue] == 1;
id premiumExpire = [appDelegate.dictUserProfile objectForKey:@"premium_expire"];
if (![premiumExpire isKindOfClass:[NSNull class]]) {
appDelegate.premiumExpire = [premiumExpire stringValue];
id premiumExpire = [results objectForKey:@"premium_expire"];
if (premiumExpire && ![premiumExpire isKindOfClass:[NSNull class]] && premiumExpire != 0) {
appDelegate.premiumExpire = [premiumExpire integerValue];
}
[self loadProducts];