|
@@ -380,7 +380,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
accountSetupWebviewBinding.loginWebview.loadUrl(url, headers);
|
|
accountSetupWebviewBinding.loginWebview.loadUrl(url, headers);
|
|
|
|
|
|
- setClient(accountSetupWebviewBinding.loginWebviewProgressBar);
|
|
|
|
|
|
+ setClient();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -397,7 +397,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
return super.onKeyDown(keyCode, event);
|
|
return super.onKeyDown(keyCode, event);
|
|
}
|
|
}
|
|
|
|
|
|
- private void setClient(ProgressBar progressBar) {
|
|
|
|
|
|
+ private void setClient() {
|
|
accountSetupWebviewBinding.loginWebview.setWebViewClient(new WebViewClient() {
|
|
accountSetupWebviewBinding.loginWebview.setWebViewClient(new WebViewClient() {
|
|
@Override
|
|
@Override
|
|
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
|
|
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
|
|
@@ -743,7 +743,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
private void checkOcServer() {
|
|
private void checkOcServer() {
|
|
String uri;
|
|
String uri;
|
|
- if (accountSetupBinding != null && !accountSetupBinding.hostUrlInput.getText().toString().isEmpty()) {
|
|
|
|
|
|
+ if (accountSetupBinding != null && accountSetupBinding.hostUrlInput.getText()!= null &&
|
|
|
|
+ !accountSetupBinding.hostUrlInput.getText().toString().isEmpty()) {
|
|
uri = accountSetupBinding.hostUrlInput.getText().toString().trim();
|
|
uri = accountSetupBinding.hostUrlInput.getText().toString().trim();
|
|
} else {
|
|
} else {
|
|
uri = mServerInfo.mBaseUrl;
|
|
uri = mServerInfo.mBaseUrl;
|
|
@@ -936,7 +937,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
case OK_NO_SSL:
|
|
case OK_NO_SSL:
|
|
case OK:
|
|
case OK:
|
|
- if (accountSetupBinding.hostUrlInput
|
|
|
|
|
|
+ if (accountSetupBinding.hostUrlInput.getText() != null &&
|
|
|
|
+ accountSetupBinding.hostUrlInput
|
|
.getText()
|
|
.getText()
|
|
.toString()
|
|
.toString()
|
|
.trim()
|
|
.trim()
|
|
@@ -1039,7 +1041,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
case OK_NO_SSL:
|
|
case OK_NO_SSL:
|
|
case OK:
|
|
case OK:
|
|
if (showWebViewLoginUrl) {
|
|
if (showWebViewLoginUrl) {
|
|
- if (accountSetupBinding.hostUrlInput
|
|
|
|
|
|
+ if (accountSetupBinding.hostUrlInput.getText() != null &&
|
|
|
|
+ accountSetupBinding.hostUrlInput
|
|
.getText()
|
|
.getText()
|
|
.toString()
|
|
.toString()
|
|
.trim()
|
|
.trim()
|
|
@@ -1467,13 +1470,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * For retrieving the clicking on authentication cancel button.
|
|
|
|
- */
|
|
|
|
- public void doNegativeAuthenticationDialogClick() {
|
|
|
|
- mIsFirstAuthAttempt = true;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
@Override
|
|
@Override
|
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
|
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
super.onActivityResult(requestCode, resultCode, data);
|