User permission must be required before checking NFC adapter/setting state (#530)

Author: beaufortfrancois

index.html

@@ -2351,23 +2351,6 @@ <h3><dfn>Writing or pushing content</dfn></h3>
           <li>
             Let |options:NDEFPushOptions| be the second argument.
           </li>
-          <li>
-            If there is no underlying <a>NFC Adapter</a>, or if a connection
-            cannot be established, then reject |p| with a
-            {{"NotSupportedError"}} {{DOMException}}
-            and return |p|.
-          </li>
-          <li>
-            If the UA is not allowed to access the underlying <a>NFC Adapter</a>
-            (e.g. a user preference), then reject |p| with a
-            {{"NotReadableError"}} {{DOMException}}
-            and return |p|.
-          </li>
-          <li>
-            If pushing data is not supported by the underlying
-            <a>NFC Adapter</a>, then reject |p| with a {{"NotSupportedError"}}
-            {{DOMException}} and return |p|.
-          </li>
           <li>
             Let |signal:AbortSignal| be the |options|’ dictionary member
             of the same name if present, or `null` otherwise.
@@ -2399,6 +2382,28 @@ <h3><dfn>Writing or pushing content</dfn></h3>
           <li>
             Return |p| and run the following steps <a>in parallel</a>:
             <ol>
+              <li>
+                If the <a>obtain permission</a> steps return `false`, then
+                reject |p| with a {{"NotAllowedError"}} {{DOMException}} and
+                abort these steps.
+              </li>
+              <li>
+                If there is no underlying <a>NFC Adapter</a>, or if a connection
+                cannot be established, then reject |p| with a
+                {{"NotSupportedError"}} {{DOMException}}
+                and return |p|.
+              </li>
+              <li>
+                If the UA is not allowed to access the underlying <a>NFC Adapter</a>
+                (e.g. a user preference), then reject |p| with a
+                {{"NotReadableError"}} {{DOMException}}
+                and return |p|.
+              </li>
+              <li>
+                If pushing data is not supported by the underlying
+                <a>NFC Adapter</a>, then reject |p| with a {{"NotSupportedError"}}
+                {{DOMException}} and return |p|.
+              </li>
               <li>
                 An implementation MAY reject |p| with
                 a {{"NotSupportedError"}} {{DOMException}}
@@ -2412,11 +2417,6 @@ <h3><dfn>Writing or pushing content</dfn></h3>
                   requested operation.
                 </p>
               </li>
-              <li>
-                If the <a>obtain permission</a> steps return `false`, then
-                reject |p| with a {{"NotAllowedError"}} {{DOMException}} and
-                abort these steps.
-              </li>
               <li>
                 Let |output| be the notation for the <a>NDEF message</a>
                 to be created by UA, as the result of passing
@@ -3419,18 +3419,6 @@ <h3><dfn>Writing or pushing content</dfn></h3>
               </li>
             </ol>
           </li>
-          <li>
-            If there is no underlying <a>NFC Adapter</a>, or if a connection
-            cannot be established, then reject |p| with a
-            {{"NotSupportedError"}} {{DOMException}}
-            and return |p|.
-          </li>
-          <li>
-            If the UA is not allowed to access the underlying <a>NFC Adapter</a>
-            (e.g. a user preference), then reject |p| with a
-            {{"NotReadableError"}} {{DOMException}}
-            and return |p|.
-          </li>
           <li>
             If |reader|.<a>[[\Signal]]</a>'s [= AbortSignal/aborted flag =] is
             set, then reject |p| with a {{"AbortError"}} {{DOMException}}
@@ -3460,6 +3448,18 @@ <h3><dfn>Writing or pushing content</dfn></h3>
                 reject |p| with a {{"NotAllowedError"}} {{DOMException}} and
                 abort these steps.
               </li>
+              <li>
+                If there is no underlying <a>NFC Adapter</a>, or if a connection
+                cannot be established, then reject |p| with a
+                {{"NotSupportedError"}} {{DOMException}}
+                and return |p|.
+              </li>
+              <li>
+                If the UA is not allowed to access the underlying <a>NFC Adapter</a>
+                (e.g. a user preference), then reject |p| with a
+                {{"NotReadableError"}} {{DOMException}}
+                and return |p|.
+              </li>
               <li>
                 Add |reader| to the <a>activated reader objects</a>.
               </li>