From 3ace16954921e4a40cb961b24847c7834b0f78da Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Fri, 15 Mar 2019 00:08:19 +0100
Subject: [PATCH] For tooltip use article.body if article.abstract is empty

---
 baRSS/Core Data/FeedArticle+Ext.m | 2 +-
 baRSS/Core Data/FeedMeta+Ext.m    | 2 ++
 baRSS/Helper/FeedDownload.m       | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/baRSS/Core Data/FeedArticle+Ext.m b/baRSS/Core Data/FeedArticle+Ext.m
index b880de2..75624ee 100644
--- a/baRSS/Core Data/FeedArticle+Ext.m	
+++ b/baRSS/Core Data/FeedArticle+Ext.m	
@@ -67,7 +67,7 @@
 	item.title = [self shortArticleName];
 	item.enabled = (self.link.length > 0);
 	item.state = (self.unread && [UserPrefs defaultYES:@"feedTickMark"] ? NSControlStateValueOn : NSControlStateValueOff);
-	item.toolTip = self.abstract;
+	item.toolTip = (self.abstract ? self.abstract : self.body); // fall back to body (html)
 	item.representedObject = self.objectID;
 	item.target = [self class];
 	item.action = @selector(didClickOnMenuItem:);
diff --git a/baRSS/Core Data/FeedMeta+Ext.m b/baRSS/Core Data/FeedMeta+Ext.m
index dde44e7..c4838c4 100644
--- a/baRSS/Core Data/FeedMeta+Ext.m	
+++ b/baRSS/Core Data/FeedMeta+Ext.m	
@@ -34,7 +34,9 @@
 		self.errorCount = 0;
 	int16_t n = self.errorCount + 1; // always increment errorCount (can be used to indicate bad feeds)
 	// TODO: remove logging
+#ifdef DEBUG
 	NSLog(@"ERROR: Feed download failed: %@ (errorCount: %d)", self.url, n);
+#endif
 	if ([self.scheduled timeIntervalSinceNow] > 30) // forced, early update. Scheduled is still in the futute.
 		return; // Keep error counter low. Not enough time has passed (e.g., temporary server outage)
 	NSTimeInterval retryWaitTime = pow(2, (n > 13 ? 13 : n)) * 60; // 2^N (between: 2 minutes and 5.7 days)
diff --git a/baRSS/Helper/FeedDownload.m b/baRSS/Helper/FeedDownload.m
index f8f85f5..f5f6ac7 100644
--- a/baRSS/Helper/FeedDownload.m
+++ b/baRSS/Helper/FeedDownload.m
@@ -123,7 +123,9 @@ static BOOL _nextUpdateIsForced = NO;
  Called when schedule timer runs out (earliest @c .schedule date). Or if forced by user request.
  */
 + (void)updateTimerCallback {
+#ifdef DEBUG
 	NSLog(@"fired");
+#endif
 	BOOL updateAll = _nextUpdateIsForced;
 	_nextUpdateIsForced = NO;