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

release: version 3.8.5 build 2.3

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-07-30 16:10:24 +02:00
parent 1e8821b5b3
commit fa852e1872
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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