Merge branch 'master' into accent-color-experimental

Mac/MainWindow/MainWindowController.swift

@@ -443,7 +443,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 	}
 
 	@IBAction func cleanUp(_ sender: Any?) {
-		sidebarViewController?.cleanUp()
 		timelineContainerViewController?.cleanUp()
 	}
 	

Mac/MainWindow/Sidebar/SidebarViewController.swift

@@ -160,8 +160,7 @@ protocol SidebarDelegate: class {
 			return
 		}
 
-		if let feed = representedObject as? Feed, isReadFiltered, feed.unreadCount > 0 {
-			addTreeControllerToFilterExceptions()
+		if isReadFiltered {
 			queueRebuildTreeAndRestoreSelection()
 		}
 	}
@@ -179,7 +178,6 @@ protocol SidebarDelegate: class {
 	}
 
 	@objc func batchUpdateDidPerform(_ notification: Notification) {
-		addTreeControllerToFilterExceptions()
 		rebuildTreeAndRestoreSelection()
 	}
 	
@@ -221,7 +219,6 @@ protocol SidebarDelegate: class {
 	}
 	
 	@objc func downloadArticlesDidUpdateUnreadCounts(_ note: Notification) {
-		addTreeControllerToFilterExceptions()
 		rebuildTreeAndRestoreSelection()
 	}
 	
@@ -452,10 +449,6 @@ protocol SidebarDelegate: class {
 		updateReadFilterButton()
 	}
 	
-	func cleanUp() {
-		rebuildTreeAndRestoreSelection()
-	}
-
 }
 
 // MARK: - NSUserInterfaceValidations

Mac/Preferences/Accounts/AccountsAddViewController.swift

@@ -160,9 +160,23 @@ extension AccountsAddViewController: OAuthAccountAuthorizationOperationDelegate
 // MARK: Private
 
 private extension AccountsAddViewController {
+	
 	func removeCloudKitIfNecessary() {
-		if let index = AccountManager.shared.activeAccounts.firstIndex(where: { $0.type == .cloudKit }) {
-			addableAccountTypes.remove(at: index)
+		func removeCloudKit() {
+			if let cloudKitIndex = addableAccountTypes.firstIndex(of: .cloudKit) {
+				addableAccountTypes.remove(at: cloudKitIndex)
+			}
+		}
+		
+		if AccountManager.shared.activeAccounts.firstIndex(where: { $0.type == .cloudKit }) != nil {
+			removeCloudKit()
+			return
+		}
+		
+		// We don't want developers without entitlements to be trying to add the CloudKit account
+		if let dev = Bundle.main.object(forInfoDictionaryKey: "DeveloperEntitlements") as? String, dev == "-dev" {
+			removeCloudKit()
 		}
 	}
+	
 }

Mac/Resources/Info.plist

@@ -67,5 +67,7 @@
 	<string>NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)</string>
 	<key>OrganizationIdentifier</key>
 	<string>$(ORGANIZATION_IDENTIFIER)</string>
+	<key>DeveloperEntitlements</key>
+	<string>$(DEVELOPER_ENTITLEMENTS)</string>
 </dict>
 </plist>