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

Fixed display of room events in 1 to 1

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-29 10:15:12 +01:00
parent c378cedf2b
commit eeb1672948
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/LinphoneManager.java
View file

@ -490,11 +490,8 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
} }
} }
String[] devices = getLc().getVideoDevicesList(); String[] devices = getLc().getVideoDevicesList();
if (devices.length != cameras.length) {
Log.w("Be careful, there are more cameras available than 2 !");
}
if (camId >= devices.length) { if (camId >= devices.length) {
Log.e("Trying to use a camera that's not in the first two, will crash so use 0 one !"); Log.e("Trying to use a camera id that's higher than the linphone's devices list, using 0 to prevent crash...");
camId = 0; camId = 0;
} }
String newDevice = devices[camId]; String newDevice = devices[camId];

6
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -1113,18 +1113,21 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
getContactsForParticipants(); getContactsForParticipants();
displayChatRoomHeader(); displayChatRoomHeader();
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event); ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
scrollToBottom(); scrollToBottom();
} }
@Override @Override
public void onConferenceLeft(ChatRoom cr, EventLog event) { public void onConferenceLeft(ChatRoom cr, EventLog event) {
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event); ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
scrollToBottom(); scrollToBottom();
} }
@Override @Override
public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) { public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event); ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
scrollToBottom(); scrollToBottom();
} }
@ -1136,6 +1139,7 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
@Override @Override
public void onParticipantRemoved(ChatRoom cr, EventLog event) { public void onParticipantRemoved(ChatRoom cr, EventLog event) {
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
getContactsForParticipants(); getContactsForParticipants();
((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event); ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
scrollToBottom(); scrollToBottom();
@ -1172,6 +1176,7 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
@Override @Override
public void onParticipantAdded(ChatRoom cr, EventLog event) { public void onParticipantAdded(ChatRoom cr, EventLog event) {
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
getContactsForParticipants(); getContactsForParticipants();
((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event); ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
scrollToBottom(); scrollToBottom();
@ -1179,6 +1184,7 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
@Override @Override
public void onSubjectChanged(ChatRoom cr, EventLog event) { public void onSubjectChanged(ChatRoom cr, EventLog event) {
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
mRoomLabel.setText(event.getSubject()); mRoomLabel.setText(event.getSubject());
((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event); ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
scrollToBottom(); scrollToBottom();