Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated linphone

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-25 11:20:58 +02:00
parent 621c8e1af7
commit 53886cd14e
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -46,11 +46,9 @@ import org.linphone.core.ChatMessage;
import org.linphone.core.ChatMessageListener; import org.linphone.core.ChatMessageListener;
import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoom;
import org.linphone.core.ChatRoomListener; import org.linphone.core.ChatRoomListener;
import org.linphone.core.ConferenceParticipantDeviceEvent;
import org.linphone.core.ConferenceParticipantEvent;
import org.linphone.core.ConferenceSubjectEvent;
import org.linphone.core.Content; import org.linphone.core.Content;
import org.linphone.core.Core; import org.linphone.core.Core;
import org.linphone.core.EventLog;
import org.linphone.core.Participant; import org.linphone.core.Participant;
import org.linphone.receivers.ContactsUpdatedListener; import org.linphone.receivers.ContactsUpdatedListener;
@ -497,22 +495,22 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
@Override @Override
public void onParticipantAdminStatusChanged(ChatRoom cr, ConferenceParticipantEvent event) { public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
} }
@Override @Override
public void onParticipantDeviceRemoved(ChatRoom cr, ConferenceParticipantDeviceEvent event) { public void onParticipantDeviceRemoved(ChatRoom cr, EventLog event) {
} }
@Override @Override
public void onParticipantRemoved(ChatRoom cr, ConferenceParticipantEvent event) { public void onParticipantRemoved(ChatRoom cr, EventLog event) {
} }
@Override @Override
public void onParticipantDeviceAdded(ChatRoom cr, ConferenceParticipantDeviceEvent event) { public void onParticipantDeviceAdded(ChatRoom cr, EventLog event) {
} }
@ -522,12 +520,12 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
@Override @Override
public void onParticipantAdded(ChatRoom cr, ConferenceParticipantEvent event) { public void onParticipantAdded(ChatRoom cr, EventLog event) {
} }
@Override @Override
public void onSubjectChanged(ChatRoom cr, ConferenceSubjectEvent event) { public void onSubjectChanged(ChatRoom cr, EventLog event) {
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 935e7b392e96f4f5f5c3432a91a07c8628a2c283 Subproject commit 639792b0e760e23bb59feaf86db64d4430dce8a2