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

Updated submodules + updated calls to createClientGroupChatRoom()

Browse source
This commit is contained in:
Sylvain Berfini 2018-04-06 10:46:23 +02:00
parent b4f851aa9e
commit d6bc43da3f
11 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -346,7 +346,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
if (chatRoom == null) {
ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null && lpc.getConferenceFactoryUri() != null && !LinphonePreferences.instance().useBasicChatRoomFor1To1()) {
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject), true);
mChatRoom.addListener(mChatRoomCreationListener);
mChatRoom.addParticipant(participant);
} else {

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

@ -418,14 +418,14 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
}
getContactsForParticipants();
mRemoteComposing.setVisibility(View.INVISIBLE);
}
private void displayChatRoomHeader() {
Core core = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (core == null || mChatRoom == null) return;
mRemoteComposing.setVisibility(View.INVISIBLE);
if (core.getCallsNb() > 0) {
mBackToCallButton.setVisibility(View.VISIBLE);
} else {
@ -679,6 +679,19 @@ 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
public void onChatMessageReceived(ChatRoom cr, EventLog event) {
cr.markAsRead();

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

@ -227,7 +227,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
public void onClick(View view) {
if (!mIsAlreadyCreatedGroup) {
mWaitLayout.setVisibility(View.VISIBLE);
mTempChatRoom = LinphoneManager.getLc().createClientGroupChatRoom(mSubjectField.getText().toString());
mTempChatRoom = LinphoneManager.getLc().createClientGroupChatRoom(mSubjectField.getText().toString(), mParticipants.size() == 1);
mTempChatRoom.addListener(mChatRoomCreationListener);
Address addresses[] = new Address[mParticipants.size()];
@ -458,6 +458,11 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
}
@Override
public void onAllInformationReceived(ChatRoom cr) {
}
@Override
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {

2
src/android/org/linphone/contacts/ContactDetailsFragment.java
View file

@ -82,7 +82,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null && lpc.getConferenceFactoryUri() != null && !LinphonePreferences.instance().useBasicChatRoomFor1To1()) {
mWaitLayout.setVisibility(View.VISIBLE);
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject), true);
mChatRoom.addListener(mChatRoomCreationListener);
mChatRoom.addParticipant(participant);
} else {

2
src/android/org/linphone/fragments/HistoryDetailFragment.java
View file

@ -204,7 +204,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null && lpc.getConferenceFactoryUri() != null && !LinphonePreferences.instance().useBasicChatRoomFor1To1()) {
mWaitLayout.setVisibility(View.VISIBLE);
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject), true);
mChatRoom.addListener(mChatRoomCreationListener);
mChatRoom.addParticipant(participant);
} else {

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 312f1e41b217b1cb69bcad193046b01774be5341
Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 91f5b7273064a496ba1c314c5b78ad492289e584
Subproject commit a9af682b9931213743c0af65e261e70e2280b1c9

2
submodules/belr

@ -1 +1 @@
Subproject commit 18abde9e43e8f98e22c09afee3e089c4e7691173
Subproject commit c65f14509eeec3192cd1170646b700e9428ac292

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 4232e757cc9ede121b6f35bc4da149d8aaa14e0f
Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc

2
submodules/linphone

@ -1 +1 @@
Subproject commit cd08c6e2fee6c99ead64dde6783337714c5aedc8
Subproject commit 5290d59d769c90f18f720b07495061ba6dcbbb84

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765
Subproject commit 9156ae093992c81d30dfc0936712e88a58f0ef63