diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 00cec2e67f..a6cb5ed9bd 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -9,6 +9,7 @@ + @@ -78,7 +79,10 @@ - + + + + @@ -3802,6 +3806,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt index fce4bdf273..4bfb401607 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperationIT.kt @@ -27,7 +27,12 @@ class DashboardListWidgetsRemoteOperationIT : AbstractIT() { assertTrue(result.resultData["recommendations"]?.buttons?.getOrNull(0) == null) assertEquals(1, result.resultData["activity"]?.buttons?.size) - assertTrue(result.resultData["activity"]?.buttons?.getOrNull(0)?.type == DashBoardButtonType.MORE) + assertTrue( + result.resultData["activity"] + ?.buttons + ?.getOrNull(0) + ?.type == DashBoardButtonType.MORE + ) assertTrue(result.resultData["activity"]?.roundIcons == false) assertTrue(result.resultData["user_status"]?.roundIcons == true) diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperationIT.kt index 235c6c1c30..ec029da67b 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperationIT.kt @@ -30,7 +30,8 @@ class ToggleFileLockRemoteOperationIT : AbstractIT() { assertTrue( @Suppress("Detekt.MagicNumber") UploadFileRemoteOperation(filePath, remotePath, "text/markdown", 1464818400) - .execute(client).isSuccess + .execute(client) + .isSuccess ) val initialFile = ReadFileRemoteOperation(remotePath).execute(client).singleData as RemoteFile diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt index f1f6c9ebf9..9e6cff1dc3 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt @@ -40,7 +40,8 @@ class SearchProvidersRemoteOperationIT : AbstractIT() { // only on < NC20 val ocCapability = GetCapabilitiesRemoteOperation() - .execute(nextcloudClient).singleData as OCCapability + .execute(nextcloudClient) + .singleData as OCCapability assumeTrue( ocCapability.version.isOlderThan(OwnCloudVersion.nextcloud_20) ) diff --git a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt index 5f78c913c6..4691e6ed20 100644 --- a/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperationIT.kt @@ -47,7 +47,8 @@ class UnifiedSearchRemoteOperationIT : AbstractIT() { assertTrue(CreateFolderRemoteOperation(remotePath, true).execute(client).isSuccess) val remoteFile = ReadFileRemoteOperation(remotePath) - .execute(client).data[0] as RemoteFile + .execute(client) + .data[0] as RemoteFile val fileId = remoteFile.localId val result = UnifiedSearchRemoteOperation("files", "test").execute(nextcloudClient) diff --git a/library/src/androidTest/java/com/nextcloud/extensions/DavPropertyProcessorTest.kt b/library/src/androidTest/java/com/nextcloud/extensions/DavPropertyProcessorTest.kt index d3e1443f00..2fffd2cbf9 100644 --- a/library/src/androidTest/java/com/nextcloud/extensions/DavPropertyProcessorTest.kt +++ b/library/src/androidTest/java/com/nextcloud/extensions/DavPropertyProcessorTest.kt @@ -18,7 +18,10 @@ import org.w3c.dom.Document import org.w3c.dom.Element class DavPropertyProcessorTest { - data class TestData(val name: String, val age: Int) + data class TestData( + val name: String, + val age: Int + ) private val gson = Gson() @@ -27,21 +30,13 @@ class DavPropertyProcessorTest { val result = gson.fromDavProperty( object : DavProperty { - override fun toXml(document: Document?): Element { - return createElement("TestData", value) - } + override fun toXml(document: Document?): Element = createElement("TestData", value) - override fun getName(): DavPropertyName { - return DavPropertyName.DISPLAYNAME - } + override fun getName(): DavPropertyName = DavPropertyName.DISPLAYNAME - override fun getValue(): String { - return "{\"name\":\"John\",\"age\":55}" - } + override fun getValue(): String = "{\"name\":\"John\",\"age\":55}" - override fun isInvisibleInAllprop(): Boolean { - return true - } + override fun isInvisibleInAllprop(): Boolean = true } ) val expected = TestData("John", 55) @@ -53,21 +48,13 @@ class DavPropertyProcessorTest { val result = gson.fromDavProperty>( object : DavProperty { - override fun toXml(document: Document?): Element { - return createElement("TestData", value) - } + override fun toXml(document: Document?): Element = createElement("TestData", value) - override fun getName(): DavPropertyName { - return DavPropertyName.DISPLAYNAME - } + override fun getName(): DavPropertyName = DavPropertyName.DISPLAYNAME - override fun getValue(): String { - return "{\"name\":\"John\",\"age\":55}" - } + override fun getValue(): String = "{\"name\":\"John\",\"age\":55}" - override fun isInvisibleInAllprop(): Boolean { - return true - } + override fun isInvisibleInAllprop(): Boolean = true } ) assertNull(result) @@ -78,21 +65,13 @@ class DavPropertyProcessorTest { val result = gson.fromDavProperty( object : DavProperty { - override fun toXml(document: Document?): Element { - return createElement("TestData", "") - } + override fun toXml(document: Document?): Element = createElement("TestData", "") - override fun getName(): DavPropertyName { - return DavPropertyName.DISPLAYNAME - } + override fun getName(): DavPropertyName = DavPropertyName.DISPLAYNAME - override fun getValue(): String? { - return null - } + override fun getValue(): String? = null - override fun isInvisibleInAllprop(): Boolean { - return true - } + override fun isInvisibleInAllprop(): Boolean = true } ) assertNull(result) diff --git a/library/src/androidTest/java/com/nextcloud/test/RandomStringGenerator.kt b/library/src/androidTest/java/com/nextcloud/test/RandomStringGenerator.kt index 189ba47e74..ee53849161 100644 --- a/library/src/androidTest/java/com/nextcloud/test/RandomStringGenerator.kt +++ b/library/src/androidTest/java/com/nextcloud/test/RandomStringGenerator.kt @@ -13,9 +13,8 @@ object RandomStringGenerator { @JvmOverloads @JvmStatic - fun make(length: Int = DEFAULT_LENGTH): String { - return (1..length) + fun make(length: Int = DEFAULT_LENGTH): String = + (1..length) .map { ALLOWED_CHARACTERS.random() } .joinToString("") - } } diff --git a/library/src/androidTest/java/com/owncloud/android/RetryTestRule.kt b/library/src/androidTest/java/com/owncloud/android/RetryTestRule.kt index 165cc35566..8186600a08 100644 --- a/library/src/androidTest/java/com/owncloud/android/RetryTestRule.kt +++ b/library/src/androidTest/java/com/owncloud/android/RetryTestRule.kt @@ -15,7 +15,9 @@ import org.junit.runners.model.Statement /** * C&p from https://stackoverflow.com/questions/45635833/how-can-i-use-flakytest-annotation-now on 18.03.2020 */ -class RetryTestRule(val retryCount: Int = 1) : TestRule { +class RetryTestRule( + val retryCount: Int = 1 +) : TestRule { companion object { private val TAG = RetryTestRule::class.java.simpleName } @@ -23,9 +25,7 @@ class RetryTestRule(val retryCount: Int = 1) : TestRule { override fun apply( base: Statement, description: Description - ): Statement { - return statement(base, description) - } + ): Statement = statement(base, description) @Suppress("TooGenericExceptionCaught") // and this exactly what we want here private fun statement(base: Statement, description: Description): Statement { diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/UsernameVariationsIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/common/UsernameVariationsIT.kt index 2cd6740581..04575c22d2 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/common/UsernameVariationsIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/common/UsernameVariationsIT.kt @@ -15,7 +15,9 @@ import org.junit.runner.RunWith import org.junit.runners.Parameterized @RunWith(Parameterized::class) -class UsernameVariationsIT(private val username: String) : AbstractIT() { +class UsernameVariationsIT( + private val username: String +) : AbstractIT() { companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/v2/AssistantV2Tests.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/v2/AssistantV2Tests.kt index c15c378661..92afbf401d 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/v2/AssistantV2Tests.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/assistant/v2/AssistantV2Tests.kt @@ -24,8 +24,8 @@ class AssistantV2Tests : AbstractIT() { testOnlyOnServer(NextcloudVersion.nextcloud_30) } - private fun getTaskType(): TaskTypeData { - return TaskTypeData( + private fun getTaskType(): TaskTypeData = + TaskTypeData( "core:text2text", "Free text to text prompt", "Runs an arbitrary prompt through a language model that returns a reply", @@ -44,7 +44,6 @@ class AssistantV2Tests : AbstractIT() { ) ) ) - } private fun getSelectedTaskType(): String = "core:text2text" diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperationIT.kt index 0a3ed54ef6..f344633eb8 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperationIT.kt @@ -21,7 +21,8 @@ class CommentFileRemoteOperationIT : AbstractIT() { val remotePath = "/commentFile.txt" assertTrue( UploadFileRemoteOperation(filePath, remotePath, "image/jpg", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) val readResult = ReadFileRemoteOperation(remotePath).execute(client) diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperationIT.kt index 948486c744..44123907cc 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperationIT.kt @@ -22,7 +22,8 @@ class CheckEtagRemoteOperationIT : AbstractIT() { assertTrue( @Suppress("Detekt.MagicNumber") UploadFileRemoteOperation(filePath, remotePath, "image/jpg", 1464818400) - .execute(client).isSuccess + .execute(client) + .isSuccess ) val readResult = ReadFileRemoteOperation(remotePath).execute(client) diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperationIT.kt index 617c1246d0..d6a5183090 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperationIT.kt @@ -21,7 +21,8 @@ class DownloadFileRemoteOperationIT : AbstractIT() { assertTrue( @Suppress("Detekt.MagicNumber") UploadFileRemoteOperation(filePath, remotePath, "image/jpg", 1464818400) - .execute(client).isSuccess + .execute(client) + .isSuccess ) assertTrue( diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperationIT.kt index 0842aed9fa..28124c8a68 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperationIT.kt @@ -20,7 +20,8 @@ class ExistenceCheckRemoteOperationIT : AbstractIT() { val notExistingRemotePath = "/notExistingCheckFile.jpg" assertTrue( UploadFileRemoteOperation(filePath, remotePath, "image/jpg", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) var existenceResult = diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt index 026b4083ed..4f07000bb6 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt @@ -42,14 +42,16 @@ class ReadFileRemoteOperationIT : AbstractIT() { val movieFilePath = "/sampleMovie.mov" assertTrue( UploadFileRemoteOperation(movieFile, movieFilePath, "video/mov", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) val livePhoto = createFile("sample") val livePhotoPath = "/samplePic.jpg" assertTrue( UploadFileRemoteOperation(livePhoto, livePhotoPath, "image/jpeg", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) // link them @@ -86,7 +88,8 @@ class ReadFileRemoteOperationIT : AbstractIT() { val remotePath = "/test.md" assertTrue( UploadFileRemoteOperation(filePath, remotePath, "text/markdown", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) val result = ReadFileRemoteOperation(remotePath).execute(client) @@ -102,7 +105,8 @@ class ReadFileRemoteOperationIT : AbstractIT() { assertTrue( UploadFileRemoteOperation(filePath, remotePath, "image/jpg", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) val result = ReadFileRemoteOperation(remotePath).execute(client) @@ -152,8 +156,7 @@ class ReadFileRemoteOperationIT : AbstractIT() { remoteFile.localId, remotePath, true - ) - .execute(client) + ).execute(client) .isSuccess ) diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt index 771c2cf96e..75e3de83ce 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt @@ -30,8 +30,7 @@ class ReadFileVersionsRemoteOperationIT : AbstractIT() { filePath, mimetype, System.currentTimeMillis() / MILLI_TO_SECOND - ) - .execute(client) + ).execute(client) assertTrue("Error uploading file $filePath: $uploadResult", uploadResult.isSuccess) @@ -44,7 +43,8 @@ class ReadFileVersionsRemoteOperationIT : AbstractIT() { var versionCount = 0 val ocCapability = GetCapabilitiesRemoteOperation() - .execute(nextcloudClient).singleData as OCCapability + .execute(nextcloudClient) + .singleData as OCCapability if (ocCapability.version.isNewerOrEqual(NextcloudVersion.nextcloud_26)) { // with NC26+ we always have a starting version versionCount++ @@ -64,8 +64,7 @@ class ReadFileVersionsRemoteOperationIT : AbstractIT() { filePath, mimetype, System.currentTimeMillis() / MILLI_TO_SECOND - ) - .execute(client) + ).execute(client) assertTrue("Error uploading file $filePath: $uploadResult", uploadResult.isSuccess) diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt index 710fe668c7..11613b2a7b 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperationIT.kt @@ -33,7 +33,8 @@ class ReadFolderRemoteOperationIT : AbstractIT() { val filePath = createFile("text") assertTrue( UploadFileRemoteOperation(filePath, remotePath + "1.txt", "text/markdown", RANDOM_MTIME) - .execute(client).isSuccess + .execute(client) + .isSuccess ) var result = ReadFolderRemoteOperation(remotePath).execute(client) diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt index 8376af46c6..56e9196928 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt @@ -85,7 +85,8 @@ class UploadFileRemoteOperationIT : AbstractIT() { return null } else { try { - Files.readAttributes(file.toPath(), BasicFileAttributes::class.java) + Files + .readAttributes(file.toPath(), BasicFileAttributes::class.java) .creationTime() .to(TimeUnit.SECONDS) } catch (e: IOException) { diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperationIT.kt index d631b5bf0b..a274e2da69 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperationIT.kt @@ -34,8 +34,8 @@ class ReadTrashbinFolderRemoteOperationIT : AbstractIT() { remotePath, "image/jpg", 1464818400 - ) - .execute(client).isSuccess + ).execute(client) + .isSuccess ) // delete file diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt index a6c77886dd..390c99d2d5 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt @@ -16,8 +16,10 @@ import com.owncloud.android.lib.resources.OCSRemoteOperation import org.apache.commons.httpclient.HttpStatus import java.io.IOException -class DashboardGetWidgetItemsRemoteOperation(val id: String, private val limitSize: Int) : - OCSRemoteOperation>>() { +class DashboardGetWidgetItemsRemoteOperation( + val id: String, + private val limitSize: Int +) : OCSRemoteOperation>>() { override fun run(client: NextcloudClient): RemoteOperationResult>> { lateinit var result: RemoteOperationResult>> lateinit var get: GetMethod diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt index da224bad41..b4d5473e4f 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt @@ -21,8 +21,10 @@ import org.apache.commons.httpclient.HttpStatus * * @param toLock `true` if file is to be locked, `false` if it is to be unlocked */ -class ToggleFileLockRemoteOperation(private val toLock: Boolean, private val filePath: String) : - RemoteOperation() { +class ToggleFileLockRemoteOperation( + private val toLock: Boolean, + private val filePath: String +) : RemoteOperation() { @Suppress("TooGenericExceptionCaught") override fun run(client: NextcloudClient): RemoteOperationResult { var method: OkHttpMethodBase? = null diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt index c7b870f81a..1d840ff78f 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt @@ -19,8 +19,7 @@ import org.apache.commons.httpclient.HttpStatus /** * Get groupfolders of an user */ -class GetGroupfoldersRemoteOperation : - OCSRemoteOperation>() { +class GetGroupfoldersRemoteOperation : OCSRemoteOperation>() { @Suppress("TooGenericExceptionCaught") override fun run(client: NextcloudClient): RemoteOperationResult> { var result: RemoteOperationResult> diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt index 8f75263087..25bf85f2ce 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt @@ -19,7 +19,9 @@ import org.apache.commons.httpclient.HttpStatus /** * Get hoverCard of an user */ -class GetHoverCardRemoteOperation(private val userId: String) : OCSRemoteOperation() { +class GetHoverCardRemoteOperation( + private val userId: String +) : OCSRemoteOperation() { @Suppress("TooGenericExceptionCaught") override fun run(client: NextcloudClient): RemoteOperationResult { var result: RemoteOperationResult diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt index 882bcd57b5..6cd18c0bec 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt @@ -43,8 +43,7 @@ class UnifiedSearchProvidersRemoteOperation : OCSRemoteOperation?>?>() {} - ) - ?.ocs + )?.ocs ?.data ?: ArrayList() diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt index 09c2fafde8..109e51ec8e 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt @@ -28,8 +28,7 @@ class UnifiedSearchRemoteOperation( val query: String, val cursor: Int? = null, val limit: Int = 5 -) : - OCSRemoteOperation() { +) : OCSRemoteOperation() { companion object { private val TAG = UnifiedSearchRemoteOperation::class.java.simpleName private const val ENDPOINT = "/ocs/v2.php/search/providers/" diff --git a/library/src/main/java/com/nextcloud/common/JSONRequestBody.kt b/library/src/main/java/com/nextcloud/common/JSONRequestBody.kt index c3f1a6e598..ea338c1fee 100644 --- a/library/src/main/java/com/nextcloud/common/JSONRequestBody.kt +++ b/library/src/main/java/com/nextcloud/common/JSONRequestBody.kt @@ -31,9 +31,7 @@ class JSONRequestBody() { return json.toRequestBody(JSON_MEDIATYPE) } - override fun toString(): String { - return content.toString() - } + override fun toString(): String = content.toString() companion object { private val JSON_MEDIATYPE = "application/json; charset=utf-8".toMediaType() diff --git a/library/src/main/java/com/nextcloud/common/NextcloudClient.kt b/library/src/main/java/com/nextcloud/common/NextcloudClient.kt index 2f4e5c6d47..830822308f 100644 --- a/library/src/main/java/com/nextcloud/common/NextcloudClient.kt +++ b/library/src/main/java/com/nextcloud/common/NextcloudClient.kt @@ -81,15 +81,15 @@ class NextcloudClient private constructor( Log_OC.d(this, "Proxy settings: $proxyHost:$proxyPort") } - return OkHttpClient.Builder() + return OkHttpClient + .Builder() .cookieJar(CookieJar.NO_COOKIES) .connectTimeout(DEFAULT_CONNECTION_TIMEOUT_LONG, TimeUnit.MILLISECONDS) .readTimeout(DEFAULT_DATA_TIMEOUT_LONG, TimeUnit.MILLISECONDS) .callTimeout( DEFAULT_CONNECTION_TIMEOUT_LONG + DEFAULT_DATA_TIMEOUT_LONG, TimeUnit.MILLISECONDS - ) - .sslSocketFactory(sslSocketFactory, trustManager) + ).sslSocketFactory(sslSocketFactory, trustManager) .hostnameVerifier { _: String?, _: SSLSession? -> true } .fastFallback(true) .proxy(proxy) @@ -135,8 +135,8 @@ class NextcloudClient private constructor( return httpStatus } - internal fun execute(request: Request): ResponseOrError { - return try { + internal fun execute(request: Request): ResponseOrError = + try { val response = client.newCall(request).execute() if (response.code == HttpStatus.SC_BAD_REQUEST) { val url = request.url @@ -147,7 +147,6 @@ class NextcloudClient private constructor( } catch (ex: IOException) { ResponseOrError(ex) } - } @Throws(IOException::class) fun followRedirection(method: OkHttpMethodBase): RedirectionPath { @@ -208,11 +207,7 @@ class NextcloudClient private constructor( } } - fun getUserIdEncoded(): String { - return delegate.userIdEncoded!! - } + fun getUserIdEncoded(): String = delegate.userIdEncoded!! - fun getUserIdPlain(): String { - return delegate.userId!! - } + fun getUserIdPlain(): String = delegate.userId!! } diff --git a/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt b/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt index c6b58973d6..a890c30fc3 100644 --- a/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt +++ b/library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt @@ -18,7 +18,10 @@ import com.owncloud.android.lib.common.network.WebdavUtils * When finally getting rid of [com.owncloud.android.lib.common.OwnCloudClient], * this should be separate from the client. */ -class NextcloudUriDelegate(override var baseUri: Uri, var userId: String?) : NextcloudUriProvider { +class NextcloudUriDelegate( + override var baseUri: Uri, + var userId: String? +) : NextcloudUriProvider { constructor(baseUri: Uri) : this(baseUri, null) val userIdEncoded: String? @@ -36,7 +39,5 @@ class NextcloudUriDelegate(override var baseUri: Uri, var userId: String?) : Nex return "$filesDavUri${WebdavUtils.encodePath(path)}" } - override fun getCommentsUri(fileId: Long): String { - return "$davUri/comments/files/$fileId" - } + override fun getCommentsUri(fileId: Long): String = "$davUri/comments/files/$fileId" } diff --git a/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt b/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt index 7e396748a8..aba9c23917 100644 --- a/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt +++ b/library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt @@ -82,37 +82,23 @@ abstract class OkHttpMethodBase( queryMap = params } - fun getResponseBodyAsString(): String { - return response?.body?.string() ?: "" - } + fun getResponseBodyAsString(): String = response?.body?.string() ?: "" - fun getResponseContentLength(): Long { - return response?.body?.contentLength() ?: -1 - } + fun getResponseContentLength(): Long = response?.body?.contentLength() ?: -1 fun releaseConnection() { response?.body?.close() } - fun getStatusCode(): Int { - return response?.code ?: UNKNOWN_STATUS_CODE - } + fun getStatusCode(): Int = response?.code ?: UNKNOWN_STATUS_CODE - fun getStatusText(): String { - return response?.message ?: "" - } + fun getStatusText(): String = response?.message ?: "" - fun getResponseHeaders(): Headers { - return response?.headers ?: Headers.Builder().build() - } + fun getResponseHeaders(): Headers = response?.headers ?: Headers.Builder().build() - fun getResponseHeader(name: String): String? { - return response?.header(name) - } + fun getResponseHeader(name: String): String? = response?.header(name) - fun getRequestHeader(name: String): String? { - return request?.header(name) - } + fun getRequestHeader(name: String): String? = request?.header(name) /** * Execute operation using nextcloud client. @@ -168,7 +154,5 @@ abstract class OkHttpMethodBase( abstract fun applyType(temp: Request.Builder) - fun isSuccess(): Boolean { - return getStatusCode() == HttpURLConnection.HTTP_OK - } + fun isSuccess(): Boolean = getStatusCode() == HttpURLConnection.HTTP_OK } diff --git a/library/src/main/java/com/nextcloud/common/PlainClient.kt b/library/src/main/java/com/nextcloud/common/PlainClient.kt index dc595e2c6e..a611442d74 100644 --- a/library/src/main/java/com/nextcloud/common/PlainClient.kt +++ b/library/src/main/java/com/nextcloud/common/PlainClient.kt @@ -28,7 +28,9 @@ import java.util.concurrent.TimeUnit import javax.net.ssl.SSLSession import javax.net.ssl.TrustManager -class PlainClient(context: Context) { +class PlainClient( + context: Context +) { var followRedirects = true var client: OkHttpClient = createDefaultClient(context) @@ -55,7 +57,8 @@ class PlainClient(context: Context) { Log_OC.d(this, "Proxy settings: $proxyHost:$proxyPort") } - return OkHttpClient.Builder() + return OkHttpClient + .Builder() .cookieJar(CookieJar.NO_COOKIES) .callTimeout(DEFAULT_DATA_TIMEOUT_LONG, TimeUnit.MILLISECONDS) .sslSocketFactory(sslSocketFactory, trustManager) @@ -67,16 +70,13 @@ class PlainClient(context: Context) { } @Throws(Exception::class) - fun execute(method: OkHttpMethodBase): Int { - return method.execute(this) - } + fun execute(method: OkHttpMethodBase): Int = method.execute(this) - internal fun execute(request: Request): ResponseOrError { - return try { + internal fun execute(request: Request): ResponseOrError = + try { val response = client.newCall(request).execute() ResponseOrError(response) } catch (ex: IOException) { ResponseOrError(ex) } - } } diff --git a/library/src/main/java/com/nextcloud/common/ResponseOrError.kt b/library/src/main/java/com/nextcloud/common/ResponseOrError.kt index 0072171700..8d1f363b9a 100644 --- a/library/src/main/java/com/nextcloud/common/ResponseOrError.kt +++ b/library/src/main/java/com/nextcloud/common/ResponseOrError.kt @@ -9,7 +9,10 @@ package com.nextcloud.common import okhttp3.Response -internal data class ResponseOrError private constructor(val result: Response?, val error: Exception?) { +internal data class ResponseOrError private constructor( + val result: Response?, + val error: Exception? +) { constructor(result: Response) : this(result, null) constructor(error: Exception) : this(null, error) } diff --git a/library/src/main/java/com/nextcloud/common/SessionTimeOut.kt b/library/src/main/java/com/nextcloud/common/SessionTimeOut.kt index 4e2fe838a5..64c2ff91c8 100644 --- a/library/src/main/java/com/nextcloud/common/SessionTimeOut.kt +++ b/library/src/main/java/com/nextcloud/common/SessionTimeOut.kt @@ -7,7 +7,10 @@ package com.nextcloud.common -data class SessionTimeOut(val readTimeOut: Int, val connectionTimeOut: Int) +data class SessionTimeOut( + val readTimeOut: Int, + val connectionTimeOut: Int +) @Suppress("Detekt.MagicNumber") val defaultSessionTimeOut = SessionTimeOut(60000, 15000) diff --git a/library/src/main/java/com/nextcloud/common/UserIdEncoder.kt b/library/src/main/java/com/nextcloud/common/UserIdEncoder.kt index 8a262b3b50..a2ad17f5a9 100644 --- a/library/src/main/java/com/nextcloud/common/UserIdEncoder.kt +++ b/library/src/main/java/com/nextcloud/common/UserIdEncoder.kt @@ -16,9 +16,9 @@ object UserIdEncoder { private const val ALLOWED_USERID_CHARACTERS = "@+" @JvmStatic - fun encode(userId: String): String { - return Uri.encode(userId, ALLOWED_USERID_CHARACTERS) + fun encode(userId: String): String = + Uri + .encode(userId, ALLOWED_USERID_CHARACTERS) // single quote is not automatically encoded by Uri but is encoded in NC server .replace("'", "%27") - } } diff --git a/library/src/main/java/com/nextcloud/extensions/GsonExtensions.kt b/library/src/main/java/com/nextcloud/extensions/GsonExtensions.kt index 476d6cc8ff..0fb5feb918 100644 --- a/library/src/main/java/com/nextcloud/extensions/GsonExtensions.kt +++ b/library/src/main/java/com/nextcloud/extensions/GsonExtensions.kt @@ -11,8 +11,8 @@ import com.google.gson.Gson import com.google.gson.JsonSyntaxException import org.apache.jackrabbit.webdav.property.DavProperty -inline fun Gson.fromDavProperty(davProperty: DavProperty<*>?): T? { - return if (davProperty != null && davProperty.value != null) { +inline fun Gson.fromDavProperty(davProperty: DavProperty<*>?): T? = + if (davProperty != null && davProperty.value != null) { try { fromJson(davProperty.value.toString(), T::class.java) } catch (e: JsonSyntaxException) { @@ -21,4 +21,3 @@ inline fun Gson.fromDavProperty(davProperty: DavProperty<*>?): T? { } else { null } -} diff --git a/library/src/main/java/com/owncloud/android/lib/common/SearchProvider.kt b/library/src/main/java/com/owncloud/android/lib/common/SearchProvider.kt index c1f5c74970..0e691c7367 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/SearchProvider.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/SearchProvider.kt @@ -10,4 +10,8 @@ package com.owncloud.android.lib.common /** * Search provider for unified search */ -data class SearchProvider(var id: String, var name: String, var order: Int) +data class SearchProvider( + var id: String, + var name: String, + var order: Int +) diff --git a/library/src/main/java/com/owncloud/android/lib/common/SearchProviders.kt b/library/src/main/java/com/owncloud/android/lib/common/SearchProviders.kt index 5596267e7a..730a79e7dc 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/SearchProviders.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/SearchProviders.kt @@ -10,4 +10,7 @@ package com.owncloud.android.lib.common /** * Search providers for unified search */ -data class SearchProviders(var eTag: String = "", var providers: List = emptyList()) +data class SearchProviders( + var eTag: String = "", + var providers: List = emptyList() +) diff --git a/library/src/main/java/com/owncloud/android/lib/common/SearchResultEntry.kt b/library/src/main/java/com/owncloud/android/lib/common/SearchResultEntry.kt index 93ab0fd222..1504e0046e 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/SearchResultEntry.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/SearchResultEntry.kt @@ -31,13 +31,9 @@ data class SearchResultEntry( val isFile: Boolean get() = fileId() != null || listOf(PARAM_DIR, PARAM_FILE).all { resourceUrl.contains(it) } - fun fileId(): String? { - return attributes["fileId"] - } + fun fileId(): String? = attributes["fileId"] - fun remotePath(): String { - return attributes["path"] ?: parseRemotePath() - } + fun remotePath(): String = attributes["path"] ?: parseRemotePath() private fun parseRemotePath(): String { val sanitizer = diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt index 39076cd269..442fda4c3d 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt @@ -29,7 +29,10 @@ import org.w3c.dom.Element import java.math.BigDecimal @Suppress("Detekt.TooGenericExceptionCaught") // legacy code -class WebdavEntry constructor(ms: MultiStatusResponse, splitElement: String) { +class WebdavEntry constructor( + ms: MultiStatusResponse, + splitElement: String +) { var name: String? = null private set var path: String? = null @@ -561,9 +564,7 @@ class WebdavEntry constructor(ms: MultiStatusResponse, splitElement: String) { return ShareType.NO_SHARED } - fun decodedPath(): String { - return Uri.decode(path) - } + fun decodedPath(): String = Uri.decode(path) val isDirectory: Boolean get() = "DIR" == contentType diff --git a/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.kt index 48baa5d1e5..e6f7aac3b4 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.kt @@ -27,8 +27,8 @@ abstract class OCSRemoteOperation : RemoteOperation() { fun getServerResponse( method: HttpMethodBase, type: TypeToken - ): T? { - return try { + ): T? = + try { val response = method.responseBodyAsString val element: JsonElement = JsonParser.parseString(response) gson.fromJson(element, type.type) @@ -37,18 +37,16 @@ abstract class OCSRemoteOperation : RemoteOperation() { } catch (syntaxException: JsonSyntaxException) { null } - } fun getServerResponse( method: OkHttpMethodBase, type: TypeToken - ): T? { - return try { + ): T? = + try { val response = method.getResponseBodyAsString() val element: JsonElement = JsonParser.parseString(response) gson.fromJson(element, type.type) } catch (syntaxException: JsonSyntaxException) { null } - } } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/CreateTaskRemoteOperationV1.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/CreateTaskRemoteOperationV1.kt index cc4487c327..09dbae62bf 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/CreateTaskRemoteOperationV1.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/CreateTaskRemoteOperationV1.kt @@ -16,8 +16,10 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody.Companion.toRequestBody import org.apache.commons.httpclient.HttpStatus -class CreateTaskRemoteOperationV1(private val input: String, private val type: String) : - RemoteOperation() { +class CreateTaskRemoteOperationV1( + private val input: String, + private val type: String +) : RemoteOperation() { override fun run(client: NextcloudClient): RemoteOperationResult { val requestBody = hashMapOf( diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/DeleteTaskRemoteOperationV1.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/DeleteTaskRemoteOperationV1.kt index 2f5ad083a0..7b667c7e82 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/DeleteTaskRemoteOperationV1.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/DeleteTaskRemoteOperationV1.kt @@ -17,7 +17,9 @@ import com.owncloud.android.lib.resources.users.DeletePrivateKeyRemoteOperation import java.io.IOException import java.net.HttpURLConnection -class DeleteTaskRemoteOperationV1(private val appId: Long) : RemoteOperation() { +class DeleteTaskRemoteOperationV1( + private val appId: Long +) : RemoteOperation() { override fun run(client: NextcloudClient): RemoteOperationResult { var postMethod: DeleteMethod? = null var result: RemoteOperationResult diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/GetTaskListRemoteOperationV1.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/GetTaskListRemoteOperationV1.kt index 384c95e9ba..b865e2d876 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/GetTaskListRemoteOperationV1.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/GetTaskListRemoteOperationV1.kt @@ -18,7 +18,9 @@ import com.owncloud.android.lib.resources.OCSRemoteOperation import com.owncloud.android.lib.resources.assistant.v1.model.TaskList import org.apache.commons.httpclient.HttpStatus -class GetTaskListRemoteOperationV1(private val appId: String) : OCSRemoteOperation() { +class GetTaskListRemoteOperationV1( + private val appId: String +) : OCSRemoteOperation() { @Suppress("TooGenericExceptionCaught") override fun run(client: NextcloudClient): RemoteOperationResult { var result: RemoteOperationResult diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskList.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskList.kt index 4a4ee48a5e..ef19a21036 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskList.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskList.kt @@ -24,8 +24,8 @@ data class Task( val completionExpectedAt: String? = null ) -fun TaskList.toV2(): com.owncloud.android.lib.resources.assistant.v2.model.TaskList { - return com.owncloud.android.lib.resources.assistant.v2.model.TaskList( +fun TaskList.toV2(): com.owncloud.android.lib.resources.assistant.v2.model.TaskList = + com.owncloud.android.lib.resources.assistant.v2.model.TaskList( tasks = tasks.map { task -> com.owncloud.android.lib.resources.assistant.v2.model.Task( @@ -36,11 +36,13 @@ fun TaskList.toV2(): com.owncloud.android.lib.resources.assistant.v2.model.TaskL appId = task.appId, input = task.input?.let { - com.owncloud.android.lib.resources.assistant.v2.model.TaskInput(input = it) + com.owncloud.android.lib.resources.assistant.v2.model + .TaskInput(input = it) }, output = task.output?.let { - com.owncloud.android.lib.resources.assistant.v2.model.TaskOutput(output = it) + com.owncloud.android.lib.resources.assistant.v2.model + .TaskOutput(output = it) }, completionExpectedAt = task.completionExpectedAt?.toIntOrNull(), progress = null, @@ -50,4 +52,3 @@ fun TaskList.toV2(): com.owncloud.android.lib.resources.assistant.v2.model.TaskL ) } ) -} diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskTypes.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskTypes.kt index 0f65ca7c17..2ff084850e 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskTypes.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/model/TaskTypes.kt @@ -20,8 +20,8 @@ data class TaskType( val description: String? ) -fun TaskTypes.toV2(): List { - return types.map { taskType -> +fun TaskTypes.toV2(): List = + types.map { taskType -> TaskTypeData( id = taskType.id, name = taskType.name, @@ -30,4 +30,3 @@ fun TaskTypes.toV2(): List { outputShape = null ) } -} diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/CreateTaskRemoteOperationV2.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/CreateTaskRemoteOperationV2.kt index 49670f4a15..7974ce4f7e 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/CreateTaskRemoteOperationV2.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/CreateTaskRemoteOperationV2.kt @@ -17,8 +17,10 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody.Companion.toRequestBody import org.apache.commons.httpclient.HttpStatus -class CreateTaskRemoteOperationV2(private val input: String, private val taskType: TaskTypeData) : - RemoteOperation() { +class CreateTaskRemoteOperationV2( + private val input: String, + private val taskType: TaskTypeData +) : RemoteOperation() { override fun run(client: NextcloudClient): RemoteOperationResult { val inputField = hashMapOf("input" to input) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/DeleteTaskRemoteOperationV2.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/DeleteTaskRemoteOperationV2.kt index 302f9349af..7b282670ba 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/DeleteTaskRemoteOperationV2.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/DeleteTaskRemoteOperationV2.kt @@ -16,7 +16,9 @@ import com.owncloud.android.lib.common.utils.Log_OC import java.io.IOException import java.net.HttpURLConnection -class DeleteTaskRemoteOperationV2(private val appId: Long) : RemoteOperation() { +class DeleteTaskRemoteOperationV2( + private val appId: Long +) : RemoteOperation() { override fun run(client: NextcloudClient): RemoteOperationResult { var postMethod: DeleteMethod? = null var result: RemoteOperationResult diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskListRemoteOperationV2.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskListRemoteOperationV2.kt index 19dc6c83c9..c72ff9ed37 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskListRemoteOperationV2.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskListRemoteOperationV2.kt @@ -18,7 +18,9 @@ import com.owncloud.android.lib.resources.OCSRemoteOperation import com.owncloud.android.lib.resources.assistant.v2.model.TaskList import org.apache.commons.httpclient.HttpStatus -class GetTaskListRemoteOperationV2(private val taskType: String) : OCSRemoteOperation() { +class GetTaskListRemoteOperationV2( + private val taskType: String +) : OCSRemoteOperation() { @Suppress("TooGenericExceptionCaught") override fun run(client: NextcloudClient): RemoteOperationResult { var result: RemoteOperationResult diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskTypesRemoteOperationV2.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskTypesRemoteOperationV2.kt index b2f3822d0b..e4b4bd8621 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskTypesRemoteOperationV2.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/GetTaskTypesRemoteOperationV2.kt @@ -47,9 +47,10 @@ class GetTaskTypesRemoteOperationV2 : OCSRemoteOperation>() { taskTypeList?.filter { taskType -> taskType.inputShape?.any { inputShape -> inputShape.type == supportedTaskType - } == true && taskType.outputShape?.any { outputShape -> - outputShape.type == supportedTaskType - } == true + } == true && + taskType.outputShape?.any { outputShape -> + outputShape.type == supportedTaskType + } == true } result = RemoteOperationResult(true, getMethod) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/model/TaskTypes.kt b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/model/TaskTypes.kt index 616c6e9199..bd33d39722 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/model/TaskTypes.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/model/TaskTypes.kt @@ -8,7 +8,9 @@ package com.owncloud.android.lib.resources.assistant.v2.model -data class TaskTypes(val types: Map) +data class TaskTypes( + val types: Map +) data class TaskTypeData( val id: String?, diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/MetadataResponse.kt b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/MetadataResponse.kt index 4c5683e862..2b755dfb62 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/MetadataResponse.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/MetadataResponse.kt @@ -7,4 +7,7 @@ */ package com.owncloud.android.lib.resources.e2ee -data class MetadataResponse(val signature: String, val metadata: String) +data class MetadataResponse( + val signature: String, + val metadata: String +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/Chunk.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/Chunk.kt index c63a5bdd2b..05f10cca2a 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/Chunk.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/Chunk.kt @@ -7,4 +7,8 @@ */ package com.owncloud.android.lib.resources.files -data class Chunk(val id: Int, val start: Long, val length: Long) +data class Chunk( + val id: Int, + val start: Long, + val length: Long +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/CreateLocalFileException.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/CreateLocalFileException.kt index ac5330a830..1ae1690271 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/CreateLocalFileException.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/CreateLocalFileException.kt @@ -9,7 +9,10 @@ package com.owncloud.android.lib.resources.files import java.io.IOException -class CreateLocalFileException(val path: String, cause: Throwable) : Exception(cause) { +class CreateLocalFileException( + val path: String, + cause: Throwable +) : Exception(cause) { override val message: String = "File could not be created" /** @@ -17,9 +20,14 @@ class CreateLocalFileException(val path: String, cause: Throwable) : Exception(c * There is no better way to check this, as `Paths` is not available in API < 26, and since this lib has a very low * minSdk, that can't even be worked around with an `if` block. */ - fun isCausedByInvalidPath(): Boolean { - return cause is IOException && (path.isEmpty() || INVALID_CHARS.any { path.contains(it) }) - } + fun isCausedByInvalidPath(): Boolean = + cause is IOException && + ( + path.isEmpty() || + INVALID_CHARS.any { + path.contains(it) + } + ) companion object { private const val INVALID_CHARS = "\\:*?\"<>|" diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/FileLockType.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/model/FileLockType.kt index cb40b26263..c705882f9e 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/model/FileLockType.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/model/FileLockType.kt @@ -7,7 +7,9 @@ */ package com.owncloud.android.lib.resources.files.model -enum class FileLockType(val value: Int) { +enum class FileLockType( + val value: Int +) { MANUAL(0), COLLABORATIVE(1), TOKEN(2); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/GeoLocation.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/model/GeoLocation.kt index fe8c4575d9..03ef1e1ebd 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/model/GeoLocation.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/model/GeoLocation.kt @@ -7,4 +7,7 @@ */ package com.owncloud.android.lib.resources.files.model -data class GeoLocation(var latitude: Double = -1.0, var longitude: Double = -1.0) +data class GeoLocation( + var latitude: Double = -1.0, + var longitude: Double = -1.0 +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/ImageDimension.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/model/ImageDimension.kt index 318eb4486d..0ca7a8c8ca 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/model/ImageDimension.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/model/ImageDimension.kt @@ -7,4 +7,7 @@ */ package com.owncloud.android.lib.resources.files.model -data class ImageDimension(var width: Float = -1f, var height: Float = -1f) +data class ImageDimension( + var width: Float = -1f, + var height: Float = -1f +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt index 8edea5fe43..f35e1304f2 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/files/model/RemoteFile.kt @@ -20,7 +20,9 @@ import java.io.Serializable * * @author masensio */ -class RemoteFile : Parcelable, Serializable { +class RemoteFile : + Parcelable, + Serializable { var remotePath: String? = null var mimeType: String? = null var length: Long = 0 @@ -184,9 +186,7 @@ class RemoteFile : Parcelable, Serializable { hidden = source.readInt() == 1 } - override fun describeContents(): Int { - return this.hashCode() - } + override fun describeContents(): Int = this.hashCode() override fun writeToParcel( dest: Parcel, @@ -234,13 +234,9 @@ class RemoteFile : Parcelable, Serializable { @JvmField val CREATOR: Parcelable.Creator = object : Parcelable.Creator { - override fun createFromParcel(source: Parcel): RemoteFile { - return RemoteFile(source) - } + override fun createFromParcel(source: Parcel): RemoteFile = RemoteFile(source) - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } + override fun newArray(size: Int): Array = arrayOfNulls(size) } } } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.kt b/library/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.kt index f8010e39d1..76f46e9c5d 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.kt @@ -22,7 +22,9 @@ import java.io.Serializable * @author masensio */ @Suppress("Detekt.TooManyFunctions") // legacy code -class OCShare : Parcelable, Serializable { +class OCShare : + Parcelable, + Serializable { var id: Long = 0 var fileSource: Long = 0 var itemSource: Long = 0 @@ -149,9 +151,7 @@ class OCShare : Parcelable, Serializable { ownerDisplayName = source.readString() } - override fun describeContents(): Int { - return this.hashCode() - } + override fun describeContents(): Int = this.hashCode() override fun writeToParcel( dest: Parcel, @@ -219,13 +219,9 @@ class OCShare : Parcelable, Serializable { @JvmField val CREATOR: Parcelable.Creator = object : Parcelable.Creator { - override fun createFromParcel(source: Parcel): OCShare { - return OCShare(source) - } + override fun createFromParcel(source: Parcel): OCShare = OCShare(source) - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } + override fun newArray(size: Int): Array = arrayOfNulls(size) } } } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/SharedWithMe.kt b/library/src/main/java/com/owncloud/android/lib/resources/shares/SharedWithMe.kt index 6f626d1201..0b671981e6 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/SharedWithMe.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/SharedWithMe.kt @@ -7,4 +7,8 @@ */ package com.owncloud.android.lib.resources.shares -class SharedWithMe(val ownerUID: String?, val ownerDisplayName: String?, val note: String?) +class SharedWithMe( + val ownerUID: String?, + val ownerDisplayName: String?, + val note: String? +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/ShareeUser.kt b/library/src/main/java/com/owncloud/android/lib/resources/shares/ShareeUser.kt index 3d3ee9fd30..f6067e7780 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/shares/ShareeUser.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/ShareeUser.kt @@ -11,5 +11,8 @@ import android.os.Parcelable import kotlinx.parcelize.Parcelize @Parcelize -data class ShareeUser(val userId: String?, var displayName: String?, val shareType: ShareType?) : - Parcelable +data class ShareeUser( + val userId: String?, + var displayName: String?, + val shareType: ShareType? +) : Parcelable diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/CapabilityBooleanType.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/CapabilityBooleanType.kt index c052f8358a..ad1821eb12 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/CapabilityBooleanType.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/CapabilityBooleanType.kt @@ -15,7 +15,9 @@ package com.owncloud.android.lib.resources.status * 0 - False * 1 - True */ -enum class CapabilityBooleanType(val value: Int) { +enum class CapabilityBooleanType( + val value: Int +) { UNKNOWN(-1), FALSE(0), TRUE(1); diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt index ff8a74c099..cc3dcdb125 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt @@ -7,7 +7,9 @@ */ package com.owncloud.android.lib.resources.status -enum class E2EVersion(val value: String) { +enum class E2EVersion( + val value: String +) { V1_0("1.0"), V1_1("1.1"), V1_2("1.2"), diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/Problem.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Problem.kt index 79fe7ddca8..47c3af8c5a 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/status/Problem.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Problem.kt @@ -7,8 +7,10 @@ */ package com.owncloud.android.lib.resources.status -data class Problem(val type: String, val count: Int, val oldestTimestamp: Long) { - fun toJsonWithTypeString(): String { - return """"$type": {"count": $count, "oldest": $oldestTimestamp}""" - } +data class Problem( + val type: String, + val count: Int, + val oldestTimestamp: Long +) { + fun toJsonWithTypeString(): String = """"$type": {"count": $count, "oldest": $oldestTimestamp}""" } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt index 1684be0f0c..554650ad59 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt @@ -16,7 +16,9 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody import org.apache.commons.httpclient.HttpStatus -class CreateTagRemoteOperation(val name: String) : RemoteOperation() { +class CreateTagRemoteOperation( + val name: String +) : RemoteOperation() { override fun run(client: NextcloudClient): RemoteOperationResult { val map = HashMap() map["name"] = name diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt index 22577c82f2..7a5b2a2940 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt @@ -45,11 +45,15 @@ class GetTagsRemoteOperation : RemoteOperation>() { response.forEach { if (it.getProperties(HttpStatus.SC_OK).contentSize > 0) { val id = - it.getProperties(HttpStatus.SC_OK) - .get(EXTENDED_PROPERTY_NAME_REMOTE_ID, ocNamespace).value as String + it + .getProperties(HttpStatus.SC_OK) + .get(EXTENDED_PROPERTY_NAME_REMOTE_ID, ocNamespace) + .value as String val name = - it.getProperties(HttpStatus.SC_OK) - .get(SHAREES_DISPLAY_NAME, ocNamespace).value as String + it + .getProperties(HttpStatus.SC_OK) + .get(SHAREES_DISPLAY_NAME, ocNamespace) + .value as String result.add(Tag(id, name)) } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt index a781adcfd4..3c07f5db39 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt @@ -16,7 +16,10 @@ import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.internal.EMPTY_BYTE_ARRAY import org.apache.commons.httpclient.HttpStatus -class PutTagRemoteOperation(val id: String, val fileId: Long) : RemoteOperation() { +class PutTagRemoteOperation( + val id: String, + val fileId: Long +) : RemoteOperation() { override fun run(client: NextcloudClient): RemoteOperationResult { val empty: RequestBody = EMPTY_BYTE_ARRAY.toRequestBody() val putMethod = diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/Tag.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/Tag.kt index c57751d194..b737e9a86b 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/tags/Tag.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/Tag.kt @@ -7,4 +7,7 @@ */ package com.owncloud.android.lib.resources.tags -data class Tag(val id: String, val name: String) +data class Tag( + val id: String, + val name: String +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/ClearAt.kt b/library/src/main/java/com/owncloud/android/lib/resources/users/ClearAt.kt index 84c45aed80..63480c8eb6 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/users/ClearAt.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/users/ClearAt.kt @@ -7,4 +7,7 @@ */ package com.owncloud.android.lib.resources.users -class ClearAt(val type: String, val time: String) +class ClearAt( + val type: String, + val time: String +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/PredefinedStatus.kt b/library/src/main/java/com/owncloud/android/lib/resources/users/PredefinedStatus.kt index 120fe0ffd9..d44dfc6ad2 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/users/PredefinedStatus.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/users/PredefinedStatus.kt @@ -7,4 +7,9 @@ */ package com.owncloud.android.lib.resources.users -class PredefinedStatus(val id: String, val icon: String, val message: String, val clearAt: ClearAt?) +class PredefinedStatus( + val id: String, + val icon: String, + val message: String, + val clearAt: ClearAt? +) diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/Status.kt b/library/src/main/java/com/owncloud/android/lib/resources/users/Status.kt index 07c1cedc8e..ada0094bca 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/users/Status.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/users/Status.kt @@ -10,8 +10,12 @@ package com.owncloud.android.lib.resources.users import android.os.Parcel import android.os.Parcelable -class Status(val status: StatusType, val message: String?, val icon: String, val clearAt: Long) : - Parcelable { +class Status( + val status: StatusType, + val message: String?, + val icon: String, + val clearAt: Long +) : Parcelable { constructor(parcel: Parcel) : this( StatusType.valueOf(parcel.readString().orEmpty()), parcel.readString(), @@ -29,17 +33,11 @@ class Status(val status: StatusType, val message: String?, val icon: String, val parcel.writeLong(clearAt) } - override fun describeContents(): Int { - return 0 - } + override fun describeContents(): Int = 0 companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): Status { - return Status(parcel) - } + override fun createFromParcel(parcel: Parcel): Status = Status(parcel) - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } + override fun newArray(size: Int): Array = arrayOfNulls(size) } } diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/StatusType.kt b/library/src/main/java/com/owncloud/android/lib/resources/users/StatusType.kt index d5c8744eab..d0725ef3d7 100644 --- a/library/src/main/java/com/owncloud/android/lib/resources/users/StatusType.kt +++ b/library/src/main/java/com/owncloud/android/lib/resources/users/StatusType.kt @@ -9,7 +9,9 @@ package com.owncloud.android.lib.resources.users import com.google.gson.annotations.SerializedName -enum class StatusType(val string: String) { +enum class StatusType( + val string: String +) { @SerializedName("online") ONLINE("online"), diff --git a/library/src/test/java/com/nextcloud/common/ClockStub.kt b/library/src/test/java/com/nextcloud/common/ClockStub.kt index 45e870ec18..f8d1b4278b 100644 --- a/library/src/test/java/com/nextcloud/common/ClockStub.kt +++ b/library/src/test/java/com/nextcloud/common/ClockStub.kt @@ -9,7 +9,9 @@ package com.nextcloud.common import com.nextcloud.android.lib.core.Clock -class ClockStub(private val currentTimeValue: Long) : Clock { +class ClockStub( + private val currentTimeValue: Long +) : Clock { override val currentTimeMillis: Long get() = currentTimeValue } diff --git a/library/src/test/java/com/nextcloud/common/NextcloudClientTest.kt b/library/src/test/java/com/nextcloud/common/NextcloudClientTest.kt index 29819f0c0c..1de00c2e6d 100644 --- a/library/src/test/java/com/nextcloud/common/NextcloudClientTest.kt +++ b/library/src/test/java/com/nextcloud/common/NextcloudClientTest.kt @@ -55,9 +55,7 @@ class NextcloudClientTest { val exception = RuntimeException("test exception") val operation = object : RemoteOperation() { - override fun run(client: NextcloudClient?): RemoteOperationResult { - throw exception - } + override fun run(client: NextcloudClient?): RemoteOperationResult = throw exception } // WHEN diff --git a/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt b/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt index e0a52b275b..59bf5f8818 100644 --- a/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt +++ b/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt @@ -75,9 +75,7 @@ class WebdavEntryTest { return document.documentElement } - private fun getMultiStatus(): MultiStatus { - return MultiStatus.createFromXml(getElement()) - } + private fun getMultiStatus(): MultiStatus = MultiStatus.createFromXml(getElement()) } @Test diff --git a/library/src/test/java/com/owncloud/android/lib/resources/files/CreateLocalFileExceptionTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/files/CreateLocalFileExceptionTest.kt index 815768ffb6..2b8f82b9eb 100644 --- a/library/src/test/java/com/owncloud/android/lib/resources/files/CreateLocalFileExceptionTest.kt +++ b/library/src/test/java/com/owncloud/android/lib/resources/files/CreateLocalFileExceptionTest.kt @@ -15,9 +15,7 @@ class CreateLocalFileExceptionTest { private fun buildException( path: String, cause: Throwable = IOException() - ): CreateLocalFileException { - return CreateLocalFileException(path, cause) - } + ): CreateLocalFileException = CreateLocalFileException(path, cause) @Test fun `causedByInvalidPath should be false if cause is not IOException`() {