From 24ee7277366816a427ea286c1f6a0226aa61896e Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 27 Oct 2014 17:12:49 +0100 Subject: [PATCH] Fix discrepancies spotted by analysis --- Classes/ChatRoomTableViewController.m | 1 + Classes/ChatRoomViewController.m | 1 + Classes/ContactsTableViewController.m | 1 + Classes/HistoryDetailsViewController.m | 12 ------------ Classes/LinphoneAppDelegate.h | 1 - Classes/LinphoneManager.m | 1 + Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m | 4 ++-- Classes/Utils/ColorSpaceUtilites.m | 1 - Classes/Utils/FastAddressBook.m | 11 +++-------- 9 files changed, 9 insertions(+), 24 deletions(-) diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m index e1995274b..1cb7c0104 100644 --- a/Classes/ChatRoomTableViewController.m +++ b/Classes/ChatRoomTableViewController.m @@ -47,6 +47,7 @@ // chatRoom = NULL; } - (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; [self reloadData]; } diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index bcd3c89fb..cd80c92c7 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -229,6 +229,7 @@ static UICompositeViewDescription *compositeDescription = nil; } -(void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; [TUNinePatchCache flushCache]; // will remove any images cache (freeing any cached but unused images) } diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index 399bb157f..3a9d1c40e 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -99,6 +99,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf } CFRelease(lDict); } + CFRelease(personSipAddresses); return match; } diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m index e918a0c2d..3b9d34051 100644 --- a/Classes/HistoryDetailsViewController.m +++ b/Classes/HistoryDetailsViewController.m @@ -383,18 +383,6 @@ static UICompositeViewDescription *compositeDescription = nil; if(lAddress == NULL) return; - NSString *displayName = nil; - if(contact != nil) { - displayName = [FastAddressBook getContactDisplayName:contact]; - } else { - const char* lDisplayName = linphone_address_get_display_name(addr); - const char* lUserName = linphone_address_get_username(addr); - if (lDisplayName) - displayName = [NSString stringWithUTF8String:lDisplayName]; - else if(lUserName) - displayName = [NSString stringWithUTF8String:lUserName]; - } - // Go to ChatRoom view [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]]; ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); diff --git a/Classes/LinphoneAppDelegate.h b/Classes/LinphoneAppDelegate.h index 223b3d390..a0ec499e1 100644 --- a/Classes/LinphoneAppDelegate.h +++ b/Classes/LinphoneAppDelegate.h @@ -27,7 +27,6 @@ @private UIBackgroundTaskIdentifier bgStartId; BOOL startedInBackground; - int savedMaxCall; } - (void)processRemoteNotification:(NSDictionary*)userInfo; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index f9b42dbeb..56780aece 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1954,6 +1954,7 @@ static void audioRouteChangeListenerCallback ( NSData* data = [NSJSONSerialization dataWithJSONObject:appDataDict options:0 error:nil]; NSString* appdataJSON = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; linphone_chat_message_set_appdata(msg, [appdataJSON UTF8String] ); + [appdataJSON release]; } #pragma mark - LPConfig Functions diff --git a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m index 3fc8c767a..ad1838bd2 100644 --- a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m +++ b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m @@ -42,10 +42,10 @@ } - (void)refreshUI { - NSMutableString *name = [[NSMutableString alloc] initWithString:@"numpad_one_"]; + NSString *name = @"numpad_one_"; if ([self voiceMailEnabled]) { - [name appendString:@"voicemail_"]; + name = [name stringByAppendingString:@"voicemail_"]; } [self setImage:[UIImage imageNamed:[name stringByAppendingString:@"default.png"]] forState: UIControlStateNormal]; diff --git a/Classes/Utils/ColorSpaceUtilites.m b/Classes/Utils/ColorSpaceUtilites.m index 5f845a428..9071e6160 100644 --- a/Classes/Utils/ColorSpaceUtilites.m +++ b/Classes/Utils/ColorSpaceUtilites.m @@ -84,7 +84,6 @@ void RGB2HSL(float r, float g, float b, float* outH, float* outS, float* outL) h = 0; s = 0; - l = 0; v = MAX(r, g); v = MAX(v, b); diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index 15e7770b9..042c0afa2 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -134,16 +134,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf addressBook = ABAddressBookCreateWithOptions(NULL, NULL); if(addressBook != NULL) { - if(ABAddressBookGetAuthorizationStatus) { - ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) { - ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self); - [self loadData]; - }); - } else { + ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) { ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self); [self loadData]; - } - } else { + }); + } else { [LinphoneLogger log:LinphoneLoggerError format:@"Create AddressBook: Fail(%@)", [error localizedDescription]]; } }