diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
index 5755eca72413..fc742f2ac97f 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
@@ -137,7 +137,6 @@ class UploadListActivity :
 
         swipeListRefreshLayout?.let { viewThemeUtils.androidx.themeSwipeRefreshLayout(it) }
         swipeListRefreshLayout?.setOnRefreshListener { this.refresh() }
-        loadItems()
     }
 
     private fun setupEmptyList() {
@@ -269,6 +268,7 @@ class UploadListActivity :
         binding?.autoUploadBatterySaverWarningCard?.let {
             uploadWarningCard?.bind(it)
         }
+        loadItems()
     }
 
     override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>) {
@@ -372,7 +372,7 @@ class UploadListActivity :
     private fun showConflictSnackbar(messageId: Int) {
         conflictSnackbar?.apply {
             setText(messageId)
-            setDuration(Snackbar.LENGTH_LONG)
+            duration = Snackbar.LENGTH_LONG
             show()
         }
     }
@@ -391,11 +391,9 @@ class UploadListActivity :
     companion object {
         private val TAG: String = UploadListActivity::class.java.getSimpleName()
 
-        fun createIntent(file: OCFile?, user: User?, flag: Int?, context: Context?): Intent =
+        fun createIntent(file: OCFile?, user: User?, flag: Int, context: Context): Intent =
             Intent(context, UploadListActivity::class.java).apply {
-                if (flag != null) {
-                    setFlags(flags or flag)
-                }
+                setFlags(flags or flag)
                 putExtra(EXTRA_FILE, file)
                 putExtra(EXTRA_USER, user)
             }
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterHelper.kt b/app/src/main/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterHelper.kt
index 63af435a21fe..9d19475b9b23 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterHelper.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterHelper.kt
@@ -32,7 +32,7 @@ class UploadListAdapterHelper(private val activity: FileActivity) {
         file.setStoragePath(upload.localPath)
         val user = activity.accountManager.getUser(upload.accountName)
         if (user.isPresent) {
-            val intent = ConflictsResolveActivity.Companion.createIntent(
+            val intent = ConflictsResolveActivity.createIntent(
                 file,
                 user.get(),
                 upload.uploadId,
@@ -61,16 +61,16 @@ class UploadListAdapterHelper(private val activity: FileActivity) {
         }
 
         val optionalUser = activity.user
-        if (PreviewImageFragment.Companion.canBePreviewed(file) && optionalUser.isPresent) {
+        if (PreviewImageFragment.canBePreviewed(file) && optionalUser.isPresent) {
             // show image preview and stay in uploads tab
-            val intent = FileDisplayActivity.Companion.openFileIntent(activity, optionalUser.get(), file)
+            val intent = FileDisplayActivity.openFileIntent(activity, optionalUser.get(), file)
             activity.startActivity(intent)
             return
         }
 
         val intent = Intent(activity, FileDisplayActivity::class.java).apply {
             setAction(Intent.ACTION_VIEW)
-            putExtra(FileDisplayActivity.Companion.KEY_FILE_PATH, upload.remotePath)
+            putExtra(FileDisplayActivity.KEY_FILE_PATH, upload.remotePath)
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         }
         activity.startActivity(intent)