diff --git a/nymea-app/platformintegration/android/platformpermissionsandroid.cpp b/nymea-app/platformintegration/android/platformpermissionsandroid.cpp index cb1bf971..6339dc5d 100644 --- a/nymea-app/platformintegration/android/platformpermissionsandroid.cpp +++ b/nymea-app/platformintegration/android/platformpermissionsandroid.cpp @@ -31,8 +31,9 @@ PlatformPermissionsAndroid::PlatformPermissionsAndroid(QObject *parent) void PlatformPermissionsAndroid::requestPermission(PlatformPermissions::Permission permission) { - qWarning() << "****** android permission request" << permission; - QtAndroid::requestPermissions({permissionMap.value(permission)}, &permissionResultCallback); + if (permissionMap.contains(permission)) { + QtAndroid::requestPermissions({permissionMap.value(permission)}, &permissionResultCallback); + } } void PlatformPermissionsAndroid::openPermissionSettings() diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index 73adeba7..b8abf74d 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -143,8 +143,6 @@ ApplicationWindow { objectName: "discovery" awsClient: AWSClient bluetoothDiscoveryEnabled: PlatformPermissions.bluetoothPermission === PlatformPermissions.PermissionStatusGranted - // discovering: pageStack.currentItem.objectName === "discoveryPage" - Component.onCompleted: console.warn("****************** local net perm", PlatformPermissions.localNetworkPermission, discovering, PlatformPermissions.localNetworkPermission === PlatformPermissions.PermissionStatusGranted, PlatformPermissions.PermissionStatusGranted) } property var supportedInterfaces: [ diff --git a/nymea-app/ui/connection/ConnectionWizard.qml b/nymea-app/ui/connection/ConnectionWizard.qml index 7b12fc7d..085bf2d6 100644 --- a/nymea-app/ui/connection/ConnectionWizard.qml +++ b/nymea-app/ui/connection/ConnectionWizard.qml @@ -13,7 +13,9 @@ WizardPageBase { extraButtonText: qsTr("Demo mode") onNext: { - PlatformPermissions.requestPermission(PlatformPermissions.PermissionLocalNetwork) + if (PlatformPermissions.localNetworkPermission !== PlatformPermissions.PermissionStatusGranted) { + PlatformPermissions.requestPermission(PlatformPermissions.PermissionLocalNetwork) + } pageStack.push(connectionSelectionComponent) } onExtraButtonPressed: {