timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update due to renaming in olm_account.cpp (maxOneTimeKeysJni() & generateOneTimeKeysJni())

Browse source 
Fix removeOneTimeKeysForSession() default return code
This commit is contained in:
pedroGitt 2016-10-25 18:16:19 +02:00
parent a6401c72e6
commit eb2052ba05
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
View file

@ -282,7 +282,10 @@ public class OlmAccount implements Serializable {
* Return the largest number of "one time keys" this account can store. * Return the largest number of "one time keys" this account can store.
* @return the max number of "one time keys", -1 otherwise * @return the max number of "one time keys", -1 otherwise
*/ */
public native long maxOneTimeKeys(); public long maxOneTimeKeys() {
return maxOneTimeKeysJni();
}
private native long maxOneTimeKeysJni();
/** /**
* Generate a number of new one time keys.<br> If total number of keys stored * Generate a number of new one time keys.<br> If total number of keys stored
@ -291,7 +294,10 @@ public class OlmAccount implements Serializable {
* @param aNumberOfKeys number of keys to generate * @param aNumberOfKeys number of keys to generate
* @return 0 if operation succeed, -1 otherwise * @return 0 if operation succeed, -1 otherwise
*/ */
public native int generateOneTimeKeys(int aNumberOfKeys); public int generateOneTimeKeys(int aNumberOfKeys) {
return generateOneTimeKeysJni(aNumberOfKeys);
}
private native int generateOneTimeKeysJni(int aNumberOfKeys);
/** /**
* Return the "one time keys" in a JSON array.<br> * Return the "one time keys" in a JSON array.<br>
@ -341,7 +347,7 @@ public class OlmAccount implements Serializable {
* @return 0 if operation succeed, 1 if no matching keys in the sessions to be removed, -1 if operation failed * @return 0 if operation succeed, 1 if no matching keys in the sessions to be removed, -1 if operation failed
*/ */
public int removeOneTimeKeysForSession(OlmSession aSession) { public int removeOneTimeKeysForSession(OlmSession aSession) {
int retCode = 0; int retCode = -1;
if(null != aSession) { if(null != aSession) {
retCode = removeOneTimeKeysForSessionJni(aSession.getOlmSessionId()); retCode = removeOneTimeKeysForSessionJni(aSession.getOlmSessionId());