wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -24,6 +24,7 @@ import com.nextcloud.client.jobs.BackgroundJobManager
 import com.nextcloud.client.network.Connectivity
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.notifications.AppWideNotificationManager
+import com.nextcloud.model.OCUploadLocalPathData
 import com.nextcloud.utils.extensions.checkWCFRestrictions
 import com.nextcloud.utils.extensions.createOwncloudClient
 import com.nextcloud.utils.extensions.getUploadIds
@@ -253,49 +254,46 @@ class FileUploadHelper {
     }
 
     @JvmOverloads
+    fun uploadNewFiles(data: OCUploadLocalPathData, showSameFileAlreadyExistsNotification: Boolean = true) {
+        val uploads = getUploadsFromLocalPaths(data)
+        backgroundJobManager.startFilesUploadJob(
+            data.user,
+            uploads.getUploadIds(),
+            showSameFileAlreadyExistsNotification
+        )
+    }
+
     @Suppress("LongParameterList")
-    fun uploadNewFiles(
-        user: User,
-        localPaths: Array<String>,
-        remotePaths: Array<String>,
-        localBehavior: Int,
-        createRemoteFolder: Boolean,
-        createdBy: Int,
-        requiresWifi: Boolean,
-        requiresCharging: Boolean,
-        nameCollisionPolicy: NameCollisionPolicy,
-        showSameFileAlreadyExistsNotification: Boolean = true
-    ) {
-        val uploads = localPaths.mapIndexed { index, localPath ->
-            fun createOCUpload(): OCUpload {
-                val result = OCUpload(localPath, remotePaths[index], user.accountName).apply {
-                    this.nameCollisionPolicy = nameCollisionPolicy
-                    isUseWifiOnly = requiresWifi
-                    isWhileChargingOnly = requiresCharging
-                    uploadStatus = UploadStatus.UPLOAD_IN_PROGRESS
-                    this.createdBy = createdBy
-                    isCreateRemoteFolder = createRemoteFolder
-                    localAction = localBehavior
-                }
+    fun uploadAndCopyNewFilesForAlbum(data: OCUploadLocalPathData, albumName: String) {
+        val uploads = getUploadsFromLocalPaths(data)
+        backgroundJobManager.startAlbumFilesUploadJob(
+            data.user,
+            uploads.getUploadIds(),
+            albumName
+        )
+    }
 
+    private fun getUploadsFromLocalPaths(data: OCUploadLocalPathData): List<OCUpload> =
+        data.localPaths.mapIndexed { index, localPath ->
+            fun createOCUpload(): OCUpload {
+                val result = data.toOCUpload(localPath, index)
                 val id = uploadsStorageManager.uploadDao.insertOrReplace(result.toUploadEntity())
                 result.uploadId = id
                 return result
             }
 
+            val remotePath = data.remotePaths[index]
             val entity = getUploadByPaths(
-                accountName = user.accountName,
+                accountName = data.user.accountName,
                 localPath = localPath,
-                remotePath = remotePaths[index]
+                remotePath = remotePath
             )
             if (entity != null) {
-                reusePendingUpload(entity, user) ?: createOCUpload()
+                reusePendingUpload(entity, data.user) ?: createOCUpload()
             } else {
                 createOCUpload()
             }
         }
-        backgroundJobManager.startFilesUploadJob(user, uploads.getUploadIds(), showSameFileAlreadyExistsNotification)
-    }
 
     private fun reusePendingUpload(entity: UploadEntity, user: User): OCUpload? {
         val capability = fileStorageManager.getCapability(user)

app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt

@@ -22,6 +22,7 @@ import com.nextcloud.utils.ContactManager
 import com.nextcloud.utils.GlideHelper
 import com.nextcloud.utils.extensions.getType
 import com.nextcloud.utils.extensions.setVisibleIf
+import com.nextcloud.utils.thumbnail.ThumbnailArguments
 import com.nextcloud.utils.thumbnail.ThumbnailGenerator
 import com.owncloud.android.R
 import com.owncloud.android.databinding.UnifiedSearchItemBinding
@@ -109,7 +110,11 @@ class UnifiedSearchItemViewHolder(
                 ImageViewCompat.setImageTintList(this, null)
             }
         } else {
-            thumbnailGenerator.setThumbnail(file, binding.thumbnail, shimmer = binding.thumbnailShimmer)
+            thumbnailGenerator.setThumbnail(
+                file,
+                binding.thumbnail,
+                ThumbnailArguments.withShimmer(binding.thumbnailShimmer)
+            )
         }
     }
 

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -885,18 +885,18 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
             // hide FAB in multi selection mode
             setFabVisible(false);
 
-            if (OCFileListFragment.this instanceof GalleryFragment) {
-                // hide the 3 dot menu icon while picking media for Albums
-                if (requireActivity() instanceof AlbumsPickerActivity) {
-                    item.setVisible(false);
-
-                    final MenuItem addAlbumItem = menu.findItem(R.id.add_to_album);
-                    // show add to album button when picking files from media to add to album
-                    addAlbumItem.setVisible(true);
-                }
+            if (OCFileListFragment.this instanceof GalleryFragment && getActivity() instanceof AlbumsPickerActivity) {
+                item.setVisible(false);
+                final MenuItem addAlbumItem = menu.findItem(R.id.add_to_album);
+                // show add to album button when picking files from media to add to album
+                addAlbumItem.setVisible(true);
+            }
+
+            final var adapter = getCommonAdapter();
+            if (adapter != null) {
+                adapter.setMultiSelect(true);
             }
 
-            getCommonAdapter().setMultiSelect(true);
             return true;
         }