From 0acacd20124cb8d0f84be3214b4517f1634a8076 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Sat, 5 Dec 2015 22:32:32 +0100 Subject: [PATCH] AxolotlStore needs to be defined in SessionBuilder. --- AxolotlKit.podspec | 30 ++++++++++---------- AxolotlKit/Classes/Sessions/SessionBuilder.h | 18 +++++++----- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/AxolotlKit.podspec b/AxolotlKit.podspec index 6cc19f6..50e520f 100644 --- a/AxolotlKit.podspec +++ b/AxolotlKit.podspec @@ -1,19 +1,19 @@ Pod::Spec.new do |s| - s.name = "AxolotlKit" - s.version = "0.7" - s.summary = "AxolotlKit is a Free implementation of the Axolotl protocol in Objective-C" - s.homepage = "https://github.com/WhisperSystems/AxolotlKit" - s.license = "GPLv2" - s.license = { :type => "GPLv2", :file => "LICENSE" } - s.author = { "Frederic Jacobs" => "github@fredericjacobs.com" } - s.social_media_url = "http://twitter.com/FredericJacobs" - s.source = { :git => "https://github.com/WhisperSystems/AxolotlKit.git", :tag => "#{s.version}" } - s.source_files = "AxolotlKit/Classes/*.{h,m}", "AxolotlKit/Classes/**/*.{h,m}" - s.public_header_files = "AxolotlKit/Classes/*.{h}", "AxolotlKit/Classes/**/*.{h}" + s.name = "AxolotlKit" + s.version = "0.8" + s.summary = "AxolotlKit is a Free implementation of the Axolotl protocol in Objective-C" + s.homepage = "https://github.com/WhisperSystems/AxolotlKit" + s.license = "GPLv2" + s.license = { :type => "GPLv2", :file => "LICENSE" } + s.author = { "Frederic Jacobs" => "github@fredericjacobs.com" } + s.social_media_url = "http://twitter.com/FredericJacobs" + s.source = { :git => "https://github.com/WhisperSystems/AxolotlKit.git", :tag => "#{s.version}" } + s.source_files = "AxolotlKit/Classes/*.{h,m}", "AxolotlKit/Classes/**/*.{h,m}" + s.public_header_files = "AxolotlKit/Classes/*.{h}", "AxolotlKit/Classes/**/*.{h}" s.ios.deployment_target = "6.0" s.osx.deployment_target = "10.8" - s.requires_arc = true - s.dependency '25519', '~> 2.0.1' - s.dependency 'HKDFKit', '~> 0.0.3' - s.dependency 'ProtocolBuffers', '~> 1.9.8' + s.requires_arc = true + s.dependency '25519', '~> 2.0.1' + s.dependency 'HKDFKit', '~> 0.0.3' + s.dependency 'ProtocolBuffers', '~> 1.9.8' end diff --git a/AxolotlKit/Classes/Sessions/SessionBuilder.h b/AxolotlKit/Classes/Sessions/SessionBuilder.h index 92977a9..eaada22 100644 --- a/AxolotlKit/Classes/Sessions/SessionBuilder.h +++ b/AxolotlKit/Classes/Sessions/SessionBuilder.h @@ -6,27 +6,31 @@ // Copyright (c) 2014 Frederic Jacobs. All rights reserved. // -#import +#import "AxolotlStore.h" #import "IdentityKeyStore.h" +#import "PreKeyBundle.h" +#import "PreKeyStore.h" #import "SessionStore.h" #import "SignedPreKeyStore.h" -#import "PreKeyStore.h" -#import "PreKeyBundle.h" +#import @class PreKeyWhisperMessage; @interface SessionBuilder : NSObject -- (instancetype)initWithAxolotlStore:(id)sessionStore recipientId:(NSString*)recipientId deviceId:(int)deviceId; +- (instancetype)initWithAxolotlStore:(id)sessionStore + recipientId:(NSString *)recipientId + deviceId:(int)deviceId; - (instancetype)initWithSessionStore:(id)sessionStore preKeyStore:(id)preKeyStore signedPreKeyStore:(id)signedPreKeyStore identityKeyStore:(id)identityKeyStore - recipientId:(NSString*)recipientId + recipientId:(NSString *)recipientId deviceId:(int)deviceId; -- (void)processPrekeyBundle:(PreKeyBundle*)preKeyBundle; -- (int)processPrekeyWhisperMessage:(PreKeyWhisperMessage*)message withSession:(SessionRecord*)sessionRecord; +- (void)processPrekeyBundle:(PreKeyBundle *)preKeyBundle; +- (int)processPrekeyWhisperMessage:(PreKeyWhisperMessage *)message + withSession:(SessionRecord *)sessionRecord; @end