From 557167419183a5c0a527f4d4775575457e6bc7fd Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Fri, 29 Apr 2016 10:41:24 +0200 Subject: [PATCH] updates --- res/raw-sw600dp/linphonerc_default | 1 - res/raw-sw600dp/linphonerc_factory | 3 +-- res/raw/linphonerc_factory | 3 +-- src/org/linphone/ui/AvatarWithPresenceImage.java | 11 +---------- submodules/linphone | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/res/raw-sw600dp/linphonerc_default b/res/raw-sw600dp/linphonerc_default index 8ee2fbaba..ee2185fad 100644 --- a/res/raw-sw600dp/linphonerc_default +++ b/res/raw-sw600dp/linphonerc_default @@ -12,7 +12,6 @@ keepalive_period=30000 size=vga [app] -sharing_server=https://www.linphone.org:444/lft.php tunnel=disabled push_notification=1 diff --git a/res/raw-sw600dp/linphonerc_factory b/res/raw-sw600dp/linphonerc_factory index 06ffbdb91..c23fe0403 100644 --- a/res/raw-sw600dp/linphonerc_factory +++ b/res/raw-sw600dp/linphonerc_factory @@ -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 \ No newline at end of file +max_calls=10 \ No newline at end of file diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory index 785851bef..acd8e2550 100644 --- a/res/raw/linphonerc_factory +++ b/res/raw/linphonerc_factory @@ -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 \ No newline at end of file +max_calls=10 \ No newline at end of file diff --git a/src/org/linphone/ui/AvatarWithPresenceImage.java b/src/org/linphone/ui/AvatarWithPresenceImage.java index c6bcde60c..1739c2283 100644 --- a/src/org/linphone/ui/AvatarWithPresenceImage.java +++ b/src/org/linphone/ui/AvatarWithPresenceImage.java @@ -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); - }*/ + } } } } diff --git a/submodules/linphone b/submodules/linphone index f10471de2..0215e014f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f10471de2e2316958ccce54a2dbcde41cd9bb05f +Subproject commit 0215e014f454ba3dcdadb63a44f9b5002489f729