Commit 8835c76d authored by Sylvain Berfini's avatar Sylvain Berfini

Update oRTP, mediastreamer2 and linphone submodules.

parent 108b8f17
......@@ -40,7 +40,6 @@ static void LinphoneNativeOutputTraceHandler(OrtpLogLevel lev, const char *fmt,
nativeOutputTraceHandler(level, fmt2, args);
}
void LinphoneCoreFactory::CreateLinphoneCore(Linphone::Core::LinphoneCoreListener^ listener)
{
CreateLinphoneCore(listener, nullptr);
......
......@@ -102,7 +102,7 @@ namespace Linphone
/// Constructs a LinphoneAddress object by parsing the user supplied address, given as a string.
/// </summary>
/// <param name="uri">address, should be like "sip:joe@sip.linphone.org"</param>
/// <returns>The LinphoneAddress that has been created</returns>
/// <returns>The LinphoneAddress that has been created, or null if the URI couldn't be parsed</returns>
LinphoneAddress^ CreateLinphoneAddress(Platform::String^ uri);
/// <summary>
......
......@@ -126,7 +126,10 @@ Platform::Object^ Linphone::Core::Utils::CreateLinphoneAddress(void* address)
Platform::Object^ Linphone::Core::Utils::CreateLinphoneAddressFromUri(const char* uri)
{
return ref new Linphone::Core::LinphoneAddress(uri);
LinphoneAddress^ addr = ref new Linphone::Core::LinphoneAddress(uri);
if (addr->address != nullptr)
return addr;
return nullptr;
}
Platform::Object^ Linphone::Core::Utils::CreateLinphoneAuthInfo(void* auth_info)
......
......@@ -118,9 +118,14 @@ namespace Linphone.Model
if (recent.Count >= RECENT_CONTACTS_MAX)
break;
Contact contact = (from c in _allContacts where (log.DisplayedName.Equals(c.DisplayName)) select c).FirstOrDefault();
if (contact != null && !recent.Contains(contact))
recent.Add(contact);
try
{
Contact contact = (from c in _allContacts where (log.DisplayedName.Equals(c.DisplayName)) select c).FirstOrDefault();
if (contact != null && !recent.Contains(contact))
recent.Add(contact);
}
catch { } // Prevent the app from crashing if current contact's displayname in the iteration is null
}
return recent;
......
......@@ -418,7 +418,16 @@ namespace Linphone.Model
{
if ((proxy != null) && (proxy.Length > 0))
{
proxy = String.Format("sip:{0}", proxy);
// Check if proxy address is correct
LinphoneAddress test = LinphoneManager.Instance.LinphoneCoreFactory.CreateLinphoneAddress(proxy);
if (test != null)
{
proxy = String.Format("sip:{0}", proxy);
}
else
{
proxy = String.Format("sip:{0}", domain);
}
}
else
{
......@@ -435,16 +444,18 @@ namespace Linphone.Model
{
cfg.SetIdentity(username, username, domain);
}
cfg.SetProxy(proxy);
// Can't set string to null: http://stackoverflow.com/questions/12980915/exception-when-trying-to-read-null-string-in-c-sharp-winrt-component-from-winjs
var auth = lc.CreateAuthInfo(username, "", password, "", "");
lc.AddAuthInfo(auth);
if (outboundProxy)
{
cfg.SetRoute(proxy);
}
// Can't set string to null: http://stackoverflow.com/questions/12980915/exception-when-trying-to-read-null-string-in-c-sharp-winrt-component-from-winjs
var auth = lc.CreateAuthInfo(username, "", password, "", "");
lc.AddAuthInfo(auth);
lc.AddProxyConfig(cfg);
lc.SetDefaultProxyConfig(cfg);
LinphoneManager.Instance.AddPushInformationsToContactParams();
......
linphone @ 0933640e
Subproject commit 08d5cbbe2c5bb72b3c9c210afc28b853b041941c
Subproject commit 0933640e54f37e3521578f979d44e84ca6e795f7
mediastreamer2 @ 1287f8c9
Subproject commit e12faacedc0d7ac45c050ee4899c578ec7895889
Subproject commit 1287f8c9fccf25e5d17fb8586d5680a905bd78f9
oRTP @ e96c55df
Subproject commit 60e0b44c64d9aa3bb5f7cb897bd5abc47953c63d
Subproject commit e96c55df4436db74656d5feedf3e8fd12adb74e4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment