diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
index cac72f81c249..0d896081a199 100644
--- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -97,7 +97,6 @@
import com.owncloud.android.ui.NextcloudWebViewClient;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.activity.SettingsActivity;
-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
import com.owncloud.android.utils.DisplayUtils;
@@ -1014,16 +1013,7 @@ private void checkOcServer() {
* server.
*/
private void checkBasicAuthorization(@Nullable String webViewUsername, @Nullable String webViewPassword) {
- // be gentle with the user
- IndeterminateProgressDialog dialog = IndeterminateProgressDialog.newInstance(R.string.auth_trying_to_login,
- true);
- FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
- ft.add(dialog, WAIT_DIALOG_TAG);
- ft.commitAllowingStateLoss();
-
- // validate credentials accessing the root folder
- OwnCloudCredentials credentials = OwnCloudCredentialsFactory.newBasicCredentials(webViewUsername,
- webViewPassword);
+ OwnCloudCredentials credentials = OwnCloudCredentialsFactory.newBasicCredentials(webViewUsername, webViewPassword);
accessRootFolder(credentials);
}
@@ -1132,7 +1122,7 @@ private void initLoginInfoView() {
MaterialButton cancelButton = accountSetupWebviewBinding.loginFlowV2.cancelButton;
loginFlowLayout.setVisibility(View.VISIBLE);
- // add margin bottom to prevent overlapping with system bars
+ // add bottom padding to prevent overlapping with system bars
ViewCompat.setOnApplyWindowInsetsListener(loginFlowLayout, (view, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
view.setPadding(
@@ -1142,6 +1132,8 @@ private void initLoginInfoView() {
systemBars.bottom);
return insets;
});
+ // the listener is attached after the initial insets dispatch, so request a fresh pass
+ ViewCompat.requestApplyInsets(loginFlowLayout);
cancelButton.setOnClickListener(v -> {
loginFlowExecutorService.shutdown();
diff --git a/app/src/main/res/layout/account_setup_webview.xml b/app/src/main/res/layout/account_setup_webview.xml
index 177640a00c19..4b861e64ec69 100644
--- a/app/src/main/res/layout/account_setup_webview.xml
+++ b/app/src/main/res/layout/account_setup_webview.xml
@@ -27,10 +27,11 @@
+ android:indeterminate="true"
+ android:indeterminateTint="@color/login_text_color" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d662ed36f1bf..28788ecd96f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -411,7 +411,6 @@
Play or pause button
Fast forward button
- Trying to log in…
No network connection
Secure connection unavailable.
Connection established