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

Update linphone and mediastreamer2, re-enable ice.

Browse source 
[--force] because I switch submodules/linphone to dev_refactor_cpp branch
This commit is contained in:
Simon Morlat 2018-03-19 17:11:59 +01:00
parent dc0d377355
commit 837879dffe
5 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/raw/linphonerc_factory
View file

@ -7,7 +7,7 @@ mtu=1300
#Because dynamic bitrate adaption can increase bitrate, we must allow "no limit" #Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
download_bw=0 download_bw=0
upload_bw=0 upload_bw=0
force_ice_disablement=1 force_ice_disablement=0
[sip] [sip]
guess_hostname=1 guess_hostname=1

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

@ -609,6 +609,18 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
@Override
public void onParticipantDeviceFetchRequested(ChatRoom cr, Address addr) {
}
@Override
public void onParticipantRegistrationSubscriptionRequested(ChatRoom cr, Address participantAddr){
}
@Override
public void onParticipantRegistrationUnsubscriptionRequested(ChatRoom cr, Address participantAddr){
}
@Override @Override
public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) { public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) {
final Address from = msg.getFromAddress(); final Address from = msg.getFromAddress();
@ -760,11 +772,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
@Override
public void onParticipantDeviceFetched(ChatRoom cr, Address participantAddr) {
}
@Override @Override
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
if (mChatRoom.hasBeenLeft()) { if (mChatRoom.hasBeenLeft()) {

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

@ -449,11 +449,6 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
} }
@Override
public void onParticipantDeviceFetched(ChatRoom cr, Address participantAddr) {
}
@Override @Override
public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) { public void onUndecryptableMessageReceived(ChatRoom cr, ChatMessage msg) {
@ -463,4 +458,16 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
} }
@Override
public void onParticipantDeviceFetchRequested(ChatRoom cr, Address addr) {
}
@Override
public void onParticipantRegistrationSubscriptionRequested(ChatRoom cr, Address participantAddr){
}
@Override
public void onParticipantRegistrationUnsubscriptionRequested(ChatRoom cr, Address participantAddr){
}
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6d6ee9691c19febf5e8a092239fa7d1e0cd5388b Subproject commit 6c7c56271a261af359a587a06916d8309f47003f

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111 Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765