mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-09 14:10:55 +02:00
commit bb92accc7c
4 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Classes/LinphoneCoreSettingsStore.m
View file

@ -309,7 +309,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setInteger:linphone_core_get_upload_bandwidth(lc) forKey:@"upload_bandwidth_preference"];
[self setInteger:linphone_core_get_download_bandwidth(lc) forKey:@"download_bandwidth_preference"];
[self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"];
[self setCString:linphone_core_get_adaptive_rate_algorithm(lc) forKey:@"adaptive_rate_algorithm_preference"];
}
// tunnel section
@ -719,8 +718,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionNone);
linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]);
linphone_core_set_adaptive_rate_algorithm(lc, [[self stringForKey:@"adaptive_rate_algorithm_preference"]
cStringUsingEncoding:[NSString defaultCStringEncoding]]);
}
// tunnel section

20
Settings/InAppSettings.bundle/Network.plist
View file

@ -172,26 +172,6 @@
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>
<dict>
<key>DefaultValue</key>
<string>Simple</string>
<key>Key</key>
<string>adaptive_rate_algorithm_preference</string>
<key>Title</key>
<string>Adaptive rate algorithm</string>
<key>Titles</key>
<array>
<string>Simple</string>
<string>Stateful</string>
</array>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Values</key>
<array>
<string>Simple</string>
<string>Stateful</string>
</array>
</dict>
</array>
</dict>
</plist>

7
TestsUI/ChatTester.m
View file

@ -160,17 +160,14 @@
// create lots of chat rooms...
LinphoneCore *lc = [LinphoneManager getLc];
for (int i = 0; i < 100; i++) {
LinphoneChatRoom *room =
linphone_core_get_chat_room_from_uri(lc, [[NSString stringWithFormat:@"%@ - %d", [self me], i] UTF8String]);
linphone_chat_room_send_message(room, "Hello");
linphone_core_get_chat_room_from_uri(lc, [[NSString stringWithFormat:@"%@ - %d", [self me], i] UTF8String]);
}
[tester waitForTimeInterval:5]; // wait for all messages to be delivered
NSTimeInterval before = [[NSDate date] timeIntervalSince1970];
[tester tapViewWithAccessibilityLabel:@"Chat"];
NSTimeInterval after = [[NSDate date] timeIntervalSince1970];
XCTAssertEqual([[self findTableView:@"ChatRoom list"] numberOfRowsInSection:0], 100);
// conversation loading MUST be less than 1 sec
XCTAssertLessThan(after - before, 1.);
}

1
TestsUI/LinphoneTestCase.m
View file

@ -24,7 +24,6 @@
if (!([language isEqualToString:@"en"] || [language containsString:@"en-"])) {
LOGF(@"Language must be 'en' (English) instead of %@", language);
}
linphone_core_set_log_level(ORTP_MESSAGE);
}
- (void)beforeAll {