From a73ce80eeec098441141fede8877604b36a6511d Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sat, 28 Dec 2019 16:20:44 +0100 Subject: [PATCH] mobile-widgets/qml: don't offer manual sync to cloud in no-cloud mode Manual sync was enabled both for CS_VERIFIED (online) and CS_NOCLOUD (offline) and then in the trigger CS_NOCLOUD lead to a login screen, potentially confusing the user. Only enable manual sync with verified cloud credentials. Signed-off-by: Jan Iversen Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/main.qml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 2e86fd10b..5f385a3aa 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -321,21 +321,12 @@ Kirigami.ApplicationWindow { name: ":/icons/cloud_sync.svg" } text: qsTr("Manual sync with cloud") - enabled: prefs.credentialStatus === CloudStatus.CS_VERIFIED || - prefs.credentialStatus === CloudStatus.CS_NOCLOUD + enabled: PrefCloudStorage.cloud_verification_status === CloudStatus.CS_VERIFIED onTriggered: { - if (prefs.credentialStatus === CloudStatus.CS_NOCLOUD) { - returnTopPage() - prefs.oldStatus = prefs.credentialStatus - manager.startPageText = "Enter valid cloud storage credentials" - prefs.credentialStatus = CloudStatus.CS_UNKNOWN - globalDrawer.close() - } else { - globalDrawer.close() - detailsWindow.endEditMode() - manager.saveChangesCloud(true); - globalDrawer.close() - } + globalDrawer.close() + detailsWindow.endEditMode() + manager.saveChangesCloud(true); + globalDrawer.close() } } Kirigami.Action {