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
e6d634f9
Commit
e6d634f9
authored
Dec 21, 2016
by
ylecollen
Browse files
move getOlmLibVersionJni to the bottom
parent
2e77e395
Changes
2
Hide whitespace changes
Inline
Side-by-side
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp
View file @
e6d634f9
...
...
@@ -36,21 +36,6 @@ OlmUtility* initializeUtilityMemory()
return
utilityPtr
;
}
JNIEXPORT
jstring
OLM_UTILITY_FUNC_DEF
(
getOlmLibVersionJni
)(
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
(
"## getOlmLibVersionJni(): Major=%d Minor=%d Patch=%d"
,
majorVer
,
minorVer
,
patchVer
);
snprintf
(
buff
,
sizeof
(
buff
),
"%d.%d.%d"
,
majorVer
,
minorVer
,
patchVer
);
returnValueStr
=
env
->
NewStringUTF
((
const
char
*
)
buff
);
return
returnValueStr
;
}
JNIEXPORT
jlong
OLM_UTILITY_FUNC_DEF
(
initUtilityJni
)(
JNIEnv
*
env
,
jobject
thiz
)
{
OlmUtility
*
utilityPtr
=
NULL
;
...
...
@@ -245,4 +230,19 @@ JNIEXPORT jstring OLM_UTILITY_FUNC_DEF(sha256Jni)(JNIEnv *env, jobject thiz, jst
}
return
sha256RetValue
;
}
JNIEXPORT
jstring
OLM_UTILITY_FUNC_DEF
(
getOlmLibVersionJni
)(
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
(
"## getOlmLibVersionJni(): Major=%d Minor=%d Patch=%d"
,
majorVer
,
minorVer
,
patchVer
);
snprintf
(
buff
,
sizeof
(
buff
),
"%d.%d.%d"
,
majorVer
,
minorVer
,
patchVer
);
returnValueStr
=
env
->
NewStringUTF
((
const
char
*
)
buff
);
return
returnValueStr
;
}
\ No newline at end of file
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h
View file @
e6d634f9
...
...
@@ -27,13 +27,10 @@
extern
"C"
{
#endif
JNIEXPORT
jlong
OLM_UTILITY_FUNC_DEF
(
initUtilityJni
)(
JNIEnv
*
env
,
jobject
thiz
);
JNIEXPORT
jstring
OLM_UTILITY_FUNC_DEF
(
getOlmLibVersionJni
)(
JNIEnv
*
env
,
jobject
thiz
);
JNIEXPORT
void
OLM_UTILITY_FUNC_DEF
(
releaseUtilityJni
)(
JNIEnv
*
env
,
jobject
thiz
);
JNIEXPORT
jstring
OLM_UTILITY_FUNC_DEF
(
verifyEd25519SignatureJni
)(
JNIEnv
*
env
,
jobject
thiz
,
jstring
aSignature
,
jstring
aKey
,
jstring
aMessage
);
JNIEXPORT
jstring
OLM_UTILITY_FUNC_DEF
(
sha256Jni
)(
JNIEnv
*
env
,
jobject
thiz
,
jstring
aMessageToHash
);
JNIEXPORT
jstring
OLM_UTILITY_FUNC_DEF
(
getOlmLibVersionJni
)(
JNIEnv
*
env
,
jobject
thiz
);
#ifdef __cplusplus
}
#endif
...
...
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