Skip to content

Commit 0acacd2

Browse files
AxolotlStore needs to be defined in SessionBuilder.
1 parent ffc922b commit 0acacd2

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

AxolotlKit.podspec

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
Pod::Spec.new do |s|
2-
s.name = "AxolotlKit"
3-
s.version = "0.7"
4-
s.summary = "AxolotlKit is a Free implementation of the Axolotl protocol in Objective-C"
5-
s.homepage = "https://github.com/WhisperSystems/AxolotlKit"
6-
s.license = "GPLv2"
7-
s.license = { :type => "GPLv2", :file => "LICENSE" }
8-
s.author = { "Frederic Jacobs" => "github@fredericjacobs.com" }
9-
s.social_media_url = "http://twitter.com/FredericJacobs"
10-
s.source = { :git => "https://github.com/WhisperSystems/AxolotlKit.git", :tag => "#{s.version}" }
11-
s.source_files = "AxolotlKit/Classes/*.{h,m}", "AxolotlKit/Classes/**/*.{h,m}"
12-
s.public_header_files = "AxolotlKit/Classes/*.{h}", "AxolotlKit/Classes/**/*.{h}"
2+
s.name = "AxolotlKit"
3+
s.version = "0.8"
4+
s.summary = "AxolotlKit is a Free implementation of the Axolotl protocol in Objective-C"
5+
s.homepage = "https://github.com/WhisperSystems/AxolotlKit"
6+
s.license = "GPLv2"
7+
s.license = { :type => "GPLv2", :file => "LICENSE" }
8+
s.author = { "Frederic Jacobs" => "github@fredericjacobs.com" }
9+
s.social_media_url = "http://twitter.com/FredericJacobs"
10+
s.source = { :git => "https://github.com/WhisperSystems/AxolotlKit.git", :tag => "#{s.version}" }
11+
s.source_files = "AxolotlKit/Classes/*.{h,m}", "AxolotlKit/Classes/**/*.{h,m}"
12+
s.public_header_files = "AxolotlKit/Classes/*.{h}", "AxolotlKit/Classes/**/*.{h}"
1313
s.ios.deployment_target = "6.0"
1414
s.osx.deployment_target = "10.8"
15-
s.requires_arc = true
16-
s.dependency '25519', '~> 2.0.1'
17-
s.dependency 'HKDFKit', '~> 0.0.3'
18-
s.dependency 'ProtocolBuffers', '~> 1.9.8'
15+
s.requires_arc = true
16+
s.dependency '25519', '~> 2.0.1'
17+
s.dependency 'HKDFKit', '~> 0.0.3'
18+
s.dependency 'ProtocolBuffers', '~> 1.9.8'
1919
end

AxolotlKit/Classes/Sessions/SessionBuilder.h

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,31 @@
66
// Copyright (c) 2014 Frederic Jacobs. All rights reserved.
77
//
88

9-
#import <Foundation/Foundation.h>
9+
#import "AxolotlStore.h"
1010
#import "IdentityKeyStore.h"
11+
#import "PreKeyBundle.h"
12+
#import "PreKeyStore.h"
1113
#import "SessionStore.h"
1214
#import "SignedPreKeyStore.h"
13-
#import "PreKeyStore.h"
14-
#import "PreKeyBundle.h"
15+
#import <Foundation/Foundation.h>
1516

1617
@class PreKeyWhisperMessage;
1718

1819
@interface SessionBuilder : NSObject
1920

20-
- (instancetype)initWithAxolotlStore:(id<AxolotlStore>)sessionStore recipientId:(NSString*)recipientId deviceId:(int)deviceId;
21+
- (instancetype)initWithAxolotlStore:(id<AxolotlStore>)sessionStore
22+
recipientId:(NSString *)recipientId
23+
deviceId:(int)deviceId;
2124

2225
- (instancetype)initWithSessionStore:(id<SessionStore>)sessionStore
2326
preKeyStore:(id<PreKeyStore>)preKeyStore
2427
signedPreKeyStore:(id<SignedPreKeyStore>)signedPreKeyStore
2528
identityKeyStore:(id<IdentityKeyStore>)identityKeyStore
26-
recipientId:(NSString*)recipientId
29+
recipientId:(NSString *)recipientId
2730
deviceId:(int)deviceId;
2831

29-
- (void)processPrekeyBundle:(PreKeyBundle*)preKeyBundle;
30-
- (int)processPrekeyWhisperMessage:(PreKeyWhisperMessage*)message withSession:(SessionRecord*)sessionRecord;
32+
- (void)processPrekeyBundle:(PreKeyBundle *)preKeyBundle;
33+
- (int)processPrekeyWhisperMessage:(PreKeyWhisperMessage *)message
34+
withSession:(SessionRecord *)sessionRecord;
3135

3236
@end

0 commit comments

Comments
 (0)