forked from mirrors/linphone-iphone
Fix fullscreen mode when return in InCall View
Fix memory leaks
This commit is contained in:
parent
e1a1ae33e6
commit
6950283052
6 changed files with 12 additions and 8 deletions
|
|
@ -342,8 +342,8 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
#endif
|
||||
|
||||
- (void)enableVideoDisplay:(BOOL)animation {
|
||||
if(videoShown)
|
||||
- (void)enableVideoDisplay:(BOOL)animation {
|
||||
if(videoShown && animation)
|
||||
return;
|
||||
|
||||
videoShown = true;
|
||||
|
|
@ -392,7 +392,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
}
|
||||
|
||||
- (void)disableVideoDisplay:(BOOL)animation {
|
||||
if(!videoShown)
|
||||
if(!videoShown && animation)
|
||||
return;
|
||||
|
||||
videoShown = false;
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
|
|||
}
|
||||
|
||||
- (BOOL)valueChangedForKey:(NSString*)key {
|
||||
return [ [changedDict valueForKey:key] boolValue];
|
||||
return [[changedDict valueForKey:key] boolValue];
|
||||
}
|
||||
|
||||
- (void)synchronizeAccount {
|
||||
|
|
|
|||
|
|
@ -219,11 +219,12 @@ struct codec_name_pref_table codec_pref_table[]={
|
|||
|
||||
//generic log handler for debug version
|
||||
void linphone_iphone_log_handler(int lev, const char *fmt, va_list args){
|
||||
NSString* format = [NSString stringWithUTF8String:fmt];
|
||||
NSString* format = [[NSString alloc] initWithUTF8String:fmt];
|
||||
NSLogv(format, args);
|
||||
NSString* formatedString = [[NSString alloc] initWithFormat:format arguments:args];
|
||||
//[[LinphoneManager instance] addLog:formatedString];
|
||||
[formatedString release];
|
||||
[format release];
|
||||
}
|
||||
|
||||
//Error/warning log handler
|
||||
|
|
|
|||
|
|
@ -294,9 +294,10 @@
|
|||
- (void)update: (UICompositeViewDescription*) description tabBar:(NSNumber*)tabBar fullscreen:(NSNumber*)fullscreen {
|
||||
|
||||
// Copy view description
|
||||
UICompositeViewDescription *oldViewDescription = (currentViewDescription != nil)? [currentViewDescription copy]: nil;
|
||||
UICompositeViewDescription *oldViewDescription = nil;
|
||||
|
||||
if(description != nil) {
|
||||
oldViewDescription = currentViewDescription;
|
||||
currentViewDescription = [description copy];
|
||||
|
||||
// Animate only with a previous screen
|
||||
|
|
@ -331,6 +332,8 @@
|
|||
[[UIDevice currentDevice] performSelector:NSSelectorFromString(@"setOrientation:") withObject:(id)correctOrientation];
|
||||
}
|
||||
[self applySubLayoutsForInterfaceOrientation:correctOrientation];
|
||||
} else {
|
||||
oldViewDescription = (currentViewDescription != nil)? [currentViewDescription copy]: nil;
|
||||
}
|
||||
|
||||
if(currentViewDescription == nil) {
|
||||
|
|
|
|||
|
|
@ -2483,13 +2483,13 @@
|
|||
D326483415887D4400930C67 /* Utils */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D3F7997E15BD31EC0018C273 /* TPMultiLayoutViewController */,
|
||||
D38935F715A6D06800A3A3AA /* CPAnimation */,
|
||||
D32B9DFA15A2F131000B6DEC /* FastAddressBook.h */,
|
||||
D32B9DFB15A2F131000B6DEC /* FastAddressBook.m */,
|
||||
D326483615887D5200930C67 /* OrderedDictionary.h */,
|
||||
D326483715887D5200930C67 /* OrderedDictionary.m */,
|
||||
D3F9A9DD15AF0FFE0045320F /* TPKeyboardAvoiding */,
|
||||
D3F7997E15BD31EC0018C273 /* TPMultiLayoutViewController */,
|
||||
D3F9A9EB15AF27620045320F /* UACellBackgroundView */,
|
||||
C9B3A6FD15B485DB006F52EE /* Utils.h */,
|
||||
D35860D515B549B500513429 /* Utils.m */,
|
||||
|
|
|
|||
2
submodules/externals/exosip
vendored
2
submodules/externals/exosip
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit dfe434328c0b0cbbaee669d40b27e09fea5f49ab
|
||||
Subproject commit 8c42924ae9009f6003e98d29638e078ca1bd7c71
|
||||
Loading…
Add table
Reference in a new issue