ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in the connectionwirzard on android (requesting localnetwork permission)

Browse Source
This commit is contained in:
Michael Zanetti 2022-11-20 21:57:44 +01:00
parent 3b2e5c9ec9
commit eb27cc5a53
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nymea-app/platformintegration/android/platformpermissionsandroid.cpp
View File

@ -31,8 +31,9 @@ PlatformPermissionsAndroid::PlatformPermissionsAndroid(QObject *parent)
void PlatformPermissionsAndroid::requestPermission(PlatformPermissions::Permission permission) void PlatformPermissionsAndroid::requestPermission(PlatformPermissions::Permission permission)
{ {
qWarning() << "****** android permission request" << permission; if (permissionMap.contains(permission)) {
QtAndroid::requestPermissions({permissionMap.value(permission)}, &permissionResultCallback); QtAndroid::requestPermissions({permissionMap.value(permission)}, &permissionResultCallback);
}
} }
void PlatformPermissionsAndroid::openPermissionSettings() void PlatformPermissionsAndroid::openPermissionSettings()

2
nymea-app/ui/Nymea.qml
View File

@ -143,8 +143,6 @@ ApplicationWindow {
objectName: "discovery" objectName: "discovery"
awsClient: AWSClient awsClient: AWSClient
bluetoothDiscoveryEnabled: PlatformPermissions.bluetoothPermission === PlatformPermissions.PermissionStatusGranted 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: [ property var supportedInterfaces: [

4
nymea-app/ui/connection/ConnectionWizard.qml
View File

@ -13,7 +13,9 @@ WizardPageBase {
extraButtonText: qsTr("Demo mode") extraButtonText: qsTr("Demo mode")
onNext: { onNext: {
PlatformPermissions.requestPermission(PlatformPermissions.PermissionLocalNetwork) if (PlatformPermissions.localNetworkPermission !== PlatformPermissions.PermissionStatusGranted) {
PlatformPermissions.requestPermission(PlatformPermissions.PermissionLocalNetwork)
}
pageStack.push(connectionSelectionComponent) pageStack.push(connectionSelectionComponent)
} }
onExtraButtonPressed: { onExtraButtonPressed: {