Changed error message in Basic Authentication to be the same than the…

… others
owncloud · Mar 12, 2024 · 5cb10a8 · 5cb10a8
1 parent b64ce23
commit 5cb10a8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -278,7 +278,7 @@ protected void showRequestAccountChangeNotice(String errorMessage, boolean mustC
                     .show();
         } else {
             Snackbar.make(findViewById(android.R.id.content), errorMessage, Snackbar.LENGTH_INDEFINITE)
-                    .setAction(R.string.auth_failure_snackbar_action, v ->
+                    .setAction(R.string.auth_oauth_failure_snackbar_action, v ->
                             requestCredentialsUpdate())
                     .show();
         }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -381,7 +381,10 @@ class FileDisplayActivity : FileActivity(),
     }
 
     private fun initAndShowListOfSpaces() {
-        val listOfSpaces = SpacesListFragment.newInstance(showPersonalSpace = false, accountName = com.owncloud.android.presentation.authentication.AccountUtils.getCurrentOwnCloudAccount(applicationContext).name)
+        val listOfSpaces = SpacesListFragment.newInstance(
+            showPersonalSpace = false,
+            accountName = com.owncloud.android.presentation.authentication.AccountUtils.getCurrentOwnCloudAccount(applicationContext).name
+        )
         this.fileListOption = FileListOption.SPACES_LIST
         val transaction = supportFragmentManager.beginTransaction()
         transaction.replace(R.id.left_fragment_container, listOfSpaces, TAG_LIST_OF_SPACES)
@@ -1351,7 +1354,6 @@ class FileDisplayActivity : FileActivity(),
                     is UnauthorizedException -> {
                         launch(Dispatchers.IO) {
                             val credentials = AccountUtils.getCredentialsForAccount(MainApp.appContext, account)
-
                             launch(Dispatchers.Main) {
                                 if (credentials is OwnCloudBearerCredentials) { // OAuth
                                     showRequestRegainAccess()
@@ -1790,24 +1792,28 @@ class FileDisplayActivity : FileActivity(),
                     is UIResult.Loading -> {
                         showLoadingDialog(R.string.deep_link_loading)
                     }
+
                     is UIResult.Success -> {
                         intent?.data = null
                         dismissLoadingDialog()
                         uiResult.data?.let { it1 -> manageItem(it1) }
                     }
+
                     is UIResult.Error -> {
                         dismissLoadingDialog()
                         if (uiResult.error is FileNotFoundException) {
                             showMessageInSnackbar(message = getString(R.string.deep_link_user_no_access))
                             changeUser()
                         } else {
-                            showMessageInSnackbar(message = getString(
-                                if (uiResult.error is DeepLinkException) {
-                                    R.string.invalid_deep_link_format
-                                } else {
-                                    R.string.default_error_msg
-                                }
-                            ))
+                            showMessageInSnackbar(
+                                message = getString(
+                                    if (uiResult.error is DeepLinkException) {
+                                        R.string.invalid_deep_link_format
+                                    } else {
+                                        R.string.default_error_msg
+                                    }
+                                )
+                            )
                         }
                     }
                 }