Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
5257d25c
Commit
5257d25c
authored
Sep 13, 2015
by
Simon Morlat
Browse files
removes reference to LinphoneChatRoom.destroy(), which should not be used from java code
parent
c6a712ea
Changes
3
Hide whitespace changes
Inline
Side-by-side
coreapi/linphonecore_jni.cc
View file @
5257d25c
...
...
@@ -1867,7 +1867,7 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_getOrCreateChatRoom(JNI
,
jstring
jto
)
{
const
char
*
to
=
env
->
GetStringUTFChars
(
jto
,
NULL
);
LinphoneChatRoom
*
lResult
=
linphone_core_get_
or_create_
chat_room
((
LinphoneCore
*
)
lc
,
to
);
LinphoneChatRoom
*
lResult
=
linphone_core_get_chat_room
_from_uri
((
LinphoneCore
*
)
lc
,
to
);
env
->
ReleaseStringUTFChars
(
jto
,
to
);
return
(
jlong
)
lResult
;
}
...
...
@@ -3086,11 +3086,6 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_markAsRead(JNIEnv*
linphone_chat_room_mark_as_read
((
LinphoneChatRoom
*
)
ptr
);
}
extern
"C"
void
Java_org_linphone_core_LinphoneChatRoomImpl_destroy
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
ptr
)
{
linphone_chat_room_destroy
((
LinphoneChatRoom
*
)
ptr
);
}
extern
"C"
jlong
Java_org_linphone_core_LinphoneChatRoomImpl_createFileTransferMessage
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
ptr
,
jstring
jname
,
jstring
jtype
,
jstring
jsubtype
,
jint
data_size
)
{
LinphoneContentPrivate
content
=
{
0
};
...
...
@@ -3389,7 +3384,7 @@ extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_unref(JNIEnv* en
extern
"C"
jlongArray
Java_org_linphone_core_LinphoneCoreImpl_getChatRooms
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
ptr
)
{
MSList
*
chats
=
linphone_core_get_chat_rooms
((
LinphoneCore
*
)
ptr
);
const
MSList
*
chats
=
linphone_core_get_chat_rooms
((
LinphoneCore
*
)
ptr
);
int
chatsSize
=
ms_list_size
(
chats
);
jlongArray
jChats
=
env
->
NewLongArray
(
chatsSize
);
jlong
*
jInternalArray
=
env
->
GetLongArrayElements
(
jChats
,
NULL
);
...
...
java/common/org/linphone/core/LinphoneChatRoom.java
View file @
5257d25c
...
...
@@ -76,11 +76,6 @@ public interface LinphoneChatRoom {
*/
LinphoneChatMessage
[]
getHistoryRange
(
int
begin
,
int
end
);
/**
* Destroys a LinphoneChatRoom.
*/
void
destroy
();
/**
* Returns the amount of unread messages associated with the peer of this chatRoom.
* @return the amount of unread messages
...
...
java/impl/org/linphone/core/LinphoneChatRoomImpl.java
View file @
5257d25c
...
...
@@ -91,10 +91,6 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
}
}
public
void
destroy
()
{
destroy
(
nativePtr
);
}
public
int
getUnreadMessagesCount
()
{
synchronized
(
getCore
()){
return
getUnreadMessagesCount
(
nativePtr
);
...
...
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