Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
b3c20156
Commit
b3c20156
authored
Nov 23, 2016
by
pedroGitt
Browse files
Rename JNI API: getOlmLibVersion() => getOlmLibVersionJni()
parent
e63be977
Changes
3
Hide whitespace changes
Inline
Side-by-side
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
View file @
b3c20156
...
...
@@ -56,6 +56,9 @@ public class OlmManager {
* Get the OLM lib version.
* @return the lib version as a string
*/
public
native
String
getOlmLibVersion
();
public
String
getOlmLibVersion
(){
return
getOlmLibVersionJni
();
}
public
native
String
getOlmLibVersionJni
();
}
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
View file @
b3c20156
...
...
@@ -465,14 +465,14 @@ JNIEXPORT jstring OLM_ACCOUNT_FUNC_DEF(signMessageJni)(JNIEnv *env, jobject thiz
}
JNIEXPORT
jstring
OLM_MANAGER_FUNC_DEF
(
getOlmLibVersion
)(
JNIEnv
*
env
,
jobject
thiz
)
JNIEXPORT
jstring
OLM_MANAGER_FUNC_DEF
(
getOlmLibVersion
Jni
)(
JNIEnv
*
env
,
jobject
thiz
)
{
uint8_t
majorVer
=
0
,
minorVer
=
0
,
patchVer
=
0
;
jstring
returnValueStr
=
0
;
char
buff
[
150
];
olm_get_library_version
(
&
majorVer
,
&
minorVer
,
&
patchVer
);
LOGD
(
"## getOlmLibVersion(): Major=%d Minor=%d Patch=%d"
,
majorVer
,
minorVer
,
patchVer
);
LOGD
(
"## getOlmLibVersion
Jni
(): Major=%d Minor=%d Patch=%d"
,
majorVer
,
minorVer
,
patchVer
);
snprintf
(
buff
,
sizeof
(
buff
),
" V%d.%d.%d"
,
majorVer
,
minorVer
,
patchVer
);
returnValueStr
=
env
->
NewStringUTF
((
const
char
*
)
buff
);
...
...
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
View file @
b3c20156
...
...
@@ -27,7 +27,7 @@
extern
"C"
{
#endif
JNIEXPORT
jstring
OLM_MANAGER_FUNC_DEF
(
getOlmLibVersion
)(
JNIEnv
*
env
,
jobject
thiz
);
JNIEXPORT
jstring
OLM_MANAGER_FUNC_DEF
(
getOlmLibVersion
Jni
)(
JNIEnv
*
env
,
jobject
thiz
);
// account creation/destruction
JNIEXPORT
void
OLM_ACCOUNT_FUNC_DEF
(
releaseAccountJni
)(
JNIEnv
*
env
,
jobject
thiz
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment