Add object detection, tracking, mobile notifications, and search to any security camera.
fix regression crash
roryclearc85383c118d4
diff --git a/ios/clearcam/AppDelegate.m b/ios/clearcam/AppDelegate.mindex 9fb7bfd..a929993 100644--- a/ios/clearcam/AppDelegate.m+++ b/ios/clearcam/AppDelegate.m@@ -1,7 +1,11 @@#import "AppDelegate.h"#import <UserNotifications/UserNotifications.h>+#import "GalleryViewController.h"+#import "StoreManager.h"+#import "FileServer.h"@interface AppDelegate () <UNUserNotificationCenterDelegate>+@property (nonatomic, strong) NSDictionary *pendingNotification;@end@implementation AppDelegate@@ -9,37 +13,118 @@- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];center.delegate = self;++ // Handle launch from notification+ if (launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey]) {+ NSDictionary *userInfo = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];+ self.pendingNotification = userInfo;+ // Only process if notifications are enabled+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"receive_notif_enabled"] && userInfo[@"aps"][@"content-available"]) {+ [self handleNotificationReceived:userInfo];+ }+ }+return YES;}-#pragma mark - Notification Delegate+- (void)applicationDidBecomeActive:(UIApplication *)application {+ if (self.pendingNotification && [[NSUserDefaults standardUserDefaults] boolForKey:@"receive_notif_enabled"]) {+ [self handleNotificationNavigation];+ self.pendingNotification = nil;+ }+}++#pragma mark - Notification Handling++- (void)handleNotificationNavigation {+ dispatch_async(dispatch_get_main_queue(), ^{+ UIWindow *window = [UIApplication sharedApplication].keyWindow;+ UIViewController *rootVC = window.rootViewController;++ UIViewController *topVC = rootVC;+ while (topVC.presentedViewController) {+ topVC = topVC.presentedViewController;+ }++ if ([topVC isKindOfClass:[UINavigationController class]]) {+ UINavigationController *nav = (UINavigationController *)topVC;+ if ([nav.topViewController isKindOfClass:[GalleryViewController class]]) return;+ }++ GalleryViewController *galleryVC = [[GalleryViewController alloc] init];++ if ([topVC isKindOfClass:[UINavigationController class]]) {+ [(UINavigationController *)topVC pushViewController:galleryVC animated:YES];+ } else if (topVC.navigationController) {+ [topVC.navigationController pushViewController:galleryVC animated:YES];+ } else {+ UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:galleryVC];+ [topVC presentViewController:navController animated:YES completion:nil];+ }+ });+}++- (void)handleNotificationReceived:(NSDictionary *)userInfo {+ return; //TODO, did this do anything before?+ /*+ GalleryViewController *gallery = [[GalleryViewController alloc] init];+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{+ sleep(15);+ [gallery getEvents];+ });+ */+}- (void)userNotificationCenter:(UNUserNotificationCenter *)centerwillPresentNotification:(UNNotification *)notificationwithCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler {- completionHandler(UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionSound);+ NSDictionary *userInfo = notification.request.content.userInfo;+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"receive_notif_enabled"]) {+ if (userInfo[@"aps"][@"content-available"]) {+ [self handleNotificationReceived:userInfo];+ }+ completionHandler(UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionSound);+ } else {+ completionHandler(0); // No presentation options when disabled+ }}+- (void)userNotificationCenter:(UNUserNotificationCenter *)centerdidReceiveNotificationResponse:(UNNotificationResponse *)responsewithCompletionHandler:(void (^)(void))completionHandler {-+ NSDictionary *userInfo = response.notification.request.content.userInfo;+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"receive_notif_enabled"]) {+ [self handleNotificationNavigation];+ }completionHandler();}-#pragma mark - Remote Notifications-- (void)application:(UIApplication *)applicationdidReceiveRemoteNotification:(NSDictionary *)userInfofetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {- completionHandler(UIBackgroundFetchResultNoData);+ if (![[NSUserDefaults standardUserDefaults] boolForKey:@"receive_notif_enabled"]) {+ completionHandler(UIBackgroundFetchResultNoData);+ return;+ }++ if (userInfo[@"aps"][@"content-available"]) {+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{+ [self handleNotificationReceived:userInfo];+ completionHandler(UIBackgroundFetchResultNewData);+ });+ } else {+ if (application.applicationState == UIApplicationStateInactive || application.applicationState == UIApplicationStateBackground) self.pendingNotification = userInfo;+ completionHandler(UIBackgroundFetchResultNoData);+ }}-#pragma mark - Device Token-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {const unsigned char *dataBuffer = (const unsigned char *)[deviceToken bytes];- if (!dataBuffer) return;+ if (!dataBuffer) {+ return;+ }+NSMutableString *token = [NSMutableString stringWithCapacity:(deviceToken.length * 2)];for (int i = 0; i < deviceToken.length; i++) {[token appendFormat:@"%02x", dataBuffer[i]];@@ -48,4 +133,16 @@ fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {[[NSUserDefaults standardUserDefaults] synchronize];}+@synthesize persistentContainer = _persistentContainer;++- (NSPersistentContainer *)persistentContainer {+ if (_persistentContainer == nil) {+ _persistentContainer = [[NSPersistentContainer alloc] initWithName:@"SegmentsModel"];+ [_persistentContainer loadPersistentStoresWithCompletionHandler:^(NSPersistentStoreDescription *storeDescription, NSError *error) {+ if (error) abort();+ }];+ }+ return _persistentContainer;+}+@end