From 719eb543a8d08c4f536ea7933ffb3af0a8553e87 Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Fri, 8 Apr 2016 17:24:41 -0700
Subject: Xcode, podspec, wrapper

---
 xcode/OLMKit/OLMSerializable.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 xcode/OLMKit/OLMSerializable.h

(limited to 'xcode/OLMKit/OLMSerializable.h')

diff --git a/xcode/OLMKit/OLMSerializable.h b/xcode/OLMKit/OLMSerializable.h
new file mode 100644
index 0000000..afacdaa
--- /dev/null
+++ b/xcode/OLMKit/OLMSerializable.h
@@ -0,0 +1,19 @@
+//
+//  OLMSerializable.h
+//  olm
+//
+//  Created by Chris Ballinger on 4/8/16.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol OLMSerializable <NSObject>
+
+/** Initializes from encrypted serialized data. Will throw error if invalid key or invalid base64. */
+- (instancetype) initWithSerializedData:(NSData*)serializedData key:(NSData*)key error:(NSError**)error;
+
+/** Serializes and encrypts object data */
+- (NSData*) serializeDataWithKey:(NSData*)key;
+
+@end
-- 
cgit v1.2.3


From daab2a58af947cddd67fe9f30dd3a9fc327650c0 Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Wed, 13 Apr 2016 16:53:47 -0700
Subject: OLMAccount and OLMSession serialization

---
 xcode/OLMKit/OLMSerializable.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'xcode/OLMKit/OLMSerializable.h')

diff --git a/xcode/OLMKit/OLMSerializable.h b/xcode/OLMKit/OLMSerializable.h
index afacdaa..b4b115a 100644
--- a/xcode/OLMKit/OLMSerializable.h
+++ b/xcode/OLMKit/OLMSerializable.h
@@ -11,9 +11,9 @@
 @protocol OLMSerializable <NSObject>
 
 /** Initializes from encrypted serialized data. Will throw error if invalid key or invalid base64. */
-- (instancetype) initWithSerializedData:(NSData*)serializedData key:(NSData*)key error:(NSError**)error;
+- (instancetype) initWithSerializedData:(NSString*)serializedData key:(NSData*)key error:(NSError**)error;
 
-/** Serializes and encrypts object data */
-- (NSData*) serializeDataWithKey:(NSData*)key;
+/** Serializes and encrypts object data, outputs base64 blob */
+- (NSString*) serializeDataWithKey:(NSData*)key error:(NSError**)error;
 
 @end
-- 
cgit v1.2.3