Merge pull request #1035 from Wevah/mac-app-store-hide-web-inspector

Disable Web Inspector for App Store builds

Mac/AppDefaults.swift

@@ -37,8 +37,10 @@ struct AppDefaults {
 		static let showTitleOnMainWindow = "KafasisTitleMode"
 		static let hideDockUnreadCount = "JustinMillerHideDockUnreadCount"
 
+		#if !MAC_APP_STORE
 			static let webInspectorEnabled = "WebInspectorEnabled"
 			static let webInspectorStartsAttached = "__WebInspectorPageGroupLevel1__.WebKit2InspectorStartsAttached"
+		#endif
 	}
 
 	private static let smallestFontSizeRawValue = FontSize.small.rawValue
@@ -141,6 +143,7 @@ struct AppDefaults {
 		return bool(for: Key.hideDockUnreadCount)
 	}
 
+	#if !MAC_APP_STORE
 		static var webInspectorEnabled: Bool {
 			get {
 				return bool(for: Key.webInspectorEnabled)
@@ -158,6 +161,7 @@ struct AppDefaults {
 				setBool(for: Key.webInspectorStartsAttached, newValue)
 			}
 		}
+	#endif
 
 	static var timelineSortDirection: ComparisonResult {
 		get {

Mac/AppDelegate.swift

@@ -309,9 +309,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 		if item.action == #selector(showAddFeedWindow(_:)) || item.action == #selector(showAddFolderWindow(_:)) {
 			return !isDisplayingSheet && !AccountManager.shared.activeAccounts.isEmpty
 		}
+		#if !MAC_APP_STORE
 		if item.action == #selector(toggleWebInspectorEnabled(_:)) {
 			(item as! NSMenuItem).state = AppDefaults.webInspectorEnabled ? .on : .off
 		}
+		#endif
 		return true
 	}
 
@@ -530,6 +532,7 @@ extension AppDelegate {
 	}
 
 	@IBAction func toggleWebInspectorEnabled(_ sender: Any?) {
+		#if !MAC_APP_STORE
 			let newValue = !AppDefaults.webInspectorEnabled
 			AppDefaults.webInspectorEnabled = newValue
 
@@ -539,6 +542,7 @@ extension AppDelegate {
 
 			AppDefaults.webInspectorStartsAttached = false
 			NotificationCenter.default.post(name: .WebInspectorEnabledDidChange, object: newValue)
+		#endif
 	}
 }
 

Mac/Base.lproj/Main.storyboard

@@ -473,7 +473,7 @@
                                         <menuItem title="Enable Web Inspector" id="EwI-z4-ZA3">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
-                                                <action selector="toggleWebInspectorEnabled:" target="Voe-Tx-rLC" id="nsd-PV-Tz2"/>
+                                                <action selector="toggleWebInspectorEnabled:" target="Voe-Tx-rLC" id="SNL-zh-XIE"/>
                                             </connections>
                                         </menuItem>
                                     </items>
@@ -588,6 +588,7 @@
                     <connections>
                         <outlet property="checkForUpdatesMenuItem" destination="1nF-7O-aKU" id="JmT-jc-DJ8"/>
                         <outlet property="debugMenuItem" destination="UqE-mp-gtV" id="OnR-lr-Zlt"/>
+                        <outlet property="enableWebInspectorMenuItem" destination="EwI-z4-ZA3" id="EGp-lP-f91"/>
                         <outlet property="sortByNewestArticleOnTopMenuItem" destination="TNS-TV-n0U" id="gix-Nd-9k4"/>
                         <outlet property="sortByOldestArticleOnTopMenuItem" destination="iii-kP-qoF" id="fTe-Tf-EWG"/>
                     </connections>

Mac/MainWindow/Detail/DetailWebViewController.swift

@@ -28,6 +28,7 @@ final class DetailWebViewController: NSViewController, WKUIDelegate {
 		}
 	}
 
+	#if !MAC_APP_STORE
 		private var webInspectorEnabled: Bool {
 			get {
 				return webView.configuration.preferences._developerExtrasEnabled
@@ -36,6 +37,7 @@ final class DetailWebViewController: NSViewController, WKUIDelegate {
 				webView.configuration.preferences._developerExtrasEnabled = newValue
 			}
 		}
+	#endif
 	
 	private var waitingForFirstReload = false
 	private let keyboardDelegate = DetailKeyboardDelegate()
@@ -96,9 +98,11 @@ final class DetailWebViewController: NSViewController, WKUIDelegate {
 		webView.isHidden = true
 		waitingForFirstReload = true
 
+		#if !MAC_APP_STORE
 			webInspectorEnabled = AppDefaults.webInspectorEnabled
 
 			NotificationCenter.default.addObserver(self, selector: #selector(webInspectorEnabledDidChange(_:)), name: .WebInspectorEnabledDidChange, object: nil)
+		#endif
 
 		reloadHTML()
 	}
@@ -199,9 +203,11 @@ private extension DetailWebViewController {
 		}
 	}
 
+	#if !MAC_APP_STORE
 		@objc func webInspectorEnabledDidChange(_ notification: Notification) {
 			self.webInspectorEnabled = notification.object! as! Bool
 		}
+	#endif
 }
 
 // MARK: - ScrollInfo

Shared/AppNotifications.swift

@@ -13,7 +13,10 @@ extension Notification.Name {
 	static let InspectableObjectsDidChange = Notification.Name("TimelineSelectionDidChangeNotification")
 	static let UserDidAddFeed = Notification.Name("UserDidAddFeedNotification")
 	static let UserDidRequestSidebarSelection = Notification.Name("UserDidRequestSidebarSelectionNotification")
+
+	#if !MAC_APP_STORE
 		static let WebInspectorEnabledDidChange = Notification.Name("WebInspectorEnabledDidChange")
+	#endif
 }
 
 typealias UserInfoDictionary = [AnyHashable: Any]