From e334503b9718273a12c1dc37d8e467382cc658ff Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 11 Apr 2013 18:03:34 +0200 Subject: [PATCH] fix double call to core_terminate fix use of numbers with # --- src/org/linphone/LinphoneService.java | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 8a2b46486..d7e62fdb1 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -247,7 +247,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis String userName = call.getRemoteAddress().getUserName(); String domain = call.getRemoteAddress().getDomain(); String displayName = call.getRemoteAddress().getDisplayName(); - LinphoneAddress address = LinphoneCoreFactoryImpl.instance().createLinphoneAddress("sip:" + userName + "@" + domain); + LinphoneAddress address = LinphoneCoreFactoryImpl.instance().createLinphoneAddress(userName,domain,null); address.setDisplayName(displayName); Uri pictureUri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(address, getContentResolver()); diff --git a/submodules/belle-sip b/submodules/belle-sip index 359d16ff3..8bd2630b9 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 359d16ff318a9fa729235253e8e295f3a8726db9 +Subproject commit 8bd2630b93b31f0a38fcfc37a5ccd2cb1d2147c2 diff --git a/submodules/linphone b/submodules/linphone index edf037fa3..4a395bfb7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit edf037fa37b980cdba898d129163261bbec0fd3d +Subproject commit 4a395bfb7280d1c8344e80f76876d2b9275c0fe5