From f1cdcfeba0bf253b84191ad5bfb7902592238559 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 26 Sep 2018 11:30:44 +0200 Subject: [PATCH] Fix call view --- res/raw/linphonerc_factory | 15 +-------------- src/android/org/linphone/call/CallActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory index 2bfcbe3d5..d3a7d7be9 100644 --- a/res/raw/linphonerc_factory +++ b/res/raw/linphonerc_factory @@ -39,30 +39,17 @@ ec_calibrator_cool_tones=1 [misc] max_calls=10 history_max_size=100 -enable_basic_to_client_group_chat_room_migration=0 -enable_simple_group_chat_message_state=0 -aggregate_imdn=1 store_friends=0 -debug=1 [app] activation_code_length=4 -prefer_basic_chat_room=0 show_login_view=1 -debug_popup_magic=#1234 -debug=1 -server_url=http://85.233.205.218:443/xmlrpc - -[in-app-purchase] -server_url=https://subscribe.linphone.org:444/inapp.php -purchasable_items_ids=test_account_subscription +friendlist_subscription_enabled=1 [assistant] -domain=sip.linphone.org password_max_length=-1 password_min_length=1 username_length=-1 username_max_length=64 username_min_length=1 username_regex=^[a-z0-9_.\-]*$ -xmlrpc_url=https://subscribe.linphone.org:444/wizard.php diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index c26be0380..3ffba5895 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -1536,10 +1536,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList LinphoneContact lContact = ContactsManager.getInstance().findContactFromAddress(lAddress); if (lContact == null) { contactName.setText(LinphoneUtils.getAddressDisplayName(lAddress)); - contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); + //contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); } else { contactName.setText(lContact.getFullName()); - LinphoneUtils.setImagePictureFromUri(contactPicture.getContext(), contactPicture, lContact.getPhotoUri(), lContact.getThumbnailUri()); + //LinphoneUtils.setImagePictureFromUri(contactPicture.getContext(), contactPicture, lContact.getPhotoUri(), lContact.getThumbnailUri()); } }