mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile-widgets: remove showPin from qmlmanager

Browse source 
Setting showPin is no longer needed, so remove it.

Signed-off-by: Jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2019-12-29 09:49:03 +01:00 • committed by Dirk Hohndel
parent b92c2d280c
commit a729d1a576
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mobile-widgets/qmlmanager.cpp
View file

@ -237,7 +237,7 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
m_btEnabled = btDiscovery->btAvailable(); m_btEnabled = btDiscovery->btAvailable();
connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged, connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged,
this, &QMLManager::btHostModeChange); this, &QMLManager::btHostModeChange);
QMLPrefs::instance()->setShowPin(false);
// create location manager service // create location manager service
locationProvider = new GpsLocation(&appendTextToLogStandalone, this); locationProvider = new GpsLocation(&appendTextToLogStandalone, this);
progress_callback = &progressCallback; progress_callback = &progressCallback;
@ -341,7 +341,6 @@ void QMLManager::openLocalThenRemote(QString url)
} }
if (qPrefCloudStorage::cloud_verification_status() == qPrefCloudStorage::CS_NEED_TO_VERIFY) { if (qPrefCloudStorage::cloud_verification_status() == qPrefCloudStorage::CS_NEED_TO_VERIFY) {
appendTextToLog(QStringLiteral("have cloud credentials, but still needs PIN")); appendTextToLog(QStringLiteral("have cloud credentials, but still needs PIN"));
QMLPrefs::instance()->setShowPin(true);
} }
if (qPrefCloudStorage::cloud_verification_status() == qPrefCloudStorage::CS_INCORRECT_USER_PASSWD) { if (qPrefCloudStorage::cloud_verification_status() == qPrefCloudStorage::CS_INCORRECT_USER_PASSWD) {
appendTextToLog(QStringLiteral("incorrect password for cloud credentials")); appendTextToLog(QStringLiteral("incorrect password for cloud credentials"));
@ -604,7 +603,6 @@ bool QMLManager::verifyCredentials(QString email, QString password, QString pin)
appendTextToLog(QStringLiteral("PIN provided but not accepted")); appendTextToLog(QStringLiteral("PIN provided but not accepted"));
setStartPageText(RED_FONT + tr("Incorrect PIN, please try again") + END_FONT); setStartPageText(RED_FONT + tr("Incorrect PIN, please try again") + END_FONT);
} }
QMLPrefs::instance()->setShowPin(true);
return false; return false;
} else if (prefs.cloud_verification_status == qPrefCloudStorage::CS_VERIFIED) { } else if (prefs.cloud_verification_status == qPrefCloudStorage::CS_VERIFIED) {
appendTextToLog(QStringLiteral("PIN accepted")); appendTextToLog(QStringLiteral("PIN accepted"));
@ -649,11 +647,8 @@ void QMLManager::tryRetrieveDataFromBackend()
appendTextToLog(QStringLiteral("Need to verify the email address - enter PIN")); appendTextToLog(QStringLiteral("Need to verify the email address - enter PIN"));
setStartPageText(RED_FONT + tr("Cannot connect to cloud storage - cloud account not verified") + END_FONT); setStartPageText(RED_FONT + tr("Cannot connect to cloud storage - cloud account not verified") + END_FONT);
revertToNoCloudIfNeeded(); revertToNoCloudIfNeeded();
QMLPrefs::instance()->setShowPin(true);
return; return;
} }
if (QMLPrefs::instance()->showPin())
QMLPrefs::instance()->setShowPin(false);
// now check the redirect URL to make sure everything is set up on the cloud server // now check the redirect URL to make sure everything is set up on the cloud server
connect(manager(), &QNetworkAccessManager::authenticationRequired, this, &QMLManager::provideAuth, Qt::UniqueConnection); connect(manager(), &QNetworkAccessManager::authenticationRequired, this, &QMLManager::provideAuth, Qt::UniqueConnection);