mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-23 06:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates

Browse source
This commit is contained in:
Brieuc Viel 2016-04-29 10:41:24 +02:00
parent e8895acd68
commit 5571674191
5 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/raw-sw600dp/linphonerc_default
View file

@ -12,7 +12,6 @@ keepalive_period=30000
size=vga
[app]
sharing_server=https://www.linphone.org:444/lft.php
tunnel=disabled
push_notification=1

3
res/raw-sw600dp/linphonerc_factory
View file

@ -38,5 +38,4 @@ dtmf_player_amp=0.1
ec_calibrator_cool_tones=1
[misc]
max_calls=10
log_collection_upload_server_url=https://www.linphone.org:444/lft.php
max_calls=10

3
res/raw/linphonerc_factory
View file

@ -39,5 +39,4 @@ ec_calibrator_cool_tones=1
[misc]
max_calls=10
log_collection_upload_server_url=https://www.linphone.org:444/lft.php
max_calls=10

11
src/org/linphone/ui/AvatarWithPresenceImage.java
View file

@ -108,7 +108,6 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
PresenceBasicStatus basicStatus = presenceModel.getBasicStatus();
if (basicStatus == PresenceBasicStatus.Closed) {
if(presenceModel.getActivity() != null && contact.isPresenceReceived() ){
Log.e("===>>> updatePresenceIcon 1");
friendStatusSmall.setImageResource(R.drawable.presence_away);
friendStatusBig.setImageResource(R.drawable.presence_away);
}else {
@ -119,18 +118,10 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
friendStatusSmall.setImageResource(R.drawable.presence_online);
friendStatusBig.setImageResource(R.drawable.presence_online);
} else {
Log.e("===>>> updatePresenceIcon 2");
friendStatusSmall.setImageResource(R.drawable.presence_away);
friendStatusBig.setImageResource(R.drawable.presence_away);
}
/*} else if(contact.isLinphoneFriend()){
friendStatusSmall.setImageResource(R.drawable.presence_away);
friendStatusBig.setImageResource(R.drawable.presence_away);
*/
}/* else{
friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
}*/
}
}
}
}

2
submodules/linphone

@ -1 +1 @@
Subproject commit f10471de2e2316958ccce54a2dbcde41cd9bb05f
Subproject commit 0215e014f454ba3dcdadb63a44f9b5002489f729