call: remove timers in pause and conference tables

ringmail · Jan 25, 2016 · 0c0c9b2 · 0c0c9b2
1 parent 619784b
commit 0c0c9b2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 43 deletions.
diff --git a/Classes/CallConferenceTableView.h b/Classes/CallConferenceTableView.h
@@ -8,9 +8,8 @@
 
 #import <UIKit/UIKit.h>
 
-@interface CallConferenceTableView : UITableViewController {
-  @private
-	NSTimer *updateTime;
-}
+@interface CallConferenceTableView : UITableViewController
+
+- (void)update;
 
 @end
diff --git a/Classes/CallConferenceTableView.m b/Classes/CallConferenceTableView.m
@@ -24,22 +24,6 @@
 
 @implementation CallConferenceTableView
 
-#pragma mark - ViewController Functions
-
-- (void)viewWillAppear:(BOOL)animated {
-	[super viewWillAppear:animated];
-	updateTime =
-		[NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(update) userInfo:nil repeats:YES];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-	[super viewWillDisappear:animated];
-	if (updateTime != nil) {
-		[updateTime invalidate];
-		updateTime = nil;
-	}
-}
-
 #pragma mark - UI change
 
 - (void)update {

diff --git a/Classes/CallPausedTableView.h b/Classes/CallPausedTableView.h
@@ -19,9 +19,8 @@
 
 #import <UIKit/UIKit.h>
 
-@interface CallPausedTableView : UITableViewController {
-  @private
-	NSTimer *updateTime;
-}
+@interface CallPausedTableView : UITableViewController
+
+- (void)update;
 
 @end
diff --git a/Classes/CallPausedTableView.m b/Classes/CallPausedTableView.m
@@ -24,22 +24,6 @@
 
 @implementation CallPausedTableView
 
-#pragma mark - ViewController Functions
-
-- (void)viewWillAppear:(BOOL)animated {
-	[super viewWillAppear:animated];
-	updateTime =
-		[NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(update) userInfo:nil repeats:YES];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-	[super viewWillDisappear:animated];
-	if (updateTime != nil) {
-		[updateTime invalidate];
-		updateTime = nil;
-	}
-}
-
 #pragma mark - UI change
 
 - (void)update {

diff --git a/Classes/CallView.m b/Classes/CallView.m
@@ -415,6 +415,9 @@ - (void)callDurationUpdate {
 	int duration =
 		linphone_core_get_current_call(LC) ? linphone_call_get_duration(linphone_core_get_current_call(LC)) : 0;
 	_durationLabel.text = [LinphoneUtils durationToString:duration];
+
+	[_pausedCallsTable update];
+	[_conferenceCallsTable update];
 }
 
 - (void)onCurrentCallChange {
@@ -513,8 +516,8 @@ - (void)callUpdate:(LinphoneCall *)call state:(LinphoneCallState)state animated:
 	}
 
 	// Update tables
-	[_pausedCallsTable.tableView reloadData];
-	[_conferenceCallsTable.tableView reloadData];
+	[_pausedCallsTable update];
+	[_conferenceCallsTable update];
 
 	static LinphoneCall *currentCall = NULL;
 	if (!currentCall || linphone_core_get_current_call(LC) != currentCall) {

diff --git a/linphone-Info.plist b/linphone-Info.plist
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>