Allow to set user information after detection started for non NDEF tags

Prior to the NDEF implementation one could change the user information
after the target detection started. The limitation seems to only effect
NDEF tags, so all other tags should still be able to set the
information at a later time. This allows to inform the user about the
current progress of the process or inform about errors.

Fixes: QTBUG-116563
Pick-to: 6.5
Change-Id: If82ea8c2056eb4c425626b06dac98462e3f0070c
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 76e0b4687ced7e3e54a60c674c9432a3161ce834)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/nfc/qnearfieldmanager_ios.mm b/src/nfc/qnearfieldmanager_ios.mm
index fd9de125..2709e2c7 100644
--- a/src/nfc/qnearfieldmanager_ios.mm
+++ b/src/nfc/qnearfieldmanager_ios.mm
@@ -212,14 +212,16 @@ void QNearFieldManagerPrivateImpl::clearTargets()
 
 void QNearFieldManagerPrivateImpl::setUserInformation(const QString &message)
 {
+    if (activeAccessMethod != QNearFieldTarget::NdefAccess)
+        [delegate alertMessage:message];
+
     if (detectionRunning) {
         // Too late!
-        qCWarning(QT_IOS_NFC, "User information must be set prior before the targer detection started");
+        qCWarning(QT_IOS_NFC,
+                  "User information must be set prior before the target detection started");
         return;
     }
 
-    [delegate alertMessage:message];
-
     if (auto queue = qt_Nfc_Queue()) {
         dispatch_sync(queue, ^{
            [ndefDelegate setAlertMessage:message];