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

Correct handling of onConferenceJoined() and onConferenceLeft() listeners.

Browse source
This commit is contained in:
Ghislain MARY 2018-05-21 11:00:13 +02:00
parent c404c239dc
commit 1f9f9b965d
2 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -751,19 +751,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
} }
/*@Override
public void onAllInformationReceived(ChatRoom cr) {
// Currently flexisip doesn't send the participants list in the INVITE
// So we have to refresh the display when information is available
// In the meantime header will be chatroom-xxxxxxx
if (mChatRoom == null) mChatRoom = cr;
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && mChatRoom.getParticipants().length > 0) {
mRemoteParticipantAddress = mChatRoom.getParticipants()[0].getAddress();
}
getContactsForParticipants();
displayChatRoomHeader();
}*/
@Override @Override
public void onChatMessageReceived(ChatRoom cr, EventLog event) { public void onChatMessageReceived(ChatRoom cr, EventLog event) {
cr.markAsRead(); cr.markAsRead();
@ -842,6 +829,26 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
@Override
public void onConferenceJoined(ChatRoom cr, EventLog event) {
// Currently flexisip doesn't send the participants list in the INVITE
// So we have to refresh the display when information is available
// In the meantime header will be chatroom-xxxxxxx
if (mChatRoom == null) mChatRoom = cr;
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && mChatRoom.getParticipants().length > 0) {
mRemoteParticipantAddress = mChatRoom.getParticipants()[0].getAddress();
}
getContactsForParticipants();
displayChatRoomHeader();
mEventsAdapter.addToHistory(event);
}
@Override
public void onConferenceLeft(ChatRoom cr, EventLog event) {
mEventsAdapter.addToHistory(event);
}
@Override @Override
public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) { public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
mEventsAdapter.addToHistory(event); mEventsAdapter.addToHistory(event);
@ -852,16 +859,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
@Override
public void onConferenceJoined(ChatRoom cr, EventLog eventLog) {
}
@Override
public void onConferenceLeft(ChatRoom cr, EventLog eventLog) {
}
@Override @Override
public void onParticipantRemoved(ChatRoom cr, EventLog event) { public void onParticipantRemoved(ChatRoom cr, EventLog event) {
getContactsForParticipants(); getContactsForParticipants();

18
src/android/org/linphone/chat/GroupInfoFragment.java
View file

@ -382,6 +382,14 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
mAdminStateChangedDialog.show(); mAdminStateChangedDialog.show();
} }
@Override
public void onConferenceJoined(ChatRoom cr, EventLog event_log) {
}
@Override
public void onConferenceLeft(ChatRoom cr, EventLog event_log) {
}
@Override @Override
public void onParticipantAdded(ChatRoom cr, EventLog event_log) { public void onParticipantAdded(ChatRoom cr, EventLog event_log) {
refreshParticipantsList(); refreshParticipantsList();
@ -448,16 +456,6 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
} }
@Override
public void onConferenceJoined(ChatRoom cr, EventLog eventLog) {
}
@Override
public void onConferenceLeft(ChatRoom cr, EventLog eventLog) {
}
@Override @Override
public void onParticipantDeviceAdded(ChatRoom cr, EventLog event_log) { public void onParticipantDeviceAdded(ChatRoom cr, EventLog event_log) {