witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Merge remote-tracking branch 'public/master' into 3.0.x

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-07-31 16:50:27 +02:00
commit 4cfbab8019
9 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -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

2
Classes/Base.lproj/WizardViews.xib
View file

@ -202,7 +202,7 @@
<textField opaque="NO" clipsSubviews="YES" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" adjustsFontSizeToFit="NO" minimumFontSize="10" background="field_background.png" id="75" userLabel="passwordField" customClass="UILinphoneTextField">
<rect key="frame" x="36" y="269" width="287" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Password"/>
<accessibility key="accessibilityConfiguration" label="Password "/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" secureTextEntry="YES"/>
<connections>

6
Classes/ChatTableViewController.m
View file

@ -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;

7
Classes/WizardViewController.m
View file

@ -951,8 +951,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)
@ -968,7 +969,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];
@ -984,7 +985,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];

20
TestsUI/WizardTester.m
View file

@ -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"];
}

4
linphone-Info.plist
View file

@ -24,7 +24,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.7.6</string>
<string>3.8.5</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@ -53,7 +53,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.2.6</string>
<string>2.3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>

2
linphone.xcodeproj/project.pbxproj
View file

@ -303,7 +303,6 @@
63B81A101B57DA33009604A6 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 63B81A0B1B57DA33009604A6 /* UIScrollView+TPKeyboardAvoidingAdditions.m */; };
63CD4B4F1A5AAC8C00B84282 /* DTAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */; };
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 */; };
7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; };
70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; };
@ -1197,7 +1196,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 */,

2
linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
View file

@ -111,7 +111,7 @@
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
buildConfiguration = "Distribution"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 7ec48ad644bbb7906e2f06e8abde5633b52f1926
Subproject commit 3cf82aaf9e1a84a8438341b026abd8c13520e005