Commit Graph

812 Commits

Author SHA1 Message Date
Jeremy Beker 15ae97f7c9
Merge branch 'master' into google_reader_compatible_syncing 2019-06-19 13:53:30 -04:00
Maurice Parker d794240bd9 Merge branch 'mac-candidate' 2019-06-19 11:31:38 -05:00
Jeremy Beker d87f68a006
Renamed GoogleReaderCompatible to just Reader 2019-06-19 12:25:37 -04:00
Jeremy Beker 52cb066dd4
Cleanup unused objects 2019-06-19 07:56:25 -04:00
Jeremy Beker 97585326c8
Merge branch 'master' into google_reader_compatible_syncing
# Conflicts:
#	iOS/Settings/SettingsAddAccountView.swift
2019-06-18 15:38:59 -04:00
Maurice Parker 35866d558d Only display active accounts for OPML import on iOS 2019-06-17 15:50:17 -05:00
Maurice Parker 47a7fa420d Fixed error caused by updating to the latest from RSWeb 2019-06-16 14:55:48 -05:00
Maurice Parker f6677367ec use refresh indicator to track all network activity. Issue #759 2019-06-16 14:48:50 -05:00
Jeremy Beker 42203c0170
FIrst pass at OPML import. Broken. 2019-06-16 15:14:20 -04:00
Jeremy Beker adf53add3a
removed unused page number function. 2019-06-16 13:15:36 -04:00
Jeremy Beker 17439c8c5e
Disbale and rename tags functional. 2019-06-16 13:14:23 -04:00
Jeremy Beker 41af536212
Rename feeds 2019-06-15 16:13:08 -04:00
Jeremy Beker 62afd312f0
Subscribing and loading initial articles functioning. 2019-06-15 15:46:13 -04:00
Jeremy Beker 029bcbda96
Merge cleanup. 2019-06-15 13:30:12 -04:00
Jeremy Beker f54bc3569b
Merge branch 'master' into google_reader_compatible_syncing
# Conflicts:
#	Frameworks/Account/Account.swift
#	submodules/RSWeb
2019-06-15 12:34:50 -04:00
Jeremy Beker e5eb8df333
Add feed working on backend, thread crash inside account code. 2019-06-15 12:27:21 -04:00
Maurice Parker 1208e319de Updated to the Sparkle 1.21.3 2019-06-15 09:54:16 -05:00
Jeremy Beker 5490dac86d
Need to use rawValue to properly mark starred/read 2019-06-15 08:21:13 -04:00
Jeremy Beker 2128afd465
Refactor endpoints into an enum 2019-06-13 12:44:20 -04:00
Jeremy Beker dac166cf58
Refactor status change calls. 2019-06-13 09:35:01 -04:00
Maurice Parker 871dbbb752 moved dispatch group notify to background thread as it was deadlocked with the dispatch group wait on app exit 2019-06-12 17:28:54 -05:00
Jeremy Beker 45c15c96aa
Marking read/unread functioning. 2019-06-12 16:41:44 -04:00
Maurice Parker c1e89a2ae0 Updated to the latest RSWeb 2019-06-12 15:09:06 -05:00
Jeremy Beker 69c947bd65
Mark read/unread structure. 2019-06-11 16:42:28 -04:00
Jeremy Beker dc60ebf1f8
Unread status is properly set when articles are downloaded from backend 2019-06-11 15:37:21 -04:00
Maurice Parker 17c04b2aef Show the refresh progress bar when an OPML import starts. Issue #732 2019-06-10 16:17:54 -05:00
Jeremy Beker 9144ee71e5
Request article IDs and content. 2019-06-10 16:53:35 -04:00
Maurice Parker 93fbbd4cc3 Make sure that FeedFinder and InitialDownloader are running on the main thread. 2019-06-10 08:21:03 -05:00
Maurice Parker f4e0cfaf2b Fix folder renaming issue that occurs for Feedbin when the tag doesn't exist at Feedbin. Issue #724 2019-06-07 05:03:54 -05:00
Maurice Parker eb71e88845 Resolved issue where local account feed finder could lock up the UI if an error was thrown. Issue #720 2019-06-06 19:46:42 -05:00
Maurice Parker e7ec59f31f
Merge pull request #725 from tgt/tgt/feedbin-fixes
Various Minor Feedbin Fixes
2019-06-06 15:27:06 -05:00
Maurice Parker 1cfc3bceef Fixed restore folder functionality for Feedbin. 2019-06-06 15:22:25 -05:00
Tom Grimwood-Taylor b0a24b6f17 Revert "Fix updating local feed list when no remote feeds."
cd85e52fdd
2019-06-06 14:23:06 +01:00
Tom Grimwood-Taylor 534da0bca6 Move call to sendArticleStatus to delegate. 2019-06-06 14:22:29 +01:00
Tom Grimwood-Taylor 0447694142 Fix feed selection when the max feed score is 0.
This occurs, for example, when searching for “macrumors.com” and adding
to the Feedbin account. All four feeds have a score of 0 since their
source is set as HTMLLink. This would also fix a case in which there are
two feeds: one with a negative score and one with a score of 0.

Since the method uses a Set the feed selected when there are multiple
feeds with an identical maximum score will be random.
2019-06-06 10:31:00 +01:00
Tom Grimwood-Taylor ac9057299a Remove edited name when remote feed name changes. 2019-06-06 10:31:00 +01:00
Tom Grimwood-Taylor f3505e4537 Fix posting name notifications when name changes. 2019-06-06 10:31:00 +01:00
Tom Grimwood-Taylor b4d7042a7b Ensure status changes are sent before refresh.
When the refresh button was manually clicked a full refresh would occur,
but locally changed statuses wouldn't be sent. This meant the statuses
of items in NetNewsWire would revert to their remote values until an
automatic status sync was triggered.
2019-06-06 10:31:00 +01:00
Tom Grimwood-Taylor 3c1b84dd73 Fix a Feedbin subscriptionID going out of sync.
If, for example, a user deleted a feed and recreated it on the server
without a sync in between, the subscription ID for the feed would update
on the server, but remain unchanged locally. If the user then wanted to
delete or rename the feed they'd get a 404 error.
2019-06-06 10:31:00 +01:00
Tom Grimwood-Taylor cd85e52fdd Fix updating local feed list when no remote feeds.
When there were no remote feeds the logic to remove local
feeds was skipped.
2019-06-03 17:09:17 +01:00
Jeremy Beker 6b147e7dc9
Add feeds to tags. Set iconURLs
remove unused functions.
2019-06-01 17:05:55 -04:00
Jeremy Beker a0efc7fda9
Cleanup tag names, fetch subscriptions 2019-06-01 08:08:19 -04:00
Jeremy Beker 76d1daf122
Cleanup merge issues/API changes 2019-06-01 06:54:10 -04:00
Maurice Parker 2d91e64148 Provide a better error message when encountering feed not found and already subscribed errors 2019-05-31 17:24:43 -05:00
Maurice Parker 8e0c857810 Update the extract page number function to make it more readable 2019-05-31 13:38:33 -05:00
Jeremy Beker 98c32b9987
Merge branch 'master' into google_reader_compatible_syncing 2019-05-31 09:54:25 -04:00
Maurice Parker 88b2775076 Make sure that an account doesn't try persist to the disk in the time that it is logically deleted and when it is actually deallocated 2019-05-31 08:05:26 -05:00
Maurice Parker fec3c69f4a Remove Feedbin api workaround for unpropagated mode=extended parameter 2019-05-31 07:54:12 -05:00
Maurice Parker 10296a1b74 Clear the feed metadata on Feedbin feed delete 2019-05-31 07:47:05 -05:00
Maurice Parker d602f894f6 Fix link parsing bug that causes crash 2019-05-31 07:22:28 -05:00
Maurice Parker 0ddb47aa32 Refactor feed finder to make it threadsafe 2019-05-30 17:35:08 -05:00
Jeremy Beker 46e21f57e8
Decoding of tags working. 2019-05-30 16:01:56 -04:00
Maurice Parker 30c21bb125 Enable folders to be dropped in a move or copy between accounts 2019-05-30 14:36:21 -05:00
Maurice Parker 1352dda8aa Modify Feedbin feed deletes so that they emulate how the local account feed deletes work. 2019-05-30 10:12:34 -05:00
Jeremy Beker fdc0374c4f
Ensure credentials are available for use
Need to load metadad first
2019-05-30 07:48:34 -04:00
Maurice Parker 7bec55c90b Add missing completion call that was causing restored feeds to not show 2019-05-29 21:39:53 -05:00
Maurice Parker 51284b5aa4 Rename deleteFeed to removeFeed to be more consistent with other API's 2019-05-29 21:04:44 -05:00
Maurice Parker 527e677934 Rename deleteFolder to removeFolder to make the API more consistent 2019-05-29 20:53:00 -05:00
Maurice Parker f4bc17c8f1 Refactor addFeed and removeFeed usages to be more consistent 2019-05-29 20:47:52 -05:00
Maurice Parker 5e3fcfd955 Correct how feeds were deleted so that only the feed in the correct container was deleted 2019-05-29 17:56:26 -05:00
Jeremy Beker aa6dfe8a08
Rework to store endpoint URL in metadata
Endpoint URL did not belong with credentials. This breaks it out and stores it in the account metadata. Updates validation code to take it as a parameter.
2019-05-29 15:16:09 -04:00
Jeremy Beker 0df86e5761
Authentication working
* Updates to use new API style per discussion with Maurice
* Credential validation functioning
2019-05-29 10:54:52 -04:00
Maurice Parker 0648053417 Enforce tag specific drop validation (can't copy to the account level) 2019-05-28 17:42:19 -05:00
Maurice Parker cf016c5d7d Prevent Feedbin in account copy from putting a feed in both the root account and a folder at the same time. 2019-05-28 13:38:40 -05:00
Jeremy Beker 84dbdf25e2
Google Reader API Account Provider and initial integration
* Creation of account classes (based on FeedBin)
* Integration on Mac side into account dialog
* Initial authentication call works and extracts auth token, but no where to put it right now.
2019-05-28 13:08:15 -04:00
Maurice Parker 493abbb609 Refactor create feed functionality to increase code reuse and encapsulation 2019-05-28 09:45:02 -05:00
Maurice Parker c7b61f7d87 Enable copy between local accounts. 2019-05-27 18:01:24 -05:00
Maurice Parker 61f9a66d74 Change so that we fire off status update immediately if the number of pending status changes exceeds 100. Issue #658 2019-05-27 12:03:12 -05:00
Maurice Parker 886b82f3bd Fix issue where unread and unstar statuses were getting lost if there wasn't already an article. Issue #708 2019-05-26 21:05:05 -05:00
Maurice Parker 7e6db47956 Add extended mode for Feedbin entries to get avatar url. Issue #669 2019-05-26 18:35:54 -05:00
Brent Simmons e974d788ff Wrap OPML import in BatchUpdate. This makes it pretty much instant. Fix #653. 2019-05-26 14:45:09 -07:00
Maurice Parker 32712533d1 Fixed duplicate adds for local account folder feed adds. Issue #701 2019-05-26 12:17:38 -05:00
Maurice Parker c61949bc04 Add account name to network error messages and prevent background iOS errors from displaying alerts 2019-05-26 11:54:32 -05:00
Maurice Parker 5f98f0d2fc Correct usage of weak self in completion handlers 2019-05-22 15:40:34 -05:00
Maurice Parker a406fa9d4d Enhance error handling to make syncing more resilient to network failures. 2019-05-21 19:15:24 -05:00
Maurice Parker d289bbea94 Fix crashing bug caused by nesting update statements. 2019-05-21 17:59:33 -05:00
Maurice Parker 8816de4a0e Fix issue where new Feeds added to a folder also got left in the account container. 2019-05-21 10:26:11 -05:00
Maurice Parker d9458c8980 Make progress indicator more accurate 2019-05-21 08:34:05 -05:00
Maurice Parker 31cc3b609c Make delete animation correct for deletes and restores by wrapping them in BatchUpdates. Issue #667 2019-05-20 18:05:28 -05:00
Maurice Parker 8e7b1c8454 Make sure the statuses get updated before the unread count query executes. Issue #670 2019-05-20 17:08:16 -05:00
Maurice Parker a5d6e5403e Add additional sql check to ensure we don't pick up deleted articles when querying for missing articles 2019-05-20 13:55:26 -05:00
Maurice Parker 59ea5cadec Add status syncing to iOS 2019-05-20 13:51:08 -05:00
Phil Viso 1f8463d091 Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover
# Conflicts:
#	iOS/Settings/AddLocalAccountViewController.swift
#	iOS/Settings/DetailAccountViewController.swift
#	iOS/Settings/Settings.storyboard
2019-05-19 19:03:50 -05:00
Maurice Parker 48e19c23a7 Set content type for Feedbin OPML Import. 2019-05-19 18:19:08 -05:00
Phil Viso bce45d28e4 Updated all iOS references to default local account new to be device specific 2019-05-19 16:52:21 -05:00
Maurice Parker 80e1888244 Rename AccountsDidChangeNotification to AccountsDidChange to match other notification names. 2019-05-19 15:51:08 -05:00
Brent Simmons 7bd4520746 Remove unused weak self. (Was causing warning in Xcode.) 2019-05-19 11:33:48 -07:00
Maurice Parker c7f02150f9 Make sure we go and get missing articles when we add a new feed. 2019-05-19 10:43:45 -05:00
Maurice Parker 9c159d21f6 Retrieve articles when we have a status but don't have an article on full refresh. 2019-05-17 14:56:27 -05:00
Maurice Parker 0a9bf2aef0 Prevent more than one OPML import from being run at the same time. 2019-05-17 10:44:22 -05:00
Maurice Parker b89f088917 Switch to using the new OPML import service 2019-05-17 10:04:13 -05:00
Maurice Parker 87512a64a5 Removed old TODO and update to latest RSWeb 2019-05-16 11:01:44 -05:00
Maurice Parker d8e6355b1e Fix bug where restoring a feed in a folder could leave the feed in the account container 2019-05-16 10:33:58 -05:00
Maurice Parker 3986e00bf7 Fix bug where account unread counts weren't changing with async api calls 2019-05-16 09:54:19 -05:00
Maurice Parker 5f65fba9e2 Fix bug that prevented last unread or last unstrap from changing correctly. 2019-05-16 06:01:10 -05:00
Maurice Parker 6882b152d9 Add timer to trigger article status sync process. 2019-05-15 17:21:58 -05:00
Maurice Parker 6be6c6a682 Add send sync database contents to Feedbin 2019-05-15 11:52:56 -05:00
Maurice Parker b1303661b2 Save article statuses to new sync database as they are created 2019-05-14 18:24:19 -05:00
Maurice Parker f449ed9608 Make sure progress gets cleared incase the last page adjustment is inaccurate 2019-05-14 17:39:55 -05:00
Maurice Parker 30273795a8 Delegate article marking functionality to the account delegate 2019-05-14 15:34:05 -05:00
Maurice Parker 1984af4664 Add download progress for Feedbin accounts 2019-05-14 13:10:07 -05:00
Maurice Parker e31e1a4d60 Save article statuses from articles we have not received yet 2019-05-14 10:06:29 -05:00
Maurice Parker 62d154d0f2 Add download syncing of article statuses 2019-05-14 06:20:53 -05:00
Maurice Parker 39a337d096 Stub out syncing article state 2019-05-13 17:04:12 -05:00
Maurice Parker eede1cc7eb Add initial feed download for Feedbin. 2019-05-13 11:18:54 -05:00
Maurice Parker ccac456d77 Change to use the entries.json service for Feedbin instead of the per feed one 2019-05-13 10:29:34 -05:00
Maurice Parker c4ce93e96a Set default read state for Feedbin articles to read when syncing 2019-05-13 08:32:03 -05:00
Maurice Parker c47fee2384 Delete unused parameters (dead code) 2019-05-13 07:17:50 -05:00
Maurice Parker 20388eff46 Change how completion handlers work for refreshArticles so that we can tell for sure when all the articles have been downloaded and updated in the database 2019-05-13 06:34:27 -05:00
Maurice Parker 2684b92a67 Added service calls for unread and starred entries 2019-05-13 03:13:06 -05:00
Maurice Parker 1b22abbbfc Make sure a refresh happens after an OPML import. 2019-05-12 19:31:29 -05:00
Maurice Parker f4510e57e5 store last article fetch time in account metadata 2019-05-12 19:17:16 -05:00
Maurice Parker 9c676f29f8 add articles download for Feedbin 2019-05-12 18:32:32 -05:00
Maurice Parker 4ed1b8a66a Move ConditionalGetKeys as they are account type specific 2019-05-12 08:47:27 -05:00
Maurice Parker 60895fc7fa Restrict Feedbin to a maximum of 1 concurrent connection to keep us under Feedbin's 250 requests per second rate limit 2019-05-12 07:22:33 -05:00
Maurice Parker 51c2527da2 Add OPML import for Feedbin. 2019-05-11 16:07:27 -05:00
Maurice Parker 6f92cd1a73 Refactor to differentiate between loading the Subscriptions.opml file and importing an external OPML file as they now need separate behaviors 2019-05-11 12:26:23 -05:00
Maurice Parker 5200e49175 Capture 401 http status codes as already subscribed error when creating a Feedbin subscription 2019-05-10 10:40:02 -05:00
Maurice Parker fd8a973084 Add already subscribed error to LocalAccountDelegate and updated iOS to work with latest Account API 2019-05-10 10:22:28 -05:00
Maurice Parker fe70723eb4 Use best feed specifier code to determine which Feedbin option to use when creating a feed 2019-05-10 10:14:24 -05:00
Maurice Parker 75fbd9e3eb Add folder delete undo support 2019-05-09 18:20:09 -05:00
Maurice Parker 23b43ecc07 Add undo for feeds 2019-05-09 16:09:21 -05:00
Maurice Parker d4bfab2da6 Fix delete folder bug 2019-05-09 13:35:40 -05:00
Maurice Parker cda8acc66c Add the ability to move feeds between folders for Feedbin 2019-05-09 13:31:18 -05:00
Maurice Parker 50d3a5799c added subscription delete 2019-05-09 07:25:45 -05:00
Maurice Parker 49116fd8e3 Add subscription id to Feed so that we can correctly rename Feedbin subscriptions 2019-05-08 18:13:54 -05:00
Maurice Parker 06626f10a7 Add feed rename 2019-05-08 17:55:53 -05:00
Maurice Parker 43d32b1281 Add create Feedbin feed 2019-05-08 17:41:19 -05:00
Maurice Parker 72c92587d2 Keep feedID and feedURL better separated 2019-05-08 09:54:55 -05:00
Maurice Parker f12494cc31 Add some debug logging 2019-05-08 08:20:29 -05:00
Maurice Parker e52dc84f13 added create subscription service 2019-05-08 06:56:15 -05:00
Maurice Parker c5b0bfcd91 Save feed folder relationship identifier 2019-05-07 18:34:45 -05:00
Maurice Parker 52e5e43d10 Add download feed to folder relationships syncing 2019-05-07 17:41:32 -05:00
Maurice Parker ae61d36c7d Change FeedbinAccountDelegate to use BatchUpdate 2019-05-07 11:10:00 -05:00
Maurice Parker 7f9055fe78 Add download subscriptions and faviconURLs 2019-05-07 10:51:41 -05:00
Maurice Parker d6ae740305 Added folder (tag) delete for Feedbin 2019-05-06 17:34:41 -05:00
Maurice Parker b7e2df1a68 Add Folder rename for Feedbin 2019-05-06 10:53:20 -05:00
Maurice Parker 51a1562e4b make slight change to how not modified responses are handled 2019-05-06 05:28:02 -05:00
Maurice Parker 18f2c7b723 Fix bug that prevented http caching from working 2019-05-05 17:46:53 -05:00
Maurice Parker 15a0ba89d7 Add folder syncing for Feedbin account 2019-05-05 15:41:20 -05:00
Maurice Parker 29f9cf83b1 Add HTTP Caching for Feedbin (conditional get) 2019-05-05 08:44:57 -05:00
Maurice Parker 35160aaf75 Rename AccountSettings to AccountMetadata to show that more than settings are stored in it and that it is analogous to FeedMetadata 2019-05-05 07:49:59 -05:00
Maurice Parker 6e7477fd89 Modify AccountSettings so that it works like FeedMetadata and can be leveraged by the AccountDelegates 2019-05-05 07:21:26 -05:00
Maurice Parker d12a056ca3 Pass stored credentials to the delegate when updated 2019-05-05 06:02:28 -05:00
Maurice Parker fc7b6f2c6b refactor how Credentials work 2019-05-05 03:25:21 -05:00
Maurice Parker aaa4342494 Add encrypted credential storage 2019-05-04 15:14:49 -05:00
Maurice Parker 595db517a7 change func signitures to use Credentials protocol from RSWeb instead of username/password 2019-05-04 11:48:48 -05:00
Maurice Parker 38202ece8d Made credentials verification errors more descriptive. 2019-05-04 09:18:14 -05:00
Maurice Parker bb42e46887 Update to use latest webservice network layer in RSWeb 2019-05-04 08:54:07 -05:00
Maurice Parker 5a852c1615 validate Feedbin account credentials and add Feedbin account 2019-05-02 18:17:52 -05:00