Merge pull request #4654 from owncloud/fix/re-login_not_working_properly

[FIX] Re-login not working properly when credentials expire

Author: jesmrec

CHANGELOG.md

@@ -39,6 +39,7 @@ ownCloud admins and users.
 
 * Bugfix - Crash from Google Play Console in TransferListFragment: [#4650](https://github.com/owncloud/android/issues/4650)
 * Bugfix - Mini-fab for creating new document not always available: [#7277](https://github.com/owncloud/enterprise/issues/7277)
+* Bugfix - Re-login not working properly when credentials expire: [#7277](https://github.com/owncloud/enterprise/issues/7277)
 
 ## Details
 
@@ -60,6 +61,14 @@ ownCloud admins and users.
    https://github.com/owncloud/enterprise/issues/7277
    https://github.com/owncloud/android/pull/4649
 
+* Bugfix - Re-login not working properly when credentials expire: [#7277](https://github.com/owncloud/enterprise/issues/7277)
+
+   The startActivityForResult method has been replaced with startActivity to make
+   re-login work properly when credentials expire.
+
+   https://github.com/owncloud/enterprise/issues/7277
+   https://github.com/owncloud/android/pull/4654
+
 # Changelog for ownCloud Android Client [4.6.0] (2025-07-22)
 
 The following sections list the changes in ownCloud Android Client 4.6.0 relevant to

changelog/unreleased/4654

@@ -0,0 +1,7 @@
+Bugfix: Re-login not working properly when credentials expire
+
+The startActivityForResult method has been replaced with startActivity
+to make re-login work properly when credentials expire.
+
+https://github.com/owncloud/enterprise/issues/7277
+https://github.com/owncloud/android/pull/4654

owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt

@@ -76,7 +76,6 @@ import com.owncloud.android.presentation.files.removefile.RemoveFilesDialogFragm
 import com.owncloud.android.presentation.files.removefile.RemoveFilesDialogFragment.Companion.TAG_REMOVE_FILES_DIALOG_FRAGMENT
 import com.owncloud.android.presentation.files.renamefile.RenameFileDialogFragment
 import com.owncloud.android.presentation.files.renamefile.RenameFileDialogFragment.Companion.FRAGMENT_TAG_RENAME_FILE
-import com.owncloud.android.ui.activity.FileActivity.REQUEST_CODE__UPDATE_CREDENTIALS
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.fragment.FileFragment
 import com.owncloud.android.ui.preview.PreviewAudioFragment
@@ -172,7 +171,7 @@ class FileDetailsFragment : FileFragment() {
                                     putExtra(EXTRA_ACTION, ACTION_UPDATE_EXPIRED_TOKEN)
                                     addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
                                 }
-                                startActivityForResult(updateAccountCredentials, REQUEST_CODE__UPDATE_CREDENTIALS)
+                                startActivity(updateAccountCredentials)
                             }.show()
                     } else {
                         showErrorInSnackbar(R.string.sync_fail_ticker, uiResult.error)

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -6,9 +6,10 @@
  * @author Christian Schabesberger
  * @author Abel García de Prada
  * @author Aitor Ballesteros Pavón
+ * @author Jorge Aguado Recio
  * <p>
  * Copyright (C) 2011  Bartek Przybylski
- * Copyright (C) 2024 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  * <p>
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -321,7 +322,7 @@ protected void requestCredentialsUpdate(Account account) {
                 AuthenticatorConstants.EXTRA_ACTION,
                 AuthenticatorConstants.ACTION_UPDATE_EXPIRED_TOKEN);
         updateAccountCredentials.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-        startActivityForResult(updateAccountCredentials, REQUEST_CODE__UPDATE_CREDENTIALS);
+        startActivity(updateAccountCredentials);
     }
 
     /**