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

Use getNbPacticipants instead of canHandleParticipants

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-24 16:37:23 +02:00
parent 4beffb45e8
commit a75e01954f
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -438,7 +438,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
holder.displayName.setSelected(true); // For animation holder.displayName.setSelected(true); // For animation
if (chatRoom.canHandleParticipants()) { if (chatRoom.getNbParticipants() > 1) {
holder.displayName.setText(chatRoom.getSubject()); holder.displayName.setText(chatRoom.getSubject());
holder.contactPicture.setImageResource(R.drawable.chat_group_avatar); holder.contactPicture.setImageResource(R.drawable.chat_group_avatar);
} else { } else {

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

@ -239,7 +239,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
private void getContactsForParticipants() { private void getContactsForParticipants() {
mParticipants = new ArrayList<>(); mParticipants = new ArrayList<>();
if (mChatRoom.canHandleParticipants()) { if (mChatRoom.getNbParticipants() > 1) {
int index = 0; int index = 0;
StringBuilder participantsLabel = new StringBuilder(); StringBuilder participantsLabel = new StringBuilder();
for (Participant p : mChatRoom.getParticipants()) { for (Participant p : mChatRoom.getParticipants()) {
@ -287,16 +287,15 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
mRemoteComposing.setVisibility(View.INVISIBLE); mRemoteComposing.setVisibility(View.INVISIBLE);
if (core.getCallByRemoteAddress(mRemoteSipUri) != null) { if (core.getCallsNb() > 0) {
mBackToCallButton.setVisibility(View.VISIBLE); mBackToCallButton.setVisibility(View.VISIBLE);
} else { } else {
mBackToCallButton.setVisibility(View.GONE); mBackToCallButton.setVisibility(View.GONE);
if (mChatRoom.canHandleParticipants()) { if (mChatRoom.getNbParticipants() > 1) {
mCallButton.setVisibility(View.GONE); mCallButton.setVisibility(View.GONE);
mGroupInfosButton.setVisibility(View.VISIBLE); mGroupInfosButton.setVisibility(View.VISIBLE);
mRoomLabel.setText(mChatRoom.getSubject()); mRoomLabel.setText(mChatRoom.getSubject());
mParticipantsLabel.setVisibility(View.VISIBLE); mParticipantsLabel.setVisibility(View.VISIBLE);
} else { } else {
mCallButton.setVisibility(View.VISIBLE); mCallButton.setVisibility(View.VISIBLE);
mGroupInfosButton.setVisibility(View.GONE); mGroupInfosButton.setVisibility(View.GONE);
@ -428,7 +427,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
@Override @Override
public void onIsComposingReceived(ChatRoom cr, Address remoteAddr, boolean isComposing) { public void onIsComposingReceived(ChatRoom cr, Address remoteAddr, boolean isComposing) {
if (cr.canHandleParticipants() && cr.getNbParticipants() > 2) { if (cr.getNbParticipants() > 1) {
ArrayList<String> composing = new ArrayList<>(); ArrayList<String> composing = new ArrayList<>();
for (Address a : cr.getComposingAddresses()) { for (Address a : cr.getComposingAddresses()) {
boolean found = false; boolean found = false;