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/OLMMessage.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 xcode/OLMKit/OLMMessage.h

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

diff --git a/xcode/OLMKit/OLMMessage.h b/xcode/OLMKit/OLMMessage.h
new file mode 100644
index 0000000..2b747fb
--- /dev/null
+++ b/xcode/OLMKit/OLMMessage.h
@@ -0,0 +1,24 @@
+//
+//  OLMMessage.h
+//  olm
+//
+//  Created by Chris Ballinger on 4/8/16.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSUInteger, OLMMessageType) {
+    OLMMessageTypeUnknown,
+    OLMMessageTypePreKey,
+    OLMMessageTypeMessage
+};
+
+@interface OLMMessage : NSObject
+
+@property (nonatomic, readonly, nonnull) NSString *message;
+@property (readonly) OLMMessageType type;
+
+- (nonnull instancetype) initWithMessage:(nonnull NSString*)message type:(OLMMessageType)type;
+
+@end
-- 
cgit v1.2.3


From f505113fb7a6d61015ad8050b3fb4e26df029150 Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Sat, 9 Apr 2016 14:00:30 -0700
Subject: Initial test passing

---
 xcode/OLMKit/OLMMessage.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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

diff --git a/xcode/OLMKit/OLMMessage.h b/xcode/OLMKit/OLMMessage.h
index 2b747fb..97c748f 100644
--- a/xcode/OLMKit/OLMMessage.h
+++ b/xcode/OLMKit/OLMMessage.h
@@ -8,17 +8,21 @@
 
 #import <Foundation/Foundation.h>
 
-typedef NS_ENUM(NSUInteger, OLMMessageType) {
-    OLMMessageTypeUnknown,
-    OLMMessageTypePreKey,
-    OLMMessageTypeMessage
+/*
+ from olm.hh
+ static const size_t OLM_MESSAGE_TYPE_PRE_KEY = 0;
+ static const size_t OLM_MESSAGE_TYPE_MESSAGE = 1;
+ */
+typedef NS_ENUM(NSInteger, OLMMessageType) {
+    OLMMessageTypePreKey = 0,
+    OLMMessageTypeMessage = 1
 };
 
 @interface OLMMessage : NSObject
 
-@property (nonatomic, readonly, nonnull) NSString *message;
+@property (nonatomic, copy, readonly, nonnull) NSString *ciphertext;
 @property (readonly) OLMMessageType type;
 
-- (nonnull instancetype) initWithMessage:(nonnull NSString*)message type:(OLMMessageType)type;
+- (nullable instancetype) initWithCiphertext:(nonnull NSString*)ciphertext type:(OLMMessageType)type;
 
 @end
-- 
cgit v1.2.3