From 22e828cace07cb51f85e6f0396a01003ca31103d Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 16 Aug 2012 15:47:06 +0200 Subject: [PATCH 01/15] Remove gesture recognizer from PhoneMainView when dealloc InCallViewController --- Classes/ContactDetailsViewController.m | 4 ---- Classes/InCallViewController.h | 1 + Classes/InCallViewController.m | 17 +++++++++++++---- Classes/LinphoneUI/UICompositeViewController.m | 17 ++++++++++++++++- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index aaa216eff..14fdb70f4 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -208,10 +208,6 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf forState:(UIControlStateDisabled | UIControlStateSelected)]; } -- (void)viewDidUnload { - [super viewDidUnload]; -} - - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { diff --git a/Classes/InCallViewController.h b/Classes/InCallViewController.h index b11f30ae3..46055e52b 100644 --- a/Classes/InCallViewController.h +++ b/Classes/InCallViewController.h @@ -40,6 +40,7 @@ UIView* testVideoView; #endif UICamSwitch* videoCameraSwitch; + UITapGestureRecognizer* singleFingerTap; UIActivityIndicatorView* videoWaitingForFirstImage; diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index 4004855ae..e836a18ef 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -53,7 +53,12 @@ const NSInteger SECURE_BUTTON_TAG=5; #pragma mark - Lifecycle Functions - (id)init { - return [super initWithNibName:@"InCallViewController" bundle:[NSBundle mainBundle]]; + self = [super initWithNibName:@"InCallViewController" bundle:[NSBundle mainBundle]]; + if(self != nil) { + self->singleFingerTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(showControls:)]; + self->videoZoomHandler = [[VideoZoomHandler alloc] init]; + } + return self; } - (void)dealloc { @@ -72,6 +77,9 @@ const NSInteger SECURE_BUTTON_TAG=5; [videoZoomHandler release]; + [[PhoneMainView instance].view removeGestureRecognizer:singleFingerTap]; + [singleFingerTap release]; + // Remove all observer [[NSNotificationCenter defaultCenter] removeObserver:self]; @@ -171,13 +179,10 @@ static UICompositeViewDescription *compositeDescription = nil; linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView); linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)videoPreview); - UITapGestureRecognizer* singleFingerTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(showControls:)]; [singleFingerTap setNumberOfTapsRequired:1]; [singleFingerTap setCancelsTouchesInView: FALSE]; [[PhoneMainView instance].view addGestureRecognizer:singleFingerTap]; - [singleFingerTap release]; - videoZoomHandler = [[VideoZoomHandler alloc] init]; [videoZoomHandler setup:videoGroup]; videoGroup.alpha = 0; @@ -186,6 +191,10 @@ static UICompositeViewDescription *compositeDescription = nil; removeTableBackground([callTableController view]); } +- (void)viewDidUnload { + [super viewDidUnload]; + [[PhoneMainView instance].view removeGestureRecognizer:singleFingerTap]; +} - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration]; diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 7de22a1e4..1c5362d37 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -244,6 +244,10 @@ return NO; } +- (void)didReceiveMemoryWarning { + [self clearCache]; +} + #pragma mark - Event Functions @@ -259,7 +263,18 @@ #pragma mark - - (void)clearCache { - [viewControllerCache removeAllObjects]; + for(NSString *key in [viewControllerCache allKeys]) { + UIViewController *vc = [viewControllerCache objectForKey:key]; + if(vc != self.stateBarViewController && + vc != self.tabBarViewController && + vc != self.contentViewController) { + if ([[UIDevice currentDevice].systemVersion doubleValue] >= 5.0) { + [vc viewWillUnload]; + } + [vc viewDidUnload]; + } + [viewControllerCache removeObjectForKey:key]; + } } - (UIInterfaceOrientation)currentOrientation { From eb96fdc9d398defefa07ce48cf1fae213898029f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 20 Aug 2012 11:13:10 +0200 Subject: [PATCH 02/15] Fix database opening if original file doesn't exist --- Classes/LinphoneManager.m | 4 ++++ Classes/LinphoneUI/UICompositeViewController.m | 1 + Classes/PhoneMainView.h | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index e1fc78eb5..0c999466c 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -234,6 +234,10 @@ struct codec_name_pref_table codec_pref_table[]={ if ([fileManager fileExistsAtPath:databaseDocumentPath] == NO) { [LinphoneLogger logc:LinphoneLoggerLog format:"Create sqlite3 database"]; NSString *resourceDocumentPath = [[NSBundle mainBundle] pathForResource:@"database" ofType:@"sqlite"]; + if ([fileManager fileExistsAtPath:resourceDocumentPath] == NO) { + [LinphoneLogger log:LinphoneLoggerError format:@"Can't find original database: %@", [error localizedDescription]]; + return; + } [fileManager copyItemAtPath:resourceDocumentPath toPath:databaseDocumentPath error:&error]; if(error != nil) { [LinphoneLogger log:LinphoneLoggerError format:@"Can't copy database: %@", [error localizedDescription]]; diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 1c5362d37..2b18de7c1 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -245,6 +245,7 @@ } - (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; [self clearCache]; } diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index 68e4bf9f2..b79f53403 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -43,7 +43,6 @@ @private UICompositeViewController *mainViewController; - UIActionSheet *incomingCallActionSheet; UIActionSheet *batteryActionSheet; int loadCount; From 4c0d7a533b3452494990e7adb2d0f5c42463f099 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Aug 2012 11:35:13 +0200 Subject: [PATCH 03/15] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index c97efee37..05601300f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c97efee37aea1ccae3c476a108e988e47f38faa4 +Subproject commit 05601300f64c0f095ba0faeb9e2dd1c1e9483238 From b3f5d7f260942e555d2d8dd994ebc6260cca30d8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Aug 2012 10:14:14 +0200 Subject: [PATCH 04/15] Add ICE configuration parameter. --- Classes/LinphoneCoreSettingsStore.m | 10 +++++++++- Settings/InAppSettings.bundle/Network.plist | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 86bd9814a..f776bc624 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -155,6 +155,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); } { [self setString: linphone_core_get_stun_server(lc) forKey:@"stun_preference"]; + [self + setInteger:lp_config_get_int(linphone_core_get_config(lc),"app","ice_preference" + , 0) forKey:@"ice_preference"]; } { @@ -429,7 +432,12 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); NSString* stun_server = [self stringForKey:@"stun_preference"]; if ([stun_server length] > 0){ linphone_core_set_stun_server(lc,[stun_server cStringUsingEncoding:[NSString defaultCStringEncoding]]); - linphone_core_set_firewall_policy(lc, LinphonePolicyUseStun); + BOOL ice_preference = [self boolForKey:@"ice_preference"]; + if(ice_preference) { + linphone_core_set_firewall_policy(lc, LinphonePolicyUseIce); + } else { + linphone_core_set_firewall_policy(lc, LinphonePolicyUseStun); + } } else { linphone_core_set_stun_server(lc, NULL); linphone_core_set_firewall_policy(lc, LinphonePolicyNoFirewall); diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist index 0f067d74f..c8a4ac946 100644 --- a/Settings/InAppSettings.bundle/Network.plist +++ b/Settings/InAppSettings.bundle/Network.plist @@ -28,6 +28,16 @@ DefaultValue + + Title + ICE + Key + ice_preference + Type + PSToggleSwitchSpecifier + DefaultValue + + Type PSToggleSwitchSpecifier From ce6c547e6bb9f481be906e90784ee31d1b270c0f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Aug 2012 11:36:58 +0200 Subject: [PATCH 05/15] Hide ICE option if STUN server is not filled. --- Classes/SettingsViewController.m | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index b0c555e68..25936e47f 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -442,6 +442,15 @@ static UICompositeViewDescription *compositeDescription = nil; [hiddenKeys removeObject:@"start_at_boot_preference"]; } [settingsController setHiddenKeys:hiddenKeys animated:TRUE]; + } else if ([@"stun_preference" compare: notif.object] == NSOrderedSame) { + NSMutableSet *hiddenKeys = [NSMutableSet setWithSet:[settingsController hiddenKeys]]; + NSString *stun_server = [notif.userInfo objectForKey:@"stun_preference"]; + if (stun_server && ([stun_server length] > 0)) { + [hiddenKeys removeObject:@"ice_preference"]; + } else { + [hiddenKeys addObject:@"ice_preference"]; + } + [settingsController setHiddenKeys:hiddenKeys animated:TRUE]; } } @@ -490,6 +499,10 @@ static UICompositeViewDescription *compositeDescription = nil; [hiddenKeys addObject:@"port_preference"]; } + if([[[[[LinphoneManager instance] settingsStore] objectForKey:@"stun_preference"] stringValue] length] == 0) { + [hiddenKeys addObject:@"ice_preference"]; + } + return hiddenKeys; } From 046962fd065bed7bd1ff5f4c4d5d485ccf9d6b59 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 20 Aug 2012 13:22:54 +0200 Subject: [PATCH 06/15] Remove useless variables (with property defined) --- Classes/ChatRoomTableViewController.h | 1 - Classes/ChatRoomViewController.h | 11 +--- Classes/ChatViewController.h | 2 - Classes/ConsoleViewController.h | 2 - Classes/ContactDetailsImagePickerController.h | 2 - Classes/ContactDetailsLabelViewController.h | 4 -- Classes/ContactDetailsLabelViewController.m | 7 +-- Classes/ContactDetailsTableViewController.h | 4 -- Classes/ContactDetailsTableViewController.m | 2 +- Classes/ContactDetailsViewController.h | 6 --- Classes/ContactDetailsViewController.m | 30 +++++------ Classes/ContactsTableViewController.h | 1 + Classes/ContactsViewController.h | 7 --- Classes/DialerViewController.h | 49 +++++------------- Classes/FirstLoginViewController.h | 5 -- Classes/HistoryDetailsViewController.h | 12 +---- Classes/HistoryTableViewController.h | 1 - Classes/HistoryTableViewController.m | 5 +- Classes/HistoryViewController.h | 7 --- Classes/InCallTableViewController.m | 2 +- Classes/InCallViewController.h | 17 +------ Classes/IncomingCallViewController.h | 5 -- Classes/LinphoneManager.h | 9 ---- Classes/LinphoneUI/UICallBar.h | 50 +++++-------------- Classes/LinphoneUI/UICallButton.h | 2 - Classes/LinphoneUI/UICallCell.h | 19 ------- Classes/LinphoneUI/UICallCell.m | 2 +- Classes/LinphoneUI/UICamSwitch.h | 2 - Classes/LinphoneUI/UIChatCell.h | 7 --- Classes/LinphoneUI/UIChatRoomCell.h | 8 --- Classes/LinphoneUI/UIChatRoomCell.m | 2 +- .../LinphoneUI/UICompositeViewController.h | 15 ------ .../LinphoneUI/UICompositeViewController.m | 2 +- Classes/LinphoneUI/UIConferenceHeader.h | 2 - Classes/LinphoneUI/UIContactCell.h | 4 -- Classes/LinphoneUI/UIContactDetailsFooter.h | 3 -- Classes/LinphoneUI/UIContactDetailsHeader.h | 9 +--- Classes/LinphoneUI/UIDigitButton.h | 4 -- Classes/LinphoneUI/UIDigitButton.m | 2 +- Classes/LinphoneUI/UIEditableTableViewCell.h | 1 - Classes/LinphoneUI/UIEraseButton.h | 4 +- Classes/LinphoneUI/UIHistoryCell.h | 6 --- Classes/LinphoneUI/UIMainBar.h | 9 ---- Classes/LinphoneUI/UIPauseButton.m | 6 +-- Classes/LinphoneUI/UIStateBar.h | 4 -- Classes/LinphoneUI/UITransferButton.h | 2 - Classes/LinphoneUI/UIVideoButton.h | 3 -- Classes/LinphoneUI/UIVideoButton.m | 4 +- Classes/Model/ChatModel.m | 4 +- Classes/MoreViewController.h | 10 +--- Classes/PhoneMainView.h | 5 -- Classes/PhoneMainView.m | 4 +- Classes/SettingsViewController.h | 2 - .../UACellBackgroundView.m | 8 +-- Classes/WizardViewController.h | 19 ++----- 55 files changed, 76 insertions(+), 339 deletions(-) diff --git a/Classes/ChatRoomTableViewController.h b/Classes/ChatRoomTableViewController.h index 1a0e3256c..e36041750 100644 --- a/Classes/ChatRoomTableViewController.h +++ b/Classes/ChatRoomTableViewController.h @@ -24,7 +24,6 @@ @interface ChatRoomTableViewController : UITableViewController { @private NSMutableArray *data; - NSString *remoteAddress; } @property (nonatomic, retain) NSString *remoteAddress; diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h index 03ac04c83..350aede1c 100644 --- a/Classes/ChatRoomViewController.h +++ b/Classes/ChatRoomViewController.h @@ -27,17 +27,8 @@ #include "linphonecore.h" @interface ChatRoomViewController : UIViewController { - ChatRoomTableViewController *tableController; - UITextField *messageField; - UIButton *sendButton; - NSString *remoteAddress; - UIToggleButton *editButton; + @private LinphoneChatRoom *chatRoom; - UILabel *addressLabel; - UIImageView *avatarImage; - UIView *headerView; - UIView *footerView; - UIImageView *fieldBackgroundImage; } diff --git a/Classes/ChatViewController.h b/Classes/ChatViewController.h index 999fcfb6f..17f56d4db 100644 --- a/Classes/ChatViewController.h +++ b/Classes/ChatViewController.h @@ -25,8 +25,6 @@ #import "UICompositeViewController.h" @interface ChatViewController : UIViewController { - ChatTableViewController *tableController; - UIToggleButton *editButton; } @property (nonatomic, retain) IBOutlet ChatTableViewController* tableController; diff --git a/Classes/ConsoleViewController.h b/Classes/ConsoleViewController.h index 5ae2f3a28..2512b8251 100644 --- a/Classes/ConsoleViewController.h +++ b/Classes/ConsoleViewController.h @@ -22,8 +22,6 @@ #import "LogView.h" @interface ConsoleViewController : UIViewController { - UITextView* logs; - UIView* logsView; } -(void) doAction; diff --git a/Classes/ContactDetailsImagePickerController.h b/Classes/ContactDetailsImagePickerController.h index eea057bf5..3e0fcff72 100644 --- a/Classes/ContactDetailsImagePickerController.h +++ b/Classes/ContactDetailsImagePickerController.h @@ -26,8 +26,6 @@ @end @interface ContactDetailsImagePickerController : UIImagePickerController { -@private - id imagePickerDelegate; } @property (nonatomic, retain) id imagePickerDelegate; diff --git a/Classes/ContactDetailsLabelViewController.h b/Classes/ContactDetailsLabelViewController.h index f67e4a253..b03ecb175 100644 --- a/Classes/ContactDetailsLabelViewController.h +++ b/Classes/ContactDetailsLabelViewController.h @@ -27,10 +27,6 @@ @end @interface ContactDetailsLabelViewController : UIViewController { - NSDictionary *dataList; - UITableView *tableView; - NSString *selectedData; - id delegate; } @property (nonatomic, copy) NSString *selectedData; diff --git a/Classes/ContactDetailsLabelViewController.m b/Classes/ContactDetailsLabelViewController.m index c63b70abf..88b42e134 100644 --- a/Classes/ContactDetailsLabelViewController.m +++ b/Classes/ContactDetailsLabelViewController.m @@ -83,10 +83,11 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - Property Functions - (void)setDataList:(NSDictionary *)adatalist { - if (self->dataList != nil) { - [self->dataList release]; + if([dataList isEqualToDictionary:adatalist]) { + return; } - self->dataList = [adatalist retain]; + [dataList release]; + dataList = [adatalist retain]; [tableView reloadData]; } diff --git a/Classes/ContactDetailsTableViewController.h b/Classes/ContactDetailsTableViewController.h index 978007841..9d59e805b 100644 --- a/Classes/ContactDetailsTableViewController.h +++ b/Classes/ContactDetailsTableViewController.h @@ -27,13 +27,9 @@ @interface ContactDetailsTableViewController : UITableViewController { @private - ABRecordRef contact; NSMutableArray *dataCache; NSMutableArray *labelArray; NSIndexPath *editingIndexPath; - UIContactDetailsHeader *headerController; - UIContactDetailsFooter *footerController; - id contactDetailsDelegate; } @property (nonatomic, assign) ABRecordRef contact; diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 784efef47..994497c0a 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -369,7 +369,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C if(contact != nil && ABRecordGetRecordID(contact) == kABRecordInvalidID) { CFRelease(contact); } - self->contact = acontact; + contact = acontact; [self loadData]; [headerController setContact:contact]; } diff --git a/Classes/ContactDetailsViewController.h b/Classes/ContactDetailsViewController.h index 5e1f159ed..cc445a0c3 100644 --- a/Classes/ContactDetailsViewController.h +++ b/Classes/ContactDetailsViewController.h @@ -25,12 +25,6 @@ #import "ContactDetailsTableViewController.h" @interface ContactDetailsViewController : UIViewController { - ContactDetailsTableViewController *tableController; - ABRecordRef contact; - UIToggleButton *editButton; - UIButton *backButton; - UIButton *cancelButton; - ABAddressBookRef addressBook; BOOL inhibUpdate; } diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index 14fdb70f4..d8cac2053 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -142,20 +142,20 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf - (void)newContact { [LinphoneLogger logc:LinphoneLoggerLog format:"New contact"]; - self->contact = NULL; + contact = NULL; [self resetData]; - self->contact = ABPersonCreate(); - [tableController setContact:self->contact]; + contact = ABPersonCreate(); + [tableController setContact:contact]; [self enableEdit:FALSE]; [[tableController tableView] reloadData]; } - (void)newContact:(NSString*)address { [LinphoneLogger logc:LinphoneLoggerLog format:"New contact"]; - self->contact = NULL; + contact = NULL; [self resetData]; - self->contact = ABPersonCreate(); - [tableController setContact:self->contact]; + contact = ABPersonCreate(); + [tableController setContact:contact]; [tableController addSipField:address]; [self enableEdit:FALSE]; [[tableController tableView] reloadData]; @@ -163,20 +163,20 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf - (void)editContact:(ABRecordRef)acontact { [LinphoneLogger logc:LinphoneLoggerLog format:"Edit contact %p", acontact]; - self->contact = NULL; + contact = NULL; [self resetData]; - self->contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact)); - [tableController setContact:self->contact]; + contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact)); + [tableController setContact:contact]; [self enableEdit:FALSE]; [[tableController tableView] reloadData]; } - (void)editContact:(ABRecordRef)acontact address:(NSString*)address { [LinphoneLogger logc:LinphoneLoggerLog format:"Edit contact %p", acontact]; - self->contact = NULL; + contact = NULL; [self resetData]; - self->contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact)); - [tableController setContact:self->contact]; + contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact)); + [tableController setContact:contact]; [tableController addSipField:address]; [self enableEdit:FALSE]; [[tableController tableView] reloadData]; @@ -187,10 +187,10 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf - (void)setContact:(ABRecordRef)acontact { [LinphoneLogger logc:LinphoneLoggerLog format:"Set contact %p", acontact]; - self->contact = NULL; + contact = NULL; [self resetData]; - self->contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact)); - [tableController setContact:self->contact]; + contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact)); + [tableController setContact:contact]; } diff --git a/Classes/ContactsTableViewController.h b/Classes/ContactsTableViewController.h index fa63b5fbd..d1cbd99a0 100644 --- a/Classes/ContactsTableViewController.h +++ b/Classes/ContactsTableViewController.h @@ -23,6 +23,7 @@ #import "OrderedDictionary.h" @interface ContactsTableViewController : UITableViewController { + @private OrderedDictionary* addressBookMap; NSMutableDictionary* avatarMap; diff --git a/Classes/ContactsViewController.h b/Classes/ContactsViewController.h index 2b14e492c..0c8fc791c 100644 --- a/Classes/ContactsViewController.h +++ b/Classes/ContactsViewController.h @@ -42,13 +42,6 @@ typedef enum _ContactSelectionMode { @end @interface ContactsViewController : UIViewController { - ContactsTableViewController *tableController; - UITableView *tableView; - - UIButton *allButton; - UIButton *linphoneButton; - UIButton *backButton; - UIButton *addButton; } @property (nonatomic, retain) IBOutlet ContactsTableViewController* tableController; diff --git a/Classes/DialerViewController.h b/Classes/DialerViewController.h index 876541100..ef088b355 100644 --- a/Classes/DialerViewController.h +++ b/Classes/DialerViewController.h @@ -27,31 +27,6 @@ #import "UIDigitButton.h" @interface DialerViewController : UIViewController { -@private - //Buttons - UITextField* addressField; - UIButton* addContactButton; - UIButton* backButton; - UIEraseButton* eraseButton; - UICallButton* callButton; - UICallButton* addCallButton; - UITransferButton* transferButton; - - //Key pad - UIDigitButton* oneButton; - UIDigitButton* twoButton; - UIDigitButton* threeButton; - UIDigitButton* fourButton; - UIDigitButton* fiveButton; - UIDigitButton* sixButton; - UIDigitButton* sevenButton; - UIDigitButton* eightButton; - UIDigitButton* nineButton; - UIDigitButton* starButton; - UIDigitButton* zeroButton; - UIDigitButton* sharpButton; - - BOOL transferMode; } - (void)setAddress:(NSString*)address; @@ -68,18 +43,18 @@ @property (nonatomic, retain) IBOutlet UIButton* backButton; @property (nonatomic, retain) IBOutlet UIEraseButton* eraseButton; -@property (nonatomic, retain) IBOutlet UIButton* oneButton; -@property (nonatomic, retain) IBOutlet UIButton* twoButton; -@property (nonatomic, retain) IBOutlet UIButton* threeButton; -@property (nonatomic, retain) IBOutlet UIButton* fourButton; -@property (nonatomic, retain) IBOutlet UIButton* fiveButton; -@property (nonatomic, retain) IBOutlet UIButton* sixButton; -@property (nonatomic, retain) IBOutlet UIButton* sevenButton; -@property (nonatomic, retain) IBOutlet UIButton* eightButton; -@property (nonatomic, retain) IBOutlet UIButton* nineButton; -@property (nonatomic, retain) IBOutlet UIButton* starButton; -@property (nonatomic, retain) IBOutlet UIButton* zeroButton; -@property (nonatomic, retain) IBOutlet UIButton* sharpButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* oneButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* twoButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* threeButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* fourButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* fiveButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* sixButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* sevenButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* eightButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* nineButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* starButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton; - (IBAction)onAddContactClick: (id) event; - (IBAction)onBackClick: (id) event; diff --git a/Classes/FirstLoginViewController.h b/Classes/FirstLoginViewController.h index 5f9961cbf..44e022547 100644 --- a/Classes/FirstLoginViewController.h +++ b/Classes/FirstLoginViewController.h @@ -22,11 +22,6 @@ #import "UICompositeViewController.h" @interface FirstLoginViewController : UIViewController { - UIButton* loginButton; - UIButton* siteButton; - UITextField* usernameField; - UITextField* passwordField; - UIView* waitView; } - (IBAction)onLoginClick:(id)sender; diff --git a/Classes/HistoryDetailsViewController.h b/Classes/HistoryDetailsViewController.h index 14da3917b..df6ffac34 100644 --- a/Classes/HistoryDetailsViewController.h +++ b/Classes/HistoryDetailsViewController.h @@ -24,17 +24,7 @@ #import "UICompositeViewController.h" @interface HistoryDetailsViewController : UIViewController { - LinphoneCallLog *callLog; - UIImageView *avatarImage; - UILabel *addressLabel; - UILabel *dateLabel; - UILabel *dateHeaderLabel; - UILabel *durationLabel; - UILabel *durationHeaderLabel; - UILabel *typeLabel; - UILabel *typeHeaderLabel; - UIButton *addressButton; - UIButton *addContactButton; + @private ABRecordRef contact; } @property (nonatomic, retain) IBOutlet UIImageView *avatarImage; diff --git a/Classes/HistoryTableViewController.h b/Classes/HistoryTableViewController.h index 9b2dc7aef..6214a3b4f 100644 --- a/Classes/HistoryTableViewController.h +++ b/Classes/HistoryTableViewController.h @@ -21,7 +21,6 @@ @interface HistoryTableViewController : UITableViewController { @private - BOOL missedFilter; NSMutableArray *callLogs; } diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m index ad0c33234..b14825271 100644 --- a/Classes/HistoryTableViewController.m +++ b/Classes/HistoryTableViewController.m @@ -69,7 +69,10 @@ #pragma mark - Property Functions - (void)setMissedFilter:(BOOL)amissedFilter { - self->missedFilter = amissedFilter; + if(missedFilter == amissedFilter) { + return; + } + missedFilter = amissedFilter; [self loadData]; [[self tableView] reloadData]; } diff --git a/Classes/HistoryViewController.h b/Classes/HistoryViewController.h index 93025f1b7..5f21f6a0e 100644 --- a/Classes/HistoryViewController.h +++ b/Classes/HistoryViewController.h @@ -24,13 +24,6 @@ #import "UIToggleButton.h" @interface HistoryViewController : UIViewController { - @private - HistoryTableViewController *tableController; - UITableView *tableView; - - UIButton *allButton; - UIButton *missedButton; - UIToggleButton *editButton; } @property (nonatomic, retain) IBOutlet HistoryTableViewController* tableController; diff --git a/Classes/InCallTableViewController.m b/Classes/InCallTableViewController.m index 66956f91a..4b21b862f 100644 --- a/Classes/InCallTableViewController.m +++ b/Classes/InCallTableViewController.m @@ -34,7 +34,7 @@ enum TableSection { #pragma mark - Lifecycle Functions - (void)initInCallTableViewController { - self->callCellData = [[NSMutableDictionary alloc] init]; + callCellData = [[NSMutableDictionary alloc] init]; } - (id)init{ diff --git a/Classes/InCallViewController.h b/Classes/InCallViewController.h index 46055e52b..d9df2a3b7 100644 --- a/Classes/InCallViewController.h +++ b/Classes/InCallViewController.h @@ -29,26 +29,11 @@ @class VideoViewController; @interface InCallViewController : UIViewController { - - InCallTableViewController* callTableController; - UITableView* callTableView; - - UIView* videoGroup; - UIView* videoView; - UIView* videoPreview; -#ifdef TEST_VIDEO_VIEW_CHANGE - UIView* testVideoView; -#endif - UICamSwitch* videoCameraSwitch; + @private UITapGestureRecognizer* singleFingerTap; - - UIActivityIndicatorView* videoWaitingForFirstImage; - NSTimer* hideControlsTimer; - BOOL videoShown; VideoZoomHandler* videoZoomHandler; - UIActionSheet* visibleActionSheet; } diff --git a/Classes/IncomingCallViewController.h b/Classes/IncomingCallViewController.h index cea938b97..a9829e07a 100644 --- a/Classes/IncomingCallViewController.h +++ b/Classes/IncomingCallViewController.h @@ -31,11 +31,6 @@ @end @interface IncomingCallViewController : UIViewController { -@private - UILabel* addressLabel; - UIImageView* avatarImage; - LinphoneCall *call; - id delegate; } @property (nonatomic, retain) IBOutlet UILabel* addressLabel; diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 34bcabc3c..997ee7c45 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -74,19 +74,10 @@ typedef struct _LinphoneManagerSounds { @private NSTimer* mIterateTimer; - bool isbackgroundModeEnabled; Connectivity connectivity; - const char* frontCamId; - const char* backCamId; - FastAddressBook* fastAddressBook; - - LinphoneManagerSounds sounds; NSMutableArray *inhibitedEvent; - id settingsStore; - sqlite3 *database; - @public CallContext currentCallContextBeforeGoingBackground; diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h index 580fa2751..d328c2173 100644 --- a/Classes/LinphoneUI/UICallBar.h +++ b/Classes/LinphoneUI/UICallBar.h @@ -28,32 +28,6 @@ #import "TPMultiLayoutViewController.h" @interface UICallBar: TPMultiLayoutViewController { - UIPauseButton* pauseButton; - UIButton* conferenceButton; - UIVideoButton* videoButton; - UIMicroButton* microButton; - UISpeakerButton* speakerButton; - UIToggleButton* optionsButton; - UIHangUpButton* hangupButton; - UIView* padView; - UIView* optionsView; - UIButton* optionsAddButton; - UIButton* optionsTransferButton; - UIToggleButton* dialerButton; - - //Key pad - UIDigitButton* oneButton; - UIDigitButton* twoButton; - UIDigitButton* threeButton; - UIDigitButton* fourButton; - UIDigitButton* fiveButton; - UIDigitButton* sixButton; - UIDigitButton* sevenButton; - UIDigitButton* eightButton; - UIDigitButton* nineButton; - UIDigitButton* starButton; - UIDigitButton* zeroButton; - UIDigitButton* sharpButton; } @property (nonatomic, retain) IBOutlet UIPauseButton* pauseButton; @@ -70,18 +44,18 @@ @property (nonatomic, retain) IBOutlet UIButton* optionsTransferButton; @property (nonatomic, retain) IBOutlet UIToggleButton* dialerButton; -@property (nonatomic, retain) IBOutlet UIButton* oneButton; -@property (nonatomic, retain) IBOutlet UIButton* twoButton; -@property (nonatomic, retain) IBOutlet UIButton* threeButton; -@property (nonatomic, retain) IBOutlet UIButton* fourButton; -@property (nonatomic, retain) IBOutlet UIButton* fiveButton; -@property (nonatomic, retain) IBOutlet UIButton* sixButton; -@property (nonatomic, retain) IBOutlet UIButton* sevenButton; -@property (nonatomic, retain) IBOutlet UIButton* eightButton; -@property (nonatomic, retain) IBOutlet UIButton* nineButton; -@property (nonatomic, retain) IBOutlet UIButton* starButton; -@property (nonatomic, retain) IBOutlet UIButton* zeroButton; -@property (nonatomic, retain) IBOutlet UIButton* sharpButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* oneButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* twoButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* threeButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* fourButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* fiveButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* sixButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* sevenButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* eightButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* nineButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* starButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton; +@property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton; - (IBAction)onOptionsClick:(id)sender; - (IBAction)onOptionsTransferClick:(id)sender; diff --git a/Classes/LinphoneUI/UICallButton.h b/Classes/LinphoneUI/UICallButton.h index 955d9a4ee..d8b317a1d 100644 --- a/Classes/LinphoneUI/UICallButton.h +++ b/Classes/LinphoneUI/UICallButton.h @@ -21,8 +21,6 @@ @interface UICallButton : UIButton { -@private - UITextField* addressField; } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UICallCell.h b/Classes/LinphoneUI/UICallCell.h index f183a81b6..3cf7e27b6 100644 --- a/Classes/LinphoneUI/UICallCell.h +++ b/Classes/LinphoneUI/UICallCell.h @@ -33,25 +33,6 @@ @end @interface UICallCell : UITableViewCell { - @private - BOOL firstCell; - BOOL conferenceCell; - BOOL currentCall; - - UIImageView* headerBackgroundImage; - UIImageView* headerBackgroundHighlightImage; - - UILabel *addressLabel; - UILabel *stateLabel; - UIImageView *stateImage; - UIPauseButton *pauseButton; - UIButton *removeButton; - UIImageView *avatarImage; - - UIView *headerView; - UIView *avatarView; - - UICallCellData *data; } @property (nonatomic, retain) UICallCellData *data; diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m index 0c863581b..92b32c186 100644 --- a/Classes/LinphoneUI/UICallCell.m +++ b/Classes/LinphoneUI/UICallCell.m @@ -92,7 +92,7 @@ - (void)prepareForReuse { [super prepareForReuse]; - self->currentCall = FALSE; + currentCall = FALSE; [headerBackgroundHighlightImage setAlpha:0.0f]; [data release]; data = nil; diff --git a/Classes/LinphoneUI/UICamSwitch.h b/Classes/LinphoneUI/UICamSwitch.h index a3927bf17..3110b0e71 100644 --- a/Classes/LinphoneUI/UICamSwitch.h +++ b/Classes/LinphoneUI/UICamSwitch.h @@ -21,11 +21,9 @@ @interface UICamSwitch : UIButton { - @private const char* currentCamId; const char* nextCamId; - UIView* preview; } @property (nonatomic, retain) IBOutlet UIView* preview; @end diff --git a/Classes/LinphoneUI/UIChatCell.h b/Classes/LinphoneUI/UIChatCell.h index 126310b04..7d7a1d7cf 100644 --- a/Classes/LinphoneUI/UIChatCell.h +++ b/Classes/LinphoneUI/UIChatCell.h @@ -22,13 +22,6 @@ #import "ChatModel.h" @interface UIChatCell : UITableViewCell { - UIImageView *avatarImage; - UILabel *addressLabel; - UILabel *chatContentLabel; - UIButton *detailsButton; - UIButton *deleteButton; - - ChatModel *chat; } @property (nonatomic, retain) ChatModel *chat; diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h index 7bbb46af9..503fffe66 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.h +++ b/Classes/LinphoneUI/UIChatRoomCell.h @@ -22,14 +22,6 @@ #import "ChatModel.h" @interface UIChatRoomCell : UITableViewCell { - UIImageView *backgroundImage; - UIView *innerView; - UIView *messageView; - UILabel *messageLabel; - UIButton *deleteButton; - UILabel *dateLabel; - - ChatModel *chat; } @property (nonatomic, retain) ChatModel *chat; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index e9351809d..08d5ce136 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -78,7 +78,7 @@ static UIFont *CELL_FONT = nil; - (void)prepareForReuse { [super prepareForReuse]; - self->chat = nil; + chat = nil; } - (void)update { diff --git a/Classes/LinphoneUI/UICompositeViewController.h b/Classes/LinphoneUI/UICompositeViewController.h index 8a64479d3..a401e68ad 100644 --- a/Classes/LinphoneUI/UICompositeViewController.h +++ b/Classes/LinphoneUI/UICompositeViewController.h @@ -24,15 +24,6 @@ #import "TPMultiLayoutViewController.h" @interface UICompositeViewDescription: NSObject{ - NSString *name; - NSString *content; - NSString *stateBar; - BOOL stateBarEnabled; - NSString *tabBar; - BOOL tabBarEnabled; - BOOL fullscreen; - BOOL landscapeMode; - BOOL portraitMode; } @property (retain) NSString *name; @@ -65,14 +56,8 @@ @interface UICompositeViewController : TPMultiLayoutViewController { @private - UIView *stateBarView; - UIView *contentView; - UIView *tabBarView; - NSMutableDictionary *viewControllerCache; - UICompositeViewDescription *currentViewDescription; - CATransition *viewTransition; UIInterfaceOrientation currentOrientation; } diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 2b18de7c1..7de90348a 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -102,7 +102,7 @@ #pragma mark - Lifecycle Functions - (void)initUICompositeViewController { - self->viewControllerCache = [[NSMutableDictionary alloc] init]; + viewControllerCache = [[NSMutableDictionary alloc] init]; currentOrientation = UIDeviceOrientationUnknown; } diff --git a/Classes/LinphoneUI/UIConferenceHeader.h b/Classes/LinphoneUI/UIConferenceHeader.h index 22b87cfaa..5834c78ae 100644 --- a/Classes/LinphoneUI/UIConferenceHeader.h +++ b/Classes/LinphoneUI/UIConferenceHeader.h @@ -22,8 +22,6 @@ #import "UIPauseButton.h" @interface UIConferenceHeader : UIViewController { - UIImageView *stateImage; - UIPauseButton *pauseButton; } @property (nonatomic, retain) IBOutlet UIImageView* stateImage; diff --git a/Classes/LinphoneUI/UIContactCell.h b/Classes/LinphoneUI/UIContactCell.h index e9f5a7b01..c94782949 100644 --- a/Classes/LinphoneUI/UIContactCell.h +++ b/Classes/LinphoneUI/UIContactCell.h @@ -21,10 +21,6 @@ #import @interface UIContactCell : UITableViewCell { - UILabel *firstNameLabel; - UILabel *lastNameLabel; - UIImageView *avatarImage; - ABRecordRef contact; } @property (nonatomic, retain) IBOutlet UILabel* firstNameLabel; diff --git a/Classes/LinphoneUI/UIContactDetailsFooter.h b/Classes/LinphoneUI/UIContactDetailsFooter.h index 08b14b850..79496261f 100644 --- a/Classes/LinphoneUI/UIContactDetailsFooter.h +++ b/Classes/LinphoneUI/UIContactDetailsFooter.h @@ -22,9 +22,6 @@ #import "ContactDetailsDelegate.h" @interface UIContactDetailsFooter : UIViewController { -@private - UIButton *removeButton; - id contactDetailsDelegate; } @property (nonatomic, retain) IBOutlet UIButton *removeButton; diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.h b/Classes/LinphoneUI/UIContactDetailsHeader.h index 79cb1dd1b..a9279f002 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.h +++ b/Classes/LinphoneUI/UIContactDetailsHeader.h @@ -24,16 +24,9 @@ #import "ContactDetailsDelegate.h" @interface UIContactDetailsHeader : UIViewController { - UILabel *addressLabel; - UIImageView *avatarImage; - UIView *normalView; - UIView *editView; - UITableView *tableView; - + @private NSArray *propertyList; - ABRecordRef contact; BOOL editing; - id contactDetailsDelegate; } @property (nonatomic, assign) ABRecordRef contact; diff --git a/Classes/LinphoneUI/UIDigitButton.h b/Classes/LinphoneUI/UIDigitButton.h index 65f2d20a5..4b7d9f0e4 100644 --- a/Classes/LinphoneUI/UIDigitButton.h +++ b/Classes/LinphoneUI/UIDigitButton.h @@ -23,10 +23,6 @@ @interface UIDigitButton : UILongTouchButton { -@private - char digit; - bool dtmf; - UITextField* addressField; } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UIDigitButton.m b/Classes/LinphoneUI/UIDigitButton.m index dcafad7b6..3f84c0ee6 100644 --- a/Classes/LinphoneUI/UIDigitButton.m +++ b/Classes/LinphoneUI/UIDigitButton.m @@ -31,7 +31,7 @@ #pragma mark - Lifecycle Functions - (void)initUIDigitButton { - self->dtmf = FALSE; + dtmf = FALSE; [self addTarget:self action:@selector(touchDown:) forControlEvents:UIControlEventTouchDown]; [self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside|UIControlEventTouchUpOutside]; } diff --git a/Classes/LinphoneUI/UIEditableTableViewCell.h b/Classes/LinphoneUI/UIEditableTableViewCell.h index 5549da4b0..d4ac998c5 100644 --- a/Classes/LinphoneUI/UIEditableTableViewCell.h +++ b/Classes/LinphoneUI/UIEditableTableViewCell.h @@ -20,7 +20,6 @@ #import @interface UIEditableTableViewCell : UITableViewCell { - UITextField *detailTextField; } @property (nonatomic, retain) IBOutlet UITextField *detailTextField; diff --git a/Classes/LinphoneUI/UIEraseButton.h b/Classes/LinphoneUI/UIEraseButton.h index 0e9e2af51..7baced2e6 100644 --- a/Classes/LinphoneUI/UIEraseButton.h +++ b/Classes/LinphoneUI/UIEraseButton.h @@ -21,9 +21,7 @@ #import "UILongTouchButton.h" -@interface UIEraseButton : UILongTouchButton { -@private - UITextField* addressField; +@interface UIEraseButton : UILongTouchButton { } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UIHistoryCell.h b/Classes/LinphoneUI/UIHistoryCell.h index 2ce131462..574f84484 100644 --- a/Classes/LinphoneUI/UIHistoryCell.h +++ b/Classes/LinphoneUI/UIHistoryCell.h @@ -22,12 +22,6 @@ #include "linphonecore.h" @interface UIHistoryCell : UITableViewCell { - UIImageView* imageView; - UILabel* addressLabel; - UIButton* detailsButton; - UIButton* deleteButton; - @private - LinphoneCallLog *callLog; } @property (nonatomic, assign) LinphoneCallLog *callLog; diff --git a/Classes/LinphoneUI/UIMainBar.h b/Classes/LinphoneUI/UIMainBar.h index 210247659..7038ba394 100644 --- a/Classes/LinphoneUI/UIMainBar.h +++ b/Classes/LinphoneUI/UIMainBar.h @@ -21,15 +21,6 @@ #import "TPMultiLayoutViewController.h" @interface UIMainBar : TPMultiLayoutViewController { - UIButton *historyButton; - UIButton *contactsButton; - UIButton *dialerButton; - UIButton *settingsButton; - UIButton *chatButton; - UIView *historyNotificationView; - UILabel *historyNotificationLabel; - UIView *chatNotificationView; - UILabel *chatNotificationLabel; } @property (nonatomic, retain) IBOutlet UIButton* historyButton; diff --git a/Classes/LinphoneUI/UIPauseButton.m b/Classes/LinphoneUI/UIPauseButton.m index d7d747961..ed6b962b6 100644 --- a/Classes/LinphoneUI/UIPauseButton.m +++ b/Classes/LinphoneUI/UIPauseButton.m @@ -29,7 +29,7 @@ #pragma mark - Lifecycle Functions - (void)initUIPauseButton { - self->type = UIPauseButtonType_CurrentCall; + type = UIPauseButtonType_CurrentCall; } - (id)init{ @@ -91,8 +91,8 @@ #pragma mark - - (void)setType:(UIPauseButtonType) atype call:(LinphoneCall*)acall { - self->type = atype; - self->call = acall; + type = atype; + call = acall; } diff --git a/Classes/LinphoneUI/UIStateBar.h b/Classes/LinphoneUI/UIStateBar.h index 5d0806b0d..a2f075a19 100644 --- a/Classes/LinphoneUI/UIStateBar.h +++ b/Classes/LinphoneUI/UIStateBar.h @@ -21,10 +21,6 @@ #import "TPMultiLayoutViewController.h" @interface UIStateBar : TPMultiLayoutViewController { - UIImageView* registrationStateImage; - UILabel* registrationStateLabel; - UIImageView* callQualityImage; - UIImageView* callSecurityImage; } @property (nonatomic, retain) IBOutlet UIImageView* registrationStateImage; diff --git a/Classes/LinphoneUI/UITransferButton.h b/Classes/LinphoneUI/UITransferButton.h index f6178358e..451ff75d4 100644 --- a/Classes/LinphoneUI/UITransferButton.h +++ b/Classes/LinphoneUI/UITransferButton.h @@ -20,8 +20,6 @@ #import @interface UITransferButton : UIButton { -@private - UITextField* addressField; } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UIVideoButton.h b/Classes/LinphoneUI/UIVideoButton.h index fbd07c43f..759911f00 100644 --- a/Classes/LinphoneUI/UIVideoButton.h +++ b/Classes/LinphoneUI/UIVideoButton.h @@ -22,9 +22,6 @@ #import "UIToggleButton.h" @interface UIVideoButton : UIToggleButton { - BOOL locked; - BOOL unlockVideoState; - UIActivityIndicatorView *waitView; } @property (assign) BOOL locked; diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m index 6de7c2842..2368b9bfa 100644 --- a/Classes/LinphoneUI/UIVideoButton.m +++ b/Classes/LinphoneUI/UIVideoButton.m @@ -27,8 +27,8 @@ @synthesize waitView; - (void)initUIVideoButton { - self->locked = FALSE; - self->unlockVideoState = FALSE; + locked = FALSE; + unlockVideoState = FALSE; } - (id)init{ diff --git a/Classes/Model/ChatModel.m b/Classes/Model/ChatModel.m index 88eec26d8..a216cdd8d 100644 --- a/Classes/Model/ChatModel.m +++ b/Classes/Model/ChatModel.m @@ -90,9 +90,9 @@ } if([self chatId] != nil) { - [self->chatId release]; + [chatId release]; } - self->chatId = [[NSNumber alloc] initWithInt:sqlite3_last_insert_rowid(database)]; + chatId = [[NSNumber alloc] initWithInt:sqlite3_last_insert_rowid(database)]; sqlite3_finalize(sqlStatement); } diff --git a/Classes/MoreViewController.h b/Classes/MoreViewController.h index 896a3a003..589c2dbaf 100644 --- a/Classes/MoreViewController.h +++ b/Classes/MoreViewController.h @@ -21,16 +21,8 @@ @class ConsoleViewController; @interface MoreViewController : UITableViewController { - + @private bool isLogViewEnabled; - - UITableViewCell *credit; - UITextView *creditText; - - UITableViewCell *web; - UILabel *weburi; - UITableViewCell *console; - ConsoleViewController *consoleViewController; bool isDebug; } diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index b79f53403..a80b60d92 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -41,13 +41,8 @@ @interface PhoneMainView : UIViewController { @private - UICompositeViewController *mainViewController; - UIActionSheet *batteryActionSheet; - int loadCount; - - UICompositeViewDescription *currentView; NSMutableArray *viewStack; } diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 390201f3d..60514b27a 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -84,7 +84,7 @@ static PhoneMainView* phoneMainViewInstance=nil; - (void)viewDidLoad { // Avoid IOS 4 bug - if(self->loadCount++ > 0) + if(loadCount++ > 0) return; [super viewDidLoad]; @@ -160,7 +160,7 @@ static PhoneMainView* phoneMainViewInstance=nil; [super viewDidUnload]; // Avoid IOS 4 bug - self->loadCount--; + loadCount--; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { diff --git a/Classes/SettingsViewController.h b/Classes/SettingsViewController.h index b85da7838..9cc04a88e 100644 --- a/Classes/SettingsViewController.h +++ b/Classes/SettingsViewController.h @@ -23,8 +23,6 @@ #import "IASKAppSettingsViewController.h" @interface SettingsViewController: UIViewController { - IASKAppSettingsViewController *settingsController; - UINavigationController *navigationController; } @property (nonatomic, retain) IBOutlet UINavigationController *navigationController; diff --git a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m index 1f8aa8e14..16e7a144f 100644 --- a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m +++ b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m @@ -21,7 +21,7 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi - (void)initUACellBackgroundView { [super setBackgroundColor:[UIColor clearColor]]; - self->automaticPositioning = TRUE; + automaticPositioning = TRUE; } - (id)init { @@ -53,10 +53,10 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi } - (void)setBackgroundColor:(UIColor *)abackgroundColor { - if(self->backgroundColor != nil) { - [self->backgroundColor release]; + if(backgroundColor != nil) { + [backgroundColor release]; } - self->backgroundColor = [[UIColor alloc]initWithCGColor:abackgroundColor.CGColor]; + backgroundColor = [[UIColor alloc]initWithCGColor:abackgroundColor.CGColor]; [self setNeedsDisplay]; } diff --git a/Classes/WizardViewController.h b/Classes/WizardViewController.h index bbb3fc9a7..f0e8f2b99 100644 --- a/Classes/WizardViewController.h +++ b/Classes/WizardViewController.h @@ -22,26 +22,13 @@ #import "UICompositeViewController.h" @interface WizardViewController : UIViewController { - UIScrollView *contentView; - - UIView *welcomeView; - UIView *choiceView; - UIView *createAccountView; - UIView *connectAccountView; - UIView *externalAccountView; - UIView *validateAccountView; - - UIView *waitView; - UIView *currentView; + @private UITextField *activeTextField; - - UIButton *backButton; - UIButton *startButton; - + UIView *currentView; NSMutableArray *historyViews; } -@property (nonatomic, retain) IBOutlet UIView *contentView; +@property (nonatomic, retain) IBOutlet UIScrollView *contentView; @property (nonatomic, retain) IBOutlet UIView *welcomeView; @property (nonatomic, retain) IBOutlet UIView *choiceView; From ae496f788f5e4afad284bcee97727f2bc6fb807e Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 20 Aug 2012 13:55:30 +0200 Subject: [PATCH 07/15] Update linphone module --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 05601300f..ff7c61809 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 05601300f64c0f095ba0faeb9e2dd1c1e9483238 +Subproject commit ff7c61809a89cc4deb3a01e93825906f3d313afb From 26e57b978363b156d91c4c63aac9d138cabb2276 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Aug 2012 14:01:55 +0200 Subject: [PATCH 08/15] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 05601300f..ff7c61809 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 05601300f64c0f095ba0faeb9e2dd1c1e9483238 +Subproject commit ff7c61809a89cc4deb3a01e93825906f3d313afb From 51fc6f00611df5a3a88a4de7f350b6ab150657f1 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Aug 2012 14:36:49 +0200 Subject: [PATCH 09/15] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ff7c61809..0a12fa9ce 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ff7c61809a89cc4deb3a01e93825906f3d313afb +Subproject commit 0a12fa9ce7af5c795722ce1f7ebad9bc85314d3b From 357849ecc111b2c8a4b6822aa10963679e7e8be6 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 20 Aug 2012 17:56:10 +0200 Subject: [PATCH 10/15] Improve UACellBackgroundView --- Classes/ContactsTableViewController.m | 3 ++- .../UACellBackgroundView.h | 5 ++--- .../UACellBackgroundView.m | 19 ++++++++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index 32afdc3c7..2dd00fc26 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -170,7 +170,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf UIContactCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId]; if (cell == nil) { cell = [[[UIContactCell alloc] initWithIdentifier:kCellId] autorelease]; - // Background View + + // Background View UACellBackgroundView *selectedBackgroundView = [[[UACellBackgroundView alloc] initWithFrame:CGRectZero] autorelease]; cell.selectedBackgroundView = selectedBackgroundView; [selectedBackgroundView setBackgroundColor:LINPHONE_TABLE_CELL_BACKGROUND_COLOR]; diff --git a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.h b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.h index a2a397792..ad0298870 100644 --- a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.h +++ b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.h @@ -19,12 +19,11 @@ typedef enum { } UACellBackgroundViewPosition; @interface UACellBackgroundView : UIView { - UACellBackgroundViewPosition position; - BOOL automaticPositioning; } @property(nonatomic) UACellBackgroundViewPosition position; -@property(nonatomic, copy) UIColor *backgroundColor; +@property(nonatomic, copy) UIColor *backgroundColor; +@property(nonatomic, copy) UIColor *borderColor; @property(assign) BOOL automaticPositioning; @end diff --git a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m index 16e7a144f..f5b043489 100644 --- a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m +++ b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m @@ -17,10 +17,14 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi @synthesize position; @synthesize backgroundColor; +@synthesize borderColor; @synthesize automaticPositioning; - (void)initUACellBackgroundView { - [super setBackgroundColor:[UIColor clearColor]]; + backgroundColor = nil; + [self setBackgroundColor:[UIColor colorWithRed:0.02 green:0.549 blue:0.961 alpha:1.0]]; + borderColor = nil; + [self setBorderColor:[UIColor grayColor]]; automaticPositioning = TRUE; } @@ -56,7 +60,16 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi if(backgroundColor != nil) { [backgroundColor release]; } - backgroundColor = [[UIColor alloc]initWithCGColor:abackgroundColor.CGColor]; + backgroundColor = [[UIColor alloc] initWithCGColor:abackgroundColor.CGColor]; + [self setNeedsDisplay]; +} + +- (void)setBorderColor:(UIColor *)aborderColor { + if(borderColor != nil) { + [borderColor release]; + } + + borderColor = [[UIColor alloc] initWithCGColor:aborderColor.CGColor]; [self setNeedsDisplay]; } @@ -123,7 +136,7 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi CGGradientRef myGradient = nil; const CGFloat *default_components = CGColorGetComponents([[self backgroundColor] CGColor]); CGFloat components[8] = {default_components[0], default_components[1], default_components[2], default_components[3], default_components[0] * 0.766f, default_components[1] * 0.766f, default_components[2] * 0.766f, default_components[3]}; - CGContextSetStrokeColorWithColor(c, [[UIColor grayColor] CGColor]); + CGContextSetStrokeColorWithColor(c, [borderColor CGColor]); CGContextSetLineWidth(c, lineWidth); CGContextSetAllowsAntialiasing(c, YES); CGContextSetShouldAntialias(c, YES); From 3d2ed9cfc64e9c914bafc75031b4650d0b05d803 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 21 Aug 2012 12:12:50 +0200 Subject: [PATCH 11/15] set reasonable playout level for dtmfs in keypad (was previously destroying your ears) --- linphonerc | 1 + linphonerc-ipad | 1 + submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/linphonerc b/linphonerc index 0a774e77a..3ee1f3d0b 100644 --- a/linphonerc +++ b/linphonerc @@ -29,6 +29,7 @@ playback_dev_id=AU: Audio Unit Receiver ringer_dev_id=AQ: Audio Queue Device capture_dev_id=AU: Audio Unit Receiver echocancellation=0 +dtmf_player_amp=0.007 [misc] history_max_size=30 diff --git a/linphonerc-ipad b/linphonerc-ipad index 075adf31c..19eb4dddf 100644 --- a/linphonerc-ipad +++ b/linphonerc-ipad @@ -29,6 +29,7 @@ playback_dev_id=AU: Audio Unit Receiver ringer_dev_id=AQ: Audio Queue Device capture_dev_id=AU: Audio Unit Receiver echocancellation=0 +dtmf_player_amp=0.007 [misc] history_max_size=30 diff --git a/submodules/linphone b/submodules/linphone index 0a12fa9ce..75040297c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0a12fa9ce7af5c795722ce1f7ebad9bc85314d3b +Subproject commit 75040297c12e118cea0ec87d2bc3980c290f8e86 From f2c47fd45d1bb64e4744f2491ae53c1b6d7b664b Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 21 Aug 2012 14:50:33 +0200 Subject: [PATCH 12/15] Fix video button disabled state --- Classes/LinphoneUI/UIVideoButton.h | 3 -- Classes/LinphoneUI/UIVideoButton.m | 44 +++++++++++++----------------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/Classes/LinphoneUI/UIVideoButton.h b/Classes/LinphoneUI/UIVideoButton.h index 759911f00..a7b4be5db 100644 --- a/Classes/LinphoneUI/UIVideoButton.h +++ b/Classes/LinphoneUI/UIVideoButton.h @@ -24,9 +24,6 @@ @interface UIVideoButton : UIToggleButton { } -@property (assign) BOOL locked; -@property (assign) BOOL unlockVideoState; - @property (nonatomic, retain) IBOutlet UIActivityIndicatorView* waitView; @end diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m index 2368b9bfa..6100bc7da 100644 --- a/Classes/LinphoneUI/UIVideoButton.m +++ b/Classes/LinphoneUI/UIVideoButton.m @@ -22,13 +22,9 @@ @implementation UIVideoButton -@synthesize locked; -@synthesize unlockVideoState; @synthesize waitView; - (void)initUIVideoButton { - locked = FALSE; - unlockVideoState = FALSE; } - (id)init{ @@ -68,8 +64,6 @@ [self setEnabled: FALSE]; [waitView startAnimating]; - [self setLocked: TRUE]; - [self setUnlockVideoState: TRUE]; LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); if (call) { @@ -95,8 +89,6 @@ [self setEnabled: FALSE]; [waitView startAnimating]; - [self setLocked: TRUE]; - [self setUnlockVideoState: FALSE]; LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); if (call) { @@ -116,26 +108,28 @@ LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]); if (currentCall) { LinphoneCallState state = linphone_call_get_state(currentCall); - if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) { - if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) { - val = true; - if(locked && unlockVideoState) { - locked = FALSE; - [waitView stopAnimating]; - } - } else { - if(locked && !unlockVideoState) { - locked = FALSE; - [waitView stopAnimating]; - } + switch (state) { + case LinphoneCallUpdated: + { + [waitView stopAnimating]; } - if(!locked) { + case LinphoneCallStreamsRunning: + { [self setEnabled:TRUE]; + if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) { + val = true; + } + break; } - } else { - // Disable button if the call is not running - [self setEnabled:FALSE]; - [waitView stopAnimating]; + + default: + { + // Disable button if the call is not running + [self setEnabled:FALSE]; + [waitView stopAnimating]; + break; + } + } } else { // Disable button if there is no call From b8f9ac4c234c199cf31ef9b8f243bc5eb280081f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 21 Aug 2012 14:50:53 +0200 Subject: [PATCH 13/15] Fix history filter issue --- Classes/HistoryTableViewController.m | 6 +++--- Classes/HistoryViewController.m | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m index b14825271..a39ccaea2 100644 --- a/Classes/HistoryTableViewController.m +++ b/Classes/HistoryTableViewController.m @@ -60,8 +60,8 @@ #pragma mark - ViewController Functions -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; [self loadData]; } @@ -74,7 +74,6 @@ } missedFilter = amissedFilter; [self loadData]; - [[self tableView] reloadData]; } @@ -94,6 +93,7 @@ } logs = ms_list_next(logs); } + [[self tableView] reloadData]; } - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m index 11f4f951a..bb37c1108 100644 --- a/Classes/HistoryViewController.m +++ b/Classes/HistoryViewController.m @@ -76,11 +76,15 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; + + if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { + [tableController viewWillAppear:animated]; + } + if([tableController isEditing]) [tableController setEditing:FALSE animated:FALSE]; [editButton setOff]; [self changeView: History_All]; - [self.tableView reloadData]; // Reset missed call linphone_core_reset_missed_calls_count([LinphoneManager getLc]); @@ -88,6 +92,27 @@ static UICompositeViewDescription *compositeDescription = nil; [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCallUpdate object:self]; } +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; + if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { + [tableController viewDidAppear:animated]; + } +} + +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; + if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { + [tableController viewDidDisappear:animated]; + } +} + +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { + [tableController viewWillDisappear:animated]; + } +} + - (void)viewDidLoad { [super viewDidLoad]; [self changeView: History_All]; From 7329929ebf792c6c340cfbc84bb96a676039e197 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 21 Aug 2012 14:54:10 +0200 Subject: [PATCH 14/15] Update mssilk --- Classes/LinphoneAppDelegate.m | 7 ------- Classes/PhoneMainView.m | 6 +----- submodules/mssilk | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 5465b209f..83199faa9 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -30,13 +30,6 @@ #include "LinphoneManager.h" #include "linphonecore.h" -#if __clang__ && __arm__ -extern int __divsi3(int a, int b); -int __aeabi_idiv(int a, int b) { - return __divsi3(a,b); -} -#endif - @implementation UILinphoneWindow @end diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 60514b27a..af4824271 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -326,6 +326,7 @@ static PhoneMainView* phoneMainViewInstance=nil; case LinphoneCallOutgoingInit: case LinphoneCallPausedByRemote: case LinphoneCallConnected: + case LinphoneCallStreamsRunning: case LinphoneCallUpdated: { [self changeCurrentView:[InCallViewController compositeViewDescription]]; @@ -359,11 +360,6 @@ static PhoneMainView* phoneMainViewInstance=nil; [self changeCurrentView:[InCallViewController compositeViewDescription]]; } break; - } - case LinphoneCallStreamsRunning: - { - [self changeCurrentView:[InCallViewController compositeViewDescription]]; - break; } default: break; diff --git a/submodules/mssilk b/submodules/mssilk index 391b6d6b0..d3a6a0a13 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40 +Subproject commit d3a6a0a130730c0eaf9a0b6ed2fc466432852684 From c2e7118f6a2abfa6426e2f5fc31a6e7d4ddfed6c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 21 Aug 2012 15:12:53 +0200 Subject: [PATCH 15/15] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 75040297c..125626d07 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 75040297c12e118cea0ec87d2bc3980c290f8e86 +Subproject commit 125626d071204ca5369eb2f33c727e8e6e6418f7