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
b6cf3f1e
Commit
b6cf3f1e
authored
8 years ago
by
pedroGitt
Browse files
Options
Downloads
Patches
Plain Diff
Update Javadoc method headers with direct link to PRE_KEY definition
parent
4545b7bc
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
+4
-4
4 additions, 4 deletions
...bSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
with
4 additions
and
4 deletions
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
+
4
−
4
View file @
b6cf3f1e
...
...
@@ -124,7 +124,7 @@ public class OlmSession implements Serializable {
/**
* Create a new in-bound session for sending/receiving messages from an
* incoming PRE_KEY message.<br>
* incoming PRE_KEY
({@link OlmMessage#MESSAGE_TYPE_PRE_KEY})
message.<br>
* Public API for {@link #initInboundSessionJni(long, String)}.
* This API may be used to process a "m.room.encrypted" event when type = 1 (PRE_KEY).
* @param aAccount the account to associate with this session
...
...
@@ -153,7 +153,7 @@ public class OlmSession implements Serializable {
/**
* Create a new in-bound session for sending/receiving messages from an
* incoming PRE_KEY message based on the sender identity key.<br>
* incoming PRE_KEY
({@link OlmMessage#MESSAGE_TYPE_PRE_KEY})
message based on the sender identity key.<br>
* Public API for {@link #initInboundSessionFromIdKeyJni(long, String, String)}.
* This API may be used to process a "m.room.encrypted" event when type = 1 (PRE_KEY).
* @param aAccount the account to associate with this session
...
...
@@ -195,7 +195,7 @@ public class OlmSession implements Serializable {
private
native
String
getSessionIdentifierJni
();
/**
* Checks if the PRE_KEY message is for this in-bound session.<br>
* Checks if the PRE_KEY
({@link OlmMessage#MESSAGE_TYPE_PRE_KEY})
message is for this in-bound session.<br>
* This API may be used to process a "m.room.encrypted" event when type = 1 (PRE_KEY).
* Public API for {@link #matchesInboundSessionJni(String)}.
* @param aOneTimeKeyMsg PRE KEY message
...
...
@@ -215,7 +215,7 @@ public class OlmSession implements Serializable {
/**
* Checks if the PRE_KEY message is for this in-bound session based on the sender identity key.<br>
* Checks if the PRE_KEY
({@link OlmMessage#MESSAGE_TYPE_PRE_KEY})
message is for this in-bound session based on the sender identity key.<br>
* This API may be used to process a "m.room.encrypted" event when type = 1 (PRE_KEY).
* Public API for {@link #matchesInboundSessionJni(String)}.
* @param aTheirIdentityKey the sender identity key
...
...
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