mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

- switch if branch for easier readability

Browse source 
- show snackbar only for webview (for old login there is a decent error warning)
This commit is contained in:
tobiaskaminsky 2017-08-31 08:22:41 +02:00
parent 43747c8e76
commit 9174397939
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -1811,20 +1811,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
}
} else { // authorization fail due to client side - probably wrong credentials
if (!webViewLoginMethod) {
updateAuthStatusIconAndText(result);
showAuthStatus();
} else {
if (webViewLoginMethod) {
mLoginWebView = (WebView) findViewById(R.id.login_webview);
initWebViewLogin(mServerInfo.mBaseUrl);
Snackbar.make(mLoginWebView, getString(R.string.auth_access_failed) + ": " + result.getLogMessage(),
Snackbar.LENGTH_LONG).show();
} else {
updateAuthStatusIconAndText(result);
showAuthStatus();
}
// reset webview
webViewPassword = null;
webViewUser = null;
deleteCookies();
Snackbar.make(mLoginWebView, getString(R.string.auth_access_failed) + ": " + result.getLogMessage(),
Snackbar.LENGTH_LONG).show();
Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
}
}