Apply ReadContext

Author: michaelkirk

AxolotlKit/Classes/SessionCipher.h

@@ -36,9 +36,11 @@ NS_ASSUME_NONNULL_BEGIN
              protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext
                        error:(NSError **)outError;
 
-- (int)throws_remoteRegistrationId:(nullable id<SPKProtocolWriteContext>)protocolContext NS_SWIFT_UNAVAILABLE("throws objc exceptions");
+- (int)throws_remoteRegistrationId:(nullable id<SPKProtocolReadContext>)protocolContext
+    NS_SWIFT_UNAVAILABLE("throws objc exceptions");
 
-- (int)throws_sessionVersion:(nullable id<SPKProtocolWriteContext>)protocolContext NS_SWIFT_UNAVAILABLE("throws objc exceptions");
+- (int)throws_sessionVersion:(nullable id<SPKProtocolReadContext>)protocolContext
+    NS_SWIFT_UNAVAILABLE("throws objc exceptions");
 
 @end
 

AxolotlKit/Classes/SessionCipher.m

@@ -484,7 +484,7 @@ + (NSData*)currentProtocolVersion{
     return versionByte;
 }
 
-- (int)throws_remoteRegistrationId:(nullable id<SPKProtocolWriteContext>)protocolContext
+- (int)throws_remoteRegistrationId:(nullable id<SPKProtocolReadContext>)protocolContext
 {
     SessionRecord *_Nullable record =
         [self.sessionStore loadSession:self.recipientId deviceId:_deviceId protocolContext:protocolContext];
@@ -496,7 +496,7 @@ - (int)throws_remoteRegistrationId:(nullable id<SPKProtocolWriteContext>)protoco
     return record.sessionState.remoteRegistrationId;
 }
 
-- (int)throws_sessionVersion:(nullable id<SPKProtocolWriteContext>)protocolContext
+- (int)throws_sessionVersion:(nullable id<SPKProtocolReadContext>)protocolContext
 {
     SessionRecord *_Nullable record =
         [self.sessionStore loadSession:self.recipientId deviceId:_deviceId protocolContext:protocolContext];

AxolotlKit/Classes/State/IdentityKeyStore.h

@@ -47,11 +47,12 @@ typedef NS_ENUM(NSInteger, TSMessageDirection) {
 - (BOOL)isTrustedIdentityKey:(NSData *)identityKey
                  recipientId:(NSString *)recipientId
                    direction:(TSMessageDirection)direction
-             protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext;
+             protocolContext:(nullable id<SPKProtocolReadContext>)protocolContext;
 
 - (nullable NSData *)identityKeyForRecipientId:(NSString *)recipientId;
 
-- (nullable NSData *)identityKeyForRecipientId:(NSString *)recipientId protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext;
+- (nullable NSData *)identityKeyForRecipientId:(NSString *)recipientId
+                               protocolContext:(nullable id<SPKProtocolReadContext>)protocolContext;
 
 @end
 

AxolotlKit/Classes/State/SessionStore.h

@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (SessionRecord *)loadSession:(NSString *)contactIdentifier
                       deviceId:(int)deviceId
-               protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext;
+               protocolContext:(nullable id<SPKProtocolReadContext>)protocolContext;
 
 - (NSArray *)subDevicesSessions:(NSString *)contactIdentifier protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext __attribute__((deprecated));
 
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)containsSession:(NSString *)contactIdentifier
                deviceId:(int)deviceId
-        protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext;
+        protocolContext:(nullable id<SPKProtocolReadContext>)protocolContext;
 
 - (void)deleteSessionForContact:(NSString *)contactIdentifier
                        deviceId:(int)deviceId

AxolotlKit/Classes/TestUtils/SPKMockProtocolStore.m

@@ -179,7 +179,8 @@ - (nullable NSData *)identityKeyForRecipientId:(NSString *)recipientId
     return [self identityKeyForRecipientId:recipientId protocolContext:nil];
 }
 
-- (nullable NSData *)identityKeyForRecipientId:(NSString *)recipientId protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext
+- (nullable NSData *)identityKeyForRecipientId:(NSString *)recipientId
+                               protocolContext:(nullable id<SPKProtocolReadContext>)protocolContext
 {
     NSData *_Nullable data = [self.trustedKeys objectForKey:recipientId];
     return data;
@@ -201,10 +202,13 @@ - (SessionRecord *)loadSession:(NSString *)contactIdentifier
     return sessionRecord;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (NSArray *)subDevicesSessions:(NSString *)contactIdentifier protocolContext:(nullable id<SPKProtocolWriteContext>)protocolContext
 {
     return [[self deviceSessionRecordsForContactIdentifier:contactIdentifier] allKeys];
 }
+#pragma clang diagnostic pop
 
 - (NSMutableDictionary *)deviceSessionRecordsForContactIdentifier:(NSString *)contactIdentifier
 {

AxolotlKit/Classes/Utility/SPKProtocolContext.h

@@ -6,7 +6,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@protocol SPKProtocolWriteContext <NSObject>
+@protocol SPKProtocolReadContext <NSObject>
+
+@end
+
+@protocol SPKProtocolWriteContext <SPKProtocolReadContext>
 
 @end