Mac version updates tweet timestamps.

drdrang · Aug 12, 2010 · 36d3e58 · 36d3e58
1 parent cd9cf9a
commit 36d3e58
Show file tree

Hide file tree

Showing 10 changed files with 378 additions and 64 deletions.
diff --git a/Classes-Mac/ConversationWindowController.m b/Classes-Mac/ConversationWindowController.m
@@ -31,8 +31,9 @@ - (id)init {
 		// Timeline HTML Controller generates the HTML from a timeline
 		ConversationHTMLController *controller = [[[ConversationHTMLController alloc] initWithMessageIdentifier:nil] autorelease];
 		controller.twitter = appDelegate.twitter;
-		self.htmlController = controller;
 		controller.delegate = self;
+		controller.useRewriteHTMLTimer = YES;
+		self.htmlController = controller;
 	}
 	return self;
 }

diff --git a/Classes-Mac/MainWindowController.m b/Classes-Mac/MainWindowController.m
@@ -44,6 +44,7 @@ - (id)init {
 		self.htmlController = [[[TimelineHTMLController alloc] init] autorelease];
 		htmlController.twitter = appDelegate.twitter;
 		htmlController.delegate = self;
+		htmlController.useRewriteHTMLTimer = YES;
 
 		// Listen for changes to Twitter state data
 		NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];

diff --git a/Classes-Mac/SearchWindowController.m b/Classes-Mac/SearchWindowController.m
@@ -36,6 +36,7 @@ - (id)initWithQuery:(NSString*)aQuery {
 		SearchResultsHTMLController *controller = [[[SearchResultsHTMLController alloc] initWithQuery:aQuery twitter:appDelegate.twitter] autorelease];
 		controller.twitter = appDelegate.twitter;
 		controller.delegate = self;
+		controller.useRewriteHTMLTimer = YES;
 		self.htmlController = controller;
 
 		// Listen for changes to Saved Searches list

diff --git a/Classes-Mac/UserWindowController.m b/Classes-Mac/UserWindowController.m
@@ -40,6 +40,7 @@ - (id)initWithScreenName:(NSString*)aScreenName account:(TwitterAccount *)anAcco
 		controller.twitter = appDelegate.twitter;
 		controller.account = anAccount;
 		controller.delegate = self;
+		controller.useRewriteHTMLTimer = YES;
 		self.htmlController = controller;
 	}
 	return self;

diff --git a/Classes-Shared/HTML Controllers/TimelineHTMLController.h b/Classes-Shared/HTML Controllers/TimelineHTMLController.h
@@ -54,6 +54,9 @@
 	BOOL noInternetConnection;
 	BOOL suppressNetworkErrorAlerts;
 
+	NSTimer *rewriteHTMLTimer;
+	BOOL useRewriteHTMLTimer;
+
 	id delegate;
 }
 
@@ -73,6 +76,8 @@
 @property (assign) BOOL noInternetConnection;
 @property (assign) BOOL suppressNetworkErrorAlerts;
 
+@property (assign) BOOL useRewriteHTMLTimer;
+
 @property (assign) id <TimelineHTMLControllerDelegate> delegate;
 
 // Timeline selection
@@ -99,6 +104,7 @@
 // Web view updating
 - (void)loadWebView;
 - (void)rewriteTweetArea;
+- (void)scheduleRewriteHTMLTimer;
 
 // Web actions
 - (BOOL)handleWebAction:(NSString*)action;

diff --git a/Classes-Shared/HTML Controllers/TimelineHTMLController.m b/Classes-Shared/HTML Controllers/TimelineHTMLController.m
@@ -34,6 +34,7 @@
 #else
 const int kDefaultMaxTweetsShown = 160;
 #endif
+const int kRewriteHTMLTimerInterval = 60;
 static NSString *kTimelineIdentifier = @"Timeline";
 static NSString *kMentionsIdentifier = @"Mentions";
 static NSString *kDirectMessagesIdentifier = @"Direct";
@@ -45,6 +46,7 @@ @implementation TimelineHTMLController
 @synthesize webView, twitter, account, timeline, messages;
 @synthesize maxTweetsShown, webViewHasValidHTML, isLoading, noInternetConnection, suppressNetworkErrorAlerts;
 @synthesize customPageTitle, customTabName;
+@synthesize useRewriteHTMLTimer;
 @synthesize delegate;
 
 
@@ -60,7 +62,7 @@ - (id)init {
 		tweetGapRowTemplate = [[self loadHTMLTemplate:@"load-gap-template"] retain];
 
 		// Loading template
-		loadingHTML = [@"<div class='status'><img class='status_spinner_image' src='spinner.gif'> Loading...</div>"retain];
+		loadingHTML = [@"<div class='status'><img class='status_spinner_image' src='spinner.gif'> Loading...</div>" retain];
 
 		// Misc
 		isLoading = YES;
@@ -96,6 +98,9 @@ - (void)dealloc {
 	[customPageTitle release];
 	[customTabName release];
 
+	[rewriteHTMLTimer invalidate];
+	rewriteHTMLTimer = nil;
+
 	[super dealloc];
 }
 
@@ -336,6 +341,10 @@ - (void)loadWebView {
 	[html replaceOccurrencesOfString:@"<tabAreaHTML/>" withString:tabAreaHTML options:0 range:NSMakeRange(0, html.length)];
 
 	[self.webView loadHTMLString:html];
+
+	if (useRewriteHTMLTimer) {
+		[self scheduleRewriteHTMLTimer];
+	}
 }
 
 - (void)setLoadingSpinnerVisibility:(BOOL)isVisible {
@@ -360,6 +369,23 @@ - (void)rewriteTweetArea {
 		// This isn't really a bug or exception to call this method when the web view isn't ready, so it isn't logged. 
 		//NSLog (@"rewriteTweetArea called when webViewHasValidHTML == NO.");
 	}
+
+	if (useRewriteHTMLTimer) {
+		[self scheduleRewriteHTMLTimer];
+	}
+}
+
+- (void)scheduleRewriteHTMLTimer {
+	if (useRewriteHTMLTimer) {
+		[rewriteHTMLTimer invalidate];
+		rewriteHTMLTimer = [NSTimer scheduledTimerWithTimeInterval:kRewriteHTMLTimerInterval target:self selector:@selector(fireRewriteHTMLTimer:) userInfo:nil repeats:NO];
+	}
+}
+
+- (void)fireRewriteHTMLTimer:(NSTimer *)timer {
+	if (useRewriteHTMLTimer) {
+		[self rewriteTweetArea];
+	}
 }
 
 #pragma mark Web actions
@@ -406,6 +432,7 @@ - (NSNumber*)number64WithString:(NSString*)string {
 	return nil;
 }
 
+
 #pragma mark HTML
 
 - (NSString *)htmlWithTemplate:(NSString *)template substitutions:(NSDictionary *)substitutions {