mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fixed_contradicted_messages_in_login_view' into develop

Browse source
This commit is contained in:
David A. Velasco 2013-06-19 12:17:16 +02:00
commit 0c7f1af8d0
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -935,7 +935,33 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
finish();
} else {
} else if (result.isServerFail() || result.isException()) {
/// if server fail or exception in authorization, the UI is updated as when a server check failed
mServerIsChecked = true;
mServerIsValid = false;
mIsSslConn = false;
mOcServerChkOperation = null;
mDiscoveredVersion = null;
mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());
// update status icon and text
updateServerStatusIconAndText(result);
showServerStatus();
mAuthStatusIcon = 0;
mAuthStatusText = 0;
showAuthStatus();
// update input controls state
showRefreshButton();
mOkButton.setEnabled(false);
// very special case (TODO: move to a common place for all the remote operations) (dangerous here?)
if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {
mLastSslUntrustedServerResult = result;
showDialog(DIALOG_SSL_VALIDATOR);
}
} else { // authorization fail due to client side - probably wrong credentials
updateAuthStatusIconAndText(result);
showAuthStatus();
Log_OC.d(TAG, "Access failed: " + result.getLogMessage());

8
src/com/owncloud/android/operations/RemoteOperationResult.java
View file

@ -267,4 +267,12 @@ public class RemoteOperationResult implements Serializable {
}
public boolean isServerFail() {
return (mHttpCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR);
}
public boolean isException() {
return (mException != null);
}
}