Add object detection, tracking, mobile notifications, and search to any security camera.
remove expiry
roryclearee944d0e1eec
diff --git a/ios/clearcam/SceneDelegate.m b/ios/clearcam/SceneDelegate.mindex ee51f70..d382c6d 100644--- a/ios/clearcam/SceneDelegate.m+++ b/ios/clearcam/SceneDelegate.m@@ -38,7 +38,8 @@ willConnectToSession:(UISceneSession *)session});return;}- [[StoreManager sharedInstance] verifySessionOnlyWithCompletion:^(BOOL isActive, NSDate *expiryDate) {+ //todo session only if logged out??+ [[StoreManager sharedInstance] verifySubscriptionWithCompletion:^(BOOL isActive, NSDate *expiryDate) {dispatch_async(dispatch_get_main_queue(), ^{UIViewController *rootVC;diff --git a/ios/clearcam/SceneState.m b/ios/clearcam/SceneState.mindex 3beb868..7dca16a 100644--- a/ios/clearcam/SceneState.m+++ b/ios/clearcam/SceneState.m@@ -93,17 +93,9 @@NSData *lowResImageData = UIImageJPEGRepresentation(resizedImage, 0.7);[lowResImageData writeToFile:filePathSmall atomically:YES];- NSDate *expiry = [[NSUserDefaults standardUserDefaults] objectForKey:@"expiry"];BOOL isSubscribed = [[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"];- BOOL sessionExpiredOrNow = !expiry || [expiry compare:[NSDate date]] != NSOrderedDescending;if(isSubscribed) {- if (sessionExpiredOrNow) {- [[StoreManager sharedInstance] verifySubscriptionWithCompletion:^(BOOL isActive, NSDate *expiryDate) {- [self sendnotification];- }];- } else {- [self sendnotification];- }+ [self sendnotification];}}}diff --git a/ios/clearcam/StoreManager.m b/ios/clearcam/StoreManager.mindex 422ad5a..4bfc247 100644--- a/ios/clearcam/StoreManager.m+++ b/ios/clearcam/StoreManager.m@@ -459,19 +459,17 @@ NSString *const StoreManagerSubscriptionStatusDidChangeNotification = @"StoreMan}- (void)verifySubscriptionWithCompletionIfSubbed:(void (^)(BOOL isActive, NSDate *expiryDate))completion {- NSDate *expiry = [[NSUserDefaults standardUserDefaults] objectForKey:@"expiry"];BOOL isSubscribed = [[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"];NSTimeInterval lastCheck = [StoreManager sharedInstance].last_check_time;- BOOL sessionExpired = !expiry || [expiry compare:[NSDate date]] != NSOrderedDescending;BOOL sessionTokenMissing = ![[StoreManager sharedInstance] retrieveSessionTokenFromKeychain];- BOOL shouldCheckRemote = sessionExpired || sessionTokenMissing || ([[NSDate date] timeIntervalSince1970] - lastCheck > 120.0);+ BOOL shouldCheckRemote = sessionTokenMissing || ([[NSDate date] timeIntervalSince1970] - lastCheck > 120.0);if (shouldCheckRemote) {[self verifySubscriptionWithCompletion:^(BOOL isActive, NSDate *expiryDate) {if (completion) completion(isActive, expiryDate);}];} else {- if (completion) completion(isSubscribed, expiry);+ if (completion) completion(isSubscribed, nil);}}@@ -515,7 +513,7 @@ NSString *const StoreManagerSubscriptionStatusDidChangeNotification = @"StoreManisRequestInProgress = NO;}dispatch_async(dispatch_get_main_queue(), ^{- completion(YES, [[NSUserDefaults standardUserDefaults] objectForKey:@"expiry"]);+ completion(YES, nil);});} else {if (checkSubscription) {@@ -589,7 +587,6 @@ NSString *const StoreManagerSubscriptionStatusDidChangeNotification = @"StoreManNSString *sessionToken = jsonResponse[@"session_token"];if (sessionToken && [sessionToken isKindOfClass:[NSString class]]) {[self storeSessionTokenInKeychain:sessionToken];- [[NSUserDefaults standardUserDefaults] setObject:[NSDate dateWithTimeIntervalSinceNow:45 * 60] forKey:@"expiry"];}[[NSNotificationCenter defaultCenter] postNotificationName:StoreManagerSubscriptionStatusDidChangeNotification object:nil];} else {diff --git a/ios/clearcam/ViewController.m b/ios/clearcam/ViewController.mindex 4c8dae5..41ab373 100644--- a/ios/clearcam/ViewController.m+++ b/ios/clearcam/ViewController.m@@ -56,15 +56,7 @@ NSMutableDictionary *classColorMap;- (void)viewDidLoad {NSLog(@"NSCameraUsageDescription: %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSCameraUsageDescription"]);[super viewDidLoad];- NSDate *expiry = [[NSUserDefaults standardUserDefaults] objectForKey:@"expiry"];BOOL isSubscribed = [[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"];- BOOL sessionExpiredOrNow = !expiry || [expiry compare:[NSDate date]] != NSOrderedDescending;- if(isSubscribed && sessionExpiredOrNow) {- if (sessionExpiredOrNow) {- [[StoreManager sharedInstance] verifySubscriptionWithCompletion:^(BOOL isActive, NSDate *expiryDate) {- }];- }- }self.streamLink = @"";self.recordPressed = NO;self.last_check_time = [[NSDate date] timeIntervalSince1970];