summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2017-10-08 10:36:40 +0200
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-10-08 19:45:40 +0300
commitfb4221311107013133b2c8ed55e452135ba4bddf (patch)
treebc4eb7f806a7cd98d197d3e1c3c2a31137d43418
parentf4165a9eea32ca265cc1e3e88cdae599bc813cdb (diff)
downloadsubsurface-fb4221311107013133b2c8ed55e452135ba4bddf.tar.gz
mobile: do not clear email and passwd when cancelling
Commit cf8e87545f1e2bf implemented a way to cancel pin setup, and this also has effects on an exit from the app after pressing the android exit. The change button started with clearing the email and passwd in order to get the credentail page(s) active again. While this worked ok, it confuses users that exit the app from the credential pages, resulting in the need to enter the credentials again after a restart. It appears that clearing the credential state is sufficient to get the pages active. Notice that the android exit is still not working (it seems a no-op), but the interaction with the buttons in the app preserves the email/passwd. Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
-rw-r--r--mobile-widgets/qmlmanager.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index b604e7e5a..7305166e8 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -228,16 +228,18 @@ void QMLManager::cancelCredentialsPinSetup()
* The user selected <cancel> on the final stage of the
* cloud account generation (entering the emailed PIN).
*
- * For now, just reset all the cloud data. This brings the app
- * back to its initial state, and the user can startover again.
+ * Resets the cloud credential status to CS_UNKNOWN, resulting
+ * in a return to the first crededentials page, with the
+ * email and passwd still filled in. In case of a cancel
+ * of registration (from the PIN page), the email address
+ * was probably misspelled, so the user never received a PIN to
+ * complete the process.
*
- * Notice that this function is also used to switch to NOCLOUD
- * mode. So the name is not perfect.
+ * Notice that this function is also used to switch to a different
+ * cloud account, so the name is not perfect.
*/
QSettings s;
- setCloudUserName(NULL);
- setCloudPassword(NULL);
setCredentialStatus(CS_UNKNOWN);
s.beginGroup("CloudStorage");
s.setValue("email", cloudUserName());