Adding remoteRegistrationId interface on SessionCipher objects.

signalapp · Feb 15, 2015 · 7122ea0 · 7122ea0
1 parent fc2b2f9
commit 7122ea0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/AxolotlKit.podspec b/AxolotlKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "AxolotlKit"
-  s.version      = "0.6"
+  s.version      = "0.6.1"
   s.summary      = "AxolotlKit is a Free implementation of the Axolotl protocol in Objective-C"
   s.homepage     = "https://github.com/WhisperSystems/AxolotlKit"
   s.license      = "GPLv2"

diff --git a/AxolotlKit/Classes/SessionCipher.h b/AxolotlKit/Classes/SessionCipher.h
@@ -27,4 +27,7 @@
 
 - (NSData*)decrypt:(id<CipherMessage>)whisperMessage;
 
+- (int)remoteRegistrationId;
+- (int)sessionVersion;
+
 @end
diff --git a/AxolotlKit/Classes/SessionCipher.m b/AxolotlKit/Classes/SessionCipher.m
@@ -267,4 +267,24 @@ + (NSData*)currentProtocolVersion{
 }
 
 
+- (int)remoteRegistrationId{
+    SessionRecord *record = [self.sessionStore loadSession:self.recipientId deviceId:_deviceId];
+
+    if (!record) {
+        @throw [NSException exceptionWithName:NoSessionException reason:@"Trying to get registration Id of a non-existing session." userInfo:nil];
+    }
+
+    return record.sessionState.remoteRegistrationId;
+}
+
+- (int)sessionVersion{
+    SessionRecord *record = [self.sessionStore loadSession:self.recipientId deviceId:_deviceId];
+
+    if (!record) {
+        @throw [NSException exceptionWithName:NoSessionException reason:@"Trying to get the version of a non-existing session." userInfo:nil];
+    }
+
+    return record.sessionState.version;
+}
+
 @end