Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

move stuff

roryclearbd0a55298994
diff --git a/clearcam/Email.h b/clearcam/Email.h
new file mode 100644
index 0000000..3495597
--- /dev/null
+++ b/clearcam/Email.h
@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+@interface Email : NSObject
+
++ (instancetype)sharedInstance;
+- (void)sendEmailWithImageAtPath:(NSString *)imagePath;
+
+@end
diff --git a/clearcam/Email.m b/clearcam/Email.m
new file mode 100644
index 0000000..bef9f1c
--- /dev/null
+++ b/clearcam/Email.m
@@ -0,0 +1,87 @@
+#import "Email.h"
+#import "SecretManager.h"
+
+@implementation Email
+
++ (instancetype)sharedInstance {
+ static Email *sharedInstance = nil;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ sharedInstance = [[self alloc] init];
+ });
+ return sharedInstance;
+}
+
+- (void)sendEmailWithImageAtPath:(NSString *)imagePath {
+ NSString *server = @"http://192.168.1.105:8080";
+ NSString *endpoint = @"/send";
+ NSString *toEmail = [[NSUserDefaults standardUserDefaults] stringForKey:@"user_email"];
+ if (!toEmail) return;
+
+ NSData *imageData = [NSData dataWithContentsOfFile:imagePath];
+ if (!imageData) {
+ NSLog(@"Failed to read image data from path: %@", imagePath);
+ return;
+ }
+
+ NSData *fileData = imageData;
+ NSString *filePathToSend = imagePath;
+
+ // Check if encryption is enabled in SettingsManager
+ BOOL encryptImage = [[NSUserDefaults standardUserDefaults] boolForKey:@"encrypt_email_data_enabled"];
+
+ if (encryptImage) {
+ // Retrieve the user's password from the Keychain
+ NSString *encryptionKey = [[SecretManager sharedManager] getEncryptionKey];
+
+ if (!encryptionKey) {
+ NSLog(@"Encryption key not found in Keychain. Encryption aborted.");
+ return;
+ }
+
+ // Encrypt the image data using the retrieved key
+ fileData = [[SecretManager sharedManager] encryptData:imageData withKey:encryptionKey];
+ if (!fileData) {
+ NSLog(@"Encryption failed.");
+ return;
+ }
+ }
+
+
+ NSString *boundary = [NSString stringWithFormat:@"Boundary-%@", [[NSUUID UUID] UUIDString]];
+ NSMutableData *bodyData = [NSMutableData data];
+
+ [bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[@"Content-Disposition: form-data; name=\"to\"\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[toEmail dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+
+ [bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"file\"; filename=\"%@\"\r\n", encryptImage ? [[filePathToSend lastPathComponent] stringByAppendingString:@".aes"] : [filePathToSend lastPathComponent]
+] dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[[NSString stringWithFormat:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:fileData];
+ [bodyData appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+
+ [bodyData appendData:[[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+
+ NSURL *url = [NSURL URLWithString:[server stringByAppendingString:endpoint]];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
+ [request setHTTPMethod:@"POST"];
+ [request setValue:[NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary] forHTTPHeaderField:@"Content-Type"];
+ [request setValue:[NSString stringWithFormat:@"%lu", (unsigned long)bodyData.length] forHTTPHeaderField:@"Content-Length"];
+ [request setHTTPBody:bodyData];
+
+ NSURLSession *session = [NSURLSession sharedSession];
+ NSURLSessionDataTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+ if (error) {
+ NSLog(@"Error: %@", error.localizedDescription);
+ } else {
+ NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+ NSLog(@"Server Response: %@", responseString);
+ }
+ }];
+ [task resume];
+}
+
+@end
diff --git a/clearcam/SceneState.h b/clearcam/SceneState.h
index fe42f36..3d478b7 100644
--- a/clearcam/SceneState.h
+++ b/clearcam/SceneState.h
@@ -10,7 +10,6 @@
@property (nonatomic, strong) NSDictionary *alerts;
@property (strong, nonatomic) NSManagedObjectContext *backgroundContext;
@property (strong, nonatomic) NSDate *last_email_time;
-- (void)sendEmailWithImageAtPath:(NSString *)imagePath;
- (void)processOutput:(NSArray *)array withImage:(CIImage *)image;
- (void)writeToFileWithString:(NSString *)customString;
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index b268679..2e306c2 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -2,6 +2,7 @@
#import "SettingsManager.h"
#import "SecretManager.h"
#import "AppDelegate.h"
+#import "Email.h"
#import <MobileCoreServices/MobileCoreServices.h> // Add this import
#import <CommonCrypto/CommonCryptor.h>
@@ -96,7 +97,7 @@
if (self.last_email_time && [[NSDate date] timeIntervalSinceDate:self.last_email_time] > 60) { // only once per hour? enforce server side!
NSLog(@"sending email");
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"send_email_alerts_enabled"]) {
- [self sendEmailWithImageAtPath:filePath];
+ [[Email sharedInstance] sendEmailWithImageAtPath:filePath];
self.last_email_time = [NSDate date]; // Set to now
}
} else {
@@ -130,78 +131,6 @@
}
}
-- (void)sendEmailWithImageAtPath:(NSString *)imagePath {
- NSString *server = @"http://192.168.1.105:8080";
- NSString *endpoint = @"/send";
- NSString *toEmail = [[NSUserDefaults standardUserDefaults] stringForKey:@"user_email"];
- if (!toEmail) return;
-
- NSData *imageData = [NSData dataWithContentsOfFile:imagePath];
- if (!imageData) {
- NSLog(@"Failed to read image data from path: %@", imagePath);
- return;
- }
-
- NSData *fileData = imageData;
- NSString *filePathToSend = imagePath;
-
- // Check if encryption is enabled in SettingsManager
- BOOL encryptImage = [[NSUserDefaults standardUserDefaults] boolForKey:@"encrypt_email_data_enabled"];
-
- if (encryptImage) {
- // Retrieve the user's password from the Keychain
- NSString *encryptionKey = [[SecretManager sharedManager] getEncryptionKey];
-
- if (!encryptionKey) {
- NSLog(@"Encryption key not found in Keychain. Encryption aborted.");
- return;
- }
-
- // Encrypt the image data using the retrieved key
- fileData = [[SecretManager sharedManager] encryptData:imageData withKey:encryptionKey];
- if (!fileData) {
- NSLog(@"Encryption failed.");
- return;
- }
- }
-
-
- NSString *boundary = [NSString stringWithFormat:@"Boundary-%@", [[NSUUID UUID] UUIDString]];
- NSMutableData *bodyData = [NSMutableData data];
-
- [bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[@"Content-Disposition: form-data; name=\"to\"\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[toEmail dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
-
- [bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"file\"; filename=\"%@\"\r\n", encryptImage ? [[filePathToSend lastPathComponent] stringByAppendingString:@".aes"] : [filePathToSend lastPathComponent]
-] dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[[NSString stringWithFormat:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:fileData];
- [bodyData appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
-
- [bodyData appendData:[[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-
- NSURL *url = [NSURL URLWithString:[server stringByAppendingString:endpoint]];
- NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
- [request setHTTPMethod:@"POST"];
- [request setValue:[NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary] forHTTPHeaderField:@"Content-Type"];
- [request setValue:[NSString stringWithFormat:@"%lu", (unsigned long)bodyData.length] forHTTPHeaderField:@"Content-Length"];
- [request setHTTPBody:bodyData];
-
- NSURLSession *session = [NSURLSession sharedSession];
- NSURLSessionDataTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (error) {
- NSLog(@"Error: %@", error.localizedDescription);
- } else {
- NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
- NSLog(@"Server Response: %@", responseString);
- }
- }];
- [task resume];
-}
-
// Helper function to get MIME type for a file
- (NSString *)mimeTypeForFileAtPath:(NSString *)path {
CFStringRef fileExtension = (__bridge CFStringRef)[path pathExtension];