AxolotlStore needs to be defined in SessionBuilder.

signalapp · Dec 5, 2015 · 0acacd2 · 0acacd2
1 parent ffc922b
commit 0acacd2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git 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
@@ -6,27 +6,31 @@
 //  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#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 <Foundation/Foundation.h>
 
 @class PreKeyWhisperMessage;
 
 @interface SessionBuilder : NSObject
 
-- (instancetype)initWithAxolotlStore:(id<AxolotlStore>)sessionStore recipientId:(NSString*)recipientId deviceId:(int)deviceId;
+- (instancetype)initWithAxolotlStore:(id<AxolotlStore>)sessionStore
+                         recipientId:(NSString *)recipientId
+                            deviceId:(int)deviceId;
 
 - (instancetype)initWithSessionStore:(id<SessionStore>)sessionStore
                          preKeyStore:(id<PreKeyStore>)preKeyStore
                    signedPreKeyStore:(id<SignedPreKeyStore>)signedPreKeyStore
                     identityKeyStore:(id<IdentityKeyStore>)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