make fixed server url great/working again

This commit is contained in:
tobiasKaminsky 2017-11-09 12:00:02 +01:00
parent a5e0962259
commit 4edd2b9ad3
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7

View file

@ -436,6 +436,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
@Override
public void onClick(View v) {
mLoginWebView.setVisibility(View.INVISIBLE);
webViewLoginMethod = false;
setContentView(R.layout.account_setup);
@ -444,12 +445,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
mHostUrlInput.setText(baseURL);
mPasswordInputLayout.setVisibility(View.VISIBLE);
mUsernameInputLayout.setVisibility(View.VISIBLE);
mUsernameInput.requestFocus();
mOAuth2Check.setVisibility(View.INVISIBLE);
mAuthStatusView.setVisibility(View.INVISIBLE);
mServerStatusView.setVisibility(View.INVISIBLE);
mTestServerButton.setVisibility(View.INVISIBLE);
forceOldLoginMethod = true;
mOkButton.setVisibility(View.VISIBLE);
initServerPreFragment(null);
checkOcServer();
}
@ -1987,7 +1992,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
private void showRefreshButton(boolean show) {
if (webViewLoginMethod) {
if (webViewLoginMethod && mRefreshButton != null) {
if (show) {
mRefreshButton.setVisibility(View.VISIBLE);
} else {