Address issues with App Store Review

diff --git a/safari/Junction.xcodeproj/project.pbxproj b/safari/Junction.xcodeproj/project.pbxproj
index 2325e7b47cbe0cced2c55777abb5d33f9f134821..3b5e98f4dbc9902d24a1acebc837bcf79f034161 100644 (file)
--- a/safari/Junction.xcodeproj/project.pbxproj
+++ b/safari/Junction.xcodeproj/project.pbxproj
@@ -151,8 +151,8 @@
                        isa = PBXGroup;
                        children = (
                                B5E6E79C2AB20D7700D7B76B /* AppDelegate.swift */,
                        isa = PBXGroup;
                        children = (
                                B5E6E79C2AB20D7700D7B76B /* AppDelegate.swift */,

-                               B5E6E7A82AB20D7700D7B76B /* ViewController.swift */,

                                B5E6E7AA2AB20D7700D7B76B /* Main.storyboard */,
                                B5E6E7AA2AB20D7700D7B76B /* Main.storyboard */,

+                               B5E6E7A82AB20D7700D7B76B /* ViewController.swift */,

                                B5E6E7AD2AB20D7800D7B76B /* Assets.xcassets */,
                                B5E6E7AF2AB20D7800D7B76B /* Junction.entitlements */,
                                B5E6E7B02AB20D7800D7B76B /* Junction.entitlements */,
                                B5E6E7AD2AB20D7800D7B76B /* Assets.xcassets */,
                                B5E6E7AF2AB20D7800D7B76B /* Junction.entitlements */,
                                B5E6E7B02AB20D7800D7B76B /* Junction.entitlements */,


@@ -574,7 +574,7 @@
                        buildSettings = {
                                CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
                                CODE_SIGN_STYLE = Automatic;
                        buildSettings = {
                                CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
                                CODE_SIGN_STYLE = Automatic;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -605,7 +605,7 @@
                        buildSettings = {
                                CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
                                CODE_SIGN_STYLE = Automatic;
                        buildSettings = {
                                CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
                                CODE_SIGN_STYLE = Automatic;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -640,7 +640,7 @@
                                CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
                                CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -677,7 +677,7 @@
                                CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
                                CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -711,7 +711,7 @@
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                BUNDLE_LOADER = "$(TEST_HOST)";
                                CODE_SIGN_STYLE = Automatic;
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                BUNDLE_LOADER = "$(TEST_HOST)";
                                CODE_SIGN_STYLE = Automatic;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MACOSX_DEPLOYMENT_TARGET = 10.14;


@@ -730,7 +730,7 @@
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                BUNDLE_LOADER = "$(TEST_HOST)";
                                CODE_SIGN_STYLE = Automatic;
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                BUNDLE_LOADER = "$(TEST_HOST)";
                                CODE_SIGN_STYLE = Automatic;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MACOSX_DEPLOYMENT_TARGET = 10.14;


@@ -748,7 +748,7 @@
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                CODE_SIGN_STYLE = Automatic;
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                CODE_SIGN_STYLE = Automatic;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MARKETING_VERSION = 1.0.1;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MARKETING_VERSION = 1.0.1;


@@ -765,7 +765,7 @@
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                CODE_SIGN_STYLE = Automatic;
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                CODE_SIGN_STYLE = Automatic;

-                               CURRENT_PROJECT_VERSION = 2;
+                               CURRENT_PROJECT_VERSION = 3;

                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MARKETING_VERSION = 1.0.1;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                GENERATE_INFOPLIST_FILE = YES;
                                MARKETING_VERSION = 1.0.1;

diff --git a/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate b/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate
index cc56d9a25da7df95444ea880d374ee14e4e6a559..3e873700c0b69c47327e573b5affe0d647153ec8 100644 (file)
Binary files a/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate and b/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/safari/Junction/Base.lproj/Main.html b/safari/Junction/Base.lproj/Main.html
index 96adac3e69b8bfe65e19a18f5516639d237685e0..96b489fdc68c1656dba3b3538634066d78c0e721 100644 (file)
--- a/safari/Junction/Base.lproj/Main.html
+++ b/safari/Junction/Base.lproj/Main.html
@@ -15,7 +15,7 @@
   <body>
     <img src="../Icon.png" width="128" height="128" alt="Junction Icon" />
     <p class="state-unknown">
   <body>
     <img src="../Icon.png" width="128" height="128" alt="Junction Icon" />
     <p class="state-unknown">

-      You can turn on Junction’s extension in Safari Extensions preferences.
+      Junction is a Safari Extension and <strong>only works in Safari</strong>. You can turn on Junction’s extension in Safari Extensions preferences.

     </p>
     <p class="state-on">
       Junction’s extension is currently on. You can turn it off in Safari
     </p>
     <p class="state-on">
       Junction’s extension is currently on. You can turn it off in Safari


@@ -25,8 +25,5 @@
       Junction’s extension is currently off. You can turn it on in Safari
       Extensions preferences.
     </p>
       Junction’s extension is currently off. You can turn it on in Safari
       Extensions preferences.
     </p>

-    <button class="open-preferences">
-      Quit and Open Safari Extensions Preferences…
-    </button>

   </body>
 </html>
   </body>
 </html>

diff --git a/safari/Junction/Base.lproj/Main.storyboard b/safari/Junction/Base.lproj/Main.storyboard
index 6de6cf174348c6bd0fcf2125b0654da2f2534948..e0bf5bc208b5e3ffffe4e08386cd31c1aa72c352 100644 (file)
--- a/safari/Junction/Base.lproj/Main.storyboard
+++ b/safari/Junction/Base.lproj/Main.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19085" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">

     <dependencies>
     <dependencies>

-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19085"/>
-        <plugIn identifier="com.apple.WebKit2IBPlugin" version="19085"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.WebKit2IBPlugin" version="22154"/>

         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>


@@ -67,7 +68,7 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>

-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Junction" customModuleProvider="target"/>

                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>


@@ -97,7 +98,7 @@
         <!--View Controller-->
         <scene sceneID="hIz-AP-VOD">
             <objects>
         <!--View Controller-->
         <scene sceneID="hIz-AP-VOD">
             <objects>

-                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="Junction" customModuleProvider="target" sceneMemberID="viewController">

                     <view key="view" id="m2S-Jp-Qdl">
                         <rect key="frame" x="0.0" y="0.0" width="425" height="325"/>
                         <autoresizingMask key="autoresizingMask"/>
                     <view key="view" id="m2S-Jp-Qdl">
                         <rect key="frame" x="0.0" y="0.0" width="425" height="325"/>
                         <autoresizingMask key="autoresizingMask"/>

diff --git a/safari/Junction/ViewController.swift b/safari/Junction/ViewController.swift
index 4ef9c21625efa8c38062d13eb4c3d3a8a3e7d4f9..91786953d642ea0bdaddd635a93594fce6261d67 100644 (file)
--- a/safari/Junction/ViewController.swift
+++ b/safari/Junction/ViewController.swift
@@ -42,7 +42,7 @@ class ViewController: NSViewController, WKNavigationDelegate, WKScriptMessageHan
 
         SFSafariApplication.showPreferencesForExtension(withIdentifier: extensionBundleIdentifier) { error in
             DispatchQueue.main.async {
 
         SFSafariApplication.showPreferencesForExtension(withIdentifier: extensionBundleIdentifier) { error in
             DispatchQueue.main.async {

-                NSApplication.shared.terminate(nil)
+                // NSApplication.shared.terminate(nil)

             }
         }
     }
             }
         }
     }