mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix typo.

Browse source
This commit is contained in:
Christian Kamm 2014-12-03 14:59:53 +01:00
parent c418e58f88
commit f82893496b
6 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/creds/shibbolethcredentials.h
View file

@ -40,7 +40,7 @@ Q_OBJECT
public:
ShibbolethCredentials();
/* create a credidentials for an already connected account */
/* create a credentials for an already connected account */
ShibbolethCredentials(const QNetworkCookie &cookie, Account *acc);
void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;

2
src/mirall/account.h
View file

@ -71,7 +71,7 @@ public:
enum State { Disconnected = 0, /// no network connection
Connected, /// account is online
SignedOut, /// Disconnected + credential token has been discarded
InvalidCredidential /// The credidential are invalids and we are asking for them to the user
InvalidCredential /// The credentials are invalid and we are asking the user for them
};
QString davPath() const { return _davPath; }

9
src/mirall/application.cpp
View file

@ -225,7 +225,7 @@ void Application::slotCheckConnection()
Account *account = AccountManager::instance()->account();
if( account ) {
if (account->state() == Account::InvalidCredidential
if (account->state() == Account::InvalidCredential
|| account->state() == Account::SignedOut) {
//Do not try to connect if we are logged out
if (!_userTriggeredConnect) {
@ -262,8 +262,8 @@ void Application::slotCredentialsFetched()
account->setState(Account::SignedOut);
return;
}
if (account->state() == Account::InvalidCredidential) {
// Then we ask again for the credidentials if they are wrong again
if (account->state() == Account::InvalidCredential) {
// Then we ask again for the credentials if they are wrong again
account->setState(Account::Disconnected);
}
slotCheckConnection();
@ -281,12 +281,11 @@ void Application::slotToggleFolderman(int state)
_checkConnectionTimer.start();
// fall through
case Account::SignedOut:
case Account::InvalidCredidential:
case Account::InvalidCredential:
folderMan->setSyncEnabled(false);
folderMan->terminateSyncProcess();
break;
}
}
void Application::slotConnectionValidatorResult(ConnectionValidator::Status status)

4
src/mirall/networkjobs.cpp
View file

@ -170,8 +170,8 @@ void AbstractNetworkJob::slotFinished()
bool discard = finished();
AbstractCredentials *creds = _account->credentials();
if (!creds->stillValid(_reply) &&! _ignoreCredentialFailure
&& _account->state() != Account::InvalidCredidential) {
_account->setState(Account::InvalidCredidential);
&& _account->state() != Account::InvalidCredential) {
_account->setState(Account::InvalidCredential);
// invalidate & forget token/password
// but try to re-sign in.

2
src/mirall/owncloudsetupwizard.cpp
View file

@ -146,7 +146,7 @@ void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString)
}
Account *account = _ocWizard->account();
account->setUrl(url);
// Set fake credentials beforfe we check what credidential it actually is.
// Set fake credentials beforfe we check what credential it actually is.
account->setCredentials(CredentialsFactory::create("dummy"));
CheckServerJob *job = new CheckServerJob(_ocWizard->account(), false, this);
job->setIgnoreCredentialFailure(true);

2
src/mirall/quotainfo.cpp
View file

@ -51,7 +51,7 @@ void QuotaInfo::slotAccountStateChanged(int state)
{
switch (state) {
case Account::SignedOut: // fall through
case Account::InvalidCredidential:
case Account::InvalidCredential:
case Account::Disconnected:
_jobRestartTimer->stop();
break;