mirror of https://github.com/oxen-io/session-ios
Rewriting outgoing pipeline with GCD.
Frederic Jacobs
11 years ago
parent
8514836032
commit
1eff2b3ad5
@ -0,0 +1,16 @@
|
||||
//
|
||||
// TSMessagesManager+callRecorder.h
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 26/11/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSMessagesManager.h"
|
||||
#import "TSCall.h"
|
||||
|
||||
@interface TSMessagesManager (callRecorder)
|
||||
|
||||
- (void)storePhoneCall:(TSCall*)call;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,24 @@
|
||||
//
|
||||
// TSMessagesManager+callRecorder.m
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 26/11/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSMessagesManager+callRecorder.h"
|
||||
#import <YapDatabase/YapDatabaseConnection.h>
|
||||
|
||||
#import "Environment.h"
|
||||
#import "ContactsManager.h"
|
||||
|
||||
@implementation TSMessagesManager (callRecorder)
|
||||
|
||||
- (void)storePhoneCall:(TSCall*)call{
|
||||
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
[call saveWithTransaction:transaction];
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
@ -0,0 +1,15 @@
|
||||
//
|
||||
// PreKeyBundle+jsonDict.h
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 26/11/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "PreKeyBundle.h"
|
||||
|
||||
@interface PreKeyBundle (jsonDict)
|
||||
|
||||
+ (PreKeyBundle*)preKeyBundleFromDictionary:(NSDictionary*)dictionary forDeviceNumber:(NSNumber*)number;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,99 @@
|
||||
//
|
||||
// PreKeyBundle+jsonDict.m
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 26/11/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "Constraints.h"
|
||||
#import "PreKeyBundle+jsonDict.h"
|
||||
#import "NSData+Base64.h"
|
||||
|
||||
@implementation PreKeyBundle (jsonDict)
|
||||
|
||||
+ (PreKeyBundle*)preKeyBundleFromDictionary:(NSDictionary*)dictionary forDeviceNumber:(NSNumber*)number{
|
||||
PreKeyBundle *bundle = nil;
|
||||
NSString *identityKeyString = [dictionary objectForKey:@"identityKey"];
|
||||
NSArray *devicesArray = [dictionary objectForKey:@"devices"];
|
||||
|
||||
if (!(identityKeyString && [devicesArray isKindOfClass:[NSArray class]])) {
|
||||
DDLogError(@"Failed to get identity key or messages array from server request");
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSData *identityKey = [NSData dataFromBase64String:identityKeyString];
|
||||
NSLog(@"IDentityKey %@", identityKey);
|
||||
|
||||
for (NSDictionary *deviceDict in devicesArray) {
|
||||
NSNumber *registrationIdString = [deviceDict objectForKey:@"registrationId"];
|
||||
NSNumber *deviceIdString = [deviceDict objectForKey:@"deviceId"];
|
||||
|
||||
if (!(registrationIdString && deviceIdString)) {
|
||||
DDLogError(@"Failed to get the registration id and device id");
|
||||
return nil;
|
||||
}
|
||||
|
||||
if (![deviceIdString isEqualToNumber:number]) {
|
||||
DDLogWarn(@"Got a keyid for another device");
|
||||
return nil;
|
||||
}
|
||||
|
||||
int registrationId = [registrationIdString intValue];
|
||||
int deviceId = [deviceIdString intValue];
|
||||
|
||||
NSDictionary *preKey = [deviceDict objectForKey:@"preKey"];
|
||||
int prekeyId;
|
||||
NSData *preKeyPublic = nil;
|
||||
|
||||
if (!preKey) {
|
||||
prekeyId = -1;
|
||||
} else{
|
||||
prekeyId = [[preKey objectForKey:@"keyId"] intValue];
|
||||
NSString *preKeyPublicString = [preKey objectForKey:@"publicKey"];
|
||||
preKeyPublic = [NSData dataFromBase64String:preKeyPublicString];
|
||||
}
|
||||
|
||||
NSDictionary *signedPrekey = [deviceDict objectForKey:@"signedPreKey"];
|
||||
|
||||
if (![signedPrekey isKindOfClass:[NSDictionary class]]) {
|
||||
DDLogError(@"Device doesn't have signed prekeys registered");
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSNumber *signedKeyIdNumber = [signedPrekey objectForKey:@"keyId"];
|
||||
NSString *signedSignatureString = [signedPrekey objectForKey:@"signature"];
|
||||
NSString *signedPublicKeyString = [signedPrekey objectForKey:@"publicKey"];
|
||||
|
||||
|
||||
|
||||
if (!(signedKeyIdNumber && signedPublicKeyString && signedSignatureString)) {
|
||||
DDLogError(@"Missing signed key material");
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSData *signedPrekeyPublic = [NSData dataFromBase64String:signedPublicKeyString];
|
||||
NSData *signedPreKeySignature = [NSData dataFromBase64String:signedSignatureString];
|
||||
|
||||
if (!(signedPrekeyPublic && signedPreKeySignature)) {
|
||||
DDLogError(@"Failed to parse signed keying material");
|
||||
return nil;
|
||||
}
|
||||
|
||||
int signedPreKeyId = [signedKeyIdNumber intValue];
|
||||
|
||||
bundle = [[self alloc] initWithRegistrationId:registrationId
|
||||
deviceId:deviceId
|
||||
preKeyId:prekeyId
|
||||
preKeyPublic:preKeyPublic
|
||||
signedPreKeyPublic:signedPrekeyPublic
|
||||
signedPreKeyId:signedPreKeyId
|
||||
signedPreKeySignature:signedPreKeySignature
|
||||
identityKey:identityKey];
|
||||
|
||||
}
|
||||
|
||||
return bundle;
|
||||
}
|
||||
|
||||
@end
|
||||
Loading…
Reference in New Issue