Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Olm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
Olm
Commits
93926e90
Commit
93926e90
authored
8 years ago
by
manuroe
Browse files
Options
Downloads
Patches
Plain Diff
OLMKit: Fixed warnings in objc wrapper
parent
29de7825
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
xcode/OLMKit/OLMAccount.m
+2
-2
2 additions, 2 deletions
xcode/OLMKit/OLMAccount.m
xcode/OLMKit/OLMSession.m
+4
-4
4 additions, 4 deletions
xcode/OLMKit/OLMSession.m
with
6 additions
and
6 deletions
xcode/OLMKit/OLMAccount.m
+
2
−
2
View file @
93926e90
...
...
@@ -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
())
{
...
...
This diff is collapsed.
Click to expand it.
xcode/OLMKit/OLMSession.m
+
4
−
4
View file @
93926e90
...
...
@@ -167,9 +167,9 @@
}
-
(
BOOL
)
matchesInboundSession
:(
NSString
*
)
oneTimeKeyMessage
{
NSData
*
otk
=
[
oneTimeKeyMessage
dataUsingEncoding
:
NSUTF8StringEncoding
];
NS
Mutable
Data
*
otk
=
[
NSMutableData
dataWithData
:
[
oneTimeKeyMessage
dataUsingEncoding
:
NSUTF8StringEncoding
]
]
;
size_t
result
=
olm_matches_inbound_session
(
_session
,
otk
.
b
ytes
,
otk
.
length
);
size_t
result
=
olm_matches_inbound_session
(
_session
,
otk
.
mutableB
ytes
,
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
];
NS
Mutable
Data
*
otk
=
[
NSMutableData
dataWithData
:
[
oneTimeKeyMessage
dataUsingEncoding
:
NSUTF8StringEncoding
]
]
;
size_t
result
=
olm_matches_inbound_session_from
(
_session
,
idKey
.
bytes
,
idKey
.
length
,
otk
.
b
ytes
,
otk
.
length
);
otk
.
mutableB
ytes
,
otk
.
length
);
if
(
result
==
1
)
{
return
YES
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment