Skip to content

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

session

rorycleard2b212914852
diff --git a/clearcam/Email.m b/clearcam/Email.m
index 5d96782..239598f 100644
--- a/clearcam/Email.m
+++ b/clearcam/Email.m
@@ -124,7 +124,7 @@
- (void)saveWithImageAtPath:(NSString *)imagePath { // todo obv merge with email
// Default to HTTPS
NSString *server = @"https://www.rors.ai";
-
+
// Allow HTTP only if user enables "use_own_email_server_enabled"
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"use_own_email_server_enabled"]) {
server = [[NSUserDefaults standardUserDefaults] valueForKey:@"own_email_server_address"];
@@ -134,12 +134,10 @@
}
NSString *endpoint = @"/save";
- NSString *toEmail = [[NSUserDefaults standardUserDefaults] stringForKey:@"user_email"];
- if (!toEmail) return;
NSData *imageData = nil;
NSString *filePathToSend = imagePath;
-
+
if (imagePath.length == 0) { //todo, to test user's endpoint
NSLog(@"Image path is empty. Generating blank image.");
CGSize imageSize = CGSizeMake(1280, 720);
@@ -182,25 +180,23 @@
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]];
-
+ // Add file field
[bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
[bodyData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"file\"; filename=\"%@\"\r\n", [filePathToSend lastPathComponent]] dataUsingEncoding:NSUTF8StringEncoding]];
[bodyData appendData:[@"Content-Type: application/octet-stream\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
[bodyData appendData:fileData];
[bodyData appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
- // Include receipt only if not using own email server
+ // Include session_token only if not using own email server
if (![[NSUserDefaults standardUserDefaults] boolForKey:@"use_own_email_server_enabled"]) {
- NSString *receipt = [[NSUserDefaults standardUserDefaults] stringForKey:@"subscriptionReceipt"];
- if (receipt) {
+ NSString *sessionToken = [[StoreManager sharedInstance] retrieveSessionTokenFromKeychain];
+ if (sessionToken) {
[bodyData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[@"Content-Disposition: form-data; name=\"receipt\"\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
- [bodyData appendData:[receipt 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]];
+ } else {
+ NSLog(@"No session token found in Keychain.");
}
}
@@ -215,7 +211,11 @@
NSURLSession *session = [NSURLSession sharedSession];
NSURLSessionDataTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
- if (error) NSLog(@"Error: %@", error.localizedDescription);
+ if (error) {
+ NSLog(@"Error: %@", error.localizedDescription);
+ } else {
+ NSLog(@"Save request completed with status code: %ld", (long)[(NSHTTPURLResponse *)response statusCode]);
+ }
}];
[task resume];
}