Code refactoring and operation migrated to kotlin

Signed-off-by: Surinder Kumar <[email protected]>

Author: surinder-tsys

app/src/main/java/com/nextcloud/ui/albumItemActions/AlbumItemAction.kt

@@ -23,7 +23,7 @@ enum class AlbumItemAction(@IdRes val id: Int, @StringRes val title: Int, @Drawa
         @JvmField
         val SORTED_VALUES = listOf(
             RENAME_ALBUM,
-            DELETE_ALBUM,
+            DELETE_ALBUM
         )
     }
 }

app/src/main/java/com/owncloud/android/operations/albums/CopyFileToAlbumOperation.kt

@@ -4,41 +4,32 @@
  * SPDX-FileCopyrightText: 2025 TSI-mc <[email protected]>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+package com.owncloud.android.operations.albums
 
-package com.owncloud.android.operations.albums;
-
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.lib.resources.albums.CopyFileToAlbumRemoteOperation;
-import com.owncloud.android.operations.UploadFileOperation;
-import com.owncloud.android.operations.common.SyncOperation;
+import com.owncloud.android.datamodel.FileDataStorageManager
+import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
+import com.owncloud.android.lib.resources.albums.CopyFileToAlbumRemoteOperation
+import com.owncloud.android.operations.UploadFileOperation
+import com.owncloud.android.operations.common.SyncOperation
 
 /**
- * Operation copying an {@link OCFile} to a different folder.
+ * Constructor
  *
- * @author David A. Velasco
+ * @param srcPath          Remote path of the [OCFile] to move.
+ * @param targetParentPath Path to the folder where the file will be copied into.
  */
-public class CopyFileToAlbumOperation extends SyncOperation {
-
-    private final String srcPath;
-    private String targetParentPath;
-
-    /**
-     * Constructor
-     *
-     * @param srcPath          Remote path of the {@link OCFile} to move.
-     * @param targetParentPath Path to the folder where the file will be copied into.
-     */
-    public CopyFileToAlbumOperation(String srcPath, String targetParentPath, FileDataStorageManager storageManager) {
-        super(storageManager);
-
-        this.srcPath = srcPath;
-        this.targetParentPath = targetParentPath;
-        if (!this.targetParentPath.endsWith(OCFile.PATH_SEPARATOR)) {
-            this.targetParentPath += OCFile.PATH_SEPARATOR;
+class CopyFileToAlbumOperation(
+    private val srcPath: String,
+    private var targetParentPath: String,
+    storageManager: FileDataStorageManager
+) :
+    SyncOperation(storageManager) {
+    init {
+        if (!targetParentPath.endsWith(OCFile.PATH_SEPARATOR)) {
+            this.targetParentPath += OCFile.PATH_SEPARATOR
         }
     }
 
@@ -47,43 +38,45 @@ public class CopyFileToAlbumOperation extends SyncOperation {
      *
      * @param client Client object to communicate with the remote ownCloud server.
      */
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        /// 1. check copy validity
-        if (targetParentPath.startsWith(srcPath)) {
-            return new RemoteOperationResult(ResultCode.INVALID_COPY_INTO_DESCENDANT);
-        }
-        OCFile file = getStorageManager().getFileByPath(srcPath);
-        if (file == null) {
-            return new RemoteOperationResult(ResultCode.FILE_NOT_FOUND);
-        }
+    @Deprecated("Deprecated in Java")
+    @Suppress("NestedBlockDepth")
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Any> {
+        /** 1. check copy validity */
+        val result: RemoteOperationResult<Any>
 
-        /// 2. remote copy
-        String targetPath = targetParentPath + file.getFileName();
-        if (file.isFolder()) {
-            targetPath += OCFile.PATH_SEPARATOR;
-        }
+        if (targetParentPath.startsWith(srcPath)) {
+            result = RemoteOperationResult<Any>(ResultCode.INVALID_COPY_INTO_DESCENDANT)
+        } else {
+            val file = storageManager.getFileByPath(srcPath)
+            if (file == null) {
+                result = RemoteOperationResult(ResultCode.FILE_NOT_FOUND)
+            } else {
+                /** 2. remote copy */
+                var targetPath = "$targetParentPath${file.fileName}"
+                if (file.isFolder) {
+                    targetPath += OCFile.PATH_SEPARATOR
+                }
 
-        // auto rename, to allow copy
-        if (targetPath.equals(srcPath)) {
-            if (file.isFolder()) {
-                targetPath = targetParentPath + file.getFileName();
-            }
-            targetPath = UploadFileOperation.getNewAvailableRemotePath(client, targetPath, null, false);
+                // auto rename, to allow copy
+                if (targetPath == srcPath) {
+                    if (file.isFolder) {
+                        targetPath = "$targetParentPath${file.fileName}"
+                    }
+                    targetPath = UploadFileOperation.getNewAvailableRemotePath(client, targetPath, null, false)
 
-            if (file.isFolder()) {
-                targetPath += OCFile.PATH_SEPARATOR;
-            }
-        }
+                    if (file.isFolder) {
+                        targetPath += OCFile.PATH_SEPARATOR
+                    }
+                }
 
-        RemoteOperationResult result = new CopyFileToAlbumRemoteOperation(srcPath, targetPath).execute(client);
+                result = CopyFileToAlbumRemoteOperation(srcPath, targetPath).execute(client)
 
-        /// 3. local copy
-        if (result.isSuccess()) {
-            getStorageManager().copyLocalFile(file, targetPath);
+                /** 3. local copy */
+                if (result.isSuccess) {
+                    storageManager.copyLocalFile(file, targetPath)
+                }
+            }
         }
-        // TODO handle ResultCode.PARTIAL_COPY_DONE in client Activity, for the moment
-
-        return result;
+        return result
     }
 }

app/src/main/java/com/owncloud/android/ui/activity/AlbumsPickerActivity.kt

@@ -143,7 +143,11 @@ class AlbumsPickerActivity : FileActivity(), FileFragment.ContainerActivity, OnE
      * @param operation Creation operation performed.
      * @param result    Result of the creation.
      */
-    private fun onCreateAlbumOperationFinish(operation: CreateNewAlbumRemoteOperation, result: RemoteOperationResult<*>) {
+    @Suppress("MaxLineLength")
+    private fun onCreateAlbumOperationFinish(
+        operation: CreateNewAlbumRemoteOperation,
+        result: RemoteOperationResult<*>
+    ) {
         if (result.isSuccess) {
             val fileListFragment = listOfFilesFragment
             fileListFragment?.refreshAlbums()

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

@@ -206,9 +206,7 @@ class GalleryAdapter(
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    fun showAlbumItems(
-        albumItems: List<OCFile>,
-    ) {
+    fun showAlbumItems(albumItems: List<OCFile>) {
         files = albumItems.toGalleryItems()
         Handler(Looper.getMainLooper()).post { notifyDataSetChanged() }
     }
@@ -313,7 +311,7 @@ class GalleryAdapter(
     }
 
     fun setCheckedItem(files: Set<OCFile>?) {
-       ocFileListDelegate.setCheckedItem(files)
+        ocFileListDelegate.setCheckedItem(files)
     }
 
     override fun getFilesCount(): Int {

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

@@ -11,4 +11,4 @@ import com.owncloud.android.lib.resources.albums.PhotoAlbumEntry
 
 interface AlbumFragmentInterface {
     fun onItemClick(album: PhotoAlbumEntry)
-}
+}

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

@@ -23,4 +23,4 @@ internal class AlbumGridItemViewHolder(private var binding: AlbumsGridItemBindin
         get() = binding.Filename
     override val albumInfo: TextView
         get() = binding.fileInfo
-}
+}

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

@@ -16,4 +16,4 @@ interface AlbumItemViewHolder {
     val shimmerThumbnail: LoaderImageView
     val albumName: TextView
     val albumInfo: TextView
-}
+}

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

@@ -23,4 +23,4 @@ internal class AlbumListItemViewHolder(private var binding: AlbumsListItemBindin
         get() = binding.Filename
     override val albumInfo: TextView
         get() = binding.fileInfo
-}
+}

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

@@ -26,6 +26,7 @@ import com.owncloud.android.lib.resources.albums.PhotoAlbumEntry
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 
+@Suppress("LongParameterList")
 class AlbumsAdapter(
     val context: Context,
     private val storageManager: FileDataStorageManager?,
@@ -60,7 +61,8 @@ class AlbumsAdapter(
         gridViewHolder.thumbnail.tag = file.lastPhoto
         gridViewHolder.albumInfo.text = String.format(
             context.resources.getString(R.string.album_items_text),
-            file.nbItems, file.createdDate
+            file.nbItems,
+            file.createdDate
         )
 
         if (file.lastPhoto > 0) {
@@ -106,4 +108,4 @@ class AlbumsAdapter(
         }
         notifyDataSetChanged()
     }
-}
+}

app/src/main/java/com/owncloud/android/ui/dialog/CreateAlbumDialogFragment.kt

@@ -97,7 +97,6 @@ class CreateAlbumDialogFragment : DialogFragment(), DialogInterface.OnClickListe
         val inflater = requireActivity().layoutInflater
         binding = EditBoxDialogBinding.inflate(inflater, null, false)
 
-
         binding.userInput.setText(albumName ?: "")
         viewThemeUtils.material.colorTextInputLayout(binding.userInputContainer)
         albumName?.let {
@@ -194,7 +193,7 @@ class CreateAlbumDialogFragment : DialogFragment(), DialogInterface.OnClickListe
         fun newInstance(albumName: String? = null): CreateAlbumDialogFragment {
             return CreateAlbumDialogFragment().apply {
                 val argsBundle = bundleOf(
-                    ARG_ALBUM_NAME to albumName,
+                    ARG_ALBUM_NAME to albumName
                 )
                 arguments = argsBundle
             }