diff options
| author | manuroe <manu@matrix.org> | 2018-06-25 17:57:51 +0200 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2018-06-27 12:26:01 -0400 |
| commit | 2e84f7552a47429cb5288f7d1e1c96ba9140df0f (patch) | |
| tree | 77e33103a016ea2b5730c871e90850d6f9a3578d | |
| parent | 9d81046f90b4afba7e71b86c564cae07daab61ad (diff) | |
Fix obj-c warnings
| -rw-r--r-- | OLMKit.podspec | 2 | ||||
| -rw-r--r-- | xcode/OLMKit/OLMInboundGroupSession.m | 2 | ||||
| -rw-r--r-- | xcode/OLMKit/OLMUtility.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OLMKit.podspec b/OLMKit.podspec index 9cac8d0..cf05845 100644 --- a/OLMKit.podspec +++ b/OLMKit.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.authors = { "Chris Ballinger" => "chrisballinger@gmail.com", "matrix.org" => "support@matrix.org" } - s.ios.deployment_target = "5.0" + s.ios.deployment_target = "6.0" s.osx.deployment_target = "10.9" # Expose the Objective-C wrapper API of libolm diff --git a/xcode/OLMKit/OLMInboundGroupSession.m b/xcode/OLMKit/OLMInboundGroupSession.m index 06c6e33..68750ec 100644 --- a/xcode/OLMKit/OLMInboundGroupSession.m +++ b/xcode/OLMKit/OLMInboundGroupSession.m @@ -194,7 +194,7 @@ { size_t length = olm_export_inbound_group_session_length(session); NSMutableData *key = [NSMutableData dataWithLength:length]; - size_t result = olm_export_inbound_group_session(session, key.mutableBytes, key.length, messageIndex); + size_t result = olm_export_inbound_group_session(session, key.mutableBytes, key.length, (uint32_t)messageIndex); if (result == olm_error()) { const char *olm_error = olm_inbound_group_session_last_error(session); NSString *errorString = [NSString stringWithUTF8String:olm_error]; diff --git a/xcode/OLMKit/OLMUtility.h b/xcode/OLMKit/OLMUtility.h index 22e9724..3041da9 100644 --- a/xcode/OLMKit/OLMUtility.h +++ b/xcode/OLMKit/OLMUtility.h @@ -36,7 +36,7 @@ FOUNDATION_EXPORT NSString *const OLMErrorDomain; @param signature the base64-encoded signature to be checked. @param key the ed25519 key. @param message the message which was signed. - @param the result error if there is a problem with the verification. + @param error if there is a problem with the verification. If the key was too small then the message will be "OLM.INVALID_BASE64". If the signature was invalid then the message will be "OLM.BAD_MESSAGE_MAC". |