From bde275fa4493bd1de5caaa21b78e4363533bc7ce Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 6 Nov 2015 10:03:39 +0100 Subject: [PATCH 01/17] xcode: fix liblinphone project --- linphone.xcodeproj/project.pbxproj | 16 ++++++++-------- prepare.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index e5c833521..c5a4bccb8 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5127,8 +5127,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -5179,8 +5179,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -5225,8 +5225,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -5271,8 +5271,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/prepare.py b/prepare.py index b7d1196ee..3d29fd6a6 100755 --- a/prepare.py +++ b/prepare.py @@ -28,7 +28,7 @@ import re import shutil import tempfile import sys -from logging import * +from logging import error, warning, info, INFO, basicConfig from distutils.spawn import find_executable from subprocess import Popen, PIPE sys.dont_write_bytecode = True @@ -210,7 +210,7 @@ def check_tools(): if check_is_installed("libtoolize", warn=False): if not check_is_installed("glibtoolize", "libtool"): - glibtoolize_path = find_executable(glibtoolize) + glibtoolize_path = find_executable("glibtoolize") reterr = 1 msg = "Please do a symbolic link from glibtoolize to libtoolize:\n\tln -s {} ${}" error(msg.format(glibtoolize_path, glibtoolize_path.replace("glibtoolize", "libtoolize"))) @@ -509,7 +509,7 @@ def main(argv=None): info("Tunnel wanted but not found yet, trying to clone it...") p = Popen("git clone gitosis@git.linphone.org:tunnel.git submodules/tunnel".split(" ")) p.wait() - if p.retcode != 0: + if p.returncode != 0: error("Could not clone tunnel. Please see http://www.belledonne-communications.com/voiptunnel.html") return 1 warning("Tunnel enabled, disabling GPL third parties.") From 107fdead4870f35ba2fca6e8770d620db93be301 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sun, 8 Nov 2015 11:36:36 +0100 Subject: [PATCH 02/17] cmake-builder:fix openh264 bitcode compilation --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 9e27991eb..d5c58d795 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 9e27991eb93b7e2b5dfa7d447f42bffab86a4e79 +Subproject commit d5c58d795f55f077c9c3129123772527f274d744 From f974640b7ab7c2dd50090758d14fa47db283ce76 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 9 Nov 2015 11:29:16 +0100 Subject: [PATCH 03/17] cmake-builder:enable bitcode only for armxxx --- submodules/cmake-builder | 2 +- submodules/externals/libvpx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index d5c58d795..e0e579773 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit d5c58d795f55f077c9c3129123772527f274d744 +Subproject commit e0e579773217b0c1df6dbb108408a94bafff9459 diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index be6eee2fc..62e8660f6 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit be6eee2fcc272d3a98c58454298af10558f44e5f +Subproject commit 62e8660f60361f36752c214ac3de17d061b45a98 From 935163f3c35598b7c90055538c5fedd3a4524401 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 9 Nov 2015 21:02:58 +0100 Subject: [PATCH 04/17] cmake-builder: enable bitcode for armv7 compilation --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e0e579773..a32776a14 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e0e579773217b0c1df6dbb108408a94bafff9459 +Subproject commit a32776a14a01d4396f56c1bcd112c4a3dff808e5 From ccd70d6c887deae18e76cc77e4b9a797f8b4c7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 9 Nov 2015 11:53:34 +0100 Subject: [PATCH 05/17] Add link flag for VideoToolbox framework --- linphone.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c5a4bccb8..0ce5be839 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 045B5CB318D72E9A0088350C /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 045B5CB218D72E9A0088350C /* libbzrtp.a */; }; + 0FA159CD1BF0AB0D00997345 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FA159CC1BF0AB0D00997345 /* VideoToolbox.framework */; }; 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22331B15E83B008C0621 /* libilbcrfc3951.a */; }; 152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22351B15E889008C0621 /* libxml2.dylib */; }; 1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1560821E18EEF26100765332 /* libmsopenh264.a */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -905,6 +906,7 @@ /* Begin PBXFileReference section */ 045B5CB218D72E9A0088350C /* libbzrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbzrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libbzrtp.a"; sourceTree = ""; }; + 0FA159CC1BF0AB0D00997345 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; }; 152F22331B15E83B008C0621 /* libilbcrfc3951.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbcrfc3951.a; path = "liblinphone-sdk/apple-darwin/lib/libilbcrfc3951.a"; sourceTree = ""; }; 152F22351B15E889008C0621 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; }; 1560821E18EEF26100765332 /* libmsopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsopenh264.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsopenh264.a"; sourceTree = ""; }; @@ -1883,6 +1885,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 0FA159CD1BF0AB0D00997345 /* VideoToolbox.framework in Frameworks */, 63D5C1F51BA6FF4D002D1ABF /* libbcg729.a in Frameworks */, 63D5C1F61BA6FF4D002D1ABF /* libswresample.a in Frameworks */, 63D5C1F71BA6FF4D002D1ABF /* libvo-amrwbenc.a in Frameworks */, @@ -2282,6 +2285,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 0FA159CC1BF0AB0D00997345 /* VideoToolbox.framework */, 63D5C1F21BA6FF4D002D1ABF /* libbcg729.a */, 63D5C1F31BA6FF4D002D1ABF /* libswresample.a */, 63D5C1F41BA6FF4D002D1ABF /* libvo-amrwbenc.a */, From 44751a5e1283398d52671e876f4a7a52f698af0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Fri, 13 Nov 2015 17:43:04 +0100 Subject: [PATCH 06/17] Enable the WebRTC implementation of iLBC codec --- .gitmodules | 6 ------ Classes/LinphoneManager.m | 4 ++-- linphone.xcodeproj/project.pbxproj | 16 ++++------------ submodules/cmake-builder | 2 +- submodules/libilbc-rfc3951 | 1 - submodules/msilbc | 1 - submodules/mswebrtc | 2 +- 7 files changed, 8 insertions(+), 24 deletions(-) delete mode 160000 submodules/libilbc-rfc3951 delete mode 160000 submodules/msilbc diff --git a/.gitmodules b/.gitmodules index e697fbae0..1fe8d627b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,12 +7,6 @@ [submodule "submodules/externals/speex"] path = submodules/externals/speex url = git://git.linphone.org/speex -[submodule "submodules/msilbc"] - path = submodules/msilbc - url = git://git.linphone.org/msilbc -[submodule "submodules/libilbc-rfc3951"] - path = submodules/libilbc-rfc3951 - url = git://git.linphone.org/libilbc-rfc3951 [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr url = git://git.linphone.org/opencore-amr diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 6d5f3bb4c..27249a99f 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -75,7 +75,7 @@ NSString *const kLinphoneFileTransferRecvUpdate = @"LinphoneFileTransferRecvUpda const int kLinphoneAudioVbrCodecDefaultBitrate = 36; /*you can override this from linphonerc or linphonerc-factory*/ -extern void libmsilbc_init(void); +//extern void libmsilbc_init(void); extern void libmsamr_init(void); extern void libmsx264_init(void); extern void libmsopenh264_init(void); @@ -1475,7 +1475,7 @@ static BOOL libStarted = FALSE; ms_init(); // Need to initialize mediastreamer2 before loading the plugins // Load plugins if available in the linphone SDK - otherwise these calls will do nothing - libmsilbc_init(); + //libmsilbc_init(); libmssilk_init(); libmsamr_init(); libmsx264_init(); diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 0ce5be839..511f78930 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 045B5CB318D72E9A0088350C /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 045B5CB218D72E9A0088350C /* libbzrtp.a */; }; 0FA159CD1BF0AB0D00997345 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FA159CC1BF0AB0D00997345 /* VideoToolbox.framework */; }; - 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22331B15E83B008C0621 /* libilbcrfc3951.a */; }; 152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22351B15E889008C0621 /* libxml2.dylib */; }; 1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1560821E18EEF26100765332 /* libmsopenh264.a */; settings = {ATTRIBUTES = (Weak, ); }; }; 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; @@ -44,7 +43,6 @@ 15AF3C9A16F37A5D00FC52EC /* routes_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */; }; 15AF3C9C16F37A5D00FC52EC /* routes_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9616F37A5D00FC52EC /* routes_over.png */; }; 15AF3C9E16F37A5D00FC52EC /* routes_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9716F37A5D00FC52EC /* routes_selected.png */; }; - 15F728731B16FF8B00A1C901 /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22331B15E83B008C0621 /* libilbcrfc3951.a */; }; 15F728741B16FF9A00A1C901 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22351B15E889008C0621 /* libxml2.dylib */; }; 1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; @@ -63,7 +61,6 @@ 22276E8513C73D3100210156 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8213C73D3100210156 /* libswscale.a */; }; 22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; }; 2234C8E915EE2F7F00E18E83 /* chat_message_delivered.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */; }; 2234C8EB15EE2F7F00E18E83 /* chat_message_not_delivered.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */; }; 2234C8EE15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; }; @@ -778,7 +775,6 @@ F0BB8C1B1936245300974404 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; F0BB8C1D1936245300974404 /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; }; F0BB8C1E1936245300974404 /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226CDADE14E2D0B800513B67 /* libmsbcg729.a */; }; - F0BB8C1F1936245300974404 /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; }; F0BB8C201936245300974404 /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AF147259670037138E /* libmssilk.a */; }; F0BB8C221936245300974404 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */; }; F0BB8C231936245300974404 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */; }; @@ -907,7 +903,6 @@ /* Begin PBXFileReference section */ 045B5CB218D72E9A0088350C /* libbzrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbzrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libbzrtp.a"; sourceTree = ""; }; 0FA159CC1BF0AB0D00997345 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; }; - 152F22331B15E83B008C0621 /* libilbcrfc3951.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbcrfc3951.a; path = "liblinphone-sdk/apple-darwin/lib/libilbcrfc3951.a"; sourceTree = ""; }; 152F22351B15E889008C0621 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; }; 1560821E18EEF26100765332 /* libmsopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsopenh264.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsopenh264.a"; sourceTree = ""; }; 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default_landscape.png; path = Resources/route_bluetooth_off_default_landscape.png; sourceTree = ""; }; @@ -966,7 +961,6 @@ 22276E8213C73D3100210156 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; 22276E8613C73D8A00210156 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 22276E8813C73DC000210156 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - 223148E51178A09900637D6A /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsilbc.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsilbc.a"; sourceTree = ""; }; 2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_delivered.png; path = Resources/chat_message_delivered.png; sourceTree = ""; }; 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_not_delivered.png; path = Resources/chat_message_not_delivered.png; sourceTree = ""; }; 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_inprogress.png; path = Resources/chat_message_inprogress.png; sourceTree = ""; }; @@ -1895,7 +1889,6 @@ 223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */, 045B5CB318D72E9A0088350C /* libbzrtp.a in Frameworks */, 220FAD3210765B400068D98F /* libgsm.a in Frameworks */, - 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */, F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */, D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */, D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */, @@ -1913,7 +1906,6 @@ 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, 63D7216C1B73973D00D70E65 /* libx264.a in Frameworks */, 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */, - 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */, 226183B0147259670037138E /* libmssilk.a in Frameworks */, 1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */, 63D7216D1B73975900D70E65 /* libmsx264.a in Frameworks */, @@ -1966,7 +1958,6 @@ buildActionMask = 2147483647; files = ( 15F728741B16FF9A00A1C901 /* libxml2.dylib in Frameworks */, - 15F728731B16FF8B00A1C901 /* libilbcrfc3951.a in Frameworks */, F0A54B0C1AD56F4600C22733 /* libc++.dylib in Frameworks */, F0A54B0D1AD56F4600C22733 /* libstdc++.dylib in Frameworks */, F08D468D1AA86849001E8CB5 /* libiconv.dylib in Frameworks */, @@ -1990,7 +1981,6 @@ F0BB8C151936242400974404 /* libmediastreamer_voip.a in Frameworks */, F0BB8C1D1936245300974404 /* libmsamr.a in Frameworks */, F0BB8C1E1936245300974404 /* libmsbcg729.a in Frameworks */, - F0BB8C1F1936245300974404 /* libmsilbc.a in Frameworks */, F0BB8C201936245300974404 /* libmssilk.a in Frameworks */, F0BB8C221936245300974404 /* libopencore-amrnb.a in Frameworks */, F0BB8C231936245300974404 /* libopencore-amrwb.a in Frameworks */, @@ -2292,7 +2282,6 @@ 63EA4C941B50189D00922857 /* libmswebrtc.a */, 63158FAC1B468E0E00969917 /* ImageOptim.sh */, 152F22351B15E889008C0621 /* libxml2.dylib */, - 152F22331B15E83B008C0621 /* libilbcrfc3951.a */, F0FF66AA1ACAEEB0008A4486 /* IOKit.framework */, F0B026F21AA710AF00FF49F7 /* libiconv.dylib */, F05BAA611A5D594E00411815 /* libz.dylib */, @@ -2326,7 +2315,6 @@ 22405EEA16006F0700B92522 /* libmediastreamer_voip.a */, 226F2ED51344B0EF00F6EF27 /* libmsamr.a */, 226CDADE14E2D0B800513B67 /* libmsbcg729.a */, - 223148E51178A09900637D6A /* libmsilbc.a */, 1560821E18EEF26100765332 /* libmsopenh264.a */, 226183AF147259670037138E /* libmssilk.a */, 22AA8AFC13D7125500B30535 /* libmsx264.a */, @@ -5331,6 +5319,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -5383,6 +5372,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -5429,6 +5419,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -5475,6 +5466,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; diff --git a/submodules/cmake-builder b/submodules/cmake-builder index a32776a14..e0f344c0a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit a32776a14a01d4396f56c1bcd112c4a3dff808e5 +Subproject commit e0f344c0aca4bb10ab94543422658be8c8e966ce diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951 deleted file mode 160000 index a6bb1eb6d..000000000 --- a/submodules/libilbc-rfc3951 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6bb1eb6dab5541cdded6a1f0326539234954c5d diff --git a/submodules/msilbc b/submodules/msilbc deleted file mode 160000 index b5a2b0702..000000000 --- a/submodules/msilbc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5a2b070259ef0c4f404fa8ca87752b8b1259d76 diff --git a/submodules/mswebrtc b/submodules/mswebrtc index eecba24b5..5787ddda7 160000 --- a/submodules/mswebrtc +++ b/submodules/mswebrtc @@ -1 +1 @@ -Subproject commit eecba24b5559c89e123991ab1f32f35649b7ebe8 +Subproject commit 5787ddda77a8292898670ab8bd3d48e6e51ccfaa From 85bc4f7b13008419d75b28484052f0169dd8a42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 18 Nov 2015 14:38:40 +0100 Subject: [PATCH 07/17] Fix disabling of voice processing --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 933a75d87..b84f3ca57 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 933a75d8734338aa52bf4da7356bd1390eea4b58 +Subproject commit b84f3ca570437476fc14382348789d2c1a537f9a From 8121587aa32d0d74be597548031ca5cf86bd2957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 18 Nov 2015 15:52:00 +0100 Subject: [PATCH 08/17] Make mediastream init mswebrtc --- submodules/liblinphone.xcodeproj/project.pbxproj | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 21ed8f629..604868bd2 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 0F3BFC991BFCC7A10025B8DF /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F3BFC981BFCC7A00025B8DF /* libmswebrtc.a */; }; 1561A554178D9C68006B4B2F /* ioshardware.h in Headers */ = {isa = PBXBuildFile; fileRef = 1561A553178D9C68006B4B2F /* ioshardware.h */; }; 1561A555178D9C71006B4B2F /* ioshardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 1561A551178D98E2006B4B2F /* ioshardware.m */; }; 2206D2D3177AC70900C40726 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C6177AC70900C40726 /* InfoPlist.strings */; }; @@ -320,9 +321,9 @@ 22DD19C113A8D7FA0018ECD4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C013A8D7FA0018ECD4 /* UIKit.framework */; }; 22DD19C213A8D7FA0018ECD4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; 22DD19C413A8D7FA0018ECD4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */; }; - 630DCF691BBAC06400A0DDC8 /* msvideopresets.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF661BBAC05100A0DDC8 /* msvideopresets.c */; settings = {ASSET_TAGS = (); }; }; - 630DCF6C1BBAC08200A0DDC8 /* rfc4103_textstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6A1BBAC08200A0DDC8 /* rfc4103_textstream.c */; settings = {ASSET_TAGS = (); }; }; - 630DCF6D1BBAC08200A0DDC8 /* video_preset_high_fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6B1BBAC08200A0DDC8 /* video_preset_high_fps.c */; settings = {ASSET_TAGS = (); }; }; + 630DCF691BBAC06400A0DDC8 /* msvideopresets.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF661BBAC05100A0DDC8 /* msvideopresets.c */; }; + 630DCF6C1BBAC08200A0DDC8 /* rfc4103_textstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6A1BBAC08200A0DDC8 /* rfc4103_textstream.c */; }; + 630DCF6D1BBAC08200A0DDC8 /* video_preset_high_fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6B1BBAC08200A0DDC8 /* video_preset_high_fps.c */; }; 7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0913E830B800EFC6DC /* libvpx.a */; }; 70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; }; 70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F013E147CE002BA2C0 /* QuartzCore.framework */; }; @@ -513,6 +514,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0F3BFC961BFCC7420025B8DF /* liblinphone-sdk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "liblinphone-sdk"; path = "../liblinphone-sdk"; sourceTree = ""; }; + 0F3BFC981BFCC7A00025B8DF /* libmswebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmswebrtc.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmswebrtc.a"; sourceTree = ""; }; 1561A551178D98E2006B4B2F /* ioshardware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioshardware.m; sourceTree = ""; }; 1561A553178D9C68006B4B2F /* ioshardware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioshardware.h; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; @@ -835,6 +838,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 0F3BFC991BFCC7A10025B8DF /* libmswebrtc.a in Frameworks */, 2206D2DE177ACD3800C40726 /* libmediastreamer_voip.a in Frameworks */, 22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */, 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */, @@ -1379,6 +1383,8 @@ F0ED99521A1645CD00A788CE /* Frameworks */ = { isa = PBXGroup; children = ( + 0F3BFC981BFCC7A00025B8DF /* libmswebrtc.a */, + 0F3BFC961BFCC7420025B8DF /* liblinphone-sdk */, AACBBE490F95108600F1A2B1 /* Foundation.framework */, 22DD19C013A8D7FA0018ECD4 /* UIKit.framework */, 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */, @@ -2596,6 +2602,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_WEBRTC, HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, @@ -2822,6 +2829,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_WEBRTC, HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, @@ -2868,6 +2876,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_WEBRTC, HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, From 5f0d265abfc0d771497f6cb61803c35b3d7a93d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 19 Nov 2015 14:47:16 +0100 Subject: [PATCH 09/17] Fix an imlicit declaration --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 27249a99f..69318b67c 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1960,7 +1960,7 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1 // Finally we can make the call LinphoneProxyConfig *proxyCfg; linphone_core_get_default_proxy(theLinphoneCore, &proxyCfg); - LinphoneCallParams *lcallParams = linphone_core_create_default_call_parameters(theLinphoneCore); + LinphoneCallParams *lcallParams = linphone_core_create_call_params(theLinphoneCore, NULL); if ([self lpConfigBoolForKey:@"edge_opt_preference"] && (self.network == network_2g)) { LOGI(@"Enabling low bandwidth mode"); linphone_call_params_enable_low_bandwidth(lcallParams, YES); From 3abbbe03049207deb4386a982fc871e23bb348ed Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 19 Nov 2015 15:03:33 +0100 Subject: [PATCH 10/17] update belle-sip with a fix for Recorded rourte header in ack --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 9b72b22e8..77510489a 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 9b72b22e81db1aeb2782413648dbcde5d41d8067 +Subproject commit 77510489a6f72d2aa2a539d800f24b0cdf82a23c From 3abf299b156f9ea0f2fce918cd24c045d492a9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Fri, 20 Nov 2015 10:44:21 +0100 Subject: [PATCH 11/17] Fix compilation of Tutorials --- .../hello-world.xcodeproj/project.pbxproj | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj b/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj index d5953a5a3..384bfc2dc 100755 --- a/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj +++ b/TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj @@ -54,7 +54,6 @@ 63D5C1301BA6E504002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; }; 63D5C1311BA6E504002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; }; 63D5C1321BA6E504002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; }; - 63D5C1331BA6E504002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; }; 63D5C1341BA6E504002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; }; 63D5C1351BA6E504002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; }; 63D5C1361BA6E504002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; }; @@ -75,7 +74,6 @@ 63D5C1461BA6E504002D1ABF /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1221BA6E4F0002D1ABF /* libx264.a */; }; 63D5C1471BA6E516002D1ABF /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1251BA6E4F0002D1ABF /* libmsamr.a */; }; 63D5C1481BA6E516002D1ABF /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */; }; - 63D5C1491BA6E516002D1ABF /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */; }; 63D5C14A1BA6E516002D1ABF /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */; }; 63D5C14B1BA6E516002D1ABF /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1291BA6E4F0002D1ABF /* libmssilk.a */; }; 63D5C14C1BA6E516002D1ABF /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */; }; @@ -90,7 +88,6 @@ 63D5C15B1BA6E765002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; }; 63D5C15C1BA6E765002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; }; 63D5C15D1BA6E765002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; }; - 63D5C15E1BA6E765002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; }; 63D5C15F1BA6E765002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; }; 63D5C1601BA6E765002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; }; 63D5C1611BA6E765002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; }; @@ -111,7 +108,6 @@ 63D5C1711BA6E765002D1ABF /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1221BA6E4F0002D1ABF /* libx264.a */; }; 63D5C1721BA6E778002D1ABF /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1251BA6E4F0002D1ABF /* libmsamr.a */; }; 63D5C1731BA6E778002D1ABF /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */; }; - 63D5C1741BA6E778002D1ABF /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */; }; 63D5C1751BA6E778002D1ABF /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */; }; 63D5C1761BA6E778002D1ABF /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1291BA6E4F0002D1ABF /* libmssilk.a */; }; 63D5C1771BA6E778002D1ABF /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */; }; @@ -139,7 +135,6 @@ 63D5C18E1BA6E92A002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; }; 63D5C18F1BA6E92A002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; }; 63D5C1901BA6E92A002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; }; - 63D5C1911BA6E92A002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; }; 63D5C1921BA6E92A002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; }; 63D5C1931BA6E92A002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; }; 63D5C1941BA6E92A002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; }; @@ -168,7 +163,6 @@ 63D5C1AC1BA6E95C002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; }; 63D5C1AD1BA6E95C002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; }; 63D5C1AE1BA6E95C002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; }; - 63D5C1AF1BA6E95C002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; }; 63D5C1B01BA6E95C002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; }; 63D5C1B11BA6E95C002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; }; 63D5C1B21BA6E95C002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; }; @@ -225,7 +219,6 @@ 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbzrtp.a; path = "../liblinphone-sdk/apple-darwin/lib/libbzrtp.a"; sourceTree = ""; }; 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcunit.a; path = "../liblinphone-sdk/apple-darwin/lib/libcunit.a"; sourceTree = ""; }; 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; - 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbcrfc3951.a; path = "../liblinphone-sdk/apple-darwin/lib/libilbcrfc3951.a"; sourceTree = ""; }; 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphonetester.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphonetester.a"; sourceTree = ""; }; 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; @@ -247,7 +240,6 @@ 63D5C1221BA6E4F0002D1ABF /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = "../liblinphone-sdk/apple-darwin/lib/libx264.a"; sourceTree = ""; }; 63D5C1251BA6E4F0002D1ABF /* libmsamr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsamr.a; sourceTree = ""; }; 63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsbcg729.a; sourceTree = ""; }; - 63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsilbc.a; sourceTree = ""; }; 63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsopenh264.a; sourceTree = ""; }; 63D5C1291BA6E4F0002D1ABF /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmssilk.a; sourceTree = ""; }; 63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmswebrtc.a; sourceTree = ""; }; @@ -267,7 +259,6 @@ files = ( 63D5C1471BA6E516002D1ABF /* libmsamr.a in Frameworks */, 63D5C1481BA6E516002D1ABF /* libmsbcg729.a in Frameworks */, - 63D5C1491BA6E516002D1ABF /* libmsilbc.a in Frameworks */, 63D5C14A1BA6E516002D1ABF /* libmsopenh264.a in Frameworks */, 63D5C14B1BA6E516002D1ABF /* libmssilk.a in Frameworks */, 63D5C14C1BA6E516002D1ABF /* libmswebrtc.a in Frameworks */, @@ -279,7 +270,6 @@ 63D5C1301BA6E504002D1ABF /* libbzrtp.a in Frameworks */, 63D5C1311BA6E504002D1ABF /* libcunit.a in Frameworks */, 63D5C1321BA6E504002D1ABF /* libgsm.a in Frameworks */, - 63D5C1331BA6E504002D1ABF /* libilbcrfc3951.a in Frameworks */, 63D5C1341BA6E504002D1ABF /* liblinphone.a in Frameworks */, 63D5C1351BA6E504002D1ABF /* liblinphonetester.a in Frameworks */, 63D5C1361BA6E504002D1ABF /* libmediastreamer_base.a in Frameworks */, @@ -339,7 +329,6 @@ 63D5C17A1BA6E8BD002D1ABF /* libsqlite3.dylib in Frameworks */, 63D5C1721BA6E778002D1ABF /* libmsamr.a in Frameworks */, 63D5C1731BA6E778002D1ABF /* libmsbcg729.a in Frameworks */, - 63D5C1741BA6E778002D1ABF /* libmsilbc.a in Frameworks */, 63D5C1751BA6E778002D1ABF /* libmsopenh264.a in Frameworks */, 63D5C1761BA6E778002D1ABF /* libmssilk.a in Frameworks */, 63D5C1771BA6E778002D1ABF /* libmswebrtc.a in Frameworks */, @@ -351,7 +340,6 @@ 63D5C15B1BA6E765002D1ABF /* libbzrtp.a in Frameworks */, 63D5C15C1BA6E765002D1ABF /* libcunit.a in Frameworks */, 63D5C15D1BA6E765002D1ABF /* libgsm.a in Frameworks */, - 63D5C15E1BA6E765002D1ABF /* libilbcrfc3951.a in Frameworks */, 63D5C15F1BA6E765002D1ABF /* liblinphone.a in Frameworks */, 63D5C1601BA6E765002D1ABF /* liblinphonetester.a in Frameworks */, 63D5C1611BA6E765002D1ABF /* libmediastreamer_base.a in Frameworks */, @@ -387,7 +375,6 @@ 63D5C18E1BA6E92A002D1ABF /* libbzrtp.a in Frameworks */, 63D5C18F1BA6E92A002D1ABF /* libcunit.a in Frameworks */, 63D5C1901BA6E92A002D1ABF /* libgsm.a in Frameworks */, - 63D5C1911BA6E92A002D1ABF /* libilbcrfc3951.a in Frameworks */, 63D5C1921BA6E92A002D1ABF /* liblinphone.a in Frameworks */, 63D5C1931BA6E92A002D1ABF /* liblinphonetester.a in Frameworks */, 63D5C1941BA6E92A002D1ABF /* libmediastreamer_base.a in Frameworks */, @@ -436,7 +423,6 @@ 63D5C1AC1BA6E95C002D1ABF /* libbzrtp.a in Frameworks */, 63D5C1AD1BA6E95C002D1ABF /* libcunit.a in Frameworks */, 63D5C1AE1BA6E95C002D1ABF /* libgsm.a in Frameworks */, - 63D5C1AF1BA6E95C002D1ABF /* libilbcrfc3951.a in Frameworks */, 63D5C1B01BA6E95C002D1ABF /* liblinphone.a in Frameworks */, 63D5C1B11BA6E95C002D1ABF /* liblinphonetester.a in Frameworks */, 63D5C1B21BA6E95C002D1ABF /* libmediastreamer_base.a in Frameworks */, @@ -539,7 +525,6 @@ 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */, 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */, 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */, - 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */, 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */, 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */, 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */, @@ -591,7 +576,6 @@ children = ( 63D5C1251BA6E4F0002D1ABF /* libmsamr.a */, 63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */, - 63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */, 63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */, 63D5C1291BA6E4F0002D1ABF /* libmssilk.a */, 63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */, From c9df435fc01bb712837679123d21254f9487854b Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 18 Nov 2015 17:35:49 +0100 Subject: [PATCH 12/17] Dialer: fix keyboard display for iPad --- Classes/Base.lproj/DialerViewController.xib | 35 ++++++++++++---- .../Base.lproj/DialerViewController~ipad.xib | 40 +++++++++++++++---- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib index 5e0953d30..e6fd77740 100644 --- a/Classes/Base.lproj/DialerViewController.xib +++ b/Classes/Base.lproj/DialerViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -41,11 +41,13 @@ + + @@ -57,6 +59,7 @@ + @@ -66,6 +69,7 @@ + - + + + @@ -365,9 +389,4 @@ - - - - - diff --git a/Classes/Base.lproj/DialerViewController~ipad.xib b/Classes/Base.lproj/DialerViewController~ipad.xib index 23e0ed78e..0c85fa0c4 100644 --- a/Classes/Base.lproj/DialerViewController~ipad.xib +++ b/Classes/Base.lproj/DialerViewController~ipad.xib @@ -1,8 +1,8 @@ - + - + @@ -40,20 +40,24 @@ + + + + @@ -110,10 +118,12 @@ + + @@ -278,6 +300,7 @@ + + @@ -403,9 +432,4 @@ - - - - - From 6cc55ab4ed2fc690a4b3a9c39e0186b6430a35c1 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 23 Nov 2015 16:02:38 +0100 Subject: [PATCH 13/17] Auth: avoid some authentication errors when manipulation accounts --- Classes/LinphoneCoreSettingsStore.m | 13 +++++++------ Classes/LinphoneManager.m | 18 +++++------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index ff76a437b..5d4be7eaf 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -506,12 +506,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); // We reached here without hitting the goto: the new settings are correct, so replace the previous ones. - // add auth info - linphone_core_clear_all_auth_info(lc); - if (info) { - linphone_core_add_auth_info(lc, info); - } - // setup new proxycfg if (isEditing) { linphone_proxy_config_done(proxyCfg); @@ -521,6 +515,13 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_core_set_default_proxy_config(lc, proxyCfg); } + // add auth info only after finishing editting the proxy config, so that + // UNREGISTER succeed + linphone_core_clear_all_auth_info(lc); + if (info) { + linphone_core_add_auth_info(lc, info); + } + bad_proxy: if (linphoneAddress) linphone_address_destroy(linphoneAddress); diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 69318b67c..a6176349b 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -922,19 +922,11 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char addButtonWithTitle:NSLocalizedString(@"Continue", nil) block:^{ NSString *password = [alertView textFieldAtIndex:0].text; - LinphoneAuthInfo *info = (LinphoneAuthInfo *)linphone_core_find_auth_info( - [LinphoneManager getLc], realm.UTF8String, username.UTF8String, domain.UTF8String); - if (info) { - linphone_auth_info_set_passwd(info, password.UTF8String); - linphone_auth_info_set_ha1(info, NULL); - } else { - LOGW(@"Could not find auth info associated with %@@%@, creating it", username, domain); - info = linphone_auth_info_new(username.UTF8String, NULL, password.UTF8String, NULL, - realm.UTF8String, domain.UTF8String); - linphone_core_add_auth_info([LinphoneManager getLc], info); - } - linphone_proxy_config_refresh_register( - linphone_core_get_default_proxy_config([LinphoneManager getLc])); + LinphoneAuthInfo *info = + linphone_auth_info_new(username.UTF8String, NULL, password.UTF8String, NULL, + realm.UTF8String, domain.UTF8String); + linphone_core_add_auth_info([LinphoneManager getLc], info); + [LinphoneManager.instance refreshRegisters]; }]; [alertView show]; } From bcea5a459c54b45253676f2dddc89710e4330da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 24 Nov 2015 10:45:28 +0100 Subject: [PATCH 14/17] Update liblinphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index b84f3ca57..4b8b216c7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b84f3ca570437476fc14382348789d2c1a537f9a +Subproject commit 4b8b216c7416742ddfa63b525ba3dd1e3c2b7aa9 From 5a5498ef88e20edce9610cd2f6ce8b9914dfc14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 24 Nov 2015 11:47:59 +0100 Subject: [PATCH 15/17] Fix build issues --- Classes/DialerViewController.m | 2 +- Classes/SettingsViewController.m | 3 +-- linphone.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index b4a7d6dfa..0148217ea 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -253,7 +253,7 @@ static UICompositeViewDescription *compositeDescription = nil; [controller setToRecipients:recipients]; if (attachLogs) { - char *filepath = linphone_core_compress_log_collection([LinphoneManager getLc]); + char *filepath = linphone_core_compress_log_collection(); if (filepath == NULL) { LOGE(@"Cannot sent logs: file is NULL"); return; diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index c856fe490..7135d9348 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -781,11 +781,10 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - Mail composer for sending logs - (void)sendEmailWithDebugAttachments { - LinphoneCore *lc = [LinphoneManager getLc]; NSMutableArray *attachments = [[NSMutableArray alloc] initWithCapacity:3]; // retrieve linphone logs if available - char *filepath = linphone_core_compress_log_collection(lc); + char *filepath = linphone_core_compress_log_collection(); if (filepath != NULL) { NSString *filename = [[NSString stringWithUTF8String:filepath] componentsSeparatedByString:@"/"].lastObject; NSString *mimeType = nil; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 511f78930..e0cacc735 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4656,6 +4656,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4741,6 +4742,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4826,6 +4828,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4912,6 +4915,7 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; From cd4fa75f35985d7f77bed811560373a81c0c28ee Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 27 Nov 2015 14:17:27 +0100 Subject: [PATCH 16/17] update linphone submodule --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 77510489a..bdf7594a8 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 77510489a6f72d2aa2a539d800f24b0cdf82a23c +Subproject commit bdf7594a81c7c5058b1c4fd1a9cd460bb4666ae7 diff --git a/submodules/linphone b/submodules/linphone index 4b8b216c7..f99fe0ced 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4b8b216c7416742ddfa63b525ba3dd1e3c2b7aa9 +Subproject commit f99fe0ced506dd6588dae8cdbf7b624e6f2f999c From 36a2e0c8052d6e60aa38f44b52d49acfa908cc20 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 30 Nov 2015 16:51:18 +0100 Subject: [PATCH 17/17] i18n: update translations --- Classes/fr.lproj/ChatViewController.strings | Bin 1542 -> 1540 bytes Classes/fr.lproj/DialerViewController.strings | Bin 4536 -> 4532 bytes .../DialerViewController~ipad.strings | Bin 4762 -> 4758 bytes Resources/fr.lproj/Localizable.strings | Bin 34430 -> 34426 bytes .../ar.lproj/Root.strings | Bin 1578 -> 1426 bytes .../de.lproj/Root.strings | Bin 1642 -> 1462 bytes .../fr.lproj/Root.strings | Bin 1654 -> 1454 bytes .../ja.lproj/Root.strings | Bin 1512 -> 1338 bytes .../nl.lproj/Root.strings | Bin 1560 -> 1404 bytes .../ru.lproj/Root.strings | Bin 1636 -> 1432 bytes .../zh_TW.lproj/Root.strings | Bin 1544 -> 1400 bytes 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Classes/fr.lproj/ChatViewController.strings b/Classes/fr.lproj/ChatViewController.strings index 56d8a57db8fb16ef23ca6289a21c0668d4559f48..280ec7c3f679efefd0eb991cb8dfff815928f7b3 100644 GIT binary patch delta 11 ScmZqUY2n#m#X8xB^%MXVVgs-M delta 11 ScmZqSY2(>o#X8x7^$Y+NR0FO6 diff --git a/Classes/fr.lproj/DialerViewController.strings b/Classes/fr.lproj/DialerViewController.strings index fb4629fcb1413e0c62802dd8489fcaccd9417255..78b9ceb4516c87b3c0741e2823b5aa3472706757 100644 GIT binary patch delta 15 Xcmdm?yhVA!zfFu1jGLvH=J5jnGt~u& delta 15 Xcmdm@yhC}yzm0#S7&nVBE#L`Mdyb#Mtq delta 27 jcmey>!}PC*X@j29W*wzGrpY==DwF-%gf^d3S(69=n1}>lqbQvQ&xgUF+&DWECm=)<-mZ-0n&*;UMdhPFk~|10(t2`9&!Mast@MGQlRbmKvNTe R_7pRePyWlQIr#~z8vuMfO3nZP delta 587 zcmaKp%}T>S6orpS??PP*b`|0xDmGHO5S1>{CL!^Mj#%AS?Lx4PG!b=`HxRXN;no-Q zWm=h`pRrtC2(MM#QCfDubA_tGGS7w0gk#X1Jx2bIzICqU~=XU8EYj%MK#hUqC$E zKp`}OEq|)TT$EA9q$lKO>^CVRn(OhU>9P}taEIHeN^NsXZHeXQePwfXK5QJ%&l}+{ Du?J7x diff --git a/Settings/InAppSettings.bundle/de.lproj/Root.strings b/Settings/InAppSettings.bundle/de.lproj/Root.strings index b5e55c073fac0ebf9ea91b067b802653e5ce5619..bd0a0f89bde143478c2f40b5d28587c56b139261 100644 GIT binary patch delta 420 zcmaFGvyFR#lyWhH5`zMREf6a)1T%Ot1OQoy49P&4&rr&c$56shJkd0|-VsGefx!?- z8#Xy>1}>lqbQvQ&x%T5A85bU#GG4ak97!RvrVvLHSct%)PvcMWxQ2bVpeuF2YR(0<%jR8ZJ?DkYw zziRsDdtbV8CLIaVmjQm2EMzLR?89=1C!V+D9A`YKU^|dK{NE^+o^$+0cxt?FdS~t| z*E8Z5us+I{JjqOGjf}@K#&;jqAlZ(5QXT>5PcRL@<5})t%avmat_j{#HAjkEAk#O+ zB!tzJe9z?MAHPz0rrLpGoqq@M*ozl*X(mJGzj?y`TD%h=C-53+7h=!N`T-krH)IEl zmAuMogEiRA;a`>31B3$g^BHBsep8ojlR+ATE>ah6q5FMBhD-TQi*Rh`(jMTpZrMkMB& zFd6ckA;KeU#&n4c>PBm&Lz?{!C(Mv1Q5(G5)RgDF)t*GFAv4smR2>a~_Bw8Zk-Tv# zUdcIp$jxc;)^QUA?dAhw6nN*3**0g+fR&7JUV?#na*i$Nhf3pYX82y{U5_)MTKpul zM!nlKAA4{O4(6Wv+EeZ^a^ubQd^h;AeMEaeY~E_WO?D%!kA9yGw0ho}6q{4F?X_!{ z9RWdQv;LKK(0bu3$k4MAbx|?gos;#%sXlIOcAhuO6v0YNT>-tA=&Yz)MqMdDnZ8Vy+Ie*ss<3Yq`_ diff --git a/Settings/InAppSettings.bundle/fr.lproj/Root.strings b/Settings/InAppSettings.bundle/fr.lproj/Root.strings index 6bdd6e1fe0d8caacd6ed8e4d521d7b9e936085d6..1aafbce71b4bbe34eb853515dc47ed7d98c59087 100644 GIT binary patch delta 446 zcmeyyvyOX$lyWhH5`zMREf6a)1T%Ot1OQoy49P&4&rr&c$56shJkdP1-VsGefx!?- z8#Xy>1}>lqbQvQ&x03@tQE&u=k literal 1654 zcma)6%TmHX5S+7Lk>a9$gXJNDR&h`ek$ZrsDIr8iK>yC);V0DY8J68uw5(Jr$z&cq zy*=~!(ULpqN?#JmWP)oUjg(SL3zl=-Eos9xmkPEV-{#$tGdaS)fqFA`g{#0_<2{b= z$QJRLEOF(y6Pd~J!3fLQ#{XRX6G?x;bSV$Gh}dN$HllY(9m0EHGM^IubG-Y`Zqz@K zDeyEvUZ662$h6l6Sbt{eN+-y`um8mNk&_HX;(wdP<4)y|J7jg5|C%z zqC%_p?IZU>Uga(D3~iQi2rr(|3e|`vJnKXMEUKprjS)e8Ocm>2)yN7vTJ35S%Dm-D zWdy}t1t`76Jje>wlHf_@6?hV{=dF*kYG5(;zk6AhJ7lOex|GK#y7w)s`Cp<&CS%oK zB5PD-4~w8G^++^p*r{am*{YB0tw9v=daNmsI-7Zo4&*jln5zvmGhAV&3dnP{S*9E9 z(RB43cn&aiRDOoqPD?{QyK)!r<~z2!E~e;>D&d5MdQJECE&lLCETV%ivNA*GmChNr zfT>`Nx{rA0ydFAB$EuyNQx3Uzktcc*YviE%3VFdZ-&Z-^qeu}!g@&4bN0dzg_3jbh z!mo%torRmu&;CHWB9r9PwhXoDPlX$jORE-ZL<;aIEaYnkW4K!2d8VJG3?NEmjM40j^2kPL+R45bWt3?&Q-42BF!K++b7l^C$eSu=29kuk!f z3nYhKmobATKBOArY5>9X BNtplu literal 1512 zcmbVMJ5Iwu5S^M+Sm}|rM-(9ei2}%vP*CNkV3F8S;v__(fewy93sr8w2~bMJ2{-`- z9YVmH8Jt~5c8X|aX+8VioA2)LPmZc|NG0;9K`pG1#uQLQIaqe_WuNcR7EUXIXZ8ro z#}{FrR9J^ml>+ss1KtoG^BHlh!>GzBymv$+fL0%Sn?>5$D(jGnsSLF%y7Zsv6qOoM z+rht@XY*mc&BEkJu|;6|!276&jbvfo&6D|DqDs&S>566!#?NHj8 zvQE&Qh?-z<-`vH$EW@)8pSFV5q6!s>ncoJ!+n&5o zL+mUg8=(sByU~&yFB1H$b7k*=!86J4%1mm+b2m)HybcrBf$w1`e7?g|(co-!f;?2A WFJ0leWRE-p?u(E|r8ZOG2>t+6wD@ZP diff --git a/Settings/InAppSettings.bundle/nl.lproj/Root.strings b/Settings/InAppSettings.bundle/nl.lproj/Root.strings index 736487848b3aee141a8e67718243c7d8fe8eb260..c971a0eec7fb141131c0cf73c8e85ac7d2b9a76a 100644 GIT binary patch delta 391 zcmbQi^M`AK6l3v3Nkt%G>0j^2kPL+R45bWt3?&Q-42BF!K++b7l^C$eSu=29kuk!f z3nYhKmobA)UbRv+K3d9NwnGCr=UOJFhjAR~3`X=|Yb^-u#7D6Tf literal 1560 zcmbVMO>crg5S?>>1@Uh*J)pLUhgPfBo-Gh-R4|BI|9so`X58#zfP*0<%glRkKH0zD zp3Gz<6NzLg37$fZl1n8$Sf22<`yb^2-l^irKHyp7t#Ga@bYVHlq&O9ULOa6McLawy`=~Lx=4^&qG$@BQLk*A%^Ylu6&D>@ChA-QlQZ@nV z)^2KZon3xaa5Jl0T@5K}=awWuhZ`H?tL`zz5V(^nb7uUH_&-NLXXxe;UAEhzX`1(N zU7og);SP^Aj}qN5%sZm5k&Ex4w-{oodGjveT@dMwR^sFt?Fdr{@0kQT{HH^Ho8Q=d zFu1L}hc4PDZeLl;xeH?|+_4H<$3FA#KC1?+u^o!gg`G}@o5+a#2g1AJeg$Um4_kZm AcK`qY diff --git a/Settings/InAppSettings.bundle/ru.lproj/Root.strings b/Settings/InAppSettings.bundle/ru.lproj/Root.strings index 72f21d0ac89aa9def725e034970c3f99b79f09b1..f837d1e4dc7a63fceef17ce9cf2e813cdb5a43f8 100644 GIT binary patch delta 430 zcmaFDGlP4Alx8u55`zMREf6a)1T%Ot1OQoy49P&4&rr&c$56rmQen-&HL*~BVvbh5 zBZ`~?gCUZBY;r)IKo#gRMtF3ABh!I~LtYpd=1$CU`6Z$ziw56ss-{P>3in zm@;fW!z96+>c)@*45ea*44_yFFvQA%A(jKA6M?)`AXZ?=WXJ{b(t$kWkS0mr{55alg}>5zPuv#%(AuCJ=cKWg!O#ARWZIwLvE!{-WdFJ39D5xzRGvd`&MH_ts(2Y zr*(H=z0_RQ?bAnz`xbrGU6JRu3;pCZTGEX2^(m46Wp|!+ctq8)^rHL?unwQG16Gr$ zAsGYo%9(zE(IMRQKSXw@mdP)9isCk`-X2pa&*CnKQ}yrV&KSf~UG&cD)@Ftixh6xM z(4)`01$gTq9nrxKYPG=J#S66s98$T&U7sSR`Hsi?YTWwZWFSrGKQqp`25-ReT30~w zGdjVKUko+HpG9_qI_FG!Vs%DxL+^Q=cc`8csmkxVy-2Ae5U=Q2eV51-4n0;`l$(%S zBD3f|8wd6N7ONe0sx#~q&3e{Bj{4d)h$=@>mka8z{Zp#}qg$@L(p!8`rSB@-L$}|o zTko)+QLOr=j(A&qSMr`PQU)d^t^_{ z4QoAV7R~u3xq-9yYwYm%Ge>SSw@tqI12hRdPvJ6vMXv4|e)5hEF=y6?o-v)BRsG8lianWb>d)~U>s2v98~vU$%h$8u(Q0Tn-d_ni V3~f^CTt!rm#Al1T`ehZA!Cxp@=t%$o diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Root.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Root.strings index 71693dda33aa70e1893c2a846358b07136b1c9dd..d1219411f3aefd5f4b1eaf831d200075fab649f6 100644 GIT binary patch literal 1400 zcmbW1-A=+l5QXR3r)YQs|E`P|6*2L~C>ZYxZKSbM11*G?SHIaw(_Ji^NHz_dnRCw0 z&Yb1vdn7Y?lxImKlLf1mR#wu;Mn=SL`C^D0IU_%H997t`O1_4@s`MH$jH#r-`H7r+ z?4jH+>mtI^+%W4h!qVI@>ng(1+%W4p!qS|vW>V0zXj;rQ~sMV#yz;LQ?BJpKG~^v6SxKaZ0Wzf4xL6#&VL)HaJxF^sI|c> zNja~J8R`W@8DRQ|A*QbKf*WtxCGHKc+4Y@2jxdF>^GwDZl&${*%Yc6@Z|pl5>eK@M z-gQbHxDINLVNB(L8d`3!L?NdKJNjJlo4G0EL`x=8`7T*Q88k9zCwg?Q^oULsvT*oo4;cd>H()K%m5@)}T4@)+{>aJU zMu<|`h?>Hp9p1^-a`3Zi@{#q1IhFDWhR%0^K5w0JHS2B^m13D;U!Gl#!9v7~<&`2v zjwmH6&n@3jeLI2*6U?qOW+q>#G%&9{WIQ3l9QElQMRGvQ1x~qRwj-*#_TXr)AzF-X zRW_n#4a(j|R3Evl@dc$|A>!345)TWk!<2CD6B4gxxu>DAY_WOD5A!7jC z!IX7cdTaFdM&PFC=N|p%+t4(}Tewx8+(o~=@p(VhM$|jvFOf~?W3Ui0w#@bI(7PYm z3s&G180`ou_;)3NP9onmew&}{M=*3#_1!sHr*s30TFzYnZ