mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

OLMKit: Fixed warnings in objc wrapper

release-v2.1.0
manuroe 2016-11-18 11:39:39 +01:00
parent 29de7825c9
commit 93926e9047
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xcode/OLMKit/OLMAccount.m
View File

@ -74,7 +74,7 @@
return self;
}
- (size_t) maxOneTimeKeys {
- (NSUInteger) maxOneTimeKeys {
return olm_account_max_number_of_one_time_keys(_account);
}
@ -156,7 +156,7 @@
- (BOOL) removeOneTimeKeysForSession:(OLMSession *)session {
NSParameterAssert(session != nil);
if (!session) {
return nil;
return NO;
}
size_t result = olm_remove_one_time_keys(self.account, session.session);
if (result == olm_error()) {

8
xcode/OLMKit/OLMSession.m
View File

@ -167,9 +167,9 @@
}
- (BOOL)matchesInboundSession:(NSString *)oneTimeKeyMessage {
NSData *otk = [oneTimeKeyMessage dataUsingEncoding:NSUTF8StringEncoding];
NSMutableData *otk = [NSMutableData dataWithData:[oneTimeKeyMessage dataUsingEncoding:NSUTF8StringEncoding]];
size_t result = olm_matches_inbound_session(_session, otk.bytes, otk.length);
size_t result = olm_matches_inbound_session(_session, otk.mutableBytes, otk.length);
if (result == 1) {
return YES;
}
@ -184,11 +184,11 @@
- (BOOL)matchesInboundSessionFrom:(NSString *)theirIdentityKey oneTimeKeyMessage:(NSString *)oneTimeKeyMessage {
NSData *idKey = [theirIdentityKey dataUsingEncoding:NSUTF8StringEncoding];
NSData *otk = [oneTimeKeyMessage dataUsingEncoding:NSUTF8StringEncoding];
NSMutableData *otk = [NSMutableData dataWithData:[oneTimeKeyMessage dataUsingEncoding:NSUTF8StringEncoding]];
size_t result = olm_matches_inbound_session_from(_session,
idKey.bytes, idKey.length,
otk.bytes, otk.length);
otk.mutableBytes, otk.length);
if (result == 1) {
return YES;
}