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
e17eb690
Commit
e17eb690
authored
Dec 21, 2016
by
ylecollen
Browse files
create a dedicated file for olm_manager.
parent
e6d634f9
Changes
5
Hide whitespace changes
Inline
Side-by-side
java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
View file @
e17eb690
...
...
@@ -50,7 +50,8 @@ olm_session.cpp \
olm_jni_helper.cpp
\
olm_inbound_group_session.cpp
\
olm_outbound_group_session.cpp
\
olm_utility.cpp
olm_utility.cpp
\
olm_manager.cpp
LOCAL_LDLIBS
:=
-llog
...
...
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp
0 → 100644
View file @
e17eb690
/*
* Copyright 2016 OpenMarket Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "olm_manager.h"
using
namespace
AndroidOlmSdk
;
JNIEXPORT
jstring
OLM_MANAGER_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_manager.h
0 → 100644
View file @
e17eb690
/*
* Copyright 2016 OpenMarket Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _OMLMANAGER_H
#define _OMLMANAGER_H
#include "olm_jni.h"
#include "olm/olm.h"
#define OLM_MANAGER_FUNC_DEF(func_name) FUNC_DEF(OlmManager,func_name)
#ifdef __cplusplus
extern
"C"
{
#endif
JNIEXPORT
jstring
OLM_MANAGER_FUNC_DEF
(
getOlmLibVersionJni
)(
JNIEnv
*
env
,
jobject
thiz
);
#ifdef __cplusplus
}
#endif
#endif
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp
View file @
e17eb690
...
...
@@ -230,19 +230,4 @@ 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 @
e17eb690
...
...
@@ -30,7 +30,6 @@ JNIEXPORT jlong OLM_UTILITY_FUNC_DEF(initUtilityJni)(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