Skip to content

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

new endpoints

rorycleare274b0db7f49
diff --git a/clearcam/Email.h b/clearcam/Email.h
index 3495597..f8ed556 100644
--- a/clearcam/Email.h
+++ b/clearcam/Email.h
@@ -3,6 +3,7 @@
@interface Email : NSObject
+ (instancetype)sharedInstance;
-- (void)sendEmailWithImageAtPath:(NSString *)imagePath;
+- (void)uploadImageAtPath:(NSString *)imagePath;
+- (void)sendNotification;
@end
diff --git a/clearcam/Email.m b/clearcam/Email.m
index aeb89f1..9353bca 100644
--- a/clearcam/Email.m
+++ b/clearcam/Email.m
@@ -15,7 +15,7 @@
return sharedInstance;
}
-- (void)sendEmailWithImageAtPath:(NSString *)imagePath {
+- (void)sendNotification {
NSString *server = @"https://www.rors.ai";
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"use_own_server_enabled"]) {
@@ -26,6 +26,39 @@
}
NSString *endpoint = @"/send";
+ NSString *boundary = [NSString stringWithFormat:@"Boundary-%@", [[NSUUID UUID] UUIDString]];
+ NSMutableData *bodyData = [NSMutableData data];
+
+ // Retrieve session token
+ NSString *sessionToken = [[StoreManager sharedInstance] retrieveSessionTokenFromKeychain];
+ if (!sessionToken) return;
+
+ // Add "session_token" field
+ [bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[@"Content-Disposition: form-data; name=\"session_token\"\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[sessionToken dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+ [bodyData appendData:[[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+
+ [FileServer performPostRequestWithURL:[server stringByAppendingString:endpoint]
+ method:@"POST"
+ contentType:[NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary]
+ body:bodyData
+ completionHandler:^(NSData *data, NSHTTPURLResponse *response, NSError *error) {}];
+}
+
+
+- (void)uploadImageAtPath:(NSString *)imagePath {
+ NSString *server = @"https://www.rors.ai";
+
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"use_own_server_enabled"]) {
+ server = [[NSUserDefaults standardUserDefaults] valueForKey:@"own_email_server_address"];
+ if (![server hasPrefix:@"http"]) {
+ server = [@"http://" stringByAppendingString:server];
+ }
+ }
+
+ NSString *endpoint = @"/upload";
NSData *imageData = nil;
NSString *filePathToSend = imagePath;
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index 91d3ad3..aa159bb 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -146,14 +146,14 @@
NSInteger endTime = [schedule[@"endHour"] integerValue] * 60 + [schedule[@"endMinute"] integerValue];
if (currentTime >= startTime && currentTime <= endTime) {
- [[Email sharedInstance] sendEmailWithImageAtPath:filePath];
+ [[Email sharedInstance] sendNotification];
if([FileServer sharedInstance].segment_length > 3) [FileServer sharedInstance].segment_length = 3;
NSTimeInterval start = [[NSDate dateWithTimeIntervalSinceNow:-7.5] timeIntervalSince1970];
NSTimeInterval end = [[NSDate dateWithTimeIntervalSinceNow:7.5] timeIntervalSince1970];
id context = [FileServer sharedInstance].context;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10 * NSEC_PER_SEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
NSString *filePath = [[FileServer sharedInstance] processVideoDownloadWithLowRes:YES startTime:start endTime:end context:context];
- [[Email sharedInstance] sendEmailWithImageAtPath:filePath];
+ [[Email sharedInstance] uploadImageAtPath:filePath];
});
break;
}
diff --git a/clearcam/SettingsViewController.m b/clearcam/SettingsViewController.m
index cc6b48e..bde370e 100644
--- a/clearcam/SettingsViewController.m
+++ b/clearcam/SettingsViewController.m
@@ -624,7 +624,7 @@
}
- (void)testEmailServer {
- [[Email sharedInstance] sendEmailWithImageAtPath:@""];
+ [[Email sharedInstance] sendNotification];
UIAlertController *resultAlert = [UIAlertController alertControllerWithTitle:@"Test Initiated"
message:@"Test email has been initiated. Check your server logs for results."
preferredStyle:UIAlertControllerStyleAlert];