Code refactoring

Author: surinder-tsys

library/src/main/java/com/owncloud/android/lib/resources/albums/CopyFileToAlbumRemoteOperation.kt

@@ -14,7 +14,6 @@ import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.operations.RemoteOperation
 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 org.apache.commons.httpclient.HttpStatus
 import org.apache.jackrabbit.webdav.DavException
 import org.apache.jackrabbit.webdav.Status

library/src/main/java/com/owncloud/android/lib/resources/albums/CreateNewAlbumRemoteOperation.kt

@@ -49,7 +49,7 @@ class CreateNewAlbumRemoteOperation @JvmOverloads constructor(
                     RemoteOperationResult(RemoteOperationResult.ResultCode.FOLDER_ALREADY_EXISTS)
             } else {
                 result = RemoteOperationResult(mkCol.succeeded(), mkCol)
-                result.setResultData(null)
+                result.resultData = null
             }
 
             Log_OC.d(TAG, "Create album $newAlbumName : ${result.logMessage}")

library/src/main/java/com/owncloud/android/lib/resources/albums/PhotoAlbumEntry.kt

@@ -27,7 +27,7 @@ class PhotoAlbumEntry(response: MultiStatusResponse) {
     private val dateRange: String?
 
     companion object {
-        val dateFormat = SimpleDateFormat("MMM yyyy", Locale.US)
+        private val dateFormat = SimpleDateFormat("MMM yyyy", Locale.US)
     }
 
     init {
@@ -51,15 +51,15 @@ class PhotoAlbumEntry(response: MultiStatusResponse) {
     private fun parseInt(value: String?): Int {
         return try {
             value?.toInt() ?: 0
-        } catch (e: NumberFormatException) {
+        } catch (_: NumberFormatException) {
             0
         }
     }
 
     private fun parseLong(value: String?): Long {
         return try {
             value?.toLong() ?: 0L
-        } catch (e: NumberFormatException) {
+        } catch (_: NumberFormatException) {
             0L
         }
     }

library/src/main/java/com/owncloud/android/lib/resources/albums/ReadAlbumItemsRemoteOperation.kt

@@ -14,7 +14,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.common.utils.WebDavFileUtils
-import com.owncloud.android.lib.resources.albums.ReadAlbumItemsRemoteOperation
 import com.owncloud.android.lib.resources.files.model.RemoteFile
 import org.apache.commons.httpclient.HttpStatus
 import org.apache.jackrabbit.webdav.DavConstants

library/src/main/java/com/owncloud/android/lib/resources/albums/ReadAlbumsRemoteOperation.kt

@@ -45,23 +45,16 @@ class ReadAlbumsRemoteOperation @JvmOverloads constructor(
             )
             val isSuccess = status == HttpStatus.SC_MULTI_STATUS || status == HttpStatus.SC_OK
             if (isSuccess) {
-                val multiStatus = propfind.responseBodyAsMultiStatus
-                val albumsList: MutableList<PhotoAlbumEntry> = ArrayList()
-                for (response in multiStatus.responses) {
-                    val st = response.status[0].statusCode
-                    if (st == HttpStatus.SC_OK) {
-                        val entry = PhotoAlbumEntry(response)
-                        albumsList.add(entry)
-                    }
-                }
+                val albumsList = propfind.responseBodyAsMultiStatus.responses
+                    .filter { it.status[0].statusCode == HttpStatus.SC_OK }
+                    .map { res -> PhotoAlbumEntry(res) }
                 result = RemoteOperationResult<List<PhotoAlbumEntry>>(true, propfind)
-                result.setResultData(albumsList)
+                result.resultData = albumsList
             } else {
                 result = RemoteOperationResult<List<PhotoAlbumEntry>>(false, propfind)
                 client.exhaustResponse(propfind.responseBodyAsStream)
             }
-        } catch (var13: Exception) {
-            val e = var13
+        } catch (e: Exception) {
             result = RemoteOperationResult<List<PhotoAlbumEntry>>(e)
             Log_OC.e(TAG, "Read album failed: ${result.logMessage}", result.exception)
         } finally {

library/src/main/java/com/owncloud/android/lib/resources/albums/RemoveAlbumRemoteOperation.kt

@@ -13,7 +13,6 @@ import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.lib.resources.albums.RemoveAlbumRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod
 

library/src/main/java/com/owncloud/android/lib/resources/albums/RenameAlbumRemoteOperation.kt

@@ -13,7 +13,6 @@ import com.owncloud.android.lib.common.network.WebdavUtils
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.lib.resources.albums.RenameAlbumRemoteOperation
 import org.apache.jackrabbit.webdav.client.methods.MoveMethod
 
 class RenameAlbumRemoteOperation @JvmOverloads constructor(
@@ -52,7 +51,6 @@ class RenameAlbumRemoteOperation @JvmOverloads constructor(
                     "Rename ${this.mOldRemotePath} to ${this.newAlbumName} : ${result.logMessage}"
                 )
                 client.exhaustResponse(move.responseBodyAsStream)
-                return result
             }
         } catch (e: Exception) {
             result = RemoteOperationResult<Any>(e)
@@ -61,7 +59,6 @@ class RenameAlbumRemoteOperation @JvmOverloads constructor(
                 "Rename ${this.mOldRemotePath} to ${this.newAlbumName} : ${result.logMessage}",
                 e
             )
-            return result
         } finally {
             move?.releaseConnection()
         }