style: changed functions with just return to expression body

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/FileListAdapter.kt

@@ -386,8 +386,8 @@ class FileListAdapter(
         }
     }
 
-    private fun generateFooterText(filesCount: Int, foldersCount: Int): String {
-        return when {
+    private fun generateFooterText(filesCount: Int, foldersCount: Int): String =
+        when {
             filesCount <= 0 -> {
                 when {
                     foldersCount <= 0 -> {
@@ -438,7 +438,6 @@ class FileListAdapter(
                 }
             }
         }
-    }
 
     interface FileListAdapterListener {
         fun onItemClick(ocFileWithSyncInfo: OCFileWithSyncInfo, position: Int)

owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt

@@ -1303,8 +1303,8 @@ class MainFileListFragment : Fragment(),
         }
     }
 
-    private fun onCheckedFilesActionChosen(menuId: Int?, checkedFiles: ArrayList<OCFile>): Boolean {
-        return when (menuId) {
+    private fun onCheckedFilesActionChosen(menuId: Int?, checkedFiles: ArrayList<OCFile>): Boolean =
+        when (menuId) {
             R.id.file_action_select_all -> {
                 fileListAdapter.selectAll()
                 updateActionModeAfterTogglingSelected()
@@ -1380,7 +1380,6 @@ class MainFileListFragment : Fragment(),
                 false
             }
         }
-    }
 
     /**
      * Update or remove the actionMode after applying any change to the selected items.

owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt

@@ -415,8 +415,8 @@ class PassCodeActivity : AppCompatActivity(), NumberKeyboardListener, EnableBiom
         finish()
     }
 
-    private fun getPasscodeAction(action: String?): PasscodeAction {
-        return when (action) {
+    private fun getPasscodeAction(action: String?): PasscodeAction =
+        when (action) {
             ACTION_REMOVE -> {
                 PasscodeAction.REMOVE
             }
@@ -429,7 +429,6 @@ class PassCodeActivity : AppCompatActivity(), NumberKeyboardListener, EnableBiom
                 PasscodeAction.CHECK
             }
         }
-    }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean =
          when (keyCode) {

owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt

@@ -193,8 +193,8 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi
         return newUri
     }
 
-    private fun insert(db: SQLiteDatabase, uri: Uri, values: ContentValues?): Uri {
-        return when (uriMatcher.match(uri)) {
+    private fun insert(db: SQLiteDatabase, uri: Uri, values: ContentValues?): Uri =
+        when (uriMatcher.match(uri)) {
             ROOT_DIRECTORY, SINGLE_FILE -> {
                 val remotePath = values?.getAsString(ProviderTableMeta.FILE_PATH)
                 val accountName = values?.getAsString(ProviderTableMeta.FILE_ACCOUNT_OWNER)
@@ -270,8 +270,6 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi
             else -> throw IllegalArgumentException("Unknown uri id: $uri")
         }
 
-    }
-
     override fun onCreate(): Boolean {
         dbHelper = DataBaseHelper(context)
         // This sentence is for opening the database, which is necessary to perform the migration correctly to DB version 38

owncloudApp/src/main/java/com/owncloud/android/usecases/transfers/downloads/DownloadFileUseCase.kt

@@ -50,12 +50,12 @@ class DownloadFileUseCase(
         val ocFile = params.file
         val accountName = params.accountName
 
-        return if (ocFile.id == null) {
-            null
-        } else if (isDownloadAlreadyEnqueued(accountName, ocFile)) {
-            null
-        } else {
-            enqueueNewDownload(ocFile, accountName)
+        return ocFile.id?.let {
+            if (isDownloadAlreadyEnqueued(accountName, ocFile)) {
+                null
+            } else {
+                enqueueNewDownload(ocFile, accountName)
+            }
         }
     }
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.kt

@@ -63,8 +63,8 @@ open class MoveRemoteFileOperation(
      *
      * @param client Client object to communicate with the remote ownCloud server.
      */
-    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
-        return if (targetRemotePath == sourceRemotePath) {
+    override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> =
+        if (targetRemotePath == sourceRemotePath) {
             // nothing to do!
             RemoteOperationResult(ResultCode.OK)
         } else if (targetRemotePath.startsWith(sourceRemotePath)) {
@@ -115,7 +115,6 @@ open class MoveRemoteFileOperation(
             }
             result
         }
-    }
 
     /**
      * For standard moves, we will use [OwnCloudClient.getUserFilesWebDavUri].

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt

@@ -49,19 +49,18 @@ internal class StatusRequester {
             (baseUrl.startsWith(HTTPS_SCHEME) &&
                     !redirectedUrl.startsWith(HTTPS_SCHEME))
 
-    fun updateLocationWithRedirectPath(oldLocation: String, redirectedLocation: String): String {
+    fun updateLocationWithRedirectPath(oldLocation: String, redirectedLocation: String): String =
         /** Redirection with different endpoint.
          * When asking for server.com/status.php and redirected to different.one/, we need to ask different.one/status.php
          */
-        return if (redirectedLocation.endsWith('/')) {
+        if (redirectedLocation.endsWith('/')) {
             redirectedLocation.trimEnd('/') + OwnCloudClient.STATUS_PATH
         } else if (!redirectedLocation.startsWith("/")) {
                 redirectedLocation
         } else {
             val oldLocationURL = URL(oldLocation)
             URL(oldLocationURL.protocol, oldLocationURL.host, oldLocationURL.port, redirectedLocation).toString()
         }
-    }
 
     private fun getGetMethod(url: String): GetMethod =
         GetMethod(URL(url)).apply {