From 8be3e15b140e5f866cfb1cfdf7ac3450ded86c16 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 22 Jul 2015 15:05:25 +0200 Subject: [PATCH 1/7] .gitmodules: use mirrors for sourceforge repositories which is down --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index abf4b679f..c2326bd1c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = git://git.linphone.org/libilbc-rfc3951.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr - url = git://git.code.sf.net/p/opencore-amr/code + url = git://git.linphone.org/opencore-amr ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr @@ -86,5 +86,5 @@ url = git://git.linphone.org/linphone-cmake-builder.git [submodule "submodules/externals/vo-amrwbenc"] path = submodules/externals/vo-amrwbenc - url = git://git.code.sf.net/p/opencore-amr/vo-amrwbenc + url = git://git.linphone.org/vo-amrwbenc ignore = dirty From bbbd10c1d94490f4b3b40d85105ff0e7c1ed832b Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 22 Jul 2015 15:18:28 +0200 Subject: [PATCH 2/7] submodules: update KIF --- Classes/KIF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/KIF b/Classes/KIF index 621d453e3..7cf06309a 160000 --- a/Classes/KIF +++ b/Classes/KIF @@ -1 +1 @@ -Subproject commit 621d453e3ae9255894f319c9814d50ae7d676121 +Subproject commit 7cf06309ad1e5b694f1ae6f2f40c0e8d386f7f06 From eb826bc5f889d6a6c98605926733684b93b43cb7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 23 Jul 2015 11:50:06 +0200 Subject: [PATCH 3/7] update belle-sip & linphone submodules --- Classes/DialerViewController.m | 8 ++++---- Classes/InCallViewController.m | 4 ++-- linphone.xcodeproj/project.pbxproj | 2 -- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index c1d07cec3..b4a7d6dfa 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -128,7 +128,7 @@ static UICompositeViewDescription *compositeDescription = nil; BOOL previewPref = [mgr lpConfigBoolForKey:@"preview_preference"]; if (videoEnabled && previewPref) { - linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); + linphone_core_set_native_preview_window_id(lc, (__bridge void *)(videoPreview)); if (!linphone_core_video_preview_enabled(lc)) { linphone_core_enable_video_preview(lc, TRUE); @@ -137,7 +137,7 @@ static UICompositeViewDescription *compositeDescription = nil; [backgroundView setHidden:FALSE]; [videoCameraSwitch setHidden:FALSE]; } else { - linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); + linphone_core_set_native_preview_window_id(lc, NULL); linphone_core_enable_video_preview(lc, FALSE); [backgroundView setHidden:TRUE]; [videoCameraSwitch setHidden:TRUE]; @@ -232,11 +232,11 @@ static UICompositeViewDescription *compositeDescription = nil; if ([LinphoneManager runningOnIpad]) { LinphoneCore *lc = [LinphoneManager getLc]; if (linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) { - linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); + linphone_core_set_native_preview_window_id(lc, (__bridge void *)(videoPreview)); [backgroundView setHidden:FALSE]; [videoCameraSwitch setHidden:FALSE]; } else { - linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); + linphone_core_set_native_preview_window_id(lc, NULL); [backgroundView setHidden:TRUE]; [videoCameraSwitch setHidden:TRUE]; } diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index a3603f9e8..b1a790bc1 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -132,8 +132,8 @@ static UICompositeViewDescription *compositeDescription = nil; [self callUpdate:call state:state animated:FALSE]; // Set windows (warn memory leaks) - linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView); - linphone_core_set_native_preview_window_id([LinphoneManager getLc], (unsigned long)videoPreview); + linphone_core_set_native_video_window_id([LinphoneManager getLc], (__bridge void *)(videoView)); + linphone_core_set_native_preview_window_id([LinphoneManager getLc], (__bridge void *)(videoPreview)); // Enable tap [singleFingerTap setEnabled:TRUE]; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 521ce0cbb..ed3299a3d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -173,7 +173,6 @@ 63D2680F1B174A5E00A2CC11 /* numpad_one_voicemail_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680D1B174A5E00A2CC11 /* numpad_one_voicemail_default.png */; }; 63D268101B174A5E00A2CC11 /* numpad_one_voicemail_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680E1B174A5E00A2CC11 /* numpad_one_voicemail_over.png */; }; 63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; }; - 63EA4C951B50189D00922857 /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63EA4C941B50189D00922857 /* libmswebrtc.a */; }; 63FB30351A680E73008CA393 /* UIRoundedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63FB30341A680E73008CA393 /* UIRoundedImageView.m */; }; 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; }; 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; }; @@ -1880,7 +1879,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 63EA4C951B50189D00922857 /* libmswebrtc.a in Frameworks */, 63A4280A1B26F576000DAB93 /* libSKP_SILK_SDK.a in Frameworks */, 152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */, 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */, diff --git a/submodules/belle-sip b/submodules/belle-sip index 580012c55..703848fb1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 580012c556ba0e4d0f09bf3f182cdf55e030f215 +Subproject commit 703848fb1496c5a372c8a8f04447cd25fbb626cf diff --git a/submodules/linphone b/submodules/linphone index 04c43a9f6..4073c6e0d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 04c43a9f64db5152e2859528c40dbd79008ccf5b +Subproject commit 4073c6e0d0eaf331da8c458a3504b5c8f5924b62 From 14385eaf8b2c7ed46dc530ea1afaa1cb08a4f792 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 27 Jul 2015 20:35:42 +0200 Subject: [PATCH 4/7] update both belle-sip&linphone --- 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 703848fb1..7ec48ad64 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 703848fb1496c5a372c8a8f04447cd25fbb626cf +Subproject commit 7ec48ad644bbb7906e2f06e8abde5633b52f1926 diff --git a/submodules/linphone b/submodules/linphone index 4073c6e0d..441696255 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4073c6e0d0eaf331da8c458a3504b5c8f5924b62 +Subproject commit 4416962557c9cd90c6cb22efd06f73d9155a4f8a From 1e8821b5b3e0fcf0b3aa811d6d2b5545c0b329d2 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 28 Jul 2015 09:50:16 +0200 Subject: [PATCH 5/7] submodules: rechange KIF submodule to official version since PR has been merged --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c2326bd1c..f8ebf7732 100644 --- a/.gitmodules +++ b/.gitmodules @@ -79,7 +79,7 @@ url = git://git.linphone.org/mswebrtc.git [submodule "Classes/KIF"] path = Classes/KIF - url = https://github.com/bagage/KIF.git + url = https://github.com/kif-framework/KIF.git ignore = dirty [submodule "submodules/cmake-builder"] path = submodules/cmake-builder From fa852e18728454e017f3858fce5dd2d468fcefd9 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 30 Jul 2015 16:10:24 +0200 Subject: [PATCH 6/7] release: version 3.8.5 build 2.3 --- Classes/ChatTableViewController.m | 6 +----- Classes/WizardViewController.m | 7 ++++--- linphone-Info.plist | 4 ++-- .../xcshareddata/xcschemes/linphone.xcscheme | 2 +- submodules/belle-sip | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Classes/ChatTableViewController.m b/Classes/ChatTableViewController.m index 0d11fb767..ed656c698 100644 --- a/Classes/ChatTableViewController.m +++ b/Classes/ChatTableViewController.m @@ -82,12 +82,8 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo // store last message in user data LinphoneChatRoom *chat_room = iter->data; MSList *history = linphone_chat_room_get_history(iter->data, 1); - assert(ms_list_size(history) <= 1); LinphoneChatMessage *last_msg = history ? history->data : NULL; - if (last_msg) { - linphone_chat_message_ref(last_msg); - linphone_chat_room_set_user_data(chat_room, last_msg); - } + linphone_chat_room_set_user_data(chat_room, last_msg); sorted = ms_list_insert_sorted(sorted, chat_room, (MSCompareFunc)sorted_history_comparison); iter = iter->next; diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 5852f2a24..d7e007e7d 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -953,8 +953,9 @@ static UICompositeViewDescription *compositeDescription = nil; otherButtonTitles:nil, nil]; [errorView show]; } else if ([response object] != nil) { // Don't handle if not object: HTTP/Communication Error + NSString *value = [response object]; if ([[request method] isEqualToString:@"check_account"]) { - if ([response object] == [NSNumber numberWithInt:1]) { + if ([value integerValue] == 1) { UIAlertView *errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check issue", nil) message:NSLocalizedString(@"Username already exists", nil) @@ -970,7 +971,7 @@ static UICompositeViewDescription *compositeDescription = nil; [self createAccount:identity password:password email:email]; } } else if ([[request method] isEqualToString:@"create_account_with_useragent"]) { - if ([response object] == [NSNumber numberWithInt:0]) { + if ([value integerValue] == 0) { NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text; NSString *password = [WizardViewController findTextField:ViewElement_Password view:contentView].text; [self changeView:validateAccountView back:FALSE animation:TRUE]; @@ -986,7 +987,7 @@ static UICompositeViewDescription *compositeDescription = nil; [errorView show]; } } else if ([[request method] isEqualToString:@"check_account_validated"]) { - if ([response object] == [NSNumber numberWithInt:1]) { + if ([value integerValue] == 1) { NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text; NSString *password = [WizardViewController findTextField:ViewElement_Password view:contentView].text; [self addProxyConfig:username password:password domain:nil withTransport:nil]; diff --git a/linphone-Info.plist b/linphone-Info.plist index d7bbb99a0..04f0fcf6b 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -24,7 +24,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.7.6 + 3.8.5 CFBundleURLTypes @@ -53,7 +53,7 @@ CFBundleVersion - 2.2.6 + 2.3 LSRequiresIPhoneOS UIApplicationExitsOnSuspend diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme index bb73200b0..f647fdabe 100644 --- a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme +++ b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme @@ -111,7 +111,7 @@ buildConfiguration = "Debug"> diff --git a/submodules/belle-sip b/submodules/belle-sip index 7ec48ad64..3cf82aaf9 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7ec48ad644bbb7906e2f06e8abde5633b52f1926 +Subproject commit 3cf82aaf9e1a84a8438341b026abd8c13520e005 From 2c94dc1d969dccdadc8c808770947308726d807b Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 31 Jul 2015 16:33:01 +0200 Subject: [PATCH 7/7] LinphoneUITester: add account creation test --- Classes/Base.lproj/WizardViews.xib | 2 +- TestsUI/WizardTester.m | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Classes/Base.lproj/WizardViews.xib b/Classes/Base.lproj/WizardViews.xib index 82ac47106..95e4efe8c 100644 --- a/Classes/Base.lproj/WizardViews.xib +++ b/Classes/Base.lproj/WizardViews.xib @@ -200,7 +200,7 @@ - + diff --git a/TestsUI/WizardTester.m b/TestsUI/WizardTester.m index f2db3c59b..03fe024a2 100644 --- a/TestsUI/WizardTester.m +++ b/TestsUI/WizardTester.m @@ -67,6 +67,26 @@ #pragma mark - Tests +- (void)testAccountCreation { + NSString *username = [NSString stringWithFormat:@"%@-%.2f", [self getUUID], [[NSDate date] timeIntervalSince1970]]; + [tester tapViewWithAccessibilityLabel:@"Start"]; + [tester tapViewWithAccessibilityLabel:@"Create linphone.org account" traits:UIAccessibilityTraitButton]; + + [tester enterText:username intoViewWithAccessibilityLabel:@"Username"]; + [tester enterText:username intoViewWithAccessibilityLabel:@"Password "]; + [tester enterText:username intoViewWithAccessibilityLabel:@"Password again"]; + [tester enterText:@"testios@.dev.null" intoViewWithAccessibilityLabel:@"Email"]; + + [tester tapViewWithAccessibilityLabel:@"Register" traits:UIAccessibilityTraitButton]; + + [tester waitForViewWithAccessibilityLabel:@"Check validation" traits:UIAccessibilityTraitButton]; + [tester tapViewWithAccessibilityLabel:@"Check validation"]; + + [tester waitForViewWithAccessibilityLabel:@"Account validation issue"]; + [tester tapViewWithAccessibilityLabel:@"Continue"]; + [tester tapViewWithAccessibilityLabel:@"Cancel"]; +} + - (void)testExternalLoginWithTCP { [self _externalLoginWithProtocol:@"TCP"]; }