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

fix crash: IASKAppSettingsView is load before app entering foreground

Browse source
This commit is contained in:
Danmei Chen 2020-05-26 19:36:16 +02:00
parent b4d3992d25
commit e06da76068
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Classes/SettingsView.m
View file

@ -196,18 +196,23 @@
- (IASKSettingsReader *)settingsReader {
IASKSettingsReader *r = [super settingsReader];
NSMutableArray *dataSource = [NSMutableArray arrayWithArray:[r dataSource]];
for (int i = 0; i < [dataSource count]; ++i) {
NSMutableArray *specifiers = [NSMutableArray arrayWithArray:[dataSource objectAtIndex:i]];
for (int j = 0; j < [specifiers count]; ++j) {
id sp = [specifiers objectAtIndex:j];
if ([sp isKindOfClass:[IASKSpecifier class]]) {
sp = [SettingsView filterSpecifier:sp];
if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
for (int i = 0; i < [dataSource count]; ++i) {
NSMutableArray *specifiers = [NSMutableArray arrayWithArray:[dataSource objectAtIndex:i]];
for (int j = 0; j < [specifiers count]; ++j) {
id sp = [specifiers objectAtIndex:j];
if ([sp isKindOfClass:[IASKSpecifier class]]) {
sp = [SettingsView filterSpecifier:sp];
}
[specifiers replaceObjectAtIndex:j withObject:sp];
}
[specifiers replaceObjectAtIndex:j withObject:sp];
}
[dataSource replaceObjectAtIndex:i withObject:specifiers];
[dataSource replaceObjectAtIndex:i withObject:specifiers];
}
} else {
NSLog(@"Application is in background, linphonecore is off, skiping filter specifier.");
}
[r setDataSource:dataSource];
return r;
}

4
Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
View file

@ -242,8 +242,8 @@ CGRect IASKCGRectSwap(CGRect rect);
[super viewDidDisappear:animated];
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
return YES;
- (BOOL)shouldAutorotate {
return YES;
}
- (void)didReceiveMemoryWarning {